Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[IA64] kprobes arch consolidation build fix

Browse source 
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: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Harvey Harrison 2008-03-06 09:49:01 -08:00 • committed by Tony Luck
parent 818c7e866f
commit 45e18c228e
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/ia64/kernel/kprobes.c
View file

@ -838,7 +838,7 @@ static int __kprobes post_kprobes_handler(struct pt_regs *regs)
return 1; 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 *cur = kprobe_running();
struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();

2
arch/ia64/mm/fault.c
View file

@ -26,7 +26,7 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
if (!user_mode(regs)) { if (!user_mode(regs)) {
/* kprobe_running() needs smp_processor_id() */ /* kprobe_running() needs smp_processor_id() */
preempt_disable(); preempt_disable();
if (kprobe_running() && kprobes_fault_handler(regs, trap)) if (kprobe_running() && kprobe_fault_handler(regs, trap))
ret = 1; ret = 1;
preempt_enable(); preempt_enable();
} }

2
include/asm-ia64/kprobes.h
View file

@ -117,7 +117,7 @@ struct arch_specific_insn {
unsigned short slot; 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, extern int kprobe_exceptions_notify(struct notifier_block *self,
unsigned long val, void *data); unsigned long val, void *data);