Merge branch 'misc' into for-linus

[linux-2.6-microblaze.git] / arch / x86 / include / asm / apic.h

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index a5a0bcf..0c5fbc6 100644 (file)
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -11,7 +11,6 @@
 #include <asm/fixmap.h>
 #include <asm/mpspec.h>
 #include <asm/msr.h>
-#include <asm/idle.h>
 
 #define ARCH_APICTIMER_STOPS_ON_C3     1
 
@@ -640,7 +639,6 @@ extern void irq_exit(void);
 static inline void entering_irq(void)
 {
        irq_enter();
-       exit_idle();
 }
 
 static inline void entering_ack_irq(void)