Merge tag 'edac_fixes_for_3.10' of git://git.kernel.org/pub/scm/linux/kernel/git...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 7c57cc9eee2c3155c707281832cbbf9d15b0dfd4..167ec097ce8b3851d8f78c2ac7ef2614c840d517 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -22,7 +22,6 @@
 #include <linux/sysrq.h>
 #include <linux/init.h>
 #include <linux/nmi.h>
-#include <linux/dmi.h>
 
 #define PANIC_TIMER_STEP 100
 #define PANIC_BLINK_SPD 18
@@ -400,13 +399,8 @@ struct slowpath_args {
 static void warn_slowpath_common(const char *file, int line, void *caller,
                                 unsigned taint, struct slowpath_args *args)
 {
-       const char *board;
-
        printk(KERN_WARNING "------------[ cut here ]------------\n");
        printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
-       board = dmi_get_system_info(DMI_PRODUCT_NAME);
-       if (board)
-               printk(KERN_WARNING "Hardware name: %s\n", board);
 
        if (args)
                vprintk(args->fmt, args->args);