From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f70.google.com (mail-lf0-f70.google.com [209.85.215.70]) by kanga.kvack.org (Postfix) with ESMTP id 2EF936B0253 for ; Tue, 23 Aug 2016 12:33:02 -0400 (EDT) Received: by mail-lf0-f70.google.com with SMTP id p85so100591617lfg.3 for ; Tue, 23 Aug 2016 09:33:02 -0700 (PDT) Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com. [2a00:1450:400c:c09::241]) by mx.google.com with ESMTPS id x8si21864227wme.6.2016.08.23.09.33.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Aug 2016 09:33:00 -0700 (PDT) Received: by mail-wm0-x241.google.com with SMTP id o80so18866556wme.0 for ; Tue, 23 Aug 2016 09:33:00 -0700 (PDT) Date: Tue, 23 Aug 2016 18:32:57 +0200 From: Daniel Vetter Subject: Re: [PATCH v2] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ Message-ID: <20160823163257.GP10980@phenom.ffwll.local> References: <20160823155024.22379-1-chris@chris-wilson.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160823155024.22379-1-chris@chris-wilson.co.uk> Sender: owner-linux-mm@kvack.org List-ID: To: Chris Wilson Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Daniel Vetter , Joonas Lahtinen , linux-mm@kvack.org On Tue, Aug 23, 2016 at 04:50:24PM +0100, Chris Wilson wrote: > PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t > used for the iomapped region, it itself is just PAGE_KERNEL. On all > other arches, PAGE_KERNEL_IO is undefined so in a general header we must > refrain from using it. > > v2: include pgtable for pgprot_combine() > > Reported-by: Stephen Rothwell > Fixes: cafaf14a5d8f ("io-mapping: Always create a struct to hold metadata about the io-mapping") > Signed-off-by: Chris Wilson > Cc: Daniel Vetter > Cc: Joonas Lahtinen > Cc: linux-mm@kvack.org This one seems to have worked out, applied to dinq. Thanks, Daniel > --- > include/linux/io-mapping.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h > index b4c4b5c4216d..a87dd7fffc0a 100644 > --- a/include/linux/io-mapping.h > +++ b/include/linux/io-mapping.h > @@ -112,7 +112,7 @@ io_mapping_unmap(void __iomem *vaddr) > #else > > #include > -#include > +#include > > /* Create the io_mapping object*/ > static inline struct io_mapping * > @@ -123,7 +123,7 @@ io_mapping_init_wc(struct io_mapping *iomap, > iomap->base = base; > iomap->size = size; > iomap->iomem = ioremap_wc(base, size); > - iomap->prot = pgprot_writecombine(PAGE_KERNEL_IO); > + iomap->prot = pgprot_writecombine(PAGE_KERNEL); > > return iomap; > } > -- > 2.9.3 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org