From: Rebecca Schultz Zavin <rebecca@android.com>
Date: Thu, 14 Jun 2012 21:52:17 +0000 (-0700)
Subject: gpu: ion: Fix bug in heap type enum
X-Git-Tag: firefly_0821_release~4090^2~722
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=0949bc5aa5252f3c6001117be0263fe30c97c4d3;p=firefly-linux-kernel-4.4.55.git

gpu: ion: Fix bug in heap type enum

Change-Id: I8bf1345896774f02bd25c8d25a05d2c1eae262ef
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
---

diff --git a/include/linux/ion.h b/include/linux/ion.h
index d44ce69446dd..050a9a157054 100644
--- a/include/linux/ion.h
+++ b/include/linux/ion.h
@@ -27,7 +27,9 @@ struct ion_handle;
  * @ION_HEAP_TYPE_CARVEOUT:	 memory allocated from a prereserved
  * 				 carveout heap, allocations are physically
  * 				 contiguous
- * @ION_HEAP_END:		 helper for iterating over heaps
+ * @ION_NUM_HEAPS:		 helper for iterating over heaps, a bit mask
+ * 				 is used to identify the heaps, so only 32
+ * 				 total heap types are supported
  */
 enum ion_heap_type {
 	ION_HEAP_TYPE_SYSTEM,
@@ -35,7 +37,7 @@ enum ion_heap_type {
 	ION_HEAP_TYPE_CARVEOUT,
 	ION_HEAP_TYPE_CUSTOM, /* must be last so device specific heaps always
 				 are at the end of this enum */
-	ION_NUM_HEAPS,
+	ION_NUM_HEAPS = 32,
 };
 
 #define ION_HEAP_SYSTEM_MASK		(1 << ION_HEAP_TYPE_SYSTEM)