X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Farm%2Fmm%2Fconsistent.c;h=db7b3e38ef1d1410287f8ca7a84cd435e73f5c2c;hb=1fe532685a1984dc9f2603ed20bd5e630ba79709;hp=333a82a3717e07daa8979986480579b943507e53;hpb=538c29d43ebdac2edcef96ac07982d2296a63077;p=deliverable%2Flinux.git

diff --git a/arch/arm/mm/consistent.c b/arch/arm/mm/consistent.c
index 333a82a3717e..db7b3e38ef1d 100644
--- a/arch/arm/mm/consistent.c
+++ b/arch/arm/mm/consistent.c
@@ -274,6 +274,11 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp,
 void *
 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp)
 {
+	void *memory;
+
+	if (dma_alloc_from_coherent(dev, size, handle, &memory))
+		return memory;
+
 	if (arch_is_coherent()) {
 		void *virt;
 
@@ -362,6 +367,9 @@ void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr
 
 	WARN_ON(irqs_disabled());
 
+	if (dma_release_from_coherent(dev, get_order(size), cpu_addr))
+		return;
+
 	if (arch_is_coherent()) {
 		kfree(cpu_addr);
 		return;