From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Mar 2010 15:34:18 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0a135ba14d71fb84c691a5386aff5049691fe6d7;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://git./linux/kernel/git/tj/percpu

* '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.
---

0a135ba14d71fb84c691a5386aff5049691fe6d7
diff --cc include/linux/srcu.h
index 3084f80909cd,41eedccc962c..4d5ecb222af9
--- a/include/linux/srcu.h
+++ b/include/linux/srcu.h
@@@ -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