Apply preempt_rt patch-4.9-rt1.patch.xz

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

diff --git a/include/linux/srcu.h b/include/linux/srcu.h
index dc8eb63c6568a8b0d2b9a2d793f80f255f3fc570..e793d3a257dafa498336b830f207a15dac92dd89 100644 (file)
--- a/include/linux/srcu.h
+++ b/include/linux/srcu.h
@@ -84,10 +84,10 @@ int init_srcu_struct(struct srcu_struct *sp);
 
 void process_srcu(struct work_struct *work);
 
-#define __SRCU_STRUCT_INIT(name)                                       \
+#define __SRCU_STRUCT_INIT(name, pcpu_name)                            \
        {                                                               \
                .completed = -300,                                      \
-               .per_cpu_ref = &name##_srcu_array,                      \
+               .per_cpu_ref = &pcpu_name,                              \
                .queue_lock = __SPIN_LOCK_UNLOCKED(name.queue_lock),    \
                .running = false,                                       \
                .batch_queue = RCU_BATCH_INIT(name.batch_queue),        \
@@ -119,7 +119,7 @@ void process_srcu(struct work_struct *work);
  */
 #define __DEFINE_SRCU(name, is_static)                                 \
        static DEFINE_PER_CPU(struct srcu_struct_array, name##_srcu_array);\
-       is_static struct srcu_struct name = __SRCU_STRUCT_INIT(name)
+       is_static struct srcu_struct name = __SRCU_STRUCT_INIT(name, name##_srcu_array)
 #define DEFINE_SRCU(name)              __DEFINE_SRCU(name, /* not static */)
 #define DEFINE_STATIC_SRCU(name)       __DEFINE_SRCU(name, static)