X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=mm%2Fallocpercpu.c;h=00b02623f008e924856329770c68ad0d3c3d7917;hb=75ecb1a4d148b274aa9acd1d6ccaca0a4654784e;hp=b2486cf887a06c1ecbd3c3d60d10682e2e5fc7d0;hpb=11c302c14d8ddc47504bd3b650bc9e8da7c717b7;p=linux-2.6

diff --git a/mm/allocpercpu.c b/mm/allocpercpu.c
index b2486cf887..00b02623f0 100644
--- a/mm/allocpercpu.c
+++ b/mm/allocpercpu.c
@@ -53,12 +53,9 @@ void *percpu_populate(void *__pdata, size_t size, gfp_t gfp, int cpu)
 	int node = cpu_to_node(cpu);
 
 	BUG_ON(pdata->ptrs[cpu]);
-	if (node_online(node)) {
-		/* FIXME: kzalloc_node(size, gfp, node) */
-		pdata->ptrs[cpu] = kmalloc_node(size, gfp, node);
-		if (pdata->ptrs[cpu])
-			memset(pdata->ptrs[cpu], 0, size);
-	} else
+	if (node_online(node))
+		pdata->ptrs[cpu] = kmalloc_node(size, gfp|__GFP_ZERO, node);
+	else
 		pdata->ptrs[cpu] = kzalloc(size, gfp);
 	return pdata->ptrs[cpu];
 }