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

Commit 0742f03a authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Srinivasarao Pathipati
Browse files

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: default avatarSuren Baghdasaryan <surenb@google.com>
Git-commit: 1900436df5d947c2ee74bd78cde1366556c93b51
Git-repo: https://android.googlesource.com/kernel/common/


[quic_c_spathi@quicinc.com: resolve trivial merge conflicts]
Signed-off-by: default avatarSrinivasarao Pathipati <quic_c_spathi@quicinc.com>
parent 577d50d9

mm/memory.c

+4 −5
Original line number Diff line number Diff line
@@ -4660,7 +4660,6 @@ int __handle_speculative_fault(struct mm_struct *mm, unsigned long address, 
	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;