---

yaml --- r: 321218 b: refs/heads/master c: 90eed7d h: refs/heads/master v: v3
git-mirror · Jul 25, 2012 · 24c98d0 · 24c98d0
1 parent 759f0dd
commit 24c98d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92f53a85db3730ae088aaeb7900f85909fd1eda6
+refs/heads/master: 90eed7d87b748f9c0d11b9bad64a4c41e31b78c4
diff --git a/trunk/arch/sh/mm/fault.c b/trunk/arch/sh/mm/fault.c
@@ -58,11 +58,15 @@ static void show_pte(struct mm_struct *mm, unsigned long addr)
 {
 	pgd_t *pgd;
 
-	if (mm)
+	if (mm) {
 		pgd = mm->pgd;
-	else
+	} else {
 		pgd = get_TTB();
 
+		if (unlikely(!pgd))
+			pgd = swapper_pg_dir;
+	}
+
 	printk(KERN_ALERT "pgd = %p\n", pgd);
 	pgd += pgd_index(addr);
 	printk(KERN_ALERT "[%08lx] *pgd=%0*Lx", addr,