diff options
| -rw-r--r-- | arch/x86/kernel/traps_32.c | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/traps_64.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index c88bbffcaa03..02d1e1e58e81 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c | |||
| @@ -541,6 +541,7 @@ fastcall void do_##name(struct pt_regs * regs, long error_code) \ | |||
| 541 | info.si_errno = 0; \ | 541 | info.si_errno = 0; \ |
| 542 | info.si_code = sicode; \ | 542 | info.si_code = sicode; \ |
| 543 | info.si_addr = (void __user *)siaddr; \ | 543 | info.si_addr = (void __user *)siaddr; \ |
| 544 | trace_hardirqs_fixup(); \ | ||
| 544 | if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ | 545 | if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ |
| 545 | == NOTIFY_STOP) \ | 546 | == NOTIFY_STOP) \ |
| 546 | return; \ | 547 | return; \ |
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index d11525ad81b4..cc68b92316cd 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c | |||
| @@ -635,6 +635,7 @@ asmlinkage void do_##name(struct pt_regs * regs, long error_code) \ | |||
| 635 | info.si_errno = 0; \ | 635 | info.si_errno = 0; \ |
| 636 | info.si_code = sicode; \ | 636 | info.si_code = sicode; \ |
| 637 | info.si_addr = (void __user *)siaddr; \ | 637 | info.si_addr = (void __user *)siaddr; \ |
| 638 | trace_hardirqs_fixup(); \ | ||
| 638 | if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ | 639 | if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ |
| 639 | == NOTIFY_STOP) \ | 640 | == NOTIFY_STOP) \ |
| 640 | return; \ | 641 | return; \ |