Messages in this thread Patch in this message | | | Date | Mon, 1 Nov 2021 17:48:46 +1100 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the folio tree |
| |
Hi all,
After merging the folio tree, today's linux-next build (powerpc ppc64_defconfig) failed like this:
Caused by commit
d389a4a81155 ("mm: Add folio flag manipulation functions")
interacting with commit
eac96c3efdb5 ("mm: filemap: check if THP has hwpoisoned subpage for PMD page fault")
from Linus' tree.
I have applied the following merge fix patch taken from Andrew's patch series.
From: Andrew Morton <akpm@linux-foundation.org> Subject: mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault-vs-folios
fix mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault.patch for folio tree PAGEFLAG_FALSE() change.
Cc: Yang Shi <shy828301@gmail.com> Cc: Matthew Wilcox <willy@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> ---
include/linux/page-flags.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/include/linux/page-flags.h~mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault-vs-folios +++ a/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 /* _ -- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |