Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 125311
b: refs/heads/master
c: ea6f18e
h: refs/heads/master
i:
  125309: 602c84f
  125307: 2075a49
  125303: f7b7a5d
  125295: ef99836
  125279: e20991d
  125247: 6903fcf
  125183: eed1172
v: v3
  • Loading branch information
Mike Travis authored and Ingo Molnar committed Nov 24, 2008
1 parent 43eeb50 commit 187885d
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: 943f3d030003e1fa5f77647328e805441213bf49
refs/heads/master: ea6f18ed5a1531caf678374f30a0990c9e6742f3
13 changes: 7 additions & 6 deletions trunk/kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -6110,8 +6110,9 @@ static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p)

do {
/* On same node? */
mask = node_to_cpumask(cpu_to_node(dead_cpu));
cpus_and(mask, mask, p->cpus_allowed);
node_to_cpumask_ptr(pnodemask, cpu_to_node(dead_cpu));

cpus_and(mask, *pnodemask, p->cpus_allowed);
dest_cpu = any_online_cpu(mask);

/* On any allowed CPU? */
Expand Down Expand Up @@ -7098,9 +7099,9 @@ static int cpu_to_allnodes_group(int cpu, const cpumask_t *cpu_map,
struct sched_group **sg, cpumask_t *nodemask)
{
int group;
node_to_cpumask_ptr(pnodemask, cpu_to_node(cpu));

*nodemask = node_to_cpumask(cpu_to_node(cpu));
cpus_and(*nodemask, *nodemask, *cpu_map);
cpus_and(*nodemask, *pnodemask, *cpu_map);
group = first_cpu(*nodemask);

if (sg)
Expand Down Expand Up @@ -7150,9 +7151,9 @@ static void free_sched_groups(const cpumask_t *cpu_map, cpumask_t *nodemask)

for (i = 0; i < nr_node_ids; i++) {
struct sched_group *oldsg, *sg = sched_group_nodes[i];
node_to_cpumask_ptr(pnodemask, i);

*nodemask = node_to_cpumask(i);
cpus_and(*nodemask, *nodemask, *cpu_map);
cpus_and(*nodemask, *pnodemask, *cpu_map);
if (cpus_empty(*nodemask))
continue;

Expand Down

0 comments on commit 187885d

Please sign in to comment.