From 2d9ac3adc42e49400987c28302452be8a5744bbd Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt@console-pimps.org>
Date: Sun, 25 Apr 2010 17:29:07 +0100
Subject: [PATCH] --- yaml --- r: 191629 b: refs/heads/master c:
 c7b03fa0bdc04e00bfbdc4cc69da144b11108f37 h: refs/heads/master i:   191627:
 02e932c6c9572d676ecf9618aa428f19ca280a4f v: v3

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

diff --git a/[refs] b/[refs]
index 86b037bd5f0e..4cd392f261f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c3d936352fefaadec57bafda1fe3807890cbf2c
+refs/heads/master: c7b03fa0bdc04e00bfbdc4cc69da144b11108f37
diff --git a/trunk/arch/sh/mm/pmb.c b/trunk/arch/sh/mm/pmb.c
index 3cc21933063b..c0fdc217ece5 100644
--- a/trunk/arch/sh/mm/pmb.c
+++ b/trunk/arch/sh/mm/pmb.c
@@ -681,7 +681,7 @@ static void __init pmb_merge(struct pmb_entry *head)
 	/*
 	 * The merged page size must be valid.
 	 */
-	if (!pmb_size_valid(newsize))
+	if (!depth || !pmb_size_valid(newsize))
 		return;
 
 	head->flags &= ~PMB_SZ_MASK;