diff options
Diffstat (limited to 'mm/allocpercpu.c')
-rw-r--r-- | mm/allocpercpu.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mm/allocpercpu.c b/mm/allocpercpu.c index b2486cf887a0..00b02623f008 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) | |||
53 | int node = cpu_to_node(cpu); | 53 | int node = cpu_to_node(cpu); |
54 | 54 | ||
55 | BUG_ON(pdata->ptrs[cpu]); | 55 | BUG_ON(pdata->ptrs[cpu]); |
56 | if (node_online(node)) { | 56 | if (node_online(node)) |
57 | /* FIXME: kzalloc_node(size, gfp, node) */ | 57 | pdata->ptrs[cpu] = kmalloc_node(size, gfp|__GFP_ZERO, node); |
58 | pdata->ptrs[cpu] = kmalloc_node(size, gfp, node); | 58 | else |
59 | if (pdata->ptrs[cpu]) | ||
60 | memset(pdata->ptrs[cpu], 0, size); | ||
61 | } else | ||
62 | pdata->ptrs[cpu] = kzalloc(size, gfp); | 59 | pdata->ptrs[cpu] = kzalloc(size, gfp); |
63 | return pdata->ptrs[cpu]; | 60 | return pdata->ptrs[cpu]; |
64 | } | 61 | } |