[patch 26/47] Use new style spinlock initializer in __RWSEM_INITIALIZER.

Martin Schwidefsky
2007-12-20T15:34:08Z

[-- Attachment #1: 125-rwlock-init.diff --]
[-- Type: text/plain, Size: 951 bytes --]

From: Heiko Carstens <heiko.carstens@de.ibm.com>

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

include/asm-s390/rwsem.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Index: quilt-2.6/include/asm-s390/rwsem.h
===================================================================
--- quilt-2.6.orig/include/asm-s390/rwsem.h
+++ quilt-2.6/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)