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

Commit ff53c1c3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "gpu: ion: don't use "vmalloc" for system heap readable name"

parents 2058105c 9d94828a

drivers/gpu/ion/msm/msm_ion.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static struct ion_heap_desc ion_heap_meta[] = { 
	{

		.id	= ION_SYSTEM_HEAP_ID,

		.type	= ION_HEAP_TYPE_SYSTEM,

		.name	= ION_VMALLOC_HEAP_NAME,

		.name	= ION_SYSTEM_HEAP_NAME,

	},

	{

		.id	= ION_SYSTEM_CONTIG_HEAP_ID,

include/uapi/linux/msm_ion.h

+3 −2
Original line number Diff line number Diff line 
/*

 * include/linux/ion.h

 *

 * Copyright (c) 2012, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -106,7 +106,8 @@ enum cp_mem_usage { 
#define ION_HEAP(bit) (1 << (bit))



#define ION_ADSP_HEAP_NAME	"adsp"

#define ION_VMALLOC_HEAP_NAME	"vmalloc"

#define ION_SYSTEM_HEAP_NAME	"system"

#define ION_VMALLOC_HEAP_NAME	ION_SYSTEM_HEAP_NAME

#define ION_KMALLOC_HEAP_NAME	"kmalloc"

#define ION_AUDIO_HEAP_NAME	"audio"

#define ION_SF_HEAP_NAME	"sf"