Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Linus Torvalds [Tue, 15 Sep 2009 16:39:44 +0000 (09:39 -0700)]
* '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

27 files changed:
1  2 
Documentation/kernel-parameters.txt
Makefile
arch/ia64/Kconfig
arch/powerpc/mm/stab.c
arch/s390/kernel/vmlinux.lds.S
arch/sparc/Kconfig
arch/x86/Kconfig
arch/x86/include/asm/percpu.h
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/cpu/mcheck/mce_amd.c
arch/x86/kernel/cpu/perf_counter.c
arch/x86/kernel/vmlinux.lds.S
arch/x86/mm/pageattr.c
block/cfq-iosched.c
include/linux/percpu-defs.h
init/main.c
kernel/module.c
kernel/perf_counter.c
kernel/sched.c
kernel/trace/trace_events.c
lib/Kconfig.debug
mm/Makefile
mm/page-writeback.c
mm/slub.c
net/rds/ib_stats.c
net/rds/iw_stats.c
net/rds/page.c

Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/module.c
Simple merge
Simple merge
diff --cc kernel/sched.c
@@@ -295,7 -318,7 +295,7 @@@ struct task_group root_task_group
  /* Default task group's sched entity on each cpu */
  static DEFINE_PER_CPU(struct sched_entity, init_sched_entity);
  /* Default task group's cfs_rq on each cpu */
- static DEFINE_PER_CPU(struct cfs_rq, init_tg_cfs_rq) ____cacheline_aligned_in_smp;
 -static DEFINE_PER_CPU_SHARED_ALIGNED(struct cfs_rq, init_cfs_rq);
++static DEFINE_PER_CPU_SHARED_ALIGNED(struct cfs_rq, init_tg_cfs_rq);
  #endif /* CONFIG_FAIR_GROUP_SCHED */
  
  #ifdef CONFIG_RT_GROUP_SCHED
@@@ -1465,10 -1365,10 +1465,10 @@@ function_test_events_call(unsigned lon
        entry->ip                       = ip;
        entry->parent_ip                = parent_ip;
  
 -      trace_nowake_buffer_unlock_commit(event, flags, pc);
 +      trace_nowake_buffer_unlock_commit(buffer, event, flags, pc);
  
   out:
-       atomic_dec(&per_cpu(test_event_disable, cpu));
+       atomic_dec(&per_cpu(ftrace_test_event_disable, cpu));
        ftrace_preempt_enable(resched);
  }
  
Simple merge
diff --cc mm/Makefile
Simple merge
Simple merge
diff --cc mm/slub.c
Simple merge
@@@ -37,9 -37,9 +37,9 @@@
  #include "rds.h"
  #include "ib.h"
  
- DEFINE_PER_CPU(struct rds_ib_statistics, rds_ib_stats) ____cacheline_aligned;
+ DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_ib_statistics, rds_ib_stats);
  
 -static char *rds_ib_stat_names[] = {
 +static const char *const rds_ib_stat_names[] = {
        "ib_connect_raced",
        "ib_listen_closed_stale",
        "ib_tx_cq_call",
@@@ -37,9 -37,9 +37,9 @@@
  #include "rds.h"
  #include "iw.h"
  
- DEFINE_PER_CPU(struct rds_iw_statistics, rds_iw_stats) ____cacheline_aligned;
+ DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_iw_statistics, rds_iw_stats);
  
 -static char *rds_iw_stat_names[] = {
 +static const char *const rds_iw_stat_names[] = {
        "iw_connect_raced",
        "iw_listen_closed_stale",
        "iw_tx_cq_call",
diff --cc net/rds/page.c
Simple merge