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

Commit 0a45dbfb authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: cma: Print region name on failure"

parents 59f74bb1 3df983ba

arch/arm64/configs/vendor/kona_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ CONFIG_MEMORY_HOTPLUG_MOVABLE_NODE=y 
CONFIG_MEMORY_HOTREMOVE=y

CONFIG_CLEANCACHE=y

CONFIG_CMA=y

CONFIG_CMA_DEBUG=y

CONFIG_CMA_DEBUGFS=y

CONFIG_CMA_AREAS=16

CONFIG_ZSMALLOC=y

mm/cma.c

+2 −2
Original line number Diff line number Diff line
@@ -538,8 +538,8 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align, 
	trace_cma_alloc(pfn, page, count, align);



	if (ret && !no_warn) {

		pr_err("%s: alloc failed, req-size: %zu pages, ret: %d\n",

			__func__, count, ret);

		pr_err("%s: %s: alloc failed, req-size: %zu pages, ret: %d\n",

			__func__, cma->name, cma->count, ret);

		cma_debug_show_areas(cma);

	}