---

yaml --- r: 34087 b: refs/heads/master c: 39ed2fe h: refs/heads/master i: 34085: c813483 34083: 6162bfd 34079: e332790 v: v3
git-mirror · Aug 25, 2006 · 1867648 · 1867648
1 parent 5a80ac5
commit 1867648
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;
-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
@@ Expand Down @@