From b55d8223cabd7da65c24ed8d2688d99c22db2d7e Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Mon, 25 Jan 2021 19:58:08 -0800 Subject: [PATCH] ANDROID: Fix sparse warning in wp_page_copy caused by SPF patchset SPF patchset introduced a sparse warning caused by type mismatch in wp_page_copy. Fix the variable type. Fixes: 'FROMLIST: mm: prepare for FAULT_FLAG_SPECULATIVE' Bug: 161210518 Signed-off-by: Suren Baghdasaryan Change-Id: Id0db15db82bce0808d58f27bd72a1db0f63c72b7 --- mm/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memory.c b/mm/memory.c index 94f5be19d31d..3538056e4501 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3006,7 +3006,7 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) pte_t entry; int page_copied = 0; struct mmu_notifier_range range; - int ret = VM_FAULT_OOM; + vm_fault_t ret = VM_FAULT_OOM; if (unlikely(anon_vma_prepare(vma))) goto out;