---

yaml --- r: 98040 b: refs/heads/master c: 4461145 h: refs/heads/master v: v3
git-mirror · Jun 12, 2008 · 55282a7 · 55282a7
1 parent 2b45147
commit 55282a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;							\