浏览代码

[ARM] Spinlock initializer cleanup

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Thomas Gleixner 18 年之前
父节点
当前提交
87b247c416
共有 3 个文件被更改,包括 4 次插入4 次删除
  1. 1 1
      arch/arm/kernel/time.c
  2. 1 1
      arch/arm/mach-omap2/gpmc.c
  3. 2 2
      arch/arm/mach-pnx4008/dma.c

+ 1 - 1
arch/arm/kernel/time.c

@@ -512,7 +512,7 @@ void __init time_init(void)
 
 
 #ifdef CONFIG_NO_IDLE_HZ
 #ifdef CONFIG_NO_IDLE_HZ
 	if (system_timer->dyn_tick)
 	if (system_timer->dyn_tick)
-		system_timer->dyn_tick->lock = SPIN_LOCK_UNLOCKED;
+		spin_lock_init(&system_timer->dyn_tick->lock);
 #endif
 #endif
 }
 }
 
 

+ 1 - 1
arch/arm/mach-omap2/gpmc.c

@@ -54,7 +54,7 @@
 
 
 static struct resource	gpmc_mem_root;
 static struct resource	gpmc_mem_root;
 static struct resource	gpmc_cs_mem[GPMC_CS_NUM];
 static struct resource	gpmc_cs_mem[GPMC_CS_NUM];
-static spinlock_t	gpmc_mem_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(gpmc_mem_lock);
 static unsigned		gpmc_cs_map;
 static unsigned		gpmc_cs_map;
 
 
 static void __iomem *gpmc_base =
 static void __iomem *gpmc_base =

+ 2 - 2
arch/arm/mach-pnx4008/dma.c

@@ -47,7 +47,7 @@ static struct ll_pool {
 	int count;
 	int count;
 } ll_pool;
 } ll_pool;
 
 
-static spinlock_t ll_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(ll_lock);
 
 
 struct pnx4008_dma_ll *pnx4008_alloc_ll_entry(dma_addr_t * ll_dma)
 struct pnx4008_dma_ll *pnx4008_alloc_ll_entry(dma_addr_t * ll_dma)
 {
 {
@@ -135,7 +135,7 @@ static inline void dma_decrement_usage(void)
 	}
 	}
 }
 }
 
 
-static spinlock_t dma_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(dma_lock);
 
 
 static inline void pnx4008_dma_lock(void)
 static inline void pnx4008_dma_lock(void)
 {
 {