Index: sys/arch/aarch64/aarch64/aarch64_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/aarch64/aarch64/aarch64_machdep.c,v
retrieving revision 1.54
diff -u -p -r1.54 aarch64_machdep.c
--- sys/arch/aarch64/aarch64/aarch64_machdep.c	10 Nov 2020 07:51:19 -0000	1.54
+++ sys/arch/aarch64/aarch64/aarch64_machdep.c	18 Nov 2020 19:44:17 -0000
@@ -195,7 +195,7 @@ cpu_kernel_vm_init(uint64_t memory_start
 	VPRINTF("%s: kernel phys start %lx end %lx+%lx\n", __func__,
 	    kernstart_phys, kernend_phys, kernend_extra);
 	fdt_add_reserved_memory_range(kernstart_phys,
-	     kernend_phys - kernstart_phys + kernend_extra);
+	     kernend_phys - kernstart_phys);
 }
 
 
@@ -322,7 +322,7 @@ initarm_common(vaddr_t kvm_base, vsize_t
 	    kernstart_phys,
 	    kernend_phys,
 	    round_page(kernend_phys),
-	    round_page(kernend_phys) + kernend_extra,
+	    round_page(kernend_phys),
 	    msgbufaddr,
 	    physical_end,
 	    VM_MIN_KERNEL_ADDRESS,
Index: sys/arch/aarch64/aarch64/locore.S
===================================================================
RCS file: /cvsroot/src/sys/arch/aarch64/aarch64/locore.S,v
retrieving revision 1.74
diff -u -p -r1.74 locore.S
--- sys/arch/aarch64/aarch64/locore.S	22 Oct 2020 07:16:06 -0000	1.74
+++ sys/arch/aarch64/aarch64/locore.S	18 Nov 2020 19:44:17 -0000
@@ -1069,13 +1069,11 @@ bootstk:
 	.space	BOOT_AP_STACKSIZE * (MAXCPUS - 1)
 #endif
 
-	.section ".init_pagetable", "aw", %nobits
 	.align PGSHIFT
 	.global ARM_BOOTSTRAP_LxPT
 ARM_BOOTSTRAP_LxPT:
 l0pt_kern:
+	.space	PAGE_SIZE
 
-	.section "_init_memory", "aw", %nobits
 	.align PGSHIFT
-
-	/* None currently */
+	.space	PAGE_SIZE * 128
Index: sys/arch/evbarm/conf/GENERIC64
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/GENERIC64,v
retrieving revision 1.165
diff -u -p -r1.165 GENERIC64
--- sys/arch/evbarm/conf/GENERIC64	28 Oct 2020 07:36:17 -0000	1.165
+++ sys/arch/evbarm/conf/GENERIC64	18 Nov 2020 19:44:18 -0000
@@ -29,7 +29,7 @@ pseudo-device 	openfirm	# /dev/openfirm
 #options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
 #options 	LOCKDEBUG
-#options 	VERBOSE_INIT_ARM # verbose bootstrapping messages
+options 	VERBOSE_INIT_ARM # verbose bootstrapping messages
 options 	INCLUDE_CONFIG_FILE
 #options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	UVMHIST_PRINT,KERNHIST_DELAY=0
@@ -46,7 +46,7 @@ options 	INCLUDE_CONFIG_FILE
 #options 	EARLYCONS=virt, CONSADDR=0x09000000
 
 # Privileged Access Never (PAN).
-options 	ARMV81_PAN
+#options 	ARMV81_PAN
 
 # Pointer Authentication (PAC).
 #makeoptions 	ARMV83_PAC=1
Index: sys/arch/evbarm/fdt/fdt_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/fdt/fdt_machdep.c,v
retrieving revision 1.78
diff -u -p -r1.78 fdt_machdep.c
--- sys/arch/evbarm/fdt/fdt_machdep.c	7 Nov 2020 08:28:15 -0000	1.78
+++ sys/arch/evbarm/fdt/fdt_machdep.c	18 Nov 2020 19:44:18 -0000
@@ -679,6 +679,7 @@ initarm(void *arg)
 	if (error)
 		return sp;
 
+#if 0
 	/*
 	 * Now we have APs started the pages used for stacks and L1PT can
 	 * be given to uvm
@@ -698,6 +699,7 @@ initarm(void *arg)
 		uvm_page_physload(spg, epg, spg, epg, VM_FREELIST_DEFAULT);
 
 	}
+#endif
 
 	return sp;
 }