kernel_optimize_test/arch/frv/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
..
asm-offsets.c
break.S
cmode.S
debug-stub.c
dma.c
entry-table.S
entry.S FRV: Wire up new syscalls 2009-06-30 18:58:37 -07:00
frv_ksyms.c FRV: Implement atomic64_t 2009-07-01 19:38:09 -07:00
futex.c
gdb-io.c
gdb-io.h
gdb-stub.c
head-mmu-fr451.S FRV: Use __INIT macro instead of .text.init. 2009-04-27 19:46:30 -07:00
head-uc-fr401.S FRV: Use __INIT macro instead of .text.init. 2009-04-27 19:46:30 -07:00
head-uc-fr451.S FRV: Use __INIT macro instead of .text.init. 2009-04-27 19:46:30 -07:00
head-uc-fr555.S FRV: Use __INIT macro instead of .text.init. 2009-04-27 19:46:30 -07:00
head.inc
head.S frv: convert frv 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-mb93091.c cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
irq-mb93093.c cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
irq-mb93493.c cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
irq.c sparseirq: use kstat_irqs_cpu instead 2009-01-11 15:53:13 +01:00
kernel_execve.S
kernel_thread.S
local.h
Makefile
module.c module: cleanup FIXME comments about trimming exception table entries. 2009-06-12 21:47:05 +09:30
pm-mb93093.c
pm.c
process.c Simplify copy_thread() 2009-04-02 19:04:51 -07:00
ptrace.c FRV: Implement new-style ptrace 2009-06-11 09:01:26 -07:00
setup.c FRV: Don't attempt to #include <linux/blk.h> as it doesn't exist 2009-04-20 08:12:59 -07:00
signal.c KEYS: Add a keyctl to install a process's session keyring on its parent [try #6] 2009-09-02 21:29:22 +10:00
sleep.S
switch_to.S
sys_frv.c
sysctl.c
time.c cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
traps.c
uaccess.c FRV: BUG to BUG_ON changes 2009-06-11 09:01:26 -07:00
vmlinux.lds.S linker script: unify usage of discard definition 2009-07-09 11:27:40 +09:00