From: Eric W. Biederman Date: Tue, 26 Jul 2005 18:14:16 +0000 (-0600) Subject: [PATCH] x86_64 sync machine_power_off with i386 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0963aba54aa26c89114dca7257acf8c938bfec8a;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [PATCH] x86_64 sync machine_power_off with i386 i386 machine_power_off was disabling the local apic and all of it's users wanted to be on the boot cpu. So call machine_shutdown which places us on the boot cpu and disables the apics. This keeps us in sync and reduces the number of cases we need to worry about in the power management code. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c index 3d1cc09406a6..47f95687905f 100644 --- a/arch/x86_64/kernel/reboot.c +++ b/arch/x86_64/kernel/reboot.c @@ -153,6 +153,9 @@ void machine_halt(void) void machine_power_off(void) { + if (!reboot_force) { + machine_shutdown(); + } if (pm_power_off) pm_power_off(); }