From d95f5e3da7848cdaf2bd14217d9772938d41f991 Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Sun, 27 Nov 2022 10:00:18 -0800 Subject: [PATCH] ANDROID: khugepaged: fix mixing declarations warning in retract_page_tables vm_write_begin() was added before variable definition, producing a "mixing declarations and code is a C99 extension" warning. Fix by rearranging the code. Fixes: ("ANDROID: mm/khugepaged: add missing vm_write_{begin|end}") Bug: 257443051 Change-Id: I6e85ccfabd5e37b1397c654d61d0b8177326c3d8 Signed-off-by: Suren Baghdasaryan --- mm/khugepaged.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 87be82c20290..b40bd0efd37e 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1605,8 +1605,9 @@ static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff) */ if (mmap_write_trylock(mm)) { if (!khugepaged_test_exit(mm)) { + spinlock_t *ptl; vm_write_begin(vma); - spinlock_t *ptl = pmd_lock(mm, pmd); + ptl = pmd_lock(mm, pmd); /* assume page table is clear */ _pmd = pmdp_collapse_flush(vma, addr, pmd); spin_unlock(ptl);