diff --git a/[refs] b/[refs]
index f238aebc5ea5..a31cac9a49bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6005123ce22770dbd91bc3cb637ce0807ab959b
+refs/heads/master: 0f624e7e5625f4c30c836b7a5decfe2553582391
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index d891ec4a8100..8823b0885183 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -1603,7 +1603,7 @@ static struct perf_event_context *find_get_context(pid_t pid, int cpu)
 		if (perf_paranoid_cpu() && !capable(CAP_SYS_ADMIN))
 			return ERR_PTR(-EACCES);
 
-		if (cpu < 0 || cpu > num_possible_cpus())
+		if (cpu < 0 || cpu >= nr_cpumask_bits)
 			return ERR_PTR(-EINVAL);
 
 		/*