diff --git a/[refs] b/[refs]
index a28bc8c1a570..987e4e5783e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45c4d015a92f72ec47acd0c7557abdc0c8a6499d
+refs/heads/master: d620a7cf05d4f12f5bbb1060d766e8139ab31458
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index a3dff1f3f9b0..6af210a7de70 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -4903,7 +4903,7 @@ SYSCALL_DEFINE3(sched_getaffinity, pid_t, pid, unsigned int, len,
 	int ret;
 	cpumask_var_t mask;
 
-	if (len < nr_cpu_ids)
+	if ((len * BITS_PER_BYTE) < nr_cpu_ids)
 		return -EINVAL;
 	if (len & (sizeof(unsigned long)-1))
 		return -EINVAL;