384be2b18a
Conflicts: arch/sparc/kernel/smp_64.c arch/x86/kernel/cpu/perf_counter.c arch/x86/kernel/setup_percpu.c drivers/cpufreq/cpufreq_ondemand.c mm/percpu.c Conflicts in core and arch percpu codes are mostly from commit ed78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many num_possible_cpus() with nr_cpu_ids. As for-next branch has moved all the first chunk allocators into mm/percpu.c, the changes are moved from arch code to mm/percpu.c. Signed-off-by: Tejun Heo <tj@kernel.org> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| calibrate.c | ||
| do_mounts.c | ||
| do_mounts.h | ||
| do_mounts_initrd.c | ||
| do_mounts_md.c | ||
| do_mounts_rd.c | ||
| initramfs.c | ||
| main.c | ||
| noinitramfs.c | ||
| version.c | ||