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 223564d3e1f8b61b9a1b8396961cd93dd426a6d7..1d07cf9af849dcb651f36c494f697970c3606743 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -28,9 +28,6 @@
 #define PANIC_TIMER_STEP 100
 #define PANIC_BLINK_SPD 18
 
-/* Machine specific panic information string */
-char *mach_panic_string;
-
 int panic_on_oops = CONFIG_PANIC_ON_OOPS_VALUE;
 static unsigned long tainted_mask;
 static int pause_on_oops;
@@ -170,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();
@@ -415,11 +412,6 @@ late_initcall(init_oops_id);
 void print_oops_end_marker(void)
 {
        init_oops_id();
-
-       if (mach_panic_string)
-               printk(KERN_WARNING "Board Information: %s\n",
-                      mach_panic_string);
-
        pr_warn("---[ end trace %016llx ]---\n", (unsigned long long)oops_id);
 }