Skip to content

Commit e664359

Browse files
committed
mm: fix mismerge of folio page flag manipulators
I had missed a semantic conflict between commit d389a4a ("mm: Add folio flag manipulation functions") from the folio tree, and commit eac96c3 ("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: 49f8275 ("Merge tag 'folio-5.16' of git://git.infradead.org/users/willy/pagecache") Reported-by: Naresh Kamboju <[email protected]> Reported-by: Yang Shi <[email protected]> Cc: Matthew Wilcox <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 8cb1ae1 commit e664359

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

include/linux/page-flags.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -803,8 +803,8 @@ PAGEFLAG_FALSE(DoubleMap, double_map)
803803
PAGEFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND)
804804
TESTSCFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND)
805805
#else
806-
PAGEFLAG_FALSE(HasHWPoisoned)
807-
TESTSCFLAG_FALSE(HasHWPoisoned)
806+
PAGEFLAG_FALSE(HasHWPoisoned, has_hwpoisoned)
807+
TESTSCFLAG_FALSE(HasHWPoisoned, has_hwpoisoned)
808808
#endif
809809

810810
/*

0 commit comments

Comments
 (0)