projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "clk: rockchip: rk3368: Add CLK_IGNORE_UNUSED flag for mipi phy refclk"
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
panic.c
diff --git
a/kernel/panic.c
b/kernel/panic.c
index 4b150bc0c6c111ee09f783eaa6aa101339f6ceec..1d07cf9af849dcb651f36c494f697970c3606743 100644
(file)
--- 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();
* 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;
if (!panic_blink)
panic_blink = no_blink;
@@
-168,7
+167,7
@@
void panic(const char *fmt, ...)
* Delay timeout seconds before rebooting the machine.
* We can't use the "normal" timers since we just panicked.
*/
* Delay timeout seconds before rebooting the machine.
* We can't use the "normal" timers since we just panicked.
*/
- pr_emerg("Rebooting in %d seconds..", panic_timeout);
+ pr_emerg("Rebooting in %d seconds..
\n
", panic_timeout);
for (i = 0; i < panic_timeout * 1000; i += PANIC_TIMER_STEP) {
touch_nmi_watchdog();
for (i = 0; i < panic_timeout * 1000; i += PANIC_TIMER_STEP) {
touch_nmi_watchdog();