summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcmring
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-09-07 16:33:52 +0200
committerThomas Gleixner <tglx@linutronix.de>2010-10-12 17:36:10 +0200
commit5356d94872502e77317f82e8fcae2a0b162af07c (patch)
tree2376d0e2652968000dddbdb708b9f9716e0a326e /arch/arm/mach-bcmring
parentprintk: Make console_sem a semaphore not a pseudo mutex (diff)
downloadlinux-5356d94872502e77317f82e8fcae2a0b162af07c.tar.xz
linux-5356d94872502e77317f82e8fcae2a0b162af07c.zip
arm: Bcmring: semaphore cleanup
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Christoph Hellwig <hch@infradead.org> Cc: Leo Chen <leochen@broadcom.com> LKML-Reference: <20100907125057.371771121@linutronix.de>
Diffstat (limited to 'arch/arm/mach-bcmring')
-rw-r--r--arch/arm/mach-bcmring/dma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-bcmring/dma.c b/arch/arm/mach-bcmring/dma.c
index 29c0a911df26..77eb35c89cd0 100644
--- a/arch/arm/mach-bcmring/dma.c
+++ b/arch/arm/mach-bcmring/dma.c
@@ -691,7 +691,7 @@ int dma_init(void)
memset(&gDMA, 0, sizeof(gDMA));
- init_MUTEX_LOCKED(&gDMA.lock);
+ sema_init(&gDMA.lock, 0);
init_waitqueue_head(&gDMA.freeChannelQ);
/* Initialize the Hardware */
@@ -1574,7 +1574,7 @@ int dma_init_mem_map(DMA_MemMap_t *memMap)
{
memset(memMap, 0, sizeof(*memMap));
- init_MUTEX(&memMap->lock);
+ sema_init(&memMap->lock, 1);
return 0;
}