soc: rockchip: pvtm: fix undefined reference to rockchip_get_pvtm_value

[firefly-linux-kernel-4.4.55.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 4579dbb7ed872a7e1c119fdbbf98d9dc8cd67a87..1d07cf9af849dcb651f36c494f697970c3606743 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -152,10 +152,12 @@ void panic(const char *fmt, ...)
         * We may have ended up stopping the CPU holding the lock (in
         * smp_send_stop()) while still having some valuable data in the console
         * buffer.  Try to acquire the lock then release it regardless of the
-        * result.  The release will also print the buffers out.
+        * result.  The release will also print the buffers out.  Locks debug
+        * should be disabled to avoid reporting bad unlock balance when
+        * panic() is not being callled from OOPS.
         */
-       console_trylock();
-       console_unlock();
+       debug_locks_off();
+       console_flush_on_panic();
 
        if (!panic_blink)
                panic_blink = no_blink;
@@ -165,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.
                 */
-               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();