x86: Print DMI_BOARD_NAME as well as DMI_PRODUCT_NAME from __show_regs()

Robert Hancock observes that DMI_BOARD_NAME is often more useful
than DMI_PRODUCT_NAME, especially on standalone motherboards.
So, print both.

Signed-off-by: Andy Isaacson <adi@hexapodia.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Robert Hancock <hancockrwd@gmail.com>
Cc: Richard Zidlicky <rz@linux-m68k.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <20091208083021.GB27174@hexapodia.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 90cf1250a005e95dfa5da38aa641b7ba5d17f253..7a7bd4e3ec49b5f42056137f6c56165809303c98 100644 (file)
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -94,18 +94,21 @@ void exit_thread(void)
 
 void show_regs_common(void)
 {
-       const char *board;
+       const char *board, *product;
 
-       board = dmi_get_system_info(DMI_PRODUCT_NAME);
+       board = dmi_get_system_info(DMI_BOARD_NAME);
        if (!board)
                board = "";
+       product = dmi_get_system_info(DMI_PRODUCT_NAME);
+       if (!product)
+               product = "";
 
        printk("\n");
-       printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n",
+       printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s/%s\n",
                current->pid, current->comm, print_tainted(),
                init_utsname()->release,
                (int)strcspn(init_utsname()->version, " "),
-               init_utsname()->version, board);
+               init_utsname()->version, board, product);
 }
 
 void flush_thread(void)