From a1aa4e18ef8db4a46bbdd7c4b0443b2baeda56fb Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 16 Jan 2008 09:51:59 +0100 Subject: [PATCH] --- yaml --- r: 75522 b: refs/heads/master c: fb1dac909d94ff807cd833d340c6827c3a957159 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/traps_32.c | 1 + trunk/arch/x86/kernel/traps_64.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ebd8b5e7f5ea..1b1909a35df3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb13ba873881abd5e15af784756a61af635e665e +refs/heads/master: fb1dac909d94ff807cd833d340c6827c3a957159 diff --git a/trunk/arch/x86/kernel/traps_32.c b/trunk/arch/x86/kernel/traps_32.c index c88bbffcaa03..02d1e1e58e81 100644 --- a/trunk/arch/x86/kernel/traps_32.c +++ b/trunk/arch/x86/kernel/traps_32.c @@ -541,6 +541,7 @@ fastcall void do_##name(struct pt_regs * regs, long error_code) \ info.si_errno = 0; \ info.si_code = sicode; \ info.si_addr = (void __user *)siaddr; \ + trace_hardirqs_fixup(); \ if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ == NOTIFY_STOP) \ return; \ diff --git a/trunk/arch/x86/kernel/traps_64.c b/trunk/arch/x86/kernel/traps_64.c index d11525ad81b4..cc68b92316cd 100644 --- a/trunk/arch/x86/kernel/traps_64.c +++ b/trunk/arch/x86/kernel/traps_64.c @@ -635,6 +635,7 @@ asmlinkage void do_##name(struct pt_regs * regs, long error_code) \ info.si_errno = 0; \ info.si_code = sicode; \ info.si_addr = (void __user *)siaddr; \ + trace_hardirqs_fixup(); \ if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ == NOTIFY_STOP) \ return; \