From a938f51ca9b8d90e4ef865cb2436e04414e19da6 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Sat, 26 Jan 2008 14:11:04 +0100
Subject: [PATCH] --- yaml --- r: 77199 b: refs/heads/master c:
 519580fc179be6d06a40edd918747bd5f0e1b899 h: refs/heads/master i:   77197:
 0332d7a408cb5ed59e95d8cc747dff17f6571060   77195:
 bffe08c482fb8e5c574b67e998e3aceac80868c3   77191:
 d23025f417e872d22948fc7ab5b6287d08002fe2   77183:
 9c3dbdd75fefe56e16494f5813f2f2038918ef1d v: v3

---
 [refs]                         | 2 +-
 trunk/include/asm-s390/rwsem.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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)