From: Paul Mundt <lethal@linux-sh.org>
Date: Sun, 21 Sep 2008 03:11:25 +0000 (+0900)
Subject: sh: Kill off duplicate page fault notifiers in slow path.
X-Git-Tag: v2.6.28-rc1~99^2~31
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8f2baee28093ea77c7cc8da45049fd94cc76998e;p=linux-2.6-omap-h63xx.git

sh: Kill off duplicate page fault notifiers in slow path.

We already have hooks in place in the __do_page_fault() fast-path,
so kill them off in the slow path.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/mm/fault_32.c b/arch/sh/mm/fault_32.c
index ef01f45daa8..08a08ea5d69 100644
--- a/arch/sh/mm/fault_32.c
+++ b/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;