From: Josef Bacik <josef@toxicpanda.com>
Date: Wed, 17 Mar 2021 02:17:48 +0000 (-0400)
Subject: Revert "PM: ACPI: reboot: Use S5 for reboot"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9d3fcb28f9b9750b474811a2964ce022df56336e;p=linux.git

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

This reverts commit d60cd06331a3566d3305b3c7b566e79edf4e2095.

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 eb1b158507616..a6ad5eb2fa733 100644
--- 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)