forked from luck/tmp_suning_uos_patched
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> |
||
|---|---|---|
| .. | ||
| align.c | ||
| asm-offsets.c | ||
| entry.S | ||
| head.S | ||
| init_task.c | ||
| irq.c | ||
| m32r_ksyms.c | ||
| Makefile | ||
| module.c | ||
| process.c | ||
| ptrace.c | ||
| setup.c | ||
| signal.c | ||
| smp.c | ||
| smpboot.c | ||
| sys_m32r.c | ||
| syscall_table.S | ||
| time.c | ||
| traps.c | ||
| vmlinux.lds.S | ||