summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/reboot.c
diff options
context:
space:
mode:
authorIvan Vecera <ivecera@redhat.com>2008-11-11 14:33:44 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-11 14:50:02 +0100
commitd3ec5cae0921611ceae06464ef6291012dd9849f (patch)
tree81a84f184f9047b12895bbd91c1e8b1ff2e076f0 /arch/x86/kernel/reboot.c
parent3ad4f597058301c97f362e500a32f63f5c950a45 (diff)
downloadop-kernel-dev-d3ec5cae0921611ceae06464ef6291012dd9849f.zip
op-kernel-dev-d3ec5cae0921611ceae06464ef6291012dd9849f.tar.gz
x86: call machine_shutdown and stop all CPUs in native_machine_halt
Impact: really halt all CPUs on halt Function machine_halt (resp. native_machine_halt) is empty for x86 architectures. When command 'halt -f' is invoked, the message "System halted." is displayed but this is not really true because all CPUs are still running. There are also similar inconsistencies for other arches (some uses power-off for halt or forever-loop with IRQs enabled/disabled). IMO there should be used the same approach for all architectures OR what does the message "System halted" really mean? This patch fixes it for x86. Signed-off-by: Ivan Vecera <ivecera@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/reboot.c')
-rw-r--r--arch/x86/kernel/reboot.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 724adfc..34f8d37 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -461,6 +461,11 @@ static void native_machine_restart(char *__unused)
static void native_machine_halt(void)
{
+ /* stop other cpus and apics */
+ machine_shutdown();
+
+ /* stop this cpu */
+ stop_this_cpu(NULL);
}
static void native_machine_power_off(void)
OpenPOWER on IntegriCloud