Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/include/asm-sparc/semaphore.h b/include/asm-sparc/semaphore.h
index e8e9ae6..f74ba31 100644 (file)
--- a/include/asm-sparc/semaphore.h
+++ b/include/asm-sparc/semaphore.h
@@ -13,24 +13,14 @@ struct semaphore {
        atomic24_t count;
        int sleepers;
        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) \
-{ ATOMIC24_INIT(count), 0, __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \
-       __SEM_DEBUG_INIT(name) }
-
-#define __MUTEX_INITIALIZER(name) \
-       __SEMAPHORE_INITIALIZER(name,1)
+#define __SEMAPHORE_INITIALIZER(name, n)                               \
+{                                                                      \
+       .count          = ATOMIC24_INIT(n),                             \
+       .sleepers       = 0,                                            \
+       .wait           = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait)    \
+}
 
 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \
        struct semaphore name = __SEMAPHORE_INITIALIZER(name,count)
@@ -43,9 +33,6 @@ static inline void sema_init (struct semaphore *sem, int val)
        atomic24_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)
@@ -68,9 +55,6 @@ static inline void down(struct semaphore * sem)
        register volatile int *ptr asm("g1");
        register int increment asm("g2");
 
-#ifdef WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
        might_sleep();
 
        ptr = &(sem->count.counter);
@@ -105,9 +89,6 @@ static inline int down_interruptible(struct semaphore * sem)
        register volatile int *ptr asm("g1");
        register int increment asm("g2");
 
-#ifdef WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
        might_sleep();
 
        ptr = &(sem->count.counter);
@@ -145,10 +126,6 @@ static inline int down_trylock(struct semaphore * sem)
        register volatile int *ptr asm("g1");
        register int increment asm("g2");
 
-#ifdef WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
-
        ptr = &(sem->count.counter);
        increment = 1;
 
@@ -184,10 +161,6 @@ static inline void up(struct semaphore * sem)
        register volatile int *ptr asm("g1");
        register int increment asm("g2");
 
-#ifdef WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
-
        ptr = &(sem->count.counter);
        increment = 1;