Commit 45e18c22 authored by Harvey Harrison's avatar Harvey Harrison Committed by Tony Luck

[IA64] kprobes arch consolidation build fix

ia64 named their handler kprobes_fault_handler while all other
arches used kprobe_fault_handler.  Change the function definition
and header declaration.
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 818c7e86
......@@ -838,7 +838,7 @@ out:
return 1;
}
int __kprobes kprobes_fault_handler(struct pt_regs *regs, int trapnr)
int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
{
struct kprobe *cur = kprobe_running();
struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
......
......@@ -26,7 +26,7 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
if (!user_mode(regs)) {
/* kprobe_running() needs smp_processor_id() */
preempt_disable();
if (kprobe_running() && kprobes_fault_handler(regs, trap))
if (kprobe_running() && kprobe_fault_handler(regs, trap))
ret = 1;
preempt_enable();
}
......
......@@ -117,7 +117,7 @@ struct arch_specific_insn {
unsigned short slot;
};
extern int kprobes_fault_handler(struct pt_regs *regs, int trapnr);
extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
extern int kprobe_exceptions_notify(struct notifier_block *self,
unsigned long val, void *data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment