diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c
index 78902e6540de..a0c562e8f0b9 100644
--- a/sys/arch/alpha/alpha/autoconf.c
+++ b/sys/arch/alpha/alpha/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.35 1999/09/15 18:10:35 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.36 1999/09/17 19:59:35 thorpej Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.35 1999/09/15 18:10:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.36 1999/09/17 19:59:35 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,7 +89,6 @@ cpu_configure()
 	if (config_rootfound("mainbus", "mainbus") == NULL)
 		panic("no mainbus found");
 	(void)spl0();
-	cold = 0;
 
 	/*
 	 * Note that bootstrapping is finished, and set the HWRPB up  
diff --git a/sys/arch/alpha/alpha/locore.s b/sys/arch/alpha/alpha/locore.s
index f6141863fd3d..62dd88ff3f86 100644
--- a/sys/arch/alpha/alpha/locore.s
+++ b/sys/arch/alpha/alpha/locore.s
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.64 1999/07/11 22:35:28 ross Exp $ */
+/* $NetBSD: locore.s,v 1.65 1999/09/17 19:59:35 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
 
 #include <machine/asm.h>
 
-__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.64 1999/07/11 22:35:28 ross Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.65 1999/09/17 19:59:35 thorpej Exp $");
 
 #ifndef EVCNT_COUNTERS
 #include <machine/intrcnt.h>
@@ -307,11 +307,7 @@ NESTED_NOPROFILE(locorestart,1,0,ra,0,0)
 
 /**************************************************************************/
 
-	.data
-EXPORT(cold)
-	.long 1			/* cold start flag (.long -> _4_ bytes) */
 	.text
-
 .stabs	__FILE__,132,0,0,backtolocore1	/* done with includes */
 .loc	1 __LINE__
 backtolocore1:
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index c4c89fc4b6d2..769a6da3060f 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.182 1999/09/12 01:16:55 chs Exp $ */
+/* $NetBSD: machdep.c,v 1.183 1999/09/17 19:59:35 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.182 1999/09/12 01:16:55 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.183 1999/09/17 19:59:35 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1090,7 +1090,6 @@ cpu_reboot(howto, bootstr)
 	int howto;
 	char *bootstr;
 {
-	extern int cold;
 #if defined(MULTIPROCESSOR)
 #if 0 /* XXX See below. */
 	u_long cpu_id;
diff --git a/sys/arch/alpha/common/shared_intr.c b/sys/arch/alpha/common/shared_intr.c
index 421c1b3facff..8ccaac9d1fca 100644
--- a/sys/arch/alpha/common/shared_intr.c
+++ b/sys/arch/alpha/common/shared_intr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: shared_intr.c,v 1.6 1998/08/01 18:52:36 thorpej Exp $ */
+/* $NetBSD: shared_intr.c,v 1.7 1999/09/17 19:59:36 thorpej Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -33,9 +33,10 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: shared_intr.c,v 1.6 1998/08/01 18:52:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shared_intr.c,v 1.7 1999/09/17 19:59:36 thorpej Exp $");
 
 #include <sys/param.h>
+#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
@@ -43,8 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: shared_intr.c,v 1.6 1998/08/01 18:52:36 thorpej Exp
 
 #include <machine/intr.h>
 
-extern int cold;
-
 static const char *intr_typename __P((int));
 
 static const char *
diff --git a/sys/arch/alpha/include/alpha.h b/sys/arch/alpha/include/alpha.h
index 5d931c1da878..d9040bb82cab 100644
--- a/sys/arch/alpha/include/alpha.h
+++ b/sys/arch/alpha/include/alpha.h
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha.h,v 1.5 1999/07/11 22:39:21 ross Exp $ */
+/* $NetBSD: alpha.h,v 1.6 1999/09/17 19:59:37 thorpej Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -86,7 +86,6 @@ struct mchkinfo {
 	 */
 };
 
-extern int cold;
 struct mchkinfo *cpu_mchkinfo __P((void));
 
 void	XentArith __P((u_int64_t, u_int64_t, u_int64_t));	/* MAGIC */
diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h
index 3133c21c514d..f4ff82bb51d2 100644
--- a/sys/arch/alpha/include/cpu.h
+++ b/sys/arch/alpha/include/cpu.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.34 1999/08/16 06:24:07 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.35 1999/09/17 19:59:37 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -218,8 +218,6 @@ struct reg;
 struct rpb;
 struct trapframe;
 
-extern int cold;
-
 int	badaddr	__P((void *, size_t));
 
 #endif /* _KERNEL */
diff --git a/sys/arch/alpha/tc/scc.c b/sys/arch/alpha/tc/scc.c
index de9b5e01284c..de97d3583e0e 100644
--- a/sys/arch/alpha/tc/scc.c
+++ b/sys/arch/alpha/tc/scc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scc.c,v 1.46 1999/08/08 01:44:57 ross Exp $ */
+/* $NetBSD: scc.c,v 1.47 1999/09/17 19:59:37 thorpej Exp $ */
 
 /*
  * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.46 1999/08/08 01:44:57 ross Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.47 1999/09/17 19:59:37 thorpej Exp $");
 
 #include "opt_ddb.h"
 #ifdef alpha
@@ -247,7 +247,6 @@ void	scc_alphaintr __P((int));
  * console variables, for using serial console while still cold and
  * autoconfig has not attached the scc device.
  */
-extern  int cold;
 scc_regmap_t *scc_cons_addr = 0;
 static struct scc_softc coldcons_softc;
 static struct consdev scccons = {
diff --git a/sys/arch/amiga/amiga/autoconf.c b/sys/arch/amiga/amiga/autoconf.c
index 664d79a8d6da..516a2e2f500e 100644
--- a/sys/arch/amiga/amiga/autoconf.c
+++ b/sys/arch/amiga/amiga/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.65 1999/09/15 18:10:35 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.66 1999/09/17 19:59:37 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -47,7 +47,6 @@ void mbattach __P((struct device *, struct device *, void *));
 int mbprint __P((void *, const char *));
 int mbmatch __P((struct device *, struct cfdata *, void *));
 
-int cold;	/* 1 if still booting */
 #include <sys/kernel.h>
 
 u_long boot_partition;
@@ -103,7 +102,6 @@ cpu_configure()
 #else
 	splx(s);
 #endif
-	cold = 0;
 #ifdef DEBUG_KERNEL_START
 	printf("survived configure...\n");
 #endif
diff --git a/sys/arch/amiga/amiga/locore.s b/sys/arch/amiga/amiga/locore.s
index 6acf34a1b15d..cdc0d9df5d2c 100644
--- a/sys/arch/amiga/amiga/locore.s
+++ b/sys/arch/amiga/amiga/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.110 1999/09/06 21:50:47 is Exp $	*/
+/*	$NetBSD: locore.s,v 1.111 1999/09/17 19:59:37 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1878,9 +1878,7 @@ _fputype:
 	.long	FPU_NONE
 _protorp:
 	.long	0x80000002,0	| prototype root pointer
-	.globl	_cold
-_cold:
-	.long	1		| cold start flag
+
 	.globl	_proc0paddr
 _proc0paddr:
 	.long	0		| KVA of proc0 u-area
diff --git a/sys/arch/arm32/arm32/autoconf.c b/sys/arch/arm32/arm32/autoconf.c
index d7ed6a9ad5d2..a7f60ab875fd 100644
--- a/sys/arch/arm32/arm32/autoconf.c
+++ b/sys/arch/arm32/arm32/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.31 1999/09/15 18:10:35 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.32 1999/09/17 19:59:38 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -74,7 +74,6 @@ static	struct device *booted_device;
 static	int booted_partition;
 
 extern dev_t dumpdev;
-extern int cold;
 
 void dumpconf __P((void));
 void isa_intr_init __P((void));
@@ -221,7 +220,6 @@ cpu_configure()
 
 	/* Time to start taking interrupts so lets open the flood gates .... */
 	(void)spl0();
-	cold = 0;
 }
 
 /* End of autoconf.c */
