diff --git a/[refs] b/[refs]
index 26774777d001..7aa7a17abf5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b4beb31759765efdda9f9431aebfedf828bbfe0
+refs/heads/master: 519580fc179be6d06a40edd918747bd5f0e1b899
diff --git a/trunk/include/asm-s390/rwsem.h b/trunk/include/asm-s390/rwsem.h
index 90f4eccaa290..9d2a17971805 100644
--- a/trunk/include/asm-s390/rwsem.h
+++ b/trunk/include/asm-s390/rwsem.h
@@ -91,8 +91,8 @@ struct rw_semaphore {
 #endif
 
 #define __RWSEM_INITIALIZER(name) \
-{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, LIST_HEAD_INIT((name).wait_list) \
-  __RWSEM_DEP_MAP_INIT(name) }
+ { RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait.lock), \
+   LIST_HEAD_INIT((name).wait_list) __RWSEM_DEP_MAP_INIT(name) }
 
 #define DECLARE_RWSEM(name) \
 	struct rw_semaphore name = __RWSEM_INITIALIZER(name)