Commit 617a8d6b authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'upstream' of git://

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://
  MIPS: Fix page table corruption on THP permission changes.
parents ee40fb29 88d02a2b
......@@ -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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment