Re: linux-next: manual merge of the akpm-current tree with the powerpc tree
From: Stephen Rothwell <hidden>
Date: 2015-12-15 06:44:43
Also in:
linux-next, lkml
Hi Andrew, On Tue, 15 Dec 2015 16:53:42 +1100 Stephen Rothwell [off-list ref] wrote:
quoted hunk ↗ jump to hunk
diff --git a/arch/powerpc/include/asm/book3s/64/hash.h b/arch/powerpc/include/asm/book3s/64/hash.h index 8b929e531758..4e69d9a273ed 100644 --- a/arch/powerpc/include/asm/book3s/64/hash.h +++ b/arch/powerpc/include/asm/book3s/64/hash.h@@ -48,9 +43,8 @@ /* * set of bits not changed in pmd_modify. */ -#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | \ - _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_SPLITTING | \ - _PAGE_THP_HUGE | _PAGE_PTE) +#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY |
^ I missed a backslash here which I fixed up in my tree.
+ _PAGE_ACCESSED | _PAGE_THP_HUGE | _PAGE_PTE)
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au