diff --git a/sys/arch/acorn32/acorn32/rpc_machdep.c b/sys/arch/acorn32/acorn32/rpc_machdep.c
index b746885701e4..6917d5499aa3 100644
--- a/sys/arch/acorn32/acorn32/rpc_machdep.c
+++ b/sys/arch/acorn32/acorn32/rpc_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_machdep.c,v 1.52 2003/05/03 03:49:03 thorpej Exp $	*/
+/*	$NetBSD: rpc_machdep.c,v 1.53 2003/05/03 18:25:28 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -56,7 +56,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.52 2003/05/03 03:49:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.53 2003/05/03 18:25:28 thorpej Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -101,6 +101,9 @@ __KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.52 2003/05/03 03:49:03 thorpej Exp
 #include "opt_ipkdb.h"
 #include "ksyms.h"
 
+/* Kernel text starts at the base of the kernel address space. */
+#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00000000)
+
 /*
  * Address to call from cpu_reset() to reset the machine.
  * This is machine architecture dependant as it varies depending
diff --git a/sys/arch/acorn32/include/vmparam.h b/sys/arch/acorn32/include/vmparam.h
index 4b1545efffa3..7df2d66eab97 100644
--- a/sys/arch/acorn32/include/vmparam.h
+++ b/sys/arch/acorn32/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.13 2003/04/28 01:34:28 thorpej Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.14 2003/05/03 18:25:29 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -51,7 +51,6 @@
 #define	KERNEL_BASE		0xf0000000
 
 /* Various constants used by the MD code*/
-#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00000000)
 #ifndef ARM32_PMAP_NEW
 #define	APTE_BASE		(KERNEL_BASE + 0x00c00000)
 #endif
diff --git a/sys/arch/arm/include/arm32/vmparam.h b/sys/arch/arm/include/arm32/vmparam.h
index 72b65bd4d66d..7e67082a48fc 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.15 2003/05/02 23:26:47 thorpej Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.16 2003/05/03 18:25:29 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -90,7 +90,7 @@
 #define	VM_MIN_ADDRESS		((vaddr_t) 0x00001000)
 #define	VM_MAXUSER_ADDRESS	((vaddr_t) KERNEL_BASE)
 #define	VM_MAX_ADDRESS		VM_MAXUSER_ADDRESS
-#define	VM_MIN_KERNEL_ADDRESS	((vaddr_t) KERNEL_TEXT_BASE)
+#define	VM_MIN_KERNEL_ADDRESS	((vaddr_t) KERNEL_BASE)
 #define	VM_MAX_KERNEL_ADDRESS	((vaddr_t) 0xffffffff)
 #else /* ! ARM32_PMAP_NEW */
 /*
@@ -110,7 +110,7 @@
 #define	VM_MAX_ADDRESS		((vaddr_t) (PTE_BASE + \
 					    (KERNEL_BASE >> PGSHIFT) * \
 					    sizeof(pt_entry_t)))
-#define	VM_MIN_KERNEL_ADDRESS	((vaddr_t) KERNEL_TEXT_BASE)
+#define	VM_MIN_KERNEL_ADDRESS	((vaddr_t) KERNEL_BASE)
 #define	VM_MAX_KERNEL_ADDRESS	((vaddr_t) 0xffffffff)
 #endif /* ARM32_PMAP_NEW */
 
diff --git a/sys/arch/cats/cats/cats_machdep.c b/sys/arch/cats/cats/cats_machdep.c
index 8bf91a429eec..21c0e1b0e0f6 100644
--- a/sys/arch/cats/cats/cats_machdep.c
+++ b/sys/arch/cats/cats/cats_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cats_machdep.c,v 1.44 2003/05/03 03:49:05 thorpej Exp $	*/
+/*	$NetBSD: cats_machdep.c,v 1.45 2003/05/03 18:25:30 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997,1998 Mark Brinicombe.
@@ -83,6 +83,8 @@
 #include <dev/isa/isavar.h>
 #endif
 
+/* Kernel text starts at the base of the kernel address space. */
+#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00000000)
 
 /*
  * Address to call from cpu_reset() to reset the machine.
diff --git a/sys/arch/cats/include/vmparam.h b/sys/arch/cats/include/vmparam.h
index db963c5bbde4..d8c7a552df25 100644
--- a/sys/arch/cats/include/vmparam.h
+++ b/sys/arch/cats/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.19 2003/05/03 03:29:07 thorpej Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.20 2003/05/03 18:25:30 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -51,7 +51,6 @@
 #define	KERNEL_BASE		0xf0000000
 
 /* Various constants used by the MD code*/
