diff options
| author | Linus Torvalds | 2011-02-15 19:18:29 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2011-02-15 19:18:29 +0100 |
| commit | fef86db8feb2618430ac9e3c9b6197a7eacaf27a (patch) | |
| tree | d296ceedbec0863b4cabfc84cf0912629d4cb1ac /drivers | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
| parent | x86, dmi, debug: Log board name (when present) in dmesg/oops output (diff) | |
| download | kernel-qcow2-linux-fef86db8feb2618430ac9e3c9b6197a7eacaf27a.tar.gz kernel-qcow2-linux-fef86db8feb2618430ac9e3c9b6197a7eacaf27a.tar.xz kernel-qcow2-linux-fef86db8feb2618430ac9e3c9b6197a7eacaf27a.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, dmi, debug: Log board name (when present) in dmesg/oops output
x86, ioapic: Don't warn about non-existing IOAPICs if we have none
x86: Fix mwait_usable section mismatch
x86: Readd missing irq_to_desc() in fixup_irq()
x86: Fix section mismatch in LAPIC initialization
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/dmi_scan.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index e28e41668177..bcb1126e3d00 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -378,10 +378,17 @@ static void __init print_filtered(const char *info) static void __init dmi_dump_ids(void) { + const char *board; /* Board Name is optional */ + printk(KERN_DEBUG "DMI: "); - print_filtered(dmi_get_system_info(DMI_BOARD_NAME)); - printk(KERN_CONT "/"); + print_filtered(dmi_get_system_info(DMI_SYS_VENDOR)); + printk(KERN_CONT " "); print_filtered(dmi_get_system_info(DMI_PRODUCT_NAME)); + board = dmi_get_system_info(DMI_BOARD_NAME); + if (board) { + printk(KERN_CONT "/"); + print_filtered(board); + } printk(KERN_CONT ", BIOS "); print_filtered(dmi_get_system_info(DMI_BIOS_VERSION)); printk(KERN_CONT " "); |