projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[cascardo/linux.git]
/
kernel
/
sched.c
diff --git
a/kernel/sched.c
b/kernel/sched.c
index
528a105
..
6af210a
100644
(file)
--- a/
kernel/sched.c
+++ b/
kernel/sched.c
@@
-71,6
+71,7
@@
#include <linux/debugfs.h>
#include <linux/ctype.h>
#include <linux/ftrace.h>
#include <linux/debugfs.h>
#include <linux/ctype.h>
#include <linux/ftrace.h>
+#include <linux/slab.h>
#include <asm/tlb.h>
#include <asm/irq_regs.h>
#include <asm/tlb.h>
#include <asm/irq_regs.h>
@@
-4902,7
+4903,7
@@
SYSCALL_DEFINE3(sched_getaffinity, pid_t, pid, unsigned int, len,
int ret;
cpumask_var_t mask;
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;
return -EINVAL;
if (len & (sizeof(unsigned long)-1))
return -EINVAL;