Unverified Commit 83751e76 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11553 mm: fix failure to unmap pte on highmem systems 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wupeng Ma <mawupeng1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YLZY4DSJMDLRZO74R4L7GXTGVEB2V7LG/ 
 
https://gitee.com/openeuler/kernel/issues/IAQT9Q 
 
Link:https://gitee.com/openeuler/kernel/pulls/11553

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 3f5989b3 d41df997

mm/memory.c

+2 −4
Original line number Diff line number Diff line
@@ -3424,10 +3424,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) 
			vmf->page = device_private_entry_to_page(entry);

			vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd,

					vmf->address, &vmf->ptl);

			if (unlikely(!pte_same(*vmf->pte, vmf->orig_pte))) {

				spin_unlock(vmf->ptl);

				goto out;

			}

			if (unlikely(!pte_same(*vmf->pte, vmf->orig_pte)))

				goto unlock;



			/*

			 * Get a page reference while we know the page can't be