diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-03-03 13:07:22 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-03-04 17:35:42 -0500 |
commit | 9dad6f5785a9f113dbbd58951d2f5ef9abd06dcc (patch) | |
tree | bed6cc599356679cd5eb4f201592c8348faa4f9b /include/asm-ia64 | |
parent | 956d6cad87abdfaef35fa4fc2f2e4ac5bb4ee7a5 (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>
Diffstat (limited to 'include/asm-ia64')
-rw-r--r-- | include/asm-ia64/kprobes.h | 4 |
1 files changed, 0 insertions, 4 deletions
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); | |||
122 | extern int kprobe_exceptions_notify(struct notifier_block *self, | 122 | extern 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 */ | ||
126 | static inline void jprobe_return(void) | ||
127 | { | ||
128 | } | ||
129 | extern void invalidate_stacked_regs(void); | 125 | extern void invalidate_stacked_regs(void); |
130 | extern void flush_register_stack(void); | 126 | extern void flush_register_stack(void); |
131 | extern void arch_remove_kprobe(struct kprobe *p); | 127 | extern void arch_remove_kprobe(struct kprobe *p); |