Skip to contentSkip to conversation

linux-next: build failure after merge of the folio tree

PATCH Stephen Rothwell 1 participant 1 message Nov 1, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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 <[email protected]>
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 <[email protected]>
Cc Matthew Wilcox <[email protected]>

---

 include/linux/page-flags.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/page-flags.h renamed from include/linux/page-flags.h~mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault-vs-folios +2 -2
@@ -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
 
 /*

_

Signature · 2 lines
Cheers,
Stephen Rothwell