aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2010-02-26 16:37:45 -0500
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>2010-02-26 16:37:32 -0500
commit22e0a0467292222214d1974d9bc2664a6c05980d (patch)
tree3dc034224808491393daa151d51c0c8b2f60b490 /arch/s390
parent52499f40267e1178b3b2c887aee85c0c9fd01ec0 (diff)
[S390] use kprobes_built_in() in mm/fault code
Use kprobes_built_in() to avoid ifdefs like most other architectures do. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/mm/fault.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 8af5b3cbed50..3040d7c78fe0 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -60,15 +60,13 @@ static inline int notify_page_fault(struct pt_regs *regs)
60{ 60{
61 int ret = 0; 61 int ret = 0;
62 62
63#ifdef CONFIG_KPROBES
64 /* kprobe_running() needs smp_processor_id() */ 63 /* kprobe_running() needs smp_processor_id() */
65 if (!user_mode(regs)) { 64 if (kprobes_built_in() && !user_mode(regs)) {
66 preempt_disable(); 65 preempt_disable();
67 if (kprobe_running() && kprobe_fault_handler(regs, 14)) 66 if (kprobe_running() && kprobe_fault_handler(regs, 14))
68 ret = 1; 67 ret = 1;
69 preempt_enable(); 68 preempt_enable();
70 } 69 }
71#endif
72 return ret; 70 return ret;
73} 71}
74 72