Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index ae8f75a..0bba34a 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4645,7 +4645,7 @@ recheck:
        }
 
        if (user) {
        }
 
        if (user) {

-               retval = security_task_setscheduler(p, policy, param);
+               retval = security_task_setscheduler(p);

                if (retval)
                        return retval;
        }
                if (retval)
                        return retval;
        }


@@ -4887,7 +4887,7 @@ long sched_setaffinity(pid_t pid, const struct cpumask *in_mask)
        if (!check_same_owner(p) && !capable(CAP_SYS_NICE))
                goto out_unlock;
 
        if (!check_same_owner(p) && !capable(CAP_SYS_NICE))
                goto out_unlock;
 

-       retval = security_task_setscheduler(p, 0, NULL);
+       retval = security_task_setscheduler(p);

        if (retval)
                goto out_unlock;
 
        if (retval)
                goto out_unlock;