vserver 1.9.5.x5

[linux-2.6.git] / arch / m32r / kernel / smp.c

diff --git a/arch/m32r/kernel/smp.c b/arch/m32r/kernel/smp.c
index 2dc542e..48b187f 100644 (file)
--- a/arch/m32r/kernel/smp.c
+++ b/arch/m32r/kernel/smp.c
@@ -38,7 +38,7 @@
  * Structure and data for smp_call_function(). This is designed to minimise
  * static memory requirements. It also looks cleaner.
  */
-static spinlock_t call_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(call_lock);
 
 struct call_data_struct {
        void (*func) (void *info);
@@ -53,7 +53,7 @@ static struct call_data_struct *call_data;
 /*
  * For flush_cache_all()
  */
-static spinlock_t flushcache_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(flushcache_lock);
 static volatile unsigned long flushcache_cpumask = 0;
 
 /*
@@ -63,7 +63,7 @@ static volatile cpumask_t flush_cpumask;
 static struct mm_struct *flush_mm;
 static struct vm_area_struct *flush_vma;
 static volatile unsigned long flush_va;
-static spinlock_t tlbstate_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(tlbstate_lock);
 #define FLUSH_ALL 0xffffffff
 
 DECLARE_PER_CPU(int, prof_multiplier);
@@ -953,7 +953,7 @@ unsigned long send_IPI_mask_phys(cpumask_t physid_mask, int ipi_num,
                "ldi    r4, #1                  \n\t"
                "st     r4, @%2                 \n\t"
                : "=&r"(ipicr_val)
-               : "r"(flags), "r"(&ipilock->lock), "r"(ipicr_addr),
+               : "r"(flags), "r"(&ipilock->slock), "r"(ipicr_addr),
                  "r"(mask), "r"(try), "r"(my_physid_mask)
                : "memory", "r4"
 #ifdef CONFIG_CHIP_M32700_TS1