The patch titled Subject: mm: fix compile error due to COMPACTION_HPAGE_ORDER has been added to the -mm tree. Its filename is mm-proactive-compaction-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-proactive-compaction-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-proactive-compaction-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Nitin Gupta <nigupta@xxxxxxxxxx> Subject: mm: fix compile error due to COMPACTION_HPAGE_ORDER Fix compile error when COMPACTION_HPAGE_ORDER is assigned to HUGETLB_PAGE_ORDER. The correct way to check if this constant is defined is to check for CONFIG_HUGETLBFS. Link: http://lkml.kernel.org/r/20200623064544.25766-1-nigupta@xxxxxxxxxx Signed-off-by: Nitin Gupta <nigupta@xxxxxxxxxx> Reported-by: Nathan Chancellor <natechancellor@xxxxxxxxx> Tested-by: Nathan Chancellor <natechancellor@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/compaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/compaction.c~mm-proactive-compaction-fix +++ a/mm/compaction.c @@ -62,7 +62,7 @@ static const int HPAGE_FRAG_CHECK_INTERV */ #if defined CONFIG_TRANSPARENT_HUGEPAGE #define COMPACTION_HPAGE_ORDER HPAGE_PMD_ORDER -#elif defined HUGETLB_PAGE_ORDER +#elif defined CONFIG_HUGETLBFS #define COMPACTION_HPAGE_ORDER HUGETLB_PAGE_ORDER #else #define COMPACTION_HPAGE_ORDER (PMD_SHIFT - PAGE_SHIFT) _ Patches currently in -mm which might be from nigupta@xxxxxxxxxx are mm-proactive-compaction.patch mm-proactive-compaction-fix.patch mm-use-unsigned-types-for-fragmentation-score.patch