diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-05-25 15:38:29 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-05-25 15:38:29 +0300 |
| commit | 14c03a4a757f4be3e81c5004ca72f809ab04e0b1 (patch) | |
| tree | bd2586eb8dab7e979aef0cf378037877521395ea /arch/powerpc | |
| parent | 09583dfed2cb9723da31601cb7080490c2e2e2d7 (diff) | |
| parent | 6779db970bd287bb35b28bd5dc256fd7aef19d1c (diff) | |
| download | linux-14c03a4a757f4be3e81c5004ca72f809ab04e0b1.tar.xz | |
Merge back reboot/poweroff notifiers rework for 5.19-rc1.
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/xmon/xmon.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 518ae5aa9410..1b586577e75b 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -161,9 +161,7 @@ void machine_restart(char *cmd) void machine_power_off(void) { machine_shutdown(); - if (pm_power_off) - pm_power_off(); - + do_kernel_power_off(); smp_send_stop(); machine_hang(); } diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index fd72753e8ad5..c916bf250796 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -1243,8 +1243,7 @@ static void bootcmds(void) } else if (cmd == 'h') { ppc_md.halt(); } else if (cmd == 'p') { - if (pm_power_off) - pm_power_off(); + do_kernel_power_off(); } } |