diff options
Diffstat (limited to 'arch/sh/kernel/traps.c')
-rw-r--r-- | arch/sh/kernel/traps.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index dcb46e71da1c..cf99111cb33f 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c | |||
@@ -95,8 +95,8 @@ void die(const char * str, struct pt_regs * regs, long err) | |||
95 | print_modules(); | 95 | print_modules(); |
96 | show_regs(regs); | 96 | show_regs(regs); |
97 | 97 | ||
98 | printk("Process: %s (pid: %d, stack limit = %p)\n", | 98 | printk("Process: %s (pid: %d, stack limit = %p)\n", current->comm, |
99 | current->comm, current->pid, task_stack_page(current) + 1); | 99 | task_pid_nr(current), task_stack_page(current) + 1); |
100 | 100 | ||
101 | if (!user_mode(regs) || in_interrupt()) | 101 | if (!user_mode(regs) || in_interrupt()) |
102 | dump_mem("Stack: ", regs->regs[15], THREAD_SIZE + | 102 | dump_mem("Stack: ", regs->regs[15], THREAD_SIZE + |
@@ -386,7 +386,8 @@ static int handle_unaligned_access(u16 instruction, struct pt_regs *regs) | |||
386 | 386 | ||
387 | printk(KERN_NOTICE "Fixing up unaligned userspace access " | 387 | printk(KERN_NOTICE "Fixing up unaligned userspace access " |
388 | "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n", | 388 | "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n", |
389 | current->comm,current->pid,(u16*)regs->pc,instruction); | 389 | current->comm, task_pid_nr(current), |
390 | (u16 *)regs->pc, instruction); | ||
390 | } | 391 | } |
391 | 392 | ||
392 | ret = -EFAULT; | 393 | ret = -EFAULT; |