2 files changed, 25 insertions, 8 deletions

diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 3c189e9accd3..ff4554198981 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -92,21 +92,31 @@ void show_regs(struct pt_regs *regs)
 
 void show_regs_common(void)
 {
-        const char *board, *product;
+        const char *vendor, *product, *board;
 
-        board = dmi_get_system_info(DMI_BOARD_NAME);
-        if (!board)
-                board = "";
+        vendor = dmi_get_system_info(DMI_SYS_VENDOR);
+        if (!vendor)
+                vendor = "";
         product = dmi_get_system_info(DMI_PRODUCT_NAME);
         if (!product)
                 product = "";
 
+        /* Board Name is optional */
+        board = dmi_get_system_info(DMI_BOARD_NAME);
+
         printk(KERN_CONT "\n");
-        printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s/%s\n",
+        printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
                 current->pid, current->comm, print_tainted(),
                 init_utsname()->release,
                 (int)strcspn(init_utsname()->version, " "),
-                init_utsname()->version, board, product);
+                init_utsname()->version);
+        printk(KERN_CONT " ");
+        printk(KERN_CONT "%s %s", vendor, product);
+        if (board) {
+                printk(KERN_CONT "/");
+                printk(KERN_CONT "%s", board);
+        }
+        printk(KERN_CONT "\n");
 }
 
 void flush_thread(void)
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 " ");