upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / arch / mips / kernel / semaphore.c

diff --git a/arch/mips/kernel/semaphore.c b/arch/mips/kernel/semaphore.c
index 732c5e6..9c40fe5 100644 (file)
--- a/arch/mips/kernel/semaphore.c
+++ b/arch/mips/kernel/semaphore.c
@@ -15,7 +15,6 @@
  * indicate that some process(es) are waiting for the semaphore.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/init.h>
@@ -64,7 +63,7 @@ static inline int __sem_update_count(struct semaphore *sem, int incr)
                : "=&r" (old_count), "=&r" (tmp), "=m" (sem->count)
                : "r" (incr), "m" (sem->count));
        } else {
-               static spinlock_t semaphore_lock = SPIN_LOCK_UNLOCKED;
+               static DEFINE_SPINLOCK(semaphore_lock);
                unsigned long flags;
 
                spin_lock_irqsave(&semaphore_lock, flags);