linux/arch/m68knommu
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
..
configs m68knommu: update the default config for the ColdFire 5407C3 board 2009-04-23 09:23:32 +10:00
kernel Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2009-09-15 09:39:44 -07:00
lib Generic semaphore implementation 2008-04-17 10:42:34 -04:00
mm arch/m68knommu: Convert #ifdef DEBUG printk(KERN_DEBUG to pr_debug( 2009-06-11 13:09:11 +10:00
platform m68knommu: remove obsolete reset code 2009-06-11 13:09:11 +10:00
Kconfig m68knommu: fix DMA support for ColdFire 2009-04-22 14:45:08 +10:00
Kconfig.debug m68knommu: removing config variable DUMPTOFLASH 2008-02-05 09:44:21 -08:00
Makefile m68knommu: improve compile arch switch settings 2009-03-30 10:29:45 +10:00
defconfig m68knommu: update defconfig 2008-03-04 08:04:11 -08:00