linux/arch/cris/kernel
Linus Torvalds ada3fa1505 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (46 commits)
  powerpc64: convert to dynamic percpu allocator
  sparc64: use embedding percpu first chunk allocator
  percpu: kill lpage first chunk allocator
  x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA
  percpu: update embedding first chunk allocator to handle sparse units
  percpu: use group information to allocate vmap areas sparsely
  vmalloc: implement pcpu_get_vm_areas()
  vmalloc: separate out insert_vmalloc_vm()
  percpu: add chunk->base_addr
  percpu: add pcpu_unit_offsets[]
  percpu: introduce pcpu_alloc_info and pcpu_group_info
  percpu: move pcpu_lpage_build_unit_map() and pcpul_lpage_dump_cfg() upward
  percpu: add @align to pcpu_fc_alloc_fn_t
  percpu: make @dyn_size mandatory for pcpu_setup_first_chunk()
  percpu: drop @static_size from first chunk allocators
  percpu: generalize first chunk allocator selection
  percpu: build first chunk allocators selectively
  percpu: rename 4k first chunk allocator to page
  percpu: improve boot messages
  percpu: fix pcpu_reclaim() locking
  ...

Fix trivial conflict as by Tejun Heo in kernel/sched.c
2009-09-15 09:39:44 -07: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 Generic semaphore implementation 2008-04-17 10:42:34 -04:00
irq.c sparseirq: use kstat_irqs_cpu on non-x86 architectures too 2009-01-12 20:01:12 +01:00
Makefile Generic semaphore implementation 2008-04-17 10:42:34 -04:00
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 KEYS: Add missing linux/tracehook.h #inclusions 2009-09-09 18:30:02 +10:00
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