diff --git a/sys/arch/arm32/arm32/machdep.c b/sys/arch/arm32/arm32/machdep.c
index 454942a65dc1..12690ebffb71 100644
--- a/sys/arch/arm32/arm32/machdep.c
+++ b/sys/arch/arm32/arm32/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.70 1999/07/08 18:05:24 thorpej Exp $	*/
+/*	$NetBSD: machdep.c,v 1.71 1999/09/17 19:59:38 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -114,8 +114,6 @@ int kernel_debug = 0;
 
 struct user *proc0paddr;
 
-int cold = 1;
-
 /* Prototypes */
 
 void consinit		__P((void));
diff --git a/sys/arch/arm32/footbridge/ebsa285_machdep.c b/sys/arch/arm32/footbridge/ebsa285_machdep.c
index 206043204594..2407343f294c 100644
--- a/sys/arch/arm32/footbridge/ebsa285_machdep.c
+++ b/sys/arch/arm32/footbridge/ebsa285_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ebsa285_machdep.c,v 1.7 1999/05/27 09:08:09 mark Exp $	*/
+/*	$NetBSD: ebsa285_machdep.c,v 1.8 1999/09/17 19:59:38 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997,1998 Mark Brinicombe.
@@ -45,6 +45,7 @@
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/exec.h>
 #include <sys/proc.h>
 #include <sys/msgbuf.h>
@@ -178,8 +179,6 @@ extern void db_machine_init	__P((void));
 extern void parse_mi_bootargs	__P((char *args));
 extern void dumpsys		__P((void));
 
-extern int cold;
-
 /* A load of console goo. */
 #include "vga.h"
 #if (NVGA > 0)
diff --git a/sys/arch/arm32/isa/isa_shark_machdep.c b/sys/arch/arm32/isa/isa_shark_machdep.c
index e20fb0c42e0e..4e6837cab884 100644
--- a/sys/arch/arm32/isa/isa_shark_machdep.c
+++ b/sys/arch/arm32/isa/isa_shark_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_shark_machdep.c,v 1.4 1999/01/01 12:42:47 mark Exp $	*/
+/*	$NetBSD: isa_shark_machdep.c,v 1.5 1999/09/17 19:59:39 thorpej Exp $	*/
 
 /*
  * Copyright 1997
@@ -35,6 +35,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
@@ -147,7 +148,6 @@ isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
 	void *ih_arg;
 {
 	    irqhandler_t *ih;
-	    extern int cold;
 
 	    /* no point in sleeping unless someone can free memory. */
 	    ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : M_WAITOK);
diff --git a/sys/arch/arm32/ofw/ofw.c b/sys/arch/arm32/ofw/ofw.c
index 55e12f9752e1..94723dd0745d 100644
--- a/sys/arch/arm32/ofw/ofw.c
+++ b/sys/arch/arm32/ofw/ofw.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofw.c,v 1.22 1999/03/29 10:02:19 mycroft Exp $	*/
+/*	$NetBSD: ofw.c,v 1.23 1999/09/17 19:59:39 thorpej Exp $	*/
 
 /*
  * Copyright 1997
@@ -42,6 +42,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <sys/mbuf.h>
 #include <vm/vm.h>
@@ -80,7 +81,6 @@
  *  Imported variables
  */
 extern BootConfig bootconfig;	/* temporary, I hope */
-extern int cold;
 
 #ifdef	DIAGNOSTIC
 /* NOTE: These variables will be removed, well some of them */
diff --git a/sys/arch/arm32/rc7500/rc7500_machdep.c b/sys/arch/arm32/rc7500/rc7500_machdep.c
index 5faa2c41f88d..51cc76008f93 100644
--- a/sys/arch/arm32/rc7500/rc7500_machdep.c
+++ b/sys/arch/arm32/rc7500/rc7500_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rc7500_machdep.c,v 1.24 1999/05/27 09:08:09 mark Exp $	*/
+/*	$NetBSD: rc7500_machdep.c,v 1.25 1999/09/17 19:59:39 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -51,6 +51,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <sys/proc.h>
 #include <sys/msgbuf.h>
@@ -157,8 +158,6 @@ pt_entry_t kernel_pt_table[NUM_KERNEL_PTS];
 
 struct user *proc0paddr;
 
-extern int cold;
-
 /* Prototypes */
 
 void physconputchar		__P((char));
diff --git a/sys/arch/arm32/riscpc/rpc_machdep.c b/sys/arch/arm32/riscpc/rpc_machdep.c
index 741a0eaf713b..8b8aeb473870 100644
--- a/sys/arch/arm32/riscpc/rpc_machdep.c
+++ b/sys/arch/arm32/riscpc/rpc_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_machdep.c,v 1.30 1999/07/08 18:05:25 thorpej Exp $	*/
+/*	$NetBSD: rpc_machdep.c,v 1.31 1999/09/17 19:59:40 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -51,6 +51,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <sys/proc.h>
 #include <sys/msgbuf.h>
@@ -152,8 +153,6 @@ pt_entry_t kernel_pt_table[NUM_KERNEL_PTS];
 
 struct user *proc0paddr;
 
-extern int cold;
-
 #ifdef CPU_SA110
 #define CPU_SA110_CACHE_CLEAN_SIZE (0x4000 * 2)
 static vaddr_t sa110_cc_base;
diff --git a/sys/arch/arm32/vidc/console/console.c b/sys/arch/arm32/vidc/console/console.c
index b2ce8b8af9c0..143beb5ff3df 100644
--- a/sys/arch/arm32/vidc/console/console.c
+++ b/sys/arch/arm32/vidc/console/console.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: console.c,v 1.15 1999/01/01 12:45:12 mark Exp $	*/
+/*	$NetBSD: console.c,v 1.16 1999/09/17 19:59:40 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994-1995 Melvyn Tang-Richardson
@@ -56,6 +56,7 @@
 #include <sys/msgbuf.h>
 #include <sys/user.h>
 #include <sys/syslog.h>
+#include <sys/kernel.h>
 
 #include <dev/cons.h>
 
@@ -995,7 +996,6 @@ rpcconsolecnputc(dev, character)
 	dev_t dev;
 	char character;
 {
-	extern int cold;
 
 	if (rpc_buf_ptr==RPC_BUF_LEN)
 		RPC_BUF_FLUSH
diff --git a/sys/arch/atari/atari/autoconf.c b/sys/arch/atari/atari/autoconf.c
index 50d43382ea9c..7f848dbf5b25 100644
--- a/sys/arch/atari/atari/autoconf.c
+++ b/sys/arch/atari/atari/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.30 1999/09/15 18:10:36 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.31 1999/09/17 19:59:40 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -47,7 +47,6 @@ void mbattach __P((struct device *, struct device *, void *));
 int mbprint __P((void *, const char *));
 int mbmatch __P((struct device *, struct cfdata *, void *));
 
-extern int cold;	/* 1 if still booting (locore.s) */
 int atari_realconfig;
 #include <sys/kernel.h>
 
@@ -63,8 +62,6 @@ cpu_configure()
 
 	if (config_rootfound("mainbus", "mainbus") == NULL)
 		panic("no mainbus found");
-
-	cold = 0;
 }
 
 void
