mirror of
https://github.com/torvalds/linux
synced 2024-09-28 07:20:56 +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> |
||
|---|---|---|
| .. | ||
| k7.c | ||
| Makefile | ||
| mce-inject.c | ||
| mce-internal.h | ||
| mce-severity.c | ||
| mce.c | ||
| mce_amd.c | ||
| mce_intel.c | ||
| non-fatal.c | ||
| p4.c | ||
| p5.c | ||
| p6.c | ||
| therm_throt.c | ||
| threshold.c | ||
| winchip.c | ||