diff options
author | Stuart Menefy <stuart.menefy@st.com> | 2009-08-24 05:29:25 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-24 05:29:25 -0400 |
commit | a1fce732359b80ead84efba23059a5f1b572b85a (patch) | |
tree | 340f92ab28309bad17b5ee232ef30419c528672c /arch | |
parent | 6000fc4d6f3e55ad52cce8d76317187fe01af2aa (diff) |
sh: Fix overzealous checking in __ioremap()
Allow peripherals before the start of RAM to be remapped.
Signed-off-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh/mm/ioremap_32.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/sh/mm/ioremap_32.c b/arch/sh/mm/ioremap_32.c index da2f4186f2cd..c3250614e3ae 100644 --- a/arch/sh/mm/ioremap_32.c +++ b/arch/sh/mm/ioremap_32.c | |||
@@ -57,14 +57,6 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned long size, | |||
57 | if (is_pci_memory_fixed_range(phys_addr, size)) | 57 | if (is_pci_memory_fixed_range(phys_addr, size)) |
58 | return (void __iomem *)phys_addr; | 58 | return (void __iomem *)phys_addr; |
59 | 59 | ||
60 | #if !defined(CONFIG_PMB_FIXED) | ||
61 | /* | ||
62 | * Don't allow anybody to remap normal RAM that we're using.. | ||
63 | */ | ||
64 | if (phys_addr < virt_to_phys(high_memory)) | ||
65 | return NULL; | ||
66 | #endif | ||
67 | |||
68 | /* | 60 | /* |
69 | * Mappings have to be page-aligned | 61 | * Mappings have to be page-aligned |
70 | */ | 62 | */ |