From 2ca47e8922243e46ef09ee161065846e5cd5cec0 Mon Sep 17 00:00:00 2001
From: Jim Wylder <jwylder@motorola.com>
Date: Thu, 29 May 2014 18:35:21 -0500
Subject: IKXCLOCK-1833 printk: ignore suspend state during panic

Skip suspend check if we are in a panic (oops), this allows
the pstore ramconsole to save logs for panics during suspend.

Change-Id: I8db78384f86f3f80a45948f22dff1335aa9ac5db
Signed-off-by: Jim Wylder <jwylder@motorola.com>
---
 kernel/printk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kernel/printk.c')

diff --git a/kernel/printk.c b/kernel/printk.c
index c2f720eb428..e2d0d491620 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -2043,7 +2043,7 @@ void console_unlock(void)
 	bool wake_klogd = false;
 	bool retry;
 
-	if (console_suspended) {
+	if (console_suspended && !oops_in_progress) {
 		up(&console_sem);
 		return;
 	}
-- 
cgit v1.2.3-70-g09d2