Skip to contentSkip to conversation

add arch_trampoline_kprobe.

S390 Martin Schwidefsky 2 participants 3 messages Apr 20, 2007 s390

lore
Share & tools
lore
#0 lore raw

From: Martin Schwidefsky <[email protected]>

Add the missing arch_trampoline_kprobe function for s390 required by kprobes-the-on-off-knob-thru-debugfs-updated.patch.

Cc Ananth N Mavinakayanahalli <[email protected]>
Cc Srinivasa DS <[email protected]>
Cc Andrew Morton <[email protected]>

---

 arch/s390/kernel/kprobes.c |    7 +++++++
 1 files changed, 7 insertions(+)
arch/s390/kernel/kprobes.c +7 -0
diff -urpN linux-2.6/arch/s390/kernel/kprobes.c linux-2.6-patched/arch/s390/kernel/kprobes.c
@@ -658,6 +658,13 @@ static struct kprobe trampoline_p = {
 	.pre_handler = trampoline_probe_handler
 };
 
+int __kprobes arch_trampoline_kprobe(struct kprobe *p)
+{
+	if (p->addr == (kprobe_opcode_t *)&kretprobe_trampoline)
+		return 1;
+	return 0;
+}
+
 int __init arch_init_kprobes(void)
 {
 	return register_kprobe(&trampoline_p);
#1 lore raw
Quoted 4 lines · Martin Schwidefsky

From: Martin Schwidefsky <[email protected]>

Add the missing arch_trampoline_kprobe function for s390 required by kprobes-the-on-off-knob-thru-debugfs-updated.patch.

Martin,

Cornelia provided this patch sometime earlier
(http://marc.info/?l=linux-kernel&m=117620748921086&w=2). Andrew has picked it up into -mm.

Ananth

Quoted 27 lines
Cc Ananth N Mavinakayanahalli <[email protected]>
Cc Srinivasa DS <[email protected]>
Cc Andrew Morton <[email protected]>

---

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

diff -urpN linux-2.6/arch/s390/kernel/kprobes.c linux-2.6-patched/arch/s390/kernel/kprobes.c

arch/s390/kernel/kprobes.c +7 -0
@@ -658,6 +658,13 @@ static struct kprobe trampoline_p = {
 	.pre_handler = trampoline_probe_handler
 };
 
+int __kprobes arch_trampoline_kprobe(struct kprobe *p)
+{
+	if (p->addr == (kprobe_opcode_t *)&kretprobe_trampoline)
+		return 1;
+	return 0;
+}
+
 int __init arch_init_kprobes(void)
 {
 	return register_kprobe(&trampoline_p);
#2 lore raw
Quoted 3 lines · Ananth N Mavinakayanahalli

Cornelia provided this patch sometime earlier
(http://marc.info/?l=linux-kernel&m=117620748921086&w=2). Andrew has picked it up into -mm.

Ok, good. The latest version of -mm on kernel.org did not have it yet.

Signature · 8 lines
blue skies,              IBM Deutschland Entwicklung GmbH
   Martin                Vorsitzender des Aufsichtsrats: Johann Weihen
                         Geschäftsführung: Herbert Kircher
Martin Schwidefsky       Sitz der Gesellschaft: Böblingen
Linux on zSeries         Registergericht: Amtsgericht Stuttgart,
   Development           HRB 243294

"Reality continues to ruin my life." - Calvin.