commit 5dd2dff5d2850035224aecf70fa744a230677435
author Linux Build Service Account <lnxbuild@localhost> Wed Apr 17 11:08:11 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 17 11:08:10 2013 -0700
tree 6a1bfcdb9bb0e7976c833e5926796e8f63e92ae2
parent 7eed5d70afd3bbf25533a6ccf6dd53722a94fcd4
parent 07f05cd464aa67af7a180f3ab29515ec4a5b9b62

Merge "msm: Fix reservation logic for ADSP heap"

arch/arm/mach-msm/board-8064.c

diff --git a/arch/arm/mach-msm/board-8064.c b/arch/arm/mach-msm/board-8064.c
index 0fe94d5..0fc91ef 100644
--- a/arch/arm/mach-msm/board-8064.c
+++ b/arch/arm/mach-msm/board-8064.c
@@ -437,7 +437,7 @@
 
 			if (fixed_position != NOT_FIXED)
 				fixed_size += heap->size;
-			else
+			else if (!use_cma)
 				reserve_mem_for_ion(MEMTYPE_EBI1, heap->size);
 
 			if (fixed_position == FIXED_LOW) {

arch/arm/mach-msm/board-8930.c

diff --git a/arch/arm/mach-msm/board-8930.c b/arch/arm/mach-msm/board-8930.c
index 8be128c..6ccaba6 100644
--- a/arch/arm/mach-msm/board-8930.c
+++ b/arch/arm/mach-msm/board-8930.c
@@ -477,7 +477,7 @@
 
 			if (fixed_position != NOT_FIXED)
 				fixed_size += heap->size;
-			else
+			else if (!use_cma)
 				reserve_mem_for_ion(MEMTYPE_EBI1, heap->size);
 
 			if (fixed_position == FIXED_LOW) {

arch/arm/mach-msm/board-8960.c

diff --git a/arch/arm/mach-msm/board-8960.c b/arch/arm/mach-msm/board-8960.c
index c5fc418..5d96389 100644
--- a/arch/arm/mach-msm/board-8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -532,7 +532,7 @@
 
 			if (fixed_position != NOT_FIXED)
 				fixed_size += heap->size;
-			else
+			else if (!use_cma)
 				reserve_mem_for_ion(MEMTYPE_EBI1, heap->size);
 
 			if (fixed_position == FIXED_LOW) {