From a1d1eb8bd3f62d1a40dec0e7d40c5f7ee2b5aa5f Mon Sep 17 00:00:00 2001 From: Alexander Winkowski Date: Fri, 12 Jan 2024 04:59:59 +0000 Subject: [PATCH] Revert "ANDROID: mm: prevent speculative page fault handling for in do_swap_page()" This reverts commit cb68c255f8dc8e960ccd9b61ff584ba419923880. Change-Id: I3deaf837842423b91b1cca32ec974d9612c882b7 Signed-off-by: Alexander Winkowski --- mm/memory.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 5e8c197e214c..1df7a5f0fec8 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3090,11 +3090,6 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) int exclusive = 0; vm_fault_t ret; - if (vmf->flags & FAULT_FLAG_SPECULATIVE) { - pte_unmap(vmf->pte); - return VM_FAULT_RETRY; - } - ret = pte_unmap_same(vmf); if (ret) { /*