android_kernel_xiaomi_sm8350/arch/cris/kernel
Tejun Heo 384be2b18a Merge branch 'percpu-for-linus' into percpu-for-next
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>
2009-08-14 14:45:31 +09:00
..
asm-offsets.c [CRIS] Merge asm-offsets.c for both arches into one file. 2008-10-31 23:37:00 +01:00
crisksyms.c
irq.c sparseirq: use kstat_irqs_cpu on non-x86 architectures too 2009-01-12 20:01:12 +01:00
Makefile
module.c module: cleanup FIXME comments about trimming exception table entries. 2009-06-12 21:47:05 +09:30
process.c mm: consolidate init_mm definition 2009-06-16 19:47:28 -07:00
profile.c cris: use simple_read_from_buffer() 2008-07-24 10:47:24 -07:00
ptrace.c
setup.c cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: cris 2009-03-16 14:11:46 +10:30
sys_cris.c headers: smp_lock.h redux 2009-07-12 12:22:34 -07:00
time.c cris: use bcd2bin/bin2bcd 2008-10-20 08:52:41 -07:00
traps.c
vmlinux.lds.S linker script: unify usage of discard definition 2009-07-09 11:27:40 +09:00