3 files changed, 12 insertions, 12 deletions

diff --git a/arch/alpha/kernel/semaphore.c b/arch/alpha/kernel/semaphore.c
index 8c8aaa205eae..8d2982aa1b8d 100644
--- a/arch/alpha/kernel/semaphore.c
+++ b/arch/alpha/kernel/semaphore.c
@@ -69,7 +69,7 @@ __down_failed(struct semaphore *sem)
 
 #ifdef CONFIG_DEBUG_SEMAPHORE
         printk("%s(%d): down failed(%p)\n",
-               tsk->comm, tsk->pid, sem);
+               tsk->comm, task_pid_nr(tsk), sem);
 #endif
 
         tsk->state = TASK_UNINTERRUPTIBLE;
@@ -98,7 +98,7 @@ __down_failed(struct semaphore *sem)
 
 #ifdef CONFIG_DEBUG_SEMAPHORE
         printk("%s(%d): down acquired(%p)\n",
-               tsk->comm, tsk->pid, sem);
+               tsk->comm, task_pid_nr(tsk), sem);
 #endif
 }
 
@@ -111,7 +111,7 @@ __down_failed_interruptible(struct semaphore *sem)
 
 #ifdef CONFIG_DEBUG_SEMAPHORE
         printk("%s(%d): down failed(%p)\n",
-               tsk->comm, tsk->pid, sem);
+               tsk->comm, task_pid_nr(tsk), sem);
 #endif
 
         tsk->state = TASK_INTERRUPTIBLE;
@@ -139,7 +139,7 @@ __down_failed_interruptible(struct semaphore *sem)
 
 #ifdef CONFIG_DEBUG_SEMAPHORE
         printk("%s(%d): down %s(%p)\n",
-               current->comm, current->pid,
+               current->comm, task_pid_nr(current),
                (ret < 0 ? "interrupted" : "acquired"), sem);
 #endif
         return ret;
@@ -168,7 +168,7 @@ down(struct semaphore *sem)
 #endif
 #ifdef CONFIG_DEBUG_SEMAPHORE
         printk("%s(%d): down(%p) <count=%d> from %p\n",
-               current->comm, current->pid, sem,
+               current->comm, task_pid_nr(current), sem,
                atomic_read(&sem->count), __builtin_return_address(0));
 #endif
         __down(sem);
@@ -182,7 +182,7 @@ down_interruptible(struct semaphore *sem)
 #endif
 #ifdef CONFIG_DEBUG_SEMAPHORE
         printk("%s(%d): down(%p) <count=%d> from %p\n",
-               current->comm, current->pid, sem,
+               current->comm, task_pid_nr(current), sem,
                atomic_read(&sem->count), __builtin_return_address(0));
 #endif
         return __down_interruptible(sem);
@@ -201,7 +201,7 @@ down_trylock(struct semaphore *sem)
 
 #ifdef CONFIG_DEBUG_SEMAPHORE
         printk("%s(%d): down_trylock %s from %p\n",
-               current->comm, current->pid,
+               current->comm, task_pid_nr(current),
                ret ? "failed" : "acquired",
                __builtin_return_address(0));
 #endif
@@ -217,7 +217,7 @@ up(struct semaphore *sem)
 #endif
 #ifdef CONFIG_DEBUG_SEMAPHORE
         printk("%s(%d): up(%p) <count=%d> from %p\n",
-               current->comm, current->pid, sem,
+               current->comm, task_pid_nr(current), sem,
                atomic_read(&sem->count), __builtin_return_address(0));
 #endif
         __up(sem);
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index ec0f05e0d8ff..2dc7f9fed213 100644
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -182,7 +182,7 @@ die_if_kernel(char * str, struct pt_regs *regs, long err, unsigned long *r9_15)
 #ifdef CONFIG_SMP
         printk("CPU %d ", hard_smp_processor_id());
 #endif
-        printk("%s(%d): %s %ld\n", current->comm, current->pid, str, err);
+        printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);
         dik_show_regs(regs, r9_15);
         add_taint(TAINT_DIE);
         dik_show_trace((unsigned long *)(regs+1));
@@ -646,7 +646,7 @@ got_exception:
         lock_kernel();
 
         printk("%s(%d): unhandled unaligned exception\n",
-               current->comm, current->pid);
+               current->comm, task_pid_nr(current));
 
         printk("pc = [<%016lx>]  ra = [<%016lx>]  ps = %04lx\n",
                pc, una_reg(26), regs->ps);
@@ -786,7 +786,7 @@ do_entUnaUser(void __user * va, unsigned long opcode,
                 }
                 if (++cnt < 5) {
                         printk("%s(%d): unaligned trap at %016lx: %p %lx %ld\n",
-                               current->comm, current->pid,
+                               current->comm, task_pid_nr(current),
                                regs->pc - 4, va, opcode, reg);
                 }
                 last_time = jiffies;
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
index e0593e606140..4829f96585b1 100644
--- a/arch/alpha/mm/fault.c
+++ b/arch/alpha/mm/fault.c
@@ -194,7 +194,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
                 goto survive;
         }
         printk(KERN_ALERT "VM: killing process %s(%d)\n",
-               current->comm, current->pid);
+               current->comm, task_pid_nr(current));
         if (!user_mode(regs))
                 goto no_context;
         do_group_exit(SIGKILL);