Hi all,
After merging the origin tree, today's linux-next build (arm64 defconfig)
failed like this:
arch/arm64/mm/fault.c: In function 'do_page_fault':
arch/arm64/mm/fault.c:624:9: error: 'vma' undeclared (first use in this function); did you mean 'vmap'?
624 | vma = lock_mm_and_find_vma(mm, addr, regs);
| ^~~:
| vmap
Caused by commit
ae870a68b5d1 ("arm64/mm: Convert to using lock_mm_and_find_vma()")
interacting with commit
1e72a0774792 ("mm: disable CONFIG_PER_VMA_LOCK by default until its fixed")
from the mm tree.
I applied the following for today (but have no idea if it is correct).
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 4 Jul 2023 12:14:37 +1000
Subject: [PATCH] fix up for "arm64/mm: Convert to using lock_mm_and_find_vma()"
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
arch/arm64/mm/fault.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 9d78ff78b0e3..b8c80f7b8a5f 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -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;
--
2.39.2
--
Cheers,
Stephen Rothwell
Attachment:
pgpIJXv1jKNMv.pgp
Description: OpenPGP digital signature
