aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/process_32.c
diff options
context:
space:
mode:
authorAlex Nixon <alex.nixon@citrix.com>2008-08-22 11:52:12 +0100
committerIngo Molnar <mingo@elte.hu>2008-08-25 10:59:18 +0200
commit379002586368ae22916f668011c9118c8ce8189c (patch)
tree875144461ee68d5c960061c202d6ddc01750ee82 /arch/x86/kernel/process_32.c
parent93be71b672f167b1e8c23725114f86305354f0ac (diff)
x86_32: clean up play_dead
The removal of the CPU from the various maps was redundant as it already happened in cpu_disable. After cleaning this up, cpu_uninit only resets the tlb state, so rename it and create a noop version for the X86_64 case (so the two play_deads can be unified later). Signed-off-by: Alex Nixon <alex.nixon@citrix.com> Acked-by: Jeremy Fitzhardinge <jeremy@goop.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/process_32.c')
-rw-r--r--arch/x86/kernel/process_32.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index e382fe0ccd6..d55eb49584b 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -75,26 +75,17 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
#ifdef CONFIG_HOTPLUG_CPU
#include <asm/nmi.h>
-static void cpu_exit_clear(void)
+/* We don't actually take CPU down, just spin without interrupts. */
+void native_play_dead(void)
{
int cpu = raw_smp_processor_id();
idle_task_exit();
- cpu_uninit();
- irq_ctx_exit(cpu);
+ reset_lazy_tlbstate();
- cpu_clear(cpu, cpu_callout_map);
- cpu_clear(cpu, cpu_callin_map);
-
- numa_remove_cpu(cpu);
-}
+ irq_ctx_exit(cpu);
-/* We don't actually take CPU down, just spin without interrupts. */
-void native_play_dead(void)
-{
- /* This must be done before dead CPU ack */
- cpu_exit_clear();
mb();
/* Ack it */
__get_cpu_var(cpu_state) = CPU_DEAD;