mm: fix mismerge of folio page flag manipulators
I had missed a semantic conflict between commitd389a4a811
("mm: Add folio flag manipulation functions") from the folio tree, and commiteac96c3efd
("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:49f8275c7d
("Merge tag 'folio-5.16' of git://git.infradead.org/users/willy/pagecache") Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org> Reported-by: Yang Shi <shy828301@gmail.com> Cc: Matthew Wilcox <willy@infradead.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
8cb1ae19bf
commit
e664359367
|
@ -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
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue