diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-06-27 12:18:04 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-06-27 12:18:04 +0800 |
commit | fb8ebda5d99fe5f3aa39fd80828a0950d4c6fc47 (patch) | |
tree | 3ef7627bb093145c34b91daa1956557d7a985aac /arch/arm64/mm/fault.c | |
parent | 9b0440e3b29f5f5340c247ac9699c53f585fa680 (diff) | |
parent | ffc4aa8f521606f63f59ff708f49780172909e94 (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-16.06-android
Diffstat (limited to 'arch/arm64/mm/fault.c')
-rw-r--r-- | arch/arm64/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 9bb45de46085..edc3e20f7ba9 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -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; /* |