diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2007-05-21 05:25:22 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-05-21 05:25:28 -0400 |
commit | a5a60a2beea07c23e242ad8e7398e761935d669a (patch) | |
tree | b02137d156f9dc0c9594191ddd64b2dfa51a6112 /arch | |
parent | 913f11ee48edfa78b531e0db9385b640fbf9f6d7 (diff) |
[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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/s390/kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c index e39333ae0fcf..358d2bbbc481 100644 --- a/arch/s390/kernel/kprobes.c +++ b/arch/s390/kernel/kprobes.c | |||
@@ -413,7 +413,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p, | |||
413 | break; | 413 | break; |
414 | } | 414 | } |
415 | } | 415 | } |
416 | BUG_ON(!orig_ret_address || (orig_ret_address == trampoline_address)); | 416 | kretprobe_assert(ri, orig_ret_address, trampoline_address); |
417 | regs->psw.addr = orig_ret_address | PSW_ADDR_AMODE; | 417 | regs->psw.addr = orig_ret_address | PSW_ADDR_AMODE; |
418 | 418 | ||
419 | reset_current_kprobe(); | 419 | reset_current_kprobe(); |