aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/mm/fault.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64/mm/fault.c')
-rw-r--r--arch/ia64/mm/fault.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index 3c3a283d3172..c2f299fe9e04 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -21,28 +21,6 @@
21 21
22extern int die(char *, struct pt_regs *, long); 22extern int die(char *, struct pt_regs *, long);
23 23
24#ifdef CONFIG_KPROBES
25static inline int notify_page_fault(struct pt_regs *regs, int trap)
26{
27 int ret = 0;
28
29 if (!user_mode(regs)) {
30 /* kprobe_running() needs smp_processor_id() */
31 preempt_disable();
32 if (kprobe_running() && kprobe_fault_handler(regs, trap))
33 ret = 1;
34 preempt_enable();
35 }
36
37 return ret;
38}
39#else
40static inline int notify_page_fault(struct pt_regs *regs, int trap)
41{
42 return 0;
43}
44#endif
45
46/* 24/*
47 * Return TRUE if ADDRESS points at a page in the kernel's mapped segment 25 * Return TRUE if ADDRESS points at a page in the kernel's mapped segment
48 * (inside region 5, on ia64) and that page is present. 26 * (inside region 5, on ia64) and that page is present.
@@ -116,7 +94,7 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
116 /* 94 /*
117 * This is to handle the kprobes on user space access instructions 95 * This is to handle the kprobes on user space access instructions
118 */ 96 */
119 if (notify_page_fault(regs, TRAP_BRKPT)) 97 if (kprobe_page_fault(regs, TRAP_BRKPT))
120 return; 98 return;
121 99
122 if (user_mode(regs)) 100 if (user_mode(regs))