Merge "drivers: dma-contiguous: remove cma regions from kmemleak scan" into msm-4.9

mm/cma.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,10 @@ static int __init cma_activate_area(struct cma *cma)
		spin_lock_init(&cma->mem_head_lock);
		#endif

		if (!PageHighMem(pfn_to_page(cma->base_pfn)))
		kmemleak_free_part(__va(cma->base_pfn << PAGE_SHIFT),
		cma->count << PAGE_SHIFT);

		return 0;

		err: