From 336b219479b5fa0ac462be92b10e7abaa8bb7d9f Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt@console-pimps.org>
Date: Tue, 6 Oct 2009 21:22:27 +0000
Subject: [PATCH] --- yaml --- r: 167163 b: refs/heads/master c:
 2bea7ea7d57fd0022f4cd08ed3d4eb2d39a2920d h: refs/heads/master i:   167161:
 050e612248117508df67134f2bf833418a25d34f   167159:
 77b2ea74d0fb7b6b81c7e9d399fbfe91c20aea3b v: v3

---
 [refs]                        | 2 +-
 trunk/arch/sh/mm/ioremap_32.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5c3ece548ff3..f43f46b2aae1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc2bdefdde89b54d8fcde7bbf7d0adc0ce5cb044
+refs/heads/master: 2bea7ea7d57fd0022f4cd08ed3d4eb2d39a2920d
diff --git a/trunk/arch/sh/mm/ioremap_32.c b/trunk/arch/sh/mm/ioremap_32.c
index c3250614e3ae..a86eaa9d75a5 100644
--- a/trunk/arch/sh/mm/ioremap_32.c
+++ b/trunk/arch/sh/mm/ioremap_32.c
@@ -83,7 +83,7 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
 	 *
 	 * PMB entries are all pre-faulted.
 	 */
-	if (unlikely(size >= 0x1000000)) {
+	if (unlikely(phys_addr >= P1SEG)) {
 		unsigned long mapped = pmb_remap(addr, phys_addr, size, flags);
 
 		if (likely(mapped)) {