linux-kernel-test/arch/x86/kernel/cpu/mcheck
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
..
k7.c x86, mce: unify mce.h 2009-06-16 16:56:07 -07:00
Makefile x86, mce: rename _64.c files which are no longer 64-bit-specific 2009-06-16 16:56:11 -07:00
mce_amd.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2009-09-15 09:39:44 -07:00
mce_intel.c x86, mce: mce_intel.c needs <asm/apic.h> 2009-06-17 08:31:15 -07:00
mce-inject.c x86, mce: rename mce_notify_user to mce_notify_irq 2009-06-03 14:48:04 -07:00
mce-internal.h x86, mce: implement new status bits 2009-06-03 14:45:34 -07:00
mce-severity.c x86, mce: export MCE severities coverage via debugfs 2009-06-03 14:45:34 -07:00
mce.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2009-09-15 09:39:44 -07:00
non-fatal.c x86, mce: unify mce.h 2009-06-16 16:56:07 -07:00
p4.c x86, mce: remove therm_throt.h 2009-06-16 16:56:09 -07:00
p5.c x86, mce: make mce_disabled boolean 2009-06-16 16:56:07 -07:00
p6.c x86, mce: unify mce.h 2009-06-16 16:56:07 -07:00
therm_throt.c x86, mce: therm_throt: Don't log redundant normality 2009-08-16 17:25:41 +02:00
threshold.c x86, mce: enable MCE_INTEL for 32bit new MCE 2009-05-28 09:24:13 -07:00
winchip.c x86, mce: unify mce.h 2009-06-16 16:56:07 -07:00