aboutsummaryrefslogtreecommitdiffstats
path: root/mm/percpu.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-09-28 20:17:56 -0400
committerTejun Heo <tj@kernel.org>2009-09-28 20:17:56 -0400
commitffe0d5a575459ffe664b0762130b557f826fcace (patch)
treeaf581934a717c510a2c6897ca4ed7fcefd440578 /mm/percpu.c
parent17d857be649a21ca90008c6dc425d849fa83db5c (diff)
percpu: fix unit_map[] verification in pcpu_setup_first_chunk()
pcpu_setup_first_chunk() incorrectly used NR_CPUS as the impossible unit number while unit number can equal and go over NR_CPUS with sparse unit map. This triggers BUG_ON() spuriously on machines which have non-power-of-two number of cpus. Use UINT_MAX instead. Signed-off-by: Tejun Heo <tj@kernel.org> Reported-and-tested-by: Tony Vroon <tony@linx.net>
Diffstat (limited to 'mm/percpu.c')
-rw-r--r--mm/percpu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/percpu.c b/mm/percpu.c
index 43d8cacfdaa5..e5c4cbda6026 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1604,7 +1604,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
1604 unit_off = alloc_bootmem(nr_cpu_ids * sizeof(unit_off[0])); 1604 unit_off = alloc_bootmem(nr_cpu_ids * sizeof(unit_off[0]));
1605 1605
1606 for (cpu = 0; cpu < nr_cpu_ids; cpu++) 1606 for (cpu = 0; cpu < nr_cpu_ids; cpu++)
1607 unit_map[cpu] = NR_CPUS; 1607 unit_map[cpu] = UINT_MAX;
1608 pcpu_first_unit_cpu = NR_CPUS; 1608 pcpu_first_unit_cpu = NR_CPUS;
1609 1609
1610 for (group = 0, unit = 0; group < ai->nr_groups; group++, unit += i) { 1610 for (group = 0, unit = 0; group < ai->nr_groups; group++, unit += i) {
@@ -1619,7 +1619,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
1619 continue; 1619 continue;
1620 1620
1621 BUG_ON(cpu > nr_cpu_ids || !cpu_possible(cpu)); 1621 BUG_ON(cpu > nr_cpu_ids || !cpu_possible(cpu));
1622 BUG_ON(unit_map[cpu] != NR_CPUS); 1622 BUG_ON(unit_map[cpu] != UINT_MAX);
1623 1623
1624 unit_map[cpu] = unit + i; 1624 unit_map[cpu] = unit + i;
1625 unit_off[cpu] = gi->base_offset + i * ai->unit_size; 1625 unit_off[cpu] = gi->base_offset + i * ai->unit_size;
@@ -1632,7 +1632,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
1632 pcpu_nr_units = unit; 1632 pcpu_nr_units = unit;
1633 1633
1634 for_each_possible_cpu(cpu) 1634 for_each_possible_cpu(cpu)
1635 BUG_ON(unit_map[cpu] == NR_CPUS); 1635 BUG_ON(unit_map[cpu] == UINT_MAX);
1636 1636
1637 pcpu_nr_groups = ai->nr_groups; 1637 pcpu_nr_groups = ai->nr_groups;
1638 pcpu_group_offsets = group_offsets; 1638 pcpu_group_offsets = group_offsets;