Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 56330
b: refs/heads/master
c: 87b247c
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Gleixner authored and Russell King committed May 11, 2007
1 parent 89374f0 commit 754301d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a0d6333742c68b321043e4982ec413951ee9afb0
refs/heads/master: 87b247c41674e29f90bf4938799ab079951ccc6b
2 changes: 1 addition & 1 deletion trunk/arch/arm/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ void __init time_init(void)

#ifdef CONFIG_NO_IDLE_HZ
if (system_timer->dyn_tick)
system_timer->dyn_tick->lock = SPIN_LOCK_UNLOCKED;
spin_lock_init(&system_timer->dyn_tick->lock);
#endif
}

2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/gpmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

static struct resource gpmc_mem_root;
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 void __iomem *gpmc_base =
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-pnx4008/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ static struct ll_pool {
int count;
} 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)
{
Expand Down Expand Up @@ -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)
{
Expand Down

0 comments on commit 754301d

Please sign in to comment.