summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-04 12:12:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-04 12:12:31 -0700
commit0121b0c771f929bb5298554b70843ab46280c298 (patch)
treef6d9f9102eeffdc8231a08c95444136f402ebf5b /kernel
parenta8941b0ed0f1e39a4d41560c3a2e7ee37d5b6e10 (diff)
parent47a70985e5c093ae03d8ccf633c70a93761d86f2 (diff)
downloadblackbird-obmc-linux-0121b0c771f929bb5298554b70843ab46280c298.tar.gz
blackbird-obmc-linux-0121b0c771f929bb5298554b70843ab46280c298.zip
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()
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c2
-rw-r--r--kernel/sched_debug.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 49d2fa7b687a..528a10592c16 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -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);
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index 67f95aada4b9..9b49db144037 100644
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -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;
}
OpenPOWER on IntegriCloud