A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-24 05:29:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

ANDROID: staging: ion: delete unused heap types and IDs

Browse source 
Delete system_contig, chunk and carevout heap types and IDs.

Test: build, boot, ion-unit-tests
Bug: 138149732
Change-Id: I45d97138ab2a6986955c8934ab13b70372d9e62d
Signed-off-by: Hridya Valsaraju <hridya@google.com>
This commit is contained in:
Hridya Valsaraju 2020-02-12 23:40:08 -08:00
commit 9f3f1787d8
5 changed files with 4 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

27
include/uapi/linux/ion.h
View file

@ -17,23 +17,14 @@
* @ION_HEAP_TYPE_SYSTEM: Reserved heap id for ion heap that allocates
* memory using alloc_page(). Also, supports
* deferred free and allocation pools.
* @ION_HEAP_TYPE_SYSTEM_CONTIG: Reserved heap id for ion heap that is the same
* as SYSTEM_HEAP, except doesn't support
* allocation pools.
* @ION_HEAP_TYPE_CARVEOUT: Reserved heap id for ion heap that allocates
* memory from a pre-reserved memory region
* aka 'carveout'.
* @ION_HEAP_TYPE_DMA: Reserved heap id for ion heap that manages
* @ION_HEAP_TYPE_DMA: Reserved heap id for ion heap that manages
* single CMA (contiguous memory allocator)
* region. Uses standard DMA APIs for
* managing memory within the CMA region.
*/
enum ion_heap_type {
ION_HEAP_TYPE_SYSTEM = 0,
ION_HEAP_TYPE_SYSTEM_CONTIG = 1,
ION_HEAP_TYPE_CARVEOUT = 2,
ION_HEAP_TYPE_CHUNK = 3,
ION_HEAP_TYPE_DMA = 4,
ION_HEAP_TYPE_DMA = 2,
/* reserved range for future standard heap types */
ION_HEAP_TYPE_CUSTOM = 16,
ION_HEAP_TYPE_MAX = 31,
@ -43,12 +34,6 @@ enum ion_heap_type {
* ion_heap_id - list of standard heap ids that Android can use
*
* @ION_HEAP_SYSTEM Id for the ION_HEAP_TYPE_SYSTEM
* @ION_HEAP_SYSTEM_CONTIG Id for the ION_HEAP_TYPE_SYSTEM_CONTIG
* @ION_HEAP_CHUNK Id for the ION_HEAP_TYPE_CHUNK
* @ION_HEAP_CARVEOUT_START Start of reserved id range for heaps of type
* ION_HEAP_TYPE_CARVEOUT
* @ION_HEAP_CARVEOUT_END End of reserved id range for heaps of type
* ION_HEAP_TYPE_CARVEOUT
* @ION_HEAP_DMA_START Start of reserved id range for heaps of type
* ION_HEAP_TYPE_DMA
* @ION_HEAP_DMA_END End of reserved id range for heaps of type
@ -60,14 +45,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_CARVEOUT_START = (ION_HEAP_SYSTEM_CONTIG << 1),
ION_HEAP_CARVEOUT_END = (ION_HEAP_CARVEOUT_START << 4),
ION_HEAP_CHUNK = (ION_HEAP_CARVEOUT_END << 1),
ION_HEAP_DMA_START = (ION_HEAP_CHUNK << 1),
ION_HEAP_DMA_START = (ION_HEAP_SYSTEM << 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),
ION_HEAP_CUSTOM_END = (ION_HEAP_CUSTOM_START << 22),
};
#define ION_NUM_MAX_HEAPS (32)