]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
PERCPU : __percpu_alloc_mask() can dynamically size percpu_data storage
authorEric Dumazet <dada1@cosmosbay.com>
Wed, 6 Feb 2008 09:37:01 +0000 (01:37 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 6 Feb 2008 18:41:04 +0000 (10:41 -0800)
Instead of allocating a fix sized array of NR_CPUS pointers for percpu_data,
we can use nr_cpu_ids, which is generally < NR_CPUS.

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Cc: Christoph Lameter <clameter@sgi.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/percpu.h
mm/allocpercpu.c

index 50faa0ea28e4a7a392f617863e0ab82d4d9c330c..1ac969724bb2fff929c397be1cbdcdf007a61953 100644 (file)
@@ -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)
index 00b02623f008e924856329770c68ad0d3c3d7917..7e58322b7134ff1d04e40269e030bdd53e1c87f6 100644 (file)
@@ -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))