diff options
Diffstat (limited to 'arch/sparc/mm')
| -rw-r--r-- | arch/sparc/mm/fault_64.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c index 83fda4d9c3b2..2371fb6b97e4 100644 --- a/arch/sparc/mm/fault_64.c +++ b/arch/sparc/mm/fault_64.c | |||
| @@ -38,20 +38,6 @@ | |||
| 38 | 38 | ||
| 39 | int show_unhandled_signals = 1; | 39 | int show_unhandled_signals = 1; |
| 40 | 40 | ||
| 41 | static inline __kprobes int notify_page_fault(struct pt_regs *regs) | ||
| 42 | { | ||
| 43 | int ret = 0; | ||
| 44 | |||
| 45 | /* kprobe_running() needs smp_processor_id() */ | ||
| 46 | if (kprobes_built_in() && !user_mode(regs)) { | ||
| 47 | preempt_disable(); | ||
| 48 | if (kprobe_running() && kprobe_fault_handler(regs, 0)) | ||
| 49 | ret = 1; | ||
| 50 | preempt_enable(); | ||
| 51 | } | ||
| 52 | return ret; | ||
| 53 | } | ||
| 54 | |||
| 55 | static void __kprobes unhandled_fault(unsigned long address, | 41 | static void __kprobes unhandled_fault(unsigned long address, |
| 56 | struct task_struct *tsk, | 42 | struct task_struct *tsk, |
| 57 | struct pt_regs *regs) | 43 | struct pt_regs *regs) |
| @@ -285,7 +271,7 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) | |||
| 285 | 271 | ||
| 286 | fault_code = get_thread_fault_code(); | 272 | fault_code = get_thread_fault_code(); |
| 287 | 273 | ||
| 288 | if (notify_page_fault(regs)) | 274 | if (kprobe_page_fault(regs, 0)) |
| 289 | goto exit_exception; | 275 | goto exit_exception; |
| 290 | 276 | ||
| 291 | si_code = SEGV_MAPERR; | 277 | si_code = SEGV_MAPERR; |
