1
0
Fork 0
alistair23-linux/arch/sh
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
..
boards sh: use in-soc KEYSC on se7724 2009-08-15 12:58:47 +09:00
boot sh: Merge the split arch/sh/boot/compressed/ Makefiles. 2009-05-10 00:58:21 +09:00
cchips sh: mach-hp6xx: Fix up the hp6xx build for hd64461 changes. 2009-05-20 11:27:13 +09:00
configs sh: re-add LCDC fbdev support to the Migo-R defconfig 2009-07-01 15:31:33 +09:00
drivers sh: pci: Initial PCI-Express support for SH7786 Urquell board. 2009-06-17 18:20:48 +09:00
include net: sh_eth: add value of ether_link pin in platform_data 2009-08-29 00:19:35 -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 sh: Handle calling csum_partial with misaligned data 2009-01-29 11:56:02 +09:00
lib64 sh: Convert sh64 to use the generic checksum code. 2009-06-15 00:00:42 +09:00
math-emu sh: Fix up the math-emu build. 2007-06-11 15:57:42 +09:00
mm headers: smp_lock.h redux 2009-07-12 12:22:34 -07:00
oprofile sh: Add support for SH7724 (SH-Mobile R2R) CPU subtype. 2009-04-16 14:40:56 +09:00
tools sh: Record ms7724se in mach-types. 2009-05-26 17:02:18 +09:00
Kconfig sh: Fix up HAVE_PERF_COUNTERS typo. 2009-06-24 01:41:05 +09:00
Kconfig.cpu sh: Tidy up SH-4A boot_cpu_data.flags probing. 2009-06-01 19:50:08 +09:00
Kconfig.debug sh: Kill off unused DEBUG_BOOTMEM symbol. 2009-06-25 21:17:19 +09:00
Makefile sh: plug vsyscall dir in to archclean. 2009-06-10 09:48:33 +03:00