diff --git a/sys/arch/atari/atari/intr.c b/sys/arch/atari/atari/intr.c
index a32d6e73ef2a..1e6018a8f5a1 100644
--- a/sys/arch/atari/atari/intr.c
+++ b/sys/arch/atari/atari/intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.6 1999/03/24 05:50:57 mrg Exp $	*/
+/*	$NetBSD: intr.c,v 1.7 1999/09/17 19:59:40 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,6 +38,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/vmmeter.h>
 #include <sys/queue.h>
@@ -118,7 +119,6 @@ intr_establish(vector, type, pri, ih_fun, ih_arg)
         int		pri;
         hw_ifun_t	ih_fun;
 {
-	extern int	cold;
 	struct intrhand	*ih, *cur_vec;
 	ih_list_t	*vec_list;
 	u_long		*hard_vec;
diff --git a/sys/arch/atari/atari/locore.s b/sys/arch/atari/atari/locore.s
index 1fad53934b7a..74b5c3ced69d 100644
--- a/sys/arch/atari/atari/locore.s
+++ b/sys/arch/atari/atari/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.62 1999/04/29 16:23:02 christos Exp $	*/
+/*	$NetBSD: locore.s,v 1.63 1999/09/17 19:59:40 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1680,9 +1680,7 @@ tmpstk:
 	.globl	_protorp
 _protorp:
 	.long	0x80000002,0		|  prototype root pointer
-	.globl	_cold
-_cold:
-	.long	1			|  cold start flag
+
 	.globl	_proc0paddr
 _proc0paddr:
 	.long	0			|  KVA of proc0 u-area
diff --git a/sys/arch/bebox/bebox/autoconf.c b/sys/arch/bebox/bebox/autoconf.c
index 7e536dd9f7bc..29abf3a77999 100644
--- a/sys/arch/bebox/bebox/autoconf.c
+++ b/sys/arch/bebox/bebox/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.4 1999/09/15 18:10:36 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.5 1999/09/17 19:59:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -60,13 +60,6 @@
 
 void findroot __P((struct device **, int *));
 
-/*
- * The following several variables are related to
- * the configuration process, and are used in initializing
- * the machine.
- */
-extern int	cold;		/* cold start flag initialized in locore.s */
-
 /*
  * Determine i/o configuration for a machine.
  */
@@ -83,7 +76,6 @@ cpu_configure()
 	    (u_short)imask[IPL_TTY]);
 
 	spl0();
-	cold = 0;
 }
 
 void
diff --git a/sys/arch/bebox/bebox/extintr.c b/sys/arch/bebox/bebox/extintr.c
index a8b812dca64c..3d99779c3361 100644
--- a/sys/arch/bebox/bebox/extintr.c
+++ b/sys/arch/bebox/bebox/extintr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: extintr.c,v 1.10 1999/08/01 07:52:22 thorpej Exp $	*/
+/*	$NetBSD: extintr.c,v 1.11 1999/09/17 19:59:41 thorpej Exp $	*/
 /*      $OpenBSD: isabus.c,v 1.1 1997/10/11 11:53:00 pefo Exp $ */
 
 /*-
@@ -42,6 +42,7 @@
  */
 #include <sys/param.h>
 #include <sys/malloc.h>
+#include <sys/kernel.h>
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
@@ -199,7 +200,6 @@ intr_establish(irq, type, level, ih_fun, ih_arg)
 {
 	struct intrhand **p, *q, *ih;
 	static struct intrhand fakehand = {fakeintr};
-	extern int cold;
 
 	/* no point in sleeping unless someone can free memory. */
 	ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : M_WAITOK);
diff --git a/sys/arch/bebox/bebox/machdep.c b/sys/arch/bebox/bebox/machdep.c
index 1ff069ccb6bf..0094bd43a22d 100644
--- a/sys/arch/bebox/bebox/machdep.c
+++ b/sys/arch/bebox/bebox/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.40 1999/06/28 08:20:43 itojun Exp $	*/
+/*	$NetBSD: machdep.c,v 1.41 1999/09/17 19:59:41 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -137,7 +137,6 @@ vaddr_t msgbuf_vaddr;
 paddr_t avail_end;			/* XXX temporary */
 
 void install_extint __P((void (*)(void)));
-int cold = 1;
 
 void
 initppc(startkernel, endkernel, args, btinfo)
diff --git a/sys/arch/evbsh3/evbsh3/shb.c b/sys/arch/evbsh3/evbsh3/shb.c
index 2e86935b217d..8d9b93bef489 100644
--- a/sys/arch/evbsh3/evbsh3/shb.c
+++ b/sys/arch/evbsh3/evbsh3/shb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: shb.c,v 1.2 1999/09/16 21:22:40 msaitoh Exp $	*/
+/*	$NetBSD: shb.c,v 1.3 1999/09/17 19:59:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.  All rights reserved.
@@ -307,7 +307,6 @@ shb_intr_establish(irq, type, level, ih_fun, ih_arg)
 {
 	struct intrhand **p, *q, *ih;
 	static struct intrhand fakehand = {fakeintr};
-	extern int cold;
 
 	/* no point in sleeping unless someone can free memory. */
 	ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : M_WAITOK);
diff --git a/sys/arch/hp300/dev/nhpib.c b/sys/arch/hp300/dev/nhpib.c
index 998a4c321b09..78b31a5ad270 100644
--- a/sys/arch/hp300/dev/nhpib.c
+++ b/sys/arch/hp300/dev/nhpib.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nhpib.c,v 1.20 1998/07/01 22:47:12 thorpej Exp $	*/
+/*	$NetBSD: nhpib.c,v 1.21 1999/09/17 19:59:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -558,7 +558,6 @@ nhpibppwatch(arg)
 {
 	struct hpibbus_softc *hs = arg;
 	struct nhpib_softc *sc = (struct nhpib_softc *)hs->sc_dev.dv_parent;
-	extern int cold;
 
 	if ((hs->sc_flags & HPIBF_PPOLL) == 0)
 		return;
diff --git a/sys/arch/hp300/hp300/autoconf.c b/sys/arch/hp300/hp300/autoconf.c
index f57a643ed063..22496531d77f 100644
--- a/sys/arch/hp300/hp300/autoconf.c
+++ b/sys/arch/hp300/hp300/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.48 1999/09/15 18:10:36 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.49 1999/09/17 19:59:42 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -134,13 +134,6 @@
 #include <hp300/dev/hpibvar.h>
 #include <hp300/dev/scsivar.h>
 
-/*
- * The following several variables are related to
- * the configuration process, and are used in initializing
- * the machine.
- */
-int	cold;		    /* if 1, still working on cold-start */
-
 /* XXX must be allocated statically because of early console init */
 struct	map extiomap[EIOMAPSIZE/16];
 
@@ -287,8 +280,6 @@ cpu_configure()
 	(void)spl0();
 
 	intr_printlevels();
-
-	cold = 0;
 }
 
 /**********************************************************************
diff --git a/sys/arch/hp300/hp300/locore.s b/sys/arch/hp300/hp300/locore.s
index 1290c46005f7..429a5d88cbc5 100644
--- a/sys/arch/hp300/hp300/locore.s
+++ b/sys/arch/hp300/hp300/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.98 1999/08/01 21:32:17 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.99 1999/09/17 19:59:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Gordon W. Ross
@@ -1932,9 +1932,6 @@ GLOBAL(prototc)
 GLOBAL(internalhpib)
 	.long	1		| has internal HP-IB, default to yes
 
-GLOBAL(cold)
-	.long	1		| cold start flag
-
 GLOBAL(want_resched)
 	.long	0
 
diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c
index 5eba4c91b1b8..ac8782e890e5 100644
--- a/sys/arch/hp300/hp300/machdep.c
+++ b/sys/arch/hp300/hp300/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.131 1999/09/12 01:17:04 chs Exp $	*/
+/*	$NetBSD: machdep.c,v 1.132 1999/09/17 19:59:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -674,7 +674,6 @@ cpu_reboot(howto, bootstr)
 	int howto;
 	char *bootstr;
 {
-	extern int cold;
 
 #if __GNUC__	/* XXX work around lame compiler problem (gcc 2.7.2) */
 	(void)&howto;
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index 0bf2a6353d61..78a5301601c8 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.40 1999/09/15 18:10:36 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.41 1999/09/17 19:59:42 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -70,13 +70,6 @@ void findroot __P((struct device **, int *));
 extern struct disklist *i386_alldisks;
 extern int i386_ndisks;
 
-/*
- * The following several variables are related to
- * the configuration process, and are used in initializing
- * the machine.
- */
-extern int	cold;		/* cold start flag initialized in locore.s */
-
 /*
  * Determine i/o configuration for a machine.
  */
@@ -94,7 +87,6 @@ cpu_configure()
 	    (u_short)imask[IPL_TTY]);
 
 	spl0();
-	cold = 0;
 
 	/* Set up proc0's TSS and LDT (after the FPU is configured). */
 	i386_proc0_tss_ldt_init();
diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s
index f60c69a08d12..18b2d21bbabe 100644
--- a/sys/arch/i386/i386/locore.s
+++ b/sys/arch/i386/i386/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.212 1999/09/08 09:16:47 kleink Exp $	*/
+/*	$NetBSD: locore.s,v 1.213 1999/09/17 19:59:43 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -214,7 +214,7 @@
 
 	.globl	_C_LABEL(cpu),_C_LABEL(cpu_id),_C_LABEL(cpu_vendor)
 	.globl	_C_LABEL(cpuid_level),_C_LABEL(cpu_feature)
-	.globl	_C_LABEL(cold),_C_LABEL(esym),_C_LABEL(boothowto)
+	.globl	_C_LABEL(esym),_C_LABEL(boothowto)
 	.globl	_C_LABEL(bootinfo),_C_LABEL(atdevbase)
 	.globl	_C_LABEL(bootdev)
 	.globl	_C_LABEL(proc0paddr),_C_LABEL(curpcb),_C_LABEL(PTDpaddr)
@@ -232,7 +232,6 @@ _C_LABEL(cpuid_level):	.long	-1	# max. level accepted by 'cpuid'
 					#   instruction
 _C_LABEL(cpu_vendor):	.space	16	# vendor string returned by `cpuid'
 					#   instruction
-_C_LABEL(cold):		.long	1	# cold till we are not
 _C_LABEL(esym):		.long	0	# ptr to end of syms
 _C_LABEL(atdevbase):	.long	0	# location of start of iomem in virtual
 _C_LABEL(proc0paddr):	.long	0
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index fdff70fe190c..05536621f57e 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.364 1999/09/12 01:17:06 chs Exp $	*/
+/*	$NetBSD: machdep.c,v 1.365 1999/09/17 19:59:43 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -1186,7 +1186,6 @@ cpu_reboot(howto, bootstr)
 	int howto;
 	char *bootstr;
 {
-	extern int cold;
 
 	if (cold) {
 		howto |= RB_HALT;
diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c
index 1f72b0f16b45..3323d6d583da 100644
--- a/sys/arch/i386/isa/isa_machdep.c
+++ b/sys/arch/i386/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.c,v 1.42 1999/03/19 04:58:46 cgd Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.43 1999/09/17 19:59:43 thorpej Exp $	*/
 
 #define ISA_DMA_STATS
 
@@ -79,6 +79,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
@@ -430,7 +431,6 @@ isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
 {
 	struct intrhand **p, *q, *ih;
 	static struct intrhand fakehand = {fakeintr};
-	extern int cold;
 
 	/* no point in sleeping unless someone can free memory. */
 	ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : M_WAITOK);
diff --git a/sys/arch/mac68k/dev/sbc.c b/sys/arch/mac68k/dev/sbc.c
index a97abd5f3515..a83af1066ffd 100644
--- a/sys/arch/mac68k/dev/sbc.c
+++ b/sys/arch/mac68k/dev/sbc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbc.c,v 1.38 1998/11/19 21:46:24 thorpej Exp $	*/
+/*	$NetBSD: sbc.c,v 1.39 1999/09/17 20:04:34 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1996 Scott Reynolds.  All rights reserved.
@@ -183,7 +183,6 @@ sbc_irq_intr(p)
 	struct ncr5380_softc *ncr_sc = p;
 	struct sbc_softc *sc = (struct sbc_softc *)ncr_sc;
 	int claimed = 0;
-	extern int cold;
 
 	/* How we ever arrive here without IRQ set is a mystery... */
 	if (*ncr_sc->sci_csr & SCI_CSR_INT) {
diff --git a/sys/arch/mac68k/mac68k/autoconf.c b/sys/arch/mac68k/mac68k/autoconf.c
index 9e616847148a..ca1dfd0a5fd3 100644
--- a/sys/arch/mac68k/mac68k/autoconf.c
+++ b/sys/arch/mac68k/mac68k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.52 1999/09/15 18:10:37 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.53 1999/09/17 20:04:35 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -83,15 +83,12 @@ static int target_to_unit __P((u_long, u_long, u_long));
 void
 cpu_configure()
 {
-	extern int	cold;
 
 	mrg_init();		/* Init Mac ROM Glue */
 	startrtclock();		/* start before ADB attached */
 
 	if (config_rootfound("mainbus", "mainbus") == NULL)
 		panic("No mainbus found!");
-
-	cold = 0;
 }
 
 void
diff --git a/sys/arch/mac68k/mac68k/locore.s b/sys/arch/mac68k/mac68k/locore.s
index 2f58d45aac03..fea7a938a9f1 100644
--- a/sys/arch/mac68k/mac68k/locore.s
+++ b/sys/arch/mac68k/mac68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.119 1999/08/05 12:35:55 briggs Exp $	*/
+/*	$NetBSD: locore.s,v 1.120 1999/09/17 20:04:35 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1861,9 +1861,6 @@ GLOBAL(fputype)
 GLOBAL(protorp)
 	.long	0,0		| prototype root pointer
 
-GLOBAL(cold)
-	.long	1		| cold start flag
-
 GLOBAL(want_resched)
 	.long	0
 
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index 7a4f548c06c8..c69cbd38857b 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.237 1999/06/28 01:56:57 briggs Exp $	*/
+/*	$NetBSD: machdep.c,v 1.238 1999/09/17 20:04:36 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -555,7 +555,6 @@ cpu_reboot(howto, bootstr)
 	char *bootstr;
 {
 	extern u_long maxaddr;
-	extern int cold;
 
 #if __GNUC__	/* XXX work around lame compiler problem (gcc 2.7.2) */
 	(void)&howto;
diff --git a/sys/arch/macppc/macppc/autoconf.c b/sys/arch/macppc/macppc/autoconf.c
index b9f02ba9ec2b..bfe92ba170fc 100644
--- a/sys/arch/macppc/macppc/autoconf.c
+++ b/sys/arch/macppc/macppc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.14 1999/09/15 18:10:37 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.15 1999/09/17 20:04:37 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -50,8 +50,6 @@
 #include <dev/ata/atavar.h>
 #include <dev/ic/wdcvar.h>
 
-extern int cold;
-
 void findroot __P((void));
 int OF_interpret __P((char *cmd, int nreturns, ...));
 
@@ -93,7 +91,6 @@ cpu_configure()
 		panic("configure: mainbus not configured");
 
 	(void)spl0();
-	cold = 0;
 
 	/*
 	 * Now allow hardware interrupts.
diff --git a/sys/arch/macppc/macppc/extintr.c b/sys/arch/macppc/macppc/extintr.c
index 3a78f57c416e..c87a99aad2ff 100644
--- a/sys/arch/macppc/macppc/extintr.c
+++ b/sys/arch/macppc/macppc/extintr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: extintr.c,v 1.9 1999/09/08 17:28:02 tsubai Exp $	*/
+/*	$NetBSD: extintr.c,v 1.10 1999/09/17 20:04:37 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1995 Per Fogelstrom
@@ -41,6 +41,7 @@
  */
 #include <sys/param.h>
 #include <sys/malloc.h>
+#include <sys/kernel.h>
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
@@ -327,7 +328,6 @@ intr_establish(irq, type, level, ih_fun, ih_arg)
 {
 	struct intrhand **p, *q, *ih;
 	static struct intrhand fakehand = {fakeintr};
-	extern int cold;
 
 	irq = mapirq(irq);
 
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index c2c5a3e5db0f..310e28d3ea19 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.52 1999/08/15 12:47:15 tsubai Exp $	*/
+/*	$NetBSD: machdep.c,v 1.53 1999/09/17 20:04:37 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -56,6 +56,7 @@
 #include <sys/syscallargs.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/user.h>
 
 #include <vm/vm.h>
@@ -122,8 +123,6 @@ int msgbufmapped = 0;
 
 void install_extint __P((void (*)(void)));
 
-int cold = 1;
-
 #ifdef DDB
 void *startsym, *endsym;
 #endif
diff --git a/sys/arch/mmeye/mmeye/machdep.c b/sys/arch/mmeye/mmeye/machdep.c
index ef5e7c86ae95..2b0e97e9fd36 100644
--- a/sys/arch/mmeye/mmeye/machdep.c
+++ b/sys/arch/mmeye/mmeye/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.3 1999/09/16 21:20:20 msaitoh Exp $	*/
+/*	$NetBSD: machdep.c,v 1.4 1999/09/17 20:04:38 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -593,7 +593,6 @@ sys___sigreturn14(p, v, retval)
 }
 
 int waittime = -1;
-int cold = 1;
 struct pcb dumppcb;
 
 void
diff --git a/sys/arch/mmeye/mmeye/shb.c b/sys/arch/mmeye/mmeye/shb.c
index 84194b4add5d..bb44f1dd879d 100644
--- a/sys/arch/mmeye/mmeye/shb.c
+++ b/sys/arch/mmeye/mmeye/shb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: shb.c,v 1.1 1999/09/13 10:31:03 itojun Exp $	*/
+/*	$NetBSD: shb.c,v 1.2 1999/09/17 20:04:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.  All rights reserved.
@@ -311,7 +311,6 @@ shb_intr_establish(irq, type, level, ih_fun, ih_arg)
 {
 	struct intrhand **p, *q, *ih;
 	static struct intrhand fakehand = {fakeintr};
-	extern int cold;
 
 	/* no point in sleeping unless someone can free memory. */
 	ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : M_WAITOK);
diff --git a/sys/arch/mvme68k/mvme68k/autoconf.c b/sys/arch/mvme68k/mvme68k/autoconf.c
index 57bc972b7416..278f07d80c1e 100644
--- a/sys/arch/mvme68k/mvme68k/autoconf.c
+++ b/sys/arch/mvme68k/mvme68k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.22 1999/09/15 18:10:37 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.23 1999/09/17 20:04:41 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -69,13 +69,6 @@
 
 struct device *booted_device;	/* boot device */
 
-/*
- * The following several variables are related to
- * the configuration process, and are used in initializing
- * the machine.
- */
-int	cold;			/* if 1, still working on cold-start */
-
 void mainbus_attach __P((struct device *, struct device *, void *));
 int  mainbus_match __P((struct device *, struct cfdata *, void *));
 int  mainbus_print __P((void *, const char *));
@@ -188,8 +181,6 @@ cpu_configure()
 
 	if (config_rootfound("mainbus", NULL) == NULL)
 		panic("autoconfig failed, no root");
-
-	cold = 0;
 }
 
 void
