powerpc/mm: Fixup _HPAGE_CHG_MASK
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Wed, 27 Jan 2016 06:34:20 +0000 (12:04 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 28 Jan 2016 12:49:43 +0000 (23:49 +1100)
This was wrongly updated by commit 7aa9a23c69ea ("powerpc, thp: remove
infrastructure for handling splitting PMDs") during the last merge
window. Fix it up.

This could lead to incorrect behaviour in THP and/or mprotect(), at a
minimum.

Fixes: 7aa9a23c69ea ("powerpc, thp: remove infrastructure for handling splitting PMDs")
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/include/asm/book3s/64/hash.h

index 06f17e778c2750edd0b2380288da820f0c40f130..8d1c8162f0c1078d1842d754b64a078be8e1ea0e 100644 (file)
@@ -50,7 +50,9 @@
  * set of bits not changed in pmd_modify.
  */
 #define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \
-                        _PAGE_ACCESSED | _PAGE_THP_HUGE)
+                        _PAGE_ACCESSED | _PAGE_THP_HUGE | _PAGE_PTE | \
+                        _PAGE_SOFT_DIRTY)
+
 
 #ifdef CONFIG_PPC_64K_PAGES
 #include <asm/book3s/64/hash-64k.h>