diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-02-29 10:11:03 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-02-29 10:11:03 +0800 |
| commit | 12a08707dec7ff067688710aee0d4698f6da98a6 (patch) | |
| tree | f4417dde853c08d86f1394ac6c97e391d336883a /kernel/panic.c | |
| parent | 34f6d2c9d12a97271d55c7b204443b2da9e6c29e (diff) | |
| parent | 2134d97aa3a7ce38bb51f933f2e20cafde371085 (diff) | |
Merge tag 'v4.4.3' into linux-linaro-lsk-v4.4
This is the 4.4.3 stable release
Diffstat (limited to 'kernel/panic.c')
| -rw-r--r-- | kernel/panic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 4b150bc0c6c1..41e2b54f36b5 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -157,8 +157,7 @@ void panic(const char *fmt, ...) * panic() is not being callled from OOPS. */ debug_locks_off(); - console_trylock(); - console_unlock(); + console_flush_on_panic(); if (!panic_blink) panic_blink = no_blink; |