aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mn10300/include/asm
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-12-12 10:36:39 -0500
committerDavid Howells <dhowells@redhat.com>2012-12-12 10:46:14 -0500
commit83c2dc15ce824450e7044b9f90cd529c25747ae0 (patch)
treecf6fb2eb5560002e0f25115128764a588b5d12c6 /arch/mn10300/include/asm
parent0369c360e5825e34ff58c140aa7fbb9855ad1e4a (diff)
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 <dhowells@redhat.com>
Diffstat (limited to 'arch/mn10300/include/asm')
-rw-r--r--arch/mn10300/include/asm/io.h2
1 files changed, 1 insertions, 1 deletions
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,
258 258
259static inline void __iomem *ioremap(unsigned long offset, unsigned long size) 259static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
260{ 260{
261 return (void __iomem *) offset; 261 return (void __iomem *)(offset & ~0x20000000);
262} 262}
263 263
264/* 264/*