diff options
author | Ivan Vecera <ivecera@redhat.com> | 2008-11-11 08:33:44 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 08:50:02 -0500 |
commit | d3ec5cae0921611ceae06464ef6291012dd9849f (patch) | |
tree | 81a84f184f9047b12895bbd91c1e8b1ff2e076f0 /arch/x86/kernel/reboot.c | |
parent | 3ad4f597058301c97f362e500a32f63f5c950a45 (diff) |
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.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 724adfc63cb9..34f8d37ae3c5 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
@@ -461,6 +461,11 @@ static void native_machine_restart(char *__unused) | |||
461 | 461 | ||
462 | static void native_machine_halt(void) | 462 | static void native_machine_halt(void) |
463 | { | 463 | { |
464 | /* stop other cpus and apics */ | ||
465 | machine_shutdown(); | ||
466 | |||
467 | /* stop this cpu */ | ||
468 | stop_this_cpu(NULL); | ||
464 | } | 469 | } |
465 | 470 | ||
466 | static void native_machine_power_off(void) | 471 | static void native_machine_power_off(void) |