Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 30799
b: refs/heads/master
c: 15f0b67
h: refs/heads/master
i:
  30797: be811a5
  30795: 0b6dc49
  30791: 8d425b7
  30783: 3e3c924
v: v3
  • Loading branch information
Srivatsa Vaddagiri authored and Linus Torvalds committed Jun 28, 2006
1 parent 485171a commit 1b35455
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 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: d3a5aa9858cc9cecc3aadac7311d376c7c9e101a
refs/heads/master: 15f0b676a482fb4067cfe25de417c417dda3440a
5 changes: 3 additions & 2 deletions trunk/kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -6022,7 +6022,7 @@ static int build_sched_domains(const cpumask_t *cpu_map)
domainspan = sched_domain_node_span(i);
cpus_and(domainspan, domainspan, *cpu_map);

sg = kmalloc(sizeof(struct sched_group), GFP_KERNEL);
sg = kmalloc_node(sizeof(struct sched_group), GFP_KERNEL, i);
if (!sg) {
printk(KERN_WARNING "Can not alloc domain group for "
"node %d\n", i);
Expand Down Expand Up @@ -6055,7 +6055,8 @@ static int build_sched_domains(const cpumask_t *cpu_map)
if (cpus_empty(tmp))
continue;

sg = kmalloc(sizeof(struct sched_group), GFP_KERNEL);
sg = kmalloc_node(sizeof(struct sched_group),
GFP_KERNEL, i);
if (!sg) {
printk(KERN_WARNING
"Can not alloc domain group for node %d\n", j);
Expand Down

0 comments on commit 1b35455

Please sign in to comment.