diff options
Diffstat (limited to 'arch/x86/kernel/process_32.c')
-rw-r--r-- | arch/x86/kernel/process_32.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index c8609dea443f..205188db9626 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <linux/tick.h> | 37 | #include <linux/tick.h> |
38 | #include <linux/percpu.h> | 38 | #include <linux/percpu.h> |
39 | #include <linux/prctl.h> | 39 | #include <linux/prctl.h> |
40 | #include <linux/dmi.h> | ||
40 | 41 | ||
41 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
42 | #include <asm/pgtable.h> | 43 | #include <asm/pgtable.h> |
@@ -163,6 +164,7 @@ void __show_registers(struct pt_regs *regs, int all) | |||
163 | unsigned long d0, d1, d2, d3, d6, d7; | 164 | unsigned long d0, d1, d2, d3, d6, d7; |
164 | unsigned long sp; | 165 | unsigned long sp; |
165 | unsigned short ss, gs; | 166 | unsigned short ss, gs; |
167 | const char *board; | ||
166 | 168 | ||
167 | if (user_mode_vm(regs)) { | 169 | if (user_mode_vm(regs)) { |
168 | sp = regs->sp; | 170 | sp = regs->sp; |
@@ -175,11 +177,15 @@ void __show_registers(struct pt_regs *regs, int all) | |||
175 | } | 177 | } |
176 | 178 | ||
177 | printk("\n"); | 179 | printk("\n"); |
178 | printk("Pid: %d, comm: %s %s (%s %.*s)\n", | 180 | |
181 | board = dmi_get_system_info(DMI_PRODUCT_NAME); | ||
182 | if (!board) | ||
183 | board = ""; | ||
184 | printk("Pid: %d, comm: %s %s (%s %.*s) %s\n", | ||
179 | task_pid_nr(current), current->comm, | 185 | task_pid_nr(current), current->comm, |
180 | print_tainted(), init_utsname()->release, | 186 | print_tainted(), init_utsname()->release, |
181 | (int)strcspn(init_utsname()->version, " "), | 187 | (int)strcspn(init_utsname()->version, " "), |
182 | init_utsname()->version); | 188 | init_utsname()->version, board); |
183 | 189 | ||
184 | printk("EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n", | 190 | printk("EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n", |
185 | (u16)regs->cs, regs->ip, regs->flags, | 191 | (u16)regs->cs, regs->ip, regs->flags, |