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

[karo-tx-linux.git] / kernel / sched / core.c

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index b4d263db52a6f6d7b09dab05508c91fb526af929..aa5973220ad213a960092012bf4493f296dab90b 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2368,8 +2368,15 @@ void wake_up_new_task(struct task_struct *p)
        trace_sched_wakeup_new(p);
        check_preempt_curr(rq, p, WF_FORK);
 #ifdef CONFIG_SMP
        trace_sched_wakeup_new(p);
        check_preempt_curr(rq, p, WF_FORK);
 #ifdef CONFIG_SMP

-       if (p->sched_class->task_woken)
+       if (p->sched_class->task_woken) {
+               /*
+                * Nothing relies on rq->lock after this, so its fine to
+                * drop it.
+                */
+               lockdep_unpin_lock(&rq->lock);

                p->sched_class->task_woken(rq, p);
                p->sched_class->task_woken(rq, p);

+               lockdep_pin_lock(&rq->lock);
+       }

 #endif
        task_rq_unlock(rq, p, &flags);
 }
 #endif
        task_rq_unlock(rq, p, &flags);
 }


@@ -4050,6 +4057,7 @@ int sched_setscheduler_nocheck(struct task_struct *p, int policy,
 {
        return _sched_setscheduler(p, policy, param, false);
 }
 {
        return _sched_setscheduler(p, policy, param, false);
 }

+EXPORT_SYMBOL_GPL(sched_setscheduler_nocheck);

 
 static int
 do_sched_setscheduler(pid_t pid, int policy, struct sched_param __user *param)
 
 static int
 do_sched_setscheduler(pid_t pid, int policy, struct sched_param __user *param)