linux-stable/arch/microblaze/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
..
cpu microblaze: Typo fix for cpu param inconsistency 2009-07-27 09:03:19 +02:00
asm-offsets.c microblaze_mmu_v2: MMU asm offset update 2009-05-26 16:45:19 +02:00
early_printk.c microblaze_mmu_v2: Alocate TLB for early console 2009-05-26 16:45:14 +02:00
entry-nommu.S microblaze: use generic syscalls.h 2009-07-06 10:26:59 +02:00
entry.S microblaze: use generic syscalls.h 2009-07-06 10:26:59 +02:00
exceptions.c microblaze_mmu_v2: Add MMU related exceptions handling 2009-05-26 16:45:20 +02:00
head.S microblaze: Clear print messages for DTB passing via r7 2009-07-27 07:39:54 +02:00
heartbeat.c microblaze_v8: heartbeat file 2009-03-27 14:25:24 +01:00
hw_exception_handler.S microblaze: Support unaligned address for put/get_user macros 2009-07-27 09:03:15 +02:00
init_task.c microblaze: remove init_mm 2009-06-20 14:36:50 +02:00
intc.c microblaze: Sane handling of missing timer/intc in device tree 2009-08-18 10:33:30 +02:00
irq.c microblaze: use the generic ack_bad_irq implementation 2009-08-18 10:33:29 +02:00
Makefile microblaze: Makefile cleanup 2009-07-27 09:03:20 +02:00
microblaze_ksyms.c microblaze: export some symbols 2009-05-21 15:56:05 +02:00
misc.S microblaze: Fix problem with early_printk in startup 2009-05-30 16:40:58 +02:00
module.c microblaze: Add support for R_MICROBLAZE_64_NONE 2009-07-27 09:03:18 +02:00
of_device.c microblaze: struct device - replace bus_id with dev_name() 2009-04-14 10:37:27 +02:00
of_platform.c microblaze_v8: Open firmware files 2009-03-27 14:25:12 +01:00
process.c microblaze_mmu_v2: Update process creation for MMU 2009-05-26 16:45:18 +02:00
prom.c microblaze: Fix cast warning for __va in prom.c 2009-05-21 16:39:58 +02:00
prom_parse.c microblaze_v8: Open firmware files 2009-03-27 14:25:12 +01:00
ptrace.c headers: smp_lock.h redux 2009-07-12 12:22:34 -07:00
selfmod.c microblaze_v8: Selfmodified code 2009-03-27 14:25:15 +01:00
setup.c microblaze: Add messages about FDT blob 2009-07-27 07:39:53 +02:00
signal.c headers: smp_lock.h redux 2009-07-12 12:22:34 -07:00
sys_microblaze.c microblaze: remove sys_ipc 2009-07-27 09:03:16 +02:00
syscall_table.S microblaze: Enable ppoll syscall 2009-08-18 10:33:31 +02:00
timer.c microblaze: Sane handling of missing timer/intc in device tree 2009-08-18 10:33:30 +02:00
traps.c microblaze_mmu_v2: Traps MMU update 2009-05-26 16:45:21 +02:00
vmlinux.lds.S linker script: unify usage of discard definition 2009-07-09 11:27:40 +09:00