aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-07-10 09:13:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-10 09:13:02 -0700
commit617a8d6bc19edd075e8111c6770f79cae75be51f (patch)
treed443d45f20a3b591e692f27e22699a139e18bf27
parentee40fb2948fc99096836995d4f3ddcc0efbac790 (diff)
parent88d02a2ba6c52350f9a73ff1b01a5be839c3ca17 (diff)
downloadlinux-stericsson-617a8d6bc19edd075e8111c6770f79cae75be51f.tar.gz
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
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.
-rw-r--r--arch/mips/include/asm/pgtable.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
index f53816744d60..7d44e888134f 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;
}