leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/

Browse Source 
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 <sfr@canb.auug.org.au>
Fixes: cafaf14a5d ("io-mapping: Always create a struct to hold metadata about the io-mapping")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: linux-mm@kvack.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20160823155024.22379-1-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2016-08-23 16:50:24 +01:00 committed by Daniel Vetter
parent 62e0fb8801
commit ac96b55669
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/io-mapping.h
View File

@ -112,7 +112,7 @@ io_mapping_unmap(void __iomem *vaddr)
#else #else
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/pgtable_types.h> #include <asm/pgtable.h>
/* Create the io_mapping object*/ /* Create the io_mapping object*/
static inline struct io_mapping * static inline struct io_mapping *
@ -123,7 +123,7 @@ io_mapping_init_wc(struct io_mapping *iomap,
iomap->base = base; iomap->base = base;
iomap->size = size; iomap->size = size;
iomap->iomem = ioremap_wc(base, size); iomap->iomem = ioremap_wc(base, size);
iomap->prot = pgprot_writecombine(PAGE_KERNEL_IO); iomap->prot = pgprot_writecombine(PAGE_KERNEL);
return iomap; return iomap;
} }