summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-05-25 14:38:29 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-05-25 14:38:29 +0200
commit14c03a4a757f4be3e81c5004ca72f809ab04e0b1 (patch)
treebd2586eb8dab7e979aef0cf378037877521395ea /arch/arm/kernel
parentMerge tag 'pm-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafa... (diff)
parentkernel/reboot: Add devm_register_restart_handler() (diff)
downloadlinux-14c03a4a757f4be3e81c5004ca72f809ab04e0b1.tar.xz
linux-14c03a4a757f4be3e81c5004ca72f809ab04e0b1.zip
Merge back reboot/poweroff notifiers rework for 5.19-rc1.
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/reboot.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
index 3044fcb8d073..2cb943422554 100644
--- a/arch/arm/kernel/reboot.c
+++ b/arch/arm/kernel/reboot.c
@@ -116,9 +116,7 @@ void machine_power_off(void)
{
local_irq_disable();
smp_send_stop();
-
- if (pm_power_off)
- pm_power_off();
+ do_kernel_power_off();
}
/*