diff --git a/[refs] b/[refs] index 29d0d4d9de5e..3a6061ab1178 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74853dba2f7a1a9b0905a09abcf65c1f3ce0b14f +refs/heads/master: bd89bb29a01503c5cffa367eccb0b356f910cb8d diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c index 6bbf7b905c76..73d365199c3f 100644 --- a/trunk/kernel/panic.c +++ b/trunk/kernel/panic.c @@ -21,6 +21,7 @@ #include #include #include +#include int panic_on_oops; static unsigned long tainted_mask; @@ -325,11 +326,16 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...) va_list args; char function[KSYM_SYMBOL_LEN]; unsigned long caller = (unsigned long)__builtin_return_address(0); + const char *board; + sprint_symbol(function, caller); printk(KERN_WARNING "------------[ cut here ]------------\n"); printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file, line, function); + board = dmi_get_system_info(DMI_PRODUCT_NAME); + if (board) + printk(KERN_WARNING "Hardware name: %s\n", board); if (fmt) { va_start(args, fmt);