diff --git a/sys/arch/mvme68k/mvme68k/locore.s b/sys/arch/mvme68k/mvme68k/locore.s
index 762edac073b3..3273b095092e 100644
--- a/sys/arch/mvme68k/mvme68k/locore.s
+++ b/sys/arch/mvme68k/mvme68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.53 1999/08/01 21:34:51 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.54 1999/09/17 20:04:41 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1708,9 +1708,6 @@ GLOBAL(bootaddr)
 GLOBAL(boothowto)
 	.long	0
 
-GLOBAL(cold)
-	.long	1		| cold start flag
-
 GLOBAL(want_resched)
 	.long	0
 
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index d306908df288..08d91dbc86b5 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.58 1999/09/12 01:17:13 chs Exp $	*/
+/*	$NetBSD: machdep.c,v 1.59 1999/09/17 20:04:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -699,7 +699,6 @@ cpu_reboot(howto, bootstr)
 	int howto;
 	char *bootstr;
 {
-	extern int cold;
 
 	/* take a snap shot before clobbering any registers */
 	if (curproc && curproc->p_addr)
diff --git a/sys/arch/newsmips/dev/sc_wrap.c b/sys/arch/newsmips/dev/sc_wrap.c
index 1fb69a5d7d2b..ffae053ab362 100644
--- a/sys/arch/newsmips/dev/sc_wrap.c
+++ b/sys/arch/newsmips/dev/sc_wrap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sc_wrap.c,v 1.9 1998/12/05 19:43:46 mjacob Exp $	*/
+/*	$NetBSD: sc_wrap.c,v 1.10 1999/09/17 20:04:43 thorpej Exp $	*/
 
 /*
  * This driver is slow!  Need to rewrite.
@@ -27,8 +27,6 @@
 #include <machine/autoconf.h>
 #include <machine/machConst.h>
 
-extern int cold;
-
 static int cxd1185_match __P((struct device *, struct cfdata *, void *));
 static void cxd1185_attach __P((struct device *, struct device *, void *));
 
diff --git a/sys/arch/newsmips/newsmips/autoconf.c b/sys/arch/newsmips/newsmips/autoconf.c
index 7b31363ed65a..061fece6bcc2 100644
--- a/sys/arch/newsmips/newsmips/autoconf.c
+++ b/sys/arch/newsmips/newsmips/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.7 1999/09/15 18:10:38 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.8 1999/09/17 20:04:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -74,7 +74,6 @@
  * the configuration process, and are used in initializing
  * the machine.
  */
-int	cold = 1;	/* if 1, still working on cold-start */
 int	cpuspeed = 10;	/* approx # instr per usec. */
 
 extern int initcpu __P((void));		/*XXX*/
@@ -109,8 +108,6 @@ cpu_configure()
 		panic("no mainbus found");
 
 	initcpu();
-
-	cold = 0;
 }
 
 void
diff --git a/sys/arch/newsmips/newsmips/machdep.c b/sys/arch/newsmips/newsmips/machdep.c
index 2345ab7b9671..1e0944768f51 100644
--- a/sys/arch/newsmips/newsmips/machdep.c
+++ b/sys/arch/newsmips/newsmips/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.29 1999/09/12 01:17:15 chs Exp $	*/
+/*	$NetBSD: machdep.c,v 1.30 1999/09/17 20:04:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 1999/09/12 01:17:15 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 1999/09/17 20:04:43 thorpej Exp $");
 
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
 
@@ -474,7 +474,6 @@ cpu_reboot(howto, bootstr)
 	volatile int howto;
 	char *bootstr;
 {
-	extern int cold;
 
 	/* take a snap shot before clobbering any registers */
 	if (curproc)
diff --git a/sys/arch/next68k/next68k/autoconf.c b/sys/arch/next68k/next68k/autoconf.c
index 56a79d99d7ef..c09a497e0ddf 100644
--- a/sys/arch/next68k/next68k/autoconf.c
+++ b/sys/arch/next68k/next68k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.6 1999/09/15 18:10:38 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.7 1999/09/17 20:04:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -69,13 +69,6 @@
 
 struct device *booted_device;	/* boot device */
 
-/*
- * The following several variables are related to
- * the configuration process, and are used in initializing
- * the machine.
- */
-int	cold;			/* if 1, still working on cold-start */
-
 void mainbus_attach __P((struct device *, struct device *, void *));
 int  mainbus_match __P((struct device *, struct cfdata *, void *));
 int  mainbus_print __P((void *, const char *));
@@ -162,8 +155,6 @@ cpu_configure()
 	if (config_rootfound("mainbus", NULL) == NULL)
 		panic("autoconfig failed, no root");
 
-	cold = 0;
-
 	/* Turn on interrupts */
 	spl0();
 }
diff --git a/sys/arch/next68k/next68k/locore.s b/sys/arch/next68k/next68k/locore.s
index 9762d7ad3015..ae6357ce18cb 100644
--- a/sys/arch/next68k/next68k/locore.s
+++ b/sys/arch/next68k/next68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.18 1999/08/01 21:38:32 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.19 1999/09/17 20:04:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1998 Darrin B. Jewell
@@ -1861,9 +1861,6 @@ GLOBAL(protorp)
 GLOBAL(prototc)
 	.long	0		| prototype translation control
 
-GLOBAL(cold)
-	.long	1		| cold start flag
-
 GLOBAL(want_resched)
 	.long	0
 
