uses more descriptive words for the state change of a CONFIG option

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

diff --git a/include/asm-arm/semaphore.h b/include/asm-arm/semaphore.h
index 2e47880..d5dc624 100644 (file)
--- a/include/asm-arm/semaphore.h
+++ b/include/asm-arm/semaphore.h
@@ -16,25 +16,14 @@ struct semaphore {
        atomic_t count;
        int sleepers;
        wait_queue_head_t wait;
-#ifdef WAITQUEUE_DEBUG
-       long __magic;
-#endif
 };
 
-#ifdef WAITQUEUE_DEBUG
-# define __SEM_DEBUG_INIT(name)        .__magic = (long)&(name).__magic
-#else
-# define __SEM_DEBUG_INIT(name)
-#endif
-
-#define __SEMAPHORE_INIT(name,cnt) {                           \
+#define __SEMAPHORE_INIT(name, cnt)                            \
+{                                                              \
        .count  = ATOMIC_INIT(cnt),                             \
        .wait   = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait),   \
-       __SEM_DEBUG_INIT(name)                                  \
 }
 
-#define __MUTEX_INITIALIZER(name) __SEMAPHORE_INIT(name,1)
-
 #define __DECLARE_SEMAPHORE_GENERIC(name,count)        \
        struct semaphore name = __SEMAPHORE_INIT(name,count)
 
@@ -46,9 +35,6 @@ static inline void sema_init(struct semaphore *sem, int val)
        atomic_set(&sem->count, val);
        sem->sleepers = 0;
        init_waitqueue_head(&sem->wait);
-#ifdef WAITQUEUE_DEBUG
-       sem->__magic = (long)&sem->__magic;
-#endif
 }
 
 static inline void init_MUTEX(struct semaphore *sem)
@@ -61,11 +47,6 @@ static inline void init_MUTEX_LOCKED(struct semaphore *sem)
        sema_init(sem, 0);
 }
 
-static inline int sema_count(struct semaphore *sem)
-{
-       return atomic_read(&sem->count);
-}
-
 /*
  * special register calling convention
  */
@@ -85,9 +66,6 @@ extern void __up(struct semaphore * sem);
  */
 static inline void down(struct semaphore * sem)
 {
-#ifdef WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
        might_sleep();
        __down_op(sem, __down_failed);
 }
@@ -98,19 +76,12 @@ static inline void down(struct semaphore * sem)
  */
 static inline int down_interruptible (struct semaphore * sem)
 {
-#ifdef WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
        might_sleep();
        return __down_op_ret(sem, __down_interruptible_failed);
 }
 
 static inline int down_trylock(struct semaphore *sem)
 {
-#ifdef WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
-
        return __down_op_ret(sem, __down_trylock_failed);
 }
 
@@ -122,10 +93,6 @@ static inline int down_trylock(struct semaphore *sem)
  */
 static inline void up(struct semaphore * sem)
 {
-#ifdef WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
-
        __up_op(sem, __up_wakeup);
 }