ARM: 7654/1: Preserve L_PTE_VALID in pte_modify()
authorCatalin Marinas <catalin.marinas@arm.com>
Mon, 18 Feb 2013 16:51:20 +0000 (17:51 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 21 Feb 2013 13:25:37 +0000 (13:25 +0000)
commit69dde4c52dbac2891b49ff9723d9c84efc5baf6f
tree771af8f80b5cf838b164613d5319777f30d7e484
parent70264367a243a68b1d5636ffb570183449803cbe
ARM: 7654/1: Preserve L_PTE_VALID in pte_modify()

Following commit 26ffd0d4 (ARM: mm: introduce present, faulting entries
for PAGE_NONE), if a page has been mapped as PROT_NONE, the L_PTE_VALID
bit is cleared by the set_pte_ext() code. With LPAE the software and
hardware pte share the same location and subsequent modifications of pte
range (change_protection()) will leave the L_PTE_VALID bit cleared.

This patch adds the L_PTE_VALID bit to the newprot mask in pte_modify().

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Reported-by: Subash Patel <subash.rp@samsung.com>
Tested-by: Subash Patel <subash.rp@samsung.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: <stable@vger.kernel.org> # 3.8.x
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/include/asm/pgtable.h