From f41afa70df3da190a6d088cc5053986210b29834 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 3 Mar 2008 20:07:22 +0200
Subject: [PATCH] --- yaml --- r: 86890 b: refs/heads/master c:
 9dad6f5785a9f113dbbd58951d2f5ef9abd06dcc h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/ia64/kernel/kprobes.c | 5 +++++
 trunk/include/asm-ia64/kprobes.h | 4 ----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 21f55ccf89b3..4867acd5c9ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 956d6cad87abdfaef35fa4fc2f2e4ac5bb4ee7a5
+refs/heads/master: 9dad6f5785a9f113dbbd58951d2f5ef9abd06dcc
diff --git a/trunk/arch/ia64/kernel/kprobes.c b/trunk/arch/ia64/kernel/kprobes.c
index b618487cdc85..615c3d2b6348 100644
--- a/trunk/arch/ia64/kernel/kprobes.c
+++ b/trunk/arch/ia64/kernel/kprobes.c
@@ -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();
diff --git a/trunk/include/asm-ia64/kprobes.h b/trunk/include/asm-ia64/kprobes.h
index a93ce9ef07ff..49684b65c187 100644
--- a/trunk/include/asm-ia64/kprobes.h
+++ b/trunk/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);