From 0949bc5aa5252f3c6001117be0263fe30c97c4d3 Mon Sep 17 00:00:00 2001 From: Rebecca Schultz Zavin Date: Thu, 14 Jun 2012 14:52:17 -0700 Subject: [PATCH] gpu: ion: Fix bug in heap type enum Change-Id: I8bf1345896774f02bd25c8d25a05d2c1eae262ef Signed-off-by: Rebecca Schultz Zavin --- include/linux/ion.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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) -- 2.34.1