Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33fc259a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fix from Will Deacon:
 "A fix for an issue that Alex saw whilst swapping with hardware
  access/dirty bit support enabled in the kernel: Fix a failure to fault
  in old pages on a write when CONFIG_ARM64_HW_AFDBM is enabled"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: mm: always take dirty state from new pte in ptep_set_access_flags
parents 75d089d1 0106d456

arch/arm64/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ int ptep_set_access_flags(struct vm_area_struct *vma, 
	 * PTE_RDONLY is cleared by default in the asm below, so set it in

	 * back if necessary (read-only or clean PTE).

	 */

	if (!pte_write(entry) || !dirty)

	if (!pte_write(entry) || !pte_sw_dirty(entry))

		pte_val(entry) |= PTE_RDONLY;



	/*