diff options
| author | Jim Wylder <jwylder@motorola.com> | 2014-05-30 16:26:48 -0500 |
|---|---|---|
| committer | Jim Wylder <jwylder@motorola.com> | 2014-05-30 16:29:05 -0500 |
| commit | 715782a6e0c76eac2839a69ec1bfaa0422955551 (patch) | |
| tree | f823604e88c9866b652a25ada185162d6c15edc3 /kernel | |
| parent | 2ca47e8922243e46ef09ee161065846e5cd5cec0 (diff) | |
| download | olio-linux-3.10-715782a6e0c76eac2839a69ec1bfaa0422955551.tar.xz olio-linux-3.10-715782a6e0c76eac2839a69ec1bfaa0422955551.zip | |
IKXCLOCK-1722 printk: ignore console lock during panic
When the console is locked, as is done in OMAPLFBFlip, panic
information will not be flushed to the console. If in an oops
case, ignore the console lock and forge ahead.
Change-Id: Ic65dc76c0f2e2d5f68997bc5c2669921d80d374f
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 e2d0d491620..bf785e0ce73 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -1357,7 +1357,7 @@ static int console_trylock_for_printk(unsigned int cpu) { int retval = 0, wake = 0; - if (console_trylock()) { + if (console_trylock() || oops_in_progress) { retval = 1; /* |