diff options
| author | Jim Wylder <jwylder@motorola.com> | 2014-05-29 18:35:21 -0500 |
|---|---|---|
| committer | James Wylder <jwylder@motorola.com> | 2014-05-30 14:13:07 +0000 |
| commit | 2ca47e8922243e46ef09ee161065846e5cd5cec0 (patch) | |
| tree | 01c821646c950c51da82990e49ed5f3fcf62e2bd /kernel | |
| parent | d6288cf1f62e37764388de05b10c094fc42c579b (diff) | |
| download | olio-linux-3.10-2ca47e8922243e46ef09ee161065846e5cd5cec0.tar.xz olio-linux-3.10-2ca47e8922243e46ef09ee161065846e5cd5cec0.zip | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |