From d56d9fb5c1e4fcc4832eea44dcd29a28ae4d68c0 Mon Sep 17 00:00:00 2001
From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Wed, 4 Aug 2010 17:48:40 +0200
Subject: [PATCH] --- yaml --- r: 207159 b: refs/heads/master c:
 2d495ebc55f0d5a7ac488716230d817d43818549 h: refs/heads/master i:   207157:
 306fc75bda8dcc098d0ee052e11a90f22a7f35c2   207155:
 df238876d70ee9194b1a30cf0be7d1d57371ea02   207151:
 a7bd46e5b9d24274e0f1942293f5e67b8d5dfc95 v: v3

---
 [refs]                     | 2 +-
 trunk/arch/cris/mm/fault.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 39ec1549ed2b..1dc91c5c42a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4e8a1813c7d65a7c28a3536da08444c21f2c37b
+refs/heads/master: 2d495ebc55f0d5a7ac488716230d817d43818549
diff --git a/trunk/arch/cris/mm/fault.c b/trunk/arch/cris/mm/fault.c
index 7705cd7cef36..9dcac8ec8fa0 100644
--- a/trunk/arch/cris/mm/fault.c
+++ b/trunk/arch/cris/mm/fault.c
@@ -12,6 +12,7 @@
 
 extern int find_fixup_code(struct pt_regs *);
 extern void die_if_kernel(const char *, struct pt_regs *, long);
+extern void show_registers(struct pt_regs *regs);
 
 /* debug of low-level TLB reload */
 #undef DEBUG
@@ -195,6 +196,11 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
 			"address %08lx at pc %08lx\n",
 			tsk->comm, tsk->pid,
 			address, instruction_pointer(regs));
+
+		/* With DPG on, we've already dumped registers above.  */
+		DPG(if (0))
+			show_registers(regs);
+
 #ifdef CONFIG_NO_SEGFAULT_TERMINATION
 		DECLARE_WAIT_QUEUE_HEAD(wq);
 		wait_event_interruptible(wq, 0 == 1);