mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 17:41:44 +00:00
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> |
||
---|---|---|
.. | ||
configs | ||
hpux | ||
include/asm | ||
kernel | ||
lib | ||
math-emu | ||
mm | ||
oprofile | ||
defpalo.conf | ||
install.sh | ||
Kconfig | ||
Kconfig.debug | ||
Makefile | ||
nm |