diff options
author | Jan Beulich <jbeulich@novell.com> | 2011-07-19 14:10:15 +0100 |
---|---|---|
committer | Jan Beulich <jbeulich@novell.com> | 2011-07-19 14:10:15 +0100 |
commit | e4c3755d4dd746511a87b9f7da7199fcd3ee0333 (patch) | |
tree | f00b8a7eb9c7b933c758dc08ef1178bd822883c2 /xen/arch/x86/shutdown.c | |
parent | ab8112740cd909f09f21ae7f9c50f05172110151 (diff) | |
download | xen-e4c3755d4dd746511a87b9f7da7199fcd3ee0333.tar.gz xen-e4c3755d4dd746511a87b9f7da7199fcd3ee0333.tar.bz2 xen-e4c3755d4dd746511a87b9f7da7199fcd3ee0333.zip |
x86-64/EFI: don't call EfiResetSystem() from machine_halt()
c/s 23615:d19e77844267 was a little too eager in adding calls to EFI
runtime services: machine_halt() doesn't really want to power off the
machine, but that's what EfiResetSystem(EfiResetShutdown, ...) (called
through efi_halt_system()) does.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'xen/arch/x86/shutdown.c')
-rw-r--r-- | xen/arch/x86/shutdown.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 5b9ed97c3d..ca31d3b48b 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -96,7 +96,6 @@ void machine_halt(void) watchdog_disable(); console_start_sync(); local_irq_enable(); - efi_halt_system(); smp_call_function(__machine_halt, NULL, 0); __machine_halt(NULL); } |