From 66f0c91b2fe573daaf009ab358d5122386dec4e8 Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Thu, 12 May 2022 16:13:22 -0700 Subject: [PATCH] ANDROID: Fix the drain_all_pages default condition broken by a hook The condition introduced by a patch adding a vendor hook to skip drain_all_pages is invalid and changes the default behavior for CMA allocations. Fix the condition to restore default behavior. Fixes: a2485b8abd57 ("ANDROID: vendor_hooks: Add hooks to for alloc_contig_range") Bug: 232357688 Reported-by: Yong-Taek Lee Signed-off-by: Suren Baghdasaryan Change-Id: I686ad9dff57f604557f79cf4dc12cde55474e533 --- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 30f52cc94948..a02506f0bfbd 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -8772,7 +8772,7 @@ int alloc_contig_range(unsigned long start, unsigned long end, trace_android_vh_cma_drain_all_pages_bypass(migratetype, &skip_drain_all_pages); - if (skip_drain_all_pages) + if (!skip_drain_all_pages) drain_all_pages(cc.zone); /*