Re: [PATCH] io-mapping: Fixup for different names of writecombine
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Date: 2016-08-24 06:54:49
Also in:
intel-gfx
On ti, 2016-08-23 at 22:22 +0200, Daniel Vetter wrote:
quoted hunk ↗ jump to hunk
Somehow architectures can't agree on this. And for good measure make sure we have a fallback which should work everywhere (fingers crossed). This is to fix a compile fail on microblaze in gpiolib-of.c, which misguidedly includes io-mapping.h (instead of screaming at whichever achitecture doesn't correctly pull in asm/io.h from linux/io.h). Not tested since there's no reasonable way to get at microblaze toolchains :( Fixes: ac96b5566926 ("io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/") Cc: Chris Wilson <redacted> Cc: Daniel Vetter <redacted> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: linux-mm@kvack.org Signed-off-by: Daniel Vetter <redacted> --- A include/linux/io-mapping.h | 6 ++++++ A 1 file changed, 6 insertions(+)diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h index a87dd7fffc0a..f4e33756c09c 100644 --- a/include/linux/io-mapping.h +++ b/include/linux/io-mapping.h@@ -123,7 +123,13 @@ io_mapping_init_wc(struct io_mapping *iomap,A iomap->base = base; A iomap->size = size; A iomap->iomem = ioremap_wc(base, size); +#ifdef pgprot_noncached_wc /* archs can't agree on a name ... */ + iomap->prot = pgprot_noncached_wc(PAGE_KERNEL); +#elif pgprot_writecombine
Maybe you meant #elif defined pgprot_writecombine? Regards, Joonas
A iomap->prot = pgprot_writecombine(PAGE_KERNEL); +#else + iomap->prot = pgprot_noncached(PAGE_KERNEL); +#endif A A return iomap; A }
-- Joonas Lahtinen Open Source Technology Center Intel Corporation -- 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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>