Merge "arm64: enable PTE type bit in the mask for pte_modify" (20916112) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm64/include/asm/pgtable.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -397,7 +397,7 @@ static inline pmd_t pmd_offset(pud_t pud, unsigned long addr)
		static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
		{
		const pteval_t mask = PTE_USER \| PTE_PXN \| PTE_UXN \| PTE_RDONLY \|
		PTE_PROT_NONE \| PTE_VALID \| PTE_WRITE;
		PTE_PROT_NONE \| PTE_WRITE \| PTE_TYPE_MASK;
		pte_val(pte) = (pte_val(pte) & ~mask) \| (pgprot_val(newprot) & mask);
		return pte;
		}