mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-26 19:36:41 +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> |
||
|---|---|---|
| .. | ||
| cpu | ||
| vsyscall | ||
| .gitignore | ||
| asm-offsets.c | ||
| cpufreq.c | ||
| crash_dump.c | ||
| debugtraps.S | ||
| disassemble.c | ||
| early_printk.c | ||
| entry-common.S | ||
| ftrace.c | ||
| gpio.c | ||
| head_32.S | ||
| head_64.S | ||
| idle.c | ||
| init_task.c | ||
| io_generic.c | ||
| io_trapped.c | ||
| io.c | ||
| irq.c | ||
| kgdb.c | ||
| kprobes.c | ||
| localtimer.c | ||
| machine_kexec.c | ||
| machvec.c | ||
| Makefile | ||
| Makefile_32 | ||
| Makefile_64 | ||
| module.c | ||
| process_32.c | ||
| process_64.c | ||
| ptrace_32.c | ||
| ptrace_64.c | ||
| relocate_kernel.S | ||
| setup.c | ||
| sh_bios.c | ||
| sh_ksyms_32.c | ||
| sh_ksyms_64.c | ||
| signal_32.c | ||
| signal_64.c | ||
| smp.c | ||
| stacktrace.c | ||
| swsusp.c | ||
| sys_sh32.c | ||
| sys_sh64.c | ||
| sys_sh.c | ||
| syscalls_32.S | ||
| syscalls_64.S | ||
| time.c | ||
| topology.c | ||
| traps_32.c | ||
| traps_64.c | ||
| traps.c | ||
| vmlinux.lds.S | ||