summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJosef Bacik <josef@toxicpanda.com>2021-03-16 22:17:48 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-03-18 16:58:02 +0100
commit9d3fcb28f9b9750b474811a2964ce022df56336e (patch)
treed9d49bd8eea74c47ee6aa2f16e314c839714927d /kernel
parent1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff)
downloadlinux-stable-9d3fcb28f9b9750b474811a2964ce022df56336e.tar.gz
linux-stable-9d3fcb28f9b9750b474811a2964ce022df56336e.tar.bz2
linux-stable-9d3fcb28f9b9750b474811a2964ce022df56336e.zip
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/reboot.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/reboot.c b/kernel/reboot.c
index eb1b15850761..a6ad5eb2fa73 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)