-#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00000000)
 #define	KERNEL_VM_BASE		(KERNEL_BASE + 0x01000000)
 /*
  * The Kernel VM Size varies depending on the machine depending on how
diff --git a/sys/arch/evbarm/adi_brh/brh_machdep.c b/sys/arch/evbarm/adi_brh/brh_machdep.c
index 65b8c29e1727..18df9c7ae433 100644
--- a/sys/arch/evbarm/adi_brh/brh_machdep.c
+++ b/sys/arch/evbarm/adi_brh/brh_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: brh_machdep.c,v 1.9 2003/05/03 03:49:05 thorpej Exp $	*/
+/*	$NetBSD: brh_machdep.c,v 1.10 2003/05/03 18:25:31 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -117,6 +117,9 @@
 #include "opt_ipkdb.h"
 #include "ksyms.h"
 
+/* Kernel text starts 2MB in from the bottom of the kernel address space. */
+#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00200000)
+
 /*
  * Address to call from cpu_reset() to reset the machine.
  * This is machine architecture dependant as it varies depending
diff --git a/sys/arch/evbarm/include/vmparam.h b/sys/arch/evbarm/include/vmparam.h
index 2e33c1763a91..2f7f876ff194 100644
--- a/sys/arch/evbarm/include/vmparam.h
+++ b/sys/arch/evbarm/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.17 2003/05/03 03:29:08 thorpej Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.18 2003/05/03 18:25:31 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -52,7 +52,6 @@
 
 #ifndef ARM32_NEW_VM_LAYOUT
 /* Various constants used by the MD code*/
-#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00200000)
 #define	KERNEL_VM_BASE		(KERNEL_BASE + 0x01000000)
 #endif
 /*
diff --git a/sys/arch/evbarm/integrator/integrator_machdep.c b/sys/arch/evbarm/integrator/integrator_machdep.c
index 1b898dfe0f4f..b2492c1b3ad9 100644
--- a/sys/arch/evbarm/integrator/integrator_machdep.c
+++ b/sys/arch/evbarm/integrator/integrator_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: integrator_machdep.c,v 1.35 2003/05/03 03:49:05 thorpej Exp $	*/
+/*	$NetBSD: integrator_machdep.c,v 1.36 2003/05/03 18:25:31 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001,2002 ARM Ltd
@@ -106,6 +106,10 @@
 #include "ksyms.h"
 
 void ifpga_reset(void) __attribute__((noreturn));
+
+/* Kernel text starts 2MB in from the bottom of the kernel address space. */
+#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00200000)
+
 /*
  * Address to call from cpu_reset() to reset the machine.
  * This is machine architecture dependant as it varies depending
diff --git a/sys/arch/evbarm/iq80310/iq80310_machdep.c b/sys/arch/evbarm/iq80310/iq80310_machdep.c
index 977a9d53a5db..f5be699b8855 100644
--- a/sys/arch/evbarm/iq80310/iq80310_machdep.c
+++ b/sys/arch/evbarm/iq80310/iq80310_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80310_machdep.c,v 1.53 2003/05/03 03:49:06 thorpej Exp $	*/
+/*	$NetBSD: iq80310_machdep.c,v 1.54 2003/05/03 18:25:32 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -114,6 +114,9 @@
 #include "opt_ipkdb.h"
 #include "ksyms.h"
 
+/* Kernel text starts 2MB in from the bottom of the kernel address space. */
+#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00200000)
+
 /*
  * Address to call from cpu_reset() to reset the machine.
  * This is machine architecture dependant as it varies depending
diff --git a/sys/arch/evbarm/iq80321/iq80321_machdep.c b/sys/arch/evbarm/iq80321/iq80321_machdep.c
index 0eb88041a344..e031c7c4a3f7 100644
--- a/sys/arch/evbarm/iq80321/iq80321_machdep.c
+++ b/sys/arch/evbarm/iq80321/iq80321_machdep.c
@@ -1,10 +1,10 @@
-/*	$NetBSD: iq80321_machdep.c,v 1.22 2003/05/03 03:49:06 thorpej Exp $	*/
+/*	$NetBSD: iq80321_machdep.c,v 1.23 2003/05/03 18:25:32 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ * Written by Jason R. Thorpe and Steve C. Woodford for Wasabi Systems, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -115,6 +115,9 @@
 #include "opt_ipkdb.h"
 #include "ksyms.h"
 
+/* Kernel text starts 2MB in from the bottom of the kernel address space. */
+#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00200000)
+
 /*
  * Address to call from cpu_reset() to reset the machine.
  * This is machine architecture dependant as it varies depending
diff --git a/sys/arch/evbarm/ixm1200/ixm1200_machdep.c b/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
index d41aa0cc5c42..b7bf43943e9a 100644
--- a/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
+++ b/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixm1200_machdep.c,v 1.19 2003/05/03 03:49:06 thorpej Exp $ */
+/*	$NetBSD: ixm1200_machdep.c,v 1.20 2003/05/03 18:25:33 thorpej Exp $ */
 #undef DEBUG_BEFOREMMU
 /*
  * Copyright (c) 2002, 2003
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.19 2003/05/03 03:49:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.20 2003/05/03 18:25:33 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
@@ -124,6 +124,9 @@ __KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.19 2003/05/03 03:49:06 thorpej
 
 void ixp12x0_reset(void) __attribute__((noreturn));
 
+/* Kernel text starts 2MB in from the bottom of the kernel address space. */
+#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00200000)
+
 /*
  * Address to call from cpu_reset() to reset the machine.
  * This is machine architecture dependant as it varies depending
diff --git a/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c b/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
index 412dcc478ff7..f293defd99cf 100644
--- a/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
+++ b/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smdk2800_machdep.c,v 1.6 2003/05/03 03:49:07 thorpej Exp $ */
+/*	$NetBSD: smdk2800_machdep.c,v 1.7 2003/05/03 18:25:33 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002 Fujitsu Component Limited
@@ -162,6 +162,9 @@
 #define	SMDK2800_IO_AREA_VBASE	0xfd000000
 #define SMDK2800_VBASE_FREE	0xfd200000
 
+/* Kernel text starts 2MB in from the bottom of the kernel address space. */
+#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00200000)
+
 /*
  * Address to call from cpu_reset() to reset the machine.
  * This is machine architecture dependant as it varies depending
diff --git a/sys/arch/hpcarm/hpcarm/hpc_machdep.c b/sys/arch/hpcarm/hpcarm/hpc_machdep.c
index 495d54a1370e..cb09a3d3574d 100644
--- a/sys/arch/hpcarm/hpcarm/hpc_machdep.c
+++ b/sys/arch/hpcarm/hpcarm/hpc_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpc_machdep.c,v 1.65 2003/05/03 03:49:07 thorpej Exp $	*/
+/*	$NetBSD: hpc_machdep.c,v 1.66 2003/05/03 18:25:34 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -108,6 +108,9 @@
 #include <nfs/nfsmount.h>
 #endif
 
+/* Kernel text starts 256K in from the bottom of the kernel address space. */
+#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00040000)
+
 /*
  * Address to call from cpu_reset() to reset the machine.
  * This is machine architecture dependant as it varies depending
diff --git a/sys/arch/hpcarm/include/vmparam.h b/sys/arch/hpcarm/include/vmparam.h
index 31ff9144ac97..e5cae664cc3a 100644
--- a/sys/arch/hpcarm/include/vmparam.h
+++ b/sys/arch/hpcarm/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.21 2003/05/03 03:29:11 thorpej Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.22 2003/05/03 18:25:35 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -51,7 +51,6 @@
 #define	KERNEL_BASE		0xc0000000
 
 /* Various constants used by the MD code*/
-#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00040000)
 #define	KERNEL_VM_BASE		(KERNEL_BASE + 0x00c00000)
 
 /*
diff --git a/sys/arch/netwinder/include/vmparam.h b/sys/arch/netwinder/include/vmparam.h
index cf6c5d786b87..95fc0a40df56 100644
--- a/sys/arch/netwinder/include/vmparam.h
+++ b/sys/arch/netwinder/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.17 2003/05/03 03:29:11 thorpej Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.18 2003/05/03 18:25:35 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -51,7 +51,6 @@
 #define	KERNEL_BASE		0xf0000000
 
 /* Various constants used by the MD code*/
-#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x0000c000)
 #define	KERNEL_VM_BASE		(KERNEL_BASE + 0x01000000)
 /*
  * The Kernel VM Size varies depending on the machine depending on how
diff --git a/sys/arch/shark/include/vmparam.h b/sys/arch/shark/include/vmparam.h
index 4e9d4b8dddba..057f713574de 100644
--- a/sys/arch/shark/include/vmparam.h
+++ b/sys/arch/shark/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.9 2003/05/03 03:29:12 thorpej Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.10 2003/05/03 18:25:35 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -51,7 +51,6 @@
 #define	KERNEL_BASE		0xf0000000
 
 /* Various constants used by the MD code */
-#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00000000)
 #define	KERNEL_VM_BASE		(KERNEL_BASE + 0x01000000)
 
 /*
diff --git a/sys/arch/shark/shark/shark_machdep.c b/sys/arch/shark/shark/shark_machdep.c
index 9a330daf2280..f719fcedcd51 100644
--- a/sys/arch/shark/shark/shark_machdep.c
+++ b/sys/arch/shark/shark/shark_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: shark_machdep.c,v 1.14 2003/05/03 12:45:16 ragge Exp $	*/
+/*	$NetBSD: shark_machdep.c,v 1.15 2003/05/03 18:25:36 thorpej Exp $	*/
 
 /*
  * Copyright 1997
@@ -153,6 +153,9 @@ extern void ofrootfound		__P((void));
 static void process_kernel_args	__P((void));
 void ofw_device_register(struct device *, void *);
 
+/* Kernel text starts at the base of the kernel address space. */
+#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00000000)
+
 /**************************************************************/