From 985ef6b2108ed28ffd5f6630e1e0fce2e2a775f2 Mon Sep 17 00:00:00 2001
From: Anton Arapov <anton@redhat.com>
Date: Wed, 12 Sep 2012 09:18:33 +0200
Subject: fedora kernel: 021ce7bee3cfdcbf16da1256b2c9f40f7e9bbd9e

Signed-off-by: Anton Arapov <anton@redhat.com>
---
 arch/sh/mm/fault.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'arch/sh')

diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c
index 1fc25d85e51..3bdc1ad9a34 100644
--- a/arch/sh/mm/fault.c
+++ b/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,
-- 
cgit