diff options
author | Alex Nixon <alex.nixon@citrix.com> | 2008-08-22 11:52:13 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 10:59:19 +0200 |
commit | a21f5d88c17a40941f6239d1959d89e8493e8e01 (patch) | |
tree | 767f763a4e05afa4b0e89192730db47e58c1180b /arch/x86/kernel/smpboot.c | |
parent | 379002586368ae22916f668011c9118c8ce8189c (diff) | |
download | linux-a21f5d88c17a40941f6239d1959d89e8493e8e01.tar.gz linux-a21f5d88c17a40941f6239d1959d89e8493e8e01.tar.bz2 linux-a21f5d88c17a40941f6239d1959d89e8493e8e01.zip |
x86: unify x86_32 and x86_64 play_dead into one function
Add the new play_dead into smpboot.c, as it fits more cleanly in there
alongside other CONFIG_HOTPLUG functions.
Separate out the common code into its own function.
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/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index c414cee296ba..28b4287296aa 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1402,6 +1402,29 @@ void native_cpu_die(unsigned int cpu) } printk(KERN_ERR "CPU %u didn't die...\n", cpu); } + +void play_dead_common(void) +{ + idle_task_exit(); + reset_lazy_tlbstate(); + irq_ctx_exit(raw_smp_processor_id()); + + mb(); + /* Ack it */ + __get_cpu_var(cpu_state) = CPU_DEAD; + + /* + * With physical CPU hotplug, we should halt the cpu + */ + local_irq_disable(); +} + +void native_play_dead(void) +{ + play_dead_common(); + wbinvd_halt(); +} + #else /* ... !CONFIG_HOTPLUG_CPU */ int native_cpu_disable(void) { @@ -1413,4 +1436,10 @@ void native_cpu_die(unsigned int cpu) /* We said "no" in __cpu_disable */ BUG(); } + +void native_play_dead(void) +{ + BUG(); +} + #endif |