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

Commit 9dad6f57 authored by Adrian Bunk's avatar Adrian Bunk Committed by Tony Luck
Browse files

[IA64] fix ia64 kprobes compilation 



This patch fixes the following compile error with a recent gcc:
  CC      kernel/kprobes.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/kprobes.c:1066: error: __ksymtab_jprobe_return causes a section type conflict

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 956d6cad

arch/ia64/kernel/kprobes.c

+5 −0
Original line number Diff line number Diff line
@@ -1001,6 +1001,11 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs) 
	return 1;

}



/* ia64 does not need this */

void __kprobes jprobe_return(void)

{

}



int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)

{

	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();

include/asm-ia64/kprobes.h

+0 −4
Original line number Diff line number Diff line
@@ -122,10 +122,6 @@ extern int kprobes_fault_handler(struct pt_regs *regs, int trapnr); 
extern int kprobe_exceptions_notify(struct notifier_block *self,

				    unsigned long val, void *data);



/* ia64 does not need this */

static inline void jprobe_return(void)

{

}

extern void invalidate_stacked_regs(void);

extern void flush_register_stack(void);

extern void arch_remove_kprobe(struct kprobe *p);