diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-12-20 23:47:18 +0100 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-12-20 23:47:18 +0100 |
| commit | a721aeac8bc2cade37e68ea195f28d2ed28c1130 (patch) | |
| tree | 34da931ad1d0d715c4fde89d19af67780e40a6aa /arch/sh/kernel/reboot.c | |
| parent | maple_tree: change return type of mas_split_final_node as void. (diff) | |
| parent | mailmap: add an old address for Naoya Horiguchi (diff) | |
| download | linux-a721aeac8bc2cade37e68ea195f28d2ed28c1130.tar.xz linux-a721aeac8bc2cade37e68ea195f28d2ed28c1130.zip | |
sync mm-stable with mm-hotfixes-stable to pick up depended-upon changes
Diffstat (limited to 'arch/sh/kernel/reboot.c')
| -rw-r--r-- | arch/sh/kernel/reboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/reboot.c b/arch/sh/kernel/reboot.c index e8eeedc9b182..1de006b1c339 100644 --- a/arch/sh/kernel/reboot.c +++ b/arch/sh/kernel/reboot.c @@ -63,7 +63,7 @@ struct machine_ops machine_ops = { .shutdown = native_machine_shutdown, .restart = native_machine_restart, .halt = native_machine_halt, -#ifdef CONFIG_KEXEC +#ifdef CONFIG_KEXEC_CORE .crash_shutdown = native_machine_crash_shutdown, #endif }; @@ -88,7 +88,7 @@ void machine_halt(void) machine_ops.halt(); } -#ifdef CONFIG_KEXEC +#ifdef CONFIG_KEXEC_CORE void machine_crash_shutdown(struct pt_regs *regs) { machine_ops.crash_shutdown(regs); |