Merge branch 'virtex-for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-virtex into...

[cascardo/linux.git] / include / asm-v850 / semaphore.h

diff --git a/include/asm-v850/semaphore.h b/include/asm-v850/semaphore.h
index df6cdec..10ed0cc 100644 (file)
--- a/include/asm-v850/semaphore.h
+++ b/include/asm-v850/semaphore.h
@@ -22,9 +22,8 @@ struct semaphore {
        struct semaphore name = __SEMAPHORE_INITIALIZER (name,count)
 
 #define DECLARE_MUTEX(name)            __DECLARE_SEMAPHORE_GENERIC (name,1)
-#define DECLARE_MUTEX_LOCKED(name)     __DECLARE_SEMAPHORE_GENERIC (name,0)
 
-extern inline void sema_init (struct semaphore *sem, int val)
+static inline void sema_init (struct semaphore *sem, int val)
 {
        *sem = (struct semaphore)__SEMAPHORE_INITIALIZER((*sem),val);
 }
@@ -52,14 +51,14 @@ extern int  __down_interruptible (struct semaphore * sem);
 extern int  __down_trylock (struct semaphore * sem);
 extern void __up (struct semaphore * sem);
 
-extern inline void down (struct semaphore * sem)
+static inline void down (struct semaphore * sem)
 {
        might_sleep();
        if (atomic_dec_return (&sem->count) < 0)
                __down (sem);
 }
 
-extern inline int down_interruptible (struct semaphore * sem)
+static inline int down_interruptible (struct semaphore * sem)
 {
        int ret = 0;
        might_sleep();
@@ -68,7 +67,7 @@ extern inline int down_interruptible (struct semaphore * sem)
        return ret;
 }
 
-extern inline int down_trylock (struct semaphore *sem)
+static inline int down_trylock (struct semaphore *sem)
 {
        int ret = 0;
        if (atomic_dec_return (&sem->count) < 0)
@@ -76,7 +75,7 @@ extern inline int down_trylock (struct semaphore *sem)
        return ret;
 }
 
-extern inline void up (struct semaphore * sem)
+static inline void up (struct semaphore * sem)
 {
        if (atomic_inc_return (&sem->count) <= 0)
                __up (sem);