mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/
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 (cherry picked from commitac96b55669
)
This commit is contained in:
parent
d5d0804f8f
commit
bcaaa0c431
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue