commit a5a60a2beea07c23e242ad8e7398e761935d669a
author Heiko Carstens <heiko.carstens@de.ibm.com> Mon May 21 11:25:22 2007 +0200
committer Martin Schwidefsky <schwidefsky@de.ibm.com> Mon May 21 11:25:28 2007 +0200
tree b02137d156f9dc0c9594191ddd64b2dfa51a6112
parent 913f11ee48edfa78b531e0db9385b640fbf9f6d7

[S390] Make use of kretprobe_assert.

s390 change for git commit 0f95b7fc839bc3272b1bf2325d8748a649bd3534.
That is print kprobes debug data before BUG().

Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Maneesh Soni <maneesh@in.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

arch/s390/kernel/kprobes.c

diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index e39333a..358d2bb 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -413,7 +413,7 @@
 			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();