From 1867648e3e0b16bf85264e9a178d17ae85a5a638 Mon Sep 17 00:00:00 2001
From: Olaf Hering <olaf@aepfle.de>
Date: Mon, 21 Aug 2006 18:11:32 +0200
Subject: [PATCH] --- yaml --- r: 34087 b: refs/heads/master c:
 39ed2fe62c39ac46cda00b1759806a297f38743b h: refs/heads/master i:   34085:
 c81348396fa360c90212a66bbba60b8e39adaf32   34083:
 6162bfd28f3bbb36eb70f39fa691ae625c22a04c   34079:
 e332790446b48bd9e9062a9f1613ed1cfce91c37 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/kernel/rtas.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e9322f0af1d1..2268ecf143cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2bf2e26c0915d54208315fc8c9864f1d987217a
+refs/heads/master: 39ed2fe62c39ac46cda00b1759806a297f38743b
diff --git a/trunk/arch/powerpc/kernel/rtas.c b/trunk/arch/powerpc/kernel/rtas.c
index 6b0699b82b41..6ef80d4e38d3 100644
--- a/trunk/arch/powerpc/kernel/rtas.c
+++ b/trunk/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;