diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2007-02-05 21:17:29 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-02-05 21:17:29 +0100 |
| commit | 35df8d53f5c951ac0cd79f1084e6787ca5980207 (patch) | |
| tree | fc8d2abc161da739be40af49dfd0773aa8841a67 | |
| parent | d58140cc18b3d69e86dead47aab5c838c08dc37e (diff) | |
| download | kernel_goldelico_gta04-35df8d53f5c951ac0cd79f1084e6787ca5980207.zip kernel_goldelico_gta04-35df8d53f5c951ac0cd79f1084e6787ca5980207.tar.gz kernel_goldelico_gta04-35df8d53f5c951ac0cd79f1084e6787ca5980207.tar.bz2 | |
[S390] Fix kprobes breakpoint handling.
In case of an illegal op the die notifier gets called with DIE_TRAP
instead of DIE_BPT first.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | arch/s390/kernel/traps.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c index aa0d7ee..f0e5a32 100644 --- a/arch/s390/kernel/traps.c +++ b/arch/s390/kernel/traps.c @@ -490,8 +490,15 @@ static void illegal_op(struct pt_regs * regs, long interruption_code) #endif } else signal = SIGILL; - } else - signal = SIGILL; + } else { + /* + * If we get an illegal op in kernel mode, send it through the + * kprobes notifier. If kprobes doesn't pick it up, SIGILL + */ + if (notify_die(DIE_BPT, "bpt", regs, interruption_code, + 3, SIGTRAP) != NOTIFY_STOP) + signal = SIGILL; + } #ifdef CONFIG_MATHEMU if (signal == SIGFPE) |