Re: 2.6.21-rc6-mm1

Cornelia Huck
2007-04-10T12:22:06Z

On Sun, 8 Apr 2007 14:35:59 -0700,
Andrew Morton <akpm@linux-foundation.org> wrote:

> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.21-rc6/2.6.21-rc6-mm1/

> +kprobes-the-on-off-knob-thru-debugfs-updated.patch
> +kprobes-the-on-off-knob-thru-debugfs-updated-fix.patch
>
> kprobes work

Add the missing arch_trampoline_kprobe() for s390.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>

---
arch/s390/kernel/kprobes.c | 7 +++++++
1 files changed, 7 insertions(+)

--- linux-2.6.21-rc6-mm1.orig/arch/s390/kernel/kprobes.c
+++ linux-2.6.21-rc6-mm1/arch/s390/kernel/kprobes.c
@@ -662,3 +662,10 @@ int __init arch_init_kprobes(void)
{
return register_kprobe(&trampoline_p);
}
+
+int __kprobes arch_trampoline_kprobe(struct kprobe *p)
+{
+ if (p->addr == (kprobe_opcode_t *) & kretprobe_trampoline)
+ return 1;
+ return 0;
+}