Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0121b0c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-fixes-for-linus' of... 

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/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()
parents a8941b0e 47a70985

kernel/sched.c

+1 −1
Original line number Diff line number Diff line
@@ -5387,7 +5387,7 @@ int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask) 


		get_task_struct(mt);

		task_rq_unlock(rq, &flags);

		wake_up_process(rq->migration_thread);

		wake_up_process(mt);

		put_task_struct(mt);

		wait_for_completion(&req.done);

		tlb_migrate_finish(p->mm);

kernel/sched_debug.c

+0 −4
Original line number Diff line number Diff line
@@ -518,8 +518,4 @@ void proc_sched_set_task(struct task_struct *p) 
	p->se.nr_wakeups_idle			= 0;

	p->sched_info.bkl_count			= 0;

#endif

	p->se.sum_exec_runtime			= 0;

	p->se.prev_sum_exec_runtime		= 0;

	p->nvcsw				= 0;

	p->nivcsw				= 0;

}