summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2023-05-22 22:57:30 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-05-30 12:42:13 +0100
commit8dacf0f4af4ddc9ccfdaca285192a3d630de1158 (patch)
treebd90c658a7e421af033e9493b455287a815e3415
parent2d82d6a14df6493acc41b9bbffd7cf0b46e02701 (diff)
downloadlinux-stable-8dacf0f4af4ddc9ccfdaca285192a3d630de1158.tar.gz
linux-stable-8dacf0f4af4ddc9ccfdaca285192a3d630de1158.tar.bz2
linux-stable-8dacf0f4af4ddc9ccfdaca285192a3d630de1158.zip
parisc: Allow to reboot machine after system halt
commit 2028315cf59bb899a5ac7e87dc48ecb8fac7ac24 upstream. In case a machine can't power-off itself on system shutdown, allow the user to reboot it by pressing the RETURN key. Cc: <stable@vger.kernel.org> # v4.14+ Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/parisc/kernel/process.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 97c206734e24..80592603caaa 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -138,13 +138,18 @@ void machine_power_off(void)
/* It seems we have no way to power the system off via
* software. The user has to press the button himself. */
- printk(KERN_EMERG "System shut down completed.\n"
- "Please power this system off now.");
+ printk("Power off or press RETURN to reboot.\n");
/* prevent soft lockup/stalled CPU messages for endless loop. */
rcu_sysrq_start();
lockup_detector_soft_poweroff();
- for (;;);
+ while (1) {
+ /* reboot if user presses RETURN key */
+ if (pdc_iodc_getc() == 13) {
+ printk("Rebooting...\n");
+ machine_restart(NULL);
+ }
+ }
}
void (*pm_power_off)(void);