diff --git a/sys/arch/next68k/next68k/machdep.c b/sys/arch/next68k/next68k/machdep.c
index cffcec784faf..7cc838922195 100644
--- a/sys/arch/next68k/next68k/machdep.c
+++ b/sys/arch/next68k/next68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.25 1999/09/12 01:17:16 chs Exp $	*/
+/*	$NetBSD: machdep.c,v 1.26 1999/09/17 20:04:45 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -619,7 +619,6 @@ cpu_reboot(howto, bootstr)
 	int howto;
 	char *bootstr;
 {
-	extern int cold;
 
 #if __GNUC__	/* XXX work around lame compiler problem (gcc 2.7.2) */
 	(void)&howto;
diff --git a/sys/arch/ofppc/ofppc/autoconf.c b/sys/arch/ofppc/ofppc/autoconf.c
index 45b9f0734047..1dc86591d215 100644
--- a/sys/arch/ofppc/ofppc/autoconf.c
+++ b/sys/arch/ofppc/ofppc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.7 1999/09/15 18:10:40 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.8 1999/09/17 20:04:45 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -39,8 +39,6 @@
 
 #include <machine/powerpc.h>
 
-extern int cold;
-
 void configure __P((void));
 void findroot __P((void));
 
@@ -57,7 +55,6 @@ cpu_configure()
 		panic("configure: mainbus not configured");
 
 	(void)spl0();
-	cold = 0;
 }
 
 /*
diff --git a/sys/arch/ofppc/ofppc/machdep.c b/sys/arch/ofppc/ofppc/machdep.c
index d1227a0f07be..96ae11af3651 100644
--- a/sys/arch/ofppc/ofppc/machdep.c
+++ b/sys/arch/ofppc/ofppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.42 1999/06/28 08:20:46 itojun Exp $	*/
+/*	$NetBSD: machdep.c,v 1.43 1999/09/17 20:04:46 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -53,6 +53,7 @@
 #include <sys/syscallargs.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/user.h>
 
 #include <vm/vm.h>
@@ -112,8 +113,6 @@ struct machvec machine_interface = {
 	fake_irq_establish,
 };
 
-int cold = 1;
-
 void
 initppc(startkernel, endkernel, args)
 	u_int startkernel, endkernel;
diff --git a/sys/arch/pc532/pc532/autoconf.c b/sys/arch/pc532/pc532/autoconf.c
index 7c1262bef26b..870bfc3fb3d7 100644
--- a/sys/arch/pc532/pc532/autoconf.c
+++ b/sys/arch/pc532/pc532/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.30 1999/09/15 18:10:40 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.31 1999/09/17 20:04:46 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -59,7 +59,6 @@
  * the machine.
  */
 
-extern int cold;		/* cold start flag initialized in locore.s */
 u_long bootdev = 0;		/* should be dev_t, but not until 32 bits */
 struct device *booted_device;	/* boot device, set by dk_establish */
 
@@ -87,7 +86,6 @@ cpu_configure()
 
 	safepri = imask[IPL_ZERO];
 	spl0();
-	cold = 0;
 }
 
 void
diff --git a/sys/arch/pc532/pc532/locore.s b/sys/arch/pc532/pc532/locore.s
index 50b8d551370d..1adfdb53ec06 100644
--- a/sys/arch/pc532/pc532/locore.s
+++ b/sys/arch/pc532/pc532/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.56 1999/06/17 00:22:42 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.57 1999/09/17 20:04:47 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1993 Philip A. Nelson.
@@ -65,7 +65,6 @@
  * Initialization
  */
 
-	DATA_D(cold,		1)	/* cold till we are not */
 	DATA_D(esym,		0)	/* pointer to end of symbols */
 	DATA_D(_have_fpu,	0)	/* Have we an FPU installed? */
 
diff --git a/sys/arch/pc532/pc532/machdep.c b/sys/arch/pc532/pc532/machdep.c
index 41674c40816d..f6bf4ea870c7 100644
--- a/sys/arch/pc532/pc532/machdep.c
+++ b/sys/arch/pc532/pc532/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.105 1999/08/16 02:59:23 simonb Exp $	*/
+/*	$NetBSD: machdep.c,v 1.106 1999/09/17 20:04:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 Matthias Pfaller.
@@ -527,7 +527,6 @@ cpu_reboot(howto, bootstr)
 	int howto;
 	char *bootstr;
 {
-	extern int cold;
 	int s;
 
 	/* If system is cold, just halt. */
diff --git a/sys/arch/pica/pica/autoconf.c b/sys/arch/pica/pica/autoconf.c
index 3d2918946eaa..4537aeb9625a 100644
--- a/sys/arch/pica/pica/autoconf.c
+++ b/sys/arch/pica/pica/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.10 1999/09/15 18:10:41 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.11 1999/09/17 20:04:48 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -65,7 +65,6 @@
  * the configuration process, and are used in initializing
  * the machine.
  */
-int	cold = 1;	/* if 1, still working on cold-start */
 int	cpuspeed = 150;	/* approx # instr per usec. */
 extern	int pica_boardtype;
 
@@ -85,7 +84,6 @@ cpu_configure()
 	if(config_rootfound("mainbus", "mainbus") == NULL)
 		panic("no mainbus found");
 	(void)spl0();
-	cold = 0;
 }
 
 void
diff --git a/sys/arch/pmax/dev/dc.c b/sys/arch/pmax/dev/dc.c
index 0b9888cc5cb9..a51dc0a0aeae 100644
--- a/sys/arch/pmax/dev/dc.c
+++ b/sys/arch/pmax/dev/dc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dc.c,v 1.48 1999/04/24 08:01:03 simonb Exp $	*/
+/*	$NetBSD: dc.c,v 1.49 1999/09/17 20:04:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dc.c,v 1.48 1999/04/24 08:01:03 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dc.c,v 1.49 1999/09/17 20:04:48 thorpej Exp $");
 
 /*
  * devDC7085.c --
@@ -193,7 +193,6 @@ struct speedtab dcspeedtab[] = {
 /*
  * Console line variables, for use when cold
  */
-extern int cold;
 dcregs *dc_cons_addr = 0;
 static struct dc_softc coldcons_softc;
 
diff --git a/sys/arch/pmax/dev/rz.c b/sys/arch/pmax/dev/rz.c
index cf1138407789..822458c53266 100644
--- a/sys/arch/pmax/dev/rz.c
+++ b/sys/arch/pmax/dev/rz.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rz.c,v 1.46 1999/04/24 08:01:07 simonb Exp $	*/
+/*	$NetBSD: rz.c,v 1.47 1999/09/17 20:04:49 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: rz.c,v 1.46 1999/04/24 08:01:07 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rz.c,v 1.47 1999/09/17 20:04:49 thorpej Exp $");
 
 /*
  * SCSI CCS (Command Command Set) disk driver.
@@ -57,6 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: rz.c,v 1.46 1999/04/24 08:01:07 simonb Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/errno.h>
 #include <sys/fcntl.h>
@@ -1663,7 +1664,6 @@ rzdump(dev, blkno, va, size)
 	int error;
 	struct rz_softc *sc;
 	struct disklabel *lp;
-	extern int cold;
 
 	/* Check for recursive dump; if so, punt. */
 	if (rzdoingadump)
diff --git a/sys/arch/pmax/dev/tz.c b/sys/arch/pmax/dev/tz.c
index c748e6ef7f5d..6e37e7a3868c 100644
--- a/sys/arch/pmax/dev/tz.c
+++ b/sys/arch/pmax/dev/tz.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tz.c,v 1.21 1999/09/07 13:53:36 simonb Exp $	*/
+/*	$NetBSD: tz.c,v 1.22 1999/09/17 20:04:49 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -49,6 +49,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/errno.h>
 #include <sys/file.h>
@@ -478,7 +479,6 @@ tzdone(unit, error, resid, status)
 	struct tz_softc *sc = &tz_softc[unit];
 	struct buf *bp = sc->sc_tab.b_actf;
 	struct buf *dp;
-	extern int cold;
 
 	if (bp == NULL) {
 		printf("tz%d: bp == NULL\n", unit);
diff --git a/sys/arch/pmax/tc/scc.c b/sys/arch/pmax/tc/scc.c
index d014475ff3bf..c4547b6d9482 100644
--- a/sys/arch/pmax/tc/scc.c
+++ b/sys/arch/pmax/tc/scc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: scc.c,v 1.51 1999/04/24 08:01:13 simonb Exp $	*/
+/*	$NetBSD: scc.c,v 1.52 1999/09/17 20:04:50 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.51 1999/04/24 08:01:13 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.52 1999/09/17 20:04:50 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -292,7 +292,6 @@ void	scc_alphaintr __P((int));
  * console variables, for using serial console while still cold and
  * autoconfig has not attached the scc device.
  */
