[PATCH] Lock initializer cleanup - (ARM26)

Use the new lock initializers DEFINE_SPIN_LOCK and DEFINE_RW_LOCK

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/arm26/kernel/dma.c b/arch/arm26/kernel/dma.c
index 038ef47662fc1adfc2d2e49bfe93eb64f950954a..80b5a774d90509bb726105f41214827b78e88de4 100644 (file)
--- a/arch/arm26/kernel/dma.c
+++ b/arch/arm26/kernel/dma.c
@@ -22,7 +22,7 @@
 
 #include <asm/dma.h>
 
-spinlock_t dma_spin_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(dma_spin_lock);
 
 static dma_t dma_chan[MAX_DMA_CHANNELS];
 

diff --git a/arch/arm26/kernel/irq.c b/arch/arm26/kernel/irq.c
index be2ebeaa8f865a8c09ca6109914d202856d30873..f3cc1036e5bc84744789e53159af8d8c88b803ed 100644 (file)
--- a/arch/arm26/kernel/irq.c
+++ b/arch/arm26/kernel/irq.c
@@ -50,7 +50,7 @@ void __init arc_init_irq(void);
 #define MAX_IRQ_CNT    100000
 
 static volatile unsigned long irq_err_count;
-static spinlock_t irq_controller_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(irq_controller_lock);
 
 struct irqdesc irq_desc[NR_IRQS];
 

diff --git a/arch/arm26/kernel/semaphore.c b/arch/arm26/kernel/semaphore.c
index 8cfc28d5163fe74d2bdde97808bc2082d252f98d..3023a53431ff240e09d66e8d024bef0fe922301f 100644 (file)
--- a/arch/arm26/kernel/semaphore.c
+++ b/arch/arm26/kernel/semaphore.c
@@ -56,7 +56,7 @@ void __up(struct semaphore *sem)
        wake_up(&sem->wait);
 }
 
-static spinlock_t semaphore_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(semaphore_lock);
 
 void __sched __down(struct semaphore * sem)
 {

diff --git a/arch/arm26/kernel/setup.c b/arch/arm26/kernel/setup.c
index 95a356d9cc2cb24230d7495d94cb5c3b7d107ecd..2909b2499049ea011e2ebe18fec66d3af31d48b4 100644 (file)
--- a/arch/arm26/kernel/setup.c
+++ b/arch/arm26/kernel/setup.c
@@ -37,7 +37,7 @@
 #endif
 
 #ifdef CONFIG_PREEMPT
-spinlock_t kernel_flag = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(kernel_flag);
 #endif
 
 #if defined(CONFIG_FPE_NWFPE)

diff --git a/arch/arm26/kernel/time.c b/arch/arm26/kernel/time.c
index 7332354396bf4482b979e3db36642e2bb34c862e..549a6b2e177ef4ca666bfd4355d9b21d7b2dafe8 100644 (file)
--- a/arch/arm26/kernel/time.c
+++ b/arch/arm26/kernel/time.c
@@ -41,7 +41,7 @@ EXPORT_SYMBOL(jiffies_64);
 extern unsigned long wall_jiffies;
 
 /* this needs a better home */
-spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(rtc_lock);
 
 /* change this if you have some constant time drift */
 #define USECS_PER_JIFFY        (1000000/HZ)

diff --git a/arch/arm26/kernel/traps.c b/arch/arm26/kernel/traps.c
index 93a0db7923e03fd8c928dadcfa0f06e4d49d6d18..f64f59022392894d473722099553afff21fd9d13 100644 (file)
--- a/arch/arm26/kernel/traps.c
+++ b/arch/arm26/kernel/traps.c
@@ -171,7 +171,7 @@ void show_stack(struct task_struct *task, unsigned long *sp) {
        dump_mem("Stack: ", (unsigned long)sp, 8192+(unsigned long)task->thread_info);
 }
 
-spinlock_t die_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(die_lock);
 
 /*
  * This function is protected against re-entrancy.

diff --git a/arch/arm26/mm/small_page.c b/arch/arm26/mm/small_page.c
index 0cab8b76c848ad966f8633d821436d1293cae680..77be86cca789e385bab5f859f8992e063185c160 100644 (file)
--- a/arch/arm26/mm/small_page.c
+++ b/arch/arm26/mm/small_page.c
@@ -75,7 +75,7 @@ static struct order orders[] = {
 #define TEST_AND_CLEAR_USED(pg,off)    (test_and_clear_bit(off, &USED_MAP(pg)))
 #define SET_USED(pg,off)               (set_bit(off, &USED_MAP(pg)))
 
-static spinlock_t small_page_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(small_page_lock);
 
 static unsigned long __get_small_page(int priority, struct order *order)
 {