aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/smp.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-26 12:21:46 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-26 12:21:46 -0500
commitea3d5226f52ef30f52aa0a04f47f5919c7facacf (patch)
tree090a48a6f6b2934d32a641ec6e61b3dc59a48514 /arch/i386/kernel/smp.c
parent9654640d0af8f2de40ff3807d3695109d3463f54 (diff)
Revert "[PATCH] i386: add idle notifier"
This reverts commit 2ff2d3d74705d34ab71b21f54634fcf50d57bdd5. Uwe Bugla reports that he cannot mount a floppy drive any more, and Jiri Slaby bisected it down to this commit. Benjamin LaHaise also points out that this is a big hot-path, and that interrupt delivery while idle is very common and should not go through all these expensive gyrations. Fix up conflicts in arch/i386/kernel/apic.c and arch/i386/kernel/irq.c due to other unrelated irq changes. Cc: Stephane Eranian <eranian@hpl.hp.com> Cc: Andi Kleen <ak@suse.de> Cc: Andrew Morton <akpm@osdl.org> Cc: Uwe Bugla <uwe.bugla@gmx.de> Cc: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386/kernel/smp.c')
-rw-r--r--arch/i386/kernel/smp.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/i386/kernel/smp.c b/arch/i386/kernel/smp.c
index 9bd9637ae692..0e8977871b1f 100644
--- a/arch/i386/kernel/smp.c
+++ b/arch/i386/kernel/smp.c
@@ -23,7 +23,6 @@
23 23
24#include <asm/mtrr.h> 24#include <asm/mtrr.h>
25#include <asm/tlbflush.h> 25#include <asm/tlbflush.h>
26#include <asm/idle.h>
27#include <mach_apic.h> 26#include <mach_apic.h>
28 27
29/* 28/*
@@ -624,7 +623,6 @@ fastcall void smp_call_function_interrupt(struct pt_regs *regs)
624 /* 623 /*
625 * At this point the info structure may be out of scope unless wait==1 624 * At this point the info structure may be out of scope unless wait==1
626 */ 625 */
627 exit_idle();
628 irq_enter(); 626 irq_enter();
629 (*func)(info); 627 (*func)(info);
630 irq_exit(); 628 irq_exit();