3 files changed, 7 insertions, 7 deletions

diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index bbf029a184ac..99fd56939afa 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -219,7 +219,7 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err)
                         return; /* STFU */
 
                 printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n",
-                        current->comm, current->pid, str, err, regs->iaoq[0]);
+                        current->comm, task_pid_nr(current), str, err, regs->iaoq[0]);
 #ifdef PRINT_USER_FAULTS
                 /* XXX for debugging only */
                 show_regs(regs);
@@ -252,7 +252,7 @@ KERN_CRIT "                     ||     ||\n");
         
         if (err)
                 printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n",
-                        current->comm, current->pid, str, err);
+                        current->comm, task_pid_nr(current), str, err);
 
         /* Wot's wrong wif bein' racy? */
         if (current->thread.flags & PARISC_KERNEL_DEATH) {
@@ -317,7 +317,7 @@ static void handle_break(struct pt_regs *regs)
         if (unlikely(iir != GDB_BREAK_INSN)) {
                 printk(KERN_DEBUG "break %d,%d: pid=%d command='%s'\n",
                         iir & 31, (iir>>13) & ((1<<13)-1),
-                        current->pid, current->comm);
+                        task_pid_nr(current), current->comm);
                 show_regs(regs);
         }
 #endif
@@ -747,7 +747,7 @@ void handle_interruption(int code, struct pt_regs *regs)
                 if (user_mode(regs)) {
 #ifdef PRINT_USER_FAULTS
                         printk(KERN_DEBUG "\nhandle_interruption() pid=%d command='%s'\n",
-                            current->pid, current->comm);
+                            task_pid_nr(current), current->comm);
                         show_regs(regs);
 #endif
                         /* SIGBUS, for lack of a better one. */
@@ -772,7 +772,7 @@ void handle_interruption(int code, struct pt_regs *regs)
                 else
                         printk(KERN_DEBUG "User Fault (long pointer) (fault %d) ",
                                code);
-                printk("pid=%d command='%s'\n", current->pid, current->comm);
+                printk("pid=%d command='%s'\n", task_pid_nr(current), current->comm);
                 show_regs(regs);
 #endif
                 si.si_signo = SIGSEGV;
diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c
index 347bb922e6d0..aebf3c168871 100644
--- a/arch/parisc/kernel/unaligned.c
+++ b/arch/parisc/kernel/unaligned.c
@@ -469,7 +469,7 @@ void handle_unaligned(struct pt_regs *regs)
                     && ++unaligned_count < 5) {
                         char buf[256];
                         sprintf(buf, "%s(%d): unaligned access to 0x" RFMT " at ip=0x" RFMT "\n",
-                                current->comm, current->pid, regs->ior, regs->iaoq[0]);
+                                current->comm, task_pid_nr(current), regs->ior, regs->iaoq[0]);
                         printk(KERN_WARNING "%s", buf);
 #ifdef DEBUG_UNALIGNED
                         show_regs(regs);
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
index 1c091b415cd9..b2e3e9a8cece 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -211,7 +211,7 @@ bad_area:
 #ifdef PRINT_USER_FAULTS
                 printk(KERN_DEBUG "\n");
                 printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n",
-                    tsk->pid, tsk->comm, code, address);
+                    task_pid_nr(tsk), tsk->comm, code, address);
                 if (vma) {
                         printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
                                         vma->vm_start, vma->vm_end);