git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
traps.c
diff --git
a/arch/s390/kernel/traps.c
b/arch/s390/kernel/traps.c
index
a65d2e8
..
a63d34c
100644
(file)
--- a/
arch/s390/kernel/traps.c
+++ b/
arch/s390/kernel/traps.c
@@
-331,7
+331,7
@@
void __kprobes do_per_trap(struct pt_regs *regs)
{
if (notify_die(DIE_SSTEP, "sstep", regs, 0, 0, SIGTRAP) == NOTIFY_STOP)
return;
{
if (notify_die(DIE_SSTEP, "sstep", regs, 0, 0, SIGTRAP) == NOTIFY_STOP)
return;
- if (
tracehook_consider_fatal_signal(current, SIGTRAP)
)
+ if (
current->ptrace
)
force_sig(SIGTRAP, current);
}
force_sig(SIGTRAP, current);
}
@@
-425,7
+425,7
@@
static void __kprobes illegal_op(struct pt_regs *regs, long pgm_int_code,
if (get_user(*((__u16 *) opcode), (__u16 __user *) location))
return;
if (*((__u16 *) opcode) == S390_BREAKPOINT_U16) {
if (get_user(*((__u16 *) opcode), (__u16 __user *) location))
return;
if (*((__u16 *) opcode) == S390_BREAKPOINT_U16) {
- if (
tracehook_consider_fatal_signal(current, SIGTRAP)
)
+ if (
current->ptrace
)
force_sig(SIGTRAP, current);
else
signal = SIGILL;
force_sig(SIGTRAP, current);
else
signal = SIGILL;