diff options
Diffstat (limited to 'arch/i386/kernel/traps.c')
-rw-r--r-- | arch/i386/kernel/traps.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index 0efad8aeb41a..4ec21037a361 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c | |||
@@ -291,10 +291,11 @@ void show_registers(struct pt_regs *regs) | |||
291 | int i; | 291 | int i; |
292 | int in_kernel = 1; | 292 | int in_kernel = 1; |
293 | unsigned long esp; | 293 | unsigned long esp; |
294 | unsigned short ss; | 294 | unsigned short ss, gs; |
295 | 295 | ||
296 | esp = (unsigned long) (®s->esp); | 296 | esp = (unsigned long) (®s->esp); |
297 | savesegment(ss, ss); | 297 | savesegment(ss, ss); |
298 | savesegment(gs, gs); | ||
298 | if (user_mode_vm(regs)) { | 299 | if (user_mode_vm(regs)) { |
299 | in_kernel = 0; | 300 | in_kernel = 0; |
300 | esp = regs->esp; | 301 | esp = regs->esp; |
@@ -313,8 +314,8 @@ void show_registers(struct pt_regs *regs) | |||
313 | regs->eax, regs->ebx, regs->ecx, regs->edx); | 314 | regs->eax, regs->ebx, regs->ecx, regs->edx); |
314 | printk(KERN_EMERG "esi: %08lx edi: %08lx ebp: %08lx esp: %08lx\n", | 315 | printk(KERN_EMERG "esi: %08lx edi: %08lx ebp: %08lx esp: %08lx\n", |
315 | regs->esi, regs->edi, regs->ebp, esp); | 316 | regs->esi, regs->edi, regs->ebp, esp); |
316 | printk(KERN_EMERG "ds: %04x es: %04x ss: %04x\n", | 317 | printk(KERN_EMERG "ds: %04x es: %04x fs: %04x gs: %04x ss: %04x\n", |
317 | regs->xds & 0xffff, regs->xes & 0xffff, ss); | 318 | regs->xds & 0xffff, regs->xes & 0xffff, regs->xfs & 0xffff, gs, ss); |
318 | printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)", | 319 | printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)", |
319 | TASK_COMM_LEN, current->comm, current->pid, | 320 | TASK_COMM_LEN, current->comm, current->pid, |
320 | current_thread_info(), current, current->thread_info); | 321 | current_thread_info(), current, current->thread_info); |