From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 5 Feb 2007 20:17:32 +0000 (+0100)
Subject: [S390] kretprobe_trampoline_holder() in wrong section.
X-Git-Tag: v2.6.21-rc1~92^2~41^2~17
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=d42335a33b2ca2406d57bb8f0cf00adbdda8cede;p=powerpc.git

[S390] kretprobe_trampoline_holder() in wrong section.

kretprobe_trampoline_holder() is in kprobes section but used to
register a kprobe in arch_init_kprobes(). Hence register_kprobe()
and therefore arch_init_kprobes() will fail.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 70db60cbe4..b2e1dc89a8 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -356,7 +356,7 @@ no_kprobe:
  *	- When the probed function returns, this probe
  *		causes the handlers to fire
  */
-void __kprobes kretprobe_trampoline_holder(void)
+void kretprobe_trampoline_holder(void)
 {
 	asm volatile(".global kretprobe_trampoline\n"
 		     "kretprobe_trampoline: bcr 0,0\n");