4 files changed, 7 insertions, 7 deletions

diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index cbfde4c833590..6712e9b4c6431 100644
--- a/sys/dev/syscons/scvtb.c
+++ b/sys/dev/syscons/scvtb.c
@@ -51,7 +51,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait)
 	vtb->vtb_cols = cols;
 	vtb->vtb_rows = rows;
 	vtb->vtb_size = cols*rows;
-	vtb->vtb_buffer = NULL;
+	vtb->vtb_buffer = 0;
 	vtb->vtb_tail = 0;
 
 	switch (type) {
@@ -62,7 +62,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait)
 				(vm_offset_t)malloc(cols*rows*sizeof(u_int16_t),
 						    M_DEVBUF, 
 						    (wait) ? M_WAITOK : M_NOWAIT);
-			if (vtb->vtb_buffer != NULL) {
+			if (vtb->vtb_buffer != 0) {
 				bzero((void *)sc_vtb_pointer(vtb, 0),
 				      cols*rows*sizeof(u_int16_t));
 				vtb->vtb_flags |= VTB_ALLOCED;
@@ -92,11 +92,11 @@ sc_vtb_destroy(sc_vtb_t *vtb)
 	vtb->vtb_tail = 0;
 
 	p = vtb->vtb_buffer;
-	vtb->vtb_buffer = NULL;
+	vtb->vtb_buffer = 0;
 	switch (vtb->vtb_type) {
 	case VTB_MEMORY:
 	case VTB_RINGBUFFER:
-		if ((vtb->vtb_flags & VTB_ALLOCED) && (p != NULL))
+		if ((vtb->vtb_flags & VTB_ALLOCED) && (p != 0))
 			free((void *)p, M_DEVBUF);
 		break;
 	default:
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index d33f02b4e164b..4673c3451c619 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -867,7 +867,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 	    hstp = scp->history->vtb_buffer + sc_vtb_tail(scp->history) *
 		sizeof(u_int16_t) + ptr->x * sizeof(u_int16_t);
 	else
-	    hstp = NULL;
+	    hstp = 0;
 
 	retval = 0;
 	for (lnum = 0; lnum < (ptr->y + ptr->ysize); lnum++) {
diff --git a/sys/dev/vinum/vinumdaemon.c b/sys/dev/vinum/vinumdaemon.c
index 570495b9ee6a0..16edfdd7aa0a4 100644
--- a/sys/dev/vinum/vinumdaemon.c
+++ b/sys/dev/vinum/vinumdaemon.c
@@ -263,7 +263,7 @@ vinum_finddaemon()
     int result;
 
     if (daemonpid != 0) {				    /* we think we have a daemon, */
-	queue_daemon_request(daemonrq_ping, (union daemoninfo) NULL); /* queue a ping */
+	queue_daemon_request(daemonrq_ping, (union daemoninfo) 0); /* queue a ping */
 	result = tsleep(&vinum_finddaemon, PUSER, "reap", 2 * hz);
 	if (result == 0)				    /* yup, the daemon's up and running */
 	    return 0;
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index 0800b6db372cb..d7e5c956639d0 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -611,7 +611,7 @@ format_config(char *config, int len)
 void
 save_config(void)
 {
-    queue_daemon_request(daemonrq_saveconfig, (union daemoninfo) NULL);
+    queue_daemon_request(daemonrq_saveconfig, (union daemoninfo) 0);
 }
 
 /*