3 files changed, 7 insertions, 6 deletions

diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index b4469992d6b2..6d7f2b07e491 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -121,7 +121,7 @@ void machine_power_off(void)
 void show_regs(struct pt_regs * regs)
 {
         printk("\n");
-        printk("Pid : %d, Comm: %20s\n", current->pid, current->comm);
+        printk("Pid : %d, Comm: %20s\n", task_pid_nr(current), current->comm);
         print_symbol("PC is at %s\n", instruction_pointer(regs));
         printk("PC  : %08lx SP  : %08lx SR  : %08lx ",
                regs->pc, regs->regs[15], regs->sr);
diff --git a/arch/sh/kernel/signal.c b/arch/sh/kernel/signal.c
index 2f42442cf164..ca754fd42437 100644
--- a/arch/sh/kernel/signal.c
+++ b/arch/sh/kernel/signal.c
@@ -382,7 +382,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,
         set_fs(USER_DS);
 
         pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n",
-                 current->comm, current->pid, frame, regs->pc, regs->pr);
+                 current->comm, task_pid_nr(current), frame, regs->pc, regs->pr);
 
         flush_cache_sigtramp(regs->pr);
 
@@ -462,7 +462,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         set_fs(USER_DS);
 
         pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n",
-                 current->comm, current->pid, frame, regs->pc, regs->pr);
+                 current->comm, task_pid_nr(current), frame, regs->pc, regs->pr);
 
         flush_cache_sigtramp(regs->pr);
 
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)
         print_modules();
         show_regs(regs);
 
-        printk("Process: %s (pid: %d, stack limit = %p)\n",
-               current->comm, current->pid, task_stack_page(current) + 1);
+        printk("Process: %s (pid: %d, stack limit = %p)\n", current->comm,
+                        task_pid_nr(current), task_stack_page(current) + 1);
 
         if (!user_mode(regs) || in_interrupt())
                 dump_mem("Stack: ", regs->regs[15], THREAD_SIZE +
@@ -386,7 +386,8 @@ static int handle_unaligned_access(u16 instruction, struct pt_regs *regs)
 
                 printk(KERN_NOTICE "Fixing up unaligned userspace access "
                        "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
-                       current->comm,current->pid,(u16*)regs->pc,instruction);
+                       current->comm, task_pid_nr(current),
+                       (u16 *)regs->pc, instruction);
         }
 
         ret = -EFAULT;