From 69e4060449884ee2457c59816c68e9744ad38921 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 9 Sep 2008 08:13:28 +0900
Subject: [PATCH] --- yaml --- r: 116112 b: refs/heads/master c:
 6eb2139b3dc3e1c5181a7cdf83a517c57c34bb12 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/sh/kernel/kprobes.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f9bb00a8090a..ce3d0f3daa1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61098a086671e2d386104e562fb7cd97cc197d1b
+refs/heads/master: 6eb2139b3dc3e1c5181a7cdf83a517c57c34bb12
diff --git a/trunk/arch/sh/kernel/kprobes.c b/trunk/arch/sh/kernel/kprobes.c
index e357e3669a34..c96850b061fb 100644
--- a/trunk/arch/sh/kernel/kprobes.c
+++ b/trunk/arch/sh/kernel/kprobes.c
@@ -290,7 +290,9 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
  */
 static void __used kretprobe_trampoline_holder(void)
 {
-	asm volatile ("kretprobe_trampoline: \n" "nop\n");
+	asm volatile (".globl kretprobe_trampoline\n"
+		      "kretprobe_trampoline:\n\t"
+		      "nop\n");
 }
 
 /*