diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-19 10:00:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-19 10:00:10 -0700 |
| commit | ec85720933863015b1c26bc19cf4e044da139bc5 (patch) | |
| tree | cdc44a17f0d08bb00538300a45da67b717499b00 /kernel | |
| parent | 65a103747104368cb1ba6f097dcc3f85b1dcf86b (diff) | |
| parent | 49cb71a77ce760f20487c38f891aa3132bef782e (diff) | |
| download | cachepc-linux-ec85720933863015b1c26bc19cf4e044da139bc5.tar.gz cachepc-linux-ec85720933863015b1c26bc19cf4e044da139bc5.zip | |
Merge tag 'pm-5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki:
"Revert two problematic commits.
Specifics:
- Revert ACPI PM commit that attempted to improve reboot handling on
some systems, but it caused other systems to panic() during reboot
(Josef Bacik)
- Revert PM-runtime commit that attempted to improve the handling of
suppliers during PM-runtime suspend of a consumer device, but it
introduced a race condition potentially leading to unexpected
behavior (Rafael Wysocki)"
* tag 'pm-5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "PM: runtime: Update device status before letting suppliers suspend"
Revert "PM: ACPI: reboot: Use S5 for reboot"
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/reboot.c | 2 |
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) |