diff mbox series

[1/1] Revert "PM: ACPI: reboot: Use S5 for reboot"

Message ID 20220325195634.3817039-2-jeffrey.lane@canonical.com
State New
Headers show
Series Revert "PM: ACPI: reboot: Use S5 for reboot" which causes Bus Fatal Error when rebooting system with BCM5720 NIC | expand

Commit Message

Jeff Lane March 25, 2022, 7:56 p.m. UTC 
From: Josef Bacik <josef@toxicpanda.com>

BugLink: https://bugs.launchpad.net/bugs/1917471

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>
(cherry picked from commit 9d3fcb28f9b9750b474811a2964ce022df56336e)
Signed-off-by: Jeff Lane <jeffrey.lane@canonical.com>
---
 kernel/reboot.c | 2 --
 1 file changed, 2 deletions(-)
diff mbox series

Patch

diff --git a/kernel/reboot.c b/kernel/reboot.c
index 838e4310e01c..ac19159d7158 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)