From 02b3f370ee4d0d897f7cc79931eba7fff5dfdbb3 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 21 May 2007 11:25:22 +0200 Subject: [PATCH] --- yaml --- r: 56715 b: refs/heads/master c: a5a60a2beea07c23e242ad8e7398e761935d669a h: refs/heads/master i: 56713: a6886dfd4f2beeae3eb265fecdc260a8f69752ea 56711: 80116010e926cad047a3e2fcd2f6188a963862d5 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/kprobes.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 96635e3ff293..203d1d79b7c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 913f11ee48edfa78b531e0db9385b640fbf9f6d7 +refs/heads/master: a5a60a2beea07c23e242ad8e7398e761935d669a diff --git a/trunk/arch/s390/kernel/kprobes.c b/trunk/arch/s390/kernel/kprobes.c index e39333ae0fcf..358d2bbbc481 100644 --- a/trunk/arch/s390/kernel/kprobes.c +++ b/trunk/arch/s390/kernel/kprobes.c @@ -413,7 +413,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p, break; } } - BUG_ON(!orig_ret_address || (orig_ret_address == trampoline_address)); + kretprobe_assert(ri, orig_ret_address, trampoline_address); regs->psw.addr = orig_ret_address | PSW_ADDR_AMODE; reset_current_kprobe();