diff --git a/sys/arch/vax/vax/crl.c b/sys/arch/vax/vax/crl.c
index c1cc926b7fee..c63abdd9e82e 100644
--- a/sys/arch/vax/vax/crl.c
+++ b/sys/arch/vax/vax/crl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: crl.c,v 1.17 2003/08/07 16:30:17 agc Exp $	*/
+/*	$NetBSD: crl.c,v 1.18 2003/09/29 22:54:28 matt Exp $	*/
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: crl.c,v 1.17 2003/08/07 16:30:17 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crl.c,v 1.18 2003/09/29 22:54:28 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -270,7 +270,7 @@ crlintr(arg)
 		break;
 
 	case CRL_S_HWERR:
-		printf("crl: hard error sn" PRId64 "\n", bp->b_blkno);
+		printf("crl: hard error sn%" PRId64 "\n", bp->b_blkno);
 		crltab.crl_active = CRL_F_ABORT;
 		mtpr(STXCS_IE | CRL_F_ABORT, PR_STXCS);
 		break;
diff --git a/sys/arch/vax/vax/in4_cksum.c b/sys/arch/vax/vax/in4_cksum.c
index e491179241a0..1f541e020aa0 100644
--- a/sys/arch/vax/vax/in4_cksum.c
+++ b/sys/arch/vax/vax/in4_cksum.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: in4_cksum.c,v 1.7 2003/08/07 16:30:18 agc Exp $	*/
+/*	$NetBSD: in4_cksum.c,v 1.8 2003/09/29 22:54:28 matt Exp $	*/
 
 /*
  * Copyright (C) 1999 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in4_cksum.c,v 1.7 2003/08/07 16:30:18 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in4_cksum.c,v 1.8 2003/09/29 22:54:28 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
@@ -125,14 +125,15 @@ in4_cksum(struct mbuf *m, u_int8_t nxt, int off, int len)
 			panic("in4_cksum: bad mbuf chain");
 #endif
 
-		__asm __volatile("
-			movzwl	16(%%ap),%0	# mov len to sum
-			addb2	8(%%ap),%0	# add proto to sum
-			rotl	$8,%0,%0	# htons, carry is preserved
-			adwc	12(%2),%0	# add src ip
-			adwc	16(%2),%0	# add dst ip
-			adwc	$0,%0		# clean up carry
-			" : "=r" (sum) : "0" (sum), "r" (mtod(m, void *)));
+		__asm __volatile(
+			"movzwl	16(%%ap),%0;"	/* mov len to sum */
+			"addb2	8(%%ap),%0;"	/* add proto to sum */
+			"rotl	$8,%0,%0;"	/* htons, carry is preserved */
+			"adwc	12(%2),%0;"	/* add src ip */
+			"adwc	16(%2),%0;"	/* add dst ip */
+			"adwc	$0,%0;"		/* clean up carry */
+			: "=r" (sum)
+			: "0" (sum), "r" (mtod(m, void *)));
 	}
 
 	/* skip unnecessary part */
diff --git a/sys/arch/vax/vax/ka820.c b/sys/arch/vax/vax/ka820.c
index 4c7b9b9928a1..c6d5fab5c7e5 100644
--- a/sys/arch/vax/vax/ka820.c
+++ b/sys/arch/vax/vax/ka820.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ka820.c,v 1.38 2003/08/07 16:30:19 agc Exp $	*/
+/*	$NetBSD: ka820.c,v 1.39 2003/09/29 22:54:28 matt Exp $	*/
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka820.c,v 1.38 2003/08/07 16:30:19 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka820.c,v 1.39 2003/09/29 22:54:28 matt Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -569,7 +569,7 @@ ka820_startslave(struct device *dev, struct cpu_info *ci)
 		if ((volatile int)ci->ci_flags & CI_RUNNING)
 			break;
 	if (i == 10000)
-		printf("%s: (ID %d) failed starting??!!??\n",
+		printf("%s: (ID %d) failed starting??\n",
 		    dev->dv_xname, sc->sc_binid);
 }
 
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index f6b058cc61fb..9d87a4d682ae 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.140 2003/09/29 21:04:53 matt Exp $	 */
+/* $NetBSD: machdep.c,v 1.141 2003/09/29 22:54:28 matt Exp $	 */
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.140 2003/09/29 21:04:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.141 2003/09/29 22:54:28 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -222,7 +222,7 @@ cpu_startup()
 	size = MAXBSIZE * nbuf;		/* # bytes for buffers */
 
 	/* allocate VM for buffers... area is not managed by VM system */
-	if (uvm_map(kernel_map, (vaddr_t *) &buffers, round_page(size),
+	if (uvm_map(kernel_map, (vaddr_t *)(void *) &buffers, round_page(size),
 		    NULL, UVM_UNKNOWN_OFFSET, 0,
 		    UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE, UVM_INH_NONE,
 				UVM_ADV_NORMAL, 0)) != 0)
diff --git a/sys/arch/vax/vsa/vsbus_dma.c b/sys/arch/vax/vsa/vsbus_dma.c
index 3ca65997fbff..85673ec5f99d 100644
--- a/sys/arch/vax/vsa/vsbus_dma.c
+++ b/sys/arch/vax/vsa/vsbus_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vsbus_dma.c,v 1.9 2003/07/15 02:15:07 lukem Exp $ */
+/* $NetBSD: vsbus_dma.c,v 1.10 2003/09/29 22:54:28 matt Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vsbus_dma.c,v 1.9 2003/07/15 02:15:07 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsbus_dma.c,v 1.10 2003/09/29 22:54:28 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -123,7 +123,7 @@ vsbus_dma_init(sc, ptecnt)
 		}
 
 		error = bus_dmamem_map(t, segs, nsegs, mapsize, 
-		   (caddr_t *) &pte, BUS_DMA_NOWAIT|BUS_DMA_COHERENT);
+		   (caddr_t *)(void *) &pte, BUS_DMA_NOWAIT|BUS_DMA_COHERENT);
 		if (error) {
 			panic("vsbus_dma_init: error mapping memory for "
 			    "hw sgmap: error=%d", error);