summaryrefslogtreecommitdiff
authortao zeng <tao.zeng@amlogic.com>2018-01-16 06:47:49 (GMT)
committer jie.yuan <jie.yuan@amlogic.com>2018-03-20 03:07:09 (GMT)
commit379cb08c8c595eb8165085b6982dd0632010d59c (patch)
treef8f2566d9aa8792c5b08b83566db0bfd6f75f7b1
parentcc266ea9ae3eaf2fed103af1e6f4029f8a3ea891 (diff)
downloadcommon-379cb08c8c595eb8165085b6982dd0632010d59c.zip
common-379cb08c8c595eb8165085b6982dd0632010d59c.tar.gz
common-379cb08c8c595eb8165085b6982dd0632010d59c.tar.bz2
memory: merge modification of tao.zeng [7/9]
mm: fix compile error on other configs PD#153120: mm:fix compile error on other configs Change-Id: I8e72afa508c44149f69c6d8c34698d13848e539c Signed-off-by: tao zeng <tao.zeng@amlogic.com>
Diffstat
-rw-r--r--mm/page_alloc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 4e620be..d73db28 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7825,8 +7825,10 @@ int alloc_contig_range(unsigned long start, unsigned long end,
/* Make sure the range is really isolated. */
if (test_pages_isolated(outer_start, end, false)) {
+ #ifdef CONFIG_AMLOGIC_MODIFY
cma_debug("%s: [%lx, %lx) PFNs busy\n",
__func__, outer_start, end);
+ #endif /* CONFIG_AMLOGIC_MODIFY */
ret = -EBUSY;
goto done;
}