瀏覽代碼

[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: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Harvey Harrison 17 年之前
父節點
當前提交
45e18c228e
共有 3 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      arch/ia64/kernel/kprobes.c
  2. 1 1
      arch/ia64/mm/fault.c
  3. 1 1
      include/asm-ia64/kprobes.h

+ 1 - 1
arch/ia64/kernel/kprobes.c

@@ -838,7 +838,7 @@ out:
 	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();

+ 1 - 1
arch/ia64/mm/fault.c

@@ -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();
 	}
 	}

+ 1 - 1
include/asm-ia64/kprobes.h

@@ -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);