]> err.no Git - linux-2.6/commitdiff
[S390] Make use of kretprobe_assert.
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Mon, 21 May 2007 09:25:22 +0000 (11:25 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 21 May 2007 09:25:28 +0000 (11:25 +0200)
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

index e39333ae0fcf29fb5312beb5342b1841e4781a3b..358d2bbbc48105854d67fac55c33f2ce943bbbb0 100644 (file)
@@ -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();