Commit 2aedd192 authored Apr 08, 2010 by Linus Torvalds

Merge branch 'sched-fixes-for-linus' of...

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()

parents cf90bfe2 84fba5ec

kernel/sched.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;