Use helpers to obtain task pid in printks (arch code)

One of the easiest things to isolate is the pid printed in kernel log.
There was a patch, that made this for arch-independent code, this one makes
so for arch/xxx files.

It took some time to cross-compile it, but hopefully these are all the
printks in arch code.

Signed-off-by: Alexey Dobriyan <adobriyan@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/arch/sh64/kernel/traps.c b/arch/sh64/kernel/traps.c
index 9d0d58fb29fa..c03101fab467 100644
--- a/arch/sh64/kernel/traps.c
+++ b/arch/sh64/kernel/traps.c
@@ -764,7 +764,7 @@ static int misaligned_fixup(struct pt_regs *regs)
                 --user_mode_unaligned_fixup_count;
                 /* Only do 'count' worth of these reports, to remove a potential DoS against syslog */
                 printk("Fixing up unaligned userspace access in \"%s\" pid=%d pc=0x%08x ins=0x%08lx\n",
-                       current->comm, current->pid, (__u32)regs->pc, opcode);
+                       current->comm, task_pid_nr(current), (__u32)regs->pc, opcode);
         } else
 #endif
         if (!user_mode(regs) && (kernel_mode_unaligned_fixup_count > 0)) {
@@ -774,7 +774,7 @@ static int misaligned_fixup(struct pt_regs *regs)
                                (__u32)regs->pc, opcode);
                 } else {
                         printk("Fixing up unaligned kernelspace access in \"%s\" pid=%d pc=0x%08x ins=0x%08lx\n",
-                               current->comm, current->pid, (__u32)regs->pc, opcode);
+                               current->comm, task_pid_nr(current), (__u32)regs->pc, opcode);
                 }
         }
 
diff --git a/arch/sh64/mm/fault.c b/arch/sh64/mm/fault.c
index 7aea586fc3d0..7c79a1ba8059 100644
--- a/arch/sh64/mm/fault.c
+++ b/arch/sh64/mm/fault.c
@@ -81,7 +81,7 @@ static inline void print_vma(struct vm_area_struct *vma)
 
 static inline void print_task(struct task_struct *tsk)
 {
-        printk("Task pid %d\n", tsk->pid);
+        printk("Task pid %d\n", task_pid_nr(tsk));
 }
 
 static pte_t *lookup_pte(struct mm_struct *mm, unsigned long address)
@@ -272,7 +272,7 @@ bad_area:
                          * usermode, so only need a few */
                         count++;
                         printk("user mode bad_area address=%08lx pid=%d (%s) pc=%08lx\n",
-                                address, current->pid, current->comm,
+                                address, task_pid_nr(current), current->comm,
                                 (unsigned long) regs->pc);
 #if 0
                         show_regs(regs);