scheduler fixes
Linus,
Please pull the latest sched-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
Thanks,
Ingo
------------------>
Andrew Morton (1):
kernel/sched.c: Suppress unused var warning
KOSAKI Motohiro (2):
sched: sched_getaffinity(): Allow less than NR_CPUS length
sched: Use proper type in sched_getaffinity()
kernel/sched.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)
kernel/sched.c +8 -4
@@ -2650,7 +2650,7 @@ void wake_up_new_task(struct task_struct *p, unsigned long clone_flags) {unsigned long flags;struct rq *rq; -int cpu =get_cpu (); +int cpu__maybe_unused =get_cpu ();#ifdef CONFIG_SMP /*
@@ -4902,7 +4902,9 @@ SYSCALL_DEFINE3(sched_getaffinity, pid_t, pid, unsigned int, len,int ret;cpumask_var_t mask; -if (len <cpumask_size ()) +if (len < nr_cpu_ids) +return -EINVAL ; +if (len & (sizeof (unsigned long )-1 ))return -EINVAL ;if (!alloc_cpumask_var (&mask,GFP_KERNEL ))
@@ -4910,10 +4912,12 @@ SYSCALL_DEFINE3(sched_getaffinity, pid_t, pid, unsigned int, len, ret =sched_getaffinity (pid, mask);if (ret ==0 ) { -if (copy_to_user (user_mask_ptr, mask,cpumask_size ())) +size_t retlen =min_t (size_t, len,cpumask_size ()); + +if (copy_to_user (user_mask_ptr, mask, retlen)) ret = -EFAULT ;else - ret =cpumask_size (); + ret = retlen; }free_cpumask_var (mask);