From 0eaecec027d1225fe8aeea0d990d357c7053d7d9 Mon Sep 17 00:00:00 2001
From: Alexander van Heukelum <heukelum@fastmail.fm>
Date: Fri, 26 Sep 2008 14:03:07 +0200
Subject: [PATCH] --- yaml --- r: 113543 b: refs/heads/master c:
 69c89b5bf7f253756f3056e84b8603abe1c50f5b h: refs/heads/master i:   113541:
 ad5511e2e7218d45f0a36fcd98c934a4e280d022   113539:
 3e2b50d362de70c513253edcead700fabd8a5d45   113535:
 dcfe9fd81e15347830438ebe6ef0ea521f2d66d9 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/x86/mm/fault.c        |  5 -----
 trunk/include/asm-x86/irqflags.h | 21 ---------------------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index ffef39e3d09e..fdc24e9fe709 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a491503e4d0cb739f409069826e2746e38826099
+refs/heads/master: 69c89b5bf7f253756f3056e84b8603abe1c50f5b
diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c
index a742d753d5b0..3f2b8962cbd0 100644
--- a/trunk/arch/x86/mm/fault.c
+++ b/trunk/arch/x86/mm/fault.c
@@ -592,11 +592,6 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
 	unsigned long flags;
 #endif
 
-	/*
-	 * We can fault from pretty much anywhere, with unknown IRQ state.
-	 */
-	trace_hardirqs_fixup();
-
 	tsk = current;
 	mm = tsk->mm;
 	prefetchw(&mm->mmap_sem);
diff --git a/trunk/include/asm-x86/irqflags.h b/trunk/include/asm-x86/irqflags.h
index 424acb48cd61..2bdab21f0898 100644
--- a/trunk/include/asm-x86/irqflags.h
+++ b/trunk/include/asm-x86/irqflags.h
@@ -166,27 +166,6 @@ static inline int raw_irqs_disabled(void)
 	return raw_irqs_disabled_flags(flags);
 }
 
-/*
- * makes the traced hardirq state match with the machine state
- *
- * should be a rarely used function, only in places where its
- * otherwise impossible to know the irq state, like in traps.
- */
-static inline void trace_hardirqs_fixup_flags(unsigned long flags)
-{
-	if (raw_irqs_disabled_flags(flags))
-		trace_hardirqs_off();
-	else
-		trace_hardirqs_on();
-}
-
-static inline void trace_hardirqs_fixup(void)
-{
-	unsigned long flags = __raw_local_save_flags();
-
-	trace_hardirqs_fixup_flags(flags);
-}
-
 #else
 
 #ifdef CONFIG_X86_64