patch-2_6_7-vs1_9_1_12

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

diff --git a/include/asm-cris/semaphore.h b/include/asm-cris/semaphore.h
index d0821f6..9ee66b9 100644 (file)
--- a/include/asm-cris/semaphore.h
+++ b/include/asm-cris/semaphore.h
@@ -21,7 +21,7 @@
 int printk(const char *fmt, ...);
 
 struct semaphore {
-       int count; /* not atomic_t since we do the atomicity here already */
+       atomic_t count;
        atomic_t waking;
        wait_queue_head_t wait;
 #if WAITQUEUE_DEBUG
@@ -36,7 +36,7 @@ struct semaphore {
 #endif
 
 #define __SEMAPHORE_INITIALIZER(name,count)             \
-        { count, ATOMIC_INIT(0),          \
+        { ATOMIC_INIT(count), ATOMIC_INIT(0),           \
           __WAIT_QUEUE_HEAD_INITIALIZER((name).wait)    \
           __SEM_DEBUG_INIT(name) }
 
@@ -84,7 +84,7 @@ extern inline void down(struct semaphore * sem)
        /* atomically decrement the semaphores count, and if its negative, we wait */
        local_save_flags(flags);
        local_irq_disable();
-       failed = --(sem->count) < 0;
+       failed = --(sem->count.counter) < 0;
        local_irq_restore(flags);
        if(failed) {
                __down(sem);
@@ -110,7 +110,7 @@ extern inline int down_interruptible(struct semaphore * sem)
        /* atomically decrement the semaphores count, and if its negative, we wait */
        local_save_flags(flags);
        local_irq_disable();
-       failed = --(sem->count) < 0;
+       failed = --(sem->count.counter) < 0;
        local_irq_restore(flags);
        if(failed)
                failed = __down_interruptible(sem);
@@ -128,7 +128,7 @@ extern inline int down_trylock(struct semaphore * sem)
 
        local_save_flags(flags);
        local_irq_disable();
-       failed = --(sem->count) < 0;
+       failed = --(sem->count.counter) < 0;
        local_irq_restore(flags);
        if(failed)
                failed = __down_trylock(sem);
@@ -153,7 +153,7 @@ extern inline void up(struct semaphore * sem)
        /* atomically increment the semaphores count, and if it was negative, we wake people */
        local_save_flags(flags);
        local_irq_disable();
-       wakeup = ++(sem->count) <= 0;
+       wakeup = ++(sem->count.counter) <= 0;
        local_irq_restore(flags);
        if(wakeup) {
                __up(sem);