Revert "PM: ACPI: reboot: Use S5 for reboot"

This reverts commit a7374e101939b094735eb0dcdd2c20f50e9dcab7.

This patch causes a panic when rebooting my Dell Poweredge r440.  I do
not have the full panic log as it's lost at that stage of the reboot and
I do not have a serial console.  Reverting this patch makes my system
able to reboot again.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/kernel/reboot.c b/kernel/reboot.c
index eb1b158507616f9c738b3bc52c2eb93c15fdfb19..a6ad5eb2fa733fe2fd43e959c9a9fccd6c7dbb4a 100644 (file)
--- a/kernel/reboot.c
+++ b/kernel/reboot.c
@@ -244,8 +244,6 @@ void migrate_to_reboot_cpu(void)
 void kernel_restart(char *cmd)
 {
        kernel_restart_prepare(cmd);
-       if (pm_power_off_prepare)
-               pm_power_off_prepare();
        migrate_to_reboot_cpu();
        syscore_shutdown();
        if (!cmd)