ANDROID: mm: fix mixed declaration and code warning
This fixes the following warning:
mm/memory.c: In function ‘___handle_speculative_fault’:
mm/memory.c:4871:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
4871 | struct mempolicy *pol;
| ^~~~~~
Bug: 183339614
Fixes: 1c5371744061 (FROMLIST: mm: provide speculative fault infrastructure)
Reported-by: kernelci.org bot <bot@kernelci.org>
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Change-Id: Iebb8c7b4f7c01688bfbb9770653063015ae47020
diff --git a/mm/memory.c b/mm/memory.c
index 95a5902..2fe2bf2 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4795,6 +4795,9 @@ static vm_fault_t ___handle_speculative_fault(struct mm_struct *mm,
.vma = vma,
.gfp_mask = __get_fault_gfp_mask(vma),
};
+#ifdef CONFIG_NUMA
+ struct mempolicy *pol;
+#endif
pgd_t *pgd, pgdval;
p4d_t *p4d, p4dval;
pud_t pudval;
@@ -4870,8 +4873,6 @@ static vm_fault_t ___handle_speculative_fault(struct mm_struct *mm,
goto out_segv;
#ifdef CONFIG_NUMA
- struct mempolicy *pol;
-
/*
* MPOL_INTERLEAVE implies additional checks in
* mpol_misplaced() which are not compatible with the