summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndy Isaacson <adi@hexapodia.org>2009-12-08 00:30:21 -0800
committerIngo Molnar <mingo@elte.hu>2009-12-09 10:17:59 +0100
commita1884b8e558ef6395f6033f9e1b69b332dd040e0 (patch)
tree573cc9ba77c70d84025e39ba80dd7f28e2065fe5 /arch
parent814e2c84a722c45650a9b8f52285d7ba6874f63b (diff)
downloadlinux-3.10-a1884b8e558ef6395f6033f9e1b69b332dd040e0.tar.gz
linux-3.10-a1884b8e558ef6395f6033f9e1b69b332dd040e0.tar.bz2
linux-3.10-a1884b8e558ef6395f6033f9e1b69b332dd040e0.zip
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')
-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 90cf1250a00..7a7bd4e3ec4 100644
--- 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)