aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2006-08-21 12:11:32 -0400
committerPaul Mackerras <paulus@samba.org>2006-08-24 23:30:26 -0400
commit39ed2fe62c39ac46cda00b1759806a297f38743b (patch)
tree9afdbd66064c97a2a4951c93f3675a54146ac973
parente2bf2e26c0915d54208315fc8c9864f1d987217a (diff)
[POWERPC] reboot when panic_timout is set
Only call into RTAS when booted with panic=0 because the RTAS call does not return. The system has to be rebooted via the HMC or via the management console right now. This is cumbersome and not what the default panic=180 is supposed to do. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/kernel/rtas.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 6b0699b82b41..6ef80d4e38d3 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -628,6 +628,9 @@ void rtas_os_term(char *str)
628{ 628{
629 int status; 629 int status;
630 630
631 if (panic_timeout)
632 return;
633
631 if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term")) 634 if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term"))
632 return; 635 return;
633 636