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

Commit a549d94b authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: disable system contig heap" into msm-4.9

parents 7dd2f2ad ef1c80bc

drivers/staging/android/ion/ion_heap.c

+5 −3
Original line number Diff line number Diff line
@@ -325,8 +325,9 @@ struct ion_heap *ion_heap_create(struct ion_platform_heap *heap_data) 


	switch (heap_data->type) {

	case ION_HEAP_TYPE_SYSTEM_CONTIG:

		heap = ion_system_contig_heap_create(heap_data);

		break;

		pr_err("%s: Heap type is disabled: %d\n", __func__,

		       heap_data->type);

		return ERR_PTR(-EINVAL);

	case ION_HEAP_TYPE_SYSTEM:

		heap = ion_system_heap_create(heap_data);

		break;
@@ -366,7 +367,8 @@ void ion_heap_destroy(struct ion_heap *heap) 


	switch (heap->type) {

	case ION_HEAP_TYPE_SYSTEM_CONTIG:

		ion_system_contig_heap_destroy(heap);

		pr_err("%s: Heap type is disabled: %d\n", __func__,

		       heap->type);

		break;

	case ION_HEAP_TYPE_SYSTEM:

		ion_system_heap_destroy(heap);