1 files changed, 5 insertions, 4 deletions

diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h
index 2ea18a3def04..148983e21d47 100644
--- a/include/linux/rwsem.h
+++ b/include/linux/rwsem.h
@@ -34,12 +34,12 @@
  */
 struct rw_semaphore {
         atomic_long_t count;
-#ifdef CONFIG_RWSEM_SPIN_ON_OWNER
         /*
-         * Write owner. Used as a speculative check to see
-         * if the owner is running on the cpu.
+         * Write owner or one of the read owners. Can be used as a
+         * speculative check to see if the owner is running on the cpu.
          */
         struct task_struct *owner;
+#ifdef CONFIG_RWSEM_SPIN_ON_OWNER
         struct optimistic_spin_queue osq; /* spinner MCS lock */
 #endif
         raw_spinlock_t wait_lock;
@@ -73,13 +73,14 @@ static inline int rwsem_is_locked(struct rw_semaphore *sem)
 #endif
 
 #ifdef CONFIG_RWSEM_SPIN_ON_OWNER
-#define __RWSEM_OPT_INIT(lockname) , .osq = OSQ_LOCK_UNLOCKED, .owner = NULL
+#define __RWSEM_OPT_INIT(lockname) , .osq = OSQ_LOCK_UNLOCKED
 #else
 #define __RWSEM_OPT_INIT(lockname)
 #endif
 
 #define __RWSEM_INITIALIZER(name)                               \
         { __RWSEM_INIT_COUNT(name),                             \
+          .owner = NULL,                                        \
           .wait_list = LIST_HEAD_INIT((name).wait_list),        \
           .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock) \
           __RWSEM_OPT_INIT(name)                                \