This commit was generated by cvs2svn to compensate for changes in r632,

[linux-2.6.git] / arch / alpha / kernel / srmcons.c

diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c
index 6312402..b5660fc 100644 (file)
--- a/arch/alpha/kernel/srmcons.c
+++ b/arch/alpha/kernel/srmcons.c
@@ -22,7 +22,7 @@
 #include <asm/uaccess.h>
 
 
-static spinlock_t srmcons_callback_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(srmcons_callback_lock);
 static int srm_is_registered_console = 0;
 
 /* 
@@ -160,7 +160,7 @@ static int
 srmcons_get_private_struct(struct srmcons_private **ps)
 {
        static struct srmcons_private *srmconsp = NULL;
-       static spinlock_t srmconsp_lock = SPIN_LOCK_UNLOCKED;
+       static DEFINE_SPINLOCK(srmconsp_lock);
        unsigned long flags;
        int retval = 0;
 
@@ -179,7 +179,7 @@ srmcons_get_private_struct(struct srmcons_private **ps)
                }
 
                srmconsp->tty = NULL;
-               srmconsp->lock = SPIN_LOCK_UNLOCKED;
+               spin_lock_init(&srmconsp->lock);
                init_timer(&srmconsp->timer);
 
                *ps = srmconsp;