WSL2-Linux-Kernel/arch/m68k
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
..
amiga m68k: cnt reaches -1, not 0 2009-08-26 23:14:49 +02:00
apollo m68k: apollo core - Kill warn_unused_result warnings 2009-01-12 20:56:35 +01:00
atari m68k: atari - Rename "mfp" to "st_mfp" 2009-02-22 09:23:02 -08:00
bvme6000 m68k: Kill several external declarations in source files 2009-01-12 20:56:34 +01:00
configs m68k: Update defconfigs for 2.6.30-rc3 2009-04-22 20:55:12 +02:00
fpsp040 m68k: fix trigraph ignored warning in setox.S 2008-12-28 20:00:05 +01:00
hp300 m68k: hp300 core - Kill warn_unused_result warnings 2009-01-12 20:56:36 +01:00
ifpsp060 Stringify support commas 2008-07-20 17:24:38 -07:00
include/asm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2009-09-14 10:37:28 -07: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 Stringify support commas 2008-07-20 17:24:38 -07:00
mac m68k: mac - Add SWIM floppy support 2009-03-26 21:15:27 +01:00
math-emu locking, m68k/asm-offsets: Rename signal defines 2009-09-01 09:38:03 +02:00
mm Move FAULT_FLAG_xyz into handle_mm_fault() callers 2009-06-21 13:08:22 -07:00
mvme16x m68k: Kill several external declarations in source files 2009-01-12 20:56:34 +01:00
mvme147 m68k: mvme147 core - Kill warn_unused_result warnings 2009-01-12 20:56:37 +01:00
q40 m68k: Kill several external declarations in source files 2009-01-12 20:56:34 +01:00
sun3 m68k: sun3 core - Kill warn_unused_result warnings 2009-01-12 20:56:38 +01:00
sun3x m68k: Kill several external declarations in source files 2009-01-12 20:56:34 +01:00
tools/amiga Convert files to UTF-8 and some cleanups 2007-10-19 23:21:04 +02:00
Kconfig trivial: fix then -> than typos in comments and documentation 2009-01-06 11:28:06 +01:00
Kconfig.debug Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile m68k: Add install target 2009-03-26 21:15:26 +01:00
install.sh m68k: Add install target 2009-03-26 21:15:26 +01:00