diff --git a/sys/arch/arm/include/arm32/vmparam.h b/sys/arch/arm/include/arm32/vmparam.h
index ae2ce5e40103..ab53c74784cc 100644
--- a/sys/arch/arm/include/arm32/vmparam.h
+++ b/sys/arch/arm/include/arm32/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.8 2002/03/23 02:22:57 thorpej Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.9 2002/03/23 19:38:30 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -90,7 +90,7 @@
 #define	PAGE_TABLE_SPACE	((1 << (32 - PGSHIFT)) * sizeof(pt_entry_t))
 
 /* Address where the page talbles are mapped. */
-#define	PTE_BASE		(KERNEL_SPACE_START - PAGE_TABLE_SPACE)
+#define	PTE_BASE		(KERNEL_BASE - PAGE_TABLE_SPACE)
 
 /*
  * Mach derived constants
@@ -98,7 +98,7 @@
 #define	VM_MIN_ADDRESS		((vaddr_t) 0x00001000)
 #define	VM_MAXUSER_ADDRESS	((vaddr_t) (PTE_BASE - UPAGES * NBPG))
 #define	VM_MAX_ADDRESS		((vaddr_t) (PTE_BASE + \
-					    (KERNEL_SPACE_START >> PGSHIFT) * \
+					    (KERNEL_BASE >> PGSHIFT) * \
 					    sizeof(pt_entry_t)))
 #define	VM_MIN_KERNEL_ADDRESS	((vaddr_t) KERNEL_TEXT_BASE)
 #define	VM_MAX_KERNEL_ADDRESS	((vaddr_t) 0xffffffff)
diff --git a/sys/arch/arm/mainbus/mainbus_io.c b/sys/arch/arm/mainbus/mainbus_io.c
index 38328943bc72..2d2e31bb6257 100644
--- a/sys/arch/arm/mainbus/mainbus_io.c
+++ b/sys/arch/arm/mainbus/mainbus_io.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus_io.c,v 1.6 2001/11/23 17:23:42 thorpej Exp $	*/
+/*	$NetBSD: mainbus_io.c,v 1.7 2002/03/23 19:38:31 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -144,7 +144,7 @@ mainbus_bs_map(t, bpa, size, cacheable, bshp)
 	vaddr_t va;
 	pt_entry_t *pte;
 
-	if ((u_long)bpa > (u_long)KERNEL_SPACE_START) {
+	if ((u_long)bpa > (u_long)KERNEL_BASE) {
 		/* XXX This is a temporary hack to aid transition. */
 		*bshp = bpa;
 		return(0);
diff --git a/sys/arch/arm/sa11x0/sa11x0_io.c b/sys/arch/arm/sa11x0/sa11x0_io.c
index 4d14245d8791..11e80508d30f 100644
--- a/sys/arch/arm/sa11x0/sa11x0_io.c
+++ b/sys/arch/arm/sa11x0/sa11x0_io.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_io.c,v 1.5 2001/11/23 17:23:42 thorpej Exp $	*/
+/*	$NetBSD: sa11x0_io.c,v 1.6 2002/03/23 19:38:31 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -147,7 +147,7 @@ sa11x0_bs_map(t, bpa, size, cacheable, bshp)
 	vaddr_t va;
 	pt_entry_t *pte;
 
-	if ((u_long)bpa > (u_long)KERNEL_SPACE_START) {
+	if ((u_long)bpa > (u_long)KERNEL_BASE) {
 		/* XXX This is a temporary hack to aid transition. */
 		*bshp = bpa;
 		return(0);