diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 08:37:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 08:37:05 -0700 |
| commit | 2aedd192f799c362ccefc3c316f0c4bd5154126b (patch) | |
| tree | 080ead7bd2c4ae496ef82e9633eadc1d1af28946 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 (diff) | |
| parent | sched: Fix sched_getaffinity() (diff) | |
| download | linux-dev-2aedd192f799c362ccefc3c316f0c4bd5154126b.tar.xz linux-dev-2aedd192f799c362ccefc3c316f0c4bd5154126b.zip | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Fix sched_getaffinity()
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index a3dff1f3f9b0..6af210a7de70 100644 --- a/kernel/sched.c +++ b/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; |