diff --git a/[refs] b/[refs]
index 07e120853528..0ca974df0649 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b38a86eb196d9402299919456fe3f28e490c76fa
+refs/heads/master: 8ca937a668d4be0b0c89c4fc9a912a5885ac06fe
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index 789e3c5777f7..910a0716e17a 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -1427,7 +1427,7 @@ static int wait_task_stopped(struct wait_opts *wo,
 	if (!unlikely(wo->wo_flags & WNOWAIT))
 		*p_code = 0;
 
-	uid = from_kuid_munged(current_user_ns(), __task_cred(p)->uid);
+	uid = from_kuid_munged(current_user_ns(), task_uid(p));
 unlock_sig:
 	spin_unlock_irq(&p->sighand->siglock);
 	if (!exit_code)
@@ -1500,7 +1500,7 @@ static int wait_task_continued(struct wait_opts *wo, struct task_struct *p)
 	}
 	if (!unlikely(wo->wo_flags & WNOWAIT))
 		p->signal->flags &= ~SIGNAL_STOP_CONTINUED;
-	uid = from_kuid_munged(current_user_ns(), __task_cred(p)->uid);
+	uid = from_kuid_munged(current_user_ns(), task_uid(p));
 	spin_unlock_irq(&p->sighand->siglock);
 
 	pid = task_pid_vnr(p);