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

Commit 6f79272a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: Fix sleeping while atomic during speculative page fault"

parents 02ea1cf2 8b8dd3be

mm/memory.c

+1 −1
Original line number Diff line number Diff line
@@ -3524,7 +3524,7 @@ static vm_fault_t pte_alloc_one_map(struct vm_fault *vmf) 
{

	struct vm_area_struct *vma = vmf->vma;



	if (!pmd_none(*vmf->pmd))

	if (!pmd_none(*vmf->pmd) || (vmf->flags & FAULT_FLAG_SPECULATIVE))

		goto map_pte;

	if (vmf->prealloc_pte) {

		vmf->ptl = pmd_lock(vma->vm_mm, vmf->pmd);