[PATCH 0/3] Generic dma-coherent updates

[PATCH 0/3] Generic dma-coherent updates

[Dmitry Baryshkov]

Hi,

Here are some patches for the tip core/generic-dma-coherent branch.

The first one fixes dma allocation from DMA_MEMORY_EXCLUSIVE memory
areas. Second adds per-device coherent mem to arm and third one
replaces SH per-device coherent memory allocations with generic version.

I've tried updating Cris, but failed to even compile the kernel.


-- 
With best wishes
Dmitry

[PATCH 1/3] Generic dma-coherent: fix DMA_MEMORY_EXCLUSIVE

[Dmitry Baryshkov]

Don't rewrite successfull allocation return values
in case the memory was marked with DMA_MEMORY_EXCLUSIVE.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
---
 kernel/dma-coherent.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/kernel/dma-coherent.c b/kernel/dma-coherent.c
index 89a554c..56dff5c 100644
--- a/kernel/dma-coherent.c
+++ b/kernel/dma-coherent.c
@@ -105,8 +105,7 @@ int dma_alloc_from_coherent(struct device *dev, ssize_t size,
 			*dma_handle = mem->device_base + (page << PAGE_SHIFT);
 			*ret = mem->virt_base + (page << PAGE_SHIFT);
 			memset(*ret, 0, size);
-		}
-		if (mem->flags & DMA_MEMORY_EXCLUSIVE)
+		} else if (mem->flags & DMA_MEMORY_EXCLUSIVE)
 			*ret = NULL;
 	}
 	return (mem != NULL);
-- 
1.5.6.2


-- 
With best wishes
Dmitry