---

yaml
---
r: 243511
b: refs/heads/master
c: 15d260b
h: refs/heads/master
i:
  243509: 0213136
  243507: 899c590
  243503: 91dfba6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff56535d294245b75fd8f79633b935a3b85993c8
+refs/heads/master: 15d260b36facc1aa769fb39b0efc41f4c8c44729

trunk/arch/powerpc/platforms/pseries/nvram.c

@@ -480,8 +480,32 @@ static void oops_to_nvram(struct kmsg_dumper *dumper,
 		const char *new_msgs, unsigned long new_len)
 {
 	static unsigned int oops_count = 0;
+	static bool panicking = false;
 	size_t text_len;
 
+	switch (reason) {
+	case KMSG_DUMP_RESTART:
+	case KMSG_DUMP_HALT:
+	case KMSG_DUMP_POWEROFF:
+		/* These are almost always orderly shutdowns. */
+		return;
+	case KMSG_DUMP_OOPS:
+	case KMSG_DUMP_KEXEC:
+		break;
+	case KMSG_DUMP_PANIC:
+		panicking = true;
+		break;
+	case KMSG_DUMP_EMERG:
+		if (panicking)
+			/* Panic report already captured. */
+			return;
+		break;
+	default:
+		pr_err("%s: ignoring unrecognized KMSG_DUMP_* reason %d\n",
+						__FUNCTION__, (int) reason);
+		return;
+	}
+
 	if (clobbering_unread_rtas_event())
 		return;