diff options
author | Matt Fleming <matt@console-pimps.org> | 2009-10-06 17:22:27 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-08 22:25:10 -0400 |
commit | 2bea7ea7d57fd0022f4cd08ed3d4eb2d39a2920d (patch) | |
tree | bb7d17a61903a5dd8d87bffb8bd13cf789bb83b4 /arch/sh | |
parent | fc2bdefdde89b54d8fcde7bbf7d0adc0ce5cb044 (diff) |
sh: Try PMB mapping based on physical address, not mapping size
We should favour PMB mappings when the physical address cannot be
reached with 29-bits.
Signed-off-by: Matt Fleming <matt@console-pimps.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/mm/ioremap_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/ioremap_32.c b/arch/sh/mm/ioremap_32.c index c3250614e3ae..a86eaa9d75a5 100644 --- a/arch/sh/mm/ioremap_32.c +++ b/arch/sh/mm/ioremap_32.c | |||
@@ -83,7 +83,7 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned long size, | |||
83 | * | 83 | * |
84 | * PMB entries are all pre-faulted. | 84 | * PMB entries are all pre-faulted. |
85 | */ | 85 | */ |
86 | if (unlikely(size >= 0x1000000)) { | 86 | if (unlikely(phys_addr >= P1SEG)) { |
87 | unsigned long mapped = pmb_remap(addr, phys_addr, size, flags); | 87 | unsigned long mapped = pmb_remap(addr, phys_addr, size, flags); |
88 | 88 | ||
89 | if (likely(mapped)) { | 89 | if (likely(mapped)) { |