From: Linus Torvalds Date: Mon, 1 Nov 2021 21:56:37 +0000 (-0700) Subject: mm: fix mismerge of folio page flag manipulators X-Git-Tag: baikal/mips/sdk6.1~7227 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=88c0596acd3d09a0b7f1bd14e3ce3ec5890d8f44;p=kernel.git mm: fix mismerge of folio page flag manipulators I had missed a semantic conflict between commit 98bc5b89a62d ("mm: Add folio flag manipulation functions") from the folio tree, and commit 4063ff18c873 ("mm: filemap: check if THP has hwpoisoned subpage for PMD page fault") that added a new set of page flags. My build tests had too many options enabled, which hid this issue. But if you didn't have MEMORY_FAILURE or TRANSPARENT_HUGEPAGE enabled, you'd end up with build errors like this: include/linux/page-flags.h:806:29: error: macro "PAGEFLAG_FALSE" requires 2 arguments, but only 1 given 806 | PAGEFLAG_FALSE(HasHWPoisoned) | ^ due to the missing lowercase name used for folio function naming. Fixes: 94c48a63731a ("Merge tag 'folio-5.16' of git://git.infradead.org/users/willy/pagecache") Reported-by: Naresh Kamboju Reported-by: Yang Shi Cc: Matthew Wilcox Signed-off-by: Linus Torvalds --- diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index d8623d6e11415..981341a3c3c4a 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -803,8 +803,8 @@ PAGEFLAG_FALSE(DoubleMap, double_map) PAGEFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND) TESTSCFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND) #else -PAGEFLAG_FALSE(HasHWPoisoned) - TESTSCFLAG_FALSE(HasHWPoisoned) +PAGEFLAG_FALSE(HasHWPoisoned, has_hwpoisoned) + TESTSCFLAG_FALSE(HasHWPoisoned, has_hwpoisoned) #endif /*