4 files changed, 11 insertions, 11 deletions

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 93b7f8e22dcc..4f1a03124a74 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -265,7 +265,7 @@ void __show_regs(struct pt_regs *regs)
 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);
         __show_regs(regs);
         __backtrace();
 }
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index 5feee722ea98..4b05dc5c1023 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -382,16 +382,16 @@ static void clear_breakpoint(struct task_struct *task, struct debug_entry *bp)
 
                 if (ret != 2 || old_insn.thumb != BREAKINST_THUMB)
                         printk(KERN_ERR "%s:%d: corrupted Thumb breakpoint at "
-                                "0x%08lx (0x%04x)\n", task->comm, task->pid,
-                                addr, old_insn.thumb);
+                                "0x%08lx (0x%04x)\n", task->comm,
+                                task_pid_nr(task), addr, old_insn.thumb);
         } else {
                 ret = swap_insn(task, addr & ~3, &old_insn.arm,
                                 &bp->insn.arm, 4);
 
                 if (ret != 4 || old_insn.arm != BREAKINST_ARM)
                         printk(KERN_ERR "%s:%d: corrupted ARM breakpoint at "
-                                "0x%08lx (0x%08x)\n", task->comm, task->pid,
-                                addr, old_insn.arm);
+                                "0x%08lx (0x%08x)\n", task->comm,
+                                task_pid_nr(task), addr, old_insn.arm);
         }
 }
 
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 8ad47619c079..4764bd9ccee8 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -223,7 +223,7 @@ static void __die(const char *str, int err, struct thread_info *thread, struct p
         print_modules();
         __show_regs(regs);
         printk("Process %s (pid: %d, stack limit = 0x%p)\n",
-                tsk->comm, tsk->pid, thread + 1);
+                tsk->comm, task_pid_nr(tsk), thread + 1);
 
         if (!user_mode(regs) || in_interrupt()) {
                 dump_mem("Stack: ", regs->ARM_sp,
@@ -337,7 +337,7 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs)
 #ifdef CONFIG_DEBUG_USER
         if (user_debug & UDBG_UNDEFINED) {
                 printk(KERN_INFO "%s (%d): undefined instruction: pc=%p\n",
-                        current->comm, current->pid, pc);
+                        current->comm, task_pid_nr(current), pc);
                 dump_instr(regs);
         }
 #endif
@@ -388,7 +388,7 @@ static int bad_syscall(int n, struct pt_regs *regs)
 #ifdef CONFIG_DEBUG_USER
         if (user_debug & UDBG_SYSCALL) {
                 printk(KERN_ERR "[%d] %s: obsolete system call %08x.\n",
-                        current->pid, current->comm, n);
+                        task_pid_nr(current), current->comm, n);
                 dump_instr(regs);
         }
 #endif
@@ -565,7 +565,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
          */
         if (user_debug & UDBG_SYSCALL) {
                 printk("[%d] %s: arm syscall %d\n",
-                       current->pid, current->comm, no);
+                       task_pid_nr(current), current->comm, no);
                 dump_instr(regs);
                 if (user_mode(regs)) {
                         __show_regs(regs);
@@ -642,7 +642,7 @@ baddataabort(int code, unsigned long instr, struct pt_regs *regs)
 #ifdef CONFIG_DEBUG_USER
         if (user_debug & UDBG_BADABORT) {
                 printk(KERN_ERR "[%d] %s: bad data abort: code %d instr 0x%08lx\n",
-                        current->pid, current->comm, code, instr);
+                        task_pid_nr(current), current->comm, code, instr);
                 dump_instr(regs);
                 show_pte(current->mm, addr);
         }
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
index 074b7cb07743..e162cca5917f 100644
--- a/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
@@ -757,7 +757,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
         if (ai_usermode & 1)
                 printk("Alignment trap: %s (%d) PC=0x%08lx Instr=0x%0*lx "
                        "Address=0x%08lx FSR 0x%03x\n", current->comm,
-                        current->pid, instrptr,
+                        task_pid_nr(current), instrptr,
                         thumb_mode(regs) ? 4 : 8,
                         thumb_mode(regs) ? tinstr : instr,
                         addr, fsr);