-extern  int cold;
 scc_regmap_t *scc_cons_addr = 0;
 static struct scc_softc coldcons_softc;
 static struct consdev scccons = {
diff --git a/sys/arch/sh3/sh3/autoconf.c b/sys/arch/sh3/sh3/autoconf.c
index e8f8c63ba60b..29ea49f462aa 100644
--- a/sys/arch/sh3/sh3/autoconf.c
+++ b/sys/arch/sh3/sh3/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.3 1999/09/15 18:10:41 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.4 1999/09/17 20:04:51 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -66,13 +66,6 @@ static int match_harddisk __P((struct device *, struct btinfo_bootdisk *));
 
 void findroot __P((struct device **, int *));
 
-/*
- * The following several variables are related to
- * the configuration process, and are used in initializing
- * the machine.
- */
-extern int	cold;		/* cold start flag initialized in locore.s */
-
 /*
  * Determine i/o configuration for a machine.
  */
@@ -89,7 +82,6 @@ cpu_configure()
 	       imask[IPL_BIO], imask[IPL_NET], imask[IPL_TTY]);
 
 	spl0();
-	cold = 0;
 }
 
 void
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c
index e5aef10dfb37..517e5eeb1908 100644
--- a/sys/arch/sparc/sparc/autoconf.c
+++ b/sys/arch/sparc/sparc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.122 1999/09/15 18:10:42 thorpej Exp $ */
+/*	$NetBSD: autoconf.c,v 1.123 1999/09/17 20:04:52 thorpej Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -99,7 +99,6 @@
  * the configuration process, and are used in initializing
  * the machine.
  */
-int	cold;		/* if 1, still working on cold-start */
 int	fbnode;		/* node ID of ROM's console frame buffer */
 int	optionsnode;	/* node ID of ROM's options */
 int	mmu_3l;		/* SUN4_400 models have a 3-level MMU */
@@ -826,7 +825,6 @@ cpu_configure()
 	bzero(proc0paddr, sizeof(struct user));
 
 	(void)spl0();
-	cold = 0;
 }
 
 struct device *altbootdev;
diff --git a/sys/arch/sparc/sparc/locore.s b/sys/arch/sparc/sparc/locore.s
index 343e52715404..07b380a88622 100644
--- a/sys/arch/sparc/sparc/locore.s
+++ b/sys/arch/sparc/sparc/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.123 1999/05/05 15:32:33 pk Exp $	*/
+/*	$NetBSD: locore.s,v 1.124 1999/09/17 20:04:52 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Paul Kranenburg
@@ -6157,9 +6157,6 @@ _C_LABEL(esym):
 	.globl	_C_LABEL(bootinfo)
 _C_LABEL(bootinfo):
 	.word	0
-	.globl	_C_LABEL(cold)
-_C_LABEL(cold):
-	.word	1		! cold start flag
 
 	.globl	_C_LABEL(proc0paddr)
 _C_LABEL(proc0paddr):
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index 486f6ade33b1..f445ba3bb060 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.153 1999/08/09 18:35:58 matt Exp $ */
+/*	$NetBSD: machdep.c,v 1.154 1999/09/17 20:04:53 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -95,6 +95,7 @@
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/clist.h>
@@ -613,7 +614,6 @@ cpu_reboot(howto, user_boot_string)
 {
 	int i;
 	static char str[128];
-	extern int cold;
 
 	/* If system is cold, just halt. */
 	if (cold) {
diff --git a/sys/arch/sparc/sparc/trap.c b/sys/arch/sparc/sparc/trap.c
index d86c4372c0f3..2e02c479d675 100644
--- a/sys/arch/sparc/sparc/trap.c
+++ b/sys/arch/sparc/sparc/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.85 1999/06/28 15:51:26 pk Exp $ */
+/*	$NetBSD: trap.c,v 1.86 1999/09/17 20:04:54 thorpej Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -100,8 +100,6 @@ extern struct emul emul_sunos;
 extern struct emul emul_netbsd_aout;
 #endif /* COMPAT_AOUT */
 
-extern int cold;
-
 #ifdef DEBUG
 int	rwindow_debug = 0;
 #endif
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index 4d59e2b3c61c..41d7163b99e3 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.21 1999/09/15 18:10:42 thorpej Exp $ */
+/*	$NetBSD: autoconf.c,v 1.22 1999/09/17 20:07:15 thorpej Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -97,7 +97,6 @@ int printspl = 0;
  * the configuration process, and are used in initializing
  * the machine.
  */
-int	cold;		/* if 1, still working on cold-start */
 int	stdinnode;	/* node ID of ROM's console input device */
 int	fbnode;		/* node ID of ROM's console output device */
 int	optionsnode;	/* node ID of ROM's options */
@@ -501,7 +500,6 @@ cpu_configure()
 #endif
 
 	(void)spl0();
-	cold = 0;
 }
 
 struct device *altbootdev;
diff --git a/sys/arch/sparc64/sparc64/locore.s b/sys/arch/sparc64/sparc64/locore.s
index 516e81a8ca62..56e3275e360a 100644
--- a/sys/arch/sparc64/sparc64/locore.s
+++ b/sys/arch/sparc64/sparc64/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.43 1999/07/18 23:55:57 eeh Exp $	*/
+/*	$NetBSD: locore.s,v 1.44 1999/09/17 20:07:15 thorpej Exp $	*/
 /*
  * Copyright (c) 1996-1999 Eduardo Horvath
  * Copyright (c) 1996 Paul Kranenburg
@@ -10011,10 +10011,6 @@ _C_LABEL(ssym):
 _C_LABEL(proc0paddr):
 	POINTER	_C_LABEL(u0)		! KVA of proc0 uarea
 	
-	.globl	_C_LABEL(cold)
-_C_LABEL(cold):
-	.word	1		! cold start flag
-
 /* interrupt counters	XXX THESE BELONG ELSEWHERE (if anywhere) */
 	.globl	_C_LABEL(intrcnt), _C_LABEL(eintrcnt), _C_LABEL(intrnames), _C_LABEL(eintrnames)
 _C_LABEL(intrnames):
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index 5eca8a4c8127..1141ba3cdfc6 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.49 1999/07/08 18:11:00 thorpej Exp $ */
+/*	$NetBSD: machdep.c,v 1.50 1999/09/17 20:07:17 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -94,6 +94,7 @@
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/clist.h>
@@ -688,7 +689,6 @@ cpu_reboot(howto, user_boot_string)
 {
 	int i;
 	static char str[128];
-	extern int cold;
 
 	/* If system is cold, just halt. */
 	if (cold) {
diff --git a/sys/arch/sparc64/sparc64/trap.c b/sys/arch/sparc64/sparc64/trap.c
index fc7e7f6d8e9a..5f8b0d382b4f 100644
--- a/sys/arch/sparc64/sparc64/trap.c
+++ b/sys/arch/sparc64/sparc64/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.29 1999/03/30 02:12:37 eeh Exp $ */
+/*	$NetBSD: trap.c,v 1.30 1999/09/17 20:07:17 thorpej Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -131,8 +131,6 @@ int rftuld = 0;
 int rftudone = 0;
 int rftkcnt[5] = { 0, 0, 0, 0, 0 };
 
-extern int cold;
-
 #ifdef DEBUG
 #define RW_64		0x1
 #define RW_ERR		0x2
diff --git a/sys/arch/sun3/dev/xd.c b/sys/arch/sun3/dev/xd.c
index adbb249b4c8c..322a673ff6c5 100644
--- a/sys/arch/sun3/dev/xd.c
+++ b/sys/arch/sun3/dev/xd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: xd.c,v 1.23 1998/12/13 17:57:19 kleink Exp $	*/
+/*	$NetBSD: xd.c,v 1.24 1999/09/17 20:07:18 thorpej Exp $	*/
 
 /*
  *
@@ -585,7 +585,6 @@ xd_init(xd)
 	struct xd_iopb_drive *driopb;
 	void *dvmabuf;
 	int rqno, err, spt, mb, blk, lcv, fullmode, newstate;
-	extern int cold;
 
 	xdc = xd->parent;
 	xd->state = XD_DRIVE_ATTACHING;
diff --git a/sys/arch/sun3/dev/xy.c b/sys/arch/sun3/dev/xy.c
index 5db36eca5d72..8fc77ee859cb 100644
--- a/sys/arch/sun3/dev/xy.c
+++ b/sys/arch/sun3/dev/xy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: xy.c,v 1.22 1998/07/23 23:48:33 gwr Exp $	*/
+/*	$NetBSD: xy.c,v 1.23 1999/09/17 20:07:18 thorpej Exp $	*/
 
 /*
  *
@@ -532,7 +532,6 @@ xy_init(xy)
 	struct dkbad *dkb;
 	void *dvmabuf;
 	int err, spt, mb, blk, lcv, fullmode, newstate;
-	extern int cold;
 
 	xyc = xy->parent;
 	xy->state = XY_DRIVE_ATTACHING;
diff --git a/sys/arch/sun3/sun3/autoconf.c b/sys/arch/sun3/sun3/autoconf.c
index 11337ad00219..a9a204e6d4a7 100644
--- a/sys/arch/sun3/sun3/autoconf.c
+++ b/sys/arch/sun3/sun3/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.53 1999/09/15 18:10:43 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.54 1999/09/17 20:07:19 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -63,9 +63,6 @@
 #error "Must have exactly one of: SUN3 and SUN3X options"
 #endif
 
-/* Want compile-time initialization here. */
-int cold = 1;
-
 /*
  * Do general device autoconfiguration,
  * then choose root device (etc.)
@@ -85,7 +82,6 @@ cpu_configure()
 	 */
 	printf("enabling interrupts\n");
 	(void)spl0();
-	cold = 0;
 }
 
 /*
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h
index 320babff3b59..1b54d3932d50 100644
--- a/sys/arch/vax/include/cpu.h
+++ b/sys/arch/vax/include/cpu.h
@@ -1,4 +1,4 @@
-/*      $NetBSD: cpu.h,v 1.39 1999/08/10 21:08:09 thorpej Exp $      */
+/*      $NetBSD: cpu.h,v 1.40 1999/09/17 20:07:19 thorpej Exp $      */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden
@@ -73,7 +73,6 @@ struct clockframe {
 };
 
 extern struct device *booted_from;
