diff --git a/[refs] b/[refs]
index 1c4aea633ca8..4f570ce5f2ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a571bbeafbcc501d9989fbce1cddcd810bd51d71
+refs/heads/master: 3d398703ef06fd97b4c28c86b580546d5b57e7b7
diff --git a/trunk/kernel/sched_rt.c b/trunk/kernel/sched_rt.c
index 954e1a81b796..bac1061cea2f 100644
--- a/trunk/kernel/sched_rt.c
+++ b/trunk/kernel/sched_rt.c
@@ -968,8 +968,8 @@ static inline int pick_optimal_cpu(int this_cpu, cpumask_t *mask)
 	if ((this_cpu != -1) && cpu_isset(this_cpu, *mask))
 		return this_cpu;
 
-	first = first_cpu(*mask);
-	if (first != NR_CPUS)
+	first = cpumask_first(mask);
+	if (first < nr_cpu_ids)
 		return first;
 
 	return -1;