Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0121b0c771f929bb5298554b70843ab46280c298

Authored by Linus Torvalds
2 parents a8941b0ed0 47a70985e5
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

…l/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: set_cpus_allowed_ptr(): Don't use rq->migration_thread after unlock
  sched: Fix proc_sched_set_task()

Showing 2 changed files Side-by-side Diff

... ... @@ -5387,7 +5387,7 @@
5387 5387  
5388 5388 get_task_struct(mt);
5389 5389 task_rq_unlock(rq, &flags);
5390   - wake_up_process(rq->migration_thread);
  5390 + wake_up_process(mt);
5391 5391 put_task_struct(mt);
5392 5392 wait_for_completion(&req.done);
5393 5393 tlb_migrate_finish(p->mm);
kernel/sched_debug.c
Diff comments   View file @ 0121b0c
... ... @@ -518,9 +518,5 @@
518 518 p->se.nr_wakeups_idle = 0;
519 519 p->sched_info.bkl_count = 0;
520 520 #endif
521   - p->se.sum_exec_runtime = 0;
522   - p->se.prev_sum_exec_runtime = 0;
523   - p->nvcsw = 0;
524   - p->nivcsw = 0;
525 521 }