| Message ID | 1412100056-15517-14-git-send-email-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 17962e6..c5514aa 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -651,6 +651,10 @@ static void native_machine_power_off(void) if (!reboot_force) machine_shutdown(); pm_power_off(); + } else { + if (!reboot_force) + machine_shutdown(); + do_kernel_poweroff(); } /* A fallback in case there is no PM info available */ tboot_shutdown(TB_SHUTDOWN_HALT);
The kernel core now supports a poweroff handler call chain to remove power from the system. Call it if pm_power_off is set to NULL. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- arch/x86/kernel/reboot.c | 4 ++++ 1 file changed, 4 insertions(+)