vserver 1.9.3

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

diff --git a/include/asm-h8300/semaphore.h b/include/asm-h8300/semaphore.h
index 9efd009..fe6ef37 100644 (file)
--- a/include/asm-h8300/semaphore.h
+++ b/include/asm-h8300/semaphore.h
@@ -26,21 +26,14 @@ struct semaphore {
        atomic_t count;
        int sleepers;
        wait_queue_head_t wait;
-#if WAITQUEUE_DEBUG
-       long __magic;
-#endif
 };
 
-#if 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), 0, __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \
-       __SEM_DEBUG_INIT(name) }
+#define __SEMAPHORE_INITIALIZER(name, n)                               \
+{                                                                      \
+       .count          = ATOMIC_INIT(n),                               \
+       .sleepers       = 0,                                            \
+       .wait           = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait)    \
+}
 
 #define __MUTEX_INITIALIZER(name) \
        __SEMAPHORE_INITIALIZER(name,1)
@@ -87,9 +80,6 @@ static inline void down(struct semaphore * sem)
 {
        register atomic_t *count asm("er0");
 
-#if WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
        might_sleep();
 
        count = &(sem->count);
@@ -116,9 +106,6 @@ static inline int down_interruptible(struct semaphore * sem)
 {
        register atomic_t *count asm("er0");
 
-#if WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
        might_sleep();
 
        count = &(sem->count);
@@ -147,10 +134,6 @@ static inline int down_trylock(struct semaphore * sem)
 {
        register atomic_t *count asm("er0");
 
-#if WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
-
        count = &(sem->count);
        __asm__ __volatile__(
                "stc ccr,r3l\n\t"
@@ -187,10 +170,6 @@ static inline void up(struct semaphore * sem)
 {
        register atomic_t *count asm("er0");
 
-#if WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
-
        count = &(sem->count);
        __asm__ __volatile__(
                "stc ccr,r3l\n\t"