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;