Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Linus Torvalds [Wed, 3 Mar 2010 15:34:18 +0000 (07:34 -0800)]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: add __percpu sparse annotations to what's left
  percpu: add __percpu sparse annotations to fs
  percpu: add __percpu sparse annotations to core kernel subsystems
  local_t: Remove leftover local.h
  this_cpu: Remove pageset_notifier
  this_cpu: Page allocator conversion
  percpu, x86: Generic inc / dec percpu instructions
  local_t: Move local.h include to ringbuffer.c and ring_buffer_benchmark.c
  module: Use this_cpu_xx to dynamically allocate counters
  local_t: Remove cpu_local_xx macros
  percpu: refactor the code in pcpu_[de]populate_chunk()
  percpu: remove compile warnings caused by __verify_pcpu_ptr()
  percpu: make accessors check for percpu pointer in sparse
  percpu: add __percpu for sparse.
  percpu: make access macros universal
  percpu: remove per_cpu__ prefix.

15 files changed:
1  2 
arch/powerpc/include/asm/local.h
arch/x86/include/asm/system.h
drivers/acpi/processor_perflib.c
drivers/dma/dmaengine.c
drivers/edac/amd64_edac.c
drivers/md/raid5.c
fs/xfs/xfs_mount.h
include/acpi/processor.h
include/linux/mm.h
include/linux/percpu_counter.h
include/linux/srcu.h
kernel/rcutorture.c
kernel/sched.c
kernel/trace/trace.c
kernel/trace/trace_functions_graph.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -33,11 -33,8 +33,11 @@@ struct srcu_struct_array 
  
  struct srcu_struct {
        int completed;
-       struct srcu_struct_array *per_cpu_ref;
+       struct srcu_struct_array __percpu *per_cpu_ref;
        struct mutex mutex;
 +#ifdef CONFIG_DEBUG_LOCK_ALLOC
 +      struct lockdep_map dep_map;
 +#endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
  };
  
  #ifndef CONFIG_PREEMPT
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
Simple merge