aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/process.c
diff options
context:
space:
mode:
authorAndy Isaacson <adi@hexapodia.org>2009-12-08 03:30:21 -0500
committerIngo Molnar <mingo@elte.hu>2009-12-09 04:17:59 -0500
commita1884b8e558ef6395f6033f9e1b69b332dd040e0 (patch)
tree573cc9ba77c70d84025e39ba80dd7f28e2065fe5 /arch/x86/kernel/process.c
parent814e2c84a722c45650a9b8f52285d7ba6874f63b (diff)
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>
Diffstat (limited to 'arch/x86/kernel/process.c')
-rw-r--r--arch/x86/kernel/process.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 90cf1250a005..7a7bd4e3ec49 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -94,18 +94,21 @@ void exit_thread(void)
94 94
95void show_regs_common(void) 95void show_regs_common(void)
96{ 96{
97 const char *board; 97 const char *board, *product;
98 98
99 board = dmi_get_system_info(DMI_PRODUCT_NAME); 99 board = dmi_get_system_info(DMI_BOARD_NAME);
100 if (!board) 100 if (!board)
101 board = ""; 101 board = "";
102 product = dmi_get_system_info(DMI_PRODUCT_NAME);
103 if (!product)
104 product = "";
102 105
103 printk("\n"); 106 printk("\n");
104 printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n", 107 printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s/%s\n",
105 current->pid, current->comm, print_tainted(), 108 current->pid, current->comm, print_tainted(),
106 init_utsname()->release, 109 init_utsname()->release,
107 (int)strcspn(init_utsname()->version, " "), 110 (int)strcspn(init_utsname()->version, " "),
108 init_utsname()->version, board); 111 init_utsname()->version, board, product);
109} 112}
110 113
111void flush_thread(void) 114void flush_thread(void)