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 <ch...@chris-wilson.co.uk> Cc: Daniel Vetter <daniel.vet...@ffwll.ch> Cc: Joonas Lahtinen <joonas.lahti...@linux.intel.com> Cc: linux...@kvack.org Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- include/linux/io-mapping.h | 6 ++++++ 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, iomap->base = base; iomap->size = size; 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 iomap->prot = pgprot_writecombine(PAGE_KERNEL); +#else + iomap->prot = pgprot_noncached(PAGE_KERNEL); +#endif return iomap; } -- 2.9.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx