diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-10 22:00:07 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-10 22:00:07 -0500 |
| commit | 85012c72b677bbeb51a26a3691ec939cd8134059 (patch) | |
| tree | 650981cd5756c500bdb047d7754ec7e6b905a5e3 | |
| parent | 9b28652a1a873ef597bfa2d33c1ff42f97b37fab (diff) | |
| download | rt-patches-85012c72b677bbeb51a26a3691ec939cd8134059.tar.gz | |
refresh fix-sema-in-arm-bcmring_dma.patchv2.6.34-rc3-583-g64a8920v2.6.34-rc3-578-g50b88c4
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | fix-sema-in-arm-bcmring_dma.patch | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/fix-sema-in-arm-bcmring_dma.patch b/fix-sema-in-arm-bcmring_dma.patch index 654cc08..e85a279 100644 --- a/fix-sema-in-arm-bcmring_dma.patch +++ b/fix-sema-in-arm-bcmring_dma.patch @@ -1,4 +1,4 @@ -From 98f716f999ecdd792d61e22e4e69ffa5419cf37b Mon Sep 17 00:00:00 2001 +From cad2ad8914ec606329d24b452bca6b2d9a1e5ef2 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Sat, 22 Jan 2011 23:29:37 -0500 Subject: [PATCH] fix sema in arm bcmring_dma @@ -6,10 +6,10 @@ Subject: [PATCH] fix sema in arm bcmring_dma Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/mach-bcmring/dma.c b/arch/arm/mach-bcmring/dma.c -index cbda897..744edb0 100644 +index 4355424..85b0dc1 100644 --- a/arch/arm/mach-bcmring/dma.c +++ b/arch/arm/mach-bcmring/dma.c -@@ -1573,7 +1573,7 @@ int dma_init_mem_map(DMA_MemMap_t *memMap) +@@ -1574,7 +1574,7 @@ int dma_init_mem_map(DMA_MemMap_t *memMap) { memset(memMap, 0, sizeof(*memMap)); @@ -18,15 +18,6 @@ index cbda897..744edb0 100644 return 0; } -@@ -2225,6 +2225,8 @@ int dma_unmap(DMA_MemMap_t *memMap, /* Stores state information about the map */ - DMA_Region_t *region; - DMA_Segment_t *segment; - -+ down(&memMap->lock); -+ - for (regionIdx = 0; regionIdx < memMap->numRegionsUsed; regionIdx++) { - region = &memMap->region[regionIdx]; - -- 1.7.1.1 |