![]() 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> |
||
---|---|---|
.. | ||
skas | ||
asm-offsets.c | ||
config.c.in | ||
dyn.lds.S | ||
exec.c | ||
exitcode.c | ||
gmon_syms.c | ||
gprof_syms.c | ||
init_task.c | ||
initrd.c | ||
internal.h | ||
irq.c | ||
ksyms.c | ||
Makefile | ||
mem.c | ||
physmem.c | ||
process.c | ||
ptrace.c | ||
reboot.c | ||
sigio.c | ||
signal.c | ||
smp.c | ||
syscall.c | ||
sysrq.c | ||
time.c | ||
tlb.c | ||
trap.c | ||
uaccess.c | ||
um_arch.c | ||
umid.c | ||
uml.lds.S | ||
vmlinux.lds.S |