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

torvalds · torvalds · commit 617a8d6bc19e · 2016-07-10T09:13:02.000-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.
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -633,7 +633,7 @@ static inline struct page *pmd_page(pmd_t pmd)`
`633`	`633`
`634`	`634`	`static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)`
`635`	`635`	`{`
`636`		`- pmd_val(pmd) = (pmd_val(pmd) & _PAGE_CHG_MASK) \|`
	`636`	`+ pmd_val(pmd) = (pmd_val(pmd) & (_PAGE_CHG_MASK \| _PAGE_HUGE)) \|`
`637`	`637`	`(pgprot_val(newprot) & ~_PAGE_CHG_MASK);`
`638`	`638`	`return pmd;`
`639`	`639`	`}`