From 50404a284a3c2d2bc174d5f3add54443b607a6f4 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt@console-pimps.org>
Date: Tue, 6 Oct 2009 21:22:34 +0000
Subject: [PATCH] --- yaml --- r: 167164 b: refs/heads/master c:
 a2767cfb1d9d97c3f861743f1ad595a80b75ec99 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/arch/sh/mm/pmb.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f43f46b2aae1..bbf765fb66b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bea7ea7d57fd0022f4cd08ed3d4eb2d39a2920d
+refs/heads/master: a2767cfb1d9d97c3f861743f1ad595a80b75ec99
diff --git a/trunk/arch/sh/mm/pmb.c b/trunk/arch/sh/mm/pmb.c
index 58f935896b44..aade31102112 100644
--- a/trunk/arch/sh/mm/pmb.c
+++ b/trunk/arch/sh/mm/pmb.c
@@ -269,6 +269,13 @@ long pmb_remap(unsigned long vaddr, unsigned long phys,
 			pmbp->link = pmbe;
 
 		pmbp = pmbe;
+
+		/*
+		 * Instead of trying smaller sizes on every iteration
+		 * (even if we succeed in allocating space), try using
+		 * pmb_sizes[i].size again.
+		 */
+		i--;
 	}
 
 	if (size >= 0x1000000)