ANDROID: mm: fix invalid backport in speculative page fault path
Invalid condition was introduced when porting the original SPF patch
which would affect NUMA mode.
Fixes: 736ae8bde8da3 ("FROMLIST: mm: adding speculative page fault failure trace events")
Bug: 257443051
Change-Id: Ib20c625615b279dc467588933a1f598dc179861b
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
diff --git a/mm/memory.c b/mm/memory.c
index 918ed4f..e37dfad 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -5064,11 +5064,10 @@ static vm_fault_t ___handle_speculative_fault(struct mm_struct *mm,
pol = __get_vma_policy(vmf.vma, address);
if (!pol)
pol = get_task_policy(current);
- if (!pol)
- if (pol && pol->mode == MPOL_INTERLEAVE) {
- trace_spf_vma_notsup(_RET_IP_, vmf.vma, address);
- return VM_FAULT_RETRY;
- }
+ if (pol && pol->mode == MPOL_INTERLEAVE) {
+ trace_spf_vma_notsup(_RET_IP_, vmf.vma, address);
+ return VM_FAULT_RETRY;
+ }
#endif
/*