From 75acd190bde52cd6f505d3ded0f6d6e70ebb4daa Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Fri, 6 Mar 2020 09:59:57 -0800 Subject: [PATCH] ANDROID: Fix kernelci build-break on !CONFIG_CMA builds commit c29070e5b92b ("ANDROID: GKI: cma: redirect page allocation to CMA") added the field cma_alloc to struct zone if CONFIG_CMA. However, two references to cma_alloc were added in mm/page_alloc.c that could be reached if CONFIG_MEMORY_ISOLATION and CONFIG_COMPACTION are defined. Fixes: c29070e5b92b ("ANDROID: GKI: cma: redirect page allocation to CMA") Signed-off-by: Todd Kjos Change-Id: I3a4b803612084a070ba3cc0af11808bea20d324e --- mm/page_alloc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0090c9211737..e22967a84da9 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -8231,7 +8231,9 @@ int alloc_contig_range(unsigned long start, unsigned long end, if (ret) return ret; +#ifdef CONFIG_CMA cc.zone->cma_alloc = 1; +#endif /* * In case of -EBUSY, we'd like to know which page causes problem. * So, just fall through. test_pages_isolated() has a tracepoint @@ -8314,7 +8316,9 @@ int alloc_contig_range(unsigned long start, unsigned long end, done: undo_isolate_page_range(pfn_max_align_down(start), pfn_max_align_up(end), migratetype); +#ifdef CONFIG_CMA cc.zone->cma_alloc = 0; +#endif return ret; }