diff --git a/sys/arch/hppa/hppa/fpu.c b/sys/arch/hppa/hppa/fpu.c
index f492751562b3..c3b541c27af2 100644
--- a/sys/arch/hppa/hppa/fpu.c
+++ b/sys/arch/hppa/hppa/fpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu.c,v 1.2 2003/08/31 01:26:34 chs Exp $	*/
+/*	$NetBSD: fpu.c,v 1.3 2003/10/25 16:15:07 chs Exp $	*/
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.2 2003/08/31 01:26:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.3 2003/10/25 16:15:07 chs Exp $");
 
 #include <sys/param.h>       
 #include <sys/systm.h>
@@ -229,7 +229,7 @@ hppa_fpu_flush(struct lwp *l)
 	 */
 
 	if (fpu_present &&
-	    fpu_cur_uspace != NULL &&
+	    fpu_cur_uspace != 0 &&
 	    fpu_cur_uspace == tf->tf_cr30)
 		hppa_fpu_swap(l->l_addr, NULL);
 }
diff --git a/sys/arch/mipsco/mipsco/autoconf.c b/sys/arch/mipsco/mipsco/autoconf.c
index 710674511d20..411b44f62f4f 100644
--- a/sys/arch/mipsco/mipsco/autoconf.c
+++ b/sys/arch/mipsco/mipsco/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.10 2003/08/07 16:28:36 agc Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.11 2003/10/25 16:15:07 chs Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -85,7 +85,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2003/08/07 16:28:36 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.11 2003/10/25 16:15:07 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -149,7 +149,7 @@ cpu_rootconf()
 	setroot(booted_device, booted_partition);
 }
 
-dev_t	bootdev = NULL;
+dev_t	bootdev = 0;
 char	boot_class;
 int	boot_id, boot_lun, boot_part;
 
diff --git a/sys/arch/sgimips/dev/mace.c b/sys/arch/sgimips/dev/mace.c
index b4849e1dc78d..c23efc7b6ce5 100644
--- a/sys/arch/sgimips/dev/mace.c
+++ b/sys/arch/sgimips/dev/mace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mace.c,v 1.13 2003/10/05 15:38:08 tsutsui Exp $	*/
+/*	$NetBSD: mace.c,v 1.14 2003/10/25 16:15:07 chs Exp $	*/
 
 /*
  * Copyright (c) 2003 Christopher Sekiya
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.13 2003/10/05 15:38:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.14 2003/10/25 16:15:07 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -139,7 +139,7 @@ mace_attach(parent, self, aux)
 	sc->iot = SGIMIPS_BUS_SPACE_MACE;
 	sc->dmat = &sgimips_default_bus_dma_tag;
 
-	if (bus_space_map(sc->iot, ma->ma_addr, NULL,
+	if (bus_space_map(sc->iot, ma->ma_addr, 0,
 	    BUS_SPACE_MAP_LINEAR, &sc->ioh))
 		panic("mace_attach: could not allocate memory\n");
 
diff --git a/sys/arch/sgimips/dev/mcclock_mace.c b/sys/arch/sgimips/dev/mcclock_mace.c
index ac967404cfde..38273075e1be 100644
--- a/sys/arch/sgimips/dev/mcclock_mace.c
+++ b/sys/arch/sgimips/dev/mcclock_mace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mcclock_mace.c,v 1.11 2003/10/05 15:38:08 tsutsui Exp $	*/
+/*	$NetBSD: mcclock_mace.c,v 1.12 2003/10/25 16:15:07 chs Exp $	*/
 
 /*
  * Copyright (c) 2001 Antti Kantee.  All Rights Reserved.
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock_mace.c,v 1.11 2003/10/05 15:38:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_mace.c,v 1.12 2003/10/25 16:15:07 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -126,7 +126,7 @@ mcclock_mace_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_st = maa->maa_st;
 	/* XXX should be bus_space_map() */
 	if (bus_space_subregion(maa->maa_st, maa->maa_sh,
-	    maa->maa_offset, NULL, &sc->sc_sh))
+	    maa->maa_offset, 0, &sc->sc_sh))
 		panic("mcclock_mace_attach: couldn't map");
 
 	/*
diff --git a/sys/arch/sgimips/pci/macepci.c b/sys/arch/sgimips/pci/macepci.c
index 0633b4cc6355..997b24632837 100644
--- a/sys/arch/sgimips/pci/macepci.c
+++ b/sys/arch/sgimips/pci/macepci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: macepci.c,v 1.14 2003/10/05 15:38:08 tsutsui Exp $	*/
+/*	$NetBSD: macepci.c,v 1.15 2003/10/25 16:15:07 chs Exp $	*/
 
 /*
  * Copyright (c) 2001,2003 Christopher Sekiya
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: macepci.c,v 1.14 2003/10/05 15:38:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: macepci.c,v 1.15 2003/10/25 16:15:07 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -127,7 +127,7 @@ macepci_attach(parent, self, aux)
 	int device, rev;
 
 	if (bus_space_subregion(maa->maa_st, maa->maa_sh,
-	    maa->maa_offset, NULL, &pc->ioh) )
+	    maa->maa_offset, 0, &pc->ioh) )
 		panic("macepci_attach: couldn't map");
 
 	pc->iot = maa->maa_st;
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index b70d9bfe6d61..cf0701760a25 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sk.c,v 1.3 2003/10/15 02:18:52 briggs Exp $	*/
+/*	$NetBSD: if_sk.c,v 1.4 2003/10/25 16:15:07 chs Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -922,7 +922,7 @@ sk_lookup(const struct pci_attach_args *pa)
 {
 	const struct sk_product *psk;
 	
-	for ( psk = &sk_products[0]; psk->sk_vendor != NULL; psk++ ) {
+	for ( psk = &sk_products[0]; psk->sk_vendor != 0; psk++ ) {
 		if (PCI_VENDOR(pa->pa_id) == psk->sk_vendor &&
 		    PCI_PRODUCT(pa->pa_id) == psk->sk_product)
 			return (psk);
diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c
index 52827f976869..20fca0d6da5f 100644
--- a/sys/dev/vinum/vinumconfig.c
+++ b/sys/dev/vinum/vinumconfig.c
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumconfig.c,v 1.1.1.1 2003/10/10 03:08:01 grog Exp $
+ * $Id: vinumconfig.c,v 1.2 2003/10/25 16:15:07 chs Exp $
  * $FreeBSD$
  */
 
@@ -104,7 +104,7 @@ throw_rude_remark(int error, char *msg,...)
 	    vprintf(msg, ap);				    /* print to the console */
 	    printf("\n");
 	} else {
-	    retval = snprintf(msg, NULL, (void *) text, 10, ap);
+	    retval = snprintf(msg, 0, (void *) text, 10, ap);
 	    text[retval] = '\0';			    /* delimit */
 	    strcpy(ioctl_reply->msg, text);
 	    ioctl_reply->error = error;			    /* first byte is the error number */