[tip:x86/apic] x86: Remove unnecessary mdelay() from cpu_disable_common()

[tip-bot for Suresh Siddha]

Commit-ID:  6d20792e85187b27ae3d1b76678a2dd7025e8bc2
Gitweb:     http://git.kernel.org/tip/6d20792e85187b27ae3d1b76678a2dd7025e8bc2
Author:     Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
AuthorDate: Tue, 1 Dec 2009 15:31:18 -0800
Committer:  Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 2 Dec 2009 10:11:02 +0100

x86: Remove unnecessary mdelay() from cpu_disable_common()

fixup_irqs() already has a mdelay(). Remove the extra and
unnecessary mdelay() from cpu_disable_common().

Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Cc: Maciej W. Rozycki <macro@xxxxxxxxxxxxxx>
Cc: ebiederm@xxxxxxxxxxxx
Cc: garyhade@xxxxxxxxxx
LKML-Reference: <20091201233335.232177348@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
 arch/x86/kernel/smpboot.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 565ebc6..324f2a4 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1250,16 +1250,7 @@ static void __ref remove_cpu_from_maps(int cpu)
 void cpu_disable_common(void)
 {
 	int cpu = smp_processor_id();
-	/*
-	 * HACK:
-	 * Allow any queued timer interrupts to get serviced
-	 * This is only a temporary solution until we cleanup
-	 * fixup_irqs as we do for IA64.
-	 */
-	local_irq_enable();
-	mdelay(1);
 
-	local_irq_disable();
 	remove_siblinginfo(cpu);
 
 	/* It's now safe to remove this processor from the online map */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/