Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / include / linux / srcu.h

diff --git a/include/linux/srcu.h b/include/linux/srcu.h
index dc8eb63c6568a8b0d2b9a2d793f80f255f3fc570..a598cf3ac70ca686ca60c77dbdfb986a554993af 100644 (file)
--- a/include/linux/srcu.h
+++ b/include/linux/srcu.h
@@ -33,9 +33,9 @@
 #include <linux/rcupdate.h>
 #include <linux/workqueue.h>
 
-struct srcu_struct_array {
-       unsigned long c[2];
-       unsigned long seq[2];
+struct srcu_array {
+       unsigned long lock_count[2];
+       unsigned long unlock_count[2];
 };
 
 struct rcu_batch {
@@ -46,7 +46,7 @@ struct rcu_batch {
 
 struct srcu_struct {
        unsigned long completed;
-       struct srcu_struct_array __percpu *per_cpu_ref;
+       struct srcu_array __percpu *per_cpu_ref;
        spinlock_t queue_lock; /* protect ->batch_queue, ->running */
        bool running;
        /* callbacks just queued */
@@ -118,7 +118,7 @@ void process_srcu(struct work_struct *work);
  * See include/linux/percpu-defs.h for the rules on per-CPU variables.
  */
 #define __DEFINE_SRCU(name, is_static)                                 \
-       static DEFINE_PER_CPU(struct srcu_struct_array, name##_srcu_array);\
+       static DEFINE_PER_CPU(struct srcu_array, name##_srcu_array);\
        is_static struct srcu_struct name = __SRCU_STRUCT_INIT(name)
 #define DEFINE_SRCU(name)              __DEFINE_SRCU(name, /* not static */)
 #define DEFINE_STATIC_SRCU(name)       __DEFINE_SRCU(name, static)