Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19a4939e authored by Sandeep Patil's avatar Sandeep Patil
Browse files

staging: ion: uapi: match the existing heap type enums 



Change the enup order for ion heap types to match how it was before so
as to not break any userspace code that depends on them.

Bug: 140507100
Test: ion-unit-tests

Change-Id: Id68c50a9bd3eda2ce46bc88a326a120c52d1110f
Signed-off-by: default avatarSandeep Patil <sspatil@google.com>
parent 577bbfcf

include/uapi/linux/ion.h

+5 −5
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
enum ion_heap_type {

	ION_HEAP_TYPE_SYSTEM = 0,

	ION_HEAP_TYPE_SYSTEM_CONTIG = 1,

	ION_HEAP_TYPE_CHUNK = 2,

	ION_HEAP_TYPE_CARVEOUT = 3,

	ION_HEAP_TYPE_CARVEOUT = 2,

	ION_HEAP_TYPE_CHUNK = 3,

	ION_HEAP_TYPE_DMA = 4,

	/* reserved range for future standard heap types */

	ION_HEAP_TYPE_CUSTOM = 16,
@@ -61,10 +61,10 @@ enum ion_heap_type { 
enum ion_heap_id {

	ION_HEAP_SYSTEM = (1 << ION_HEAP_TYPE_SYSTEM),

	ION_HEAP_SYSTEM_CONTIG = (ION_HEAP_SYSTEM << 1),

	ION_HEAP_CHUNK = (ION_HEAP_SYSTEM_CONTIG << 1),

	ION_HEAP_CARVEOUT_START = (ION_HEAP_CHUNK << 1),

	ION_HEAP_CARVEOUT_START = (ION_HEAP_SYSTEM_CONTIG << 1),

	ION_HEAP_CARVEOUT_END = (ION_HEAP_CARVEOUT_START << 4),

	ION_HEAP_DMA_START = (ION_HEAP_CARVEOUT_END << 1),

	ION_HEAP_CHUNK = (ION_HEAP_CARVEOUT_END << 1),

	ION_HEAP_DMA_START = (ION_HEAP_CHUNK << 1),

	ION_HEAP_DMA_END = (ION_HEAP_DMA_START << 7),

	ION_HEAP_CUSTOM_START = (ION_HEAP_DMA_END << 1),

	ION_HEAP_CUSTOM_END = (ION_HEAP_CUSTOM_START << 15),