diff options
| author | Olaf Hering <olaf@aepfle.de> | 2006-08-21 18:11:32 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-25 13:30:26 +1000 |
| commit | 39ed2fe62c39ac46cda00b1759806a297f38743b (patch) | |
| tree | 9afdbd66064c97a2a4951c93f3675a54146ac973 | |
| parent | e2bf2e26c0915d54208315fc8c9864f1d987217a (diff) | |
| download | linux-3.10-39ed2fe62c39ac46cda00b1759806a297f38743b.tar.gz linux-3.10-39ed2fe62c39ac46cda00b1759806a297f38743b.tar.bz2 linux-3.10-39ed2fe62c39ac46cda00b1759806a297f38743b.zip | |
[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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 6b0699b82b4..6ef80d4e38d 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -628,6 +628,9 @@ void rtas_os_term(char *str) { int status; + if (panic_timeout) + return; + if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term")) return; |