aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 1aa840a9f585..3f5bfdc3d94d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6126,8 +6126,6 @@ static int __migrate_task_irq(struct task_struct *p, int src_cpu, int dest_cpu)
6126 */ 6126 */
6127static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p) 6127static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p)
6128{ 6128{
6129 unsigned long flags;
6130 struct rq *rq;
6131 int dest_cpu; 6129 int dest_cpu;
6132 /* FIXME: Use cpumask_of_node here. */ 6130 /* FIXME: Use cpumask_of_node here. */
6133 cpumask_t _nodemask = node_to_cpumask(cpu_to_node(dead_cpu)); 6131 cpumask_t _nodemask = node_to_cpumask(cpu_to_node(dead_cpu));
@@ -6146,10 +6144,8 @@ again:
6146 6144
6147 /* No more Mr. Nice Guy. */ 6145 /* No more Mr. Nice Guy. */
6148 if (dest_cpu >= nr_cpu_ids) { 6146 if (dest_cpu >= nr_cpu_ids) {
6149 rq = task_rq_lock(p, &flags);
6150 cpuset_cpus_allowed_locked(p, &p->cpus_allowed); 6147 cpuset_cpus_allowed_locked(p, &p->cpus_allowed);
6151 dest_cpu = cpumask_any_and(cpu_online_mask, &p->cpus_allowed); 6148 dest_cpu = cpumask_any_and(cpu_online_mask, &p->cpus_allowed);
6152 task_rq_unlock(rq, &flags);
6153 6149
6154 /* 6150 /*
6155 * Don't tell them about moving exiting tasks or 6151 * Don't tell them about moving exiting tasks or