diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:16:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:16:46 +0200 |
| commit | cb9aa97c21c59ad01c9514d7faf45dc166fba226 (patch) | |
| tree | 66a530f154db78b85f5b1406ebc51401df8d3913 /arch/x86/kernel/traps_32.c | |
| parent | 668a6c3654560aef8741642478973e205a4f02bf (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into tracing/mmiotrace-mergefixups
Diffstat (limited to 'arch/x86/kernel/traps_32.c')
| -rw-r--r-- | arch/x86/kernel/traps_32.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index bde6f63e15d..08d752de4ee 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c @@ -544,6 +544,7 @@ vm86_trap: #define DO_ERROR(trapnr, signr, str, name) \ void do_##name(struct pt_regs *regs, long error_code) \ { \ + trace_hardirqs_fixup(); \ if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ == NOTIFY_STOP) \ return; \ |