Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/ia64/kernel/kprobes.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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();

arch/ia64/mm/fault.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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();

	}

	}

include/asm-ia64/kprobes.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);