tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault()

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>

authored by

SeongJae Park and committed by
Linus Torvalds 24be4d0b e50df249

-2
-2
arch/arm64/mm/fault.c
··· 536 536 unsigned long vm_flags; 537 537 unsigned int mm_flags = FAULT_FLAG_DEFAULT; 538 538 unsigned long addr = untagged_addr(far); 539 - #ifdef CONFIG_PER_VMA_LOCK 540 539 struct vm_area_struct *vma; 541 - #endif 542 540 543 541 if (kprobe_page_fault(regs, esr)) 544 542 return 0;