From 6bf307b883ff54afb0672a8e4489d62e8ed40309 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 10 Dec 2009 18:02:19 -0800
Subject: [PATCH] --- yaml --- r: 176432 b: refs/heads/master c:
 135d082171766922c6a9e2c741a326e518268428 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/sparc/mm/fault_64.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ef27eeee4939..9bbc79428592 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 936cf251787be41833afe2a1e44fbd5fb2adbdb6
+refs/heads/master: 135d082171766922c6a9e2c741a326e518268428
diff --git a/trunk/arch/sparc/mm/fault_64.c b/trunk/arch/sparc/mm/fault_64.c
index 43b0da96a4fb..0aa50b200af8 100644
--- a/trunk/arch/sparc/mm/fault_64.c
+++ b/trunk/arch/sparc/mm/fault_64.c
@@ -31,13 +31,12 @@
 #include <asm/sections.h>
 #include <asm/mmu_context.h>
 
-#ifdef CONFIG_KPROBES
 static inline int notify_page_fault(struct pt_regs *regs)
 {
 	int ret = 0;
 
 	/* kprobe_running() needs smp_processor_id() */
-	if (!user_mode(regs)) {
+	if (kprobes_built_in() && !user_mode(regs)) {
 		preempt_disable();
 		if (kprobe_running() && kprobe_fault_handler(regs, 0))
 			ret = 1;
@@ -45,12 +44,6 @@ static inline int notify_page_fault(struct pt_regs *regs)
 	}
 	return ret;
 }
-#else
-static inline int notify_page_fault(struct pt_regs *regs)
-{
-	return 0;
-}
-#endif
 
 static void __kprobes unhandled_fault(unsigned long address,
 				      struct task_struct *tsk,