diff --git a/[refs] b/[refs]
index e165d11c5e88..59ff11b94f84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24a9ab7fa143498802b35c66de10cc3cfdac2c51
+refs/heads/master: 5c1c8085b5dc30ae4ff0ee54039e387ed59262bf
diff --git a/trunk/arch/xtensa/kernel/semaphore.c b/trunk/arch/xtensa/kernel/semaphore.c
index d40f4b1b75ac..995c6410ae10 100644
--- a/trunk/arch/xtensa/kernel/semaphore.c
+++ b/trunk/arch/xtensa/kernel/semaphore.c
@@ -100,7 +100,7 @@ static __inline__ int waking_non_zero_trylock(struct semaphore *sem)
 	return ret;
 }
 
-spinlock_t semaphore_wake_lock;
+DEFINE_SPINLOCK(semaphore_wake_lock);
 
 /*
  * Semaphores are implemented using a two-way counter: