fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/include/asm-cris/semaphore-helper.h b/include/asm-cris/semaphore-helper.h
index 461c5e4..a8e1e6c 100644 (file)
--- a/include/asm-cris/semaphore-helper.h
+++ b/include/asm-cris/semaphore-helper.h
@@ -20,12 +20,12 @@
 /*
  * These two _must_ execute atomically wrt each other.
  */
-extern inline void wake_one_more(struct semaphore * sem)
+static inline void wake_one_more(struct semaphore * sem)
 {
        atomic_inc(&sem->waking);
 }
 
-extern inline int waking_non_zero(struct semaphore *sem)
+static inline int waking_non_zero(struct semaphore *sem)
 {
        unsigned long flags;
        int ret = 0;
@@ -40,7 +40,7 @@ extern inline int waking_non_zero(struct semaphore *sem)
        return ret;
 }
 
-extern inline int waking_non_zero_interruptible(struct semaphore *sem,
+static inline int waking_non_zero_interruptible(struct semaphore *sem,
                                                struct task_struct *tsk)
 {
        int ret = 0;
@@ -52,14 +52,14 @@ extern inline int waking_non_zero_interruptible(struct semaphore *sem,
                dec(&sem->waking);
                ret = 1;
        } else if (signal_pending(tsk)) {
-               count_inc(&sem->count);
+               inc(&sem->count);
                ret = -EINTR;
        }
        local_irq_restore(flags);
        return ret;
 }
 
-extern inline int waking_non_zero_trylock(struct semaphore *sem)
+static inline int waking_non_zero_trylock(struct semaphore *sem)
 {
         int ret = 1;
        unsigned long flags;
@@ -67,7 +67,7 @@ extern inline int waking_non_zero_trylock(struct semaphore *sem)
        local_save_flags(flags);
        local_irq_disable();
        if (read(&sem->waking) <= 0)
-               count_inc(&sem->count);
+               inc(&sem->count);
        else {
                dec(&sem->waking);
                ret = 0;