Merge branch 'syscalls-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo...

[linux-2.6-microblaze.git] / kernel / sched / core.c

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index de44045..28b6899 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4942,7 +4942,7 @@ SYSCALL_DEFINE3(sched_getaffinity, pid_t, pid, unsigned int, len,
  *
  * Return: 0.
  */
-SYSCALL_DEFINE0(sched_yield)
+static void do_sched_yield(void)
 {
        struct rq_flags rf;
        struct rq *rq;
@@ -4963,7 +4963,11 @@ SYSCALL_DEFINE0(sched_yield)
        sched_preempt_enable_no_resched();
 
        schedule();
+}
 
+SYSCALL_DEFINE0(sched_yield)
+{
+       do_sched_yield();
        return 0;
 }
 
@@ -5047,7 +5051,7 @@ EXPORT_SYMBOL(__cond_resched_softirq);
 void __sched yield(void)
 {
        set_current_state(TASK_RUNNING);
-       sys_sched_yield();
+       do_sched_yield();
 }
 EXPORT_SYMBOL(yield);