diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-01-05 06:48:10 -0500 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2011-01-05 06:47:31 -0500 |
commit | 5e9a26928f550157563cfc06ce12c4ae121a02ec (patch) | |
tree | fc58668f8c6151a5f58c0430f92a0691d727af42 /arch/s390/kernel/traps.c | |
parent | da7f51c11d5fedca9ba779ee220063ccb4f0a27e (diff) |
[S390] ptrace cleanup
Overhaul program event recording and the code dealing with the ptrace
user space interface.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/traps.c')
-rw-r--r-- | arch/s390/kernel/traps.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c index 4f0cecb4f9e0..5eb78dd584ce 100644 --- a/arch/s390/kernel/traps.c +++ b/arch/s390/kernel/traps.c | |||
@@ -365,12 +365,10 @@ static inline void __user *get_psw_address(struct pt_regs *regs, | |||
365 | ((regs->psw.addr - (pgm_int_code >> 16)) & PSW_ADDR_INSN); | 365 | ((regs->psw.addr - (pgm_int_code >> 16)) & PSW_ADDR_INSN); |
366 | } | 366 | } |
367 | 367 | ||
368 | void __kprobes do_single_step(struct pt_regs *regs) | 368 | void __kprobes do_per_trap(struct pt_regs *regs) |
369 | { | 369 | { |
370 | if (notify_die(DIE_SSTEP, "sstep", regs, 0, 0, | 370 | if (notify_die(DIE_SSTEP, "sstep", regs, 0, 0, SIGTRAP) == NOTIFY_STOP) |
371 | SIGTRAP) == NOTIFY_STOP){ | ||
372 | return; | 371 | return; |
373 | } | ||
374 | if (tracehook_consider_fatal_signal(current, SIGTRAP)) | 372 | if (tracehook_consider_fatal_signal(current, SIGTRAP)) |
375 | force_sig(SIGTRAP, current); | 373 | force_sig(SIGTRAP, current); |
376 | } | 374 | } |