summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2017-03-18 17:13:27 +0100
committerHelge Deller <deller@gmx.de>2017-03-18 17:27:45 +0100
commit73580dac7618e4bcd21679f553cf3c97323fec46 (patch)
treeff973c428ccfd92a2476fee7bdd9759badf2ba57
parentparisc: perf: Fix potential NULL pointer dereference (diff)
downloadlinux-73580dac7618e4bcd21679f553cf3c97323fec46.tar.xz
linux-73580dac7618e4bcd21679f553cf3c97323fec46.zip
parisc: Fix system shutdown halt
On those parisc machines which don't provide a software power off function, the system currently kills the init process at the end of a shutdown and unexpectedly restarts insteads of halting. Fix it by adding a loop which will not return. Signed-off-by: Helge Deller <deller@gmx.de> Cc: stable@vger.kernel.org # 4.9+
-rw-r--r--arch/parisc/kernel/process.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 06f7ca7fe70b..b76f503eee4a 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -142,6 +142,8 @@ void machine_power_off(void)
printk(KERN_EMERG "System shut down completed.\n"
"Please power this system off now.");
+
+ for (;;);
}
void (*pm_power_off)(void) = machine_power_off;