tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

Linus Torvalds 617a8d6b ee40fb29

+1 -1
+1 -1
arch/mips/include/asm/pgtable.h
··· 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 }