diff --git a/[refs] b/[refs]
index 4e884a16ebd5..53dadb73a5b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb53e9f3ea859a6d59c37b500593b970aa8562e6
+refs/heads/master: 4461145ef1be92851c230f858f6b6f457c99670f
diff --git a/trunk/arch/x86/kernel/traps_32.c b/trunk/arch/x86/kernel/traps_32.c
index bde6f63e15d5..08d752de4eee 100644
--- a/trunk/arch/x86/kernel/traps_32.c
+++ b/trunk/arch/x86/kernel/traps_32.c
@@ -544,6 +544,7 @@ do_trap(int trapnr, int signr, char *str, int vm86, struct pt_regs *regs,
 #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;							\