From 6b9a9f9c98ed6d8190ab9abd338b54a56d55dcfa Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Tue, 26 Jul 2005 12:08:53 -0600 Subject: [PATCH] --- yaml --- r: 5057 b: refs/heads/master c: 4fa2564a6fde9815df969ef3547744a22f66ba9d h: refs/heads/master i: 5055: ffe914b48f816c07b71911b4937de2ce100892ce v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/reboot.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2b3562d24cb6..041ff1e6fc77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8e392e7c8f019657ff3ebe70a45d234990831db +refs/heads/master: 4fa2564a6fde9815df969ef3547744a22f66ba9d diff --git a/trunk/arch/i386/kernel/reboot.c b/trunk/arch/i386/kernel/reboot.c index 1049876702aa..c71fef31dc47 100644 --- a/trunk/arch/i386/kernel/reboot.c +++ b/trunk/arch/i386/kernel/reboot.c @@ -347,10 +347,8 @@ void machine_halt(void) void machine_power_off(void) { - lapic_shutdown(); + machine_shutdown(); - if (efi_enabled) - efi.reset_system(EFI_RESET_SHUTDOWN, EFI_SUCCESS, 0, NULL); if (pm_power_off) pm_power_off(); }