---

yaml --- r: 191629 b: refs/heads/master c: c7b03fa h: refs/heads/master i: 191627: 02e932c v: v3
git-mirror · Apr 25, 2010 · 2d9ac3a · 2d9ac3a
1 parent 5a2bdcd
commit 2d9ac3a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;