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/m68k/kernel | |
| parent | 09583dfed2cb9723da31601cb7080490c2e2e2d7 (diff) | |
| parent | 6779db970bd287bb35b28bd5dc256fd7aef19d1c (diff) | |
| download | linux-14c03a4a757f4be3e81c5004ca72f809ab04e0b1.tar.gz linux-14c03a4a757f4be3e81c5004ca72f809ab04e0b1.tar.bz2 linux-14c03a4a757f4be3e81c5004ca72f809ab04e0b1.zip | |
Merge back reboot/poweroff notifiers rework for 5.19-rc1.
Diffstat (limited to 'arch/m68k/kernel')
| -rw-r--r-- | arch/m68k/kernel/process.c | 5 | ||||
| -rw-r--r-- | arch/m68k/kernel/setup_mm.c | 1 | ||||
| -rw-r--r-- | arch/m68k/kernel/setup_no.c | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index a6030dbaa089..e160a7c57bd3 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c @@ -67,12 +67,11 @@ void machine_halt(void) void machine_power_off(void) { - if (mach_power_off) - mach_power_off(); + do_kernel_power_off(); for (;;); } -void (*pm_power_off)(void) = machine_power_off; +void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); void show_regs(struct pt_regs * regs) diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index 78ab562beb31..42691abcd908 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -98,7 +98,6 @@ EXPORT_SYMBOL(mach_get_rtc_pll); EXPORT_SYMBOL(mach_set_rtc_pll); void (*mach_reset)( void ); void (*mach_halt)( void ); -void (*mach_power_off)( void ); #ifdef CONFIG_HEARTBEAT void (*mach_heartbeat) (int); EXPORT_SYMBOL(mach_heartbeat); diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c index 5e4104f07a44..00bf82258233 100644 --- a/arch/m68k/kernel/setup_no.c +++ b/arch/m68k/kernel/setup_no.c @@ -55,7 +55,6 @@ int (*mach_hwclk) (int, struct rtc_time*); /* machine dependent reboot functions */ void (*mach_reset)(void); void (*mach_halt)(void); -void (*mach_power_off)(void); #ifdef CONFIG_M68000 #if defined(CONFIG_M68328) |