Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 58303
b: refs/heads/master
c: 9761eea
h: refs/heads/master
i:
  58301: 2393e64
  58299: 3eeb842
  58295: c8c90e9
  58287: fe2375f
  58271: fa36a9d
  58239: 4262ba0
v: v3
  • Loading branch information
Ingo Molnar committed Jul 9, 2007
1 parent 35cc4e4 commit 5133c85
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 23bdd703a585a869f2eb32fb9f66749d0476d71e
refs/heads/master: 9761eea8516d1ff2c7b185e283c5d81cfc307acb
13 changes: 7 additions & 6 deletions trunk/kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -1265,9 +1265,9 @@ static int sched_balance_self(int cpu, int flag)
struct sched_domain *tmp, *sd = NULL;

for_each_domain(cpu, tmp) {
/*
* If power savings logic is enabled for a domain, stop there.
*/
/*
* If power savings logic is enabled for a domain, stop there.
*/
if (tmp->flags & SD_POWERSAVINGS_BALANCE)
break;
if (tmp->flags & flag)
Expand Down Expand Up @@ -1350,9 +1350,9 @@ static int wake_idle(int cpu, struct task_struct *p)
if (idle_cpu(i))
return i;
}
}
else
} else {
break;
}
}
return cpu;
}
Expand Down Expand Up @@ -1702,7 +1702,7 @@ static inline void finish_task_switch(struct rq *rq, struct task_struct *prev)
/*
* Remove function-return probe instances associated with this
* task and put them back on the free list.
*/
*/
kprobe_flush_task(prev);
put_task_struct(prev);
}
Expand Down Expand Up @@ -5920,6 +5920,7 @@ static int build_sched_domains(const cpumask_t *cpu_map)
sched_group_nodes[i] = sg;
for_each_cpu_mask(j, nodemask) {
struct sched_domain *sd;

sd = &per_cpu(node_domains, j);
sd->groups = sg;
}
Expand Down

0 comments on commit 5133c85

Please sign in to comment.