---

yaml
---
r: 196607
b: refs/heads/master
c: e9bbc8c
h: refs/heads/master
i:
  196605: d995efa
  196603: 5743d26
  196599: 1850b60
  196591: b98ab9e
  196575: 73e3958
  196543: 68b4189
  196479: a81a123
  196351: e2fd336
  196095: fb7d86b
  195583: 32a9275
  194559: d61d5ef
  192511: 9325e2b
  188415: 57c45dd
  180223: d6ecfc0
  163839: 820908f
  131071: 5e1d553
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27f10907b7cca57df5e2a9c94c14354dd1b7879d
+refs/heads/master: e9bbc8cde0e3c33b42ddbe1b02108cb5c97275eb

trunk/arch/powerpc/kernel/rtas.c

@@ -691,10 +691,14 @@ void rtas_os_term(char *str)
 {
 	int status;
 
-	if (panic_timeout)
-		return;
-
-	if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term"))
+	/*
+	 * Firmware with the ibm,extended-os-term property is guaranteed
+	 * to always return from an ibm,os-term call. Earlier versions without
+	 * this property may terminate the partition which we want to avoid
+	 * since it interferes with panic_timeout.
+	 */
+	if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term") ||
+	    RTAS_UNKNOWN_SERVICE == rtas_token("ibm,extended-os-term"))
 		return;
 
 	snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str);
@@ -705,8 +709,7 @@ void rtas_os_term(char *str)
 	} while (rtas_busy_delay(status));
 
 	if (status != 0)
-		printk(KERN_EMERG "ibm,os-term call failed %d\n",
-			       status);
+		printk(KERN_EMERG "ibm,os-term call failed %d\n", status);
 }
 
 static int ibm_suspend_me_token = RTAS_UNKNOWN_SERVICE;