The patch titled
kprobes-the-on-off-knob-thru-debugfs-updated s390 fix
has been removed from the -mm tree. Its filename was
kprobes-the-on-off-knob-thru-debugfs-updated-s390-fix.patch
This patch was dropped because it was folded into kprobes-the-on-off-knob-thru-debugfs-updated.patch
------------------------------------------------------
Subject: kprobes-the-on-off-knob-thru-debugfs-updated s390 fix
From: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Add the missing arch_trampoline_kprobe() for s390.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/s390/kernel/kprobes.c | 7 +++++++
1 files changed, 7 insertions(+)
diff -puN arch/s390/kernel/kprobes.c~kprobes-the-on-off-knob-thru-debugfs-updated-s390-fix arch/s390/kernel/kprobes.c
--- a/arch/s390/kernel/kprobes.c~kprobes-the-on-off-knob-thru-debugfs-updated-s390-fix
+++ a/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;
+}
_
Patches currently in -mm which might be from cornelia.huck@xxxxxxxxxx are
origin.patch
partitions-check-the-return-value-of-kobject_add-etc.patch
kprobes-the-on-off-knob-thru-debugfs-updated.patch
kprobes-the-on-off-knob-thru-debugfs-updated-s390-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
