diff --git a/[refs] b/[refs]
index 2c6991cbaa2f..aa68ef0f759b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22e650045899011b028e40625bc73df9f3260bac
+refs/heads/master: 235454c99851ba21038061b9acf38d1a636068c5
diff --git a/trunk/arch/xtensa/include/asm/rwsem.h b/trunk/arch/xtensa/include/asm/rwsem.h
index e39edf5c86f2..9d32f6874393 100644
--- a/trunk/arch/xtensa/include/asm/rwsem.h
+++ b/trunk/arch/xtensa/include/asm/rwsem.h
@@ -38,7 +38,7 @@ struct rw_semaphore {
 };
 
 #define __RWSEM_INITIALIZER(name) \
-	{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \
+	{ RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock),	\
 	  LIST_HEAD_INIT((name).wait_list) }
 
 #define DECLARE_RWSEM(name)		\