diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-05-25 14:38:29 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-05-25 14:38:29 +0200 |
| commit | 14c03a4a757f4be3e81c5004ca72f809ab04e0b1 (patch) | |
| tree | bd2586eb8dab7e979aef0cf378037877521395ea /arch/mips | |
| parent | Merge tag 'pm-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | kernel/reboot: Add devm_register_restart_handler() (diff) | |
| download | linux-dev-14c03a4a757f4be3e81c5004ca72f809ab04e0b1.tar.xz linux-dev-14c03a4a757f4be3e81c5004ca72f809ab04e0b1.zip | |
Merge back reboot/poweroff notifiers rework for 5.19-rc1.
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/reset.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c index 6288780b779e..e7ce07b3e79b 100644 --- a/arch/mips/kernel/reset.c +++ b/arch/mips/kernel/reset.c @@ -114,8 +114,7 @@ void machine_halt(void) void machine_power_off(void) { - if (pm_power_off) - pm_power_off(); + do_kernel_power_off(); #ifdef CONFIG_SMP preempt_disable(); |