-extern int cold;
 extern int mastercpu;
 extern int bootdev;
 
diff --git a/sys/arch/vax/vax/autoconf.c b/sys/arch/vax/vax/autoconf.c
index aab8671b54ee..855165263328 100644
--- a/sys/arch/vax/vax/autoconf.c
+++ b/sys/arch/vax/vax/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.43 1999/09/15 18:10:43 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.44 1999/09/17 20:07:20 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -73,9 +73,9 @@ cpu_configure()
 		panic("mainbus not configured");
 
 	/*
-	 * We're ready to start up. Clear CPU and soft cold start flags.
+	 * We're ready to start up. Clear CPU cold start flag.
+	 * Soft cold-start flag will be cleared in configure().
 	 */
-	cold = 0;
 	if (dep_call->cpu_clrf) 
 		(*dep_call->cpu_clrf)();
 }
diff --git a/sys/arch/vax/vax/ka49.c b/sys/arch/vax/vax/ka49.c
index a330bf71c744..8b8931bcfd04 100644
--- a/sys/arch/vax/vax/ka49.c
+++ b/sys/arch/vax/vax/ka49.c
@@ -32,6 +32,7 @@
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 21a76192f3a1..6a02cb853add 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.86 1999/08/12 20:23:49 ragge Exp $	 */
+/* $NetBSD: machdep.c,v 1.87 1999/09/17 20:07:20 thorpej Exp $	 */
 
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
@@ -121,7 +121,6 @@ extern int virtual_avail, virtual_end;
  * We do these external declarations here, maybe they should be done
  * somewhere else...
  */
-int		cold = 1;
 int		want_resched;
 char		machine[] = MACHINE;		/* from <machine/param.h> */
 char		machine_arch[] = MACHINE_ARCH;	/* from <machine/param.h> */
diff --git a/sys/arch/vax/vax/scb.c b/sys/arch/vax/vax/scb.c
index 37a9bdb3a3c8..537c3648ff0e 100644
--- a/sys/arch/vax/vax/scb.c
+++ b/sys/arch/vax/vax/scb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: scb.c,v 1.7 1999/08/27 20:00:24 ragge Exp $ */
+/*	$NetBSD: scb.c,v 1.8 1999/09/17 20:07:20 thorpej Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -35,6 +35,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 
 #include <machine/trap.h>
 #include <machine/scb.h>
diff --git a/sys/arch/x68k/x68k/autoconf.c b/sys/arch/x68k/x68k/autoconf.c
index ed3c14f14009..aef29eca92b1 100644
--- a/sys/arch/x68k/x68k/autoconf.c
+++ b/sys/arch/x68k/x68k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.20 1999/09/15 18:10:43 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.21 1999/09/17 20:07:21 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -59,7 +59,6 @@ static int simple_devprint __P((void *, const char *));
 static struct device *scsi_find __P((dev_t));
 static struct device *find_dev_byname __P((const char *));
 
-extern int cold;	/* 1 if still booting (locore.s) */
 int x68k_realconfig;
 #include <sys/kernel.h>
 
@@ -76,8 +75,6 @@ cpu_configure()
 	if (config_rootfound("mainbus", "mainbus") == NULL)
 		panic("no mainbus found");
 
-	cold = 0;
-
 	/* Turn on interrupts */
 	(void) spl0();
 }
diff --git a/sys/arch/x68k/x68k/locore.s b/sys/arch/x68k/x68k/locore.s
index 77563cdde0c5..8e57f480ec00 100644
--- a/sys/arch/x68k/x68k/locore.s
+++ b/sys/arch/x68k/x68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.48 1999/08/05 15:58:17 minoura Exp $	*/
+/*	$NetBSD: locore.s,v 1.49 1999/09/17 20:07:21 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1751,9 +1751,6 @@ GLOBAL(fputype)
 GLOBAL(protorp)
 	.long	0,0		| prototype root pointer
 
-GLOBAL(cold)
-	.long	1		| cold start flag
-
 GLOBAL(want_resched)
 	.long	0
 
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index f4a65c5cf710..53bca34a572a 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_synch.c,v 1.64 1999/09/15 21:54:57 thorpej Exp $	*/
+/*	$NetBSD: kern_synch.c,v 1.65 1999/09/17 20:09:05 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -345,7 +345,6 @@ tsleep(ident, priority, wmesg, timo)
 	register struct slpque *qp;
 	register int s;
 	int sig, catch = priority & PCATCH;
-	extern int cold;
 	void endtsleep __P((void *));
 
 	if (cold || panicstr) {
@@ -484,7 +483,6 @@ sleep(ident, priority)
 	register struct proc *p = curproc;
 	register struct slpque *qp;
 	register int s;
-	extern int cold;
 
 #ifdef DIAGNOSTIC
 	if (priority > PZERO) {
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index de3783681cda..71ae86bc85fc 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: kernel.h,v 1.14 1998/02/10 00:25:32 perry Exp $	*/
+/*	$NetBSD: kernel.h,v 1.15 1999/09/17 20:09:07 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -58,6 +58,7 @@ extern volatile struct timeval time;
 
 extern int rtc_offset;		/* offset of rtc from UTC in minutes */
 
+extern int cold;		/* still working on startup */
 extern int tick;		/* usec per tick (1000000 / hz) */
 extern int tickfix;		/* periodic tick adj. tick not integral */
 extern int tickfixinterval;	/* interval at which to apply adjustment */