summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-03-03 19:07:22 +0100
committerTony Luck <tony.luck@intel.com>2008-03-04 23:35:42 +0100
commit9dad6f5785a9f113dbbd58951d2f5ef9abd06dcc (patch)
treebed6cc599356679cd5eb4f201592c8348faa4f9b /include
parent[IA64] move gcc_intrin.h from header-y to unifdef-y (diff)
downloadlinux-9dad6f5785a9f113dbbd58951d2f5ef9abd06dcc.tar.xz
linux-9dad6f5785a9f113dbbd58951d2f5ef9abd06dcc.zip
[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')
-rw-r--r--include/asm-ia64/kprobes.h4
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);
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);