arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault()
authorSeongJae Park <sj@kernel.org>
Tue, 4 Jul 2023 01:00:03 +0000 (01:00 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Jul 2023 02:04:32 +0000 (19:04 -0700)
Commit ae870a68b5d1 ("arm64/mm: Convert to using
lock_mm_and_find_vma()") made do_page_fault() to use 'vma' even if
CONFIG_PER_VMA_LOCK is not defined, but the declaration is still in the
ifdef.

As a result, building kernel without the config fails with undeclared
variable error as below:

    arch/arm64/mm/fault.c: In function 'do_page_fault':
    arch/arm64/mm/fault.c:624:2: error: 'vma' undeclared (first use in this function); did you mean 'vmap'?
      624 |  vma = lock_mm_and_find_vma(mm, addr, regs);
          |  ^~~
          |  vmap

Fix it by moving the declaration out of the ifdef.

Fixes: ae870a68b5d1 ("arm64/mm: Convert to using lock_mm_and_find_vma()")
Signed-off-by: SeongJae Park <sj@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/arm64/mm/fault.c

index 935f0a8..3fe516b 100644 (file)
@@ -536,9 +536,7 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr,
        unsigned long vm_flags;
        unsigned int mm_flags = FAULT_FLAG_DEFAULT;
        unsigned long addr = untagged_addr(far);
-#ifdef CONFIG_PER_VMA_LOCK
        struct vm_area_struct *vma;
-#endif
 
        if (kprobe_page_fault(regs, esr))
                return 0;