[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-a1884b8e558ef6395f6033f9e1b69b332dd040e0@git.kernel.org>
Date: Wed, 9 Dec 2009 09:56:59 GMT
From: tip-bot for Andy Isaacson <adi@...apodia.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
hancockrwd@...il.com, arjan@...ux.intel.com, rz@...ux-m68k.org,
akpm@...ux-foundation.org, tglx@...utronix.de, mingo@...e.hu,
adi@...apodia.org
Subject: [tip:x86/urgent] x86: Print DMI_BOARD_NAME as well as DMI_PRODUCT_NAME from __show_regs()
Commit-ID: a1884b8e558ef6395f6033f9e1b69b332dd040e0
Gitweb: http://git.kernel.org/tip/a1884b8e558ef6395f6033f9e1b69b332dd040e0
Author: Andy Isaacson <adi@...apodia.org>
AuthorDate: Tue, 8 Dec 2009 00:30:21 -0800
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Wed, 9 Dec 2009 10:17:59 +0100
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@...apodia.org>
Cc: Arjan van de Ven <arjan@...ux.intel.com>
Cc: Robert Hancock <hancockrwd@...il.com>
Cc: Richard Zidlicky <rz@...ux-m68k.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>
LKML-Reference: <20091208083021.GB27174@...apodia.org>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/kernel/process.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 90cf125..7a7bd4e 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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists