diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-02-14 05:55:18 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-02-14 05:55:18 -0500 |
commit | d2137d5af4259f50c19addb8246a186c9ffac325 (patch) | |
tree | 2f7e309f9cf8ef2f2698532c226edda38021fe69 /mm/percpu.c | |
parent | f005fe12b90c5b9fe180a09209a893e09affa8aa (diff) | |
parent | 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 (diff) |
Merge branch 'linus' into x86/bootmem
Conflicts:
arch/x86/mm/numa_64.c
Merge reason: fix the conflict, update to latest -rc and pick up this
dependent fix from Yinghai:
e6d2e2b2b1e1: memblock: don't adjust size in memblock_find_base()
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm/percpu.c')
-rw-r--r-- | mm/percpu.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index efe816856a9d..3f930018aa60 100644 --- a/mm/percpu.c +++ b/mm/percpu.c | |||
@@ -258,7 +258,7 @@ static void __maybe_unused pcpu_next_pop(struct pcpu_chunk *chunk, | |||
258 | 258 | ||
259 | /* | 259 | /* |
260 | * (Un)populated page region iterators. Iterate over (un)populated | 260 | * (Un)populated page region iterators. Iterate over (un)populated |
261 | * page regions betwen @start and @end in @chunk. @rs and @re should | 261 | * page regions between @start and @end in @chunk. @rs and @re should |
262 | * be integer variables and will be set to start and end page index of | 262 | * be integer variables and will be set to start and end page index of |
263 | * the current region. | 263 | * the current region. |
264 | */ | 264 | */ |
@@ -293,12 +293,8 @@ static void *pcpu_mem_alloc(size_t size) | |||
293 | 293 | ||
294 | if (size <= PAGE_SIZE) | 294 | if (size <= PAGE_SIZE) |
295 | return kzalloc(size, GFP_KERNEL); | 295 | return kzalloc(size, GFP_KERNEL); |
296 | else { | 296 | else |
297 | void *ptr = vmalloc(size); | 297 | return vzalloc(size); |
298 | if (ptr) | ||
299 | memset(ptr, 0, size); | ||
300 | return ptr; | ||
301 | } | ||
302 | } | 298 | } |
303 | 299 | ||
304 | /** | 300 | /** |
@@ -1268,7 +1264,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai, | |||
1268 | 1264 | ||
1269 | /* we're done parsing the input, undefine BUG macro and dump config */ | 1265 | /* we're done parsing the input, undefine BUG macro and dump config */ |
1270 | #undef PCPU_SETUP_BUG_ON | 1266 | #undef PCPU_SETUP_BUG_ON |
1271 | pcpu_dump_alloc_info(KERN_INFO, ai); | 1267 | pcpu_dump_alloc_info(KERN_DEBUG, ai); |
1272 | 1268 | ||
1273 | pcpu_nr_groups = ai->nr_groups; | 1269 | pcpu_nr_groups = ai->nr_groups; |
1274 | pcpu_group_offsets = group_offsets; | 1270 | pcpu_group_offsets = group_offsets; |