| From 6b4b16246e53561cbd83fe2b53a17252af0b68bb Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Sun, 16 Jan 2011 21:09:43 -0500 |
| Subject: [PATCH] dma: init_MUTEX_LOCKED --> sema_init |
| |
| This is one of several extractions from the merge up to 33-rc8. |
| |
| You can find the origin of this change in the tip merge commit: |
| |
| commit 5f854cfc024622e4aae14d7cf422f6ff86278688 |
| Merge: cc24da0 4ec62b2 |
| Author: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun Feb 21 20:17:22 2010 +0100 |
| |
| Forward to 2.6.33-rc8 |
| |
| Merge branch 'linus' into rt/head with a pile of conflicts. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| Normally there are not significant changes/additions in a merge commit that |
| are not from any other "normal" commit. But in this case there are, so |
| break them out into separate explicit commits. |
| |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| arch/arm/mach-bcmring/dma.c | 2 +- |
| 1 files changed, 1 insertions(+), 1 deletions(-) |
| |
| diff --git a/arch/arm/mach-bcmring/dma.c b/arch/arm/mach-bcmring/dma.c |
| index 29c0a91..4355424 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 */ |
| -- |
| 1.7.0.4 |
| |
