Merge commit 'v2.6.37-rc7' into perf/core

[firefly-linux-kernel-4.4.55.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 456c99054160a773fa6736005397a3bc138f6902..c68cead94dd76942beeffa932498d0ae5a2cfe41 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4128,7 +4128,6 @@ need_resched_nonpreemptible:
                rq->nr_switches++;
                rq->curr = next;
                ++*switch_count;
-               WARN_ON_ONCE(test_tsk_need_resched(next));
 
                context_switch(rq, prev, next); /* unlocks the rq */
                /*
@@ -8294,8 +8293,6 @@ void __init sched_init(void)
                zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
 #endif /* SMP */
 
-       perf_event_init();
-
        scheduler_running = 1;
 }