From 83c2dc15ce824450e7044b9f90cd529c25747ae0 Mon Sep 17 00:00:00 2001 From: David Howells Date: Wed, 12 Dec 2012 15:36:39 +0000 Subject: MN10300: Handle cacheable PCI regions in pci_iomap() Handle cacheable PCI regions in pci_iomap(). If IORESOURCE_CACHEABLE is set then we AND away the 0x20000000 "flag". Signed-off-by: David Howells --- arch/mn10300/include/asm/io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/mn10300/include') diff --git a/arch/mn10300/include/asm/io.h b/arch/mn10300/include/asm/io.h index 139df8c53de8..70f1c06e29de 100644 --- a/arch/mn10300/include/asm/io.h +++ b/arch/mn10300/include/asm/io.h @@ -258,7 +258,7 @@ static inline void __iomem *__ioremap(unsigned long offset, unsigned long size, static inline void __iomem *ioremap(unsigned long offset, unsigned long size) { - return (void __iomem *) offset; + return (void __iomem *)(offset & ~0x20000000); } /* -- cgit v1.2.3 From 76583cffb77533fe564aaf21d184b89a5f419ffe Mon Sep 17 00:00:00 2001 From: David Howells Date: Wed, 12 Dec 2012 15:36:40 +0000 Subject: MN10300: Use asm-generic/pci_iomap.h The declarations from MN10300's pci_iomap() was removed by commit 34f1bdee1910f7efe3c32e1a891dba4fd21cb3b6 but asm-generic/pci_iomap.h wasn't then #included from asm/io.h. Signed-off-by: David Howells --- arch/mn10300/include/asm/io.h | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/mn10300/include') diff --git a/arch/mn10300/include/asm/io.h b/arch/mn10300/include/asm/io.h index 70f1c06e29de..e6ed0d897ccc 100644 --- a/arch/mn10300/include/asm/io.h +++ b/arch/mn10300/include/asm/io.h @@ -14,6 +14,7 @@ #include /* I/O is all done through memory accesses */ #include #include +#include #define mmiowb() do {} while (0) -- cgit v1.2.3