mirror of
https://github.com/torvalds/linux.git
synced 2026-06-07 22:14:04 +02:00
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: 1c53717440 (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
This commit is contained in:
parent
73ae4bff1d
commit
e98d2de6a6
|
|
@ -4795,6 +4795,9 @@ static vm_fault_t ___handle_speculative_fault(struct mm_struct *mm,
|
||||||
.vma = vma,
|
.vma = vma,
|
||||||
.gfp_mask = __get_fault_gfp_mask(vma),
|
.gfp_mask = __get_fault_gfp_mask(vma),
|
||||||
};
|
};
|
||||||
|
#ifdef CONFIG_NUMA
|
||||||
|
struct mempolicy *pol;
|
||||||
|
#endif
|
||||||
pgd_t *pgd, pgdval;
|
pgd_t *pgd, pgdval;
|
||||||
p4d_t *p4d, p4dval;
|
p4d_t *p4d, p4dval;
|
||||||
pud_t pudval;
|
pud_t pudval;
|
||||||
|
|
@ -4870,8 +4873,6 @@ static vm_fault_t ___handle_speculative_fault(struct mm_struct *mm,
|
||||||
goto out_segv;
|
goto out_segv;
|
||||||
|
|
||||||
#ifdef CONFIG_NUMA
|
#ifdef CONFIG_NUMA
|
||||||
struct mempolicy *pol;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* MPOL_INTERLEAVE implies additional checks in
|
* MPOL_INTERLEAVE implies additional checks in
|
||||||
* mpol_misplaced() which are not compatible with the
|
* mpol_misplaced() which are not compatible with the
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user