* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (46 commits) powerpc64: convert to dynamic percpu allocator sparc64: use embedding percpu first chunk allocator percpu: kill lpage first chunk allocator x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA percpu: update embedding first chunk allocator to handle sparse units percpu: use group information to allocate vmap areas sparsely vmalloc: implement pcpu_get_vm_areas() vmalloc: separate out insert_vmalloc_vm() percpu: add chunk->base_addr percpu: add pcpu_unit_offsets[] percpu: introduce pcpu_alloc_info and pcpu_group_info percpu: move pcpu_lpage_build_unit_map() and pcpul_lpage_dump_cfg() upward percpu: add @align to pcpu_fc_alloc_fn_t percpu: make @dyn_size mandatory for pcpu_setup_first_chunk() percpu: drop @static_size from first chunk allocators percpu: generalize first chunk allocator selection percpu: build first chunk allocators selectively percpu: rename 4k first chunk allocator to page percpu: improve boot messages percpu: fix pcpu_reclaim() locking ... Fix trivial conflict as by Tejun Heo in kernel/sched.c
Showing the changes to kernel/module.c (1 of 80 files). Show all
Unified · Split
| @@ -369,7 +369,7 @@ EXPORT_SYMBOL_GPL(find_module); · 368 unmodified lines | ||
| 369 | 369 | |
| 370 | 370 | #ifdef CONFIG_SMP |
| 371 | 371 | |
| 372 | −#ifdef CONFIG_HAVE_DYNAMIC_PER_CPU_AREA | |
| 372 | +#ifndef CONFIG_HAVE_LEGACY_PER_CPU_AREA | |
| 373 | 373 | |
| 374 | 374 | static void *percpu_modalloc(unsigned long size, unsigned long align, |
| 375 | 375 | const char *name) |
| @@ -394,7 +394,7 @@ static void percpu_modfree(void *freeme) · 18 unmodified lines | ||
| 394 | 394 | free_percpu(freeme); |
| 395 | 395 | } |
| 396 | 396 | |
| 397 | −#else /* ... !CONFIG_HAVE_DYNAMIC_PER_CPU_AREA */ | |
| 397 | +#else /* ... CONFIG_HAVE_LEGACY_PER_CPU_AREA */ | |
| 398 | 398 | |
| 399 | 399 | /* Number of blocks used and allocated. */ |
| 400 | 400 | static unsigned int pcpu_num_used, pcpu_num_allocated; |
| @@ -540,7 +540,7 @@ static int percpu_modinit(void) · 139 unmodified lines | ||
| 540 | 540 | } |
| 541 | 541 | __initcall(percpu_modinit); |
| 542 | 542 | |
| 543 | −#endif /* CONFIG_HAVE_DYNAMIC_PER_CPU_AREA */ | |
| 543 | +#endif /* CONFIG_HAVE_LEGACY_PER_CPU_AREA */ | |
| 544 | 544 | |
| 545 | 545 | static unsigned int find_pcpusec(Elf_Ehdr *hdr, |
| 546 | 546 | Elf_Shdr *sechdrs, |