summaryrefslogtreecommitdiff
path: root/arch/parisc
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2017-03-18 16:13:27 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-26 11:05:57 (GMT)
commit13695ce5b1024b38cfecbd334ec5ddcaac1b6807 (patch)
tree9a1086349d5aeecb6f6f442c07e0266c0a9f00f9 /arch/parisc
parenta690a42ae7b90ceb761816fb33ee39058962d58e (diff)
downloadlinux-13695ce5b1024b38cfecbd334ec5ddcaac1b6807.tar.xz
parisc: Fix system shutdown halt
commit 73580dac7618e4bcd21679f553cf3c97323fec46 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/parisc')
-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 4063943..e81afc37 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -139,6 +139,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;