vserver 1.9.3

[linux-2.6.git] / include / asm-alpha / semaphore.h

diff --git a/include/asm-alpha/semaphore.h b/include/asm-alpha/semaphore.h
index 1f19784..eb2cbd9 100644 (file)
--- a/include/asm-alpha/semaphore.h
+++ b/include/asm-alpha/semaphore.h
@@ -18,21 +18,13 @@
 struct semaphore {
        atomic_t count;
        wait_queue_head_t wait;
-#ifdef WAITQUEUE_DEBUG
-       long __magic;
-#endif
 };
 
-#ifdef WAITQUEUE_DEBUG
-# define __SEM_DEBUG_INIT(name)                , (long)&(name).__magic
-#else
-# define __SEM_DEBUG_INIT(name)
-#endif
-
-#define __SEMAPHORE_INITIALIZER(name,count)            \
-       { ATOMIC_INIT(count),                           \
-         __WAIT_QUEUE_HEAD_INITIALIZER((name).wait)    \
-         __SEM_DEBUG_INIT(name) }
+#define __SEMAPHORE_INITIALIZER(name, n)                       \
+{                                                              \
+       .count  = ATOMIC_INIT(n),                               \
+       .wait   = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait),   \
+}
 
 #define __MUTEX_INITIALIZER(name)                      \
        __SEMAPHORE_INITIALIZER(name,1)
@@ -53,9 +45,6 @@ static inline void sema_init(struct semaphore *sem, int val)
 
        atomic_set(&sem->count, val);
        init_waitqueue_head(&sem->wait);
-#ifdef WAITQUEUE_DEBUG
-       sem->__magic = (long)&sem->__magic;
-#endif
 }
 
 static inline void init_MUTEX (struct semaphore *sem)
@@ -142,7 +131,7 @@ static inline void __up(struct semaphore *sem)
                __up_wakeup(sem);
 }
 
-#if !defined(WAITQUEUE_DEBUG) && !defined(CONFIG_DEBUG_SEMAPHORE)
+#if !defined(CONFIG_DEBUG_SEMAPHORE)
 extern inline void down(struct semaphore *sem)
 {
        __down(sem);