diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-07-04 19:50:10 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-04 19:50:10 +0200 |
| commit | c63c3105e4991b2991ba73a742b8b59bfdbe4acd (patch) | |
| tree | f059af5b7c9b14f1af343e1c9a1f172062a16202 | |
| parent | Merge branches 'sh/hwblk', 'sh/cpuidle' and 'sh/stable-updates' (diff) | |
| download | linux-c63c3105e4991b2991ba73a742b8b59bfdbe4acd.tar.xz linux-c63c3105e4991b2991ba73a742b8b59bfdbe4acd.zip | |
sh: use kprobes_built_in() for notify_page_fault().
Kill off the KPROBES ifdef, as per x86.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/mm/fault_32.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sh/mm/fault_32.c b/arch/sh/mm/fault_32.c index 71925946f1e1..ce75b8882efb 100644 --- a/arch/sh/mm/fault_32.c +++ b/arch/sh/mm/fault_32.c @@ -25,14 +25,12 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap) { int ret = 0; -#ifdef CONFIG_KPROBES - if (!user_mode(regs)) { + if (kprobes_built_in() && !user_mode(regs)) { preempt_disable(); if (kprobe_running() && kprobe_fault_handler(regs, trap)) ret = 1; preempt_enable(); } -#endif return ret; } |