diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-05-30 15:41:11 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-05-30 15:41:11 +0200 |
| commit | 9f9c1f6844bdacb4a011cc69e19b929997038f4f (patch) | |
| tree | 969c031e572de35941d1b8147f4b4f309791d78f /arch/arm64 | |
| parent | 1cdc5ba06dcea1f1008c497fca34c42be9bc6a1d (diff) | |
| parent | da007f171fc9dd993d03a360b515cac1c87921bb (diff) | |
| download | linux-9f9c1f6844bdacb4a011cc69e19b929997038f4f.tar.bz2 | |
Merge branch 'pm-sysoff'
Merge system power off handling rework from Dmitry Osipenko for
5.19-rc1.
This introduces a mechanism allowing power sequences to be used for
powering off the system and makes related changes in platform-specific
code for multiple platforms.
* pm-sysoff: (29 commits)
kernel/reboot: Change registration order of legacy power-off handler
m68k: virt: Switch to new sys-off handler API
kernel/reboot: Add devm_register_restart_handler()
kernel/reboot: Add devm_register_power_off_handler()
soc/tegra: pmc: Use sys-off handler API to power off Nexus 7 properly
reboot: Remove pm_power_off_prepare()
regulator: pfuze100: Use devm_register_sys_off_handler()
ACPI: power: Switch to sys-off handler API
memory: emif: Use kernel_can_power_off()
mips: Use do_kernel_power_off()
ia64: Use do_kernel_power_off()
x86: Use do_kernel_power_off()
sh: Use do_kernel_power_off()
m68k: Switch to new sys-off handler API
powerpc: Use do_kernel_power_off()
xen/x86: Use do_kernel_power_off()
parisc: Use do_kernel_power_off()
arm64: Use do_kernel_power_off()
riscv: Use do_kernel_power_off()
csky: Use do_kernel_power_off()
...
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/process.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 9734c9fb1a32..2f42123e059f 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -111,8 +111,7 @@ void machine_power_off(void) { local_irq_disable(); smp_send_stop(); - if (pm_power_off) - pm_power_off(); + do_kernel_power_off(); } /* |