diff --git a/[refs] b/[refs]
index 83b2ddda19c1..8213f2de47d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ad4c18884e864cf4c77f9074d3d1816063f99cd
+refs/heads/master: 3160568371da441b7f2fb57f2f1225404207e8f2
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 281da29d0801..c4635f74540c 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -6631,6 +6631,8 @@ SYSCALL_DEFINE3(sched_setaffinity, pid_t, pid, unsigned int, len,
 long sched_getaffinity(pid_t pid, struct cpumask *mask)
 {
 	struct task_struct *p;
+	unsigned long flags;
+	struct rq *rq;
 	int retval;
 
 	get_online_cpus();
@@ -6645,7 +6647,9 @@ long sched_getaffinity(pid_t pid, struct cpumask *mask)
 	if (retval)
 		goto out_unlock;
 
+	rq = task_rq_lock(p, &flags);
 	cpumask_and(mask, &p->cpus_allowed, cpu_online_mask);
+	task_rq_unlock(rq, &flags);
 
 out_unlock:
 	read_unlock(&tasklist_lock);