From 24c9ab32aedb4b78f138a82c0ffe38bd363ba511 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Apr 2010 10:02:02 -0700
Subject: [PATCH] --- yaml --- r: 189663 b: refs/heads/master c:
 d620a7cf05d4f12f5bbb1060d766e8139ab31458 h: refs/heads/master i:   189661:
 9ec3e324217c2748cc20ee5fc44cc9f6fc30d4ca   189659:
 048b2e0cf4170e479b5b40a99db28ff89cdaa443   189655:
 1bc47963d3fadedbf09693dfc8a3999b3060458f   189647:
 067c1f08ba7a258a3a395543b6315c6ba93df1a6   189631:
 772f4b2eaef6ba9b09ebc340cc93c96fe91e697d v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;