---

yaml --- r: 83418 b: refs/heads/master c: b324215 h: refs/heads/master v: v3
git-mirror · Feb 6, 2008 · cd51c82 · cd51c82
1 parent 9a0237f
commit cd51c82
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7ca2d41a029577a8cff453d1445951d4f96bfd8
+refs/heads/master: b3242151906372f30f57feaa43b4cac96a23edb1
diff --git a/trunk/include/linux/percpu.h b/trunk/include/linux/percpu.h
@@ -54,7 +54,7 @@
 #ifdef CONFIG_SMP
 
 struct percpu_data {
-	void *ptrs[NR_CPUS];
+	void *ptrs[1];
 };
 
 #define __percpu_disguise(pdata) (struct percpu_data *)~(unsigned long)(pdata)

diff --git a/trunk/mm/allocpercpu.c b/trunk/mm/allocpercpu.c
@@ -98,7 +98,7 @@ EXPORT_SYMBOL_GPL(__percpu_populate_mask);
  */
 void *__percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t *mask)
 {
-	void *pdata = kzalloc(sizeof(struct percpu_data), gfp);
+	void *pdata = kzalloc(nr_cpu_ids * sizeof(void *), gfp);
 	void *__pdata = __percpu_disguise(pdata);
 
 	if (unlikely(!pdata))