---

yaml --- r: 136958 b: refs/heads/master c: cb83b42 h: refs/heads/master v: v3
git-mirror · Feb 24, 2009 · 717c3ac · 717c3ac
1 parent b30bc0e
commit 717c3ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cae3aeb83fef5a7c9c8ac40e653e59dd9a35469c
+refs/heads/master: cb83b42e23bd6c4bf91793a320fbe83787c13596
diff --git a/trunk/mm/percpu.c b/trunk/mm/percpu.c
@@ -850,7 +850,7 @@ size_t __init pcpu_setup_static(pcpu_populate_pte_fn_t populate_pte_fn,
 	pcpu_chunk_size = num_possible_cpus() * pcpu_unit_size;
 	pcpu_nr_slots = pcpu_size_to_slot(pcpu_unit_size) + 1;
 	pcpu_chunk_struct_size = sizeof(struct pcpu_chunk)
-		+ (1 << pcpu_unit_pages_shift) * sizeof(struct page *);
+		+ num_possible_cpus() * pcpu_unit_pages * sizeof(struct page *);
 
 	/* allocate chunk slots */
 	pcpu_slot = alloc_bootmem(pcpu_nr_slots * sizeof(pcpu_slot[0]));