linux/arch/m32r/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
..
align.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
asm-offsets.c kbuild: frv,m32r,sparc64 introduce fake asm-offsets.h file 2005-09-09 22:47:53 +02:00
entry.S m32r/kernel/: cleanups 2008-09-27 18:27:21 +09:00
head.S m32r: convert to use __HEAD and HEAD_TEXT macros. 2009-04-26 09:20:38 -07:00
init_task.c mm: consolidate init_mm definition 2009-06-16 19:47:28 -07:00
irq.c sparseirq: use kstat_irqs_cpu instead 2009-01-11 15:53:13 +01:00
m32r_ksyms.c m32r: export empty_zero_page 2008-09-27 18:27:21 +09:00
Makefile m32r: build fix for __stringify macro 2009-05-02 21:43:26 +09:00
module.c module: cleanup FIXME comments about trimming exception table entries. 2009-06-12 21:47:05 +09:30
process.c ptrace: remove PT_DTRACE from arch/m32r 2009-06-18 13:03:49 -07:00
ptrace.c headers: smp_lock.h redux 2009-07-12 12:22:34 -07:00
setup.c procfs: constify function pointer tables 2008-02-08 09:22:38 -08:00
signal.c KEYS: Add missing linux/tracehook.h #inclusions 2009-09-09 18:30:02 +10:00
smp.c m32r/kernel/: cleanups 2008-09-27 18:27:21 +09:00
smpboot.c percpu: fix percpu accessors to potentially !cpu_possible() cpus: m32r 2009-01-01 10:12:14 +10:30
sys_m32r.c m32r: use generic sys_pipe 2008-05-09 08:04:56 -07:00
syscall_table.S timerfd: fix remaining architectures 2008-02-05 14:37:15 -08:00
time.c cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
traps.c m32r/kernel/: cleanups 2008-09-27 18:27:21 +09:00
vmlinux.lds.S linker script: unify usage of discard definition 2009-07-09 11:27:40 +09:00