diff --git a/[refs] b/[refs]
index a989eedc2ba6..cab134f74753 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ad06dd6f1ec745c5ee0e37ec26b1b817f88507a
+refs/heads/master: e7cb016e5a3163e2999d8715390d64eb46816655
diff --git a/trunk/arch/sh/kernel/kprobes.c b/trunk/arch/sh/kernel/kprobes.c
index c4f4a0923eb9..ac6074942fd6 100644
--- a/trunk/arch/sh/kernel/kprobes.c
+++ b/trunk/arch/sh/kernel/kprobes.c
@@ -277,7 +277,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
  * here. When a retprobed function returns, this probe is hit and
  * trampoline_probe_handler() runs, calling the kretprobe's handler.
  */
-void kretprobe_trampoline_holder(void)
+static void __used kretprobe_trampoline_holder(void)
 {
 	asm volatile ("kretprobe_trampoline: \n" "nop\n");
 }