diff --git a/[refs] b/[refs]
index 921750fa7ddd..e26504019a63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7970479c4881e156a0c07c1a7fdc564c8e3b2bfc
+refs/heads/master: a5ae2330a5a6e7948866715a845ad2e8900bd4c2
diff --git a/trunk/arch/x86/kernel/traps_64.c b/trunk/arch/x86/kernel/traps_64.c
index 7853f488cd6c..71c2629997b3 100644
--- a/trunk/arch/x86/kernel/traps_64.c
+++ b/trunk/arch/x86/kernel/traps_64.c
@@ -204,7 +204,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
 			printk_ratelimit()) {
 		printk(KERN_INFO
 			"%s[%d] general protection ip:%lx sp:%lx error:%lx",
-			tsk->comm, tsk->pid,
+			tsk->comm, task_pid_nr(tsk),
 			regs->ip, regs->sp, error_code);
 		print_vma_addr(" in ", regs->ip);
 		printk("\n");