R0dn3yS/android_kernel_xiaomi_sm7250
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mm: fix conflict

Browse Source 
This fixes conflict with 6832199422
fix modifying of page protection by insert_pfn()

Bug: 140544941
Test: boot
Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: I536ddf02d40ab4067fe2f656141df9712b3585ca
Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
This commit is contained in:
Martin Liu 2020-04-12 02:02:21 +08:00 committed by spakkkk
parent 6df773aaef
commit f4eed96283
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mm/memory.c
View File

@ -1868,7 +1868,7 @@ static int insert_pfn(struct vm_area_struct *vma, unsigned long addr,
goto out_unlock;
}
entry = pte_mkyoung(*pte);
entry = maybe_mkwrite(pte_mkdirty(entry), vma->vm_flags);
entry = maybe_mkwrite(pte_mkdirty(entry), vma);
if (ptep_set_access_flags(vma, addr, pte, entry, 1))
update_mmu_cache(vma, addr, pte);
}