? sys/cscope.out
? sys/arch/aarch64/aarch64/locore.S.new
? sys/arch/evbarm/conf/GENERIC.local
? sys/arch/evbarm/conf/GENERIC_SAN
? sys/arch/evbmips/conf/OCTEON.MP
? sys/uvm/pmap/cscope.out
Index: sys/arch/arm/arm/armv6_start.S
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/arm/armv6_start.S,v
retrieving revision 1.22
diff -u -p -r1.22 armv6_start.S
--- sys/arch/arm/arm/armv6_start.S	25 Aug 2020 15:03:48 -0000	1.22
+++ sys/arch/arm/arm/armv6_start.S	25 Aug 2020 17:31:35 -0000
@@ -43,9 +43,6 @@
 #include <arm/armreg.h>
 #include "assym.h"
 
-#define INIT_ARM_STACK_SHIFT	10
-#define INIT_ARM_STACK_SIZE	(1 << INIT_ARM_STACK_SHIFT)
-
 #if defined(CONSADDR) && defined(CONADDR)
 #error Only one of CONSADDR and CONADDR should be defined
 #endif
@@ -234,7 +231,7 @@ generic_savevars:
 	.global start_stacks_bottom
 	.global start_stacks_top
 start_stacks_bottom:
-	.space	INIT_ARM_STACK_SIZE * MAXCPUS
+	.space	INIT_ARM_TOTAL_STACK
 start_stacks_top:
 
 	.section "_init_memory", "aw", %nobits
Index: sys/arch/arm/arm32/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/arm32/genassym.cf,v
retrieving revision 1.94
diff -u -p -r1.94 genassym.cf
--- sys/arch/arm/arm32/genassym.cf	14 Aug 2020 16:18:36 -0000	1.94
+++ sys/arch/arm/arm32/genassym.cf	25 Aug 2020 17:31:35 -0000
@@ -58,6 +58,7 @@ include <arm/locore.h>
 include <arm/vfpreg.h>
 include <arm/undefined.h>
 
+include <arm/arm32/machdep.h>
 include <arm/arm32/pte.h>
 
 include <machine/pmap.h>
@@ -160,6 +161,10 @@ define	MAXCPUS			MAXCPUS
 #define	CPU_CONTROL_DC_ENABLE	CPU_CONTROL_DC_ENABLE
 #define	TTBCR_S_PD0		TTBCR_S_PD0
 
+define	INIT_ARM_STACK_SHIFT	INIT_ARM_STACK_SHIFT
+define	INIT_ARM_STACK_SIZE	INIT_ARM_STACK_SIZE
+define	INIT_ARM_TOTAL_STACK	INIT_ARM_TOTAL_STACK
+
 # Important offsets into the lwp and proc structs & associated constants
 define	L_PCB			offsetof(struct lwp, l_addr)
 define	L_CPU			offsetof(struct lwp, l_cpu)
Index: sys/arch/arm/arm32/locore.S
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/arm32/locore.S,v
retrieving revision 1.41
diff -u -p -r1.41 locore.S
--- sys/arch/arm/arm32/locore.S	8 Jul 2020 10:18:00 -0000	1.41
+++ sys/arch/arm/arm32/locore.S	25 Aug 2020 17:31:35 -0000
@@ -40,9 +40,6 @@
 #include <arm/asm.h>
 #include <arm/locore.h>
 
-/* What size should this really be ? It is only used by init_arm() */
-#define INIT_ARM_STACK_SIZE	2048
-
 	RCSID("$NetBSD: locore.S,v 1.41 2020/07/08 10:18:00 skrll Exp $")
 
 /*
Index: sys/arch/arm/include/asan.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/include/asan.h,v
retrieving revision 1.3
diff -u -p -r1.3 asan.h
--- sys/arch/arm/include/asan.h	19 Jul 2020 11:47:48 -0000	1.3
+++ sys/arch/arm/include/asan.h	25 Aug 2020 17:31:35 -0000
@@ -62,7 +62,7 @@ kasan_md_unsupported(vaddr_t addr)
  * that VA = PA + KERNEL_BASE.
  */
 
-#define KASAN_NEARLYPAGES	3
+#define KASAN_NEARLYPAGES	(2 + howmany(INIT_ARM_TOTAL_STACK, L2_S_SEGSIZE))
 
 static bool __md_early __read_mostly;
 static size_t __md_nearlypages __attribute__((__section__(".data")));
@@ -165,16 +165,13 @@ kasan_md_shadow_map_page(vaddr_t va)
 /*
  * Map the init stacks of the BP and APs. We will map the rest in kasan_init.
  */
-#define INIT_ARM_STACK_SHIFT	10
-#define INIT_ARM_STACK_SIZE	(1 << INIT_ARM_STACK_SHIFT)
-
 static void
 kasan_md_early_init(void *stack)
 {
 
 	__md_early = true;
 	__md_nearlypages = 0;
-	kasan_shadow_map(stack, INIT_ARM_STACK_SIZE * MAXCPUS);
+	kasan_shadow_map(stack, INIT_ARM_TOTAL_STACK);
 	__md_early = false;
 }
 
Index: sys/arch/arm/include/arm32/machdep.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/include/arm32/machdep.h,v
retrieving revision 1.34
diff -u -p -r1.34 machdep.h
--- sys/arch/arm/include/arm32/machdep.h	4 Jul 2020 07:02:35 -0000	1.34
+++ sys/arch/arm/include/arm32/machdep.h	25 Aug 2020 17:31:35 -0000
@@ -5,6 +5,10 @@
 
 #ifdef _KERNEL
 
+#define INIT_ARM_STACK_SHIFT	12
+#define INIT_ARM_STACK_SIZE	(1 << INIT_ARM_STACK_SHIFT)
+#define INIT_ARM_TOTAL_STACK	(INIT_ARM_STACK_SIZE * MAXCPUS)
+
 /* Define various stack sizes in pages */
 #ifndef IRQ_STACK_SIZE
 #define IRQ_STACK_SIZE	1