Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

617a8d6b · Linus Torvalds <[email protected]> · 2016-07-10 09:13:02 -07:00

Pull MIPS fix from Ralf Baechle:
 "Another week with just a single 4.7 fix.

  This fixes a possible 'loss' of the huge page bit from pmd on
  permission change"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Fix page table corruption on THP permission changes.

Commit: 617a8d6bc19edd075e8111c6770f79cae75be51f
Parents: ee40fb29 · 88d02a2b

Merge commit. Changes below are compared with the first parent: ee40fb29.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
arch/mips/include/asm/pgtable.h	modified	+1	−1	View file

arch/mips/include/asm/pgtable.h

View file

diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
index f538167..7d44e88 100644
--- a/arch/mips/include/asm/pgtable.h
+++ b/arch/mips/include/asm/pgtable.h
@@ -633,7 +633,7 @@ static inline struct page *pmd_page(pmd_t pmd)
 
 static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)
 {
-	pmd_val(pmd) = (pmd_val(pmd) & _PAGE_CHG_MASK) |
+	pmd_val(pmd) = (pmd_val(pmd) & (_PAGE_CHG_MASK | _PAGE_HUGE)) |
 		       (pgprot_val(newprot) & ~_PAGE_CHG_MASK);
 	return pmd;
 }