From d34590299dd38f419cb0a3296b040f939776f535 Mon Sep 17 00:00:00 2001
From: Alexander van Heukelum <heukelum@fastmail.fm>
Date: Fri, 26 Sep 2008 14:03:04 +0200
Subject: [PATCH] --- yaml --- r: 113540 b: refs/heads/master c:
 4b986a365253b57d8ab4ed7b796ba0893ff4c05c h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/traps_64.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 288844ff284e..31d60bf9fb39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e61a7932495e37685e95ec9a59ad08810dec959
+refs/heads/master: 4b986a365253b57d8ab4ed7b796ba0893ff4c05c
diff --git a/trunk/arch/x86/kernel/traps_64.c b/trunk/arch/x86/kernel/traps_64.c
index 9c0ac0cab013..9f487f374c72 100644
--- a/trunk/arch/x86/kernel/traps_64.c
+++ b/trunk/arch/x86/kernel/traps_64.c
@@ -658,7 +658,6 @@ 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;							\