diff --git a/[refs] b/[refs]
index a37063d6b6ca..ffef39e3d09e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b1c870f19849235b8c7e4dfe2ec6b0d691fa9d7
+refs/heads/master: a491503e4d0cb739f409069826e2746e38826099
diff --git a/trunk/arch/x86/kernel/traps_64.c b/trunk/arch/x86/kernel/traps_64.c
index 7d56c875dd03..7d59559c2dff 100644
--- a/trunk/arch/x86/kernel/traps_64.c
+++ b/trunk/arch/x86/kernel/traps_64.c
@@ -899,8 +899,6 @@ asmlinkage void __kprobes do_debug(struct pt_regs *regs,
 	unsigned long condition;
 	siginfo_t info;
 
-	trace_hardirqs_fixup();
-
 	get_debugreg(condition, 6);
 
 	/*