diff options
Diffstat (limited to 'arch/x86/kernel/traps_32.c')
-rw-r--r-- | arch/x86/kernel/traps_32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index b132d3957dfc..1e9d57256eb1 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c | |||
@@ -316,7 +316,7 @@ void show_registers(struct pt_regs *regs) | |||
316 | printk(KERN_EMERG "ds: %04x es: %04x fs: %04x gs: %04x ss: %04x\n", | 316 | printk(KERN_EMERG "ds: %04x es: %04x fs: %04x gs: %04x ss: %04x\n", |
317 | regs->xds & 0xffff, regs->xes & 0xffff, regs->xfs & 0xffff, gs, ss); | 317 | 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)", | 318 | printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)", |
319 | TASK_COMM_LEN, current->comm, current->pid, | 319 | TASK_COMM_LEN, current->comm, task_pid_nr(current), |
320 | current_thread_info(), current, task_thread_info(current)); | 320 | current_thread_info(), current, task_thread_info(current)); |
321 | /* | 321 | /* |
322 | * When in-kernel, we also print out the stack and code at the | 322 | * When in-kernel, we also print out the stack and code at the |
@@ -622,7 +622,7 @@ fastcall void __kprobes do_general_protection(struct pt_regs * regs, | |||
622 | printk_ratelimit()) | 622 | printk_ratelimit()) |
623 | printk(KERN_INFO | 623 | printk(KERN_INFO |
624 | "%s[%d] general protection eip:%lx esp:%lx error:%lx\n", | 624 | "%s[%d] general protection eip:%lx esp:%lx error:%lx\n", |
625 | current->comm, current->pid, | 625 | current->comm, task_pid_nr(current), |
626 | regs->eip, regs->esp, error_code); | 626 | regs->eip, regs->esp, error_code); |
627 | 627 | ||
628 | force_sig(SIGSEGV, current); | 628 | force_sig(SIGSEGV, current); |