Merge branch 'linus' into core/rcu, to fix up a semantic conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined kernel/sched/core.c
index 42d273d349b4e6e14a4f524a081103ad57285916,bcd214e4b4d630eb3304f6000a220dc881bafc24..f7402f7eb44803a6659b5f2b6337d64624dd8d0a
--- 1/kernel/sched/core.c
--- 2/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -2366,8 -2366,15 +2366,15 @@@ void wake_up_new_task(struct task_struc
        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);
+               lockdep_pin_lock(&rq->lock);
+       }
  #endif
        task_rq_unlock(rq, p, &flags);
  }
@@@ -4022,7 -4029,6 +4029,7 @@@ int sched_setscheduler_nocheck(struct t
  {
        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)
@@@ -7239,9 -7245,6 +7246,6 @@@ void __init sched_init_smp(void
        alloc_cpumask_var(&non_isolated_cpus, GFP_KERNEL);
        alloc_cpumask_var(&fallback_doms, GFP_KERNEL);
  
-       /* nohz_full won't take effect without isolating the cpus. */
-       tick_nohz_full_add_cpus_to(cpu_isolated_map);
- 
        sched_init_numa();
  
        /*