Merge branch 'timers/urgent' into x86/xen

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / smpboot.c

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 66b04e598817f052b98ce9ee5ad9244278363144..06f1407d55423507c920b9d1c0c19827098cc057 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -52,6 +52,7 @@
 #include <asm/desc.h>
 #include <asm/nmi.h>
 #include <asm/irq.h>
+#include <asm/idle.h>
 #include <asm/smp.h>
 #include <asm/trampoline.h>
 #include <asm/cpu.h>
@@ -1414,6 +1415,7 @@ void play_dead_common(void)
        idle_task_exit();
        reset_lazy_tlbstate();
        irq_ctx_exit(raw_smp_processor_id());
+       c1e_remove_cpu(raw_smp_processor_id());
 
        mb();
        /* Ack it */