From b0a16d0ade070c1e26d919d9d4e622331278c3cc Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Sun, 21 Sep 2008 12:11:25 +0900
Subject: [PATCH] --- yaml --- r: 116144 b: refs/heads/master c:
 8f2baee28093ea77c7cc8da45049fd94cc76998e h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/arch/sh/mm/fault_32.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index cebb56d0fab1..4cf28e3c01d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 887f1ae3bc1701604a7b5ef145e1021072675444
+refs/heads/master: 8f2baee28093ea77c7cc8da45049fd94cc76998e
diff --git a/trunk/arch/sh/mm/fault_32.c b/trunk/arch/sh/mm/fault_32.c
index ef01f45daa8a..08a08ea5d69f 100644
--- a/trunk/arch/sh/mm/fault_32.c
+++ b/trunk/arch/sh/mm/fault_32.c
@@ -53,13 +53,10 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
 	int fault;
 	siginfo_t info;
 
-	if (notify_page_fault(regs, lookup_exception_vector()))
-		return;
-
-#ifdef CONFIG_SH_KGDB
-	if (kgdb_nofault && kgdb_bus_err_hook)
-		kgdb_bus_err_hook();
-#endif
+	/*
+	 * We don't bother with any notifier callbacks here, as they are
+	 * all handled through the __do_page_fault() fast-path.
+	 */
 
 	tsk = current;
 	si_code = SEGV_MAPERR;