diff --git a/[refs] b/[refs]
index c2979b09f015..eaa36a148f2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65f8c95e46a1827ae8bbc52a817ea308dd7d65ae
+refs/heads/master: 80c9d03c22f13a17df67b4b99a83ed5e9acf6093
diff --git a/trunk/fs/pstore/platform.c b/trunk/fs/pstore/platform.c
index 6c23eab7f76c..a40da07e93d6 100644
--- a/trunk/fs/pstore/platform.c
+++ b/trunk/fs/pstore/platform.c
@@ -164,7 +164,13 @@ static void pstore_console_write(struct console *con, const char *s, unsigned c)
 
 		if (c > psinfo->bufsize)
 			c = psinfo->bufsize;
-		spin_lock_irqsave(&psinfo->buf_lock, flags);
+
+		if (oops_in_progress) {
+			if (!spin_trylock_irqsave(&psinfo->buf_lock, flags))
+				break;
+		} else {
+			spin_lock_irqsave(&psinfo->buf_lock, flags);
+		}
 		memcpy(psinfo->buf, s, c);
 		psinfo->write(PSTORE_TYPE_CONSOLE, 0, NULL, 0, c, psinfo);
 		spin_unlock_irqrestore(&psinfo->buf_lock, flags);