aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-03-03 13:07:22 -0500
committerTony Luck <tony.luck@intel.com>2008-03-04 17:35:42 -0500
commit9dad6f5785a9f113dbbd58951d2f5ef9abd06dcc (patch)
treebed6cc599356679cd5eb4f201592c8348faa4f9b
parent956d6cad87abdfaef35fa4fc2f2e4ac5bb4ee7a5 (diff)
[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: Adrian Bunk <bunk@kernel.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--arch/ia64/kernel/kprobes.c5
-rw-r--r--include/asm-ia64/kprobes.h4
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index b618487cdc85..615c3d2b6348 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -1001,6 +1001,11 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
1001 return 1; 1001 return 1;
1002} 1002}
1003 1003
1004/* ia64 does not need this */
1005void __kprobes jprobe_return(void)
1006{
1007}
1008
1004int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) 1009int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
1005{ 1010{
1006 struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); 1011 struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
diff --git a/include/asm-ia64/kprobes.h b/include/asm-ia64/kprobes.h
index a93ce9ef07ff..49684b65c187 100644
--- a/include/asm-ia64/kprobes.h
+++ b/include/asm-ia64/kprobes.h
@@ -122,10 +122,6 @@ extern int kprobes_fault_handler(struct pt_regs *regs, int trapnr);
122extern int kprobe_exceptions_notify(struct notifier_block *self, 122extern int kprobe_exceptions_notify(struct notifier_block *self,
123 unsigned long val, void *data); 123 unsigned long val, void *data);
124 124
125/* ia64 does not need this */
126static inline void jprobe_return(void)
127{
128}
129extern void invalidate_stacked_regs(void); 125extern void invalidate_stacked_regs(void);
130extern void flush_register_stack(void); 126extern void flush_register_stack(void);
131extern void arch_remove_kprobe(struct kprobe *p); 127extern void arch_remove_kprobe(struct kprobe *p);