commit 1d2a10a2cfe5899d9c4b31e59e2cd8aff0d311de
author Linux Build Service Account <lnxbuild@localhost> Thu Jun 20 05:52:16 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jun 20 05:52:13 2013 -0700
tree 894999eefcaea99576d24c0194992c8d9d1408a6
parent 1a58d07f91b3394694eeccd25b11e4b01fc40138
parent 83062cf0351637afc7c20456a43ac9b12ffab28b

Merge "gpu: ion: Explictly mark DMA allocations as GFP_KERNEL"

drivers/gpu/ion/ion_cma_heap.c

diff --git a/drivers/gpu/ion/ion_cma_heap.c b/drivers/gpu/ion/ion_cma_heap.c
index e7f7836..b24b2bd 100644
--- a/drivers/gpu/ion/ion_cma_heap.c
+++ b/drivers/gpu/ion/ion_cma_heap.c
@@ -76,10 +76,10 @@
 
 	if (!ION_IS_CACHED(flags))
 		info->cpu_addr = dma_alloc_writecombine(dev, len,
-					&(info->handle), 0);
+					&(info->handle), GFP_KERNEL);
 	else
 		info->cpu_addr = dma_alloc_nonconsistent(dev, len,
-					&(info->handle), 0);
+					&(info->handle), GFP_KERNEL);
 
 	if (!info->cpu_addr) {
 		dev_err(dev, "Fail to allocate buffer\n");

drivers/gpu/ion/ion_cma_secure_heap.c

diff --git a/drivers/gpu/ion/ion_cma_secure_heap.c b/drivers/gpu/ion/ion_cma_secure_heap.c
index b3960b2..415c73e 100644
--- a/drivers/gpu/ion/ion_cma_secure_heap.c
+++ b/drivers/gpu/ion/ion_cma_secure_heap.c
@@ -83,7 +83,8 @@
 		return ION_CMA_ALLOCATE_FAILED;
 	}
 
-	info->cpu_addr = dma_alloc_attrs(dev, len, &(info->handle), 0, &attrs);
+	info->cpu_addr = dma_alloc_attrs(dev, len, &(info->handle), GFP_KERNEL,
+						&attrs);
 
 	if (!info->cpu_addr) {
 		dev_err(dev, "Fail to allocate buffer\n");