summaryrefslogtreecommitdiffstats
path: root/arch/mn10300/include/asm/io.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-12-12 16:36:39 +0100
committerDavid Howells <dhowells@redhat.com>2012-12-12 16:46:14 +0100
commit83c2dc15ce824450e7044b9f90cd529c25747ae0 (patch)
treecf6fb2eb5560002e0f25115128764a588b5d12c6 /arch/mn10300/include/asm/io.h
parentMN10300: fix debug polling in ttySM driver (diff)
downloadlinux-83c2dc15ce824450e7044b9f90cd529c25747ae0.tar.xz
linux-83c2dc15ce824450e7044b9f90cd529c25747ae0.zip
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/io.h')
-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,
static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
{
- return (void __iomem *) offset;
+ return (void __iomem *)(offset & ~0x20000000);
}
/*