From e8adebf242bbf68acbc586743ac9d22dcaf86944 Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Wed, 21 May 1997 14:18:27 +0000
Subject: Introducing "Jumping Daemon" screen saver. This is really cute and
 eye-catching :-)

Submitted by:	ssigala@globalnet.it
---
 sys/dev/syscons/daemon/daemon_saver.c | 215 ++++++++++++++++++++++++++++++++++
 1 file changed, 215 insertions(+)
 create mode 100644 sys/dev/syscons/daemon/daemon_saver.c

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
new file mode 100644
index 000000000000..d189c593282e
--- /dev/null
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -0,0 +1,215 @@
+/*-
+ * Copyright (c) 1997 Sandro Sigala, Brescia, Italy.
+ * Copyright (c) 1995 S ren Schmidt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/exec.h>
+#include <sys/sysent.h>
+#include <sys/lkm.h>
+#include <sys/errno.h>
+
+#include <machine/md_var.h>
+
+#include "saver.h"
+
+MOD_MISC(daemon_saver);
+
+void (*current_saver)(int blank);
+void (*old_saver)(int blank);
+
+#define DAEMON_MAX_WIDTH	32
+#define DAEMON_MAX_HEIGHT	19
+
+/* How is the author of this ASCII pic? */
+
+static char *daemon_pic[] = {
+        "             ,        ,",
+	"            /(        )`",
+	"            \\ \\___   / |",
+	"            /- _  `-/  '",
+	"           (/\\/ \\ \\   /\\",
+	"           / /   | `    \\",
+	"           O O   ) /    |",
+	"           `-^--'`<     '",
+	"          (_.)  _  )   /",
+	"           `.___/`    /",
+	"             `-----' /",
+	"<----.     __ / __   \\",
+	"<----|====O)))==) \\) /====",
+	"<----'    `--' `.__,' \\",
+	"             |        |",
+	"              \\       /       /\\",
+	"         ______( (_  / \\______/",
+	"       ,'  ,-----'   |",
+	"       `--{__________)",
+	NULL
+};
+
+static char *daemon_attr[] = {
+        "             R        R",
+	"            RR        RR",
+	"            R RRRR   R R",
+	"            RR W  RRR  R",
+	"           RWWW W R   RR",
+	"           W W   W R    R",
+	"           B B   W R    R",
+	"           WWWWWWRR     R",
+	"          RRRR  R  R   R",
+	"           RRRRRRR    R",
+	"             RRRRRRR R",
+	"YYYYYY     RR R RR   R",
+	"YYYYYYYYYYRRRRYYR RR RYYYY",
+	"YYYYYY    RRRR RRRRRR R",
+	"             R        R",
+	"              R       R       RR",
+	"         CCCCCCR RR  R RRRRRRRR",
+	"       CC  CCCCCCC   C",
+	"       CCCCCCCCCCCCCCC",
+	NULL
+};
+
+
+static void
+draw_daemon(int xpos, int ypos)
+{
+	int x, y;
+	int attr;
+
+	for (y = 0; daemon_pic[y] != NULL; y++)
+		for (x = 0; daemon_pic[y][x] != '\0'; x++) {
+			switch (daemon_attr[y][x]) {
+			case 'R': attr = (FG_LIGHTRED|BG_BLACK)<<8; break;
+			case 'Y': attr = (FG_YELLOW|BG_BLACK)<<8; break;
+			case 'B': attr = (FG_LIGHTBLUE|BG_BLACK)<<8; break;
+			case 'W': attr = (FG_LIGHTGREY|BG_BLACK)<<8; break;
+			case 'C': attr = (FG_CYAN|BG_BLACK)<<8; break;
+			default: attr = (FG_WHITE|BG_BLACK)<<8; break;
+			}
+			*((u_short *)(Crtat + (ypos + y)*cur_console->xsize 
+			    + xpos + x)) = scr_map[daemon_pic[y][x]]|attr;
+		}
+}
+
+static void
+draw_string(int xpos, int ypos, char *s, int len)
+{
+	int x;
+
+	for (x = 0; x < len; x++)
+		*((u_short*)(Crtat + ypos*cur_console->xsize + xpos + x)) =
+			scr_map[s[x]]|(FG_LIGHTGREEN|BG_BLACK)<<8;
+}
+
+static void
+daemon_saver(int blank)
+{
+	static const char message[] = {"FreeBSD 3.0 CURRENT"};
+	static int dxpos = 0, dypos = 0;
+	static int dxdir = 1, dydir = 1;
+	static int txpos = 10, typos = 10;
+	static int txdir = -1, tydir = -1;
+	static int moved_daemon = 0;
+	scr_stat *scp = cur_console;
+
+	if (blank) {
+		if (scrn_blanked++ < 2)
+			return;
+		fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat,
+		      scp->xsize * scp->ysize);
+		set_border(0);
+		scrn_blanked = 1;
+
+		if (++moved_daemon) {
+			if (dxdir > 0) {
+				if (dxpos + 1 >= scp->xsize - DAEMON_MAX_WIDTH)
+					dxdir = -1;
+			} else {
+				if (dxpos == 0) dxdir = 1;
+			}
+			if (dydir > 0) {
+				if (dypos + 1 >= scp->ysize - DAEMON_MAX_HEIGHT
+)
+					dydir = -1;
+			} else {
+				if (dypos == 0) dydir = 1;
+			}
+			moved_daemon = -1;
+			dxpos += dxdir; dypos += dydir;
+		}
+
+		if (txdir > 0) {
+			if (txpos + 1 >= scp->xsize - sizeof(message)-1)
+				txdir = -1;
+		} else {
+			if (txpos == 0) txdir = 1;
+		}
+		if (tydir > 0) {
+			if (typos + 1 >= scp->ysize - 1)
+				tydir = -1;
+		} else {
+			if (typos == 0) tydir = 1;
+		}
+		txpos += txdir; typos += tydir;
+
+		draw_daemon(dxpos, dypos);
+		draw_string(txpos, typos, (char *)message, sizeof(message)-1);
+	} else {
+		if (scrn_blanked) {
+			set_border(scp->border);
+			scrn_blanked = 0;
+			scp->start = 0;
+			scp->end = scp->xsize * scp->ysize;
+		}
+	}
+}
+
+static int
+daemon_saver_load(struct lkm_table *lkmtp, int cmd)
+{
+	(*current_saver)(0);
+	old_saver = current_saver;
+	current_saver = daemon_saver;
+	return 0;
+}
+
+static int
+daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
+{
+	(*current_saver)(0);
+	current_saver = old_saver;
+	return 0;
+}
+
+int
+daemon_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
+{
+	MOD_DISPATCH(daemon_saver, lkmtp, cmd, ver,
+		daemon_saver_load, daemon_saver_unload, lkm_nullcmd);
+}
-- 
cgit v1.3


From 068eabc6c4159ef696f7bd662ed06351c7a4391c Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Sat, 24 May 1997 01:44:39 +0000
Subject: Flip the daemon at the edge of the screen. Submitted by:	Sandro
 Sigala, Chris Shenton

---
 lkm/syscons/daemon/daemon_saver.c         | 67 ++++++++++++++++++++++++-------
 sys/dev/syscons/daemon/daemon_saver.c     | 67 ++++++++++++++++++++++++-------
 sys/modules/syscons/daemon/daemon_saver.c | 67 ++++++++++++++++++++++++-------
 3 files changed, 159 insertions(+), 42 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/lkm/syscons/daemon/daemon_saver.c b/lkm/syscons/daemon/daemon_saver.c
index d189c593282e..fcdcbfa84eab 100644
--- a/lkm/syscons/daemon/daemon_saver.c
+++ b/lkm/syscons/daemon/daemon_saver.c
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 1997 Sandro Sigala, Brescia, Italy.
+ * Copyright (c) 1997 Chris Shenton
  * Copyright (c) 1995 S ren Schmidt
  * All rights reserved.
  *
@@ -24,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: daemon_saver.c,v 1.1 1997/05/21 14:18:27 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -44,10 +45,18 @@ MOD_MISC(daemon_saver);
 void (*current_saver)(int blank);
 void (*old_saver)(int blank);
 
+#define CONSOLE_VECT(x, y) \
+	*((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
+
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
-/* How is the author of this ASCII pic? */
+/*
+ * Define this to disable the bouncing text.
+ */
+#undef DAEMON_ONLY
+
+/* Who is the author of this ASCII pic? */
 
 static char *daemon_pic[] = {
         "             ,        ,",
@@ -95,9 +104,27 @@ static char *daemon_attr[] = {
 	NULL
 };
 
+/*
+ * Reverse a graphics character, or return unaltered if no mirror;
+ * should do alphanumerics too, but I'm too lazy. <cshenton@it.hq.nasa.gov>
+ */
+
+static char
+xflip_symbol(char symbol)
+{
+	static const char lchars[] = "`'(){}[]\\/<>";
+	static const char rchars[] = "'`)(}{][/\\><";
+	int pos;
+
+	for (pos = 0; lchars[pos] != '\0'; pos++)
+		if (lchars[pos] == symbol)
+			return rchars[pos];
+
+	return symbol;
+}
 
 static void
-draw_daemon(int xpos, int ypos)
+draw_daemon(int xpos, int ypos, int dxdir)
 {
 	int x, y;
 	int attr;
@@ -112,29 +139,38 @@ draw_daemon(int xpos, int ypos)
 			case 'C': attr = (FG_CYAN|BG_BLACK)<<8; break;
 			default: attr = (FG_WHITE|BG_BLACK)<<8; break;
 			}
-			*((u_short *)(Crtat + (ypos + y)*cur_console->xsize 
-			    + xpos + x)) = scr_map[daemon_pic[y][x]]|attr;
+			if (dxdir < 0) {	/* Moving left */
+				CONSOLE_VECT(xpos + x, ypos + y) =
+					scr_map[daemon_pic[y][x]]|attr;
+			} else {		/* Moving right */
+				CONSOLE_VECT(xpos + DAEMON_MAX_WIDTH - x - 1, ypos + y) =
+					scr_map[xflip_symbol(daemon_pic[y][x])]|attr;
+			}
 		}
 }
 
+#ifndef DAEMON_ONLY
 static void
 draw_string(int xpos, int ypos, char *s, int len)
 {
 	int x;
 
 	for (x = 0; x < len; x++)
-		*((u_short*)(Crtat + ypos*cur_console->xsize + xpos + x)) =
+		CONSOLE_VECT(xpos + x, ypos) =
 			scr_map[s[x]]|(FG_LIGHTGREEN|BG_BLACK)<<8;
 }
+#endif
 
 static void
 daemon_saver(int blank)
 {
+#ifndef DAEMON_ONLY
 	static const char message[] = {"FreeBSD 3.0 CURRENT"};
-	static int dxpos = 0, dypos = 0;
-	static int dxdir = 1, dydir = 1;
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
+#endif
+	static int dxpos = 0, dypos = 0;
+	static int dxdir = 1, dydir = 1;
 	static int moved_daemon = 0;
 	scr_stat *scp = cur_console;
 
@@ -148,14 +184,13 @@ daemon_saver(int blank)
 
 		if (++moved_daemon) {
 			if (dxdir > 0) {
-				if (dxpos + 1 >= scp->xsize - DAEMON_MAX_WIDTH)
+				if (dxpos == scp->xsize - DAEMON_MAX_WIDTH)
 					dxdir = -1;
 			} else {
 				if (dxpos == 0) dxdir = 1;
 			}
 			if (dydir > 0) {
-				if (dypos + 1 >= scp->ysize - DAEMON_MAX_HEIGHT
-)
+				if (dypos == scp->ysize - DAEMON_MAX_HEIGHT)
 					dydir = -1;
 			} else {
 				if (dypos == 0) dydir = 1;
@@ -164,22 +199,26 @@ daemon_saver(int blank)
 			dxpos += dxdir; dypos += dydir;
 		}
 
+#ifndef DAEMON_ONLY
 		if (txdir > 0) {
-			if (txpos + 1 >= scp->xsize - sizeof(message)-1)
+			if (txpos == scp->xsize - sizeof(message)-1)
 				txdir = -1;
 		} else {
 			if (txpos == 0) txdir = 1;
 		}
 		if (tydir > 0) {
-			if (typos + 1 >= scp->ysize - 1)
+			if (typos == scp->ysize - 1)
 				tydir = -1;
 		} else {
 			if (typos == 0) tydir = 1;
 		}
 		txpos += txdir; typos += tydir;
+#endif
 
-		draw_daemon(dxpos, dypos);
+ 		draw_daemon(dxpos, dypos, dxdir);
+#ifndef DAEMON_ONLY
 		draw_string(txpos, typos, (char *)message, sizeof(message)-1);
+#endif
 	} else {
 		if (scrn_blanked) {
 			set_border(scp->border);
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index d189c593282e..fcdcbfa84eab 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 1997 Sandro Sigala, Brescia, Italy.
+ * Copyright (c) 1997 Chris Shenton
  * Copyright (c) 1995 S ren Schmidt
  * All rights reserved.
  *
@@ -24,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: daemon_saver.c,v 1.1 1997/05/21 14:18:27 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -44,10 +45,18 @@ MOD_MISC(daemon_saver);
 void (*current_saver)(int blank);
 void (*old_saver)(int blank);
 
+#define CONSOLE_VECT(x, y) \
+	*((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
+
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
-/* How is the author of this ASCII pic? */
+/*
+ * Define this to disable the bouncing text.
+ */
+#undef DAEMON_ONLY
+
+/* Who is the author of this ASCII pic? */
 
 static char *daemon_pic[] = {
         "             ,        ,",
@@ -95,9 +104,27 @@ static char *daemon_attr[] = {
 	NULL
 };
 
+/*
+ * Reverse a graphics character, or return unaltered if no mirror;
+ * should do alphanumerics too, but I'm too lazy. <cshenton@it.hq.nasa.gov>
+ */
+
+static char
+xflip_symbol(char symbol)
+{
+	static const char lchars[] = "`'(){}[]\\/<>";
+	static const char rchars[] = "'`)(}{][/\\><";
+	int pos;
+
+	for (pos = 0; lchars[pos] != '\0'; pos++)
+		if (lchars[pos] == symbol)
+			return rchars[pos];
+
+	return symbol;
+}
 
 static void
-draw_daemon(int xpos, int ypos)
+draw_daemon(int xpos, int ypos, int dxdir)
 {
 	int x, y;
 	int attr;
@@ -112,29 +139,38 @@ draw_daemon(int xpos, int ypos)
 			case 'C': attr = (FG_CYAN|BG_BLACK)<<8; break;
 			default: attr = (FG_WHITE|BG_BLACK)<<8; break;
 			}
-			*((u_short *)(Crtat + (ypos + y)*cur_console->xsize 
-			    + xpos + x)) = scr_map[daemon_pic[y][x]]|attr;
+			if (dxdir < 0) {	/* Moving left */
+				CONSOLE_VECT(xpos + x, ypos + y) =
+					scr_map[daemon_pic[y][x]]|attr;
+			} else {		/* Moving right */
+				CONSOLE_VECT(xpos + DAEMON_MAX_WIDTH - x - 1, ypos + y) =
+					scr_map[xflip_symbol(daemon_pic[y][x])]|attr;
+			}
 		}
 }
 
+#ifndef DAEMON_ONLY
 static void
 draw_string(int xpos, int ypos, char *s, int len)
 {
 	int x;
 
 	for (x = 0; x < len; x++)
-		*((u_short*)(Crtat + ypos*cur_console->xsize + xpos + x)) =
+		CONSOLE_VECT(xpos + x, ypos) =
 			scr_map[s[x]]|(FG_LIGHTGREEN|BG_BLACK)<<8;
 }
+#endif
 
 static void
 daemon_saver(int blank)
 {
+#ifndef DAEMON_ONLY
 	static const char message[] = {"FreeBSD 3.0 CURRENT"};
-	static int dxpos = 0, dypos = 0;
-	static int dxdir = 1, dydir = 1;
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
+#endif
+	static int dxpos = 0, dypos = 0;
+	static int dxdir = 1, dydir = 1;
 	static int moved_daemon = 0;
 	scr_stat *scp = cur_console;
 
@@ -148,14 +184,13 @@ daemon_saver(int blank)
 
 		if (++moved_daemon) {
 			if (dxdir > 0) {
-				if (dxpos + 1 >= scp->xsize - DAEMON_MAX_WIDTH)
+				if (dxpos == scp->xsize - DAEMON_MAX_WIDTH)
 					dxdir = -1;
 			} else {
 				if (dxpos == 0) dxdir = 1;
 			}
 			if (dydir > 0) {
-				if (dypos + 1 >= scp->ysize - DAEMON_MAX_HEIGHT
-)
+				if (dypos == scp->ysize - DAEMON_MAX_HEIGHT)
 					dydir = -1;
 			} else {
 				if (dypos == 0) dydir = 1;
@@ -164,22 +199,26 @@ daemon_saver(int blank)
 			dxpos += dxdir; dypos += dydir;
 		}
 
+#ifndef DAEMON_ONLY
 		if (txdir > 0) {
-			if (txpos + 1 >= scp->xsize - sizeof(message)-1)
+			if (txpos == scp->xsize - sizeof(message)-1)
 				txdir = -1;
 		} else {
 			if (txpos == 0) txdir = 1;
 		}
 		if (tydir > 0) {
-			if (typos + 1 >= scp->ysize - 1)
+			if (typos == scp->ysize - 1)
 				tydir = -1;
 		} else {
 			if (typos == 0) tydir = 1;
 		}
 		txpos += txdir; typos += tydir;
+#endif
 
-		draw_daemon(dxpos, dypos);
+ 		draw_daemon(dxpos, dypos, dxdir);
+#ifndef DAEMON_ONLY
 		draw_string(txpos, typos, (char *)message, sizeof(message)-1);
+#endif
 	} else {
 		if (scrn_blanked) {
 			set_border(scp->border);
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index d189c593282e..fcdcbfa84eab 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 1997 Sandro Sigala, Brescia, Italy.
+ * Copyright (c) 1997 Chris Shenton
  * Copyright (c) 1995 S ren Schmidt
  * All rights reserved.
  *
@@ -24,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: daemon_saver.c,v 1.1 1997/05/21 14:18:27 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -44,10 +45,18 @@ MOD_MISC(daemon_saver);
 void (*current_saver)(int blank);
 void (*old_saver)(int blank);
 
+#define CONSOLE_VECT(x, y) \
+	*((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
+
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
-/* How is the author of this ASCII pic? */
+/*
+ * Define this to disable the bouncing text.
+ */
+#undef DAEMON_ONLY
+
+/* Who is the author of this ASCII pic? */
 
 static char *daemon_pic[] = {
         "             ,        ,",
@@ -95,9 +104,27 @@ static char *daemon_attr[] = {
 	NULL
 };
 
+/*
+ * Reverse a graphics character, or return unaltered if no mirror;
+ * should do alphanumerics too, but I'm too lazy. <cshenton@it.hq.nasa.gov>
+ */
+
+static char
+xflip_symbol(char symbol)
+{
+	static const char lchars[] = "`'(){}[]\\/<>";
+	static const char rchars[] = "'`)(}{][/\\><";
+	int pos;
+
+	for (pos = 0; lchars[pos] != '\0'; pos++)
+		if (lchars[pos] == symbol)
+			return rchars[pos];
+
+	return symbol;
+}
 
 static void
-draw_daemon(int xpos, int ypos)
+draw_daemon(int xpos, int ypos, int dxdir)
 {
 	int x, y;
 	int attr;
@@ -112,29 +139,38 @@ draw_daemon(int xpos, int ypos)
 			case 'C': attr = (FG_CYAN|BG_BLACK)<<8; break;
 			default: attr = (FG_WHITE|BG_BLACK)<<8; break;
 			}
-			*((u_short *)(Crtat + (ypos + y)*cur_console->xsize 
-			    + xpos + x)) = scr_map[daemon_pic[y][x]]|attr;
+			if (dxdir < 0) {	/* Moving left */
+				CONSOLE_VECT(xpos + x, ypos + y) =
+					scr_map[daemon_pic[y][x]]|attr;
+			} else {		/* Moving right */
+				CONSOLE_VECT(xpos + DAEMON_MAX_WIDTH - x - 1, ypos + y) =
+					scr_map[xflip_symbol(daemon_pic[y][x])]|attr;
+			}
 		}
 }
 
+#ifndef DAEMON_ONLY
 static void
 draw_string(int xpos, int ypos, char *s, int len)
 {
 	int x;
 
 	for (x = 0; x < len; x++)
-		*((u_short*)(Crtat + ypos*cur_console->xsize + xpos + x)) =
+		CONSOLE_VECT(xpos + x, ypos) =
 			scr_map[s[x]]|(FG_LIGHTGREEN|BG_BLACK)<<8;
 }
+#endif
 
 static void
 daemon_saver(int blank)
 {
+#ifndef DAEMON_ONLY
 	static const char message[] = {"FreeBSD 3.0 CURRENT"};
-	static int dxpos = 0, dypos = 0;
-	static int dxdir = 1, dydir = 1;
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
+#endif
+	static int dxpos = 0, dypos = 0;
+	static int dxdir = 1, dydir = 1;
 	static int moved_daemon = 0;
 	scr_stat *scp = cur_console;
 
@@ -148,14 +184,13 @@ daemon_saver(int blank)
 
 		if (++moved_daemon) {
 			if (dxdir > 0) {
-				if (dxpos + 1 >= scp->xsize - DAEMON_MAX_WIDTH)
+				if (dxpos == scp->xsize - DAEMON_MAX_WIDTH)
 					dxdir = -1;
 			} else {
 				if (dxpos == 0) dxdir = 1;
 			}
 			if (dydir > 0) {
-				if (dypos + 1 >= scp->ysize - DAEMON_MAX_HEIGHT
-)
+				if (dypos == scp->ysize - DAEMON_MAX_HEIGHT)
 					dydir = -1;
 			} else {
 				if (dypos == 0) dydir = 1;
@@ -164,22 +199,26 @@ daemon_saver(int blank)
 			dxpos += dxdir; dypos += dydir;
 		}
 
+#ifndef DAEMON_ONLY
 		if (txdir > 0) {
-			if (txpos + 1 >= scp->xsize - sizeof(message)-1)
+			if (txpos == scp->xsize - sizeof(message)-1)
 				txdir = -1;
 		} else {
 			if (txpos == 0) txdir = 1;
 		}
 		if (tydir > 0) {
-			if (typos + 1 >= scp->ysize - 1)
+			if (typos == scp->ysize - 1)
 				tydir = -1;
 		} else {
 			if (typos == 0) tydir = 1;
 		}
 		txpos += txdir; typos += tydir;
+#endif
 
-		draw_daemon(dxpos, dypos);
+ 		draw_daemon(dxpos, dypos, dxdir);
+#ifndef DAEMON_ONLY
 		draw_string(txpos, typos, (char *)message, sizeof(message)-1);
+#endif
 	} else {
 		if (scrn_blanked) {
 			set_border(scp->border);
-- 
cgit v1.3


From 6b35fac151a519e037792d482d999f22c07292c7 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sun, 25 May 1997 16:06:29 +0000
Subject: Fixed up ssigala@globalnet.it's "Jumping Daemon" screen saver for <
 v3.0.

---
 lkm/syscons/daemon/daemon_saver.c         | 8 ++++----
 sys/dev/syscons/daemon/daemon_saver.c     | 8 ++++----
 sys/modules/syscons/daemon/daemon_saver.c | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/lkm/syscons/daemon/daemon_saver.c b/lkm/syscons/daemon/daemon_saver.c
index fcdcbfa84eab..cbc2705ebbb8 100644
--- a/lkm/syscons/daemon/daemon_saver.c
+++ b/lkm/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.1 1997/05/21 14:18:27 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.2 1997/05/24 01:44:39 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -165,7 +165,7 @@ static void
 daemon_saver(int blank)
 {
 #ifndef DAEMON_ONLY
-	static const char message[] = {"FreeBSD 3.0 CURRENT"};
+	static const char message[] = {"FreeBSD 2.2 STABLE"};
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
 #endif
@@ -249,6 +249,6 @@ daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
 int
 daemon_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
-	MOD_DISPATCH(daemon_saver, lkmtp, cmd, ver,
-		daemon_saver_load, daemon_saver_unload, lkm_nullcmd);
+	DISPATCH(lkmtp, cmd, ver, daemon_saver_load, daemon_saver_unload,
+		 lkm_nullcmd);
 }
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index fcdcbfa84eab..cbc2705ebbb8 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.1 1997/05/21 14:18:27 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.2 1997/05/24 01:44:39 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -165,7 +165,7 @@ static void
 daemon_saver(int blank)
 {
 #ifndef DAEMON_ONLY
-	static const char message[] = {"FreeBSD 3.0 CURRENT"};
+	static const char message[] = {"FreeBSD 2.2 STABLE"};
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
 #endif
@@ -249,6 +249,6 @@ daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
 int
 daemon_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
-	MOD_DISPATCH(daemon_saver, lkmtp, cmd, ver,
-		daemon_saver_load, daemon_saver_unload, lkm_nullcmd);
+	DISPATCH(lkmtp, cmd, ver, daemon_saver_load, daemon_saver_unload,
+		 lkm_nullcmd);
 }
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index fcdcbfa84eab..cbc2705ebbb8 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.1 1997/05/21 14:18:27 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.2 1997/05/24 01:44:39 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -165,7 +165,7 @@ static void
 daemon_saver(int blank)
 {
 #ifndef DAEMON_ONLY
-	static const char message[] = {"FreeBSD 3.0 CURRENT"};
+	static const char message[] = {"FreeBSD 2.2 STABLE"};
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
 #endif
@@ -249,6 +249,6 @@ daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
 int
 daemon_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
-	MOD_DISPATCH(daemon_saver, lkmtp, cmd, ver,
-		daemon_saver_load, daemon_saver_unload, lkm_nullcmd);
+	DISPATCH(lkmtp, cmd, ver, daemon_saver_load, daemon_saver_unload,
+		 lkm_nullcmd);
 }
-- 
cgit v1.3


From 8800a82c29275f87500c2c337dafbe6f07c3b249 Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Mon, 26 May 1997 01:02:41 +0000
Subject: Corrected accidental breakage in the last commit.

Pointed out by: Steve Passe, smp@csn.net
---
 lkm/syscons/daemon/daemon_saver.c         | 6 +++---
 sys/dev/syscons/daemon/daemon_saver.c     | 6 +++---
 sys/modules/syscons/daemon/daemon_saver.c | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/lkm/syscons/daemon/daemon_saver.c b/lkm/syscons/daemon/daemon_saver.c
index cbc2705ebbb8..921044c44689 100644
--- a/lkm/syscons/daemon/daemon_saver.c
+++ b/lkm/syscons/daemon/daemon_saver.c
@@ -165,7 +165,7 @@ static void
 daemon_saver(int blank)
 {
 #ifndef DAEMON_ONLY
-	static const char message[] = {"FreeBSD 2.2 STABLE"};
+	static const char message[] = {"FreeBSD 3.0 CURRENT"};
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
 #endif
@@ -249,6 +249,6 @@ daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
 int
 daemon_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
-	DISPATCH(lkmtp, cmd, ver, daemon_saver_load, daemon_saver_unload,
-		 lkm_nullcmd);
+	MOD_DISPATCH(daemon_saver, lkmtp, cmd, ver,
+		daemon_saver_load, daemon_saver_unload, lkm_nullcmd);
 }
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index cbc2705ebbb8..921044c44689 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -165,7 +165,7 @@ static void
 daemon_saver(int blank)
 {
 #ifndef DAEMON_ONLY
-	static const char message[] = {"FreeBSD 2.2 STABLE"};
+	static const char message[] = {"FreeBSD 3.0 CURRENT"};
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
 #endif
@@ -249,6 +249,6 @@ daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
 int
 daemon_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
-	DISPATCH(lkmtp, cmd, ver, daemon_saver_load, daemon_saver_unload,
-		 lkm_nullcmd);
+	MOD_DISPATCH(daemon_saver, lkmtp, cmd, ver,
+		daemon_saver_load, daemon_saver_unload, lkm_nullcmd);
 }
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index cbc2705ebbb8..921044c44689 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -165,7 +165,7 @@ static void
 daemon_saver(int blank)
 {
 #ifndef DAEMON_ONLY
-	static const char message[] = {"FreeBSD 2.2 STABLE"};
+	static const char message[] = {"FreeBSD 3.0 CURRENT"};
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
 #endif
@@ -249,6 +249,6 @@ daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
 int
 daemon_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
-	DISPATCH(lkmtp, cmd, ver, daemon_saver_load, daemon_saver_unload,
-		 lkm_nullcmd);
+	MOD_DISPATCH(daemon_saver, lkmtp, cmd, ver,
+		daemon_saver_load, daemon_saver_unload, lkm_nullcmd);
 }
-- 
cgit v1.3


From f4863d1a23a74635ad1c56a4d725e1bb062839a4 Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Tue, 24 Jun 1997 12:43:18 +0000
Subject: Take the OS release string from the kernel variable `osrelease'
 rather than hard-code it in the message text. Optinally include the host name
 in the message if SHOW_HOSTNAME is defined.

The origianl idea and sample code submitted by Angelo Turetta
<ATuretta@stylo.it>.
---
 lkm/syscons/daemon/Makefile               |  8 +++++++-
 lkm/syscons/daemon/daemon_saver.c         | 31 +++++++++++++++++++++++++++----
 sys/dev/syscons/daemon/daemon_saver.c     | 31 +++++++++++++++++++++++++++----
 sys/modules/syscons/daemon/Makefile       |  8 +++++++-
 sys/modules/syscons/daemon/daemon_saver.c | 31 +++++++++++++++++++++++++++----
 5 files changed, 95 insertions(+), 14 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/lkm/syscons/daemon/Makefile b/lkm/syscons/daemon/Makefile
index 57526c0b0c18..3c5a3205ded9 100644
--- a/lkm/syscons/daemon/Makefile
+++ b/lkm/syscons/daemon/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.1 1997/05/21 14:18:26 yokota Exp $
 
 KMOD=	daemon_saver_mod
 SRCS= 	daemon_saver.c
@@ -6,4 +6,10 @@ SRCS= 	daemon_saver.c
 NOMAN=
 CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
 
+# Omits the bouncing message text and shows only the daemon.
+#CFLAGS+= -DDAEMON_ONLY
+
+# Includes the host name in the message text.
+#CFLAGS+= -DSHOW_HOSTNAME
+
 .include <bsd.kmod.mk>
diff --git a/lkm/syscons/daemon/daemon_saver.c b/lkm/syscons/daemon/daemon_saver.c
index 921044c44689..232f41689369 100644
--- a/lkm/syscons/daemon/daemon_saver.c
+++ b/lkm/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.2 1997/05/24 01:44:39 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.4 1997/05/26 01:02:41 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -35,6 +35,9 @@
 #include <sys/sysent.h>
 #include <sys/lkm.h>
 #include <sys/errno.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
+#include <sys/malloc.h>
 
 #include <machine/md_var.h>
 
@@ -150,6 +153,9 @@ draw_daemon(int xpos, int ypos, int dxdir)
 }
 
 #ifndef DAEMON_ONLY
+static char *message;
+static int messagelen;
+
 static void
 draw_string(int xpos, int ypos, char *s, int len)
 {
@@ -165,7 +171,6 @@ static void
 daemon_saver(int blank)
 {
 #ifndef DAEMON_ONLY
-	static const char message[] = {"FreeBSD 3.0 CURRENT"};
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
 #endif
@@ -201,7 +206,7 @@ daemon_saver(int blank)
 
 #ifndef DAEMON_ONLY
 		if (txdir > 0) {
-			if (txpos == scp->xsize - sizeof(message)-1)
+			if (txpos == scp->xsize - messagelen)
 				txdir = -1;
 		} else {
 			if (txpos == 0) txdir = 1;
@@ -217,7 +222,7 @@ daemon_saver(int blank)
 
  		draw_daemon(dxpos, dypos, dxdir);
 #ifndef DAEMON_ONLY
-		draw_string(txpos, typos, (char *)message, sizeof(message)-1);
+		draw_string(txpos, typos, (char *)message, messagelen);
 #endif
 	} else {
 		if (scrn_blanked) {
@@ -232,9 +237,25 @@ daemon_saver(int blank)
 static int
 daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 {
+#ifdef SHOW_HOSTNAME
+	static const char *freebsd = " - FreeBSD ";
+#else
+	static const char *freebsd = "FreeBSD ";
+#endif /* SHOW_HOSTNAME */
+
 	(*current_saver)(0);
 	old_saver = current_saver;
 	current_saver = daemon_saver;
+
+#ifdef SHOW_HOSTNAME
+	messagelen = strlen(hostname) + strlen(freebsd) + strlen(osrelease);
+	message = malloc(messagelen + 1, M_DEVBUF, M_NOWAIT);
+	sprintf(message, "%s%s%s", hostname, freebsd, osrelease);
+#else
+	messagelen = strlen(freebsd) + strlen(osrelease);
+	message = malloc(messagelen + 1, M_DEVBUF, M_NOWAIT);
+	sprintf(message, "%s%s", freebsd, osrelease);
+#endif /* SHOW_HOSTNAME */
 	return 0;
 }
 
@@ -243,6 +264,8 @@ daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
 	current_saver = old_saver;
+
+	free(message, M_DEVBUF);
 	return 0;
 }
 
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 921044c44689..232f41689369 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.2 1997/05/24 01:44:39 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.4 1997/05/26 01:02:41 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -35,6 +35,9 @@
 #include <sys/sysent.h>
 #include <sys/lkm.h>
 #include <sys/errno.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
+#include <sys/malloc.h>
 
 #include <machine/md_var.h>
 
@@ -150,6 +153,9 @@ draw_daemon(int xpos, int ypos, int dxdir)
 }
 
 #ifndef DAEMON_ONLY
+static char *message;
+static int messagelen;
+
 static void
 draw_string(int xpos, int ypos, char *s, int len)
 {
@@ -165,7 +171,6 @@ static void
 daemon_saver(int blank)
 {
 #ifndef DAEMON_ONLY
-	static const char message[] = {"FreeBSD 3.0 CURRENT"};
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
 #endif
@@ -201,7 +206,7 @@ daemon_saver(int blank)
 
 #ifndef DAEMON_ONLY
 		if (txdir > 0) {
-			if (txpos == scp->xsize - sizeof(message)-1)
+			if (txpos == scp->xsize - messagelen)
 				txdir = -1;
 		} else {
 			if (txpos == 0) txdir = 1;
@@ -217,7 +222,7 @@ daemon_saver(int blank)
 
  		draw_daemon(dxpos, dypos, dxdir);
 #ifndef DAEMON_ONLY
-		draw_string(txpos, typos, (char *)message, sizeof(message)-1);
+		draw_string(txpos, typos, (char *)message, messagelen);
 #endif
 	} else {
 		if (scrn_blanked) {
@@ -232,9 +237,25 @@ daemon_saver(int blank)
 static int
 daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 {
+#ifdef SHOW_HOSTNAME
+	static const char *freebsd = " - FreeBSD ";
+#else
+	static const char *freebsd = "FreeBSD ";
+#endif /* SHOW_HOSTNAME */
+
 	(*current_saver)(0);
 	old_saver = current_saver;
 	current_saver = daemon_saver;
+
+#ifdef SHOW_HOSTNAME
+	messagelen = strlen(hostname) + strlen(freebsd) + strlen(osrelease);
+	message = malloc(messagelen + 1, M_DEVBUF, M_NOWAIT);
+	sprintf(message, "%s%s%s", hostname, freebsd, osrelease);
+#else
+	messagelen = strlen(freebsd) + strlen(osrelease);
+	message = malloc(messagelen + 1, M_DEVBUF, M_NOWAIT);
+	sprintf(message, "%s%s", freebsd, osrelease);
+#endif /* SHOW_HOSTNAME */
 	return 0;
 }
 
@@ -243,6 +264,8 @@ daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
 	current_saver = old_saver;
+
+	free(message, M_DEVBUF);
 	return 0;
 }
 
diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile
index 57526c0b0c18..3c5a3205ded9 100644
--- a/sys/modules/syscons/daemon/Makefile
+++ b/sys/modules/syscons/daemon/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.1 1997/05/21 14:18:26 yokota Exp $
 
 KMOD=	daemon_saver_mod
 SRCS= 	daemon_saver.c
@@ -6,4 +6,10 @@ SRCS= 	daemon_saver.c
 NOMAN=
 CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
 
+# Omits the bouncing message text and shows only the daemon.
+#CFLAGS+= -DDAEMON_ONLY
+
+# Includes the host name in the message text.
+#CFLAGS+= -DSHOW_HOSTNAME
+
 .include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index 921044c44689..232f41689369 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.2 1997/05/24 01:44:39 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.4 1997/05/26 01:02:41 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -35,6 +35,9 @@
 #include <sys/sysent.h>
 #include <sys/lkm.h>
 #include <sys/errno.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
+#include <sys/malloc.h>
 
 #include <machine/md_var.h>
 
@@ -150,6 +153,9 @@ draw_daemon(int xpos, int ypos, int dxdir)
 }
 
 #ifndef DAEMON_ONLY
+static char *message;
+static int messagelen;
+
 static void
 draw_string(int xpos, int ypos, char *s, int len)
 {
@@ -165,7 +171,6 @@ static void
 daemon_saver(int blank)
 {
 #ifndef DAEMON_ONLY
-	static const char message[] = {"FreeBSD 3.0 CURRENT"};
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
 #endif
@@ -201,7 +206,7 @@ daemon_saver(int blank)
 
 #ifndef DAEMON_ONLY
 		if (txdir > 0) {
-			if (txpos == scp->xsize - sizeof(message)-1)
+			if (txpos == scp->xsize - messagelen)
 				txdir = -1;
 		} else {
 			if (txpos == 0) txdir = 1;
@@ -217,7 +222,7 @@ daemon_saver(int blank)
 
  		draw_daemon(dxpos, dypos, dxdir);
 #ifndef DAEMON_ONLY
-		draw_string(txpos, typos, (char *)message, sizeof(message)-1);
+		draw_string(txpos, typos, (char *)message, messagelen);
 #endif
 	} else {
 		if (scrn_blanked) {
@@ -232,9 +237,25 @@ daemon_saver(int blank)
 static int
 daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 {
+#ifdef SHOW_HOSTNAME
+	static const char *freebsd = " - FreeBSD ";
+#else
+	static const char *freebsd = "FreeBSD ";
+#endif /* SHOW_HOSTNAME */
+
 	(*current_saver)(0);
 	old_saver = current_saver;
 	current_saver = daemon_saver;
+
+#ifdef SHOW_HOSTNAME
+	messagelen = strlen(hostname) + strlen(freebsd) + strlen(osrelease);
+	message = malloc(messagelen + 1, M_DEVBUF, M_NOWAIT);
+	sprintf(message, "%s%s%s", hostname, freebsd, osrelease);
+#else
+	messagelen = strlen(freebsd) + strlen(osrelease);
+	message = malloc(messagelen + 1, M_DEVBUF, M_NOWAIT);
+	sprintf(message, "%s%s", freebsd, osrelease);
+#endif /* SHOW_HOSTNAME */
 	return 0;
 }
 
@@ -243,6 +264,8 @@ daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
 	current_saver = old_saver;
+
+	free(message, M_DEVBUF);
 	return 0;
 }
 
-- 
cgit v1.3


From ce834215a70ff69e7e222827437116eee2f9ac6f Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Tue, 15 Jul 1997 14:49:39 +0000
Subject: Incorporated lots of fixes and suggestions from Bruce and changes to
 facilitate the new saver loading/unloading notification interface in syscons.

daemon_saver:
- M_NOWAIT was wrong, since NULL returns are not handled.  Just use
  M_WAITOK.
- use `ostype' instead of hard-coded "FreeBSD". Now there is no more
  hard-coded string! (But, who will run this screen saver on other
  OS?!)
- put macros and data declarations in a consistent order.
- -DDEAMON_ONLY and -DSHOW_HOSTNAME options added in the previous commit
  are removed. Options of this kind can go stale and no one notices
  because no one uses them. DEAMON_ONLY is just removed. SHOW_HOSTNAME
  is made default.

snake_saver:
- use `ostype' and `osrelease' as in the daemon saver. The string changes
  slightly - there was a hyphen after "FreeBSD"; now there is a space.
  (It is consistent with uname -a, like the daemon server already is.)

all screen savers:
- Use the new add_scrn_saver()/remove_scrn_saver() in syscons.c
  to declare loading/unloading of a screen saver. Removed reference
  to `current_saver' and the variable `old_saver' as they are not
  necessary anymore.
- The blank, fade and green screen savers manipulate VGA registers.
  Module loading should fail for non-VGA cards.
- `scrn_blanked' is consistently treated as a number/counter rather
  than boolean.
- Some savers touch `scp->start' and `scp->end' to force entire screen
  update when stopping themselves. This is unnecessary now because
  syscons.c takes care of that.
- cleared up many unused or unnecessary #include statements.
- Removed -DLKM from Makefiles.

YOU NEED TO RECOMPILE BOTH SCREEN SAVERS AND KERNEL AS OF THIS CHANGE.
---
 lkm/syscons/blank/Makefile                |  4 +-
 lkm/syscons/blank/blank_saver.c           | 21 ++++-----
 lkm/syscons/daemon/Makefile               | 10 +----
 lkm/syscons/daemon/daemon_saver.c         | 73 ++++++++++---------------------
 lkm/syscons/fade/Makefile                 |  4 +-
 lkm/syscons/fade/fade_saver.c             | 21 ++++-----
 lkm/syscons/green/Makefile                |  4 +-
 lkm/syscons/green/green_saver.c           | 21 ++++-----
 lkm/syscons/saver.h                       | 14 ++----
 lkm/syscons/snake/Makefile                |  4 +-
 lkm/syscons/snake/snake_saver.c           | 67 +++++++++++++++++-----------
 lkm/syscons/star/Makefile                 |  4 +-
 lkm/syscons/star/star_saver.c             | 25 +++--------
 sys/dev/syscons/blank/blank_saver.c       | 21 ++++-----
 sys/dev/syscons/daemon/daemon_saver.c     | 73 ++++++++++---------------------
 sys/dev/syscons/fade/fade_saver.c         | 21 ++++-----
 sys/dev/syscons/green/green_saver.c       | 21 ++++-----
 sys/dev/syscons/snake/snake_saver.c       | 67 +++++++++++++++++-----------
 sys/dev/syscons/star/star_saver.c         | 25 +++--------
 sys/modules/syscons/blank/Makefile        |  4 +-
 sys/modules/syscons/blank/blank_saver.c   | 21 ++++-----
 sys/modules/syscons/daemon/Makefile       | 10 +----
 sys/modules/syscons/daemon/daemon_saver.c | 73 ++++++++++---------------------
 sys/modules/syscons/fade/Makefile         |  4 +-
 sys/modules/syscons/fade/fade_saver.c     | 21 ++++-----
 sys/modules/syscons/green/Makefile        |  4 +-
 sys/modules/syscons/green/green_saver.c   | 21 ++++-----
 sys/modules/syscons/saver.h               | 14 ++----
 sys/modules/syscons/snake/Makefile        |  4 +-
 sys/modules/syscons/snake/snake_saver.c   | 67 +++++++++++++++++-----------
 sys/modules/syscons/star/Makefile         |  4 +-
 sys/modules/syscons/star/star_saver.c     | 25 +++--------
 32 files changed, 320 insertions(+), 452 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/lkm/syscons/blank/Makefile b/lkm/syscons/blank/Makefile
index 2c9491506a9f..d6a411e81118 100644
--- a/lkm/syscons/blank/Makefile
+++ b/lkm/syscons/blank/Makefile
@@ -1,9 +1,9 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1997/02/22 12:49:02 peter Exp $
 
 KMOD=	blank_saver_mod
 SRCS= 	blank_saver.c
 
 NOMAN=
-CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
 
 .include <bsd.kmod.mk>
diff --git a/lkm/syscons/blank/blank_saver.c b/lkm/syscons/blank/blank_saver.c
index d0194283b7e3..a534ab390d09 100644
--- a/lkm/syscons/blank/blank_saver.c
+++ b/lkm/syscons/blank/blank_saver.c
@@ -25,23 +25,21 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.8 1997/02/22 12:49:06 peter Exp $
+ *	$Id: blank_saver.c,v 1.9 1997/04/06 10:48:10 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+
+#include <i386/isa/isa.h>
+
 #include <saver.h>
 
 MOD_MISC(blank_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
-
 static void
 blank_saver(int blank)
 {
@@ -61,18 +59,15 @@ blank_saver(int blank)
 static int
 blank_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = blank_saver;
-	return 0;
+	if (!crtc_vga)
+		return EINVAL;
+	return add_scrn_saver(blank_saver);
 }
 
 static int
 blank_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	return remove_scrn_saver(blank_saver);
 }
 
 int
diff --git a/lkm/syscons/daemon/Makefile b/lkm/syscons/daemon/Makefile
index 3c5a3205ded9..25d2cfe0019d 100644
--- a/lkm/syscons/daemon/Makefile
+++ b/lkm/syscons/daemon/Makefile
@@ -1,15 +1,9 @@
-#	$Id: Makefile,v 1.1 1997/05/21 14:18:26 yokota Exp $
+#	$Id: Makefile,v 1.2 1997/06/24 12:43:18 yokota Exp $
 
 KMOD=	daemon_saver_mod
 SRCS= 	daemon_saver.c
 
 NOMAN=
-CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
-
-# Omits the bouncing message text and shows only the daemon.
-#CFLAGS+= -DDAEMON_ONLY
-
-# Includes the host name in the message text.
-#CFLAGS+= -DSHOW_HOSTNAME
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
 
 .include <bsd.kmod.mk>
diff --git a/lkm/syscons/daemon/daemon_saver.c b/lkm/syscons/daemon/daemon_saver.c
index 232f41689369..3325ad3a011d 100644
--- a/lkm/syscons/daemon/daemon_saver.c
+++ b/lkm/syscons/daemon/daemon_saver.c
@@ -25,28 +25,22 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.4 1997/05/26 01:02:41 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.5 1997/06/24 12:43:18 yokota Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+#include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <sys/malloc.h>
 
 #include <machine/md_var.h>
+#include <i386/include/pc/display.h>
 
-#include "saver.h"
-
-MOD_MISC(daemon_saver);
-
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
+#include <saver.h>
 
 #define CONSOLE_VECT(x, y) \
 	*((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
@@ -54,10 +48,10 @@ void (*old_saver)(int blank);
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
-/*
- * Define this to disable the bouncing text.
- */
-#undef DAEMON_ONLY
+MOD_MISC(daemon_saver);
+
+static char *message;
+static int messagelen;
 
 /* Who is the author of this ASCII pic? */
 
@@ -152,10 +146,6 @@ draw_daemon(int xpos, int ypos, int dxdir)
 		}
 }
 
-#ifndef DAEMON_ONLY
-static char *message;
-static int messagelen;
-
 static void
 draw_string(int xpos, int ypos, char *s, int len)
 {
@@ -165,15 +155,12 @@ draw_string(int xpos, int ypos, char *s, int len)
 		CONSOLE_VECT(xpos + x, ypos) =
 			scr_map[s[x]]|(FG_LIGHTGREEN|BG_BLACK)<<8;
 }
-#endif
 
 static void
 daemon_saver(int blank)
 {
-#ifndef DAEMON_ONLY
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
-#endif
 	static int dxpos = 0, dypos = 0;
 	static int dxdir = 1, dydir = 1;
 	static int moved_daemon = 0;
@@ -204,7 +191,6 @@ daemon_saver(int blank)
 			dxpos += dxdir; dypos += dydir;
 		}
 
-#ifndef DAEMON_ONLY
 		if (txdir > 0) {
 			if (txpos == scp->xsize - messagelen)
 				txdir = -1;
@@ -218,18 +204,13 @@ daemon_saver(int blank)
 			if (typos == 0) tydir = 1;
 		}
 		txpos += txdir; typos += tydir;
-#endif
 
  		draw_daemon(dxpos, dypos, dxdir);
-#ifndef DAEMON_ONLY
 		draw_string(txpos, typos, (char *)message, messagelen);
-#endif
 	} else {
-		if (scrn_blanked) {
+		if (scrn_blanked > 0) {
 			set_border(scp->border);
 			scrn_blanked = 0;
-			scp->start = 0;
-			scp->end = scp->xsize * scp->ysize;
 		}
 	}
 }
@@ -237,36 +218,28 @@ daemon_saver(int blank)
 static int
 daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-#ifdef SHOW_HOSTNAME
-	static const char *freebsd = " - FreeBSD ";
-#else
-	static const char *freebsd = "FreeBSD ";
-#endif /* SHOW_HOSTNAME */
+	int err;
 
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = daemon_saver;
+	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
+	    strlen(osrelease);
+	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
+	sprintf(message, "%s - %s %s", hostname, ostype, osrelease);
 
-#ifdef SHOW_HOSTNAME
-	messagelen = strlen(hostname) + strlen(freebsd) + strlen(osrelease);
-	message = malloc(messagelen + 1, M_DEVBUF, M_NOWAIT);
-	sprintf(message, "%s%s%s", hostname, freebsd, osrelease);
-#else
-	messagelen = strlen(freebsd) + strlen(osrelease);
-	message = malloc(messagelen + 1, M_DEVBUF, M_NOWAIT);
-	sprintf(message, "%s%s", freebsd, osrelease);
-#endif /* SHOW_HOSTNAME */
-	return 0;
+	err = add_scrn_saver(daemon_saver);
+	if (err != 0)
+		free(message, M_DEVBUF);
+	return err;
 }
 
 static int
 daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
+	int err;
 
-	free(message, M_DEVBUF);
-	return 0;
+	err = remove_scrn_saver(daemon_saver);
+	if (err == 0)
+		free(message, M_DEVBUF);
+	return err;
 }
 
 int
diff --git a/lkm/syscons/fade/Makefile b/lkm/syscons/fade/Makefile
index 15d5331db202..393912da1590 100644
--- a/lkm/syscons/fade/Makefile
+++ b/lkm/syscons/fade/Makefile
@@ -1,9 +1,9 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1997/02/22 12:49:09 peter Exp $
 
 KMOD=	fade_saver_mod
 SRCS= 	fade_saver.c
 
 NOMAN=
-CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
 
 .include <bsd.kmod.mk>
diff --git a/lkm/syscons/fade/fade_saver.c b/lkm/syscons/fade/fade_saver.c
index 4fda21cdd48e..d68bba93959f 100644
--- a/lkm/syscons/fade/fade_saver.c
+++ b/lkm/syscons/fade/fade_saver.c
@@ -25,23 +25,21 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.9 1997/02/22 12:49:10 peter Exp $
+ *	$Id: fade_saver.c,v 1.10 1997/04/06 10:48:18 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+
+#include <i386/isa/isa.h>
+
 #include <saver.h>
 
 MOD_MISC(fade_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
-
 static void
 fade_saver(int blank)
 {
@@ -76,18 +74,15 @@ fade_saver(int blank)
 static int
 fade_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = fade_saver;
-	return 0;
+	if (!crtc_vga)
+		return EINVAL;
+	return add_scrn_saver(fade_saver);
 }
 
 static int
 fade_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	return remove_scrn_saver(fade_saver);
 }
 
 int
diff --git a/lkm/syscons/green/Makefile b/lkm/syscons/green/Makefile
index e27e00c5a4f9..2943a06f79d3 100644
--- a/lkm/syscons/green/Makefile
+++ b/lkm/syscons/green/Makefile
@@ -1,9 +1,9 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1997/02/22 12:49:13 peter Exp $
 
 KMOD=	green_saver_mod
 SRCS= 	green_saver.c
 
 NOMAN=
-CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
 
 .include <bsd.kmod.mk>
diff --git a/lkm/syscons/green/green_saver.c b/lkm/syscons/green/green_saver.c
index c3c9a7ed93dd..0454753d6b0b 100644
--- a/lkm/syscons/green/green_saver.c
+++ b/lkm/syscons/green/green_saver.c
@@ -25,23 +25,21 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.8 1997/02/22 12:49:15 peter Exp $
+ *	$Id: green_saver.c,v 1.9 1997/04/06 10:49:13 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+
+#include <i386/isa/isa.h>
+
 #include <saver.h>
 
 MOD_MISC(green_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
-
 static void
 green_saver(int blank)
 {
@@ -65,18 +63,15 @@ green_saver(int blank)
 static int
 green_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = green_saver;
-	return 0;
+	if (!crtc_vga)
+		return EINVAL;
+	return add_scrn_saver(green_saver);
 }
 
 static int
 green_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	return remove_scrn_saver(green_saver);
 }
 
 int
diff --git a/lkm/syscons/saver.h b/lkm/syscons/saver.h
index 67ac358b22f1..7ba6c1192049 100644
--- a/lkm/syscons/saver.h
+++ b/lkm/syscons/saver.h
@@ -25,18 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: saver.h,v 1.7 1997/02/22 12:49:00 peter Exp $
+ *  $Id: saver.h,v 1.8 1997/05/21 14:18:00 yokota Exp $
  */
 
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/tty.h>
-#include <i386/include/pc/display.h>
-#include <i386/include/console.h>
-#include <i386/include/apm_bios.h>
-#include <i386/i386/cons.h>
-#include <i386/isa/isa.h>
-#include <i386/isa/isa_device.h>
+#include <machine/apm_bios.h>
+#include <machine/console.h>
+
 #include <i386/isa/syscons.h>
 
 extern scr_stat	*cur_console;
diff --git a/lkm/syscons/snake/Makefile b/lkm/syscons/snake/Makefile
index 38417aeb25fe..7288f2ca0afc 100644
--- a/lkm/syscons/snake/Makefile
+++ b/lkm/syscons/snake/Makefile
@@ -1,9 +1,9 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1997/02/22 12:49:18 peter Exp $
 
 KMOD=	snake_saver_mod
 SRCS= 	snake_saver.c
 
 NOMAN=
-CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
 
 .include <bsd.kmod.mk>
diff --git a/lkm/syscons/snake/snake_saver.c b/lkm/syscons/snake/snake_saver.c
index f0580ae2d325..c5a9842b4fda 100644
--- a/lkm/syscons/snake/snake_saver.c
+++ b/lkm/syscons/snake/snake_saver.c
@@ -25,47 +25,52 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.13 1997/02/22 12:49:19 peter Exp $
+ *	$Id: snake_saver.c,v 1.14 1997/04/06 10:49:22 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
 
 #include <machine/md_var.h>
+#include <i386/include/pc/display.h>
 
-#include "saver.h"
+#include <saver.h>
 
 MOD_MISC(snake_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
+static char	*message;
+static u_char	**messagep;
+static int	messagelen;
 
 static void
 snake_saver(int blank)
 {
-	const char	saves[] = {"FreeBSD-3.0-CURRENT"};
-	static u_char	*savs[sizeof(saves)-1];
 	static int	dirx, diry;
 	int		f;
 	scr_stat	*scp = cur_console;
 
+/* XXX hack for minimal changes. */
+#define	save	message
+#define	savs	messagep
+
 	if (blank) {
-		if (!scrn_blanked) {
+		if (scrn_blanked <= 0) {
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8 | scr_map[0x20],
 			      Crtat, scp->xsize * scp->ysize);
 			set_border(0);
 			dirx = (scp->xpos ? 1 : -1);
 			diry = (scp->ypos ?
 				scp->xsize : -scp->xsize);
-			for (f=0; f< sizeof(saves)-1; f++)
+			for (f=0; f< messagelen; f++)
 				savs[f] = (u_char *)Crtat + 2 *
 					  (scp->xpos+scp->ypos*scp->xsize);
-			*(savs[0]) = scr_map[*saves];
+			*(savs[0]) = scr_map[*save];
 			f = scp->ysize * scp->xsize + 5;
 			outb(crtc_addr, 14);
 			outb(crtc_addr+1, f >> 8);
@@ -76,8 +81,8 @@ snake_saver(int blank)
 		if (scrn_blanked++ < 4)
 			return;
 		scrn_blanked = 1;
-		*(savs[sizeof(saves)-2]) = scr_map[0x20];
-		for (f=sizeof(saves)-2; f > 0; f--)
+		*(savs[messagelen-1]) = scr_map[0x20];
+		for (f=messagelen-1; f > 0; f--)
 			savs[f] = savs[f-1];
 		f = (savs[0] - (u_char *)Crtat) / 2;
 		if ((f % scp->xsize) == 0 ||
@@ -89,15 +94,13 @@ snake_saver(int blank)
 		    (random() % 20) == 0)
 			diry = -diry;
 		savs[0] += 2*dirx + 2*diry;
-		for (f=sizeof(saves)-2; f>=0; f--)
-			*(savs[f]) = scr_map[saves[f]];
+		for (f=messagelen-1; f>=0; f--)
+			*(savs[f]) = scr_map[save[f]];
 	}
 	else {
-		if (scrn_blanked) {
+		if (scrn_blanked > 0) {
 			set_border(scp->border);
 			scrn_blanked = 0;
-			scp->start = 0;
-			scp->end = scp->xsize * scp->ysize;
 		}
 	}
 }
@@ -105,18 +108,32 @@ snake_saver(int blank)
 static int
 snake_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = snake_saver;
-	return 0;
+	int err;
+
+	messagelen = strlen(ostype) + 1 + strlen(osrelease);
+	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
+	sprintf(message, "%s %s", ostype, osrelease);
+	messagep = malloc(messagelen * sizeof *messagep, M_DEVBUF, M_WAITOK);
+
+	err = add_scrn_saver(snake_saver);
+	if (err != 0) {
+		free(message, M_DEVBUF);
+		free(messagep, M_DEVBUF);
+	}
+	return err;
 }
 
 static int
 snake_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	int err;
+
+	err = remove_scrn_saver(snake_saver);
+	if (err == 0) {
+		free(message, M_DEVBUF);
+		free(messagep, M_DEVBUF);
+	}
+	return err;
 }
 
 int
diff --git a/lkm/syscons/star/Makefile b/lkm/syscons/star/Makefile
index 39aa7dd4b9b8..aa3ed6aeb96a 100644
--- a/lkm/syscons/star/Makefile
+++ b/lkm/syscons/star/Makefile
@@ -1,9 +1,9 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1997/02/22 12:49:21 peter Exp $
 
 KMOD=	star_saver_mod
 SRCS= 	star_saver.c
 
 NOMAN=
-CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
 
 .include <bsd.kmod.mk>
diff --git a/lkm/syscons/star/star_saver.c b/lkm/syscons/star/star_saver.c
index 465c493a3dcf..d025b16afdba 100644
--- a/lkm/syscons/star/star_saver.c
+++ b/lkm/syscons/star/star_saver.c
@@ -25,26 +25,22 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.10 1997/02/22 12:49:22 peter Exp $
+ *	$Id: star_saver.c,v 1.11 1997/04/06 11:07:01 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
 
 #include <machine/md_var.h>
+#include <i386/include/pc/display.h>
 
-#include "saver.h"
+#include <saver.h>
 
 MOD_MISC(star_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
-
 #define NUM_STARS	50
 
 /*
@@ -62,7 +58,7 @@ star_saver(int blank)
 	static u_short 	stars[NUM_STARS][2];
 
 	if (blank) {
-		if (!scrn_blanked) {
+		if (scrn_blanked <= 0) {
 			scrn_blanked = 1;
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat,
 			      scp->xsize * scp->ysize);
@@ -83,11 +79,9 @@ star_saver(int blank)
 		}
 	}
 	else {
-		if (scrn_blanked) {
+		if (scrn_blanked > 0) {
 			set_border(scp->border);
 			scrn_blanked = 0;
-			scp->start = 0;
-			scp->end = scp->xsize * scp->ysize;
 		}
 	}
 }
@@ -95,18 +89,13 @@ star_saver(int blank)
 static int
 star_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = star_saver;
-	return 0;
+	return add_scrn_saver(star_saver);
 }
 
 static int
 star_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	return remove_scrn_saver(star_saver);
 }
 
 int
diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index d0194283b7e3..a534ab390d09 100644
--- a/sys/dev/syscons/blank/blank_saver.c
+++ b/sys/dev/syscons/blank/blank_saver.c
@@ -25,23 +25,21 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.8 1997/02/22 12:49:06 peter Exp $
+ *	$Id: blank_saver.c,v 1.9 1997/04/06 10:48:10 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+
+#include <i386/isa/isa.h>
+
 #include <saver.h>
 
 MOD_MISC(blank_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
-
 static void
 blank_saver(int blank)
 {
@@ -61,18 +59,15 @@ blank_saver(int blank)
 static int
 blank_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = blank_saver;
-	return 0;
+	if (!crtc_vga)
+		return EINVAL;
+	return add_scrn_saver(blank_saver);
 }
 
 static int
 blank_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	return remove_scrn_saver(blank_saver);
 }
 
 int
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 232f41689369..3325ad3a011d 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,28 +25,22 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.4 1997/05/26 01:02:41 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.5 1997/06/24 12:43:18 yokota Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+#include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <sys/malloc.h>
 
 #include <machine/md_var.h>
+#include <i386/include/pc/display.h>
 
-#include "saver.h"
-
-MOD_MISC(daemon_saver);
-
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
+#include <saver.h>
 
 #define CONSOLE_VECT(x, y) \
 	*((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
@@ -54,10 +48,10 @@ void (*old_saver)(int blank);
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
-/*
- * Define this to disable the bouncing text.
- */
-#undef DAEMON_ONLY
+MOD_MISC(daemon_saver);
+
+static char *message;
+static int messagelen;
 
 /* Who is the author of this ASCII pic? */
 
@@ -152,10 +146,6 @@ draw_daemon(int xpos, int ypos, int dxdir)
 		}
 }
 
-#ifndef DAEMON_ONLY
-static char *message;
-static int messagelen;
-
 static void
 draw_string(int xpos, int ypos, char *s, int len)
 {
@@ -165,15 +155,12 @@ draw_string(int xpos, int ypos, char *s, int len)
 		CONSOLE_VECT(xpos + x, ypos) =
 			scr_map[s[x]]|(FG_LIGHTGREEN|BG_BLACK)<<8;
 }
-#endif
 
 static void
 daemon_saver(int blank)
 {
-#ifndef DAEMON_ONLY
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
-#endif
 	static int dxpos = 0, dypos = 0;
 	static int dxdir = 1, dydir = 1;
 	static int moved_daemon = 0;
@@ -204,7 +191,6 @@ daemon_saver(int blank)
 			dxpos += dxdir; dypos += dydir;
 		}
 
-#ifndef DAEMON_ONLY
 		if (txdir > 0) {
 			if (txpos == scp->xsize - messagelen)
 				txdir = -1;
@@ -218,18 +204,13 @@ daemon_saver(int blank)
 			if (typos == 0) tydir = 1;
 		}
 		txpos += txdir; typos += tydir;
-#endif
 
  		draw_daemon(dxpos, dypos, dxdir);
-#ifndef DAEMON_ONLY
 		draw_string(txpos, typos, (char *)message, messagelen);
-#endif
 	} else {
-		if (scrn_blanked) {
+		if (scrn_blanked > 0) {
 			set_border(scp->border);
 			scrn_blanked = 0;
-			scp->start = 0;
-			scp->end = scp->xsize * scp->ysize;
 		}
 	}
 }
@@ -237,36 +218,28 @@ daemon_saver(int blank)
 static int
 daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-#ifdef SHOW_HOSTNAME
-	static const char *freebsd = " - FreeBSD ";
-#else
-	static const char *freebsd = "FreeBSD ";
-#endif /* SHOW_HOSTNAME */
+	int err;
 
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = daemon_saver;
+	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
+	    strlen(osrelease);
+	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
+	sprintf(message, "%s - %s %s", hostname, ostype, osrelease);
 
-#ifdef SHOW_HOSTNAME
-	messagelen = strlen(hostname) + strlen(freebsd) + strlen(osrelease);
-	message = malloc(messagelen + 1, M_DEVBUF, M_NOWAIT);
-	sprintf(message, "%s%s%s", hostname, freebsd, osrelease);
-#else
-	messagelen = strlen(freebsd) + strlen(osrelease);
-	message = malloc(messagelen + 1, M_DEVBUF, M_NOWAIT);
-	sprintf(message, "%s%s", freebsd, osrelease);
-#endif /* SHOW_HOSTNAME */
-	return 0;
+	err = add_scrn_saver(daemon_saver);
+	if (err != 0)
+		free(message, M_DEVBUF);
+	return err;
 }
 
 static int
 daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
+	int err;
 
-	free(message, M_DEVBUF);
-	return 0;
+	err = remove_scrn_saver(daemon_saver);
+	if (err == 0)
+		free(message, M_DEVBUF);
+	return err;
 }
 
 int
diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index 4fda21cdd48e..d68bba93959f 100644
--- a/sys/dev/syscons/fade/fade_saver.c
+++ b/sys/dev/syscons/fade/fade_saver.c
@@ -25,23 +25,21 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.9 1997/02/22 12:49:10 peter Exp $
+ *	$Id: fade_saver.c,v 1.10 1997/04/06 10:48:18 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+
+#include <i386/isa/isa.h>
+
 #include <saver.h>
 
 MOD_MISC(fade_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
-
 static void
 fade_saver(int blank)
 {
@@ -76,18 +74,15 @@ fade_saver(int blank)
 static int
 fade_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = fade_saver;
-	return 0;
+	if (!crtc_vga)
+		return EINVAL;
+	return add_scrn_saver(fade_saver);
 }
 
 static int
 fade_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	return remove_scrn_saver(fade_saver);
 }
 
 int
diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index c3c9a7ed93dd..0454753d6b0b 100644
--- a/sys/dev/syscons/green/green_saver.c
+++ b/sys/dev/syscons/green/green_saver.c
@@ -25,23 +25,21 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.8 1997/02/22 12:49:15 peter Exp $
+ *	$Id: green_saver.c,v 1.9 1997/04/06 10:49:13 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+
+#include <i386/isa/isa.h>
+
 #include <saver.h>
 
 MOD_MISC(green_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
-
 static void
 green_saver(int blank)
 {
@@ -65,18 +63,15 @@ green_saver(int blank)
 static int
 green_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = green_saver;
-	return 0;
+	if (!crtc_vga)
+		return EINVAL;
+	return add_scrn_saver(green_saver);
 }
 
 static int
 green_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	return remove_scrn_saver(green_saver);
 }
 
 int
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index f0580ae2d325..c5a9842b4fda 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -25,47 +25,52 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.13 1997/02/22 12:49:19 peter Exp $
+ *	$Id: snake_saver.c,v 1.14 1997/04/06 10:49:22 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
 
 #include <machine/md_var.h>
+#include <i386/include/pc/display.h>
 
-#include "saver.h"
+#include <saver.h>
 
 MOD_MISC(snake_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
+static char	*message;
+static u_char	**messagep;
+static int	messagelen;
 
 static void
 snake_saver(int blank)
 {
-	const char	saves[] = {"FreeBSD-3.0-CURRENT"};
-	static u_char	*savs[sizeof(saves)-1];
 	static int	dirx, diry;
 	int		f;
 	scr_stat	*scp = cur_console;
 
+/* XXX hack for minimal changes. */
+#define	save	message
+#define	savs	messagep
+
 	if (blank) {
-		if (!scrn_blanked) {
+		if (scrn_blanked <= 0) {
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8 | scr_map[0x20],
 			      Crtat, scp->xsize * scp->ysize);
 			set_border(0);
 			dirx = (scp->xpos ? 1 : -1);
 			diry = (scp->ypos ?
 				scp->xsize : -scp->xsize);
-			for (f=0; f< sizeof(saves)-1; f++)
+			for (f=0; f< messagelen; f++)
 				savs[f] = (u_char *)Crtat + 2 *
 					  (scp->xpos+scp->ypos*scp->xsize);
-			*(savs[0]) = scr_map[*saves];
+			*(savs[0]) = scr_map[*save];
 			f = scp->ysize * scp->xsize + 5;
 			outb(crtc_addr, 14);
 			outb(crtc_addr+1, f >> 8);
@@ -76,8 +81,8 @@ snake_saver(int blank)
 		if (scrn_blanked++ < 4)
 			return;
 		scrn_blanked = 1;
-		*(savs[sizeof(saves)-2]) = scr_map[0x20];
-		for (f=sizeof(saves)-2; f > 0; f--)
+		*(savs[messagelen-1]) = scr_map[0x20];
+		for (f=messagelen-1; f > 0; f--)
 			savs[f] = savs[f-1];
 		f = (savs[0] - (u_char *)Crtat) / 2;
 		if ((f % scp->xsize) == 0 ||
@@ -89,15 +94,13 @@ snake_saver(int blank)
 		    (random() % 20) == 0)
 			diry = -diry;
 		savs[0] += 2*dirx + 2*diry;
-		for (f=sizeof(saves)-2; f>=0; f--)
-			*(savs[f]) = scr_map[saves[f]];
+		for (f=messagelen-1; f>=0; f--)
+			*(savs[f]) = scr_map[save[f]];
 	}
 	else {
-		if (scrn_blanked) {
+		if (scrn_blanked > 0) {
 			set_border(scp->border);
 			scrn_blanked = 0;
-			scp->start = 0;
-			scp->end = scp->xsize * scp->ysize;
 		}
 	}
 }
@@ -105,18 +108,32 @@ snake_saver(int blank)
 static int
 snake_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = snake_saver;
-	return 0;
+	int err;
+
+	messagelen = strlen(ostype) + 1 + strlen(osrelease);
+	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
+	sprintf(message, "%s %s", ostype, osrelease);
+	messagep = malloc(messagelen * sizeof *messagep, M_DEVBUF, M_WAITOK);
+
+	err = add_scrn_saver(snake_saver);
+	if (err != 0) {
+		free(message, M_DEVBUF);
+		free(messagep, M_DEVBUF);
+	}
+	return err;
 }
 
 static int
 snake_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	int err;
+
+	err = remove_scrn_saver(snake_saver);
+	if (err == 0) {
+		free(message, M_DEVBUF);
+		free(messagep, M_DEVBUF);
+	}
+	return err;
 }
 
 int
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 465c493a3dcf..d025b16afdba 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -25,26 +25,22 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.10 1997/02/22 12:49:22 peter Exp $
+ *	$Id: star_saver.c,v 1.11 1997/04/06 11:07:01 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
 
 #include <machine/md_var.h>
+#include <i386/include/pc/display.h>
 
-#include "saver.h"
+#include <saver.h>
 
 MOD_MISC(star_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
-
 #define NUM_STARS	50
 
 /*
@@ -62,7 +58,7 @@ star_saver(int blank)
 	static u_short 	stars[NUM_STARS][2];
 
 	if (blank) {
-		if (!scrn_blanked) {
+		if (scrn_blanked <= 0) {
 			scrn_blanked = 1;
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat,
 			      scp->xsize * scp->ysize);
@@ -83,11 +79,9 @@ star_saver(int blank)
 		}
 	}
 	else {
-		if (scrn_blanked) {
+		if (scrn_blanked > 0) {
 			set_border(scp->border);
 			scrn_blanked = 0;
-			scp->start = 0;
-			scp->end = scp->xsize * scp->ysize;
 		}
 	}
 }
@@ -95,18 +89,13 @@ star_saver(int blank)
 static int
 star_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = star_saver;
-	return 0;
+	return add_scrn_saver(star_saver);
 }
 
 static int
 star_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	return remove_scrn_saver(star_saver);
 }
 
 int
diff --git a/sys/modules/syscons/blank/Makefile b/sys/modules/syscons/blank/Makefile
index 2c9491506a9f..d6a411e81118 100644
--- a/sys/modules/syscons/blank/Makefile
+++ b/sys/modules/syscons/blank/Makefile
@@ -1,9 +1,9 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1997/02/22 12:49:02 peter Exp $
 
 KMOD=	blank_saver_mod
 SRCS= 	blank_saver.c
 
 NOMAN=
-CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/blank/blank_saver.c b/sys/modules/syscons/blank/blank_saver.c
index d0194283b7e3..a534ab390d09 100644
--- a/sys/modules/syscons/blank/blank_saver.c
+++ b/sys/modules/syscons/blank/blank_saver.c
@@ -25,23 +25,21 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.8 1997/02/22 12:49:06 peter Exp $
+ *	$Id: blank_saver.c,v 1.9 1997/04/06 10:48:10 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+
+#include <i386/isa/isa.h>
+
 #include <saver.h>
 
 MOD_MISC(blank_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
-
 static void
 blank_saver(int blank)
 {
@@ -61,18 +59,15 @@ blank_saver(int blank)
 static int
 blank_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = blank_saver;
-	return 0;
+	if (!crtc_vga)
+		return EINVAL;
+	return add_scrn_saver(blank_saver);
 }
 
 static int
 blank_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	return remove_scrn_saver(blank_saver);
 }
 
 int
diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile
index 3c5a3205ded9..25d2cfe0019d 100644
--- a/sys/modules/syscons/daemon/Makefile
+++ b/sys/modules/syscons/daemon/Makefile
@@ -1,15 +1,9 @@
-#	$Id: Makefile,v 1.1 1997/05/21 14:18:26 yokota Exp $
+#	$Id: Makefile,v 1.2 1997/06/24 12:43:18 yokota Exp $
 
 KMOD=	daemon_saver_mod
 SRCS= 	daemon_saver.c
 
 NOMAN=
-CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
-
-# Omits the bouncing message text and shows only the daemon.
-#CFLAGS+= -DDAEMON_ONLY
-
-# Includes the host name in the message text.
-#CFLAGS+= -DSHOW_HOSTNAME
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index 232f41689369..3325ad3a011d 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,28 +25,22 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.4 1997/05/26 01:02:41 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.5 1997/06/24 12:43:18 yokota Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+#include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <sys/malloc.h>
 
 #include <machine/md_var.h>
+#include <i386/include/pc/display.h>
 
-#include "saver.h"
-
-MOD_MISC(daemon_saver);
-
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
+#include <saver.h>
 
 #define CONSOLE_VECT(x, y) \
 	*((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
@@ -54,10 +48,10 @@ void (*old_saver)(int blank);
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
-/*
- * Define this to disable the bouncing text.
- */
-#undef DAEMON_ONLY
+MOD_MISC(daemon_saver);
+
+static char *message;
+static int messagelen;
 
 /* Who is the author of this ASCII pic? */
 
@@ -152,10 +146,6 @@ draw_daemon(int xpos, int ypos, int dxdir)
 		}
 }
 
-#ifndef DAEMON_ONLY
-static char *message;
-static int messagelen;
-
 static void
 draw_string(int xpos, int ypos, char *s, int len)
 {
@@ -165,15 +155,12 @@ draw_string(int xpos, int ypos, char *s, int len)
 		CONSOLE_VECT(xpos + x, ypos) =
 			scr_map[s[x]]|(FG_LIGHTGREEN|BG_BLACK)<<8;
 }
-#endif
 
 static void
 daemon_saver(int blank)
 {
-#ifndef DAEMON_ONLY
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
-#endif
 	static int dxpos = 0, dypos = 0;
 	static int dxdir = 1, dydir = 1;
 	static int moved_daemon = 0;
@@ -204,7 +191,6 @@ daemon_saver(int blank)
 			dxpos += dxdir; dypos += dydir;
 		}
 
-#ifndef DAEMON_ONLY
 		if (txdir > 0) {
 			if (txpos == scp->xsize - messagelen)
 				txdir = -1;
@@ -218,18 +204,13 @@ daemon_saver(int blank)
 			if (typos == 0) tydir = 1;
 		}
 		txpos += txdir; typos += tydir;
-#endif
 
  		draw_daemon(dxpos, dypos, dxdir);
-#ifndef DAEMON_ONLY
 		draw_string(txpos, typos, (char *)message, messagelen);
-#endif
 	} else {
-		if (scrn_blanked) {
+		if (scrn_blanked > 0) {
 			set_border(scp->border);
 			scrn_blanked = 0;
-			scp->start = 0;
-			scp->end = scp->xsize * scp->ysize;
 		}
 	}
 }
@@ -237,36 +218,28 @@ daemon_saver(int blank)
 static int
 daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-#ifdef SHOW_HOSTNAME
-	static const char *freebsd = " - FreeBSD ";
-#else
-	static const char *freebsd = "FreeBSD ";
-#endif /* SHOW_HOSTNAME */
+	int err;
 
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = daemon_saver;
+	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
+	    strlen(osrelease);
+	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
+	sprintf(message, "%s - %s %s", hostname, ostype, osrelease);
 
-#ifdef SHOW_HOSTNAME
-	messagelen = strlen(hostname) + strlen(freebsd) + strlen(osrelease);
-	message = malloc(messagelen + 1, M_DEVBUF, M_NOWAIT);
-	sprintf(message, "%s%s%s", hostname, freebsd, osrelease);
-#else
-	messagelen = strlen(freebsd) + strlen(osrelease);
-	message = malloc(messagelen + 1, M_DEVBUF, M_NOWAIT);
-	sprintf(message, "%s%s", freebsd, osrelease);
-#endif /* SHOW_HOSTNAME */
-	return 0;
+	err = add_scrn_saver(daemon_saver);
+	if (err != 0)
+		free(message, M_DEVBUF);
+	return err;
 }
 
 static int
 daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
+	int err;
 
-	free(message, M_DEVBUF);
-	return 0;
+	err = remove_scrn_saver(daemon_saver);
+	if (err == 0)
+		free(message, M_DEVBUF);
+	return err;
 }
 
 int
diff --git a/sys/modules/syscons/fade/Makefile b/sys/modules/syscons/fade/Makefile
index 15d5331db202..393912da1590 100644
--- a/sys/modules/syscons/fade/Makefile
+++ b/sys/modules/syscons/fade/Makefile
@@ -1,9 +1,9 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1997/02/22 12:49:09 peter Exp $
 
 KMOD=	fade_saver_mod
 SRCS= 	fade_saver.c
 
 NOMAN=
-CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/fade/fade_saver.c b/sys/modules/syscons/fade/fade_saver.c
index 4fda21cdd48e..d68bba93959f 100644
--- a/sys/modules/syscons/fade/fade_saver.c
+++ b/sys/modules/syscons/fade/fade_saver.c
@@ -25,23 +25,21 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.9 1997/02/22 12:49:10 peter Exp $
+ *	$Id: fade_saver.c,v 1.10 1997/04/06 10:48:18 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+
+#include <i386/isa/isa.h>
+
 #include <saver.h>
 
 MOD_MISC(fade_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
-
 static void
 fade_saver(int blank)
 {
@@ -76,18 +74,15 @@ fade_saver(int blank)
 static int
 fade_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = fade_saver;
-	return 0;
+	if (!crtc_vga)
+		return EINVAL;
+	return add_scrn_saver(fade_saver);
 }
 
 static int
 fade_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	return remove_scrn_saver(fade_saver);
 }
 
 int
diff --git a/sys/modules/syscons/green/Makefile b/sys/modules/syscons/green/Makefile
index e27e00c5a4f9..2943a06f79d3 100644
--- a/sys/modules/syscons/green/Makefile
+++ b/sys/modules/syscons/green/Makefile
@@ -1,9 +1,9 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1997/02/22 12:49:13 peter Exp $
 
 KMOD=	green_saver_mod
 SRCS= 	green_saver.c
 
 NOMAN=
-CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/green/green_saver.c b/sys/modules/syscons/green/green_saver.c
index c3c9a7ed93dd..0454753d6b0b 100644
--- a/sys/modules/syscons/green/green_saver.c
+++ b/sys/modules/syscons/green/green_saver.c
@@ -25,23 +25,21 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.8 1997/02/22 12:49:15 peter Exp $
+ *	$Id: green_saver.c,v 1.9 1997/04/06 10:49:13 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+
+#include <i386/isa/isa.h>
+
 #include <saver.h>
 
 MOD_MISC(green_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
-
 static void
 green_saver(int blank)
 {
@@ -65,18 +63,15 @@ green_saver(int blank)
 static int
 green_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = green_saver;
-	return 0;
+	if (!crtc_vga)
+		return EINVAL;
+	return add_scrn_saver(green_saver);
 }
 
 static int
 green_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	return remove_scrn_saver(green_saver);
 }
 
 int
diff --git a/sys/modules/syscons/saver.h b/sys/modules/syscons/saver.h
index 67ac358b22f1..7ba6c1192049 100644
--- a/sys/modules/syscons/saver.h
+++ b/sys/modules/syscons/saver.h
@@ -25,18 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: saver.h,v 1.7 1997/02/22 12:49:00 peter Exp $
+ *  $Id: saver.h,v 1.8 1997/05/21 14:18:00 yokota Exp $
  */
 
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/tty.h>
-#include <i386/include/pc/display.h>
-#include <i386/include/console.h>
-#include <i386/include/apm_bios.h>
-#include <i386/i386/cons.h>
-#include <i386/isa/isa.h>
-#include <i386/isa/isa_device.h>
+#include <machine/apm_bios.h>
+#include <machine/console.h>
+
 #include <i386/isa/syscons.h>
 
 extern scr_stat	*cur_console;
diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile
index 38417aeb25fe..7288f2ca0afc 100644
--- a/sys/modules/syscons/snake/Makefile
+++ b/sys/modules/syscons/snake/Makefile
@@ -1,9 +1,9 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1997/02/22 12:49:18 peter Exp $
 
 KMOD=	snake_saver_mod
 SRCS= 	snake_saver.c
 
 NOMAN=
-CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index f0580ae2d325..c5a9842b4fda 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -25,47 +25,52 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.13 1997/02/22 12:49:19 peter Exp $
+ *	$Id: snake_saver.c,v 1.14 1997/04/06 10:49:22 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
 
 #include <machine/md_var.h>
+#include <i386/include/pc/display.h>
 
-#include "saver.h"
+#include <saver.h>
 
 MOD_MISC(snake_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
+static char	*message;
+static u_char	**messagep;
+static int	messagelen;
 
 static void
 snake_saver(int blank)
 {
-	const char	saves[] = {"FreeBSD-3.0-CURRENT"};
-	static u_char	*savs[sizeof(saves)-1];
 	static int	dirx, diry;
 	int		f;
 	scr_stat	*scp = cur_console;
 
+/* XXX hack for minimal changes. */
+#define	save	message
+#define	savs	messagep
+
 	if (blank) {
-		if (!scrn_blanked) {
+		if (scrn_blanked <= 0) {
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8 | scr_map[0x20],
 			      Crtat, scp->xsize * scp->ysize);
 			set_border(0);
 			dirx = (scp->xpos ? 1 : -1);
 			diry = (scp->ypos ?
 				scp->xsize : -scp->xsize);
-			for (f=0; f< sizeof(saves)-1; f++)
+			for (f=0; f< messagelen; f++)
 				savs[f] = (u_char *)Crtat + 2 *
 					  (scp->xpos+scp->ypos*scp->xsize);
-			*(savs[0]) = scr_map[*saves];
+			*(savs[0]) = scr_map[*save];
 			f = scp->ysize * scp->xsize + 5;
 			outb(crtc_addr, 14);
 			outb(crtc_addr+1, f >> 8);
@@ -76,8 +81,8 @@ snake_saver(int blank)
 		if (scrn_blanked++ < 4)
 			return;
 		scrn_blanked = 1;
-		*(savs[sizeof(saves)-2]) = scr_map[0x20];
-		for (f=sizeof(saves)-2; f > 0; f--)
+		*(savs[messagelen-1]) = scr_map[0x20];
+		for (f=messagelen-1; f > 0; f--)
 			savs[f] = savs[f-1];
 		f = (savs[0] - (u_char *)Crtat) / 2;
 		if ((f % scp->xsize) == 0 ||
@@ -89,15 +94,13 @@ snake_saver(int blank)
 		    (random() % 20) == 0)
 			diry = -diry;
 		savs[0] += 2*dirx + 2*diry;
-		for (f=sizeof(saves)-2; f>=0; f--)
-			*(savs[f]) = scr_map[saves[f]];
+		for (f=messagelen-1; f>=0; f--)
+			*(savs[f]) = scr_map[save[f]];
 	}
 	else {
-		if (scrn_blanked) {
+		if (scrn_blanked > 0) {
 			set_border(scp->border);
 			scrn_blanked = 0;
-			scp->start = 0;
-			scp->end = scp->xsize * scp->ysize;
 		}
 	}
 }
@@ -105,18 +108,32 @@ snake_saver(int blank)
 static int
 snake_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = snake_saver;
-	return 0;
+	int err;
+
+	messagelen = strlen(ostype) + 1 + strlen(osrelease);
+	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
+	sprintf(message, "%s %s", ostype, osrelease);
+	messagep = malloc(messagelen * sizeof *messagep, M_DEVBUF, M_WAITOK);
+
+	err = add_scrn_saver(snake_saver);
+	if (err != 0) {
+		free(message, M_DEVBUF);
+		free(messagep, M_DEVBUF);
+	}
+	return err;
 }
 
 static int
 snake_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	int err;
+
+	err = remove_scrn_saver(snake_saver);
+	if (err == 0) {
+		free(message, M_DEVBUF);
+		free(messagep, M_DEVBUF);
+	}
+	return err;
 }
 
 int
diff --git a/sys/modules/syscons/star/Makefile b/sys/modules/syscons/star/Makefile
index 39aa7dd4b9b8..aa3ed6aeb96a 100644
--- a/sys/modules/syscons/star/Makefile
+++ b/sys/modules/syscons/star/Makefile
@@ -1,9 +1,9 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1997/02/22 12:49:21 peter Exp $
 
 KMOD=	star_saver_mod
 SRCS= 	star_saver.c
 
 NOMAN=
-CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../sys
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 465c493a3dcf..d025b16afdba 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -25,26 +25,22 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.10 1997/02/22 12:49:22 peter Exp $
+ *	$Id: star_saver.c,v 1.11 1997/04/06 11:07:01 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
 
 #include <machine/md_var.h>
+#include <i386/include/pc/display.h>
 
-#include "saver.h"
+#include <saver.h>
 
 MOD_MISC(star_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
-
 #define NUM_STARS	50
 
 /*
@@ -62,7 +58,7 @@ star_saver(int blank)
 	static u_short 	stars[NUM_STARS][2];
 
 	if (blank) {
-		if (!scrn_blanked) {
+		if (scrn_blanked <= 0) {
 			scrn_blanked = 1;
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat,
 			      scp->xsize * scp->ysize);
@@ -83,11 +79,9 @@ star_saver(int blank)
 		}
 	}
 	else {
-		if (scrn_blanked) {
+		if (scrn_blanked > 0) {
 			set_border(scp->border);
 			scrn_blanked = 0;
-			scp->start = 0;
-			scp->end = scp->xsize * scp->ysize;
 		}
 	}
 }
@@ -95,18 +89,13 @@ star_saver(int blank)
 static int
 star_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = star_saver;
-	return 0;
+	return add_scrn_saver(star_saver);
 }
 
 static int
 star_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	return remove_scrn_saver(star_saver);
 }
 
 int
-- 
cgit v1.3


From 02f2e93b60c2b91feac8f45c4c889a5a8e40d8a2 Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Sun, 26 Oct 1997 07:35:18 +0000
Subject: - The daemon might go off the screen and crashed the system if the
 screen size was changed while the screen saver was inactive. Adjust the
 positions of the daemon and the text and clip them accordingly each time.

- Don't call set_border() too often. Some video chip may produce
flicker.

Pointed out by tony@dell.com

- Don't fill the entire screen with blank char every time the saver is
called.  Blank only the part of the screen where the daemon and the
text was previously printed.
---
 lkm/syscons/daemon/daemon_saver.c         | 183 ++++++++++++++++++++++++------
 sys/dev/syscons/daemon/daemon_saver.c     | 183 ++++++++++++++++++++++++------
 sys/modules/syscons/daemon/daemon_saver.c | 183 ++++++++++++++++++++++++------
 3 files changed, 444 insertions(+), 105 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/lkm/syscons/daemon/daemon_saver.c b/lkm/syscons/daemon/daemon_saver.c
index 3325ad3a011d..ca00b46c4723 100644
--- a/lkm/syscons/daemon/daemon_saver.c
+++ b/lkm/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.5 1997/06/24 12:43:18 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.6 1997/07/15 14:49:16 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -43,7 +43,7 @@
 #include <saver.h>
 
 #define CONSOLE_VECT(x, y) \
-	*((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
+	((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
 
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
@@ -121,14 +121,35 @@ xflip_symbol(char symbol)
 }
 
 static void
-draw_daemon(int xpos, int ypos, int dxdir)
+clear_daemon(int xpos, int ypos, int dxdir, int xoff, int yoff, 
+	    int xlen, int ylen)
+{
+	int y;
+
+	if (xlen <= 0)
+		return;
+	for (y = yoff; y < ylen; y++)
+		fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20], 
+		      CONSOLE_VECT(xpos + xoff, ypos + y), xlen - xoff);
+}
+
+static void
+draw_daemon(int xpos, int ypos, int dxdir, int xoff, int yoff, 
+	    int xlen, int ylen)
 {
 	int x, y;
+	int px;
 	int attr;
 
-	for (y = 0; daemon_pic[y] != NULL; y++)
-		for (x = 0; daemon_pic[y][x] != '\0'; x++) {
-			switch (daemon_attr[y][x]) {
+	for (y = yoff; y < ylen; y++) {
+		if (dxdir < 0)
+			px = xoff;
+		else
+			px = DAEMON_MAX_WIDTH - xlen;
+		if (px >= strlen(daemon_pic[y]))
+			continue;
+		for (x = xoff; (x < xlen) && (daemon_pic[y][px] != '\0'); x++, px++) {
+			switch (daemon_attr[y][px]) {
 			case 'R': attr = (FG_LIGHTRED|BG_BLACK)<<8; break;
 			case 'Y': attr = (FG_YELLOW|BG_BLACK)<<8; break;
 			case 'B': attr = (FG_LIGHTBLUE|BG_BLACK)<<8; break;
@@ -137,22 +158,32 @@ draw_daemon(int xpos, int ypos, int dxdir)
 			default: attr = (FG_WHITE|BG_BLACK)<<8; break;
 			}
 			if (dxdir < 0) {	/* Moving left */
-				CONSOLE_VECT(xpos + x, ypos + y) =
-					scr_map[daemon_pic[y][x]]|attr;
+				*CONSOLE_VECT(xpos + x, ypos + y) =
+					scr_map[daemon_pic[y][px]]|attr;
 			} else {		/* Moving right */
-				CONSOLE_VECT(xpos + DAEMON_MAX_WIDTH - x - 1, ypos + y) =
-					scr_map[xflip_symbol(daemon_pic[y][x])]|attr;
+				*CONSOLE_VECT(xpos + DAEMON_MAX_WIDTH - px - 1, ypos + y) =
+					scr_map[xflip_symbol(daemon_pic[y][px])]|attr;
 			}
 		}
+	}
+}
+
+static void
+clear_string(int xpos, int ypos, int xoff, char *s, int len)
+{
+	if (len <= 0)
+		return;
+	fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20], 
+	      CONSOLE_VECT(xpos + xoff, ypos), len - xoff);
 }
 
 static void
-draw_string(int xpos, int ypos, char *s, int len)
+draw_string(int xpos, int ypos, int xoff, char *s, int len)
 {
 	int x;
 
-	for (x = 0; x < len; x++)
-		CONSOLE_VECT(xpos + x, ypos) =
+	for (x = xoff; x < len; x++)
+		*CONSOLE_VECT(xpos + x, ypos) =
 			scr_map[s[x]]|(FG_LIGHTGREEN|BG_BLACK)<<8;
 }
 
@@ -164,49 +195,131 @@ daemon_saver(int blank)
 	static int dxpos = 0, dypos = 0;
 	static int dxdir = 1, dydir = 1;
 	static int moved_daemon = 0;
+	static int xoff, yoff, toff;
+	static int xlen, ylen, tlen;
 	scr_stat *scp = cur_console;
+	int min, max;
 
 	if (blank) {
+		if (scrn_blanked == 0) {
+			/* clear the screen and set the border color */
+			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
+			      Crtat, scp->xsize * scp->ysize);
+			set_border(0);
+			xlen = ylen = tlen = 0;
+		}
 		if (scrn_blanked++ < 2)
 			return;
-		fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat,
-		      scp->xsize * scp->ysize);
-		set_border(0);
 		scrn_blanked = 1;
 
+ 		clear_daemon(dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
+		clear_string(txpos, typos, toff, (char *)message, tlen);
+
 		if (++moved_daemon) {
-			if (dxdir > 0) {
-				if (dxpos == scp->xsize - DAEMON_MAX_WIDTH)
-					dxdir = -1;
+			/*
+			 * The daemon picture may be off the screen, if
+			 * screen size is chagened while the screen
+			 * saver is inactive. Make sure the origin of
+			 * the picture is between min and max.
+			 */
+			if (scp->xsize <= DAEMON_MAX_WIDTH) {
+				/*
+				 * If the screen width is too narrow, we
+				 * allow part of the picture go off
+				 * the screen so that the daemon won't
+				 * flip too often.
+				 */
+				min = scp->xsize - DAEMON_MAX_WIDTH - 10;
+				max = 10;
 			} else {
-				if (dxpos == 0) dxdir = 1;
+				min = 0;
+				max = scp->xsize - DAEMON_MAX_WIDTH;
+			}
+			if (dxpos <= min) {
+				dxpos = min;
+				dxdir = 1;
+			} else if (dxpos >= max) {
+				dxpos = max;
+				dxdir = -1;
 			}
-			if (dydir > 0) {
-				if (dypos == scp->ysize - DAEMON_MAX_HEIGHT)
-					dydir = -1;
+
+			if (scp->ysize <= DAEMON_MAX_HEIGHT) {
+				min = scp->ysize - DAEMON_MAX_HEIGHT - 10;
+				max = 10;
 			} else {
-				if (dypos == 0) dydir = 1;
+				min = 0;
+				max = scp->ysize - DAEMON_MAX_HEIGHT;
+			}
+			if (dypos <= min) {
+				dypos = min;
+				dydir = 1;
+			} else if (dypos >= max) {
+				dypos = max;
+				dydir = -1;
 			}
+
 			moved_daemon = -1;
 			dxpos += dxdir; dypos += dydir;
+
+			/* clip the picture */
+			xoff = 0;
+			xlen = DAEMON_MAX_WIDTH;
+			if (dxpos + xlen <= 0)
+				xlen = 0;
+			else if (dxpos < 0)
+				xoff = -dxpos;
+			if (dxpos >= scp->xsize)
+				xlen = 0;
+			else if (dxpos + xlen > scp->xsize)
+				xlen = scp->xsize - dxpos;
+			yoff = 0;
+			ylen = DAEMON_MAX_HEIGHT;
+			if (dypos + ylen <= 0)
+				ylen = 0;
+			else if (dypos < 0)
+				yoff = -dypos;
+			if (dypos >= scp->ysize)
+				ylen = 0;
+			else if (dypos + ylen > scp->ysize)
+				ylen = scp->ysize - dypos;
 		}
 
-		if (txdir > 0) {
-			if (txpos == scp->xsize - messagelen)
-				txdir = -1;
+		if (scp->xsize <= messagelen) {
+			min = scp->xsize - messagelen - 10;
+			max = 10;
 		} else {
-			if (txpos == 0) txdir = 1;
+			min = 0;
+			max = scp->xsize - messagelen;
 		}
-		if (tydir > 0) {
-			if (typos == scp->ysize - 1)
-				tydir = -1;
-		} else {
-			if (typos == 0) tydir = 1;
+		if (txpos <= min) {
+			txpos = min;
+			txdir = 1;
+		} else if (txpos >= max) {
+			txpos = max;
+			txdir = -1;
+		}
+		if (typos <= 0) {
+			typos = 0;
+			tydir = 1;
+		} else if (typos >= scp->ysize - 1) {
+			typos = scp->ysize - 1;
+			tydir = -1;
 		}
 		txpos += txdir; typos += tydir;
 
- 		draw_daemon(dxpos, dypos, dxdir);
-		draw_string(txpos, typos, (char *)message, messagelen);
+		toff = 0;
+		tlen = messagelen;
+		if (txpos + tlen <= 0)
+			tlen = 0;
+		else if (txpos < 0)
+			toff = -txpos;
+		if (txpos >= scp->xsize)
+			tlen = 0;
+		else if (txpos + tlen > scp->xsize)
+			tlen = scp->xsize - txpos;
+
+ 		draw_daemon(dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
+		draw_string(txpos, typos, toff, (char *)message, tlen);
 	} else {
 		if (scrn_blanked > 0) {
 			set_border(scp->border);
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 3325ad3a011d..ca00b46c4723 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.5 1997/06/24 12:43:18 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.6 1997/07/15 14:49:16 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -43,7 +43,7 @@
 #include <saver.h>
 
 #define CONSOLE_VECT(x, y) \
-	*((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
+	((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
 
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
@@ -121,14 +121,35 @@ xflip_symbol(char symbol)
 }
 
 static void
-draw_daemon(int xpos, int ypos, int dxdir)
+clear_daemon(int xpos, int ypos, int dxdir, int xoff, int yoff, 
+	    int xlen, int ylen)
+{
+	int y;
+
+	if (xlen <= 0)
+		return;
+	for (y = yoff; y < ylen; y++)
+		fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20], 
+		      CONSOLE_VECT(xpos + xoff, ypos + y), xlen - xoff);
+}
+
+static void
+draw_daemon(int xpos, int ypos, int dxdir, int xoff, int yoff, 
+	    int xlen, int ylen)
 {
 	int x, y;
+	int px;
 	int attr;
 
-	for (y = 0; daemon_pic[y] != NULL; y++)
-		for (x = 0; daemon_pic[y][x] != '\0'; x++) {
-			switch (daemon_attr[y][x]) {
+	for (y = yoff; y < ylen; y++) {
+		if (dxdir < 0)
+			px = xoff;
+		else
+			px = DAEMON_MAX_WIDTH - xlen;
+		if (px >= strlen(daemon_pic[y]))
+			continue;
+		for (x = xoff; (x < xlen) && (daemon_pic[y][px] != '\0'); x++, px++) {
+			switch (daemon_attr[y][px]) {
 			case 'R': attr = (FG_LIGHTRED|BG_BLACK)<<8; break;
 			case 'Y': attr = (FG_YELLOW|BG_BLACK)<<8; break;
 			case 'B': attr = (FG_LIGHTBLUE|BG_BLACK)<<8; break;
@@ -137,22 +158,32 @@ draw_daemon(int xpos, int ypos, int dxdir)
 			default: attr = (FG_WHITE|BG_BLACK)<<8; break;
 			}
 			if (dxdir < 0) {	/* Moving left */
-				CONSOLE_VECT(xpos + x, ypos + y) =
-					scr_map[daemon_pic[y][x]]|attr;
+				*CONSOLE_VECT(xpos + x, ypos + y) =
+					scr_map[daemon_pic[y][px]]|attr;
 			} else {		/* Moving right */
-				CONSOLE_VECT(xpos + DAEMON_MAX_WIDTH - x - 1, ypos + y) =
-					scr_map[xflip_symbol(daemon_pic[y][x])]|attr;
+				*CONSOLE_VECT(xpos + DAEMON_MAX_WIDTH - px - 1, ypos + y) =
+					scr_map[xflip_symbol(daemon_pic[y][px])]|attr;
 			}
 		}
+	}
+}
+
+static void
+clear_string(int xpos, int ypos, int xoff, char *s, int len)
+{
+	if (len <= 0)
+		return;
+	fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20], 
+	      CONSOLE_VECT(xpos + xoff, ypos), len - xoff);
 }
 
 static void
-draw_string(int xpos, int ypos, char *s, int len)
+draw_string(int xpos, int ypos, int xoff, char *s, int len)
 {
 	int x;
 
-	for (x = 0; x < len; x++)
-		CONSOLE_VECT(xpos + x, ypos) =
+	for (x = xoff; x < len; x++)
+		*CONSOLE_VECT(xpos + x, ypos) =
 			scr_map[s[x]]|(FG_LIGHTGREEN|BG_BLACK)<<8;
 }
 
@@ -164,49 +195,131 @@ daemon_saver(int blank)
 	static int dxpos = 0, dypos = 0;
 	static int dxdir = 1, dydir = 1;
 	static int moved_daemon = 0;
+	static int xoff, yoff, toff;
+	static int xlen, ylen, tlen;
 	scr_stat *scp = cur_console;
+	int min, max;
 
 	if (blank) {
+		if (scrn_blanked == 0) {
+			/* clear the screen and set the border color */
+			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
+			      Crtat, scp->xsize * scp->ysize);
+			set_border(0);
+			xlen = ylen = tlen = 0;
+		}
 		if (scrn_blanked++ < 2)
 			return;
-		fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat,
-		      scp->xsize * scp->ysize);
-		set_border(0);
 		scrn_blanked = 1;
 
+ 		clear_daemon(dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
+		clear_string(txpos, typos, toff, (char *)message, tlen);
+
 		if (++moved_daemon) {
-			if (dxdir > 0) {
-				if (dxpos == scp->xsize - DAEMON_MAX_WIDTH)
-					dxdir = -1;
+			/*
+			 * The daemon picture may be off the screen, if
+			 * screen size is chagened while the screen
+			 * saver is inactive. Make sure the origin of
+			 * the picture is between min and max.
+			 */
+			if (scp->xsize <= DAEMON_MAX_WIDTH) {
+				/*
+				 * If the screen width is too narrow, we
+				 * allow part of the picture go off
+				 * the screen so that the daemon won't
+				 * flip too often.
+				 */
+				min = scp->xsize - DAEMON_MAX_WIDTH - 10;
+				max = 10;
 			} else {
-				if (dxpos == 0) dxdir = 1;
+				min = 0;
+				max = scp->xsize - DAEMON_MAX_WIDTH;
+			}
+			if (dxpos <= min) {
+				dxpos = min;
+				dxdir = 1;
+			} else if (dxpos >= max) {
+				dxpos = max;
+				dxdir = -1;
 			}
-			if (dydir > 0) {
-				if (dypos == scp->ysize - DAEMON_MAX_HEIGHT)
-					dydir = -1;
+
+			if (scp->ysize <= DAEMON_MAX_HEIGHT) {
+				min = scp->ysize - DAEMON_MAX_HEIGHT - 10;
+				max = 10;
 			} else {
-				if (dypos == 0) dydir = 1;
+				min = 0;
+				max = scp->ysize - DAEMON_MAX_HEIGHT;
+			}
+			if (dypos <= min) {
+				dypos = min;
+				dydir = 1;
+			} else if (dypos >= max) {
+				dypos = max;
+				dydir = -1;
 			}
+
 			moved_daemon = -1;
 			dxpos += dxdir; dypos += dydir;
+
+			/* clip the picture */
+			xoff = 0;
+			xlen = DAEMON_MAX_WIDTH;
+			if (dxpos + xlen <= 0)
+				xlen = 0;
+			else if (dxpos < 0)
+				xoff = -dxpos;
+			if (dxpos >= scp->xsize)
+				xlen = 0;
+			else if (dxpos + xlen > scp->xsize)
+				xlen = scp->xsize - dxpos;
+			yoff = 0;
+			ylen = DAEMON_MAX_HEIGHT;
+			if (dypos + ylen <= 0)
+				ylen = 0;
+			else if (dypos < 0)
+				yoff = -dypos;
+			if (dypos >= scp->ysize)
+				ylen = 0;
+			else if (dypos + ylen > scp->ysize)
+				ylen = scp->ysize - dypos;
 		}
 
-		if (txdir > 0) {
-			if (txpos == scp->xsize - messagelen)
-				txdir = -1;
+		if (scp->xsize <= messagelen) {
+			min = scp->xsize - messagelen - 10;
+			max = 10;
 		} else {
-			if (txpos == 0) txdir = 1;
+			min = 0;
+			max = scp->xsize - messagelen;
 		}
-		if (tydir > 0) {
-			if (typos == scp->ysize - 1)
-				tydir = -1;
-		} else {
-			if (typos == 0) tydir = 1;
+		if (txpos <= min) {
+			txpos = min;
+			txdir = 1;
+		} else if (txpos >= max) {
+			txpos = max;
+			txdir = -1;
+		}
+		if (typos <= 0) {
+			typos = 0;
+			tydir = 1;
+		} else if (typos >= scp->ysize - 1) {
+			typos = scp->ysize - 1;
+			tydir = -1;
 		}
 		txpos += txdir; typos += tydir;
 
- 		draw_daemon(dxpos, dypos, dxdir);
-		draw_string(txpos, typos, (char *)message, messagelen);
+		toff = 0;
+		tlen = messagelen;
+		if (txpos + tlen <= 0)
+			tlen = 0;
+		else if (txpos < 0)
+			toff = -txpos;
+		if (txpos >= scp->xsize)
+			tlen = 0;
+		else if (txpos + tlen > scp->xsize)
+			tlen = scp->xsize - txpos;
+
+ 		draw_daemon(dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
+		draw_string(txpos, typos, toff, (char *)message, tlen);
 	} else {
 		if (scrn_blanked > 0) {
 			set_border(scp->border);
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index 3325ad3a011d..ca00b46c4723 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.5 1997/06/24 12:43:18 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.6 1997/07/15 14:49:16 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -43,7 +43,7 @@
 #include <saver.h>
 
 #define CONSOLE_VECT(x, y) \
-	*((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
+	((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
 
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
@@ -121,14 +121,35 @@ xflip_symbol(char symbol)
 }
 
 static void
-draw_daemon(int xpos, int ypos, int dxdir)
+clear_daemon(int xpos, int ypos, int dxdir, int xoff, int yoff, 
+	    int xlen, int ylen)
+{
+	int y;
+
+	if (xlen <= 0)
+		return;
+	for (y = yoff; y < ylen; y++)
+		fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20], 
+		      CONSOLE_VECT(xpos + xoff, ypos + y), xlen - xoff);
+}
+
+static void
+draw_daemon(int xpos, int ypos, int dxdir, int xoff, int yoff, 
+	    int xlen, int ylen)
 {
 	int x, y;
+	int px;
 	int attr;
 
-	for (y = 0; daemon_pic[y] != NULL; y++)
-		for (x = 0; daemon_pic[y][x] != '\0'; x++) {
-			switch (daemon_attr[y][x]) {
+	for (y = yoff; y < ylen; y++) {
+		if (dxdir < 0)
+			px = xoff;
+		else
+			px = DAEMON_MAX_WIDTH - xlen;
+		if (px >= strlen(daemon_pic[y]))
+			continue;
+		for (x = xoff; (x < xlen) && (daemon_pic[y][px] != '\0'); x++, px++) {
+			switch (daemon_attr[y][px]) {
 			case 'R': attr = (FG_LIGHTRED|BG_BLACK)<<8; break;
 			case 'Y': attr = (FG_YELLOW|BG_BLACK)<<8; break;
 			case 'B': attr = (FG_LIGHTBLUE|BG_BLACK)<<8; break;
@@ -137,22 +158,32 @@ draw_daemon(int xpos, int ypos, int dxdir)
 			default: attr = (FG_WHITE|BG_BLACK)<<8; break;
 			}
 			if (dxdir < 0) {	/* Moving left */
-				CONSOLE_VECT(xpos + x, ypos + y) =
-					scr_map[daemon_pic[y][x]]|attr;
+				*CONSOLE_VECT(xpos + x, ypos + y) =
+					scr_map[daemon_pic[y][px]]|attr;
 			} else {		/* Moving right */
-				CONSOLE_VECT(xpos + DAEMON_MAX_WIDTH - x - 1, ypos + y) =
-					scr_map[xflip_symbol(daemon_pic[y][x])]|attr;
+				*CONSOLE_VECT(xpos + DAEMON_MAX_WIDTH - px - 1, ypos + y) =
+					scr_map[xflip_symbol(daemon_pic[y][px])]|attr;
 			}
 		}
+	}
+}
+
+static void
+clear_string(int xpos, int ypos, int xoff, char *s, int len)
+{
+	if (len <= 0)
+		return;
+	fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20], 
+	      CONSOLE_VECT(xpos + xoff, ypos), len - xoff);
 }
 
 static void
-draw_string(int xpos, int ypos, char *s, int len)
+draw_string(int xpos, int ypos, int xoff, char *s, int len)
 {
 	int x;
 
-	for (x = 0; x < len; x++)
-		CONSOLE_VECT(xpos + x, ypos) =
+	for (x = xoff; x < len; x++)
+		*CONSOLE_VECT(xpos + x, ypos) =
 			scr_map[s[x]]|(FG_LIGHTGREEN|BG_BLACK)<<8;
 }
 
@@ -164,49 +195,131 @@ daemon_saver(int blank)
 	static int dxpos = 0, dypos = 0;
 	static int dxdir = 1, dydir = 1;
 	static int moved_daemon = 0;
+	static int xoff, yoff, toff;
+	static int xlen, ylen, tlen;
 	scr_stat *scp = cur_console;
+	int min, max;
 
 	if (blank) {
+		if (scrn_blanked == 0) {
+			/* clear the screen and set the border color */
+			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
+			      Crtat, scp->xsize * scp->ysize);
+			set_border(0);
+			xlen = ylen = tlen = 0;
+		}
 		if (scrn_blanked++ < 2)
 			return;
-		fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat,
-		      scp->xsize * scp->ysize);
-		set_border(0);
 		scrn_blanked = 1;
 
+ 		clear_daemon(dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
+		clear_string(txpos, typos, toff, (char *)message, tlen);
+
 		if (++moved_daemon) {
-			if (dxdir > 0) {
-				if (dxpos == scp->xsize - DAEMON_MAX_WIDTH)
-					dxdir = -1;
+			/*
+			 * The daemon picture may be off the screen, if
+			 * screen size is chagened while the screen
+			 * saver is inactive. Make sure the origin of
+			 * the picture is between min and max.
+			 */
+			if (scp->xsize <= DAEMON_MAX_WIDTH) {
+				/*
+				 * If the screen width is too narrow, we
+				 * allow part of the picture go off
+				 * the screen so that the daemon won't
+				 * flip too often.
+				 */
+				min = scp->xsize - DAEMON_MAX_WIDTH - 10;
+				max = 10;
 			} else {
-				if (dxpos == 0) dxdir = 1;
+				min = 0;
+				max = scp->xsize - DAEMON_MAX_WIDTH;
+			}
+			if (dxpos <= min) {
+				dxpos = min;
+				dxdir = 1;
+			} else if (dxpos >= max) {
+				dxpos = max;
+				dxdir = -1;
 			}
-			if (dydir > 0) {
-				if (dypos == scp->ysize - DAEMON_MAX_HEIGHT)
-					dydir = -1;
+
+			if (scp->ysize <= DAEMON_MAX_HEIGHT) {
+				min = scp->ysize - DAEMON_MAX_HEIGHT - 10;
+				max = 10;
 			} else {
-				if (dypos == 0) dydir = 1;
+				min = 0;
+				max = scp->ysize - DAEMON_MAX_HEIGHT;
+			}
+			if (dypos <= min) {
+				dypos = min;
+				dydir = 1;
+			} else if (dypos >= max) {
+				dypos = max;
+				dydir = -1;
 			}
+
 			moved_daemon = -1;
 			dxpos += dxdir; dypos += dydir;
+
+			/* clip the picture */
+			xoff = 0;
+			xlen = DAEMON_MAX_WIDTH;
+			if (dxpos + xlen <= 0)
+				xlen = 0;
+			else if (dxpos < 0)
+				xoff = -dxpos;
+			if (dxpos >= scp->xsize)
+				xlen = 0;
+			else if (dxpos + xlen > scp->xsize)
+				xlen = scp->xsize - dxpos;
+			yoff = 0;
+			ylen = DAEMON_MAX_HEIGHT;
+			if (dypos + ylen <= 0)
+				ylen = 0;
+			else if (dypos < 0)
+				yoff = -dypos;
+			if (dypos >= scp->ysize)
+				ylen = 0;
+			else if (dypos + ylen > scp->ysize)
+				ylen = scp->ysize - dypos;
 		}
 
-		if (txdir > 0) {
-			if (txpos == scp->xsize - messagelen)
-				txdir = -1;
+		if (scp->xsize <= messagelen) {
+			min = scp->xsize - messagelen - 10;
+			max = 10;
 		} else {
-			if (txpos == 0) txdir = 1;
+			min = 0;
+			max = scp->xsize - messagelen;
 		}
-		if (tydir > 0) {
-			if (typos == scp->ysize - 1)
-				tydir = -1;
-		} else {
-			if (typos == 0) tydir = 1;
+		if (txpos <= min) {
+			txpos = min;
+			txdir = 1;
+		} else if (txpos >= max) {
+			txpos = max;
+			txdir = -1;
+		}
+		if (typos <= 0) {
+			typos = 0;
+			tydir = 1;
+		} else if (typos >= scp->ysize - 1) {
+			typos = scp->ysize - 1;
+			tydir = -1;
 		}
 		txpos += txdir; typos += tydir;
 
- 		draw_daemon(dxpos, dypos, dxdir);
-		draw_string(txpos, typos, (char *)message, messagelen);
+		toff = 0;
+		tlen = messagelen;
+		if (txpos + tlen <= 0)
+			tlen = 0;
+		else if (txpos < 0)
+			toff = -txpos;
+		if (txpos >= scp->xsize)
+			tlen = 0;
+		else if (txpos + tlen > scp->xsize)
+			tlen = scp->xsize - txpos;
+
+ 		draw_daemon(dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
+		draw_string(txpos, typos, toff, (char *)message, tlen);
 	} else {
 		if (scrn_blanked > 0) {
 			set_border(scp->border);
-- 
cgit v1.3


From 33b77e2decd50e53798014b70bf7ca3bdc4c0c7e Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Fri, 16 Jan 1998 17:58:55 +0000
Subject: Include <machine/pc/display.h>, not <i386/include/pc/display.h>. 
 This is not quite correct, because the Makefiles in lkm/syscons don't set up
 the `machine' symlink, but other, more volatile headers in <machine> are
 already used.

---
 lkm/syscons/daemon/daemon_saver.c         | 4 ++--
 lkm/syscons/snake/snake_saver.c           | 4 ++--
 lkm/syscons/star/star_saver.c             | 4 ++--
 sys/dev/syscons/daemon/daemon_saver.c     | 4 ++--
 sys/dev/syscons/snake/snake_saver.c       | 4 ++--
 sys/dev/syscons/star/star_saver.c         | 4 ++--
 sys/modules/syscons/daemon/daemon_saver.c | 4 ++--
 sys/modules/syscons/snake/snake_saver.c   | 4 ++--
 sys/modules/syscons/star/star_saver.c     | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/lkm/syscons/daemon/daemon_saver.c b/lkm/syscons/daemon/daemon_saver.c
index ca00b46c4723..d5583c827519 100644
--- a/lkm/syscons/daemon/daemon_saver.c
+++ b/lkm/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.6 1997/07/15 14:49:16 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.7 1997/10/26 07:35:18 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -38,7 +38,7 @@
 #include <sys/sysctl.h>
 
 #include <machine/md_var.h>
-#include <i386/include/pc/display.h>
+#include <machine/pc/display.h>
 
 #include <saver.h>
 
diff --git a/lkm/syscons/snake/snake_saver.c b/lkm/syscons/snake/snake_saver.c
index c5a9842b4fda..1449ae376979 100644
--- a/lkm/syscons/snake/snake_saver.c
+++ b/lkm/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.14 1997/04/06 10:49:22 dufault Exp $
+ *	$Id: snake_saver.c,v 1.15 1997/07/15 14:49:35 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -38,7 +38,7 @@
 #include <sys/sysctl.h>
 
 #include <machine/md_var.h>
-#include <i386/include/pc/display.h>
+#include <machine/pc/display.h>
 
 #include <saver.h>
 
diff --git a/lkm/syscons/star/star_saver.c b/lkm/syscons/star/star_saver.c
index d025b16afdba..15525cb83819 100644
--- a/lkm/syscons/star/star_saver.c
+++ b/lkm/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.11 1997/04/06 11:07:01 dufault Exp $
+ *	$Id: star_saver.c,v 1.12 1997/07/15 14:49:39 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -35,7 +35,7 @@
 #include <sys/lkm.h>
 
 #include <machine/md_var.h>
-#include <i386/include/pc/display.h>
+#include <machine/pc/display.h>
 
 #include <saver.h>
 
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index ca00b46c4723..d5583c827519 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.6 1997/07/15 14:49:16 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.7 1997/10/26 07:35:18 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -38,7 +38,7 @@
 #include <sys/sysctl.h>
 
 #include <machine/md_var.h>
-#include <i386/include/pc/display.h>
+#include <machine/pc/display.h>
 
 #include <saver.h>
 
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index c5a9842b4fda..1449ae376979 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.14 1997/04/06 10:49:22 dufault Exp $
+ *	$Id: snake_saver.c,v 1.15 1997/07/15 14:49:35 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -38,7 +38,7 @@
 #include <sys/sysctl.h>
 
 #include <machine/md_var.h>
-#include <i386/include/pc/display.h>
+#include <machine/pc/display.h>
 
 #include <saver.h>
 
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index d025b16afdba..15525cb83819 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.11 1997/04/06 11:07:01 dufault Exp $
+ *	$Id: star_saver.c,v 1.12 1997/07/15 14:49:39 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -35,7 +35,7 @@
 #include <sys/lkm.h>
 
 #include <machine/md_var.h>
-#include <i386/include/pc/display.h>
+#include <machine/pc/display.h>
 
 #include <saver.h>
 
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index ca00b46c4723..d5583c827519 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.6 1997/07/15 14:49:16 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.7 1997/10/26 07:35:18 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -38,7 +38,7 @@
 #include <sys/sysctl.h>
 
 #include <machine/md_var.h>
-#include <i386/include/pc/display.h>
+#include <machine/pc/display.h>
 
 #include <saver.h>
 
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index c5a9842b4fda..1449ae376979 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.14 1997/04/06 10:49:22 dufault Exp $
+ *	$Id: snake_saver.c,v 1.15 1997/07/15 14:49:35 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -38,7 +38,7 @@
 #include <sys/sysctl.h>
 
 #include <machine/md_var.h>
-#include <i386/include/pc/display.h>
+#include <machine/pc/display.h>
 
 #include <saver.h>
 
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index d025b16afdba..15525cb83819 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.11 1997/04/06 11:07:01 dufault Exp $
+ *	$Id: star_saver.c,v 1.12 1997/07/15 14:49:39 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -35,7 +35,7 @@
 #include <sys/lkm.h>
 
 #include <machine/md_var.h>
-#include <i386/include/pc/display.h>
+#include <machine/pc/display.h>
 
 #include <saver.h>
 
-- 
cgit v1.3


From 11afcc8f9f96d657b8e6f7547c02c1957331fc96 Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Thu, 6 Aug 1998 09:14:26 +0000
Subject: The daemon, snake and star savers should refuse to load if the
 current video mode is the VESA mode, because they cannot work properly under
 the VESA mode support as in the current form.

---
 lkm/syscons/daemon/daemon_saver.c         | 5 ++++-
 lkm/syscons/snake/snake_saver.c           | 5 ++++-
 lkm/syscons/star/star_saver.c             | 5 ++++-
 sys/dev/syscons/daemon/daemon_saver.c     | 5 ++++-
 sys/dev/syscons/snake/snake_saver.c       | 5 ++++-
 sys/dev/syscons/star/star_saver.c         | 5 ++++-
 sys/modules/syscons/daemon/daemon_saver.c | 5 ++++-
 sys/modules/syscons/snake/snake_saver.c   | 5 ++++-
 sys/modules/syscons/star/star_saver.c     | 5 ++++-
 9 files changed, 36 insertions(+), 9 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/lkm/syscons/daemon/daemon_saver.c b/lkm/syscons/daemon/daemon_saver.c
index d5583c827519..f3cf3dce7736 100644
--- a/lkm/syscons/daemon/daemon_saver.c
+++ b/lkm/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.7 1997/10/26 07:35:18 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.8 1998/01/16 17:58:43 bde Exp $
  */
 
 #include <sys/param.h>
@@ -333,6 +333,9 @@ daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
 	    strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
diff --git a/lkm/syscons/snake/snake_saver.c b/lkm/syscons/snake/snake_saver.c
index 1449ae376979..c3fa1fe7ce38 100644
--- a/lkm/syscons/snake/snake_saver.c
+++ b/lkm/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.15 1997/07/15 14:49:35 yokota Exp $
+ *	$Id: snake_saver.c,v 1.16 1998/01/16 17:58:50 bde Exp $
  */
 
 #include <sys/param.h>
@@ -110,6 +110,9 @@ snake_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	messagelen = strlen(ostype) + 1 + strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s %s", ostype, osrelease);
diff --git a/lkm/syscons/star/star_saver.c b/lkm/syscons/star/star_saver.c
index 15525cb83819..517a5579968f 100644
--- a/lkm/syscons/star/star_saver.c
+++ b/lkm/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.12 1997/07/15 14:49:39 yokota Exp $
+ *	$Id: star_saver.c,v 1.13 1998/01/16 17:58:55 bde Exp $
  */
 
 #include <sys/param.h>
@@ -89,6 +89,9 @@ star_saver(int blank)
 static int
 star_saver_load(struct lkm_table *lkmtp, int cmd)
 {
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	return add_scrn_saver(star_saver);
 }
 
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index d5583c827519..f3cf3dce7736 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.7 1997/10/26 07:35:18 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.8 1998/01/16 17:58:43 bde Exp $
  */
 
 #include <sys/param.h>
@@ -333,6 +333,9 @@ daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
 	    strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index 1449ae376979..c3fa1fe7ce38 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.15 1997/07/15 14:49:35 yokota Exp $
+ *	$Id: snake_saver.c,v 1.16 1998/01/16 17:58:50 bde Exp $
  */
 
 #include <sys/param.h>
@@ -110,6 +110,9 @@ snake_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	messagelen = strlen(ostype) + 1 + strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s %s", ostype, osrelease);
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 15525cb83819..517a5579968f 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.12 1997/07/15 14:49:39 yokota Exp $
+ *	$Id: star_saver.c,v 1.13 1998/01/16 17:58:55 bde Exp $
  */
 
 #include <sys/param.h>
@@ -89,6 +89,9 @@ star_saver(int blank)
 static int
 star_saver_load(struct lkm_table *lkmtp, int cmd)
 {
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	return add_scrn_saver(star_saver);
 }
 
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index d5583c827519..f3cf3dce7736 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.7 1997/10/26 07:35:18 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.8 1998/01/16 17:58:43 bde Exp $
  */
 
 #include <sys/param.h>
@@ -333,6 +333,9 @@ daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
 	    strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index 1449ae376979..c3fa1fe7ce38 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.15 1997/07/15 14:49:35 yokota Exp $
+ *	$Id: snake_saver.c,v 1.16 1998/01/16 17:58:50 bde Exp $
  */
 
 #include <sys/param.h>
@@ -110,6 +110,9 @@ snake_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	messagelen = strlen(ostype) + 1 + strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s %s", ostype, osrelease);
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 15525cb83819..517a5579968f 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.12 1997/07/15 14:49:39 yokota Exp $
+ *	$Id: star_saver.c,v 1.13 1998/01/16 17:58:55 bde Exp $
  */
 
 #include <sys/param.h>
@@ -89,6 +89,9 @@ star_saver(int blank)
 static int
 star_saver_load(struct lkm_table *lkmtp, int cmd)
 {
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	return add_scrn_saver(star_saver);
 }
 
-- 
cgit v1.3


From a8445737e740901f5f2c8d24c12ef7fc8b00134e Mon Sep 17 00:00:00 2001
From: Søren Schmidt <sos@FreeBSD.org>
Date: Tue, 15 Sep 1998 18:16:39 +0000
Subject: Add VESA support to syscons.

Kazu writes:

The VESA support code requires vm86 support. Make sure your kernel
configuration file has the following line.
        options "VM86"
If you want to statically link the VESA support code to the kernel,
add the following option to the kernel configuration file.
        options "VESA"

The vidcontrol command now accepts the following video mode names:
VESA_132x25, VESA_132x43, VESA_132x50, VESA_132x60, VESA_800x600

The VESA_800x600 mode is a raster display mode. The 80x25 text will
be displayed on the 800x600 screen. Useful for some laptop computers.

vidcontrol accepts the new `-i <info>' option, where <info> must be
either `adapter' or `mode'.  When the `-i adapter' option is given,
vidcontrol will print basic information (not much) on the video
adapter. When the `-i mode' option is specified, vidcontrol will
list video modes which are actually supported by the video adapter.

Submitted by:   Kazutaka YOKOTA yokota@FreeBSD.ORG
---
 lkm/syscons/blank/blank_saver.c           |   10 +-
 lkm/syscons/daemon/daemon_saver.c         |    6 +-
 lkm/syscons/fade/fade_saver.c             |   12 +-
 lkm/syscons/green/green_saver.c           |   10 +-
 lkm/syscons/saver.h                       |   12 +-
 lkm/syscons/snake/snake_saver.c           |   14 +-
 lkm/syscons/star/star_saver.c             |   14 +-
 sys/conf/NOTES                            |    5 +-
 sys/conf/files.i386                       |    6 +-
 sys/conf/options.i386                     |    4 +-
 sys/dev/kbd/kbdtables.h                   |   10 +-
 sys/dev/syscons/blank/blank_saver.c       |   10 +-
 sys/dev/syscons/daemon/daemon_saver.c     |    6 +-
 sys/dev/syscons/fade/fade_saver.c         |   12 +-
 sys/dev/syscons/green/green_saver.c       |   10 +-
 sys/dev/syscons/scvesactl.c               |  150 +++
 sys/dev/syscons/scvidctl.c                |  486 ++++++++
 sys/dev/syscons/snake/snake_saver.c       |   14 +-
 sys/dev/syscons/star/star_saver.c         |   14 +-
 sys/dev/syscons/syscons.c                 | 1819 ++++++++---------------------
 sys/dev/syscons/syscons.h                 |   92 +-
 sys/i386/conf/LINT                        |    5 +-
 sys/i386/conf/NOTES                       |    5 +-
 sys/i386/conf/files.i386                  |    6 +-
 sys/i386/conf/options.i386                |    4 +-
 sys/i386/include/console.h                |  127 +-
 sys/i386/include/pc/vesa.h                |  127 ++
 sys/i386/isa/kbdtables.h                  |   10 +-
 sys/i386/isa/pcaudio.c                    |   10 +-
 sys/i386/isa/scvesactl.c                  |  150 +++
 sys/i386/isa/scvidctl.c                   |  486 ++++++++
 sys/i386/isa/syscons.c                    | 1819 ++++++++---------------------
 sys/i386/isa/syscons.h                    |   92 +-
 sys/i386/isa/vesa.c                       |  868 ++++++++++++++
 sys/i386/isa/videoio.c                    | 1612 +++++++++++++++++++++++++
 sys/i386/isa/videoio.h                    |  107 ++
 sys/i386/isa/wst.c                        |    8 +-
 sys/modules/syscons/blank/blank_saver.c   |   10 +-
 sys/modules/syscons/daemon/daemon_saver.c |    6 +-
 sys/modules/syscons/fade/fade_saver.c     |   12 +-
 sys/modules/syscons/green/green_saver.c   |   10 +-
 sys/modules/syscons/saver.h               |   12 +-
 sys/modules/syscons/snake/snake_saver.c   |   14 +-
 sys/modules/syscons/star/star_saver.c     |   14 +-
 sys/pc98/pc98/wst.c                       |    8 +-
 usr.sbin/vidcontrol/vidcontrol.1          |    7 +-
 usr.sbin/vidcontrol/vidcontrol.c          |  122 +-
 47 files changed, 5504 insertions(+), 2863 deletions(-)
 create mode 100644 sys/dev/syscons/scvesactl.c
 create mode 100644 sys/dev/syscons/scvidctl.c
 create mode 100644 sys/i386/include/pc/vesa.h
 create mode 100644 sys/i386/isa/scvesactl.c
 create mode 100644 sys/i386/isa/scvidctl.c
 create mode 100644 sys/i386/isa/vesa.c
 create mode 100644 sys/i386/isa/videoio.c
 create mode 100644 sys/i386/isa/videoio.h

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/lkm/syscons/blank/blank_saver.c b/lkm/syscons/blank/blank_saver.c
index 451dc9a4b241..d5f4cf0bf560 100644
--- a/lkm/syscons/blank/blank_saver.c
+++ b/lkm/syscons/blank/blank_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.10 1997/07/15 14:49:09 yokota Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
diff --git a/lkm/syscons/daemon/daemon_saver.c b/lkm/syscons/daemon/daemon_saver.c
index f3cf3dce7736..688df41f274a 100644
--- a/lkm/syscons/daemon/daemon_saver.c
+++ b/lkm/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.8 1998/01/16 17:58:43 bde Exp $
+ *	$Id: daemon_saver.c,v 1.9 1998/08/06 09:14:20 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -205,7 +205,7 @@ daemon_saver(int blank)
 			/* clear the screen and set the border color */
 			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
 			      Crtat, scp->xsize * scp->ysize);
-			set_border(0);
+			set_border(scp, 0);
 			xlen = ylen = tlen = 0;
 		}
 		if (scrn_blanked++ < 2)
@@ -322,7 +322,7 @@ daemon_saver(int blank)
 		draw_string(txpos, typos, toff, (char *)message, tlen);
 	} else {
 		if (scrn_blanked > 0) {
-			set_border(scp->border);
+			set_border(scp, scp->border);
 			scrn_blanked = 0;
 		}
 	}
diff --git a/lkm/syscons/fade/fade_saver.c b/lkm/syscons/fade/fade_saver.c
index 341f7e8d240c..41176e76e092 100644
--- a/lkm/syscons/fade/fade_saver.c
+++ b/lkm/syscons/fade/fade_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995-1997 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.11 1997/07/15 14:49:25 yokota Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
@@ -84,7 +84,7 @@ fade_saver(int blank)
 	else {
 		switch (crtc_type) {
 		case KD_VGA:
-			load_palette(palette);
+			load_palette(cur_console, palette);
 			count = 0;
 			break;
 		case KD_EGA:
diff --git a/lkm/syscons/green/green_saver.c b/lkm/syscons/green/green_saver.c
index b8c82958ac34..667866284681 100644
--- a/lkm/syscons/green/green_saver.c
+++ b/lkm/syscons/green/green_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.10 1997/07/15 14:49:29 yokota Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
diff --git a/lkm/syscons/saver.h b/lkm/syscons/saver.h
index 7118e4588e22..96cc010e9b81 100644
--- a/lkm/syscons/saver.h
+++ b/lkm/syscons/saver.h
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995-1997 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,12 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: saver.h,v 1.9 1997/07/15 14:48:11 yokota Exp $
+ *	$Id$
  */
-
 #include <machine/apm_bios.h>
 #include <machine/console.h>
 
+#include <i386/isa/videoio.h>
 #include <i386/isa/syscons.h>
 
 extern scr_stat	*cur_console;
diff --git a/lkm/syscons/snake/snake_saver.c b/lkm/syscons/snake/snake_saver.c
index c3fa1fe7ce38..c5011d04bac2 100644
--- a/lkm/syscons/snake/snake_saver.c
+++ b/lkm/syscons/snake/snake_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.16 1998/01/16 17:58:50 bde Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
@@ -63,7 +63,7 @@ snake_saver(int blank)
 		if (scrn_blanked <= 0) {
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8 | scr_map[0x20],
 			      Crtat, scp->xsize * scp->ysize);
-			set_border(0);
+			set_border(scp, 0);
 			dirx = (scp->xpos ? 1 : -1);
 			diry = (scp->ypos ?
 				scp->xsize : -scp->xsize);
@@ -99,7 +99,7 @@ snake_saver(int blank)
 	}
 	else {
 		if (scrn_blanked > 0) {
-			set_border(scp->border);
+			set_border(scp, scp->border);
 			scrn_blanked = 0;
 		}
 	}
diff --git a/lkm/syscons/star/star_saver.c b/lkm/syscons/star/star_saver.c
index 517a5579968f..8ac65bdba71c 100644
--- a/lkm/syscons/star/star_saver.c
+++ b/lkm/syscons/star/star_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.13 1998/01/16 17:58:55 bde Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
@@ -62,7 +62,7 @@ star_saver(int blank)
 			scrn_blanked = 1;
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat,
 			      scp->xsize * scp->ysize);
-			set_border(0);
+			set_border(scp, 0);
 			for(i=0; i<NUM_STARS; i++) {
 				stars[i][0] =
 					random() % (scp->xsize*scp->ysize);
@@ -80,7 +80,7 @@ star_saver(int blank)
 	}
 	else {
 		if (scrn_blanked > 0) {
-			set_border(scp->border);
+			set_border(scp, scp->border);
 			scrn_blanked = 0;
 		}
 	}
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 2d8c4a883224..8b20f861bacc 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.464 1998/09/15 10:01:13 gibbs Exp $
+#	$Id: LINT,v 1.465 1998/09/15 11:44:43 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -803,6 +803,9 @@ options		SC_HISTORY_SIZE=200	# number of history buffer lines
 options		SC_DISABLE_REBOOT	# disable reboot key sequence
 # If the screen flickers badly when the mouse pointer is moved, try this.
 options		SC_BAD_FLICKER
+# To include support for VESA video modes
+# Dont use together with SMP!!
+options		VESA			# needs VM86 defined too!!
 
 #
 # `flags' for sc0:
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 5302df40d509..6a0847003632 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.202 1998/09/08 20:57:46 sos Exp $
+#	$Id: files.i386,v 1.203 1998/09/15 10:01:13 gibbs Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -240,6 +240,10 @@ i386/isa/spigot.c		optional	spigot	device-driver
 i386/isa/spkr.c			optional	speaker	device-driver
 i386/isa/stallion.c		optional	stl	device-driver
 i386/isa/syscons.c		optional	sc	device-driver
+i386/isa/scvidctl.c		optional	sc	device-driver
+i386/isa/scvesactl.c		optional	sc	device-driver
+i386/isa/videoio.c		optional	sc	device-driver
+i386/isa/vesa.c			optional	sc	device-driver
 i386/isa/tw.c			optional	tw	device-driver
 #i386/isa/ultra14f.c		optional	uha	device-driver
 i386/isa/wd.c			optional	wdc	device-driver
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index c07d086cbdf4..21c45983b680 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.85 1998/09/08 18:09:50 brian Exp $
+#	$Id: options.i386,v 1.86 1998/09/15 10:01:14 gibbs Exp $
 
 BOUNCEPAGES		opt_bounce.h
 DISABLE_PSE
@@ -77,6 +77,8 @@ SC_DISABLE_REBOOT	opt_syscons.h
 SC_MOUSE_CHAR		opt_syscons.h
 SC_BAD_FLICKER		opt_syscons.h
 
+VESA			opt_vesa.h
+
 PSM_HOOKAPM		opt_psm.h
 PSM_RESETAFTERSUSPEND	opt_psm.h
 PSM_DEBUG		opt_psm.h
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index d36b39a33e7a..61376f48b919 100644
--- a/sys/dev/kbd/kbdtables.h
+++ b/sys/dev/kbd/kbdtables.h
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1992-1995 Søren Schmidt
+ * Copyright (c) 1992-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: kbdtables.h,v 1.39 1998/01/28 08:45:18 yokota Exp $
+ *	$Id$
  */
 
 #define SET8 0x80       	/* set eight bit on */
diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index 451dc9a4b241..d5f4cf0bf560 100644
--- a/sys/dev/syscons/blank/blank_saver.c
+++ b/sys/dev/syscons/blank/blank_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.10 1997/07/15 14:49:09 yokota Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index f3cf3dce7736..688df41f274a 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.8 1998/01/16 17:58:43 bde Exp $
+ *	$Id: daemon_saver.c,v 1.9 1998/08/06 09:14:20 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -205,7 +205,7 @@ daemon_saver(int blank)
 			/* clear the screen and set the border color */
 			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
 			      Crtat, scp->xsize * scp->ysize);
-			set_border(0);
+			set_border(scp, 0);
 			xlen = ylen = tlen = 0;
 		}
 		if (scrn_blanked++ < 2)
@@ -322,7 +322,7 @@ daemon_saver(int blank)
 		draw_string(txpos, typos, toff, (char *)message, tlen);
 	} else {
 		if (scrn_blanked > 0) {
-			set_border(scp->border);
+			set_border(scp, scp->border);
 			scrn_blanked = 0;
 		}
 	}
diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index 341f7e8d240c..41176e76e092 100644
--- a/sys/dev/syscons/fade/fade_saver.c
+++ b/sys/dev/syscons/fade/fade_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995-1997 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.11 1997/07/15 14:49:25 yokota Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
@@ -84,7 +84,7 @@ fade_saver(int blank)
 	else {
 		switch (crtc_type) {
 		case KD_VGA:
-			load_palette(palette);
+			load_palette(cur_console, palette);
 			count = 0;
 			break;
 		case KD_EGA:
diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index b8c82958ac34..667866284681 100644
--- a/sys/dev/syscons/green/green_saver.c
+++ b/sys/dev/syscons/green/green_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.10 1997/07/15 14:49:29 yokota Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
new file mode 100644
index 000000000000..9678177d4011
--- /dev/null
+++ b/sys/dev/syscons/scvesactl.c
@@ -0,0 +1,150 @@
+/*-
+ * Copyright (c) 1998 Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote 
+ *    products derived from this software without specific prior written 
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id$
+ */
+
+#include "sc.h"
+#include "opt_vesa.h"
+#include "opt_vm86.h"
+
+#if (NSC > 0 && defined(VESA) && defined(VM86)) || defined(VESA_MODULE)
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/tty.h>
+#include <sys/kernel.h>
+
+#include <machine/apm_bios.h>
+#include <machine/console.h>
+#include <machine/pc/vesa.h>
+
+#include <i386/isa/videoio.h>
+#include <i386/isa/syscons.h>
+
+static int (*prev_user_ioctl)(dev_t dev, int cmd, caddr_t data, int flag, 
+			      struct proc *p);
+
+extern struct tty *scdevtotty(dev_t dev);
+
+int
+vesa_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+{
+	scr_stat *scp;
+	struct tty *tp;
+	video_info_t info;
+	video_adapter_t *adp;
+	int mode;
+	int error;
+	int s;
+
+	tp = scdevtotty(dev);
+	if (!tp)
+		return ENXIO;
+	scp = sc_get_scr_stat(tp->t_dev);
+
+	switch (cmd) {
+	case SW_VESA_USER:
+
+		mode = (int)data;
+		if ((*biosvidsw.get_info)(scp->adp, mode, &info))
+			return ENODEV;
+		if (info.vi_flags & V_INFO_GRAPHICS)
+			goto vesa_graphics;
+		else
+			goto vesa_text;
+
+	/* text modes */
+	case SW_VESA_C80x60:
+	case SW_VESA_C132x25:
+	case SW_VESA_C132x43:
+	case SW_VESA_C132x50:
+	case SW_VESA_C132x60:
+		adp = get_adapter(scp);
+		if (!(adp->va_flags & V_ADP_MODECHANGE))
+			return ENODEV;
+		mode = (cmd & 0xff) + M_VESA_BASE;
+vesa_text:
+		return sc_set_text_mode(scp, tp, mode, 0, 0, 0);
+
+	/* graphics modes */
+	case SW_VESA_32K_320: 	case SW_VESA_64K_320: 
+	case SW_VESA_FULL_320:
+
+	case SW_VESA_CG640x400:
+
+	case SW_VESA_CG640x480:
+	case SW_VESA_32K_640:	case SW_VESA_64K_640:
+	case SW_VESA_FULL_640:
+
+	case SW_VESA_800x600:	case SW_VESA_CG800x600:
+	case SW_VESA_32K_800:	case SW_VESA_64K_800:
+	case SW_VESA_FULL_800:
+
+	case SW_VESA_1024x768:	case SW_VESA_CG1024x768:
+	case SW_VESA_32K_1024:	case SW_VESA_64K_1024:
+	case SW_VESA_FULL_1024:
+
+	case SW_VESA_1280x1024:	case SW_VESA_CG1280x1024:
+	case SW_VESA_32K_1280:	case SW_VESA_64K_1280:
+	case SW_VESA_FULL_1280:
+		adp = get_adapter(scp);
+		if (!(adp->va_flags & V_ADP_MODECHANGE))
+			return ENODEV;
+		mode = (cmd & 0xff) + M_VESA_BASE;
+vesa_graphics:
+		return sc_set_graphics_mode(scp, tp, mode);
+	}
+
+	if (prev_user_ioctl)
+		return (*prev_user_ioctl)(dev, cmd, data, flag, p);
+	else
+		return ENOIOCTL;
+}
+
+int
+vesa_load_ioctl(void)
+{
+	if (prev_user_ioctl)
+		return EBUSY;
+	prev_user_ioctl = sc_user_ioctl;
+	sc_user_ioctl = vesa_ioctl;
+	return 0;
+}
+
+int
+vesa_unload_ioctl(void)
+{
+	if (sc_user_ioctl != vesa_ioctl)
+		return EBUSY;
+	sc_user_ioctl = prev_user_ioctl;
+	prev_user_ioctl = NULL;
+	return 0;
+}
+
+#endif /* (NSC > 0 && VESA && VM86) || VESA_MODULE */
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
new file mode 100644
index 000000000000..464933edb112
--- /dev/null
+++ b/sys/dev/syscons/scvidctl.c
@@ -0,0 +1,486 @@
+/*-
+ * Copyright (c) 1998 Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote 
+ *    products derived from this software without specific prior written 
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id$
+ */
+
+#include "sc.h"
+#include "opt_syscons.h"
+
+#if NSC > 0
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/signalvar.h>
+#include <sys/tty.h>
+#include <sys/kernel.h>
+
+#include <machine/apm_bios.h>
+#include <machine/console.h>
+
+#include <i386/isa/videoio.h>
+#include <i386/isa/syscons.h>
+
+/* video ioctl */
+
+extern scr_stat *cur_console;
+extern u_short *Crtat;
+extern int fonts_loaded;
+extern int sc_history_size;
+extern u_char palette[];
+
+int
+sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
+		 int fontsize)
+{
+    video_adapter_t *adp;
+    video_info_t info;
+    int error;
+    int s;
+    int i;
+
+    if ((*biosvidsw.get_info)(scp->adp, mode, &info))
+	return ENODEV;
+    adp = get_adapter(scp);
+ 
+    /* adjust argument values */
+    if (fontsize <= 0)
+	fontsize = info.vi_cheight;
+    if (fontsize < 14) {
+	fontsize = 8;
+	if (!(fonts_loaded & FONT_8))
+	    return EINVAL;
+    } else if (fontsize >= 16) {
+	fontsize = 16;
+	if (!(fonts_loaded & FONT_16))
+	    return EINVAL;
+    } else {
+	fontsize = 14;
+	if (!(fonts_loaded & FONT_14))
+	    return EINVAL;
+    }
+    if ((xsize <= 0) || (xsize > info.vi_width))
+	xsize = info.vi_width;
+    if ((ysize <= 0) || (ysize > info.vi_height))
+	ysize = info.vi_height;
+
+    /* stop screen saver, etc */
+    s = spltty();
+    if ((error = sc_clean_up(scp))) {
+	splx(s);
+	return error;
+    }
+
+    /* set up scp */
+    if (scp->history != NULL)
+	i = imax(scp->history_size / scp->xsize 
+		 - imax(sc_history_size, scp->ysize), 0);
+    else
+	i = 0;
+    /*
+     * This is a kludge to fend off scrn_update() while we
+     * muck around with scp. XXX
+     */
+    scp->status |= UNKNOWN_MODE;
+    scp->status &= ~(GRAPHICS_MODE | PIXEL_MODE);
+    scp->mode = mode;
+    scp->font_size = fontsize;
+    scp->xsize = xsize;
+    scp->ysize = ysize;
+    scp->xpixel = scp->xsize*8;
+    scp->ypixel = scp->ysize*fontsize;
+
+    /* allocate buffers */
+    sc_alloc_scr_buffer(scp, TRUE, TRUE);
+    if (ISMOUSEAVAIL(adp->va_flags))
+	sc_alloc_cut_buffer(scp, FALSE);
+    sc_alloc_history_buffer(scp, sc_history_size, i, FALSE);
+    splx(s);
+
+    if (scp == cur_console)
+	set_mode(scp);
+    scp->status &= ~UNKNOWN_MODE;
+
+    if (tp == NULL)
+	return 0;
+    if (tp->t_winsize.ws_col != scp->xsize
+	|| tp->t_winsize.ws_row != scp->ysize) {
+	tp->t_winsize.ws_col = scp->xsize;
+	tp->t_winsize.ws_row = scp->ysize;
+	pgsignal(tp->t_pgrp, SIGWINCH, 1);
+    }
+
+    return 0;
+}
+
+int
+sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode)
+{
+    video_adapter_t *adp;
+    video_info_t info;
+    int error;
+    int s;
+
+    if ((*biosvidsw.get_info)(scp->adp, mode, &info))
+	return ENODEV;
+    adp = get_adapter(scp);
+
+    /* stop screen saver, etc */
+    s = spltty();
+    if ((error = sc_clean_up(scp))) {
+	splx(s);
+	return error;
+    }
+
+    /* set up scp */
+    scp->status |= (UNKNOWN_MODE | GRAPHICS_MODE);
+    scp->status &= ~PIXEL_MODE;
+    scp->mode = mode;
+    scp->xpixel = info.vi_width;
+    scp->ypixel = info.vi_height;
+    scp->xsize = info.vi_width/8;
+    scp->ysize = info.vi_height/info.vi_cheight;
+    scp->font_size = FONT_NONE;
+    /* move the mouse cursor at the center of the screen */
+    sc_move_mouse(scp, scp->xpixel / 2, scp->ypixel / 2);
+    splx(s);
+
+    if (scp == cur_console)
+	set_mode(scp);
+    /* clear_graphics();*/
+    scp->status &= ~UNKNOWN_MODE;
+
+    if (tp == NULL)
+	return 0;
+    if (tp->t_winsize.ws_xpixel != scp->xpixel
+	|| tp->t_winsize.ws_ypixel != scp->ypixel) {
+	tp->t_winsize.ws_xpixel = scp->xpixel;
+	tp->t_winsize.ws_ypixel = scp->ypixel;
+	pgsignal(tp->t_pgrp, SIGWINCH, 1);
+    }
+
+    return 0;
+}
+
+int
+sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize, 
+		  int fontsize)
+{
+    video_adapter_t *adp;
+    video_info_t info;
+    int error;
+    int s;
+    int i;
+
+    if ((*biosvidsw.get_info)(scp->adp, scp->mode, &info))
+	return ENODEV;		/* this shouldn't happen */
+    adp = get_adapter(scp);
+
+#ifdef SC_VIDEO_DEBUG
+    if (scp->scr_buf != NULL) {
+	printf("set_pixel_mode(): mode:%x, col:%d, row:%d, font:%d\n",
+	       scp->mode, xsize, ysize, fontsize);
+    }
+#endif
+
+    /* adjust argument values */
+    if ((fontsize <= 0) || (fontsize == FONT_NONE))
+	fontsize = info.vi_cheight;
+    if (fontsize < 14) {
+	fontsize = 8;
+	if (!(fonts_loaded & FONT_8))
+	    return EINVAL;
+    } else if (fontsize >= 16) {
+	fontsize = 16;
+	if (!(fonts_loaded & FONT_16))
+	    return EINVAL;
+    } else {
+	fontsize = 14;
+	if (!(fonts_loaded & FONT_14))
+	    return EINVAL;
+    }
+    if (xsize <= 0)
+	xsize = info.vi_width/8;
+    if (ysize <= 0)
+	ysize = info.vi_height/fontsize;
+
+#ifdef SC_VIDEO_DEBUG
+    if (scp->scr_buf != NULL) {
+	printf("set_pixel_mode(): mode:%x, col:%d, row:%d, font:%d\n",
+	       scp->mode, xsize, ysize, fontsize);
+	printf("set_pixel_mode(): Crtat:%x, %dx%d, xoff:%d, yoff:%d\n",
+	       Crtat, info.vi_width, info.vi_height, 
+	       (info.vi_width/8 - xsize)/2,
+	       (info.vi_height/fontsize - ysize)/2);
+    }
+#endif
+
+    /* stop screen saver, etc */
+    s = spltty();
+    if ((error = sc_clean_up(scp))) {
+	splx(s);
+	return error;
+    }
+
+    /* set up scp */
+    if (scp->history != NULL)
+	i = imax(scp->history_size / scp->xsize 
+		 - imax(sc_history_size, scp->ysize), 0);
+    else
+	i = 0;
+    scp->status |= (UNKNOWN_MODE | PIXEL_MODE);
+    scp->status &= ~(GRAPHICS_MODE | MOUSE_ENABLED);
+    scp->xsize = xsize;
+    scp->ysize = ysize;
+    scp->font_size = fontsize;
+    scp->xoff = (scp->xpixel/8 - xsize)/2;
+    scp->yoff = (scp->ypixel/fontsize - ysize)/2;
+
+    /* allocate buffers */
+    sc_alloc_scr_buffer(scp, TRUE, TRUE);
+    if (ISMOUSEAVAIL(adp->va_flags))
+	sc_alloc_cut_buffer(scp, FALSE);
+    sc_alloc_history_buffer(scp, sc_history_size, i, FALSE);
+    splx(s);
+
+    /* FIXME */
+    if (scp == cur_console)
+	bzero(Crtat, scp->xpixel*scp->ypixel/8);
+
+    scp->status &= ~UNKNOWN_MODE;
+
+#ifdef SC_VIDEO_DEBUG
+    printf("set_pixel_mode(): status:%x\n", scp->status);
+#endif
+
+    if (tp == NULL)
+	return 0;
+    if (tp->t_winsize.ws_col != scp->xsize
+	|| tp->t_winsize.ws_row != scp->ysize) {
+	tp->t_winsize.ws_col = scp->xsize;
+	tp->t_winsize.ws_row = scp->ysize;
+	pgsignal(tp->t_pgrp, SIGWINCH, 1);
+    }
+
+    return 0;
+}
+
+int
+sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
+{
+    scr_stat *scp;
+    video_adapter_t *adp;
+    int error;
+    int s;
+
+    scp = sc_get_scr_stat(tp->t_dev);
+
+    switch (cmd) {
+
+    case CONS_CURRENT:  	/* get current adapter type */
+	adp = get_adapter(scp);
+	*(int *)data = adp->va_type;
+	return 0;
+
+    case CONS_CURRENTADP:	/* get current adapter index */
+	*(int *)data = scp->adp;
+	return 0;
+
+    case CONS_ADPINFO:		/* adapter information */
+	adp = (*biosvidsw.adapter)(((video_adapter_t *)data)->va_index);
+	if (adp == NULL)
+	    return ENODEV;
+	bcopy(adp, data, sizeof(*adp));
+	return 0;
+
+    case CONS_GET:      	/* get current video mode */
+	*(int *)data = scp->mode;
+	return 0;
+
+    case CONS_MODEINFO:		/* get mode information */
+	return ((*biosvidsw.get_info)(scp->adp, 
+		    ((video_info_t *)data)->vi_mode, (video_info_t *)data) 
+		? ENODEV : 0);
+
+    case CONS_FINDMODE:		/* find a matching video mode */
+	return ((*biosvidsw.query_mode)(scp->adp, (video_info_t *)data) 
+		? ENODEV : 0);
+
+    case CONS_SETWINORG:
+	return ((*biosvidsw.set_win_org)(scp->adp, *(u_int *)data) 
+		   ? ENODEV : 0);
+
+    /* VGA TEXT MODES */
+    case SW_VGA_C40x25:
+    case SW_VGA_C80x25: case SW_VGA_M80x25:
+    case SW_VGA_C80x30: case SW_VGA_M80x30:
+    case SW_VGA_C80x50: case SW_VGA_M80x50:
+    case SW_VGA_C80x60: case SW_VGA_M80x60:
+    case SW_B40x25:     case SW_C40x25:
+    case SW_B80x25:     case SW_C80x25:
+    case SW_ENH_B40x25: case SW_ENH_C40x25:
+    case SW_ENH_B80x25: case SW_ENH_C80x25:
+    case SW_ENH_B80x43: case SW_ENH_C80x43:
+    case SW_EGAMONO80x25:
+	adp = get_adapter(scp);
+	if (!(adp->va_flags & V_ADP_MODECHANGE))
+ 	    return ENODEV;
+	return sc_set_text_mode(scp, tp, cmd & 0xff, 0, 0, 0);
+
+    /* GRAPHICS MODES */
+    case SW_BG320:     case SW_BG640:
+    case SW_CG320:     case SW_CG320_D:   case SW_CG640_E:
+    case SW_CG640x350: case SW_ENH_CG640:
+    case SW_BG640x480: case SW_CG640x480: case SW_VGA_CG320:
+    case SW_VGA_MODEX:
+	adp = get_adapter(scp);
+	if (!(adp->va_flags & V_ADP_MODECHANGE))
+	    return ENODEV;
+	return sc_set_graphics_mode(scp, tp, cmd & 0xff);
+
+    case KDSETMODE:     	/* set current mode of this (virtual) console */
+	switch (*data) {
+	case KD_TEXT:   	/* switch to TEXT (known) mode */
+	    /*
+	     * If scp->mode is of graphics modes, we don't know which
+	     * text mode to switch back to...
+	     */
+	    if (scp->status & GRAPHICS_MODE)
+		return EINVAL;
+	    /* restore fonts & palette ! */
+#if 0
+	    adp = get_adapter(scp);
+	    if (ISFONTAVAIL(adp->va_flags) 
+		&& !(scp->status & (GRAPHICS_MODE | PIXEL_MODE)))
+		/*
+		 * FONT KLUDGE
+		 * Don't load fonts for now... XXX
+		 */
+		if (fonts_loaded & FONT_8)
+		    copy_font(scp, LOAD, 8, font_8);
+		if (fonts_loaded & FONT_14)
+		    copy_font(scp, LOAD, 14, font_14);
+		if (fonts_loaded & FONT_16)
+		    copy_font(scp, LOAD, 16, font_16);
+	    }
+#endif
+	    load_palette(scp, palette);
+
+	    /* move hardware cursor out of the way */
+	    (*biosvidsw.set_hw_cursor)(scp->adp, -1, -1);
+
+	    /* FALL THROUGH */
+
+	case KD_TEXT1:  	/* switch to TEXT (known) mode */
+	    /*
+	     * If scp->mode is of graphics modes, we don't know which
+	     * text/pixel mode to switch back to...
+	     */
+	    if (scp->status & GRAPHICS_MODE)
+		return EINVAL;
+	    s = spltty();
+	    if ((error = sc_clean_up(scp))) {
+		splx(s);
+		return error;
+	    }
+	    scp->status |= UNKNOWN_MODE;
+	    splx(s);
+	    /* no restore fonts & palette */
+	    if (scp == cur_console) {
+		set_mode(scp);
+		/* FIXME */
+		if (scp->status & PIXEL_MODE)
+		    bzero(Crtat, scp->xpixel*scp->ypixel/8);
+	    }
+	    sc_clear_screen(scp);
+	    scp->status &= ~UNKNOWN_MODE;
+	    return 0;
+
+	case KD_PIXEL:		/* pixel (raster) display */
+	    if (!(scp->status & (GRAPHICS_MODE | PIXEL_MODE)))
+		return EINVAL;
+	    if (!(scp->status & PIXEL_MODE))
+		return sc_set_pixel_mode(scp, tp, scp->xsize, scp->ysize, 
+					 scp->font_size);
+	    s = spltty();
+	    if ((error = sc_clean_up(scp))) {
+		splx(s);
+		return error;
+	    }
+	    scp->status |= (UNKNOWN_MODE | PIXEL_MODE);
+	    splx(s);
+	    if (scp == cur_console) {
+		set_mode(scp);
+		load_palette(scp, palette);
+		/* FIXME */
+		bzero(Crtat, scp->xpixel*scp->ypixel/8);
+	    }
+	    sc_clear_screen(scp);
+	    scp->status &= ~UNKNOWN_MODE;
+	    return 0;
+
+	case KD_GRAPHICS:	/* switch to GRAPHICS (unknown) mode */
+	    s = spltty();
+	    if ((error = sc_clean_up(scp))) {
+		splx(s);
+		return error;
+	    }
+	    scp->status |= UNKNOWN_MODE;
+	    splx(s);
+	    return 0;
+
+	default:
+	    return EINVAL;
+	}
+	/* NOT REACHED */
+
+    case KDRASTER:		/* set pixel (raster) display mode */
+	if (ISUNKNOWNSC(scp) || ISTEXTSC(scp))
+	    return ENODEV;
+	return sc_set_pixel_mode(scp, tp, ((int *)data)[0], ((int *)data)[1], 
+				 ((int *)data)[2]);
+
+    case KDGETMODE:     	/* get current mode of this (virtual) console */
+	/* 
+	 * From the user program's point of view, KD_PIXEL is the same 
+	 * as KD_TEXT... 
+	 */
+	*data = ISGRAPHSC(scp) ? KD_GRAPHICS : KD_TEXT;
+	return 0;
+
+    case KDSBORDER:     	/* set border color of this (virtual) console */
+	scp->border = *data;
+	if (scp == cur_console)
+	    set_border(cur_console, scp->border);
+	return 0;
+    }
+
+    return ENOIOCTL;
+}
+
+#endif /* NSC > 0 */
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index c3fa1fe7ce38..c5011d04bac2 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.16 1998/01/16 17:58:50 bde Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
@@ -63,7 +63,7 @@ snake_saver(int blank)
 		if (scrn_blanked <= 0) {
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8 | scr_map[0x20],
 			      Crtat, scp->xsize * scp->ysize);
-			set_border(0);
+			set_border(scp, 0);
 			dirx = (scp->xpos ? 1 : -1);
 			diry = (scp->ypos ?
 				scp->xsize : -scp->xsize);
@@ -99,7 +99,7 @@ snake_saver(int blank)
 	}
 	else {
 		if (scrn_blanked > 0) {
-			set_border(scp->border);
+			set_border(scp, scp->border);
 			scrn_blanked = 0;
 		}
 	}
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 517a5579968f..8ac65bdba71c 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.13 1998/01/16 17:58:55 bde Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
@@ -62,7 +62,7 @@ star_saver(int blank)
 			scrn_blanked = 1;
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat,
 			      scp->xsize * scp->ysize);
-			set_border(0);
+			set_border(scp, 0);
 			for(i=0; i<NUM_STARS; i++) {
 				stars[i][0] =
 					random() % (scp->xsize*scp->ysize);
@@ -80,7 +80,7 @@ star_saver(int blank)
 	}
 	else {
 		if (scrn_blanked > 0) {
-			set_border(scp->border);
+			set_border(scp, scp->border);
 			scrn_blanked = 0;
 		}
 	}
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index ebc243f52ba7..50e0f199c0fb 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1992-1997 Søren Schmidt
+ * Copyright (c) 1992-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,13 +25,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.276 1998/08/23 08:26:41 bde Exp $
+ *	$Id$
  */
 
 #include "sc.h"
 #include "apm.h"
 #include "opt_ddb.h"
 #include "opt_devfs.h"
+#include "opt_vesa.h"
+#include "opt_vm86.h"
 #include "opt_syscons.h"
 
 #if NSC > 0
@@ -57,9 +59,9 @@
 #include <machine/psl.h>
 #include <machine/frame.h>
 #include <machine/pc/display.h>
+#include <machine/pc/vesa.h>
 #include <machine/apm_bios.h>
 #include <machine/random.h>
-#include <machine/bootinfo.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
@@ -70,6 +72,7 @@
 #include <i386/isa/timerreg.h>
 #include <i386/isa/kbdtables.h>
 #include <i386/isa/kbdio.h>
+#include <i386/isa/videoio.h>
 #include <i386/isa/syscons.h>
 
 #if !defined(MAXCONS)
@@ -96,11 +99,6 @@
 #define COLD 0
 #define WARM 1
 
-#define VESA_MODE(x)		((x) >= M_VESA_BASE)
-
-#define MODE_MAP_SIZE		(M_VGA_CG320 + 1)
-#define MODE_PARAM_SIZE		64
-
 #define DEFAULT_BLANKTIME	(5*60)		/* 5 minutes */
 #define MAX_BLANKTIME		(7*24*60*60)	/* 7 days!? */
 
@@ -159,6 +157,7 @@ static  int        	blinkrate = 0;
 	u_int       	crtc_addr = MONO_BASE;
 	char		crtc_type = KD_MONO;
 	char        	crtc_vga = FALSE;
+static	int		adp_flags = 0;
 static  u_char      	shfts = 0, ctls = 0, alts = 0, agrs = 0, metas = 0;
 static  u_char		accents = 0;
 static  u_char      	nlkcnt = 0, clkcnt = 0, slkcnt = 0, alkcnt = 0;
@@ -172,7 +171,7 @@ static	int		run_scrn_saver = FALSE;	/* should run the saver? */
 static	int		scrn_idle = FALSE;	/* about to run the saver */
 	u_char      	scr_map[256];
 	u_char      	scr_rmap[256];
-	char        	*video_mode_ptr = NULL;
+static	int		initial_video_mode;	/* initial video mode # */
 static	int		bios_video_mode;	/* video mode # set by BIOS */
 	int     	fonts_loaded = 0
 #ifdef STD8X16FONT
@@ -180,19 +179,15 @@ static	int		bios_video_mode;	/* video mode # set by BIOS */
 #endif
 	;
 
-	char        	font_8[256*8];
-	char		font_14[256*14];
+	u_char		font_8[256*8];
+	u_char		font_14[256*14];
 #ifdef STD8X16FONT
 extern
 #endif
-	unsigned char	font_16[256*16];
-	char        	palette[256*3];
-static  char		*mode_map[MODE_MAP_SIZE];
-static  char		vgaregs[MODE_PARAM_SIZE];
-static  char		vgaregs2[MODE_PARAM_SIZE];
-static  int		rows_offset = 1;
-static	char 		*cut_buffer;
-static	int		cut_buffer_size;
+	u_char		font_16[256*16];
+	u_char        	palette[256*3];
+static	u_char 		*cut_buffer = NULL;
+static	int		cut_buffer_size = 0;
 static	int		mouse_level = 0;	/* sysmouse protocol level */
 static	mousestatus_t	mouse_status = { 0, 0, 0, 0, 0, 0 };
 static  u_short 	mouse_and_mask[16] = {
@@ -208,13 +203,14 @@ static  u_short 	mouse_or_mask[16] = {
 				0x0000, 0x0000, 0x0000, 0x0000
 			};
 
-static int		extra_history_size = 
+	int		sc_history_size = SC_HISTORY_SIZE;
+static	int		extra_history_size = 
 			    SC_MAX_HISTORY_SIZE - SC_HISTORY_SIZE * MAXCONS;
 
 static void    		none_saver(int blank) { }
 static void    		(*current_saver)(int blank) = none_saver;
 static void    		(*default_saver)(int blank) = none_saver;
-int  			(*sc_user_ioctl)(dev_t dev, int cmd, caddr_t data,
+	int  		(*sc_user_ioctl)(dev_t dev, int cmd, caddr_t data,
 					 int flag, struct proc *p) = NULL;
 
 static int		sticky_splash = FALSE;
@@ -233,8 +229,6 @@ static struct tty     	sccons[MAXCONS+2];
 #endif
 #define SC_MOUSE 	128
 #define SC_CONSOLE	255
-#define MONO_BUF    	pa_to_va(0xB0000)
-#define CGA_BUF     	pa_to_va(0xB8000)
 u_short         	*Crtat;
 static const int	nsccons = MAXCONS+2;
 
@@ -243,9 +237,6 @@ static const int	nsccons = MAXCONS+2;
     + (offset)) % (scp->history_size)))
 #define ISSIGVALID(sig)	((sig) > 0 && (sig) < NSIG)
 
-/* this should really be in `rtc.h' */
-#define RTC_EQUIPMENT		0x14
-
 /* prototypes */
 static int scattach(struct isa_device *dev);
 static int scparam(struct tty *tp, struct termios *t);
@@ -256,30 +247,26 @@ static void scstart(struct tty *tp);
 static void scmousestart(struct tty *tp);
 static void scinit(void);
 static void scshutdown(int howto, void *arg);
-static void map_mode_table(char *map[], char *table, int max);
-static int map_mode_num(int mode);
-static char *get_mode_param(scr_stat *scp, int mode);
 static u_int scgetc(u_int flags);
 #define SCGETC_CN	1
 #define SCGETC_NONBLOCK	2
 static void sccnupdate(scr_stat *scp);
-static scr_stat *get_scr_stat(dev_t dev);
 static scr_stat *alloc_scp(void);
 static void init_scp(scr_stat *scp);
 static void sc_bcopy(scr_stat *scp, u_short *p, int from, int to, int mark);
 static int get_scr_num(void);
 static timeout_t scrn_timer;
 static void scrn_update(scr_stat *scp, int show_cursor);
+static void scrn_saver(void (*saver)(int), int blank);
 static void stop_scrn_saver(void (*saver)(int));
 static int wait_scrn_saver_stop(void);
-static void clear_screen(scr_stat *scp);
 static int switch_scr(scr_stat *scp, u_int next_scr);
 static void exchange_scr(void);
-static void move_crsr(scr_stat *scp, int x, int y);
 static void scan_esc(scr_stat *scp, u_char c);
+static void ansi_put(scr_stat *scp, u_char *buf, int len);
 static void draw_cursor_image(scr_stat *scp); 
 static void remove_cursor_image(scr_stat *scp); 
-static void ansi_put(scr_stat *scp, u_char *buf, int len);
+static void move_crsr(scr_stat *scp, int x, int y);
 static u_char *get_fstr(u_int c, u_int *len);
 static void history_to_screen(scr_stat *scp);
 static int history_up_line(scr_stat *scp);
@@ -287,16 +274,6 @@ static int history_down_line(scr_stat *scp);
 static int mask2attr(struct term_stat *term);
 static void set_keyboard(int command, int data);
 static void update_leds(int which);
-static void set_vgaregs(char *modetable);
-static void read_vgaregs(char *buf);
-#define COMP_IDENTICAL	0
-#define COMP_SIMILAR	1
-#define COMP_DIFFERENT	2
-static int comp_vgaregs(u_char *buf1, u_char *buf2);
-static void dump_vgaregs(u_char *buf);
-#define PARAM_BUFSIZE	6
-static void set_font_mode(u_char *buf);
-static void set_normal_mode(u_char *buf);
 static void set_destructive_cursor(scr_stat *scp);
 static void set_mouse_pos(scr_stat *scp);
 static int skip_spc_right(scr_stat *scp, u_short *p);
@@ -312,12 +289,11 @@ static void draw_mouse_image(scr_stat *scp);
 static void remove_mouse_image(scr_stat *scp); 
 static void draw_cutmarking(scr_stat *scp); 
 static void remove_cutmarking(scr_stat *scp); 
-static void save_palette(void);
 static void do_bell(scr_stat *scp, int pitch, int duration);
 static timeout_t blink_screen;
 #ifdef SC_SPLASH_SCREEN
-static void scsplash_init(void);
-static void scsplash(int show);
+static void scsplash_init(scr_stat *scp);
+static void scsplash_saver(int show);
 #define scsplash_stick(stick)		(sticky_splash = (stick))
 #else
 #define scsplash_stick(stick)
@@ -332,7 +308,7 @@ static	d_close_t	scclose;
 static	d_read_t	scread;
 static	d_write_t	scwrite;
 static	d_ioctl_t	scioctl;
-static	d_devtotty_t	scdevtotty;
+	d_devtotty_t	scdevtotty;
 static	d_mmap_t	scmmap;
 
 #define	CDEV_MAJOR	12
@@ -353,7 +329,7 @@ draw_cursor_image(scr_stat *scp)
     u_short cursor_image, *ptr = Crtat + (scp->cursor_pos - scp->scr_buf);
     u_short prev_image;
 
-    if (VESA_MODE(scp->mode)) {
+    if (ISPIXELSC(scp)) {
 	sc_bcopy(scp, scp->scr_buf, scp->cursor_pos - scp->scr_buf, 
 	  scp->cursor_pos - scp->scr_buf, 1);
 	return;
@@ -405,7 +381,7 @@ draw_cursor_image(scr_stat *scp)
 static void
 remove_cursor_image(scr_stat *scp)
 {
-    if (VESA_MODE(scp->mode))
+    if (ISPIXELSC(scp))
 	sc_bcopy(scp, scp->scr_buf, scp->cursor_oldpos - scp->scr_buf, 
 	  scp->cursor_oldpos - scp->scr_buf, 0);
     else
@@ -436,6 +412,12 @@ scprobe(struct isa_device *dev)
 	    printf("sc%d: no video adapter is found.\n", dev->id_unit);
 	return (0);
     }
+    (*biosvidsw.diag)(bootverbose);
+#if defined(VESA) && defined(VM86)
+    if (vesa_load())
+	return FALSE;
+    (*biosvidsw.diag)(bootverbose);
+#endif
 
     sc_port = dev->id_iobase;
     if (sckbdprobe(dev->id_unit, dev->id_flags))
@@ -448,99 +430,24 @@ scprobe(struct isa_device *dev)
 static int
 scvidprobe(int unit, int flags)
 {
-    /* 
-     * XXX don't try to `printf' anything here, the console may not have 
-     * been configured yet. 
-     */
-    u_short volatile *cp;
-    u_short was;
-    u_int pa;
-    u_int segoff;
+    video_adapter_t *adp;
 
     /* do this test only once */
     if (init_done != COLD)
-	return (Crtat != 0);
-
-    /*
-     * Finish defaulting crtc variables for a mono screen.  Crtat is a
-     * bogus common variable so that it can be shared with pcvt, so it
-     * can't be statically initialized.  XXX.
-     */
-    Crtat = (u_short *)MONO_BUF;
-    crtc_type = KD_MONO;
-    /* If CGA memory seems to work, switch to color.  */
-    cp = (u_short *)CGA_BUF;
-    was = *cp;
-    *cp = (u_short) 0xA55A;
-    bios_video_mode = *(u_char *)pa_to_va(0x449);
-    if (bootinfo.bi_vesa == 0x102) {
-	bios_video_mode = bootinfo.bi_vesa;
-	Crtat  = (u_short *)pa_to_va(0xA0000);
-	crtc_addr = COLOR_BASE;
-	crtc_type = KD_VGA;
-        bzero(Crtat, 800*600/8);
-    } else if (*cp == 0xA55A) {
-	Crtat = (u_short *)CGA_BUF;
-	crtc_addr = COLOR_BASE;
-	crtc_type = KD_CGA;
-    } else {
-        cp = Crtat;
-	was = *cp;
-	*cp = (u_short) 0xA55A;
-	if (*cp != 0xA55A) {
-	    /* no screen at all, bail out */
-	    Crtat = 0;
-	    return FALSE;
-	}
-    }
-    *cp = was;
+	return (crtc_type != -1);
 
-    if (!VESA_MODE(bios_video_mode)) {
-	/* 
-	 * Check rtc and BIOS date area.
-	 * XXX: don't use BIOSDATA_EQUIPMENT, it is not a dead copy
-	 * of RTC_EQUIPMENT. The bit 4 and 5 of the ETC_EQUIPMENT are
-	 * zeros for EGA and VGA. However, the EGA/VGA BIOS will set 
-	 * these bits in BIOSDATA_EQUIPMENT according to the monitor
-	 * type detected.
-	 */
-	switch ((rtcin(RTC_EQUIPMENT) >> 4) & 3) {	/* bit 4 and 5 */
-	case 0: /* EGA/VGA, or nothing */
-	    crtc_type = KD_EGA;
-	    /* the color adapter may be in the 40x25 mode... XXX */
-	    break;
-	case 1: /* CGA 40x25 */
-	    /* switch to the 80x25 mode? XXX */
-	    /* FALL THROUGH */
-	case 2: /* CGA 80x25 */
-	    /* `crtc_type' has already been set... */
-	    /* crtc_type = KD_CGA; */
-	    break;
-	case 3: /* MDA */
-	    /* `crtc_type' has already been set... */
-	    /* crtc_type = KD_MONO; */
-	    break;
-	}
+    if ((*biosvidsw.init)() <= 0)
+	return FALSE;
+    if ((adp = (*biosvidsw.adapter)(V_ADP_PRIMARY)) == NULL)
+	return FALSE;
 
-	/* is this a VGA or higher ? */
-	outb(crtc_addr, 7);
-	if (inb(crtc_addr) == 7) {
-
-	    crtc_type = KD_VGA;
-	    crtc_vga = TRUE;
-	    read_vgaregs(vgaregs);
-
-	    /* Get the BIOS video mode pointer */
-	    segoff = *(u_int *)pa_to_va(0x4a8);
-	    pa = ((segoff & 0xffff0000) >> 12) + (segoff & 0xffff);
-	    if (ISMAPPED(pa, sizeof(u_int))) {
-		segoff = *(u_int *)pa_to_va(pa);
-		pa = ((segoff & 0xffff0000) >> 12) + (segoff & 0xffff);       
-		if (ISMAPPED(pa, MODE_PARAM_SIZE))
-		    video_mode_ptr = (char *)pa_to_va(pa);
-	    }
-	}
-    }
+    crtc_type = adp->va_type;
+    crtc_vga = (crtc_type == KD_VGA);
+    crtc_addr = adp->va_crtc_addr;
+    Crtat = (u_short *)adp->va_window;
+    adp_flags = adp->va_flags;
+    initial_video_mode = adp->va_initial_mode;
+    bios_video_mode = adp->va_initial_bios_mode;
 
     return TRUE;
 }
@@ -728,48 +635,42 @@ static int
 scattach(struct isa_device *dev)
 {
     scr_stat *scp;
+    video_info_t info;
     dev_t cdev = makedev(CDEV_MAJOR, 0);
-    char *p;
 #ifdef DEVFS
     int vc;
 #endif
 
     scinit();
     flags = dev->id_flags;
-    if (crtc_type != KD_VGA || VESA_MODE(bios_video_mode))
+    if (!ISFONTAVAIL(adp_flags))
 	flags &= ~CHAR_CURSOR;
 
     scp = console[0];
 
-    if (crtc_type == KD_VGA) {
-	cut_buffer_size = scp->xsize * scp->ysize + 1;
-    	cut_buffer = (char *)malloc(cut_buffer_size, M_DEVBUF, M_NOWAIT);
-	if (cut_buffer != NULL)
-	    cut_buffer[0] = '\0';
-    }
-
-    scp->scr_buf = (u_short *)malloc(scp->xsize*scp->ysize*sizeof(u_short),
-				     M_DEVBUF, M_NOWAIT);
-
     /* copy temporary buffer to final buffer */
-    bcopy(sc_buffer, scp->scr_buf, scp->xsize * scp->ysize * sizeof(u_short));
+    scp->scr_buf = NULL;
+    sc_alloc_scr_buffer(scp, FALSE, FALSE);
+    bcopy(sc_buffer, scp->scr_buf, scp->xsize*scp->ysize*sizeof(u_short));
 
-    scp->cursor_pos = scp->cursor_oldpos =
-	scp->scr_buf + scp->xpos + scp->ypos * scp->xsize;
-    scp->mouse_pos = scp->mouse_oldpos = 
-	scp->scr_buf + ((scp->mouse_ypos/scp->font_size)*scp->xsize +
-	    		scp->mouse_xpos/8);
+    /* cut buffer is available only when the mouse pointer is used */
+    if (ISMOUSEAVAIL(adp_flags))
+	sc_alloc_cut_buffer(scp, FALSE);
 
     /* initialize history buffer & pointers */
-    scp->history_head = scp->history_pos = 
-	(u_short *)malloc(scp->history_size*sizeof(u_short),
-			  M_DEVBUF, M_NOWAIT);
-    if (scp->history_head != NULL)
-        bzero(scp->history_head, scp->history_size*sizeof(u_short));
-    scp->history = scp->history_head;
+    sc_alloc_history_buffer(scp, sc_history_size, 0, FALSE);
+
+#if defined(VESA) && defined(VM86)
+    if ((flags & VESA800X600) 
+	&& ((*biosvidsw.get_info)(scp->adp, M_VESA_800x600, &info) == 0)) {
+	sc_set_graphics_mode(scp, NULL, M_VESA_800x600);
+	sc_set_pixel_mode(scp, NULL, COL, ROW, 16);
+	initial_video_mode = M_VESA_800x600;
+    }
+#endif /* VESA && VM86 */
 
     /* initialize cursor stuff */
-    if (!(scp->status & UNKNOWN_MODE))
+    if (!ISGRAPHSC(scp))
     	draw_cursor_image(scp);
 
     /* get screen update going */
@@ -777,42 +678,13 @@ scattach(struct isa_device *dev)
 
     update_leds(scp->status);
 
-    if ((crtc_type == KD_VGA) && bootverbose) {
-        printf("sc%d: BIOS video mode:%d\n", dev->id_unit, bios_video_mode);
-        printf("sc%d: VGA registers upon power-up\n", dev->id_unit);
-        dump_vgaregs(vgaregs);
-        printf("sc%d: video mode:%d\n", dev->id_unit, scp->mode);
-        printf("sc%d: VGA registers in BIOS for mode:%d\n", 
-		dev->id_unit, scp->mode);
-        dump_vgaregs(vgaregs2);
-	p = get_mode_param(scp, scp->mode);
-        if (p != NULL) {
-            printf("sc%d: VGA registers to be used for mode:%d\n", 
-		dev->id_unit, scp->mode);
-            dump_vgaregs(p);
-        }
-        printf("sc%d: rows_offset:%d\n", dev->id_unit, rows_offset);
-    }
-    if ((crtc_type == KD_VGA) && !VESA_MODE(bios_video_mode) 
-	&& (video_mode_ptr == NULL))
-        printf("sc%d: WARNING: video mode switching is only partially supported\n",
-	        dev->id_unit); 
-
     printf("sc%d: ", dev->id_unit);
     switch(crtc_type) {
     case KD_VGA:
-	if (VESA_MODE(bios_video_mode))
-	    printf("Graphics display (VESA mode = 0x%x)", bios_video_mode);
-	else if (crtc_addr == MONO_BASE)
-	    printf("VGA mono");
-	else
-	    printf("VGA color");
+	printf("VGA %s", (adp_flags & V_ADP_COLOR) ? "color" : "mono");
 	break;
     case KD_EGA:
-	if (crtc_addr == MONO_BASE)
-	    printf("EGA mono");
-	else
-	    printf("EGA color");
+	printf("EGA %s", (adp_flags & V_ADP_COLOR) ? "color" : "mono");
 	break;
     case KD_CGA:
 	printf("CGA");
@@ -820,7 +692,7 @@ scattach(struct isa_device *dev)
     case KD_MONO:
     case KD_HERCULES:
     default:
-	printf("MDA/hercules");
+	printf("MDA/Hercules");
 	break;
     }
     printf(" <%d virtual consoles, flags=0x%x>\n", MAXCONS, flags);
@@ -896,6 +768,8 @@ scopen(dev_t dev, int flag, int mode, struct proc *p)
 	    return(EBUSY);
     if (minor(dev) < MAXCONS && !console[minor(dev)]) {
 	console[minor(dev)] = alloc_scp();
+	if (ISGRAPHSC(console[minor(dev)]))
+	    sc_set_pixel_mode(console[minor(dev)], NULL, COL, ROW, 16);
     }
     if (minor(dev)<MAXCONS && !tp->t_winsize.ws_col && !tp->t_winsize.ws_row) {
 	tp->t_winsize.ws_col = console[minor(dev)]->xsize;
@@ -913,7 +787,7 @@ scclose(dev_t dev, int flag, int mode, struct proc *p)
     if (!tp)
 	return(ENXIO);
     if (minor(dev) < MAXCONS) {
-	scp = get_scr_stat(tp->t_dev);
+	scp = sc_get_scr_stat(tp->t_dev);
 	if (scp->status & SWITCH_WAIT_ACQ)
 	    wakeup((caddr_t)&scp->smode);
 #if not_yet_done
@@ -927,9 +801,9 @@ scclose(dev_t dev, int flag, int mode, struct proc *p)
 	    if (scp->history != NULL) {
 		free(scp->history, M_DEVBUF);
 		if (scp->history_size / scp->xsize
-			> imax(SC_HISTORY_SIZE, scp->ysize))
+			> imax(sc_history_size, scp->ysize))
 		    extra_history_size += scp->history_size / scp->xsize 
-			- imax(SC_HISTORY_SIZE, scp->ysize);
+			- imax(sc_history_size, scp->ysize);
 	    }
 	    free(scp, M_DEVBUF);
 	    console[minor(dev)] = NULL;
@@ -1008,10 +882,17 @@ scintr(int unit)
 	}
     }
 
+#if 0
     if (cur_console->status & MOUSE_ENABLED) {
 	cur_console->status &= ~MOUSE_VISIBLE;
 	remove_mouse_image(cur_console);
     }
+#else
+    if (cur_console->status & MOUSE_VISIBLE) {
+	remove_mouse_image(cur_console);
+	cur_console->status &= ~MOUSE_VISIBLE;
+    }
+#endif
 }
 
 static int
@@ -1030,21 +911,25 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
     u_int i;
     struct tty *tp;
     scr_stat *scp;
-    u_short *usp;
-    char *mp;
+    video_adapter_t *adp;
     int s;
 
     tp = scdevtotty(dev);
     if (!tp)
 	return ENXIO;
-    scp = get_scr_stat(tp->t_dev);
+    scp = sc_get_scr_stat(tp->t_dev);
 
     /* If there is a user_ioctl function call that first */
     if (sc_user_ioctl) {
-	if (error = (*sc_user_ioctl)(dev, cmd, data, flag, p))
+	error = (*sc_user_ioctl)(dev, cmd, data, flag, p);
+	if (error != ENOIOCTL)
 	    return error;
     }
 
+    error = sc_vid_ioctl(tp, cmd, data, flag, p);
+    if (error != ENOIOCTL)
+	return error;
+
     switch (cmd) {  		/* process console hardware related ioctl's */
 
     case GIO_ATTR:      	/* get current attributes */
@@ -1052,18 +937,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case GIO_COLOR:     	/* is this a color console ? */
-	if (crtc_addr == COLOR_BASE)
-	    *(int*)data = 1;
-	else
-	    *(int*)data = 0;
-	return 0;
-
-    case CONS_CURRENT:  	/* get current adapter type */
-	*(int *)data = crtc_type;
-	return 0;
-
-    case CONS_GET:      	/* get current video mode */
-	*(int*)data = scp->mode;
+	*(int *)data = (adp_flags & V_ADP_COLOR) ? 1 : 0;
 	return 0;
 
     case CONS_BLANKTIME:    	/* set screen saver timeout (0 = no saver) */
@@ -1081,7 +955,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	else
 	    flags &= ~BLINK_CURSOR;
 	if ((*(int*)data) & 0x02) {
-	    if (crtc_type != KD_VGA || VESA_MODE(bios_video_mode))
+	    if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
 		return ENXIO;
 	    flags |= CHAR_CURSOR;
 	} else
@@ -1090,7 +964,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	 * The cursor shape is global property; all virtual consoles
 	 * are affected. Update the cursor in the current console...
 	 */
-	if (!(cur_console->status & UNKNOWN_MODE)) {
+	if (!ISGRAPHSC(cur_console)) {
             remove_cursor_image(cur_console);
 	    if (flags & CHAR_CURSOR)
 	        set_destructive_cursor(cur_console);
@@ -1117,37 +991,22 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    lines = imax(*(int *)data, scp->ysize);
 	    lines0 = (scp->history != NULL) ? 
 		      scp->history_size / scp->xsize : scp->ysize;
+	    if (lines0 > imax(sc_history_size, scp->ysize))
+		i = lines0 - imax(sc_history_size, scp->ysize);
+	    else
+		i = 0;
 	    /*
 	     * syscons unconditionally allocates buffers upto SC_HISTORY_SIZE
 	     * lines or scp->ysize lines, whichever is larger. A value 
 	     * greater than that is allowed, subject to extra_history_size.
 	     */
-	    if (lines > imax(lines0, SC_HISTORY_SIZE) + extra_history_size)
-                return EINVAL;
+	    if (lines > imax(sc_history_size, scp->ysize))
+		if (lines - imax(sc_history_size, scp->ysize) >
+		    extra_history_size + i)
+		    return EINVAL;
             if (cur_console->status & BUFFER_SAVED)
                 return EBUSY;
-	    usp = scp->history;
-	    scp->history = NULL;
-	    if (usp != NULL)
-		free(usp, M_DEVBUF);
-	    scp->history_size = lines * scp->xsize;
-	    /*
-	     * extra_history_size += 
-	     *    (lines0 > imax(SC_HISTORY_SIZE, scp->ysize)) ? 
-	     *     lines0 - imax(SC_HISTORY_SIZE, scp->ysize)) : 0;
-	     * extra_history_size -= 
-	     *    (lines > imax(SC_HISTORY_SIZE, scp->ysize)) ? 
-	     *	   lines - imax(SC_HISTORY_SIZE, scp->ysize)) : 0;
-	     * lines0 >= ysize && lines >= ysize... Hey, the above can be 
-	     * reduced to the following...
-	     */
-	    extra_history_size += 
-		imax(lines0, SC_HISTORY_SIZE) - imax(lines, SC_HISTORY_SIZE);
-	    usp = (u_short *)malloc(scp->history_size * sizeof(u_short),
-				    M_DEVBUF, M_WAITOK);
-	    bzero(usp, scp->history_size * sizeof(u_short));
-	    scp->history_head = scp->history_pos = usp;
-	    scp->history = usp;
+	    sc_alloc_history_buffer(scp, lines, i, TRUE);
 	    return 0;
 	}
 	else
@@ -1171,7 +1030,8 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	mouse_info_t *mouse = (mouse_info_t*)data;
 	mouse_info_t buf;
 
-	if (crtc_type != KD_VGA || VESA_MODE(bios_video_mode))
+	/* FIXME: */
+	if (!ISMOUSEAVAIL(get_adapter(scp)->va_flags))
 	    return ENODEV;
 	
 	if (cmd == OLD_CONS_MOUSECTL) {
@@ -1220,7 +1080,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    return 0;
 
 	case MOUSE_SHOW:
-	    if (!(scp->status & MOUSE_ENABLED)) {
+	    if (ISTEXTSC(scp) && !(scp->status & MOUSE_ENABLED)) {
 		scp->status |= (MOUSE_ENABLED | MOUSE_VISIBLE);
 		scp->mouse_oldpos = scp->mouse_pos;
 		mark_all(scp);
@@ -1231,7 +1091,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    break;
 
 	case MOUSE_HIDE:
-	    if (scp->status & MOUSE_ENABLED) {
+	    if (ISTEXTSC(scp) && (scp->status & MOUSE_ENABLED)) {
 		scp->status &= ~(MOUSE_ENABLED | MOUSE_VISIBLE);
 		mark_all(scp);
 		return 0;
@@ -1276,7 +1136,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    if (mouse_status.flags == 0)
 		return 0;
 
-	    if (cur_console->status & MOUSE_ENABLED)
+	    if (ISTEXTSC(cur_console) && (cur_console->status & MOUSE_ENABLED))
 	    	cur_console->status |= MOUSE_VISIBLE;
 
 	    if ((MOUSE_TTY)->t_state & TS_ISOPEN) {
@@ -1321,7 +1181,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    else if (mouse->operation == MOUSE_ACTION && cut_buffer != NULL) {
 		/* process button presses */
 		if ((cur_console->mouse_buttons ^ mouse->u.data.buttons) && 
-		    !(cur_console->status & UNKNOWN_MODE)) {
+		    ISTEXTSC(cur_console)) {
 		    cur_console->mouse_buttons = mouse->u.data.buttons;
 		    if (cur_console->mouse_buttons & MOUSE_BUTTON1DOWN)
 			mouse_cut_start(cur_console);
@@ -1358,7 +1218,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    if (mouse_status.flags == 0)
 		return 0;
 
-	    if (cur_console->status & MOUSE_ENABLED)
+	    if (ISTEXTSC(cur_console) && (cur_console->status & MOUSE_ENABLED))
 	    	cur_console->status |= MOUSE_VISIBLE;
 
 	    if ((MOUSE_TTY)->t_state & TS_ISOPEN) {
@@ -1387,7 +1247,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 		break;
 	    }
 
-	    if ((cur_console->status & UNKNOWN_MODE) || (cut_buffer == NULL))
+	    if (!ISTEXTSC(cur_console) || (cut_buffer == NULL))
 		break;
 
 	    switch (mouse->u.event.id) {
@@ -1567,18 +1427,41 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case CONS_IDLE:		/* see if the screen has been idle */
-	*(int *)data = (scrn_idle && !(cur_console->status & UNKNOWN_MODE));
+	/*
+	 * When the screen is in the GRAPHICS_MODE or UNKNOWN_MODE,
+	 * the user process may have been writing something on the
+	 * screen and syscons is not aware of it. Declare the screen
+	 * is NOT idle if it is in one of these modes. But there is
+	 * an exception to it; if a screen saver is running in the 
+	 * graphics mode in the current screen, we should say that the
+	 * screen has been idle.
+	 */
+	*(int *)data = scrn_idle 
+		       && (!ISGRAPHSC(cur_console)
+			   || (cur_console->status & SAVER_RUNNING));
 	return 0;
 
     case CONS_SAVERMODE:	/* set saver mode */
 	switch(*(int *)data) {
 	case CONS_USR_SAVER:
-	    /* if a LKM screen saver is running, it will eventually stop... */
+	    /* if a LKM screen saver is running, stop it first. */
+	    scsplash_stick(FALSE);
 	    saver_mode = *(int *)data;
+	    s = spltty();
+	    if ((error = wait_scrn_saver_stop())) {
+		splx(s);
+		return error;
+	    }
+	    scp->status |= SAVER_RUNNING;
 	    scsplash_stick(TRUE);
+	    splx(s);
 	    break;
 	case CONS_LKM_SAVER:
+	    s = spltty();
+	    if ((saver_mode == CONS_USR_SAVER) && (scp->status & SAVER_RUNNING))
+		scp->status &= ~SAVER_RUNNING;
 	    saver_mode = *(int *)data;
+	    splx(s);
 	    break;
 	default:
 	    return EINVAL;
@@ -1597,226 +1480,6 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	splx(s);
 	return 0;
 
-    /* VGA TEXT MODES */
-    case SW_VGA_C40x25:
-    case SW_VGA_C80x25: case SW_VGA_M80x25:
-    case SW_VGA_C80x30: case SW_VGA_M80x30:
-    case SW_VGA_C80x50: case SW_VGA_M80x50:
-    case SW_VGA_C80x60: case SW_VGA_M80x60:
-    case SW_B40x25:     case SW_C40x25:
-    case SW_B80x25:     case SW_C80x25:
-    case SW_ENH_B40x25: case SW_ENH_C40x25:
-    case SW_ENH_B80x25: case SW_ENH_C80x25:
-    case SW_ENH_B80x43: case SW_ENH_C80x43:
-    case SW_EGAMONO80x25:
-
-	if (crtc_type != KD_VGA)
- 	    return ENODEV;
- 	mp = get_mode_param(scp, cmd & 0xff);
- 	if (mp == NULL)
- 	    return ENODEV;
- 
-	s = spltty();
-	if ((error = wait_scrn_saver_stop())) {
-	    splx(s);
-	    return error;
-	}
-
-	scp->status &= ~MOUSE_VISIBLE;
-	remove_cutmarking(scp);
-	if (scp->history != NULL)
-	    i = imax(scp->history_size / scp->xsize 
-		     - imax(SC_HISTORY_SIZE, scp->ysize), 0);
-	else
-	    i = 0;
-	switch (cmd & 0xff) {
-	case M_VGA_C80x60: case M_VGA_M80x60:
-	    if (!(fonts_loaded & FONT_8)) {
-		splx(s);
-		return EINVAL;
-	    }
-	    /*
-	     * This is a kludge to fend off scrn_update() while we
-	     * muck around with scp. XXX
-	     */
-	    scp->status |= UNKNOWN_MODE;
-	    scp->xsize = 80;
-	    scp->ysize = 60;
-	    scp->font_size = 8;
-	    break;
-	case M_VGA_C80x50: case M_VGA_M80x50:
-	    if (!(fonts_loaded & FONT_8)) {
-		splx(s);
-		return EINVAL;
-	    }
-	    scp->status |= UNKNOWN_MODE;
-	    scp->xsize = 80;
-	    scp->ysize = 50;
-	    scp->font_size = 8;
-	    break;
-	case M_ENH_B80x43: case M_ENH_C80x43:
-	    if (!(fonts_loaded & FONT_8)) {
-		splx(s);
-		return EINVAL;
-	    }
-	    scp->status |= UNKNOWN_MODE;
-	    scp->xsize = 80;
-	    scp->ysize = 43;
-	    scp->font_size = 8;
-	    break;
-	case M_VGA_C80x30: case M_VGA_M80x30:
-	    scp->status |= UNKNOWN_MODE;
-	    scp->xsize = 80;
-	    scp->ysize = 30;
-	    scp->font_size = mp[2];
-	    break;
-	case M_ENH_C40x25: case M_ENH_B40x25:
-	case M_ENH_C80x25: case M_ENH_B80x25:
-	case M_EGAMONO80x25:
-	    if (!(fonts_loaded & FONT_14)) {
-		splx(s);
-		return EINVAL;
-	    }
-	    /* FALL THROUGH */
-	default:
-	    if ((cmd & 0xff) > M_VGA_CG320) {
-		splx(s);
-		return EINVAL;
-	    }
-	    scp->status |= UNKNOWN_MODE;
-            scp->xsize = mp[0];
-            scp->ysize = mp[1] + rows_offset;
-	    scp->font_size = mp[2];
-	    break;
-	}
-
-	scp->mode = cmd & 0xff;
-	scp->xpixel = scp->xsize * 8;
-	scp->ypixel = scp->ysize * scp->font_size;
-	free(scp->scr_buf, M_DEVBUF);
-	scp->scr_buf = (u_short *)
-	    malloc(scp->xsize*scp->ysize*sizeof(u_short), M_DEVBUF, M_WAITOK);
-	/* move the text cursor to the home position */
-	move_crsr(scp, 0, 0);
-	/* move the mouse cursor at the center of the screen */
-	scp->mouse_xpos = scp->xpixel / 2;
-	scp->mouse_ypos = scp->ypixel / 2;
-    	scp->mouse_pos = scp->mouse_oldpos = 
-	    scp->scr_buf + (scp->mouse_ypos / scp->font_size) * scp->xsize 
-	    + scp->mouse_xpos / 8;
-	/* allocate a larger cut buffer if necessary */
-	if ((cut_buffer == NULL)
-	    || (cut_buffer_size < scp->xsize * scp->ysize + 1)) {
-	    if (cut_buffer != NULL)
-		free(cut_buffer, M_DEVBUF);
-	    cut_buffer_size = scp->xsize * scp->ysize + 1;
-	    cut_buffer = (char *)malloc(cut_buffer_size, M_DEVBUF, M_NOWAIT);
-	    if (cut_buffer != NULL)
-		cut_buffer[0] = '\0';
-	}
-	splx(s);
-
-	usp = scp->history;
-	scp->history = NULL;
-	if (usp != NULL) {
-	    free(usp, M_DEVBUF);
-	    extra_history_size += i;
-	}
-	scp->history_size = imax(SC_HISTORY_SIZE, scp->ysize) * scp->xsize;
-	usp = (u_short *)malloc(scp->history_size * sizeof(u_short), 
-				M_DEVBUF, M_NOWAIT);
-	if (usp != NULL)
-	    bzero(usp, scp->history_size * sizeof(u_short));
-	scp->history_head = scp->history_pos = usp;
-	scp->history = usp;
-	if (scp == cur_console)
-	    set_mode(scp);
-	clear_screen(scp);
-	scp->status &= ~UNKNOWN_MODE;
-
-	if (tp->t_winsize.ws_col != scp->xsize
-	    || tp->t_winsize.ws_row != scp->ysize) {
-	    tp->t_winsize.ws_col = scp->xsize;
-	    tp->t_winsize.ws_row = scp->ysize;
-	    pgsignal(tp->t_pgrp, SIGWINCH, 1);
-	}
-	return 0;
-
-    /* GRAPHICS MODES */
-    case SW_BG320:     case SW_BG640:
-    case SW_CG320:     case SW_CG320_D:   case SW_CG640_E:
-    case SW_CG640x350: case SW_ENH_CG640:
-    case SW_BG640x480: case SW_CG640x480: case SW_VGA_CG320:
-
-	if (crtc_type != KD_VGA)
-	    return ENODEV;
-	mp = get_mode_param(scp, cmd & 0xff);
-	if (mp == NULL)
-	    return ENODEV;
-
-	s = spltty();
-	if ((error = wait_scrn_saver_stop())) {
-	    splx(s);
-	    return error;
-	}
-
-	scp->status &= ~MOUSE_VISIBLE;
-	remove_cutmarking(scp);
-	scp->status |= UNKNOWN_MODE;    /* graphics mode */
-	scp->mode = cmd & 0xFF;
-	scp->xpixel = mp[0] * 8;
-	scp->ypixel = (mp[1] + rows_offset) * mp[2];
-	scp->font_size = FONT_NONE;
-	/* move the mouse cursor at the center of the screen */
-	scp->mouse_xpos = scp->xpixel / 2;
-	scp->mouse_ypos = scp->ypixel / 2;
-	splx(s);
-
-	if (scp == cur_console)
-	    set_mode(scp);
-	/* clear_graphics();*/
-
-	if (tp->t_winsize.ws_xpixel != scp->xpixel
-	    || tp->t_winsize.ws_ypixel != scp->ypixel) {
-	    tp->t_winsize.ws_xpixel = scp->xpixel;
-	    tp->t_winsize.ws_ypixel = scp->ypixel;
-	    pgsignal(tp->t_pgrp, SIGWINCH, 1);
-	}
-	return 0;
-
-    case SW_VGA_MODEX:
-	if (crtc_type != KD_VGA)
-	    return ENODEV;
-	mp = get_mode_param(scp, cmd & 0xff);
-	if (mp == NULL)
-	    return ENODEV;
-
-	s = spltty();
-	if ((error = wait_scrn_saver_stop())) {
-	    splx(s);
-	    return error;
-	}
-
-	scp->status &= ~MOUSE_VISIBLE;
-	remove_cutmarking(scp);
-	scp->status |= UNKNOWN_MODE;    /* graphics mode */
-	scp->mode = cmd & 0xFF;
-	scp->xpixel = 320;
-	scp->ypixel = 240;
-	scp->font_size = FONT_NONE;
-	splx(s);
-
-	if (scp == cur_console)
-	    set_mode(scp);
-	/* clear_graphics();*/
-	if (tp->t_winsize.ws_xpixel != scp->xpixel
-	    || tp->t_winsize.ws_ypixel != scp->ypixel) {
-	    tp->t_winsize.ws_xpixel = scp->xpixel;
-	    tp->t_winsize.ws_ypixel = scp->ypixel;
-	    pgsignal(tp->t_pgrp, SIGWINCH, 1);
-	}
-	return 0;
-
     case VT_SETMODE:    	/* set screen switcher mode */
     {
 	struct vt_mode *mode;
@@ -1839,7 +1502,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case VT_RELDISP:    	/* screen switcher ioctl */
-	switch(*data) {
+	switch(*(int *)data) {
 	case VT_FALSE:  	/* user refuses to release screen, abort */
 	    if (scp == old_scp && (scp->status & SWITCH_WAIT_REL)) {
 		old_scp->status &= ~SWITCH_WAIT_REL;
@@ -1879,32 +1542,32 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	for (i = 0; i < MAXCONS; i++) {
 	    tp = VIRTUAL_TTY(i);
 	    if (!(tp->t_state & TS_ISOPEN)) {
-		*data = i + 1;
+		*(int *)data = i + 1;
 		return 0;
 	    }
 	}
 	return EINVAL;
 
     case VT_ACTIVATE:   	/* switch to screen *data */
-	return switch_scr(scp, (*data) - 1);
+	return switch_scr(scp, *(int *)data - 1);
 
     case VT_WAITACTIVE: 	/* wait for switch to occur */
-	if (*data > MAXCONS || *data < 0)
+	if (*(int *)data > MAXCONS || *(int *)data < 0)
 	    return EINVAL;
-	if (minor(dev) == (*data) - 1)
+	if (minor(dev) == *(int *)data - 1)
 	    return 0;
-	if (*data == 0) {
+	if (*(int *)data == 0) {
 	    if (scp == cur_console)
 		return 0;
 	}
 	else
-	    scp = console[(*data) - 1];
+	    scp = console[*(int *)data - 1];
 	while ((error=tsleep((caddr_t)&scp->smode, PZERO|PCATCH,
 			     "waitvt", 0)) == ERESTART) ;
 	return error;
 
     case VT_GETACTIVE:
-	*data = get_scr_num()+1;
+	*(int *)data = get_scr_num()+1;
 	return 0;
 
     case KDENABIO:      	/* allow io operations */
@@ -1920,102 +1583,28 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	p->p_md.md_regs->tf_eflags &= ~PSL_IOPL;
 	return 0;
 
-    case KDSETMODE:     	/* set current mode of this (virtual) console */
-	switch (*data) {
-	case KD_TEXT:   	/* switch to TEXT (known) mode */
-	    /* restore fonts & palette ! */
-	    if (crtc_type == KD_VGA) {
-		if (!VESA_MODE(scp->mode)) {
-#if 0
-		    /*
-		     * FONT KLUDGE
-		     * Don't load fonts for now... XXX
-		     */
-		    if (fonts_loaded & FONT_8)
-			copy_font(LOAD, FONT_8, font_8);
-		    if (fonts_loaded & FONT_14)
-			copy_font(LOAD, FONT_14, font_14);
-		    if (fonts_loaded & FONT_16)
-			copy_font(LOAD, FONT_16, font_16);
-#endif
-		}
-		load_palette(palette);
-	    }
-
-	    /* move hardware cursor out of the way */
-	    outb(crtc_addr, 14);
-	    outb(crtc_addr + 1, 0xff);
-	    outb(crtc_addr, 15);
-	    outb(crtc_addr + 1, 0xff);
-
-	    /* FALL THROUGH */
-
-	case KD_TEXT1:  	/* switch to TEXT (known) mode */
-	    s = spltty();
-	    if ((error = wait_scrn_saver_stop())) {
-		splx(s);
-		return error;
-	    }
-	    scp->status &= ~MOUSE_VISIBLE;
-	    remove_cutmarking(scp);
-	    scp->status |= UNKNOWN_MODE;
-	    splx(s);
-	    /* no restore fonts & palette */
-	    if (crtc_type == KD_VGA)
-		set_mode(scp);
-	    scp->status &= ~UNKNOWN_MODE;
-	    clear_screen(scp);
-	    return 0;
-
-	case KD_GRAPHICS:	/* switch to GRAPHICS (unknown) mode */
-	    s = spltty();
-	    if ((error = wait_scrn_saver_stop())) {
-		splx(s);
-		return error;
-	    }
-	    scp->status &= ~MOUSE_VISIBLE;
-	    remove_cutmarking(scp);
-	    scp->status |= UNKNOWN_MODE;
-	    splx(s);
-	    return 0;
-	default:
+    case KDSKBSTATE:    	/* set keyboard state (locks) */
+	if (*(int *)data & ~LOCK_KEY_MASK)
 	    return EINVAL;
-	}
-	/* NOT REACHED */
-
-    case KDGETMODE:     	/* get current mode of this (virtual) console */
-	*data = (scp->status & UNKNOWN_MODE) ? KD_GRAPHICS : KD_TEXT;
-	return 0;
-
-    case KDSBORDER:     	/* set border color of this (virtual) console */
-	scp->border = *data;
+	scp->status &= ~LOCK_KEY_MASK;
+	scp->status |= *(int *)data;
 	if (scp == cur_console)
-	    set_border(scp->border);
+	    update_leds(scp->status);
 	return 0;
 
-    case KDSKBSTATE:    	/* set keyboard state (locks) */
-	if (*data >= 0 && *data <= LOCK_KEY_MASK) {
-	    scp->status &= ~LOCK_KEY_MASK;
-	    scp->status |= *data;
-	    if (scp == cur_console)
-		update_leds(scp->status);
-	    return 0;
-	}
-	return EINVAL;
-
     case KDGKBSTATE:    	/* get keyboard state (locks) */
-	*data = scp->status & LOCK_KEY_MASK;
+	*(int *)data = scp->status & LOCK_KEY_MASK;
 	return 0;
 
     case KDSETRAD:      	/* set keyboard repeat & delay rates */
-	if (*data & 0x80)
+	if (*(int *)data & ~0x7f)
 	    return EINVAL;
 	if (sc_kbdc != NULL) 
-	    set_keyboard(KBDC_SET_TYPEMATIC, *data);
+	    set_keyboard(KBDC_SET_TYPEMATIC, *(int *)data);
 	return 0;
 
     case KDSKBMODE:     	/* set keyboard mode */
-	switch (*data) {
+	switch (*(int *)data) {
 	case K_RAW: 		/* switch to RAW scancode mode */
 	    scp->status &= ~KBD_CODE_MODE;
 	    scp->status |= KBD_RAW_MODE;
@@ -2037,7 +1626,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	/* NOT REACHED */
 
     case KDGKBMODE:     	/* get keyboard mode */
-	*data = (scp->status & KBD_RAW_MODE) ? K_RAW : 
+	*(int *)data = (scp->status & KBD_RAW_MODE) ? K_RAW : 
 		((scp->status & KBD_CODE_MODE) ? K_CODE : K_XLATE);
 	return 0;
 
@@ -2074,21 +1663,20 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case KDGKBTYPE:     	/* get keyboard type */
-	*data = 0;  		/* type not known (yet) */
+	*(int *)data = 0;  	/* type not known (yet) */
 	return 0;
 
     case KDSETLED:      	/* set keyboard LED status */
-	if (*data >= 0 && *data <= LED_MASK) {
-	    scp->status &= ~LED_MASK;
-	    scp->status |= *data;
-	    if (scp == cur_console)
-		update_leds(scp->status);
-	    return 0;
-	}
-	return EINVAL;
+	if (*(int *)data & ~LED_MASK)
+	    return EINVAL;
+	scp->status &= ~LED_MASK;
+	scp->status |= *(int *)data;
+	if (scp == cur_console)
+	    update_leds(scp->status);
+	return 0;
 
     case KDGETLED:      	/* get keyboard LED status */
-	*data = scp->status & LED_MASK;
+	*(int *)data = scp->status & LED_MASK;
 	return 0;
 
     case GETFKEY:       	/* get functionkey string */
@@ -2143,7 +1731,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case PIO_FONT8x8:   	/* set 8x8 dot font */
-	if (crtc_type != KD_VGA)
+	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
 	    return ENXIO;
 	bcopy(data, font_8, 8*256);
 	fonts_loaded |= FONT_8;
@@ -2152,17 +1740,12 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	 * Always use the font page #0. XXX
 	 * Don't load if the current font size is not 8x8.
 	 */
-	if (!VESA_MODE(cur_console->mode) 
-	    && !(cur_console->status & UNKNOWN_MODE)
-	    && (cur_console->font_size < 14)) {
-	    copy_font(LOAD, FONT_8, font_8);
-	    if (flags & CHAR_CURSOR)
-	        set_destructive_cursor(cur_console);
-	}
+	if (ISTEXTSC(cur_console) && (cur_console->font_size < 14))
+	    copy_font(cur_console, LOAD, 8, font_8);
 	return 0;
 
     case GIO_FONT8x8:   	/* get 8x8 dot font */
-	if (crtc_type != KD_VGA)
+	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
 	    return ENXIO;
 	if (fonts_loaded & FONT_8) {
 	    bcopy(font_8, data, 8*256);
@@ -2172,7 +1755,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    return ENXIO;
 
     case PIO_FONT8x14:  	/* set 8x14 dot font */
-	if (crtc_type != KD_VGA)
+	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
 	    return ENXIO;
 	bcopy(data, font_14, 14*256);
 	fonts_loaded |= FONT_14;
@@ -2181,17 +1764,13 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	 * Always use the font page #0. XXX
 	 * Don't load if the current font size is not 8x14.
 	 */
-	if (!VESA_MODE(cur_console->mode) 
-	    && !(cur_console->status & UNKNOWN_MODE)
-	    && (cur_console->font_size >= 14) && (cur_console->font_size < 16)) {
-	    copy_font(LOAD, FONT_14, font_14);
-	    if (flags & CHAR_CURSOR)
-	        set_destructive_cursor(cur_console);
-	}
+	if (ISTEXTSC(cur_console)
+	    && (cur_console->font_size >= 14) && (cur_console->font_size < 16))
+	    copy_font(cur_console, LOAD, 14, font_14);
 	return 0;
 
     case GIO_FONT8x14:  	/* get 8x14 dot font */
-	if (crtc_type != KD_VGA)
+	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
 	    return ENXIO;
 	if (fonts_loaded & FONT_14) {
 	    bcopy(font_14, data, 14*256);
@@ -2201,7 +1780,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    return ENXIO;
 
     case PIO_FONT8x16:  	/* set 8x16 dot font */
-	if (crtc_type != KD_VGA)
+	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
 	    return ENXIO;
 	bcopy(data, font_16, 16*256);
 	fonts_loaded |= FONT_16;
@@ -2210,17 +1789,12 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	 * Always use the font page #0. XXX
 	 * Don't load if the current font size is not 8x16.
 	 */
-	if (!VESA_MODE(cur_console->mode) 
-	    && !(cur_console->status & UNKNOWN_MODE)
-	    && (cur_console->font_size >= 16)) {
-	    copy_font(LOAD, FONT_16, font_16);
-	    if (flags & CHAR_CURSOR)
-	        set_destructive_cursor(cur_console);
-	}
+	if (ISTEXTSC(cur_console) && (cur_console->font_size >= 16))
+	    copy_font(cur_console, LOAD, 16, font_16);
 	return 0;
 
     case GIO_FONT8x16:  	/* get 8x16 dot font */
-	if (crtc_type != KD_VGA)
+	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
 	    return ENXIO;
 	if (fonts_loaded & FONT_16) {
 	    bcopy(font_16, data, 16*256);
@@ -2247,7 +1821,7 @@ scstart(struct tty *tp)
     struct clist *rbp;
     int s, len;
     u_char buf[PCBURST];
-    scr_stat *scp = get_scr_stat(tp->t_dev);
+    scr_stat *scp = sc_get_scr_stat(tp->t_dev);
 
     if (scp->status & SLKED || blink_in_progress)
 	return; /* XXX who repeats the call when the above flags are cleared? */
@@ -2329,7 +1903,7 @@ sccnputc(dev_t dev, int c)
 
     scp->term = kernel_console;
     current_default = &kernel_default;
-    if (scp == cur_console && !(scp->status & UNKNOWN_MODE))
+    if (scp == cur_console && !ISGRAPHSC(scp))
 	remove_cursor_image(scp);
     buf[0] = c;
     ansi_put(scp, buf, 1);
@@ -2384,25 +1958,28 @@ sccnupdate(scr_stat *scp)
     if (font_loading_in_progress)
 	return;
 
-    if (panicstr) {
+    if (panicstr || shutdown_in_progress) {
 	scsplash_stick(FALSE);
 	run_scrn_saver = FALSE;
+    } else if (scp != cur_console) {
+	return;
     }
+
     if (!run_scrn_saver)
 	scrn_idle = FALSE;
     if ((saver_mode != CONS_LKM_SAVER) || !scrn_idle)
-	if (scrn_blanked > 0)
+	if (scp->status & SAVER_RUNNING)
             stop_scrn_saver(current_saver);
 
     if (scp != cur_console || blink_in_progress || switch_in_progress)
 	return;
 
-    if ((scp->status & UNKNOWN_MODE) == 0 && scrn_blanked <= 0)
+    if (!ISGRAPHSC(scp) && !(scp->status & SAVER_RUNNING))
 	scrn_update(scp, TRUE);
 }
 
-static scr_stat
-*get_scr_stat(dev_t dev)
+scr_stat
+*sc_get_scr_stat(dev_t dev)
 {
     int unit = minor(dev);
 
@@ -2461,6 +2038,8 @@ scrn_timer(void *arg)
 	    scintr(0);
     }
 
+    scp = cur_console;
+
     /* should we stop the screen saver? */
     getmicrouptime(&tv);
     if (panicstr || shutdown_in_progress) {
@@ -2476,7 +2055,7 @@ scrn_timer(void *arg)
 	    run_scrn_saver = TRUE;
     }
     if ((saver_mode != CONS_LKM_SAVER) || !scrn_idle)
-	if (scrn_blanked > 0)
+	if (scp->status & SAVER_RUNNING)
             stop_scrn_saver(current_saver);
 
     /* should we just return ? */
@@ -2488,14 +2067,13 @@ scrn_timer(void *arg)
     }
 
     /* Update the screen */
-    scp = cur_console;
-    if ((scp->status & UNKNOWN_MODE) == 0 && scrn_blanked <= 0)
+    if (!ISGRAPHSC(scp) && !(scp->status & SAVER_RUNNING))
 	scrn_update(scp, TRUE);
 
     /* should we activate the screen saver? */
     if ((saver_mode == CONS_LKM_SAVER) && scrn_idle)
-	if ((scp->status & UNKNOWN_MODE) == 0 || scrn_blanked > 0)
-	    (*current_saver)(TRUE);
+	if (!ISGRAPHSC(scp) || (scp->status & SAVER_RUNNING))
+	    scrn_saver(current_saver, TRUE);
 
     if (arg)
 	timeout(scrn_timer, (void *)TRUE, hz / 25);
@@ -2583,9 +2161,9 @@ add_scrn_saver(void (*this_saver)(int))
 
     if (current_saver != default_saver)
 	return EBUSY;
-    current_saver = this_saver;
+    run_scrn_saver = FALSE;
     saver_mode = CONS_LKM_SAVER;
-    run_scrn_saver = (scrn_blank_time > 0);
+    current_saver = this_saver;
     return 0;
 }
 
@@ -2612,10 +2190,22 @@ remove_scrn_saver(void (*this_saver)(int))
     return 0;
 }
 
+static void
+scrn_saver(void (*saver)(int), int blank)
+{
+    static int busy = FALSE;
+
+    if (busy)
+	return;
+    busy = TRUE;
+    (*saver)(blank);
+    busy = FALSE;
+}
+
 static void
 stop_scrn_saver(void (*saver)(int))
 {
-    (*saver)(FALSE);
+    scrn_saver(saver, FALSE);
     run_scrn_saver = FALSE;
     /* the screen saver may have chosen not to stop after all... */
     if (scrn_blanked > 0)
@@ -2632,8 +2222,8 @@ wait_scrn_saver_stop(void)
 {
     int error = 0;
 
-    run_scrn_saver = FALSE;
     while (scrn_blanked > 0) {
+	run_scrn_saver = FALSE;
 	error = tsleep((caddr_t)&scrn_blanked, PZERO | PCATCH, "scrsav", 0);
 	run_scrn_saver = FALSE;
 	if (error != ERESTART)
@@ -2642,8 +2232,8 @@ wait_scrn_saver_stop(void)
     return error;
 }
 
-static void
-clear_screen(scr_stat *scp)
+void
+sc_clear_screen(scr_stat *scp)
 {
     move_crsr(scp, 0, 0);
     scp->cursor_oldpos = scp->cursor_pos;
@@ -2668,8 +2258,7 @@ switch_scr(scr_stat *scp, u_int next_scr)
 	switch_in_progress = FALSE;
 
     if (next_scr >= MAXCONS || switch_in_progress ||
-	(cur_console->smode.mode == VT_AUTO
-	 && cur_console->status & UNKNOWN_MODE)) {
+	(cur_console->smode.mode == VT_AUTO && ISGRAPHSC(cur_console))) {
 	do_bell(scp, BELL_PITCH, BELL_DURATION);
 	return EINVAL;
     }
@@ -2721,25 +2310,26 @@ exchange_scr(void)
 {
     move_crsr(old_scp, old_scp->xpos, old_scp->ypos);
     cur_console = new_scp;
-    if (old_scp->mode != new_scp->mode || (old_scp->status & UNKNOWN_MODE)){
-	if (crtc_type == KD_VGA)
+    if (old_scp->mode != new_scp->mode || ISUNKNOWNSC(old_scp)) {
+	if (adp_flags & V_ADP_MODECHANGE)
 	    set_mode(new_scp);
     }
     move_crsr(new_scp, new_scp->xpos, new_scp->ypos);
-    if (!(new_scp->status & UNKNOWN_MODE) && (flags & CHAR_CURSOR))
+    if (ISTEXTSC(new_scp) && (flags & CHAR_CURSOR))
 	set_destructive_cursor(new_scp);
-    if ((old_scp->status & UNKNOWN_MODE) && crtc_type == KD_VGA)
-	load_palette(palette);
+    if (ISGRAPHSC(old_scp))
+	load_palette(new_scp, palette);
     if (old_scp->status & KBD_RAW_MODE || new_scp->status & KBD_RAW_MODE ||
         old_scp->status & KBD_CODE_MODE || new_scp->status & KBD_CODE_MODE)
 	shfts = ctls = alts = agrs = metas = accents = 0;
-    set_border(new_scp->border);
+    set_border(new_scp, new_scp->border);
     update_leds(new_scp->status);
     delayed_next_scr = FALSE;
     mark_all(new_scp);
-    if (new_scp->mode == 0x102) {
-	bzero(Crtat, 800*600/8);
-    }
+
+    /* FIXME: the screen size may be larger than a 64K segment. */
+    if (ISPIXELSC(new_scp))
+	bzero(Crtat, new_scp->xpixel*new_scp->ypixel/8);
 }
 
 static void
@@ -2788,7 +2378,7 @@ scan_esc(scr_stat *scp, u_char c)
 	    return;
 #endif
 	case 'c':   /* Clear screen & home */
-	    clear_screen(scp);
+	    sc_clear_screen(scp);
 	    break;
 
 	case '(':   /* iso-2022: designate 94 character set to G0 */
@@ -2874,7 +2464,7 @@ scan_esc(scr_stat *scp, u_char c)
 		      scp->cursor_pos,
 		      scp->scr_buf + scp->xsize * scp->ysize - scp->cursor_pos);
     		mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
-    		mark_for_update(scp, scp->xsize * scp->ysize);
+    		mark_for_update(scp, scp->xsize * scp->ysize - 1);
 		remove_cutmarking(scp);
 		break;
 	    case 1: /* clear from beginning of display to cursor */
@@ -2936,7 +2526,7 @@ scan_esc(scr_stat *scp, u_char c)
 	    fillw(scp->term.cur_color | scr_map[0x20], src,
 		  n * scp->xsize);
 	    mark_for_update(scp, scp->ypos * scp->xsize);
-	    mark_for_update(scp, scp->xsize * scp->ysize);
+	    mark_for_update(scp, scp->xsize * scp->ysize - 1);
 	    break;
 
 	case 'M':   /* Delete n lines */
@@ -2951,7 +2541,7 @@ scan_esc(scr_stat *scp, u_char c)
 	    fillw(scp->term.cur_color | scr_map[0x20], src,
 		  n * scp->xsize);
 	    mark_for_update(scp, scp->ypos * scp->xsize);
-	    mark_for_update(scp, scp->xsize * scp->ysize);
+	    mark_for_update(scp, scp->xsize * scp->ysize - 1);
 	    break;
 
 	case 'P':   /* Delete n chars */
@@ -3192,7 +2782,7 @@ scan_esc(scr_stat *scp, u_char c)
 	    if (scp->term.num_param == 1) {
 		scp->border=scp->term.param[0] & 0xff;
 		if (scp == cur_console)
-		    set_border(scp->border);
+		    set_border(cur_console, scp->border);
             }
 	    break;
 
@@ -3209,8 +2799,8 @@ scan_esc(scr_stat *scp, u_char c)
 		    flags |= BLINK_CURSOR;
 		else
 		    flags &= ~BLINK_CURSOR;
-		if ((scp->term.param[0] & 0x02) && 
-		    crtc_type == KD_VGA && !VESA_MODE(bios_video_mode))
+		if ((scp->term.param[0] & 0x02) 
+		    && ISFONTAVAIL(get_adapter(scp)->va_flags)) 
 		    flags |= CHAR_CURSOR;
 		else
 		    flags &= ~CHAR_CURSOR;
@@ -3223,9 +2813,9 @@ scan_esc(scr_stat *scp, u_char c)
 	     * The cursor shape is global property; all virtual consoles
 	     * are affected. Update the cursor in the current console...
 	     */
-	    if (!(cur_console->status & UNKNOWN_MODE)) {
+	    if (!ISGRAPHSC(cur_console)) {
 		remove_cursor_image(cur_console);
-		if (crtc_type == KD_VGA && (flags & CHAR_CURSOR))
+		if (flags & CHAR_CURSOR)
 	            set_destructive_cursor(cur_console);
 		draw_cursor_image(cur_console);
 	    }
@@ -3366,7 +2956,7 @@ outloop:
 	    break;
 
 	case 0x0c:  /* form feed, clears screen */
-	    clear_screen(scp);
+	    sc_clear_screen(scp);
 	    break;
 
 	case 0x0d:  /* return, return to pos 0 */
@@ -3413,42 +3003,17 @@ outloop:
 static void
 scinit(void)
 {
-    u_int hw_cursor;
+    int col;
+    int row;
     u_int i;
 
     if (init_done != COLD)
 	return;
     init_done = WARM;
 
-    /*
-     * Ensure a zero start address.  This is mainly to recover after
-     * switching from pcvt using userconfig().  The registers are w/o
-     * for old hardware so it's too hard to relocate the active screen
-     * memory.
-     */
-    outb(crtc_addr, 12);
-    outb(crtc_addr + 1, 0);
-    outb(crtc_addr, 13);
-    outb(crtc_addr + 1, 0);
-
-    /* extract cursor location */
-    outb(crtc_addr, 14);
-    hw_cursor = inb(crtc_addr + 1) << 8;
-    outb(crtc_addr, 15);
-    hw_cursor |= inb(crtc_addr + 1);
-
-    /*
-     * Validate cursor location.  It may be off the screen.  Then we must
-     * not use it for the initial buffer offset.
-     */
-    if (hw_cursor >= ROW * COL)
-	hw_cursor = (ROW - 1) * COL;
-
-    /* move hardware cursor out of the way */
-    outb(crtc_addr, 14);
-    outb(crtc_addr + 1, 0xff);
-    outb(crtc_addr, 15);
-    outb(crtc_addr + 1, 0xff);
+    /* extract the hardware cursor location and move it out of the way */
+    (*biosvidsw.read_hw_cursor)(V_ADP_PRIMARY, &col, &row);
+    (*biosvidsw.set_hw_cursor)(V_ADP_PRIMARY, -1, -1);
 
     /* set up the first console */
     current_default = &user_default;
@@ -3456,51 +3021,22 @@ scinit(void)
     init_scp(console[0]);
     cur_console = console[0];
 
-    /* discard the video mode table if we are not familiar with it... */
-    if (video_mode_ptr) {
-        bzero(mode_map, sizeof(mode_map));
-	bcopy(video_mode_ptr + MODE_PARAM_SIZE*console[0]->mode, 
-	      vgaregs2, sizeof(vgaregs2));
-        switch (comp_vgaregs(vgaregs, video_mode_ptr 
-                    + MODE_PARAM_SIZE*console[0]->mode)) {
-        case COMP_IDENTICAL:
-            map_mode_table(mode_map, video_mode_ptr, M_VGA_CG320 + 1);
-            /* 
-             * This is a kludge for Toshiba DynaBook SS433 whose BIOS video
-             * mode table entry has the actual # of rows at the offset 1; 
-	     * BIOSes from other manufacturers store the # of rows - 1 there. 
-	     * XXX
-             */
-	    rows_offset = vgaregs[1] + 1 
-		- video_mode_ptr[MODE_PARAM_SIZE*console[0]->mode + 1];
-            break;
-        case COMP_SIMILAR:
-            map_mode_table(mode_map, video_mode_ptr, M_VGA_CG320 + 1);
-            mode_map[console[0]->mode] = vgaregs;
-	    rows_offset = vgaregs[1] + 1 
-		- video_mode_ptr[MODE_PARAM_SIZE*console[0]->mode + 1];
-            vgaregs[1] -= rows_offset - 1;
-            break;
-        case COMP_DIFFERENT:
-        default:
-            video_mode_ptr = NULL;
-            mode_map[console[0]->mode] = vgaregs;
-	    rows_offset = 1;
-            break;
-        }
-    }
-
     /* copy screen to temporary buffer */
-    if (!VESA_MODE(console[0]->mode))
+    if (ISTEXTSC(console[0]))
 	    generic_bcopy(Crtat, sc_buffer,
 		   console[0]->xsize * console[0]->ysize * sizeof(u_short));
 
     console[0]->scr_buf = console[0]->mouse_pos = console[0]->mouse_oldpos
 	= sc_buffer;
-    console[0]->cursor_pos = console[0]->cursor_oldpos = sc_buffer + hw_cursor;
+    if (col >= console[0]->xsize)
+	col = 0;
+    if (row >= console[0]->ysize)
+	row = console[0]->ysize - 1;
+    console[0]->xpos = col;
+    console[0]->ypos = row;
+    console[0]->cursor_pos = console[0]->cursor_oldpos =
+	sc_buffer + row*console[0]->xsize + col;
     console[0]->cursor_saveunder = *console[0]->cursor_pos;
-    console[0]->xpos = hw_cursor % COL;
-    console[0]->ypos = hw_cursor / COL;
     for (i=1; i<MAXCONS; i++)
 	console[i] = NULL;
     kernel_console.esc = 0;
@@ -3515,28 +3051,26 @@ scinit(void)
 	scr_map[i] = scr_rmap[i] = i;
     }
 
-    /* Save font and palette if VGA */
-    if (crtc_type == KD_VGA) {
-	if (!VESA_MODE(bios_video_mode)) {
-	    if (fonts_loaded & FONT_16) {
-		copy_font(LOAD, FONT_16, font_16);
-	    } else {
-		copy_font(SAVE, FONT_16, font_16);
-		fonts_loaded = FONT_16;
-	    }
-	    set_destructive_cursor(console[0]);
+    /* Save font and palette */
+    if (ISFONTAVAIL(get_adapter(cur_console)->va_flags)) {
+	if (fonts_loaded & FONT_16) {
+	    copy_font(cur_console, LOAD, 16, font_16);
+	} else {
+	    copy_font(cur_console, SAVE, 16, font_16);
+	    fonts_loaded = FONT_16;
+	    set_destructive_cursor(cur_console);
 	}
-	save_palette();
+	/*
+	 * FONT KLUDGE
+	 * Always use the font page #0. XXX
+	 */
+	(*biosvidsw.show_font)(cur_console->adp, 0);
     }
+    save_palette(cur_console, palette);
 
 #ifdef SC_SPLASH_SCREEN
-    /* 
-     * If not booting verbosely, put up the splash.
-     * Note that the splash screen is not currently supported in 
-     * the VESA mode.
-     */
-    if (!(boothowto & RB_VERBOSE) && !VESA_MODE(bios_video_mode))
-	scsplash_init();
+    /* put up the splash. */
+    scsplash_init(cur_console);
 #endif
 }
 
@@ -3551,52 +3085,79 @@ scshutdown(int howto, void *arg)
     shutdown_in_progress = TRUE;
 }
 
-static void
-map_mode_table(char *map[], char *table, int max)
+int
+sc_clean_up(scr_stat *scp)
 {
-    int i;
+    int error;
 
-    for(i = 0; i < max; ++i)
-	map[i] = table + i*MODE_PARAM_SIZE;
-    for(; i < MODE_MAP_SIZE; ++i)
-	map[i] = NULL;
+    if ((error = wait_scrn_saver_stop()))
+	return error;
+    scp->status &= ~MOUSE_VISIBLE;
+    remove_cutmarking(scp);
+    return 0;
 }
 
-static int
-map_mode_num(int mode)
+void
+sc_alloc_scr_buffer(scr_stat *scp, int wait, int clear)
 {
-    static struct {
-        int from;
-        int to;
-    } mode_map[] = {
-        { M_ENH_B80x43, M_ENH_B80x25 },
-        { M_ENH_C80x43, M_ENH_C80x25 },
-        { M_VGA_M80x30, M_VGA_M80x25 },
-        { M_VGA_C80x30, M_VGA_C80x25 },
-        { M_VGA_M80x50, M_VGA_M80x25 },
-        { M_VGA_C80x50, M_VGA_C80x25 },
-        { M_VGA_M80x60, M_VGA_M80x25 },
-        { M_VGA_C80x60, M_VGA_C80x25 },
-        { M_VGA_MODEX,  M_VGA_CG320 },
-    };
-    int i;
+    if (scp->scr_buf)
+	free(scp->scr_buf, M_DEVBUF);
+    scp->scr_buf = (u_short *)malloc(scp->xsize*scp->ysize*sizeof(u_short), 
+				     M_DEVBUF, (wait) ? M_WAITOK : M_NOWAIT);
 
-    for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) {
-        if (mode_map[i].from == mode)
-            return mode_map[i].to;
+    if (clear) {
+        /* clear the screen and move the text cursor to the top-left position */
+	sc_clear_screen(scp);
+    } else {
+	/* retain the current cursor position, but adjust pointers */
+	move_crsr(scp, scp->xpos, scp->ypos);
+	scp->cursor_oldpos = scp->cursor_pos;
     }
-    return mode;
+
+    /* move the mouse cursor at the center of the screen */
+    sc_move_mouse(scp, scp->xpixel / 2, scp->ypixel / 2);
 }
 
-static char 
-*get_mode_param(scr_stat *scp, int mode)
+void
+sc_alloc_cut_buffer(scr_stat *scp, int wait)
 {
-    if (mode >= MODE_MAP_SIZE)
-	mode = map_mode_num(mode);
-    if (mode < MODE_MAP_SIZE)
-	return mode_map[mode];
-    else
-	return NULL;
+    if ((cut_buffer == NULL)
+	|| (cut_buffer_size < scp->xsize * scp->ysize + 1)) {
+	if (cut_buffer != NULL)
+	    free(cut_buffer, M_DEVBUF);
+	cut_buffer_size = scp->xsize * scp->ysize + 1;
+	cut_buffer = (u_char *)malloc(cut_buffer_size, 
+				    M_DEVBUF, (wait) ? M_WAITOK : M_NOWAIT);
+	if (cut_buffer != NULL)
+	    cut_buffer[0] = '\0';
+    }
+}
+
+void
+sc_alloc_history_buffer(scr_stat *scp, int lines, int extra, int wait)
+{
+    u_short *usp;
+
+    if (lines < scp->ysize)
+	lines = scp->ysize;
+
+    usp = scp->history;
+    scp->history = NULL;
+    if (usp != NULL) {
+	free(usp, M_DEVBUF);
+	if (extra > 0)
+	    extra_history_size += extra;
+    }
+
+    scp->history_size = lines * scp->xsize;
+    if (lines > imax(sc_history_size, scp->ysize))
+	extra_history_size -= lines - imax(sc_history_size, scp->ysize);
+    usp = (u_short *)malloc(scp->history_size * sizeof(u_short), 
+			    M_DEVBUF, (wait) ? M_WAITOK : M_NOWAIT);
+    if (usp != NULL)
+	bzero(usp, scp->history_size * sizeof(u_short));
+    scp->history_head = scp->history_pos = usp;
+    scp->history = usp;
 }
 
 static scr_stat
@@ -3606,22 +3167,15 @@ static scr_stat
 
     scp = (scr_stat *)malloc(sizeof(scr_stat), M_DEVBUF, M_WAITOK);
     init_scp(scp);
-    scp->scr_buf = scp->cursor_pos = scp->cursor_oldpos =
-	(u_short *)malloc(scp->xsize*scp->ysize*sizeof(u_short),
-			  M_DEVBUF, M_WAITOK);
-    scp->mouse_pos = scp->mouse_oldpos = 
-	scp->scr_buf + ((scp->mouse_ypos/scp->font_size)*scp->xsize +
-			scp->mouse_xpos/8);
-    scp->history_head = scp->history_pos =
-	(u_short *)malloc(scp->history_size*sizeof(u_short),
-			  M_DEVBUF, M_WAITOK);
-    bzero(scp->history_head, scp->history_size*sizeof(u_short));
-    scp->history = scp->history_head;
+    sc_alloc_scr_buffer(scp, TRUE, TRUE);
+    if (ISMOUSEAVAIL(get_adapter(scp)->va_flags))
+	sc_alloc_cut_buffer(scp, TRUE);
+    sc_alloc_history_buffer(scp, sc_history_size, 0, TRUE);
 /* SOS
-    if (crtc_type == KD_VGA && video_mode_ptr)
+    if (get_adapter(scp)->va_flags & V_ADP_MODECHANGE)
 	set_mode(scp);
 */
-    clear_screen(scp);
+    sc_clear_screen(scp);
     scp->cursor_saveunder = *scp->cursor_pos;
     return scp;
 }
@@ -3629,43 +3183,29 @@ static scr_stat
 static void
 init_scp(scr_stat *scp)
 {
-    switch(crtc_type) {
-    case KD_VGA:
-	if (VESA_MODE(bios_video_mode))
-	    scp->mode = bios_video_mode;
-	else if (crtc_addr == MONO_BASE)
-	    scp->mode = M_VGA_M80x25;
-	else
-	    scp->mode = M_VGA_C80x25;
-	scp->font_size = 16;
-	break;
-    case KD_CGA:
-	if (crtc_addr == MONO_BASE)
-	    scp->mode = M_B80x25;
-	else
-	    scp->mode = M_C80x25;
-	scp->font_size = 8;
-	break;
-    case KD_EGA:
-	if (crtc_addr == MONO_BASE)
-	    scp->mode = M_B80x25;
-	else
-	    scp->mode = M_C80x25;
-	scp->font_size = 14;
-	break;
-    case KD_MONO:
-    case KD_HERCULES:
-    default:
-	scp->mode = M_EGAMONO80x25;
-	scp->font_size = 14;
-	break;
+    video_info_t info;
+
+    scp->adp = V_ADP_PRIMARY;
+    (*biosvidsw.get_info)(scp->adp, initial_video_mode, &info);
+
+    scp->status = 0;
+    scp->mode = scp->initial_mode = initial_video_mode;
+    scp->scr_buf = NULL;
+    if (info.vi_flags & V_INFO_GRAPHICS) {
+	scp->status |= GRAPHICS_MODE;
+	scp->xpixel = info.vi_width;
+	scp->ypixel = info.vi_height;
+	scp->xsize = info.vi_width/8;
+	scp->ysize = info.vi_height/info.vi_cheight;
+	scp->font_size = FONT_NONE;
+    } else {
+	scp->xsize = info.vi_width;
+	scp->ysize = info.vi_height;
+	scp->xpixel = scp->xsize*8;
+	scp->ypixel = scp->ysize*info.vi_cheight;
+	scp->font_size = info.vi_cheight;
     }
-    scp->initial_mode = scp->mode;
-
-    scp->xsize = COL;
-    scp->ysize = ROW;
-    scp->xpixel = scp->xsize * 8;
-    scp->ypixel = scp->ysize * scp->font_size;
+    scp->xoff = scp->yoff = 0;
     scp->xpos = scp->ypos = 0;
     scp->saved_xpos = scp->saved_ypos = -1;
     scp->start = scp->xsize * scp->ysize;
@@ -3677,8 +3217,8 @@ init_scp(scr_stat *scp)
 	current_default->std_color;
     scp->term.rev_color = current_default->rev_color;
     scp->border = BG_BLACK;
-    scp->cursor_start = *(char *)pa_to_va(0x461);
-    scp->cursor_end = *(char *)pa_to_va(0x460);
+    scp->cursor_start = *(u_int8_t *)pa_to_va(0x461);
+    scp->cursor_end = *(u_int8_t *)pa_to_va(0x460);
     scp->mouse_xpos = scp->xsize*8/2;
     scp->mouse_ypos = scp->ysize*scp->font_size/2;
     scp->mouse_cut_start = scp->mouse_cut_end = NULL;
@@ -3687,13 +3227,13 @@ init_scp(scr_stat *scp)
     scp->mouse_proc = NULL;
     scp->bell_pitch = BELL_PITCH;
     scp->bell_duration = BELL_DURATION;
-    scp->status = (*(char *)pa_to_va(0x417) & 0x20) ? NLKED : 0;
+    scp->status |= (*(u_int8_t *)pa_to_va(0x417) & 0x20) ? NLKED : 0;
     scp->status |= CURSOR_ENABLED;
     scp->pid = 0;
     scp->proc = NULL;
     scp->smode.mode = VT_AUTO;
     scp->history_head = scp->history_pos = scp->history = NULL;
-    scp->history_size = imax(SC_HISTORY_SIZE, scp->ysize) * scp->xsize;
+    scp->history_size = imax(sc_history_size, scp->ysize) * scp->xsize;
 }
 
 static u_char
@@ -4140,9 +3680,9 @@ next_code:
 			scsplash_stick(FALSE);
 			stop_scrn_saver(current_saver);
 		    } else {
-			if ((cur_console->status & UNKNOWN_MODE) == 0) {
+			if (!ISGRAPHSC(cur_console)) {
 			    scsplash_stick(TRUE);
-			    (*current_saver)(TRUE);
+			    scrn_saver(current_saver, TRUE);
 			}
 		    }
 		}
@@ -4409,475 +3949,100 @@ update_leds(int which)
     set_keyboard(KBDC_SET_LEDS, xlate_leds[which & LED_MASK]);
 }
 
-void
+int
 set_mode(scr_stat *scp)
 {
-    char special_modetable[MODE_PARAM_SIZE];
-    char *mp;
-    int s;
-    int i;
+    video_info_t info;
+    video_adapter_t *adp;
 
-    if (scp != cur_console)
-	return;
+    /* reject unsupported mode */
+    if ((*biosvidsw.get_info)(scp->adp, scp->mode, &info))
+	return 1;
 
-    /* 
-     * even if mode switching is disabled, we can change back
-     * to the initial mode or the custom mode based on the initial
-     * mode if we have saved register values upon start-up.
-     */
-    mp = get_mode_param(scp, scp->mode);
-    if (mp == NULL)
-	return;
-    bcopy(mp, &special_modetable, sizeof(special_modetable));
+    /* if this vty is not currently showing, do nothing */
+    if (scp != cur_console)
+	return 0;
 
     /* setup video hardware for the given mode */
-    switch (scp->mode) {
-    case M_VGA_C80x60: case M_VGA_M80x60:
-	special_modetable[2]  = 0x08;
-	special_modetable[19] = 0x47;
-	goto special_480l;
-
-    case M_VGA_C80x30: case M_VGA_M80x30:
-	special_modetable[19] = 0x4f;
-special_480l:
-	special_modetable[9] |= 0xc0;
-	special_modetable[16] = 0x08;
-	special_modetable[17] = 0x3e;
-	special_modetable[26] = 0xea;
-	special_modetable[28] = 0xdf;
-	special_modetable[31] = 0xe7;
-	special_modetable[32] = 0x04;
-	goto setup_mode;
-
-    case M_ENH_C80x43: case M_ENH_B80x43:
-	special_modetable[28] = 87;
-	goto special_80x50;
-
-    case M_VGA_C80x50: case M_VGA_M80x50:
-special_80x50:
-	special_modetable[2] = 8;
-	special_modetable[19] = 7;
-	goto setup_mode;
-
-    case M_VGA_C40x25: case M_VGA_C80x25:
-    case M_VGA_M80x25:
-    case M_B40x25:     case M_C40x25:
-    case M_B80x25:     case M_C80x25:
-    case M_ENH_B40x25: case M_ENH_C40x25:
-    case M_ENH_B80x25: case M_ENH_C80x25:
-    case M_EGAMONO80x25:
-
-setup_mode:
-	set_vgaregs(special_modetable);
-	scp->font_size = special_modetable[2];
-
-	/* set font type (size) */
-	if (scp->font_size < 14) {
-	    if (fonts_loaded & FONT_8)
-		copy_font(LOAD, FONT_8, font_8);
-	    i = 0x0a;				/* font 2 */
-	} else if (scp->font_size >= 16) {
-	    if (fonts_loaded & FONT_16)
-		copy_font(LOAD, FONT_16, font_16);
-	    i = 0x00;				/* font 0 */
-	} else {
-	    if (fonts_loaded & FONT_14)
-		copy_font(LOAD, FONT_14, font_14);
-	    i = 0x05;				/* font 1 */
+    adp = get_adapter(scp);
+    (*biosvidsw.set_mode)(scp->adp, scp->mode);
+    Crtat = (u_short *)adp->va_window;
+
+    if (!(scp->status & GRAPHICS_MODE)) {
+	/* load appropriate font */
+	if (!(scp->status & PIXEL_MODE) 
+	    && ISFONTAVAIL(get_adapter(scp)->va_flags)) {
+	    if (scp->font_size < 14) {
+		if (fonts_loaded & FONT_8)
+		    copy_font(scp, LOAD, 8, font_8);
+	    } else if (scp->font_size >= 16) {
+		if (fonts_loaded & FONT_16)
+		    copy_font(scp, LOAD, 16, font_16);
+	    } else {
+		if (fonts_loaded & FONT_14)
+		    copy_font(scp, LOAD, 14, font_14);
+	    }
+	    /*
+	    * FONT KLUDGE:
+	    * This is an interim kludge to display correct font.
+	    * Always use the font page #0 on the video plane 2.
+	    * Somehow we cannot show the font in other font pages on
+	    * some video cards... XXX
+	    */ 
+	    (*biosvidsw.show_font)(scp->adp, 0);
 	}
-	/*
-	 * FONT KLUDGE:
-	 * This is an interim kludge to display correct font.
-	 * Always use the font page #0 on the video plane 2.
-	 * Somehow we cannot show the font in other font pages on
-	 * some video cards... XXX
-	 */
-	i = 0x00;
-	s = splhigh();
-	outb(TSIDX, 0x00); outb(TSREG, 0x01);
-	outb(TSIDX, 0x03); outb(TSREG, i);
-	outb(TSIDX, 0x00); outb(TSREG, 0x03);
-	splx(s);
-	if (flags & CHAR_CURSOR)
-	    set_destructive_cursor(scp);
 	mark_all(scp);
-	break;
-
-    case M_VGA_MODEX:
-	/* "unchain" the VGA mode */
-	special_modetable[5-1+0x04] &= 0xf7;
-	special_modetable[5-1+0x04] |= 0x04;
-	/* turn off doubleword mode */
-	special_modetable[10+0x14] &= 0xbf;
-	/* turn off word adressing */
-	special_modetable[10+0x17] |= 0x40;
-	/* set logical screen width */
-	special_modetable[10+0x13] = 80;
-	/* set 240 lines */
-	special_modetable[10+0x11] = 0x2c;
-	special_modetable[10+0x06] = 0x0d;
-	special_modetable[10+0x07] = 0x3e;
-	special_modetable[10+0x10] = 0xea;
-	special_modetable[10+0x11] = 0xac;
-	special_modetable[10+0x12] = 0xdf;
-	special_modetable[10+0x15] = 0xe7;
-	special_modetable[10+0x16] = 0x06;
-	/* set vertical sync polarity to reflect aspect ratio */
-	special_modetable[9] = 0xe3;
-	goto setup_grmode;
-
-    case M_BG320:     case M_CG320:     case M_BG640:
-    case M_CG320_D:   case M_CG640_E:
-    case M_CG640x350: case M_ENH_CG640:
-    case M_BG640x480: case M_CG640x480: case M_VGA_CG320:
-
-setup_grmode:
-	set_vgaregs(special_modetable);
-	scp->font_size = FONT_NONE;
-	break;
-
-    default:
-	/* call user defined function XXX */
-	break;
-    }
-
-    /* set border color for this (virtual) console */
-    set_border(scp->border);
-    return;
-}
-
-void
-set_border(u_char color)
-{
-    switch (crtc_type) {
-    case KD_EGA:
-    case KD_VGA:
-        inb(crtc_addr + 6);		/* reset flip-flop */
-        outb(ATC, 0x31); outb(ATC, color);
-	break;
-    case KD_CGA:
-	outb(crtc_addr + 5, color & 0x0f); /* color select register */
-	break;
-    case KD_MONO:
-    case KD_HERCULES:
-    default:
-	break;
     }
-}
-
-static void
-set_vgaregs(char *modetable)
-{
-    int i, s = splhigh();
-
-    outb(TSIDX, 0x00); outb(TSREG, 0x01);   	/* stop sequencer */
-    for (i=0; i<4; i++) {           		/* program sequencer */
-	outb(TSIDX, i+1);
-	outb(TSREG, modetable[i+5]);
-    }
-    outb(MISC, modetable[9]);       		/* set dot-clock */
-    outb(TSIDX, 0x00); outb(TSREG, 0x03);   	/* start sequencer */
-    outb(crtc_addr, 0x11);
-    outb(crtc_addr+1, inb(crtc_addr+1) & 0x7F);
-    for (i=0; i<25; i++) {          		/* program crtc */
-	outb(crtc_addr, i);
-	if (i == 14 || i == 15)     		/* no hardware cursor */
-	    outb(crtc_addr+1, 0xff);
-	else
-	    outb(crtc_addr+1, modetable[i+10]);
-    }
-    inb(crtc_addr+6);           		/* reset flip-flop */
-    for (i=0; i<20; i++) {          		/* program attribute ctrl */
-	outb(ATC, i);
-	outb(ATC, modetable[i+35]);
-    }
-    for (i=0; i<9; i++) {           		/* program graph data ctrl */
-	outb(GDCIDX, i);
-	outb(GDCREG, modetable[i+55]);
-    }
-    inb(crtc_addr+6);           		/* reset flip-flop */
-    outb(ATC, 0x20);            		/* enable palette */
-    splx(s);
-}
-
-static void
-read_vgaregs(char *buf)
-{
-    int i, j;
-    int s;
+    set_border(scp, scp->border);
 
-    bzero(buf, MODE_PARAM_SIZE);
-
-    s = splhigh();
-
-    outb(TSIDX, 0x00); outb(TSREG, 0x01);   	/* stop sequencer */
-    for (i=0, j=5; i<4; i++) {           
-	outb(TSIDX, i+1);
-	buf[j++] = inb(TSREG);
-    }
-    buf[9] = inb(MISC + 10);      		/* dot-clock */
-    outb(TSIDX, 0x00); outb(TSREG, 0x03);   	/* start sequencer */
-
-    for (i=0, j=10; i<25; i++) {       		/* crtc */
-	outb(crtc_addr, i);
-	buf[j++] = inb(crtc_addr+1);
-    }
-    for (i=0, j=35; i<20; i++) {          	/* attribute ctrl */
-        inb(crtc_addr+6);           		/* reset flip-flop */
-	outb(ATC, i);
-	buf[j++] = inb(ATC + 1);
-    }
-    for (i=0, j=55; i<9; i++) {           	/* graph data ctrl */
-	outb(GDCIDX, i);
-	buf[j++] = inb(GDCREG);
-    }
-    inb(crtc_addr+6);           		/* reset flip-flop */
-    outb(ATC, 0x20);            		/* enable palette */
-
-    buf[0] = *(char *)pa_to_va(0x44a);		/* COLS */
-    buf[1] = *(char *)pa_to_va(0x484);		/* ROWS */
-    buf[2] = *(char *)pa_to_va(0x485);		/* POINTS */
-    buf[3] = *(char *)pa_to_va(0x44c);
-    buf[4] = *(char *)pa_to_va(0x44d);
-
-    splx(s);
-}
-
-static int 
-comp_vgaregs(u_char *buf1, u_char *buf2)
-{
-    static struct {
-        u_char mask;
-    } params[MODE_PARAM_SIZE] = {
-	0xff, 0x00, 0xff, 		/* COLS, ROWS, POINTS */
-	0xff, 0xff, 			/* page length */
-	0xfe, 0xff, 0xff, 0xff,		/* sequencer registers */
-	0xf3,				/* misc register */
-	0xff, 0xff, 0xff, 0x7f, 0xff,	/* CRTC */
-	0xff, 0xff, 0xff, 0x7f, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xff, 0x7f, 0xff, 0xff,
-	0x7f, 0xff, 0xff, 0xef, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff,	/* attribute controller registers */
-	0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xf0,
-	0xff, 0xff, 0xff, 0xff, 0xff,	/* GDC register */
-	0xff, 0xff, 0xff, 0xff, 
-    }; 
-    int identical = TRUE;
-    int i;
-
-    for (i = 0; i < sizeof(params)/sizeof(params[0]); ++i) {
-	if (params[i].mask == 0)	/* don't care */
-	    continue;
-	if ((buf1[i] & params[i].mask) != (buf2[i] & params[i].mask))
-	    return COMP_DIFFERENT;
-	if (buf1[i] != buf2[i])
-	    identical = FALSE;
-    }
-    return (identical) ? COMP_IDENTICAL : COMP_SIMILAR;
-
-#if 0
-    for(i = 0; i < 20; ++i) {
-	if (*buf1++ != *buf2++)
-	    return COMP_DIFFERENT;
-    }
-    buf1 += 2;  /* skip the cursor shape */
-    buf2 += 2;
-    for(i = 22; i < 24; ++i) {
-	if (*buf1++ != *buf2++)
-	    return COMP_DIFFERENT;
-    }
-    buf1 += 2;  /* skip the cursor position */
-    buf2 += 2;
-    for(i = 26; i < MODE_PARAM_SIZE; ++i) {
-	if (*buf1++ != *buf2++)
-	    return COMP_DIFFERENT;
-    }
-    return COMP_IDENTICAL;
-#endif
-}
-
-static void
-dump_vgaregs(u_char *buf)
-{
-    int i;
+    /* move hardware cursor out of the way */
+    (*biosvidsw.set_hw_cursor)(scp->adp, -1, -1);
 
-    for(i = 0; i < MODE_PARAM_SIZE;) {
-	printf("%02x ", buf[i]);
-	if ((++i % 16) == 0)
-	    printf("\n");
-    }
+    return 0;
 }
 
-static void
-set_font_mode(u_char *buf)
+void
+copy_font(scr_stat *scp, int operation, int font_size, u_char *buf)
 {
-    int s = splhigh();
-
+    /*
+     * FONT KLUDGE:
+     * This is an interim kludge to display correct font.
+     * Always use the font page #0 on the video plane 2.
+     * Somehow we cannot show the font in other font pages on
+     * some video cards... XXX
+     */ 
     font_loading_in_progress = TRUE;
-
-    /* save register values */
-    outb(TSIDX, 0x02); buf[0] = inb(TSREG);
-    outb(TSIDX, 0x04); buf[1] = inb(TSREG);
-    outb(GDCIDX, 0x04); buf[2] = inb(GDCREG);
-    outb(GDCIDX, 0x05); buf[3] = inb(GDCREG);
-    outb(GDCIDX, 0x06); buf[4] = inb(GDCREG);
-    inb(crtc_addr + 6);
-    outb(ATC, 0x10); buf[5] = inb(ATC + 1);
-
-    /* setup vga for loading fonts */
-    inb(crtc_addr+6);           		/* reset flip-flop */
-    outb(ATC, 0x10); outb(ATC, buf[5] & ~0x01);
-    inb(crtc_addr+6);               		/* reset flip-flop */
-    outb(ATC, 0x20);            		/* enable palette */
-
-#if SLOW_VGA
-#ifndef SC_BAD_FLICKER
-    outb(TSIDX, 0x00); outb(TSREG, 0x01);
-#endif
-    outb(TSIDX, 0x02); outb(TSREG, 0x04);
-    outb(TSIDX, 0x04); outb(TSREG, 0x07);
-#ifndef SC_BAD_FLICKER
-    outb(TSIDX, 0x00); outb(TSREG, 0x03);
-#endif
-    outb(GDCIDX, 0x04); outb(GDCREG, 0x02);
-    outb(GDCIDX, 0x05); outb(GDCREG, 0x00);
-    outb(GDCIDX, 0x06); outb(GDCREG, 0x04);
-#else
-#ifndef SC_BAD_FLICKER
-    outw(TSIDX, 0x0100);
-#endif
-    outw(TSIDX, 0x0402);
-    outw(TSIDX, 0x0704);
-#ifndef SC_BAD_FLICKER
-    outw(TSIDX, 0x0300);
-#endif
-    outw(GDCIDX, 0x0204);
-    outw(GDCIDX, 0x0005);
-    outw(GDCIDX, 0x0406);               /* addr = a0000, 64kb */
-#endif
-    splx(s);
-}
-
-static void
-set_normal_mode(u_char *buf)
-{
-    char *modetable;
-    int s = splhigh();
-
-    /* setup vga for normal operation mode again */
-    inb(crtc_addr+6);           		/* reset flip-flop */
-    outb(ATC, 0x10); outb(ATC, buf[5]);
-    inb(crtc_addr+6);               		/* reset flip-flop */
-    outb(ATC, 0x20);            		/* enable palette */
-
-#if SLOW_VGA
-#ifndef SC_BAD_FLICKER
-    outb(TSIDX, 0x00); outb(TSREG, 0x01);
-#endif
-    outb(TSIDX, 0x02); outb(TSREG, buf[0]);
-    outb(TSIDX, 0x04); outb(TSREG, buf[1]);
-#ifndef SC_BAD_FLICKER
-    outb(TSIDX, 0x00); outb(TSREG, 0x03);
-#endif
-    outb(GDCIDX, 0x04); outb(GDCREG, buf[2]);
-    outb(GDCIDX, 0x05); outb(GDCREG, buf[3]);
-    if (crtc_addr == MONO_BASE) {
-	outb(GDCIDX, 0x06); outb(GDCREG,(buf[4] & 0x03) | 0x08);
-    } else {
-	outb(GDCIDX, 0x06); outb(GDCREG,(buf[4] & 0x03) | 0x0c);
+    if (operation == LOAD) {
+	(*biosvidsw.load_font)(scp->adp, 0, font_size, buf, 0, 256);
+	if (flags & CHAR_CURSOR)
+	    set_destructive_cursor(scp);
+    } else if (operation == SAVE) {
+	(*biosvidsw.save_font)(scp->adp, 0, font_size, buf, 0, 256);
     }
-#else
-#ifndef SC_BAD_FLICKER
-    outw(TSIDX, 0x0100);
-#endif
-    outw(TSIDX, 0x0002 | (buf[0] << 8));
-    outw(TSIDX, 0x0004 | (buf[1] << 8));
-#ifndef SC_BAD_FLICKER
-    outw(TSIDX, 0x0300);
-#endif
-    outw(GDCIDX, 0x0004 | (buf[2] << 8));
-    outw(GDCIDX, 0x0005 | (buf[3] << 8));
-    if (crtc_addr == MONO_BASE)
-        outw(GDCIDX, 0x0006 | (((buf[4] & 0x03) | 0x08)<<8));
-    else
-        outw(GDCIDX, 0x0006 | (((buf[4] & 0x03) | 0x0c)<<8));
-#endif
-
     font_loading_in_progress = FALSE;
-    splx(s);
-}
-
-void
-copy_font(int operation, int font_type, char* font_image)
-{
-    int ch, line, segment, fontsize;
-    u_char buf[PARAM_BUFSIZE];
-    u_char val;
-
-    switch (font_type) {
-    default:
-    case FONT_8:
-	segment = 0x8000;
-	fontsize = 8;
-	break;
-    case FONT_14:
-	segment = 0x4000;
-	fontsize = 14;
-	break;
-    case FONT_16:
-	segment = 0x0000;
-	fontsize = 16;
-	break;
-    }
-    /*
-     * FONT KLUDGE
-     * Always use the font page #0. XXX
-     */
-    segment = 0x0000;
-    outb(TSIDX, 0x01); val = inb(TSREG);        /* disable screen */
-    outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
-    set_font_mode(buf);
-    for (ch=0; ch < 256; ch++)
-	for (line=0; line < fontsize; line++)
-	if (operation)
-	    *(char *)pa_to_va(VIDEOMEM+(segment)+(ch*32)+line) =
-		    font_image[(ch*fontsize)+line];
-	else
-	    font_image[(ch*fontsize)+line] =
-	    *(char *)pa_to_va(VIDEOMEM+(segment)+(ch*32)+line);
-    set_normal_mode(buf);
-    outb(TSIDX, 0x01); outb(TSREG, val & 0xDF); /* enable screen */
 }
 
 static void
 set_destructive_cursor(scr_stat *scp)
 {
-    u_char buf[PARAM_BUFSIZE];
     u_char cursor[32];
-    caddr_t address;
+    u_char *font_buffer;
+    int font_size;
     int i;
-    char *font_buffer;
+
+    if (!ISFONTAVAIL(get_adapter(scp)->va_flags) || !ISTEXTSC(scp))
+	return;
 
     if (scp->font_size < 14) {
 	font_buffer = font_8;
-	address = (caddr_t)VIDEOMEM + 0x8000;
-    }
-    else if (scp->font_size >= 16) {
+	font_size = 8;
+    } else if (scp->font_size >= 16) {
 	font_buffer = font_16;
-	address = (caddr_t)VIDEOMEM;
-    }
-    else {
+	font_size = 16;
+    } else {
 	font_buffer = font_14;
-	address = (caddr_t)VIDEOMEM + 0x4000;
+	font_size = 14;
     }
-    /*
-     * FONT KLUDGE
-     * Always use the font page #0. XXX
-     */
-    address = (caddr_t)VIDEOMEM;
 
     if (scp->status & MOUSE_VISIBLE) {
 	if ((scp->cursor_saveunder & 0xff) == SC_MOUSE_CHAR)
@@ -4902,9 +4067,18 @@ set_destructive_cursor(scr_stat *scp)
 #if 1
     while (!(inb(crtc_addr+6) & 0x08)) /* wait for vertical retrace */ ;
 #endif
-    set_font_mode(buf);
-    generic_bcopy(cursor, (char *)pa_to_va(address) + DEAD_CHAR * 32, 32);
-    set_normal_mode(buf);
+    font_loading_in_progress = TRUE;
+    (*biosvidsw.load_font)(scp->adp, 0, font_size, cursor, DEAD_CHAR, 1);
+    font_loading_in_progress = FALSE;
+}
+
+void
+sc_move_mouse(scr_stat *scp, int x, int y)
+{
+    scp->mouse_xpos = x;
+    scp->mouse_ypos = y;
+    scp->mouse_pos = scp->mouse_oldpos = 
+	scp->scr_buf + (y / scp->font_size) * scp->xsize + x / 8;
 }
 
 static void
@@ -4916,7 +4090,7 @@ set_mouse_pos(scr_stat *scp)
 	scp->mouse_xpos = 0;
     if (scp->mouse_ypos < 0)
 	scp->mouse_ypos = 0;
-    if (scp->status & UNKNOWN_MODE) {
+    if (!ISTEXTSC(scp)) {
         if (scp->mouse_xpos > scp->xpixel-1)
 	    scp->mouse_xpos = scp->xpixel-1;
         if (scp->mouse_ypos > scp->ypixel-1)
@@ -5146,35 +4320,26 @@ mouse_paste(scr_stat *scp)
 static void
 draw_mouse_image(scr_stat *scp)
 {
-    caddr_t address;
-    int i;
-    char *font_buffer;
-    u_char buf[PARAM_BUFSIZE];
     u_short buffer[32];
     u_short xoffset, yoffset;
     u_short *crt_pos = Crtat + (scp->mouse_pos - scp->scr_buf);
-    int font_size = scp->font_size;
+    u_char *font_buffer;
+    int font_size;
+    int i;
 
-    if (font_size < 14) {
+    if (scp->font_size < 14) {
 	font_buffer = font_8;
-	address = (caddr_t)VIDEOMEM + 0x8000;
-    }
-    else if (font_size >= 16) {
+	font_size = 8;
+    } else if (scp->font_size >= 16) {
 	font_buffer = font_16;
-	address = (caddr_t)VIDEOMEM;
-    }
-    else {
+	font_size = 16;
+    } else {
 	font_buffer = font_14;
-	address = (caddr_t)VIDEOMEM + 0x4000;
+	font_size = 14;
     }
-    /*
-     * FONT KLUDGE
-     * Always use the font page #0. XXX
-     */
-    address = (caddr_t)VIDEOMEM;
 
     xoffset = scp->mouse_xpos % 8;
-    yoffset = scp->mouse_ypos % font_size;
+    yoffset = scp->mouse_ypos % scp->font_size;
 
     /* prepare mousepointer char's bitmaps */
     bcopy(font_buffer + ((*(scp->mouse_pos) & 0xff) * font_size),
@@ -5209,9 +4374,11 @@ draw_mouse_image(scr_stat *scp)
     /* wait for vertical retrace to avoid jitter on some videocards */
     while (!(inb(crtc_addr+6) & 0x08)) /* idle */ ;
 #endif
-    set_font_mode(buf);
-    generic_bcopy(scp->mouse_cursor, (char *)pa_to_va(address) + SC_MOUSE_CHAR * 32, 128);
-    set_normal_mode(buf);
+    font_loading_in_progress = TRUE;
+    (*biosvidsw.load_font)(scp->adp, 0, 32, scp->mouse_cursor, 
+			   SC_MOUSE_CHAR, 4); 
+    font_loading_in_progress = FALSE;
+
     *(crt_pos) = (*(scp->mouse_pos) & 0xff00) | SC_MOUSE_CHAR;
     *(crt_pos+scp->xsize) = 
 	(*(scp->mouse_pos + scp->xsize) & 0xff00) | (SC_MOUSE_CHAR + 2);
@@ -5229,6 +4396,8 @@ remove_mouse_image(scr_stat *scp)
 {
     u_short *crt_pos = Crtat + (scp->mouse_oldpos - scp->scr_buf);
 
+    if (!ISTEXTSC(scp))
+	return;
     *(crt_pos) = *(scp->mouse_oldpos);
     *(crt_pos+1) = *(scp->mouse_oldpos+1);
     *(crt_pos+scp->xsize) = *(scp->mouse_oldpos+scp->xsize);
@@ -5278,30 +4447,6 @@ remove_cutmarking(scr_stat *scp)
     mark_all(scp);
 }
 
-static void
-save_palette(void)
-{
-    int i;
-
-    outb(PALRADR, 0x00);
-    for (i=0x00; i<0x300; i++)
-	palette[i] = inb(PALDATA);
-    inb(crtc_addr+6);           /* reset flip/flop */
-}
-
-void
-load_palette(char *palette)
-{
-    int i;
-
-    outb(PIXMASK, 0xFF);            /* no pixelmask */
-    outb(PALWADR, 0x00);
-    for (i=0x00; i<0x300; i++)
-	 outb(PALDATA, palette[i]);
-    inb(crtc_addr+6);           /* reset flip/flop */
-    outb(ATC, 0x20);            /* enable palette */
-}
-
 static void
 do_bell(scr_stat *scp, int pitch, int duration)
 {
@@ -5330,7 +4475,7 @@ blink_screen(void *arg)
 {
     scr_stat *scp = arg;
 
-    if ((scp->status & UNKNOWN_MODE) || (blink_in_progress <= 1)) {
+    if (!ISTEXTSC(scp) || (blink_in_progress <= 1)) {
 	blink_in_progress = FALSE;
     	mark_all(scp);
 	if (delayed_next_scr)
@@ -5351,25 +4496,41 @@ blink_screen(void *arg)
 void 
 sc_bcopy(scr_stat *scp, u_short *p, int from, int to, int mark)
 {
-    if (!VESA_MODE(scp->mode)) {
-	generic_bcopy(p+from, Crtat+from, (to-from+1)*sizeof (u_short));
-    } else if (scp->mode == 0x102) {
-	u_char *d, *e;
-	int i,j;
+    u_char *font;
+    u_char *d, *e;
+    u_char *f;
+    int font_size;
+    int line_length;
+    int xsize;
+    int i, j;
 
+    if (ISTEXTSC(scp)) {
+	generic_bcopy(p+from, Crtat+from, (to-from+1)*sizeof (u_short));
+    } else /* if ISPIXELSC(scp) */ {
 	if (mark)
-		mark = 255;
-	d = (u_char *)Crtat;
-	d += 10 + 6*16*100 + (from%80) + 16*100*(from/80);
+	    mark = 255;
+	font_size = scp->font_size;
+	if (font_size < 14)
+	    font = font_8;
+	else if (font_size >= 16)
+	    font = font_16;
+	else
+	    font = font_14;
+	line_length = scp->xpixel/8;
+	xsize = scp->xsize;
+	d = (u_char *)Crtat 
+	    + scp->xoff + scp->yoff*font_size*line_length 
+	    + (from%xsize) + font_size*line_length*(from/xsize);
 	for (i = from ; i <= to ; i++) {
 	    e = d;
-	    for (j = 0 ; j < 16; j++) {
-	        *e = mark^font_16[(p[i]&0xff)*16+j];
-		e+=100;
+	    f = &font[(p[i] & 0x00ff)*font_size];
+	    for (j = 0 ; j < font_size; j++, f++) {
+	        *e = mark^*f;
+		e += line_length;
 	    }
 	    d++;
-	    if ((i % 80) == 79)
-		d += 20 + 15*100;
+	    if ((i % xsize) == xsize - 1)
+		d += scp->xoff*2 + (font_size - 1)*line_length;
 	}
     }
 }
@@ -5377,34 +4538,36 @@ sc_bcopy(scr_stat *scp, u_short *p, int from, int to, int mark)
 #ifdef SC_SPLASH_SCREEN
 
 static void
-scsplash_init(void)
+scsplash_init(scr_stat *scp)
 {
+    video_info_t info;
+
     /* 
      * We currently assume the splash screen always use
      * VGA_CG320 mode and abort installation if this mode is not
      * supported with this video card. XXX
      */
-    if (crtc_type != KD_VGA || get_mode_param(cur_console, M_VGA_CG320) == NULL)
+    if ((*biosvidsw.get_info)(scp->adp, M_VGA_CG320, &info))
 	return;
 
-    if (splash_load() == 0 && add_scrn_saver(scsplash) == 0) {
-	default_saver = scsplash;
+    if (scsplash_load(scp) == 0 && add_scrn_saver(scsplash_saver) == 0) {
+	default_saver = scsplash_saver;
 	scrn_blank_time = DEFAULT_BLANKTIME;
 	run_scrn_saver = TRUE;
-	if (!(boothowto & RB_CONFIG)) {
+	if (!(boothowto & (RB_VERBOSE | RB_CONFIG))) {
 	    scsplash_stick(TRUE);
-	    scsplash(TRUE);
+	    scsplash_saver(TRUE);
 	}
     }
 }
 
 static void
-scsplash(int show)
+scsplash_saver(int show)
 {
     if (show)
-	splash(TRUE);
+	scsplash(TRUE);
     else if (!sticky_splash)
-	splash(FALSE);
+	scsplash(FALSE);
 }
 
 #endif /* SC_SPLASH_SCREEN */
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index b23a2ae7c5da..315946b57305 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995-1997 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.h,v 1.38 1998/08/03 09:09:35 yokota Exp $
+ *	$Id$
  */
 
 #ifndef _I386_ISA_SYSCONS_H_
@@ -65,6 +65,9 @@
 #define MOUSE_MOVED	0x01000
 #define MOUSE_CUTTING	0x02000
 #define MOUSE_VISIBLE	0x04000
+#define GRAPHICS_MODE	0x08000
+#define PIXEL_MODE	0x10000
+#define SAVER_RUNNING	0x20000
 
 /* configuration flags */
 #define VISUAL_BELL	0x00001
@@ -74,6 +77,7 @@
 #define XT_KEYBD	0x00010
 #define KBD_NORESET	0x00020
 #define QUIET_BELL	0x00040
+#define VESA800X600	0x00080
 
 /* attribute flags */
 #define NORMAL_ATTR             0x00
@@ -84,9 +88,6 @@
 #define FOREGROUND_CHANGED      0x10
 #define BACKGROUND_CHANGED      0x20
 
-/* video hardware memory addresses */
-#define VIDEOMEM	0x000A0000
-
 /* misc defines */
 #define FALSE		0
 #define TRUE		1
@@ -104,20 +105,6 @@
 #define FONT_14		4
 #define FONT_16		8
 
-/* defines related to hardware addresses */
-#define	MONO_BASE	0x3B4			/* crt controller base mono */
-#define	COLOR_BASE	0x3D4			/* crt controller base color */
-#define MISC		0x3C2			/* misc output register */
-#define ATC		IO_VGA+0x00		/* attribute controller */
-#define TSIDX		IO_VGA+0x04		/* timing sequencer idx */
-#define TSREG		IO_VGA+0x05		/* timing sequencer data */
-#define PIXMASK		IO_VGA+0x06		/* pixel write mask */
-#define PALRADR		IO_VGA+0x07		/* palette read address */
-#define PALWADR		IO_VGA+0x08		/* palette write address */
-#define PALDATA		IO_VGA+0x09		/* palette data register */
-#define GDCIDX		IO_VGA+0x0E		/* graph data controller idx */
-#define GDCREG		IO_VGA+0x0F		/* graph data controller data */
-
 /* special characters */
 #define cntlc		0x03
 #define cntld		0x04
@@ -141,6 +128,7 @@ typedef struct term_stat {
 } term_stat;
 
 typedef struct scr_stat {
+	int		adp;			/* video adapter index */
 	u_short 	*scr_buf;		/* buffer when off screen */
 	int 		xpos;			/* current X position */
 	int 		ypos;			/* current Y position */
@@ -150,6 +138,8 @@ typedef struct scr_stat {
 	int 		ysize;			/* Y text size */
 	int 		xpixel;			/* X graphics size */
 	int 		ypixel;			/* Y graphics size */
+	int		xoff;			/* X offset in pixel mode */
+	int		yoff;			/* Y offset in pixel mode */
 	int		font_size;		/* fontsize in Y direction */
 	int		start;			/* modified area start */
 	int		end;			/* modified area end */
@@ -186,7 +176,8 @@ typedef struct scr_stat {
 	int		history_size;		/* size of history buffer */
 	struct apmhook  r_hook;			/* reconfiguration support */
 #ifdef SC_SPLASH_SCREEN
-	u_char		splash_save_mode;	/* saved mode for splash screen */
+	int		splash_save_mode;	/* saved mode for splash screen */
+	int		splash_save_status;	/* saved status for splash screen */
 #endif
 } scr_stat;
 
@@ -195,18 +186,59 @@ typedef struct default_attr {
 	int             rev_color;              /* reverse hardware color */
 } default_attr;
 
+
+#define ISTEXTSC(scp)	(!((scp)->status 				\
+			  & (UNKNOWN_MODE | GRAPHICS_MODE | PIXEL_MODE)))
+#define ISGRAPHSC(scp)	(((scp)->status 				\
+			  & (UNKNOWN_MODE | GRAPHICS_MODE)))
+#define ISPIXELSC(scp)	(((scp)->status 				\
+			  & (UNKNOWN_MODE | GRAPHICS_MODE | PIXEL_MODE))\
+			  == PIXEL_MODE)
+#define ISUNKNOWNSC(scp) ((scp)->status & UNKNOWN_MODE)
+
+#define ISFONTAVAIL(af)	((af) & V_ADP_FONT)
+#define ISMOUSEAVAIL(af) ((af) & V_ADP_FONT)
+#define ISPALAVAIL(af)	((af) & V_ADP_PALETTE)
+
 /* misc prototypes used by different syscons related LKM's */
-void set_border(u_char color);
-void set_mode(scr_stat *scp);
-void copy_font(int operation, int font_type, char* font_image);
-void load_palette(char *palette);
+
+/* syscons.c */
+extern int (*sc_user_ioctl)(dev_t dev, int cmd, caddr_t data, int flag, 
+			    struct proc *p);
+
+int set_mode(scr_stat *scp);
+scr_stat *sc_get_scr_stat(dev_t dev);
+
+void copy_font(scr_stat *scp, int operation, int font_size, u_char *font_image);
+#define save_palette(scp, pal)	(*biosvidsw.save_palette)((scp)->adp, pal)
+#define load_palette(scp, pal)	(*biosvidsw.load_palette)((scp)->adp, pal)
+#define set_border(scp, col)	(*biosvidsw.set_border)((scp)->adp, col)
+#define get_adapter(scp)	(*biosvidsw.adapter)((scp)->adp)
+
 int add_scrn_saver(void (*this)(int));
 int remove_scrn_saver(void (*this)(int));
 
+void sc_clear_screen(scr_stat *scp);
+void sc_move_mouse(scr_stat *scp, int x, int y);
+int sc_clean_up(scr_stat *scp);
+void sc_alloc_scr_buffer(scr_stat *scp, int wait, int clear);
+void sc_alloc_cut_buffer(scr_stat *scp, int wait);
+void sc_alloc_history_buffer(scr_stat *scp, int lines, int extra, int wait);
+
+/* scvidctl.c */
+int sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode,
+		     int xsize, int ysize, int fontsize);
+int sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode);
+int sc_set_pixel_mode(scr_stat *scp, struct tty *tp,
+		      int xsize, int ysize, int fontsize);
+int sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, 
+		 struct proc *p);
+
 #ifdef SC_SPLASH_SCREEN
-void splash(int);
-int splash_load(void);
-int splash_unload(void);
+/* splash.c */
+void scsplash(int);
+int scsplash_load(scr_stat *scp);
+int scsplash_unload(scr_stat *scp);
 #endif
 
 #endif /* !_I386_ISA_SYSCONS_H_ */
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 2d8c4a883224..8b20f861bacc 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.464 1998/09/15 10:01:13 gibbs Exp $
+#	$Id: LINT,v 1.465 1998/09/15 11:44:43 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -803,6 +803,9 @@ options		SC_HISTORY_SIZE=200	# number of history buffer lines
 options		SC_DISABLE_REBOOT	# disable reboot key sequence
 # If the screen flickers badly when the mouse pointer is moved, try this.
 options		SC_BAD_FLICKER
+# To include support for VESA video modes
+# Dont use together with SMP!!
+options		VESA			# needs VM86 defined too!!
 
 #
 # `flags' for sc0:
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 2d8c4a883224..8b20f861bacc 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.464 1998/09/15 10:01:13 gibbs Exp $
+#	$Id: LINT,v 1.465 1998/09/15 11:44:43 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -803,6 +803,9 @@ options		SC_HISTORY_SIZE=200	# number of history buffer lines
 options		SC_DISABLE_REBOOT	# disable reboot key sequence
 # If the screen flickers badly when the mouse pointer is moved, try this.
 options		SC_BAD_FLICKER
+# To include support for VESA video modes
+# Dont use together with SMP!!
+options		VESA			# needs VM86 defined too!!
 
 #
 # `flags' for sc0:
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 5302df40d509..6a0847003632 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.202 1998/09/08 20:57:46 sos Exp $
+#	$Id: files.i386,v 1.203 1998/09/15 10:01:13 gibbs Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -240,6 +240,10 @@ i386/isa/spigot.c		optional	spigot	device-driver
 i386/isa/spkr.c			optional	speaker	device-driver
 i386/isa/stallion.c		optional	stl	device-driver
 i386/isa/syscons.c		optional	sc	device-driver
+i386/isa/scvidctl.c		optional	sc	device-driver
+i386/isa/scvesactl.c		optional	sc	device-driver
+i386/isa/videoio.c		optional	sc	device-driver
+i386/isa/vesa.c			optional	sc	device-driver
 i386/isa/tw.c			optional	tw	device-driver
 #i386/isa/ultra14f.c		optional	uha	device-driver
 i386/isa/wd.c			optional	wdc	device-driver
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index c07d086cbdf4..21c45983b680 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.85 1998/09/08 18:09:50 brian Exp $
+#	$Id: options.i386,v 1.86 1998/09/15 10:01:14 gibbs Exp $
 
 BOUNCEPAGES		opt_bounce.h
 DISABLE_PSE
@@ -77,6 +77,8 @@ SC_DISABLE_REBOOT	opt_syscons.h
 SC_MOUSE_CHAR		opt_syscons.h
 SC_BAD_FLICKER		opt_syscons.h
 
+VESA			opt_vesa.h
+
 PSM_HOOKAPM		opt_psm.h
 PSM_RESETAFTERSUSPEND	opt_psm.h
 PSM_DEBUG		opt_psm.h
diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h
index 7503746c8420..3373e608eabf 100644
--- a/sys/i386/include/console.h
+++ b/sys/i386/include/console.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: console.h,v 1.37 1998/07/06 06:29:06 imp Exp $
+ *	$Id: console.h,v 1.38 1998/08/03 11:30:28 yokota Exp $
  */
 
 #ifndef	_MACHINE_CONSOLE_H_
@@ -51,6 +51,7 @@
 #define KDGETLED	_IOR('K', 65, int)
 #define KDSETLED	_IO('K', 66 /*, int */)
 #define KDSETRAD	_IO('K', 67 /*, int */)
+#define KDRASTER	_IOW('K', 100, scr_size_t)
 
 #define GETFKEY		_IOWR('k', 0, fkeyarg_t)
 #define SETFKEY		_IOWR('k', 1, fkeyarg_t)
@@ -84,6 +85,11 @@
 #define GIO_FONT8x16	_IOR('c', 69, fnt16_t)
 #define CONS_GETINFO    _IOWR('c', 73, vid_info_t)
 #define CONS_GETVERS	_IOR('c', 74, int)
+#define CONS_CURRENTADP	_IOR('c', 100, int)
+#define CONS_ADPINFO	_IOWR('c', 101, video_adapter_t)
+#define CONS_MODEINFO	_IOWR('c', 102, video_info_t)
+#define CONS_FINDMODE	_IOWR('c', 103, video_info_t)
+#define CONS_SETWINORG	_IO('c', 104 /* u_int */) 
 
 /* CONS_SAVERMODE */
 #define CONS_LKM_SAVER	0
@@ -169,6 +175,7 @@ struct mouse_info {
 #define KD_TEXT0	0		/* ditto			*/
 #define KD_TEXT1	2		/* set text mode !restore fonts */
 #define KD_GRAPHICS	1		/* set graphics mode 		*/
+#define KD_PIXEL	3		/* set pixel mode		*/
 
 #define K_RAW		0		/* keyboard returns scancodes	*/
 #define K_XLATE		1		/* keyboard returns ascii 	*/
@@ -263,6 +270,55 @@ struct ssaver	{
 	long	time;
 };
 
+/* adapter infromation block */
+struct video_adapter {
+    int			va_index;
+    int			va_type;
+    int			va_flags;
+#define V_ADP_COLOR	(1<<0)
+#define V_ADP_MODECHANGE (1<<1)
+#define V_ADP_STATESAVE	(1<<2)
+#define V_ADP_STATELOAD	(1<<3)
+#define V_ADP_FONT	(1<<4)
+#define V_ADP_PALETTE	(1<<5)
+#define V_ADP_BORDER	(1<<6)
+#define V_ADP_VESA	(1<<7)
+    int			va_crtc_addr;
+    u_int		va_window;	/* virtual address */
+    size_t		va_window_size;
+    size_t		va_window_gran;
+    u_int		va_buffer;	/* virtual address */
+    size_t		va_buffer_size;
+    int			va_initial_mode;
+    int			va_initial_bios_mode;
+    int			va_mode;
+};
+
+#define V_ADP_PRIMARY		0
+#define V_ADP_SECONDARY		1
+
+/* video mode information block */
+struct video_info {
+    int			vi_mode;
+    int			vi_flags;
+#define V_INFO_COLOR	(1<<0)
+#define V_INFO_GRAPHICS	(1<<1)
+#define V_INFO_LENEAR	(1<<2)
+#define V_INFO_VESA	(1<<3)
+    int			vi_width;
+    int			vi_height;
+    int			vi_cwidth;
+    int			vi_cheight;
+    int			vi_depth;
+    int			vi_planes;
+    u_int		vi_window;	/* physical address */
+    size_t		vi_window_size;
+    size_t		vi_window_gran;
+    u_int		vi_buffer;	/* physical address */
+    size_t		vi_buffer_size;
+    /* XXX pixel format, memory model,... */
+};
+
 typedef struct accentmap accentmap_t;
 typedef struct fkeytab fkeytab_t;
 typedef struct fkeyarg fkeyarg_t;
@@ -273,6 +329,9 @@ typedef struct {char fnt8x8[8*256];} fnt8_t;
 typedef struct {char fnt8x14[14*256];} fnt14_t;
 typedef struct {char fnt8x16[16*256];} fnt16_t;
 typedef struct ssaver ssaver_t;
+typedef struct video_adapter video_adapter_t;
+typedef struct video_info video_info_t;
+typedef struct {int scr_size[3];} scr_size_t;
 
 /* defines for "special" keys (spcl bit set in keymap) */
 #define NOP		0x00		/* nothing (dead key)		*/
@@ -378,8 +437,6 @@ typedef struct ssaver ssaver_t;
 #define M_HGC_P1	0xe1	/* hercules graphics - page 1 @ B8000 */
 #define M_MCA_MODE	0xff	/* monochrome adapter mode */
 
-#define M_VESA_BASE	0x100	/* VESA mode number base */
-
 #define SW_PC98_80x25	_IO('S', M_PC98_80x25)
 #define SW_PC98_80x30	_IO('S', M_PC98_80x30)
 #define SW_B40x25 	_IO('S', M_B40x25)
@@ -421,4 +478,68 @@ typedef struct ssaver ssaver_t;
 #define SW_VGA_CG640	_IO('S', M_VGA_CG640)
 #define SW_VGA_MODEX	_IO('S', M_VGA_MODEX)
 
+#define M_VESA_BASE		0x100	/* VESA mode number base */
+
+#define M_VESA_CG640x400	0x100	/* 640x400, 256 color */
+#define M_VESA_CG640x480	0x101	/* 640x480, 256 color */
+#define M_VESA_800x600		0x102	/* 800x600, 16 color */
+#define M_VESA_CG800x600	0x103	/* 800x600, 256 color */
+#define M_VESA_1024x768		0x104	/* 1024x768, 16 color */
+#define M_VESA_CG1024x768	0x105	/* 1024x768, 256 color */
+#define M_VESA_1280x1024	0x106	/* 1280x1024, 16 color */
+#define M_VESA_CG1280x1024	0x107	/* 1280x1024, 256 color */
+#define M_VESA_C80x60		0x108	/* 8x8 font */
+#define M_VESA_C132x25		0x109	/* 8x16 font */
+#define M_VESA_C132x43		0x10a	/* 8x14 font */
+#define M_VESA_C132x50		0x10b	/* 8x8 font */
+#define M_VESA_C132x60		0x10c	/* 8x8 font */
+#define M_VESA_32K_320		0x10d	/* 320x200, 5:5:5 */
+#define M_VESA_64K_320		0x10e	/* 320x200, 5:6:5 */
+#define M_VESA_FULL_320		0x10f	/* 320x200, 8:8:8 */
+#define M_VESA_32K_640		0x110	/* 640x480, 5:5:5 */
+#define M_VESA_64K_640		0x111	/* 640x480, 5:6:5 */
+#define M_VESA_FULL_640		0x112	/* 640x480, 8:8:8 */
+#define M_VESA_32K_800		0x113	/* 800x600, 5:5:5 */
+#define M_VESA_64K_800		0x114	/* 800x600, 5:6:5 */
+#define M_VESA_FULL_800		0x115	/* 800x600, 8:8:8 */
+#define M_VESA_32K_1024		0x116	/* 1024x768, 5:5:5 */
+#define M_VESA_64K_1024		0x117	/* 1024x768, 5:6:5 */
+#define M_VESA_FULL_1024	0x118	/* 1024x768, 8:8:8 */
+#define M_VESA_32K_1280		0x119	/* 1280x1024, 5:5:5 */
+#define M_VESA_64K_1280		0x11a	/* 1280x1024, 5:6:5 */
+#define M_VESA_FULL_1280	0x11b	/* 1280x1024, 8:8:8 */
+#define M_VESA_MODE_MAX		0x1ff
+#define M_VESA_USER		0x1ff
+
+#define SW_VESA_CG640x400	_IO('V', M_VESA_CG640x400 - M_VESA_BASE)
+#define SW_VESA_CG640x480	_IO('V', M_VESA_CG640x480 - M_VESA_BASE)
+#define SW_VESA_800x600		_IO('V', M_VESA_800x600 - M_VESA_BASE)
+#define SW_VESA_CG800x600	_IO('V', M_VESA_CG800x600 - M_VESA_BASE)
+#define SW_VESA_1024x768	_IO('V', M_VESA_1024x768 - M_VESA_BASE)
+#define SW_VESA_CG1024x768	_IO('V', M_VESA_CG1024x768 - M_VESA_BASE)
+#define SW_VESA_1280x1024	_IO('V', M_VESA_1280x1024 - M_VESA_BASE)
+#define SW_VESA_CG1280x1024	_IO('V', M_VESA_CG1280x1024 - M_VESA_BASE)
+#define SW_VESA_C80x60		_IO('V', M_VESA_C80x60 - M_VESA_BASE)
+#define SW_VESA_C132x25		_IO('V', M_VESA_C132x25 - M_VESA_BASE)
+#define SW_VESA_C132x43		_IO('V', M_VESA_C132x43 - M_VESA_BASE)
+#define SW_VESA_C132x50		_IO('V', M_VESA_C132x50 - M_VESA_BASE)
+#define SW_VESA_C132x60		_IO('V', M_VESA_C132x60 - M_VESA_BASE)
+#define SW_VESA_32K_320		_IO('V', M_VESA_32K_320 - M_VESA_BASE)
+#define SW_VESA_64K_320		_IO('V', M_VESA_64K_320 - M_VESA_BASE)
+#define SW_VESA_FULL_320	_IO('V', M_VESA_FULL_320 - M_VESA_BASE)
+#define SW_VESA_32K_640		_IO('V', M_VESA_32K_640 - M_VESA_BASE)
+#define SW_VESA_64K_640		_IO('V', M_VESA_64K_640 - M_VESA_BASE)
+#define SW_VESA_FULL_640	_IO('V', M_VESA_FULL_640 - M_VESA_BASE)
+#define SW_VESA_32K_800		_IO('V', M_VESA_32K_800 - M_VESA_BASE)
+#define SW_VESA_64K_800		_IO('V', M_VESA_64K_800 - M_VESA_BASE)
+#define SW_VESA_FULL_800	_IO('V', M_VESA_FULL_800 - M_VESA_BASE)
+#define SW_VESA_32K_1024	_IO('V', M_VESA_32K_1024 - M_VESA_BASE)
+#define SW_VESA_64K_1024	_IO('V', M_VESA_64K_1024 - M_VESA_BASE)
+#define SW_VESA_FULL_1024	_IO('V', M_VESA_FULL_1024 - M_VESA_BASE)
+#define SW_VESA_32K_1280	_IO('V', M_VESA_32K_1280 - M_VESA_BASE)
+#define SW_VESA_64K_1280	_IO('V', M_VESA_64K_1280 - M_VESA_BASE)
+#define SW_VESA_FULL_1280	_IO('V', M_VESA_FULL_1280 - M_VESA_BASE)
+#define SW_VESA_USER		_IO('V', M_VESA_USER - M_VESA_BASE)
+
 #endif /* !_MACHINE_CONSOLE_H_ */
+
diff --git a/sys/i386/include/pc/vesa.h b/sys/i386/include/pc/vesa.h
new file mode 100644
index 000000000000..4fa38eee14b3
--- /dev/null
+++ b/sys/i386/include/pc/vesa.h
@@ -0,0 +1,127 @@
+/*-
+ * Copyright (c) 1998 Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote 
+ *    products derived from this software without specific prior written 
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id$
+ */
+
+#ifndef _MACHINE_PC_VESA_H
+#define _MACHINE_PC_VESA_H
+
+struct vesa_info
+{
+    /* mandatory fields */
+    u_int8_t		v_sig[4] __attribute__ ((packed));	/* VESA */
+    u_int16_t		v_version __attribute__ ((packed));	/* ver in BCD */
+    u_int32_t		v_oemstr __attribute__ ((packed));	/* OEM string */
+    u_int32_t		v_flags __attribute__ ((packed));	/* flags */
+#define V_DAC8		(1<<0)
+#define V_NONVGA	(1<<1)
+#define V_SNOW		(1<<2)
+    u_int32_t		v_modetable __attribute__ ((packed));	/* modes */
+    u_int16_t		v_memsize __attribute__ ((packed));	/* in 64K */
+    /* 2.0 */
+    u_int16_t		v_revision __attribute__ ((packed));	/* software rev */
+    u_int32_t		v_venderstr __attribute__ ((packed));	/* vender */
+    u_int32_t		v_prodstr __attribute__ ((packed));	/* product name */
+    u_int32_t		v_revstr __attribute__ ((packed));	/* product rev */
+};
+
+struct vesa_mode 
+{
+    /* mandatory fields */
+    u_int16_t		v_modeattr;
+#define V_MODESUPP	(1<<0)	/* VESA mode attributes */
+#define V_MODEOPTINFO	(1<<1)
+#define V_MODEBIOSOUT	(1<<2)
+#define V_MODECOLOR	(1<<3)
+#define V_MODEGRAPHICS	(1<<4)
+#define V_MODENONVGA	(1<<5)
+#define V_MODENONBANK	(1<<6)
+#define V_MODELFB	(1<<7)
+#define V_MODEVESA	(1<<16)	/* Private attributes */
+    u_int8_t		v_waattr;
+    u_int8_t		v_wbattr;
+#define V_WATTREXIST	(1<<0)
+#define V_WATTRREAD	(1<<1)
+#define V_WATTRWRITE	(1<<2)
+    u_int16_t		v_wgran;
+    u_int16_t		v_wsize;
+    u_int16_t		v_waseg;
+    u_int16_t		v_wbseg;
+    u_int32_t		v_posfunc;
+    u_int16_t		v_bpscanline;
+    /* fields optional for 1.0/1.1 implementations */
+    u_int16_t		v_width;
+    u_int16_t		v_height;
+    u_int8_t		v_cwidth;
+    u_int8_t		v_cheight;
+    u_int8_t		v_planes;
+    u_int8_t		v_bpp;
+    u_int8_t		v_banks;
+    u_int8_t		v_memmodel;
+#define V_MMTEXT	0
+#define V_MMCGA		1
+#define V_MMHGC		2
+#define V_MMEGA		3
+#define V_MMPACKED	4
+#define V_MMSEQU256	5
+#define V_MMDIRCOLOR	6
+#define V_MMYUV		7
+    u_int8_t		v_banksize;
+    u_int8_t		v_ipages;
+    u_int8_t		v_reserved0;
+    /* fields for 1.2+ implementations */
+    u_int8_t		v_redmasksize;
+    u_int8_t		v_redfieldpos;
+    u_int8_t		v_greenmasksize;
+    u_int8_t		v_greenfieldpos;
+    u_int8_t		v_bluemasksize;
+    u_int8_t		v_bluefieldpos;
+    u_int8_t		v_resmasksize;
+    u_int8_t		v_resfieldpos;
+    u_int8_t		v_dircolormode;
+    /* 2.0 implementations */
+    u_int32_t		v_lfb;
+    u_int32_t		v_offscreen;
+    u_int8_t		v_offscreensize;
+};
+
+#ifdef KERNEL
+
+#define VESA_MODE(x)	((x) >= M_VESA_BASE)
+
+int vesa_load_ioctl(void);
+int vesa_unload_ioctl(void);
+
+#ifndef VESA_MODULE
+int vesa_load(void);
+#endif
+
+#endif /* KERNEL */
+
+#endif /* !_MACHINE_PC_VESA_H */
diff --git a/sys/i386/isa/kbdtables.h b/sys/i386/isa/kbdtables.h
index d36b39a33e7a..61376f48b919 100644
--- a/sys/i386/isa/kbdtables.h
+++ b/sys/i386/isa/kbdtables.h
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1992-1995 Søren Schmidt
+ * Copyright (c) 1992-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: kbdtables.h,v 1.39 1998/01/28 08:45:18 yokota Exp $
+ *	$Id$
  */
 
 #define SET8 0x80       	/* set eight bit on */
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index 25b5237a76dc..e2b0c6557835 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1994 Søren Schmidt
+ * Copyright (c) 1994-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pcaudio.c,v 1.41 1998/06/07 17:10:48 dfr Exp $
+ *	$Id$
  */
 
 #include "pca.h"
diff --git a/sys/i386/isa/scvesactl.c b/sys/i386/isa/scvesactl.c
new file mode 100644
index 000000000000..9678177d4011
--- /dev/null
+++ b/sys/i386/isa/scvesactl.c
@@ -0,0 +1,150 @@
+/*-
+ * Copyright (c) 1998 Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote 
+ *    products derived from this software without specific prior written 
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id$
+ */
+
+#include "sc.h"
+#include "opt_vesa.h"
+#include "opt_vm86.h"
+
+#if (NSC > 0 && defined(VESA) && defined(VM86)) || defined(VESA_MODULE)
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/tty.h>
+#include <sys/kernel.h>
+
+#include <machine/apm_bios.h>
+#include <machine/console.h>
+#include <machine/pc/vesa.h>
+
+#include <i386/isa/videoio.h>
+#include <i386/isa/syscons.h>
+
+static int (*prev_user_ioctl)(dev_t dev, int cmd, caddr_t data, int flag, 
+			      struct proc *p);
+
+extern struct tty *scdevtotty(dev_t dev);
+
+int
+vesa_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+{
+	scr_stat *scp;
+	struct tty *tp;
+	video_info_t info;
+	video_adapter_t *adp;
+	int mode;
+	int error;
+	int s;
+
+	tp = scdevtotty(dev);
+	if (!tp)
+		return ENXIO;
+	scp = sc_get_scr_stat(tp->t_dev);
+
+	switch (cmd) {
+	case SW_VESA_USER:
+
+		mode = (int)data;
+		if ((*biosvidsw.get_info)(scp->adp, mode, &info))
+			return ENODEV;
+		if (info.vi_flags & V_INFO_GRAPHICS)
+			goto vesa_graphics;
+		else
+			goto vesa_text;
+
+	/* text modes */
+	case SW_VESA_C80x60:
+	case SW_VESA_C132x25:
+	case SW_VESA_C132x43:
+	case SW_VESA_C132x50:
+	case SW_VESA_C132x60:
+		adp = get_adapter(scp);
+		if (!(adp->va_flags & V_ADP_MODECHANGE))
+			return ENODEV;
+		mode = (cmd & 0xff) + M_VESA_BASE;
+vesa_text:
+		return sc_set_text_mode(scp, tp, mode, 0, 0, 0);
+
+	/* graphics modes */
+	case SW_VESA_32K_320: 	case SW_VESA_64K_320: 
+	case SW_VESA_FULL_320:
+
+	case SW_VESA_CG640x400:
+
+	case SW_VESA_CG640x480:
+	case SW_VESA_32K_640:	case SW_VESA_64K_640:
+	case SW_VESA_FULL_640:
+
+	case SW_VESA_800x600:	case SW_VESA_CG800x600:
+	case SW_VESA_32K_800:	case SW_VESA_64K_800:
+	case SW_VESA_FULL_800:
+
+	case SW_VESA_1024x768:	case SW_VESA_CG1024x768:
+	case SW_VESA_32K_1024:	case SW_VESA_64K_1024:
+	case SW_VESA_FULL_1024:
+
+	case SW_VESA_1280x1024:	case SW_VESA_CG1280x1024:
+	case SW_VESA_32K_1280:	case SW_VESA_64K_1280:
+	case SW_VESA_FULL_1280:
+		adp = get_adapter(scp);
+		if (!(adp->va_flags & V_ADP_MODECHANGE))
+			return ENODEV;
+		mode = (cmd & 0xff) + M_VESA_BASE;
+vesa_graphics:
+		return sc_set_graphics_mode(scp, tp, mode);
+	}
+
+	if (prev_user_ioctl)
+		return (*prev_user_ioctl)(dev, cmd, data, flag, p);
+	else
+		return ENOIOCTL;
+}
+
+int
+vesa_load_ioctl(void)
+{
+	if (prev_user_ioctl)
+		return EBUSY;
+	prev_user_ioctl = sc_user_ioctl;
+	sc_user_ioctl = vesa_ioctl;
+	return 0;
+}
+
+int
+vesa_unload_ioctl(void)
+{
+	if (sc_user_ioctl != vesa_ioctl)
+		return EBUSY;
+	sc_user_ioctl = prev_user_ioctl;
+	prev_user_ioctl = NULL;
+	return 0;
+}
+
+#endif /* (NSC > 0 && VESA && VM86) || VESA_MODULE */
diff --git a/sys/i386/isa/scvidctl.c b/sys/i386/isa/scvidctl.c
new file mode 100644
index 000000000000..464933edb112
--- /dev/null
+++ b/sys/i386/isa/scvidctl.c
@@ -0,0 +1,486 @@
+/*-
+ * Copyright (c) 1998 Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote 
+ *    products derived from this software without specific prior written 
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id$
+ */
+
+#include "sc.h"
+#include "opt_syscons.h"
+
+#if NSC > 0
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/signalvar.h>
+#include <sys/tty.h>
+#include <sys/kernel.h>
+
+#include <machine/apm_bios.h>
+#include <machine/console.h>
+
+#include <i386/isa/videoio.h>
+#include <i386/isa/syscons.h>
+
+/* video ioctl */
+
+extern scr_stat *cur_console;
+extern u_short *Crtat;
+extern int fonts_loaded;
+extern int sc_history_size;
+extern u_char palette[];
+
+int
+sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
+		 int fontsize)
+{
+    video_adapter_t *adp;
+    video_info_t info;
+    int error;
+    int s;
+    int i;
+
+    if ((*biosvidsw.get_info)(scp->adp, mode, &info))
+	return ENODEV;
+    adp = get_adapter(scp);
+ 
+    /* adjust argument values */
+    if (fontsize <= 0)
+	fontsize = info.vi_cheight;
+    if (fontsize < 14) {
+	fontsize = 8;
+	if (!(fonts_loaded & FONT_8))
+	    return EINVAL;
+    } else if (fontsize >= 16) {
+	fontsize = 16;
+	if (!(fonts_loaded & FONT_16))
+	    return EINVAL;
+    } else {
+	fontsize = 14;
+	if (!(fonts_loaded & FONT_14))
+	    return EINVAL;
+    }
+    if ((xsize <= 0) || (xsize > info.vi_width))
+	xsize = info.vi_width;
+    if ((ysize <= 0) || (ysize > info.vi_height))
+	ysize = info.vi_height;
+
+    /* stop screen saver, etc */
+    s = spltty();
+    if ((error = sc_clean_up(scp))) {
+	splx(s);
+	return error;
+    }
+
+    /* set up scp */
+    if (scp->history != NULL)
+	i = imax(scp->history_size / scp->xsize 
+		 - imax(sc_history_size, scp->ysize), 0);
+    else
+	i = 0;
+    /*
+     * This is a kludge to fend off scrn_update() while we
+     * muck around with scp. XXX
+     */
+    scp->status |= UNKNOWN_MODE;
+    scp->status &= ~(GRAPHICS_MODE | PIXEL_MODE);
+    scp->mode = mode;
+    scp->font_size = fontsize;
+    scp->xsize = xsize;
+    scp->ysize = ysize;
+    scp->xpixel = scp->xsize*8;
+    scp->ypixel = scp->ysize*fontsize;
+
+    /* allocate buffers */
+    sc_alloc_scr_buffer(scp, TRUE, TRUE);
+    if (ISMOUSEAVAIL(adp->va_flags))
+	sc_alloc_cut_buffer(scp, FALSE);
+    sc_alloc_history_buffer(scp, sc_history_size, i, FALSE);
+    splx(s);
+
+    if (scp == cur_console)
+	set_mode(scp);
+    scp->status &= ~UNKNOWN_MODE;
+
+    if (tp == NULL)
+	return 0;
+    if (tp->t_winsize.ws_col != scp->xsize
+	|| tp->t_winsize.ws_row != scp->ysize) {
+	tp->t_winsize.ws_col = scp->xsize;
+	tp->t_winsize.ws_row = scp->ysize;
+	pgsignal(tp->t_pgrp, SIGWINCH, 1);
+    }
+
+    return 0;
+}
+
+int
+sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode)
+{
+    video_adapter_t *adp;
+    video_info_t info;
+    int error;
+    int s;
+
+    if ((*biosvidsw.get_info)(scp->adp, mode, &info))
+	return ENODEV;
+    adp = get_adapter(scp);
+
+    /* stop screen saver, etc */
+    s = spltty();
+    if ((error = sc_clean_up(scp))) {
+	splx(s);
+	return error;
+    }
+
+    /* set up scp */
+    scp->status |= (UNKNOWN_MODE | GRAPHICS_MODE);
+    scp->status &= ~PIXEL_MODE;
+    scp->mode = mode;
+    scp->xpixel = info.vi_width;
+    scp->ypixel = info.vi_height;
+    scp->xsize = info.vi_width/8;
+    scp->ysize = info.vi_height/info.vi_cheight;
+    scp->font_size = FONT_NONE;
+    /* move the mouse cursor at the center of the screen */
+    sc_move_mouse(scp, scp->xpixel / 2, scp->ypixel / 2);
+    splx(s);
+
+    if (scp == cur_console)
+	set_mode(scp);
+    /* clear_graphics();*/
+    scp->status &= ~UNKNOWN_MODE;
+
+    if (tp == NULL)
+	return 0;
+    if (tp->t_winsize.ws_xpixel != scp->xpixel
+	|| tp->t_winsize.ws_ypixel != scp->ypixel) {
+	tp->t_winsize.ws_xpixel = scp->xpixel;
+	tp->t_winsize.ws_ypixel = scp->ypixel;
+	pgsignal(tp->t_pgrp, SIGWINCH, 1);
+    }
+
+    return 0;
+}
+
+int
+sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize, 
+		  int fontsize)
+{
+    video_adapter_t *adp;
+    video_info_t info;
+    int error;
+    int s;
+    int i;
+
+    if ((*biosvidsw.get_info)(scp->adp, scp->mode, &info))
+	return ENODEV;		/* this shouldn't happen */
+    adp = get_adapter(scp);
+
+#ifdef SC_VIDEO_DEBUG
+    if (scp->scr_buf != NULL) {
+	printf("set_pixel_mode(): mode:%x, col:%d, row:%d, font:%d\n",
+	       scp->mode, xsize, ysize, fontsize);
+    }
+#endif
+
+    /* adjust argument values */
+    if ((fontsize <= 0) || (fontsize == FONT_NONE))
+	fontsize = info.vi_cheight;
+    if (fontsize < 14) {
+	fontsize = 8;
+	if (!(fonts_loaded & FONT_8))
+	    return EINVAL;
+    } else if (fontsize >= 16) {
+	fontsize = 16;
+	if (!(fonts_loaded & FONT_16))
+	    return EINVAL;
+    } else {
+	fontsize = 14;
+	if (!(fonts_loaded & FONT_14))
+	    return EINVAL;
+    }
+    if (xsize <= 0)
+	xsize = info.vi_width/8;
+    if (ysize <= 0)
+	ysize = info.vi_height/fontsize;
+
+#ifdef SC_VIDEO_DEBUG
+    if (scp->scr_buf != NULL) {
+	printf("set_pixel_mode(): mode:%x, col:%d, row:%d, font:%d\n",
+	       scp->mode, xsize, ysize, fontsize);
+	printf("set_pixel_mode(): Crtat:%x, %dx%d, xoff:%d, yoff:%d\n",
+	       Crtat, info.vi_width, info.vi_height, 
+	       (info.vi_width/8 - xsize)/2,
+	       (info.vi_height/fontsize - ysize)/2);
+    }
+#endif
+
+    /* stop screen saver, etc */
+    s = spltty();
+    if ((error = sc_clean_up(scp))) {
+	splx(s);
+	return error;
+    }
+
+    /* set up scp */
+    if (scp->history != NULL)
+	i = imax(scp->history_size / scp->xsize 
+		 - imax(sc_history_size, scp->ysize), 0);
+    else
+	i = 0;
+    scp->status |= (UNKNOWN_MODE | PIXEL_MODE);
+    scp->status &= ~(GRAPHICS_MODE | MOUSE_ENABLED);
+    scp->xsize = xsize;
+    scp->ysize = ysize;
+    scp->font_size = fontsize;
+    scp->xoff = (scp->xpixel/8 - xsize)/2;
+    scp->yoff = (scp->ypixel/fontsize - ysize)/2;
+
+    /* allocate buffers */
+    sc_alloc_scr_buffer(scp, TRUE, TRUE);
+    if (ISMOUSEAVAIL(adp->va_flags))
+	sc_alloc_cut_buffer(scp, FALSE);
+    sc_alloc_history_buffer(scp, sc_history_size, i, FALSE);
+    splx(s);
+
+    /* FIXME */
+    if (scp == cur_console)
+	bzero(Crtat, scp->xpixel*scp->ypixel/8);
+
+    scp->status &= ~UNKNOWN_MODE;
+
+#ifdef SC_VIDEO_DEBUG
+    printf("set_pixel_mode(): status:%x\n", scp->status);
+#endif
+
+    if (tp == NULL)
+	return 0;
+    if (tp->t_winsize.ws_col != scp->xsize
+	|| tp->t_winsize.ws_row != scp->ysize) {
+	tp->t_winsize.ws_col = scp->xsize;
+	tp->t_winsize.ws_row = scp->ysize;
+	pgsignal(tp->t_pgrp, SIGWINCH, 1);
+    }
+
+    return 0;
+}
+
+int
+sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
+{
+    scr_stat *scp;
+    video_adapter_t *adp;
+    int error;
+    int s;
+
+    scp = sc_get_scr_stat(tp->t_dev);
+
+    switch (cmd) {
+
+    case CONS_CURRENT:  	/* get current adapter type */
+	adp = get_adapter(scp);
+	*(int *)data = adp->va_type;
+	return 0;
+
+    case CONS_CURRENTADP:	/* get current adapter index */
+	*(int *)data = scp->adp;
+	return 0;
+
+    case CONS_ADPINFO:		/* adapter information */
+	adp = (*biosvidsw.adapter)(((video_adapter_t *)data)->va_index);
+	if (adp == NULL)
+	    return ENODEV;
+	bcopy(adp, data, sizeof(*adp));
+	return 0;
+
+    case CONS_GET:      	/* get current video mode */
+	*(int *)data = scp->mode;
+	return 0;
+
+    case CONS_MODEINFO:		/* get mode information */
+	return ((*biosvidsw.get_info)(scp->adp, 
+		    ((video_info_t *)data)->vi_mode, (video_info_t *)data) 
+		? ENODEV : 0);
+
+    case CONS_FINDMODE:		/* find a matching video mode */
+	return ((*biosvidsw.query_mode)(scp->adp, (video_info_t *)data) 
+		? ENODEV : 0);
+
+    case CONS_SETWINORG:
+	return ((*biosvidsw.set_win_org)(scp->adp, *(u_int *)data) 
+		   ? ENODEV : 0);
+
+    /* VGA TEXT MODES */
+    case SW_VGA_C40x25:
+    case SW_VGA_C80x25: case SW_VGA_M80x25:
+    case SW_VGA_C80x30: case SW_VGA_M80x30:
+    case SW_VGA_C80x50: case SW_VGA_M80x50:
+    case SW_VGA_C80x60: case SW_VGA_M80x60:
+    case SW_B40x25:     case SW_C40x25:
+    case SW_B80x25:     case SW_C80x25:
+    case SW_ENH_B40x25: case SW_ENH_C40x25:
+    case SW_ENH_B80x25: case SW_ENH_C80x25:
+    case SW_ENH_B80x43: case SW_ENH_C80x43:
+    case SW_EGAMONO80x25:
+	adp = get_adapter(scp);
+	if (!(adp->va_flags & V_ADP_MODECHANGE))
+ 	    return ENODEV;
+	return sc_set_text_mode(scp, tp, cmd & 0xff, 0, 0, 0);
+
+    /* GRAPHICS MODES */
+    case SW_BG320:     case SW_BG640:
+    case SW_CG320:     case SW_CG320_D:   case SW_CG640_E:
+    case SW_CG640x350: case SW_ENH_CG640:
+    case SW_BG640x480: case SW_CG640x480: case SW_VGA_CG320:
+    case SW_VGA_MODEX:
+	adp = get_adapter(scp);
+	if (!(adp->va_flags & V_ADP_MODECHANGE))
+	    return ENODEV;
+	return sc_set_graphics_mode(scp, tp, cmd & 0xff);
+
+    case KDSETMODE:     	/* set current mode of this (virtual) console */
+	switch (*data) {
+	case KD_TEXT:   	/* switch to TEXT (known) mode */
+	    /*
+	     * If scp->mode is of graphics modes, we don't know which
+	     * text mode to switch back to...
+	     */
+	    if (scp->status & GRAPHICS_MODE)
+		return EINVAL;
+	    /* restore fonts & palette ! */
+#if 0
+	    adp = get_adapter(scp);
+	    if (ISFONTAVAIL(adp->va_flags) 
+		&& !(scp->status & (GRAPHICS_MODE | PIXEL_MODE)))
+		/*
+		 * FONT KLUDGE
+		 * Don't load fonts for now... XXX
+		 */
+		if (fonts_loaded & FONT_8)
+		    copy_font(scp, LOAD, 8, font_8);
+		if (fonts_loaded & FONT_14)
+		    copy_font(scp, LOAD, 14, font_14);
+		if (fonts_loaded & FONT_16)
+		    copy_font(scp, LOAD, 16, font_16);
+	    }
+#endif
+	    load_palette(scp, palette);
+
+	    /* move hardware cursor out of the way */
+	    (*biosvidsw.set_hw_cursor)(scp->adp, -1, -1);
+
+	    /* FALL THROUGH */
+
+	case KD_TEXT1:  	/* switch to TEXT (known) mode */
+	    /*
+	     * If scp->mode is of graphics modes, we don't know which
+	     * text/pixel mode to switch back to...
+	     */
+	    if (scp->status & GRAPHICS_MODE)
+		return EINVAL;
+	    s = spltty();
+	    if ((error = sc_clean_up(scp))) {
+		splx(s);
+		return error;
+	    }
+	    scp->status |= UNKNOWN_MODE;
+	    splx(s);
+	    /* no restore fonts & palette */
+	    if (scp == cur_console) {
+		set_mode(scp);
+		/* FIXME */
+		if (scp->status & PIXEL_MODE)
+		    bzero(Crtat, scp->xpixel*scp->ypixel/8);
+	    }
+	    sc_clear_screen(scp);
+	    scp->status &= ~UNKNOWN_MODE;
+	    return 0;
+
+	case KD_PIXEL:		/* pixel (raster) display */
+	    if (!(scp->status & (GRAPHICS_MODE | PIXEL_MODE)))
+		return EINVAL;
+	    if (!(scp->status & PIXEL_MODE))
+		return sc_set_pixel_mode(scp, tp, scp->xsize, scp->ysize, 
+					 scp->font_size);
+	    s = spltty();
+	    if ((error = sc_clean_up(scp))) {
+		splx(s);
+		return error;
+	    }
+	    scp->status |= (UNKNOWN_MODE | PIXEL_MODE);
+	    splx(s);
+	    if (scp == cur_console) {
+		set_mode(scp);
+		load_palette(scp, palette);
+		/* FIXME */
+		bzero(Crtat, scp->xpixel*scp->ypixel/8);
+	    }
+	    sc_clear_screen(scp);
+	    scp->status &= ~UNKNOWN_MODE;
+	    return 0;
+
+	case KD_GRAPHICS:	/* switch to GRAPHICS (unknown) mode */
+	    s = spltty();
+	    if ((error = sc_clean_up(scp))) {
+		splx(s);
+		return error;
+	    }
+	    scp->status |= UNKNOWN_MODE;
+	    splx(s);
+	    return 0;
+
+	default:
+	    return EINVAL;
+	}
+	/* NOT REACHED */
+
+    case KDRASTER:		/* set pixel (raster) display mode */
+	if (ISUNKNOWNSC(scp) || ISTEXTSC(scp))
+	    return ENODEV;
+	return sc_set_pixel_mode(scp, tp, ((int *)data)[0], ((int *)data)[1], 
+				 ((int *)data)[2]);
+
+    case KDGETMODE:     	/* get current mode of this (virtual) console */
+	/* 
+	 * From the user program's point of view, KD_PIXEL is the same 
+	 * as KD_TEXT... 
+	 */
+	*data = ISGRAPHSC(scp) ? KD_GRAPHICS : KD_TEXT;
+	return 0;
+
+    case KDSBORDER:     	/* set border color of this (virtual) console */
+	scp->border = *data;
+	if (scp == cur_console)
+	    set_border(cur_console, scp->border);
+	return 0;
+    }
+
+    return ENOIOCTL;
+}
+
+#endif /* NSC > 0 */
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index ebc243f52ba7..50e0f199c0fb 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1992-1997 Søren Schmidt
+ * Copyright (c) 1992-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,13 +25,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.276 1998/08/23 08:26:41 bde Exp $
+ *	$Id$
  */
 
 #include "sc.h"
 #include "apm.h"
 #include "opt_ddb.h"
 #include "opt_devfs.h"
+#include "opt_vesa.h"
+#include "opt_vm86.h"
 #include "opt_syscons.h"
 
 #if NSC > 0
@@ -57,9 +59,9 @@
 #include <machine/psl.h>
 #include <machine/frame.h>
 #include <machine/pc/display.h>
+#include <machine/pc/vesa.h>
 #include <machine/apm_bios.h>
 #include <machine/random.h>
-#include <machine/bootinfo.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
@@ -70,6 +72,7 @@
 #include <i386/isa/timerreg.h>
 #include <i386/isa/kbdtables.h>
 #include <i386/isa/kbdio.h>
+#include <i386/isa/videoio.h>
 #include <i386/isa/syscons.h>
 
 #if !defined(MAXCONS)
@@ -96,11 +99,6 @@
 #define COLD 0
 #define WARM 1
 
-#define VESA_MODE(x)		((x) >= M_VESA_BASE)
-
-#define MODE_MAP_SIZE		(M_VGA_CG320 + 1)
-#define MODE_PARAM_SIZE		64
-
 #define DEFAULT_BLANKTIME	(5*60)		/* 5 minutes */
 #define MAX_BLANKTIME		(7*24*60*60)	/* 7 days!? */
 
@@ -159,6 +157,7 @@ static  int        	blinkrate = 0;
 	u_int       	crtc_addr = MONO_BASE;
 	char		crtc_type = KD_MONO;
 	char        	crtc_vga = FALSE;
+static	int		adp_flags = 0;
 static  u_char      	shfts = 0, ctls = 0, alts = 0, agrs = 0, metas = 0;
 static  u_char		accents = 0;
 static  u_char      	nlkcnt = 0, clkcnt = 0, slkcnt = 0, alkcnt = 0;
@@ -172,7 +171,7 @@ static	int		run_scrn_saver = FALSE;	/* should run the saver? */
 static	int		scrn_idle = FALSE;	/* about to run the saver */
 	u_char      	scr_map[256];
 	u_char      	scr_rmap[256];
-	char        	*video_mode_ptr = NULL;
+static	int		initial_video_mode;	/* initial video mode # */
 static	int		bios_video_mode;	/* video mode # set by BIOS */
 	int     	fonts_loaded = 0
 #ifdef STD8X16FONT
@@ -180,19 +179,15 @@ static	int		bios_video_mode;	/* video mode # set by BIOS */
 #endif
 	;
 
-	char        	font_8[256*8];
-	char		font_14[256*14];
+	u_char		font_8[256*8];
+	u_char		font_14[256*14];
 #ifdef STD8X16FONT
 extern
 #endif
-	unsigned char	font_16[256*16];
-	char        	palette[256*3];
-static  char		*mode_map[MODE_MAP_SIZE];
-static  char		vgaregs[MODE_PARAM_SIZE];
-static  char		vgaregs2[MODE_PARAM_SIZE];
-static  int		rows_offset = 1;
-static	char 		*cut_buffer;
-static	int		cut_buffer_size;
+	u_char		font_16[256*16];
+	u_char        	palette[256*3];
+static	u_char 		*cut_buffer = NULL;
+static	int		cut_buffer_size = 0;
 static	int		mouse_level = 0;	/* sysmouse protocol level */
 static	mousestatus_t	mouse_status = { 0, 0, 0, 0, 0, 0 };
 static  u_short 	mouse_and_mask[16] = {
@@ -208,13 +203,14 @@ static  u_short 	mouse_or_mask[16] = {
 				0x0000, 0x0000, 0x0000, 0x0000
 			};
 
-static int		extra_history_size = 
+	int		sc_history_size = SC_HISTORY_SIZE;
+static	int		extra_history_size = 
 			    SC_MAX_HISTORY_SIZE - SC_HISTORY_SIZE * MAXCONS;
 
 static void    		none_saver(int blank) { }
 static void    		(*current_saver)(int blank) = none_saver;
 static void    		(*default_saver)(int blank) = none_saver;
-int  			(*sc_user_ioctl)(dev_t dev, int cmd, caddr_t data,
+	int  		(*sc_user_ioctl)(dev_t dev, int cmd, caddr_t data,
 					 int flag, struct proc *p) = NULL;
 
 static int		sticky_splash = FALSE;
@@ -233,8 +229,6 @@ static struct tty     	sccons[MAXCONS+2];
 #endif
 #define SC_MOUSE 	128
 #define SC_CONSOLE	255
-#define MONO_BUF    	pa_to_va(0xB0000)
-#define CGA_BUF     	pa_to_va(0xB8000)
 u_short         	*Crtat;
 static const int	nsccons = MAXCONS+2;
 
@@ -243,9 +237,6 @@ static const int	nsccons = MAXCONS+2;
     + (offset)) % (scp->history_size)))
 #define ISSIGVALID(sig)	((sig) > 0 && (sig) < NSIG)
 
-/* this should really be in `rtc.h' */
-#define RTC_EQUIPMENT		0x14
-
 /* prototypes */
 static int scattach(struct isa_device *dev);
 static int scparam(struct tty *tp, struct termios *t);
@@ -256,30 +247,26 @@ static void scstart(struct tty *tp);
 static void scmousestart(struct tty *tp);
 static void scinit(void);
 static void scshutdown(int howto, void *arg);
-static void map_mode_table(char *map[], char *table, int max);
-static int map_mode_num(int mode);
-static char *get_mode_param(scr_stat *scp, int mode);
 static u_int scgetc(u_int flags);
 #define SCGETC_CN	1
 #define SCGETC_NONBLOCK	2
 static void sccnupdate(scr_stat *scp);
-static scr_stat *get_scr_stat(dev_t dev);
 static scr_stat *alloc_scp(void);
 static void init_scp(scr_stat *scp);
 static void sc_bcopy(scr_stat *scp, u_short *p, int from, int to, int mark);
 static int get_scr_num(void);
 static timeout_t scrn_timer;
 static void scrn_update(scr_stat *scp, int show_cursor);
+static void scrn_saver(void (*saver)(int), int blank);
 static void stop_scrn_saver(void (*saver)(int));
 static int wait_scrn_saver_stop(void);
-static void clear_screen(scr_stat *scp);
 static int switch_scr(scr_stat *scp, u_int next_scr);
 static void exchange_scr(void);
-static void move_crsr(scr_stat *scp, int x, int y);
 static void scan_esc(scr_stat *scp, u_char c);
+static void ansi_put(scr_stat *scp, u_char *buf, int len);
 static void draw_cursor_image(scr_stat *scp); 
 static void remove_cursor_image(scr_stat *scp); 
-static void ansi_put(scr_stat *scp, u_char *buf, int len);
+static void move_crsr(scr_stat *scp, int x, int y);
 static u_char *get_fstr(u_int c, u_int *len);
 static void history_to_screen(scr_stat *scp);
 static int history_up_line(scr_stat *scp);
@@ -287,16 +274,6 @@ static int history_down_line(scr_stat *scp);
 static int mask2attr(struct term_stat *term);
 static void set_keyboard(int command, int data);
 static void update_leds(int which);
-static void set_vgaregs(char *modetable);
-static void read_vgaregs(char *buf);
-#define COMP_IDENTICAL	0
-#define COMP_SIMILAR	1
-#define COMP_DIFFERENT	2
-static int comp_vgaregs(u_char *buf1, u_char *buf2);
-static void dump_vgaregs(u_char *buf);
-#define PARAM_BUFSIZE	6
-static void set_font_mode(u_char *buf);
-static void set_normal_mode(u_char *buf);
 static void set_destructive_cursor(scr_stat *scp);
 static void set_mouse_pos(scr_stat *scp);
 static int skip_spc_right(scr_stat *scp, u_short *p);
@@ -312,12 +289,11 @@ static void draw_mouse_image(scr_stat *scp);
 static void remove_mouse_image(scr_stat *scp); 
 static void draw_cutmarking(scr_stat *scp); 
 static void remove_cutmarking(scr_stat *scp); 
-static void save_palette(void);
 static void do_bell(scr_stat *scp, int pitch, int duration);
 static timeout_t blink_screen;
 #ifdef SC_SPLASH_SCREEN
-static void scsplash_init(void);
-static void scsplash(int show);
+static void scsplash_init(scr_stat *scp);
+static void scsplash_saver(int show);
 #define scsplash_stick(stick)		(sticky_splash = (stick))
 #else
 #define scsplash_stick(stick)
@@ -332,7 +308,7 @@ static	d_close_t	scclose;
 static	d_read_t	scread;
 static	d_write_t	scwrite;
 static	d_ioctl_t	scioctl;
-static	d_devtotty_t	scdevtotty;
+	d_devtotty_t	scdevtotty;
 static	d_mmap_t	scmmap;
 
 #define	CDEV_MAJOR	12
@@ -353,7 +329,7 @@ draw_cursor_image(scr_stat *scp)
     u_short cursor_image, *ptr = Crtat + (scp->cursor_pos - scp->scr_buf);
     u_short prev_image;
 
-    if (VESA_MODE(scp->mode)) {
+    if (ISPIXELSC(scp)) {
 	sc_bcopy(scp, scp->scr_buf, scp->cursor_pos - scp->scr_buf, 
 	  scp->cursor_pos - scp->scr_buf, 1);
 	return;
@@ -405,7 +381,7 @@ draw_cursor_image(scr_stat *scp)
 static void
 remove_cursor_image(scr_stat *scp)
 {
-    if (VESA_MODE(scp->mode))
+    if (ISPIXELSC(scp))
 	sc_bcopy(scp, scp->scr_buf, scp->cursor_oldpos - scp->scr_buf, 
 	  scp->cursor_oldpos - scp->scr_buf, 0);
     else
@@ -436,6 +412,12 @@ scprobe(struct isa_device *dev)
 	    printf("sc%d: no video adapter is found.\n", dev->id_unit);
 	return (0);
     }
+    (*biosvidsw.diag)(bootverbose);
+#if defined(VESA) && defined(VM86)
+    if (vesa_load())
+	return FALSE;
+    (*biosvidsw.diag)(bootverbose);
+#endif
 
     sc_port = dev->id_iobase;
     if (sckbdprobe(dev->id_unit, dev->id_flags))
@@ -448,99 +430,24 @@ scprobe(struct isa_device *dev)
 static int
 scvidprobe(int unit, int flags)
 {
-    /* 
-     * XXX don't try to `printf' anything here, the console may not have 
-     * been configured yet. 
-     */
-    u_short volatile *cp;
-    u_short was;
-    u_int pa;
-    u_int segoff;
+    video_adapter_t *adp;
 
     /* do this test only once */
     if (init_done != COLD)
-	return (Crtat != 0);
-
-    /*
-     * Finish defaulting crtc variables for a mono screen.  Crtat is a
-     * bogus common variable so that it can be shared with pcvt, so it
-     * can't be statically initialized.  XXX.
-     */
-    Crtat = (u_short *)MONO_BUF;
-    crtc_type = KD_MONO;
-    /* If CGA memory seems to work, switch to color.  */
-    cp = (u_short *)CGA_BUF;
-    was = *cp;
-    *cp = (u_short) 0xA55A;
-    bios_video_mode = *(u_char *)pa_to_va(0x449);
-    if (bootinfo.bi_vesa == 0x102) {
-	bios_video_mode = bootinfo.bi_vesa;
-	Crtat  = (u_short *)pa_to_va(0xA0000);
-	crtc_addr = COLOR_BASE;
-	crtc_type = KD_VGA;
-        bzero(Crtat, 800*600/8);
-    } else if (*cp == 0xA55A) {
-	Crtat = (u_short *)CGA_BUF;
-	crtc_addr = COLOR_BASE;
-	crtc_type = KD_CGA;
-    } else {
-        cp = Crtat;
-	was = *cp;
-	*cp = (u_short) 0xA55A;
-	if (*cp != 0xA55A) {
-	    /* no screen at all, bail out */
-	    Crtat = 0;
-	    return FALSE;
-	}
-    }
-    *cp = was;
+	return (crtc_type != -1);
 
-    if (!VESA_MODE(bios_video_mode)) {
-	/* 
-	 * Check rtc and BIOS date area.
-	 * XXX: don't use BIOSDATA_EQUIPMENT, it is not a dead copy
-	 * of RTC_EQUIPMENT. The bit 4 and 5 of the ETC_EQUIPMENT are
-	 * zeros for EGA and VGA. However, the EGA/VGA BIOS will set 
-	 * these bits in BIOSDATA_EQUIPMENT according to the monitor
-	 * type detected.
-	 */
-	switch ((rtcin(RTC_EQUIPMENT) >> 4) & 3) {	/* bit 4 and 5 */
-	case 0: /* EGA/VGA, or nothing */
-	    crtc_type = KD_EGA;
-	    /* the color adapter may be in the 40x25 mode... XXX */
-	    break;
-	case 1: /* CGA 40x25 */
-	    /* switch to the 80x25 mode? XXX */
-	    /* FALL THROUGH */
-	case 2: /* CGA 80x25 */
-	    /* `crtc_type' has already been set... */
-	    /* crtc_type = KD_CGA; */
-	    break;
-	case 3: /* MDA */
-	    /* `crtc_type' has already been set... */
-	    /* crtc_type = KD_MONO; */
-	    break;
-	}
+    if ((*biosvidsw.init)() <= 0)
+	return FALSE;
+    if ((adp = (*biosvidsw.adapter)(V_ADP_PRIMARY)) == NULL)
+	return FALSE;
 
-	/* is this a VGA or higher ? */
-	outb(crtc_addr, 7);
-	if (inb(crtc_addr) == 7) {
-
-	    crtc_type = KD_VGA;
-	    crtc_vga = TRUE;
-	    read_vgaregs(vgaregs);
-
-	    /* Get the BIOS video mode pointer */
-	    segoff = *(u_int *)pa_to_va(0x4a8);
-	    pa = ((segoff & 0xffff0000) >> 12) + (segoff & 0xffff);
-	    if (ISMAPPED(pa, sizeof(u_int))) {
-		segoff = *(u_int *)pa_to_va(pa);
-		pa = ((segoff & 0xffff0000) >> 12) + (segoff & 0xffff);       
-		if (ISMAPPED(pa, MODE_PARAM_SIZE))
-		    video_mode_ptr = (char *)pa_to_va(pa);
-	    }
-	}
-    }
+    crtc_type = adp->va_type;
+    crtc_vga = (crtc_type == KD_VGA);
+    crtc_addr = adp->va_crtc_addr;
+    Crtat = (u_short *)adp->va_window;
+    adp_flags = adp->va_flags;
+    initial_video_mode = adp->va_initial_mode;
+    bios_video_mode = adp->va_initial_bios_mode;
 
     return TRUE;
 }
@@ -728,48 +635,42 @@ static int
 scattach(struct isa_device *dev)
 {
     scr_stat *scp;
+    video_info_t info;
     dev_t cdev = makedev(CDEV_MAJOR, 0);
-    char *p;
 #ifdef DEVFS
     int vc;
 #endif
 
     scinit();
     flags = dev->id_flags;
-    if (crtc_type != KD_VGA || VESA_MODE(bios_video_mode))
+    if (!ISFONTAVAIL(adp_flags))
 	flags &= ~CHAR_CURSOR;
 
     scp = console[0];
 
-    if (crtc_type == KD_VGA) {
-	cut_buffer_size = scp->xsize * scp->ysize + 1;
-    	cut_buffer = (char *)malloc(cut_buffer_size, M_DEVBUF, M_NOWAIT);
-	if (cut_buffer != NULL)
-	    cut_buffer[0] = '\0';
-    }
-
-    scp->scr_buf = (u_short *)malloc(scp->xsize*scp->ysize*sizeof(u_short),
-				     M_DEVBUF, M_NOWAIT);
-
     /* copy temporary buffer to final buffer */
-    bcopy(sc_buffer, scp->scr_buf, scp->xsize * scp->ysize * sizeof(u_short));
+    scp->scr_buf = NULL;
+    sc_alloc_scr_buffer(scp, FALSE, FALSE);
+    bcopy(sc_buffer, scp->scr_buf, scp->xsize*scp->ysize*sizeof(u_short));
 
-    scp->cursor_pos = scp->cursor_oldpos =
-	scp->scr_buf + scp->xpos + scp->ypos * scp->xsize;
-    scp->mouse_pos = scp->mouse_oldpos = 
-	scp->scr_buf + ((scp->mouse_ypos/scp->font_size)*scp->xsize +
-	    		scp->mouse_xpos/8);
+    /* cut buffer is available only when the mouse pointer is used */
+    if (ISMOUSEAVAIL(adp_flags))
+	sc_alloc_cut_buffer(scp, FALSE);
 
     /* initialize history buffer & pointers */
-    scp->history_head = scp->history_pos = 
-	(u_short *)malloc(scp->history_size*sizeof(u_short),
-			  M_DEVBUF, M_NOWAIT);
-    if (scp->history_head != NULL)
-        bzero(scp->history_head, scp->history_size*sizeof(u_short));
-    scp->history = scp->history_head;
+    sc_alloc_history_buffer(scp, sc_history_size, 0, FALSE);
+
+#if defined(VESA) && defined(VM86)
+    if ((flags & VESA800X600) 
+	&& ((*biosvidsw.get_info)(scp->adp, M_VESA_800x600, &info) == 0)) {
+	sc_set_graphics_mode(scp, NULL, M_VESA_800x600);
+	sc_set_pixel_mode(scp, NULL, COL, ROW, 16);
+	initial_video_mode = M_VESA_800x600;
+    }
+#endif /* VESA && VM86 */
 
     /* initialize cursor stuff */
-    if (!(scp->status & UNKNOWN_MODE))
+    if (!ISGRAPHSC(scp))
     	draw_cursor_image(scp);
 
     /* get screen update going */
@@ -777,42 +678,13 @@ scattach(struct isa_device *dev)
 
     update_leds(scp->status);
 
-    if ((crtc_type == KD_VGA) && bootverbose) {
-        printf("sc%d: BIOS video mode:%d\n", dev->id_unit, bios_video_mode);
-        printf("sc%d: VGA registers upon power-up\n", dev->id_unit);
-        dump_vgaregs(vgaregs);
-        printf("sc%d: video mode:%d\n", dev->id_unit, scp->mode);
-        printf("sc%d: VGA registers in BIOS for mode:%d\n", 
-		dev->id_unit, scp->mode);
-        dump_vgaregs(vgaregs2);
-	p = get_mode_param(scp, scp->mode);
-        if (p != NULL) {
-            printf("sc%d: VGA registers to be used for mode:%d\n", 
-		dev->id_unit, scp->mode);
-            dump_vgaregs(p);
-        }
-        printf("sc%d: rows_offset:%d\n", dev->id_unit, rows_offset);
-    }
-    if ((crtc_type == KD_VGA) && !VESA_MODE(bios_video_mode) 
-	&& (video_mode_ptr == NULL))
-        printf("sc%d: WARNING: video mode switching is only partially supported\n",
-	        dev->id_unit); 
-
     printf("sc%d: ", dev->id_unit);
     switch(crtc_type) {
     case KD_VGA:
-	if (VESA_MODE(bios_video_mode))
-	    printf("Graphics display (VESA mode = 0x%x)", bios_video_mode);
-	else if (crtc_addr == MONO_BASE)
-	    printf("VGA mono");
-	else
-	    printf("VGA color");
+	printf("VGA %s", (adp_flags & V_ADP_COLOR) ? "color" : "mono");
 	break;
     case KD_EGA:
-	if (crtc_addr == MONO_BASE)
-	    printf("EGA mono");
-	else
-	    printf("EGA color");
+	printf("EGA %s", (adp_flags & V_ADP_COLOR) ? "color" : "mono");
 	break;
     case KD_CGA:
 	printf("CGA");
@@ -820,7 +692,7 @@ scattach(struct isa_device *dev)
     case KD_MONO:
     case KD_HERCULES:
     default:
-	printf("MDA/hercules");
+	printf("MDA/Hercules");
 	break;
     }
     printf(" <%d virtual consoles, flags=0x%x>\n", MAXCONS, flags);
@@ -896,6 +768,8 @@ scopen(dev_t dev, int flag, int mode, struct proc *p)
 	    return(EBUSY);
     if (minor(dev) < MAXCONS && !console[minor(dev)]) {
 	console[minor(dev)] = alloc_scp();
+	if (ISGRAPHSC(console[minor(dev)]))
+	    sc_set_pixel_mode(console[minor(dev)], NULL, COL, ROW, 16);
     }
     if (minor(dev)<MAXCONS && !tp->t_winsize.ws_col && !tp->t_winsize.ws_row) {
 	tp->t_winsize.ws_col = console[minor(dev)]->xsize;
@@ -913,7 +787,7 @@ scclose(dev_t dev, int flag, int mode, struct proc *p)
     if (!tp)
 	return(ENXIO);
     if (minor(dev) < MAXCONS) {
-	scp = get_scr_stat(tp->t_dev);
+	scp = sc_get_scr_stat(tp->t_dev);
 	if (scp->status & SWITCH_WAIT_ACQ)
 	    wakeup((caddr_t)&scp->smode);
 #if not_yet_done
@@ -927,9 +801,9 @@ scclose(dev_t dev, int flag, int mode, struct proc *p)
 	    if (scp->history != NULL) {
 		free(scp->history, M_DEVBUF);
 		if (scp->history_size / scp->xsize
-			> imax(SC_HISTORY_SIZE, scp->ysize))
+			> imax(sc_history_size, scp->ysize))
 		    extra_history_size += scp->history_size / scp->xsize 
-			- imax(SC_HISTORY_SIZE, scp->ysize);
+			- imax(sc_history_size, scp->ysize);
 	    }
 	    free(scp, M_DEVBUF);
 	    console[minor(dev)] = NULL;
@@ -1008,10 +882,17 @@ scintr(int unit)
 	}
     }
 
+#if 0
     if (cur_console->status & MOUSE_ENABLED) {
 	cur_console->status &= ~MOUSE_VISIBLE;
 	remove_mouse_image(cur_console);
     }
+#else
+    if (cur_console->status & MOUSE_VISIBLE) {
+	remove_mouse_image(cur_console);
+	cur_console->status &= ~MOUSE_VISIBLE;
+    }
+#endif
 }
 
 static int
@@ -1030,21 +911,25 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
     u_int i;
     struct tty *tp;
     scr_stat *scp;
-    u_short *usp;
-    char *mp;
+    video_adapter_t *adp;
     int s;
 
     tp = scdevtotty(dev);
     if (!tp)
 	return ENXIO;
-    scp = get_scr_stat(tp->t_dev);
+    scp = sc_get_scr_stat(tp->t_dev);
 
     /* If there is a user_ioctl function call that first */
     if (sc_user_ioctl) {
-	if (error = (*sc_user_ioctl)(dev, cmd, data, flag, p))
+	error = (*sc_user_ioctl)(dev, cmd, data, flag, p);
+	if (error != ENOIOCTL)
 	    return error;
     }
 
+    error = sc_vid_ioctl(tp, cmd, data, flag, p);
+    if (error != ENOIOCTL)
+	return error;
+
     switch (cmd) {  		/* process console hardware related ioctl's */
 
     case GIO_ATTR:      	/* get current attributes */
@@ -1052,18 +937,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case GIO_COLOR:     	/* is this a color console ? */
-	if (crtc_addr == COLOR_BASE)
-	    *(int*)data = 1;
-	else
-	    *(int*)data = 0;
-	return 0;
-
-    case CONS_CURRENT:  	/* get current adapter type */
-	*(int *)data = crtc_type;
-	return 0;
-
-    case CONS_GET:      	/* get current video mode */
-	*(int*)data = scp->mode;
+	*(int *)data = (adp_flags & V_ADP_COLOR) ? 1 : 0;
 	return 0;
 
     case CONS_BLANKTIME:    	/* set screen saver timeout (0 = no saver) */
@@ -1081,7 +955,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	else
 	    flags &= ~BLINK_CURSOR;
 	if ((*(int*)data) & 0x02) {
-	    if (crtc_type != KD_VGA || VESA_MODE(bios_video_mode))
+	    if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
 		return ENXIO;
 	    flags |= CHAR_CURSOR;
 	} else
@@ -1090,7 +964,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	 * The cursor shape is global property; all virtual consoles
 	 * are affected. Update the cursor in the current console...
 	 */
-	if (!(cur_console->status & UNKNOWN_MODE)) {
+	if (!ISGRAPHSC(cur_console)) {
             remove_cursor_image(cur_console);
 	    if (flags & CHAR_CURSOR)
 	        set_destructive_cursor(cur_console);
@@ -1117,37 +991,22 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    lines = imax(*(int *)data, scp->ysize);
 	    lines0 = (scp->history != NULL) ? 
 		      scp->history_size / scp->xsize : scp->ysize;
+	    if (lines0 > imax(sc_history_size, scp->ysize))
+		i = lines0 - imax(sc_history_size, scp->ysize);
+	    else
+		i = 0;
 	    /*
 	     * syscons unconditionally allocates buffers upto SC_HISTORY_SIZE
 	     * lines or scp->ysize lines, whichever is larger. A value 
 	     * greater than that is allowed, subject to extra_history_size.
 	     */
-	    if (lines > imax(lines0, SC_HISTORY_SIZE) + extra_history_size)
-                return EINVAL;
+	    if (lines > imax(sc_history_size, scp->ysize))
+		if (lines - imax(sc_history_size, scp->ysize) >
+		    extra_history_size + i)
+		    return EINVAL;
             if (cur_console->status & BUFFER_SAVED)
                 return EBUSY;
-	    usp = scp->history;
-	    scp->history = NULL;
-	    if (usp != NULL)
-		free(usp, M_DEVBUF);
-	    scp->history_size = lines * scp->xsize;
-	    /*
-	     * extra_history_size += 
-	     *    (lines0 > imax(SC_HISTORY_SIZE, scp->ysize)) ? 
-	     *     lines0 - imax(SC_HISTORY_SIZE, scp->ysize)) : 0;
-	     * extra_history_size -= 
-	     *    (lines > imax(SC_HISTORY_SIZE, scp->ysize)) ? 
-	     *	   lines - imax(SC_HISTORY_SIZE, scp->ysize)) : 0;
-	     * lines0 >= ysize && lines >= ysize... Hey, the above can be 
-	     * reduced to the following...
-	     */
-	    extra_history_size += 
-		imax(lines0, SC_HISTORY_SIZE) - imax(lines, SC_HISTORY_SIZE);
-	    usp = (u_short *)malloc(scp->history_size * sizeof(u_short),
-				    M_DEVBUF, M_WAITOK);
-	    bzero(usp, scp->history_size * sizeof(u_short));
-	    scp->history_head = scp->history_pos = usp;
-	    scp->history = usp;
+	    sc_alloc_history_buffer(scp, lines, i, TRUE);
 	    return 0;
 	}
 	else
@@ -1171,7 +1030,8 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	mouse_info_t *mouse = (mouse_info_t*)data;
 	mouse_info_t buf;
 
-	if (crtc_type != KD_VGA || VESA_MODE(bios_video_mode))
+	/* FIXME: */
+	if (!ISMOUSEAVAIL(get_adapter(scp)->va_flags))
 	    return ENODEV;
 	
 	if (cmd == OLD_CONS_MOUSECTL) {
@@ -1220,7 +1080,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    return 0;
 
 	case MOUSE_SHOW:
-	    if (!(scp->status & MOUSE_ENABLED)) {
+	    if (ISTEXTSC(scp) && !(scp->status & MOUSE_ENABLED)) {
 		scp->status |= (MOUSE_ENABLED | MOUSE_VISIBLE);
 		scp->mouse_oldpos = scp->mouse_pos;
 		mark_all(scp);
@@ -1231,7 +1091,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    break;
 
 	case MOUSE_HIDE:
-	    if (scp->status & MOUSE_ENABLED) {
+	    if (ISTEXTSC(scp) && (scp->status & MOUSE_ENABLED)) {
 		scp->status &= ~(MOUSE_ENABLED | MOUSE_VISIBLE);
 		mark_all(scp);
 		return 0;
@@ -1276,7 +1136,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    if (mouse_status.flags == 0)
 		return 0;
 
-	    if (cur_console->status & MOUSE_ENABLED)
+	    if (ISTEXTSC(cur_console) && (cur_console->status & MOUSE_ENABLED))
 	    	cur_console->status |= MOUSE_VISIBLE;
 
 	    if ((MOUSE_TTY)->t_state & TS_ISOPEN) {
@@ -1321,7 +1181,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    else if (mouse->operation == MOUSE_ACTION && cut_buffer != NULL) {
 		/* process button presses */
 		if ((cur_console->mouse_buttons ^ mouse->u.data.buttons) && 
-		    !(cur_console->status & UNKNOWN_MODE)) {
+		    ISTEXTSC(cur_console)) {
 		    cur_console->mouse_buttons = mouse->u.data.buttons;
 		    if (cur_console->mouse_buttons & MOUSE_BUTTON1DOWN)
 			mouse_cut_start(cur_console);
@@ -1358,7 +1218,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    if (mouse_status.flags == 0)
 		return 0;
 
-	    if (cur_console->status & MOUSE_ENABLED)
+	    if (ISTEXTSC(cur_console) && (cur_console->status & MOUSE_ENABLED))
 	    	cur_console->status |= MOUSE_VISIBLE;
 
 	    if ((MOUSE_TTY)->t_state & TS_ISOPEN) {
@@ -1387,7 +1247,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 		break;
 	    }
 
-	    if ((cur_console->status & UNKNOWN_MODE) || (cut_buffer == NULL))
+	    if (!ISTEXTSC(cur_console) || (cut_buffer == NULL))
 		break;
 
 	    switch (mouse->u.event.id) {
@@ -1567,18 +1427,41 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case CONS_IDLE:		/* see if the screen has been idle */
-	*(int *)data = (scrn_idle && !(cur_console->status & UNKNOWN_MODE));
+	/*
+	 * When the screen is in the GRAPHICS_MODE or UNKNOWN_MODE,
+	 * the user process may have been writing something on the
+	 * screen and syscons is not aware of it. Declare the screen
+	 * is NOT idle if it is in one of these modes. But there is
+	 * an exception to it; if a screen saver is running in the 
+	 * graphics mode in the current screen, we should say that the
+	 * screen has been idle.
+	 */
+	*(int *)data = scrn_idle 
+		       && (!ISGRAPHSC(cur_console)
+			   || (cur_console->status & SAVER_RUNNING));
 	return 0;
 
     case CONS_SAVERMODE:	/* set saver mode */
 	switch(*(int *)data) {
 	case CONS_USR_SAVER:
-	    /* if a LKM screen saver is running, it will eventually stop... */
+	    /* if a LKM screen saver is running, stop it first. */
+	    scsplash_stick(FALSE);
 	    saver_mode = *(int *)data;
+	    s = spltty();
+	    if ((error = wait_scrn_saver_stop())) {
+		splx(s);
+		return error;
+	    }
+	    scp->status |= SAVER_RUNNING;
 	    scsplash_stick(TRUE);
+	    splx(s);
 	    break;
 	case CONS_LKM_SAVER:
+	    s = spltty();
+	    if ((saver_mode == CONS_USR_SAVER) && (scp->status & SAVER_RUNNING))
+		scp->status &= ~SAVER_RUNNING;
 	    saver_mode = *(int *)data;
+	    splx(s);
 	    break;
 	default:
 	    return EINVAL;
@@ -1597,226 +1480,6 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	splx(s);
 	return 0;
 
-    /* VGA TEXT MODES */
-    case SW_VGA_C40x25:
-    case SW_VGA_C80x25: case SW_VGA_M80x25:
-    case SW_VGA_C80x30: case SW_VGA_M80x30:
-    case SW_VGA_C80x50: case SW_VGA_M80x50:
-    case SW_VGA_C80x60: case SW_VGA_M80x60:
-    case SW_B40x25:     case SW_C40x25:
-    case SW_B80x25:     case SW_C80x25:
-    case SW_ENH_B40x25: case SW_ENH_C40x25:
-    case SW_ENH_B80x25: case SW_ENH_C80x25:
-    case SW_ENH_B80x43: case SW_ENH_C80x43:
-    case SW_EGAMONO80x25:
-
-	if (crtc_type != KD_VGA)
- 	    return ENODEV;
- 	mp = get_mode_param(scp, cmd & 0xff);
- 	if (mp == NULL)
- 	    return ENODEV;
- 
-	s = spltty();
-	if ((error = wait_scrn_saver_stop())) {
-	    splx(s);
-	    return error;
-	}
-
-	scp->status &= ~MOUSE_VISIBLE;
-	remove_cutmarking(scp);
-	if (scp->history != NULL)
-	    i = imax(scp->history_size / scp->xsize 
-		     - imax(SC_HISTORY_SIZE, scp->ysize), 0);
-	else
-	    i = 0;
-	switch (cmd & 0xff) {
-	case M_VGA_C80x60: case M_VGA_M80x60:
-	    if (!(fonts_loaded & FONT_8)) {
-		splx(s);
-		return EINVAL;
-	    }
-	    /*
-	     * This is a kludge to fend off scrn_update() while we
-	     * muck around with scp. XXX
-	     */
-	    scp->status |= UNKNOWN_MODE;
-	    scp->xsize = 80;
-	    scp->ysize = 60;
-	    scp->font_size = 8;
-	    break;
-	case M_VGA_C80x50: case M_VGA_M80x50:
-	    if (!(fonts_loaded & FONT_8)) {
-		splx(s);
-		return EINVAL;
-	    }
-	    scp->status |= UNKNOWN_MODE;
-	    scp->xsize = 80;
-	    scp->ysize = 50;
-	    scp->font_size = 8;
-	    break;
-	case M_ENH_B80x43: case M_ENH_C80x43:
-	    if (!(fonts_loaded & FONT_8)) {
-		splx(s);
-		return EINVAL;
-	    }
-	    scp->status |= UNKNOWN_MODE;
-	    scp->xsize = 80;
-	    scp->ysize = 43;
-	    scp->font_size = 8;
-	    break;
-	case M_VGA_C80x30: case M_VGA_M80x30:
-	    scp->status |= UNKNOWN_MODE;
-	    scp->xsize = 80;
-	    scp->ysize = 30;
-	    scp->font_size = mp[2];
-	    break;
-	case M_ENH_C40x25: case M_ENH_B40x25:
-	case M_ENH_C80x25: case M_ENH_B80x25:
-	case M_EGAMONO80x25:
-	    if (!(fonts_loaded & FONT_14)) {
-		splx(s);
-		return EINVAL;
-	    }
-	    /* FALL THROUGH */
-	default:
-	    if ((cmd & 0xff) > M_VGA_CG320) {
-		splx(s);
-		return EINVAL;
-	    }
-	    scp->status |= UNKNOWN_MODE;
-            scp->xsize = mp[0];
-            scp->ysize = mp[1] + rows_offset;
-	    scp->font_size = mp[2];
-	    break;
-	}
-
-	scp->mode = cmd & 0xff;
-	scp->xpixel = scp->xsize * 8;
-	scp->ypixel = scp->ysize * scp->font_size;
-	free(scp->scr_buf, M_DEVBUF);
-	scp->scr_buf = (u_short *)
-	    malloc(scp->xsize*scp->ysize*sizeof(u_short), M_DEVBUF, M_WAITOK);
-	/* move the text cursor to the home position */
-	move_crsr(scp, 0, 0);
-	/* move the mouse cursor at the center of the screen */
-	scp->mouse_xpos = scp->xpixel / 2;
-	scp->mouse_ypos = scp->ypixel / 2;
-    	scp->mouse_pos = scp->mouse_oldpos = 
-	    scp->scr_buf + (scp->mouse_ypos / scp->font_size) * scp->xsize 
-	    + scp->mouse_xpos / 8;
-	/* allocate a larger cut buffer if necessary */
-	if ((cut_buffer == NULL)
-	    || (cut_buffer_size < scp->xsize * scp->ysize + 1)) {
-	    if (cut_buffer != NULL)
-		free(cut_buffer, M_DEVBUF);
-	    cut_buffer_size = scp->xsize * scp->ysize + 1;
-	    cut_buffer = (char *)malloc(cut_buffer_size, M_DEVBUF, M_NOWAIT);
-	    if (cut_buffer != NULL)
-		cut_buffer[0] = '\0';
-	}
-	splx(s);
-
-	usp = scp->history;
-	scp->history = NULL;
-	if (usp != NULL) {
-	    free(usp, M_DEVBUF);
-	    extra_history_size += i;
-	}
-	scp->history_size = imax(SC_HISTORY_SIZE, scp->ysize) * scp->xsize;
-	usp = (u_short *)malloc(scp->history_size * sizeof(u_short), 
-				M_DEVBUF, M_NOWAIT);
-	if (usp != NULL)
-	    bzero(usp, scp->history_size * sizeof(u_short));
-	scp->history_head = scp->history_pos = usp;
-	scp->history = usp;
-	if (scp == cur_console)
-	    set_mode(scp);
-	clear_screen(scp);
-	scp->status &= ~UNKNOWN_MODE;
-
-	if (tp->t_winsize.ws_col != scp->xsize
-	    || tp->t_winsize.ws_row != scp->ysize) {
-	    tp->t_winsize.ws_col = scp->xsize;
-	    tp->t_winsize.ws_row = scp->ysize;
-	    pgsignal(tp->t_pgrp, SIGWINCH, 1);
-	}
-	return 0;
-
-    /* GRAPHICS MODES */
-    case SW_BG320:     case SW_BG640:
-    case SW_CG320:     case SW_CG320_D:   case SW_CG640_E:
-    case SW_CG640x350: case SW_ENH_CG640:
-    case SW_BG640x480: case SW_CG640x480: case SW_VGA_CG320:
-
-	if (crtc_type != KD_VGA)
-	    return ENODEV;
-	mp = get_mode_param(scp, cmd & 0xff);
-	if (mp == NULL)
-	    return ENODEV;
-
-	s = spltty();
-	if ((error = wait_scrn_saver_stop())) {
-	    splx(s);
-	    return error;
-	}
-
-	scp->status &= ~MOUSE_VISIBLE;
-	remove_cutmarking(scp);
-	scp->status |= UNKNOWN_MODE;    /* graphics mode */
-	scp->mode = cmd & 0xFF;
-	scp->xpixel = mp[0] * 8;
-	scp->ypixel = (mp[1] + rows_offset) * mp[2];
-	scp->font_size = FONT_NONE;
-	/* move the mouse cursor at the center of the screen */
-	scp->mouse_xpos = scp->xpixel / 2;
-	scp->mouse_ypos = scp->ypixel / 2;
-	splx(s);
-
-	if (scp == cur_console)
-	    set_mode(scp);
-	/* clear_graphics();*/
-
-	if (tp->t_winsize.ws_xpixel != scp->xpixel
-	    || tp->t_winsize.ws_ypixel != scp->ypixel) {
-	    tp->t_winsize.ws_xpixel = scp->xpixel;
-	    tp->t_winsize.ws_ypixel = scp->ypixel;
-	    pgsignal(tp->t_pgrp, SIGWINCH, 1);
-	}
-	return 0;
-
-    case SW_VGA_MODEX:
-	if (crtc_type != KD_VGA)
-	    return ENODEV;
-	mp = get_mode_param(scp, cmd & 0xff);
-	if (mp == NULL)
-	    return ENODEV;
-
-	s = spltty();
-	if ((error = wait_scrn_saver_stop())) {
-	    splx(s);
-	    return error;
-	}
-
-	scp->status &= ~MOUSE_VISIBLE;
-	remove_cutmarking(scp);
-	scp->status |= UNKNOWN_MODE;    /* graphics mode */
-	scp->mode = cmd & 0xFF;
-	scp->xpixel = 320;
-	scp->ypixel = 240;
-	scp->font_size = FONT_NONE;
-	splx(s);
-
-	if (scp == cur_console)
-	    set_mode(scp);
-	/* clear_graphics();*/
-	if (tp->t_winsize.ws_xpixel != scp->xpixel
-	    || tp->t_winsize.ws_ypixel != scp->ypixel) {
-	    tp->t_winsize.ws_xpixel = scp->xpixel;
-	    tp->t_winsize.ws_ypixel = scp->ypixel;
-	    pgsignal(tp->t_pgrp, SIGWINCH, 1);
-	}
-	return 0;
-
     case VT_SETMODE:    	/* set screen switcher mode */
     {
 	struct vt_mode *mode;
@@ -1839,7 +1502,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case VT_RELDISP:    	/* screen switcher ioctl */
-	switch(*data) {
+	switch(*(int *)data) {
 	case VT_FALSE:  	/* user refuses to release screen, abort */
 	    if (scp == old_scp && (scp->status & SWITCH_WAIT_REL)) {
 		old_scp->status &= ~SWITCH_WAIT_REL;
@@ -1879,32 +1542,32 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	for (i = 0; i < MAXCONS; i++) {
 	    tp = VIRTUAL_TTY(i);
 	    if (!(tp->t_state & TS_ISOPEN)) {
-		*data = i + 1;
+		*(int *)data = i + 1;
 		return 0;
 	    }
 	}
 	return EINVAL;
 
     case VT_ACTIVATE:   	/* switch to screen *data */
-	return switch_scr(scp, (*data) - 1);
+	return switch_scr(scp, *(int *)data - 1);
 
     case VT_WAITACTIVE: 	/* wait for switch to occur */
-	if (*data > MAXCONS || *data < 0)
+	if (*(int *)data > MAXCONS || *(int *)data < 0)
 	    return EINVAL;
-	if (minor(dev) == (*data) - 1)
+	if (minor(dev) == *(int *)data - 1)
 	    return 0;
-	if (*data == 0) {
+	if (*(int *)data == 0) {
 	    if (scp == cur_console)
 		return 0;
 	}
 	else
-	    scp = console[(*data) - 1];
+	    scp = console[*(int *)data - 1];
 	while ((error=tsleep((caddr_t)&scp->smode, PZERO|PCATCH,
 			     "waitvt", 0)) == ERESTART) ;
 	return error;
 
     case VT_GETACTIVE:
-	*data = get_scr_num()+1;
+	*(int *)data = get_scr_num()+1;
 	return 0;
 
     case KDENABIO:      	/* allow io operations */
@@ -1920,102 +1583,28 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	p->p_md.md_regs->tf_eflags &= ~PSL_IOPL;
 	return 0;
 
-    case KDSETMODE:     	/* set current mode of this (virtual) console */
-	switch (*data) {
-	case KD_TEXT:   	/* switch to TEXT (known) mode */
-	    /* restore fonts & palette ! */
-	    if (crtc_type == KD_VGA) {
-		if (!VESA_MODE(scp->mode)) {
-#if 0
-		    /*
-		     * FONT KLUDGE
-		     * Don't load fonts for now... XXX
-		     */
-		    if (fonts_loaded & FONT_8)
-			copy_font(LOAD, FONT_8, font_8);
-		    if (fonts_loaded & FONT_14)
-			copy_font(LOAD, FONT_14, font_14);
-		    if (fonts_loaded & FONT_16)
-			copy_font(LOAD, FONT_16, font_16);
-#endif
-		}
-		load_palette(palette);
-	    }
-
-	    /* move hardware cursor out of the way */
-	    outb(crtc_addr, 14);
-	    outb(crtc_addr + 1, 0xff);
-	    outb(crtc_addr, 15);
-	    outb(crtc_addr + 1, 0xff);
-
-	    /* FALL THROUGH */
-
-	case KD_TEXT1:  	/* switch to TEXT (known) mode */
-	    s = spltty();
-	    if ((error = wait_scrn_saver_stop())) {
-		splx(s);
-		return error;
-	    }
-	    scp->status &= ~MOUSE_VISIBLE;
-	    remove_cutmarking(scp);
-	    scp->status |= UNKNOWN_MODE;
-	    splx(s);
-	    /* no restore fonts & palette */
-	    if (crtc_type == KD_VGA)
-		set_mode(scp);
-	    scp->status &= ~UNKNOWN_MODE;
-	    clear_screen(scp);
-	    return 0;
-
-	case KD_GRAPHICS:	/* switch to GRAPHICS (unknown) mode */
-	    s = spltty();
-	    if ((error = wait_scrn_saver_stop())) {
-		splx(s);
-		return error;
-	    }
-	    scp->status &= ~MOUSE_VISIBLE;
-	    remove_cutmarking(scp);
-	    scp->status |= UNKNOWN_MODE;
-	    splx(s);
-	    return 0;
-	default:
+    case KDSKBSTATE:    	/* set keyboard state (locks) */
+	if (*(int *)data & ~LOCK_KEY_MASK)
 	    return EINVAL;
-	}
-	/* NOT REACHED */
-
-    case KDGETMODE:     	/* get current mode of this (virtual) console */
-	*data = (scp->status & UNKNOWN_MODE) ? KD_GRAPHICS : KD_TEXT;
-	return 0;
-
-    case KDSBORDER:     	/* set border color of this (virtual) console */
-	scp->border = *data;
+	scp->status &= ~LOCK_KEY_MASK;
+	scp->status |= *(int *)data;
 	if (scp == cur_console)
-	    set_border(scp->border);
+	    update_leds(scp->status);
 	return 0;
 
-    case KDSKBSTATE:    	/* set keyboard state (locks) */
-	if (*data >= 0 && *data <= LOCK_KEY_MASK) {
-	    scp->status &= ~LOCK_KEY_MASK;
-	    scp->status |= *data;
-	    if (scp == cur_console)
-		update_leds(scp->status);
-	    return 0;
-	}
-	return EINVAL;
-
     case KDGKBSTATE:    	/* get keyboard state (locks) */
-	*data = scp->status & LOCK_KEY_MASK;
+	*(int *)data = scp->status & LOCK_KEY_MASK;
 	return 0;
 
     case KDSETRAD:      	/* set keyboard repeat & delay rates */
-	if (*data & 0x80)
+	if (*(int *)data & ~0x7f)
 	    return EINVAL;
 	if (sc_kbdc != NULL) 
-	    set_keyboard(KBDC_SET_TYPEMATIC, *data);
+	    set_keyboard(KBDC_SET_TYPEMATIC, *(int *)data);
 	return 0;
 
     case KDSKBMODE:     	/* set keyboard mode */
-	switch (*data) {
+	switch (*(int *)data) {
 	case K_RAW: 		/* switch to RAW scancode mode */
 	    scp->status &= ~KBD_CODE_MODE;
 	    scp->status |= KBD_RAW_MODE;
@@ -2037,7 +1626,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	/* NOT REACHED */
 
     case KDGKBMODE:     	/* get keyboard mode */
-	*data = (scp->status & KBD_RAW_MODE) ? K_RAW : 
+	*(int *)data = (scp->status & KBD_RAW_MODE) ? K_RAW : 
 		((scp->status & KBD_CODE_MODE) ? K_CODE : K_XLATE);
 	return 0;
 
@@ -2074,21 +1663,20 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case KDGKBTYPE:     	/* get keyboard type */
-	*data = 0;  		/* type not known (yet) */
+	*(int *)data = 0;  	/* type not known (yet) */
 	return 0;
 
     case KDSETLED:      	/* set keyboard LED status */
-	if (*data >= 0 && *data <= LED_MASK) {
-	    scp->status &= ~LED_MASK;
-	    scp->status |= *data;
-	    if (scp == cur_console)
-		update_leds(scp->status);
-	    return 0;
-	}
-	return EINVAL;
+	if (*(int *)data & ~LED_MASK)
+	    return EINVAL;
+	scp->status &= ~LED_MASK;
+	scp->status |= *(int *)data;
+	if (scp == cur_console)
+	    update_leds(scp->status);
+	return 0;
 
     case KDGETLED:      	/* get keyboard LED status */
-	*data = scp->status & LED_MASK;
+	*(int *)data = scp->status & LED_MASK;
 	return 0;
 
     case GETFKEY:       	/* get functionkey string */
@@ -2143,7 +1731,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case PIO_FONT8x8:   	/* set 8x8 dot font */
-	if (crtc_type != KD_VGA)
+	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
 	    return ENXIO;
 	bcopy(data, font_8, 8*256);
 	fonts_loaded |= FONT_8;
@@ -2152,17 +1740,12 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	 * Always use the font page #0. XXX
 	 * Don't load if the current font size is not 8x8.
 	 */
-	if (!VESA_MODE(cur_console->mode) 
-	    && !(cur_console->status & UNKNOWN_MODE)
-	    && (cur_console->font_size < 14)) {
-	    copy_font(LOAD, FONT_8, font_8);
-	    if (flags & CHAR_CURSOR)
-	        set_destructive_cursor(cur_console);
-	}
+	if (ISTEXTSC(cur_console) && (cur_console->font_size < 14))
+	    copy_font(cur_console, LOAD, 8, font_8);
 	return 0;
 
     case GIO_FONT8x8:   	/* get 8x8 dot font */
-	if (crtc_type != KD_VGA)
+	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
 	    return ENXIO;
 	if (fonts_loaded & FONT_8) {
 	    bcopy(font_8, data, 8*256);
@@ -2172,7 +1755,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    return ENXIO;
 
     case PIO_FONT8x14:  	/* set 8x14 dot font */
-	if (crtc_type != KD_VGA)
+	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
 	    return ENXIO;
 	bcopy(data, font_14, 14*256);
 	fonts_loaded |= FONT_14;
@@ -2181,17 +1764,13 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	 * Always use the font page #0. XXX
 	 * Don't load if the current font size is not 8x14.
 	 */
-	if (!VESA_MODE(cur_console->mode) 
-	    && !(cur_console->status & UNKNOWN_MODE)
-	    && (cur_console->font_size >= 14) && (cur_console->font_size < 16)) {
-	    copy_font(LOAD, FONT_14, font_14);
-	    if (flags & CHAR_CURSOR)
-	        set_destructive_cursor(cur_console);
-	}
+	if (ISTEXTSC(cur_console)
+	    && (cur_console->font_size >= 14) && (cur_console->font_size < 16))
+	    copy_font(cur_console, LOAD, 14, font_14);
 	return 0;
 
     case GIO_FONT8x14:  	/* get 8x14 dot font */
-	if (crtc_type != KD_VGA)
+	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
 	    return ENXIO;
 	if (fonts_loaded & FONT_14) {
 	    bcopy(font_14, data, 14*256);
@@ -2201,7 +1780,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    return ENXIO;
 
     case PIO_FONT8x16:  	/* set 8x16 dot font */
-	if (crtc_type != KD_VGA)
+	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
 	    return ENXIO;
 	bcopy(data, font_16, 16*256);
 	fonts_loaded |= FONT_16;
@@ -2210,17 +1789,12 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	 * Always use the font page #0. XXX
 	 * Don't load if the current font size is not 8x16.
 	 */
-	if (!VESA_MODE(cur_console->mode) 
-	    && !(cur_console->status & UNKNOWN_MODE)
-	    && (cur_console->font_size >= 16)) {
-	    copy_font(LOAD, FONT_16, font_16);
-	    if (flags & CHAR_CURSOR)
-	        set_destructive_cursor(cur_console);
-	}
+	if (ISTEXTSC(cur_console) && (cur_console->font_size >= 16))
+	    copy_font(cur_console, LOAD, 16, font_16);
 	return 0;
 
     case GIO_FONT8x16:  	/* get 8x16 dot font */
-	if (crtc_type != KD_VGA)
+	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
 	    return ENXIO;
 	if (fonts_loaded & FONT_16) {
 	    bcopy(font_16, data, 16*256);
@@ -2247,7 +1821,7 @@ scstart(struct tty *tp)
     struct clist *rbp;
     int s, len;
     u_char buf[PCBURST];
-    scr_stat *scp = get_scr_stat(tp->t_dev);
+    scr_stat *scp = sc_get_scr_stat(tp->t_dev);
 
     if (scp->status & SLKED || blink_in_progress)
 	return; /* XXX who repeats the call when the above flags are cleared? */
@@ -2329,7 +1903,7 @@ sccnputc(dev_t dev, int c)
 
     scp->term = kernel_console;
     current_default = &kernel_default;
-    if (scp == cur_console && !(scp->status & UNKNOWN_MODE))
+    if (scp == cur_console && !ISGRAPHSC(scp))
 	remove_cursor_image(scp);
     buf[0] = c;
     ansi_put(scp, buf, 1);
@@ -2384,25 +1958,28 @@ sccnupdate(scr_stat *scp)
     if (font_loading_in_progress)
 	return;
 
-    if (panicstr) {
+    if (panicstr || shutdown_in_progress) {
 	scsplash_stick(FALSE);
 	run_scrn_saver = FALSE;
+    } else if (scp != cur_console) {
+	return;
     }
+
     if (!run_scrn_saver)
 	scrn_idle = FALSE;
     if ((saver_mode != CONS_LKM_SAVER) || !scrn_idle)
-	if (scrn_blanked > 0)
+	if (scp->status & SAVER_RUNNING)
             stop_scrn_saver(current_saver);
 
     if (scp != cur_console || blink_in_progress || switch_in_progress)
 	return;
 
-    if ((scp->status & UNKNOWN_MODE) == 0 && scrn_blanked <= 0)
+    if (!ISGRAPHSC(scp) && !(scp->status & SAVER_RUNNING))
 	scrn_update(scp, TRUE);
 }
 
-static scr_stat
-*get_scr_stat(dev_t dev)
+scr_stat
+*sc_get_scr_stat(dev_t dev)
 {
     int unit = minor(dev);
 
@@ -2461,6 +2038,8 @@ scrn_timer(void *arg)
 	    scintr(0);
     }
 
+    scp = cur_console;
+
     /* should we stop the screen saver? */
     getmicrouptime(&tv);
     if (panicstr || shutdown_in_progress) {
@@ -2476,7 +2055,7 @@ scrn_timer(void *arg)
 	    run_scrn_saver = TRUE;
     }
     if ((saver_mode != CONS_LKM_SAVER) || !scrn_idle)
-	if (scrn_blanked > 0)
+	if (scp->status & SAVER_RUNNING)
             stop_scrn_saver(current_saver);
 
     /* should we just return ? */
@@ -2488,14 +2067,13 @@ scrn_timer(void *arg)
     }
 
     /* Update the screen */
-    scp = cur_console;
-    if ((scp->status & UNKNOWN_MODE) == 0 && scrn_blanked <= 0)
+    if (!ISGRAPHSC(scp) && !(scp->status & SAVER_RUNNING))
 	scrn_update(scp, TRUE);
 
     /* should we activate the screen saver? */
     if ((saver_mode == CONS_LKM_SAVER) && scrn_idle)
-	if ((scp->status & UNKNOWN_MODE) == 0 || scrn_blanked > 0)
-	    (*current_saver)(TRUE);
+	if (!ISGRAPHSC(scp) || (scp->status & SAVER_RUNNING))
+	    scrn_saver(current_saver, TRUE);
 
     if (arg)
 	timeout(scrn_timer, (void *)TRUE, hz / 25);
@@ -2583,9 +2161,9 @@ add_scrn_saver(void (*this_saver)(int))
 
     if (current_saver != default_saver)
 	return EBUSY;
-    current_saver = this_saver;
+    run_scrn_saver = FALSE;
     saver_mode = CONS_LKM_SAVER;
-    run_scrn_saver = (scrn_blank_time > 0);
+    current_saver = this_saver;
     return 0;
 }
 
@@ -2612,10 +2190,22 @@ remove_scrn_saver(void (*this_saver)(int))
     return 0;
 }
 
+static void
+scrn_saver(void (*saver)(int), int blank)
+{
+    static int busy = FALSE;
+
+    if (busy)
+	return;
+    busy = TRUE;
+    (*saver)(blank);
+    busy = FALSE;
+}
+
 static void
 stop_scrn_saver(void (*saver)(int))
 {
-    (*saver)(FALSE);
+    scrn_saver(saver, FALSE);
     run_scrn_saver = FALSE;
     /* the screen saver may have chosen not to stop after all... */
     if (scrn_blanked > 0)
@@ -2632,8 +2222,8 @@ wait_scrn_saver_stop(void)
 {
     int error = 0;
 
-    run_scrn_saver = FALSE;
     while (scrn_blanked > 0) {
+	run_scrn_saver = FALSE;
 	error = tsleep((caddr_t)&scrn_blanked, PZERO | PCATCH, "scrsav", 0);
 	run_scrn_saver = FALSE;
 	if (error != ERESTART)
@@ -2642,8 +2232,8 @@ wait_scrn_saver_stop(void)
     return error;
 }
 
-static void
-clear_screen(scr_stat *scp)
+void
+sc_clear_screen(scr_stat *scp)
 {
     move_crsr(scp, 0, 0);
     scp->cursor_oldpos = scp->cursor_pos;
@@ -2668,8 +2258,7 @@ switch_scr(scr_stat *scp, u_int next_scr)
 	switch_in_progress = FALSE;
 
     if (next_scr >= MAXCONS || switch_in_progress ||
-	(cur_console->smode.mode == VT_AUTO
-	 && cur_console->status & UNKNOWN_MODE)) {
+	(cur_console->smode.mode == VT_AUTO && ISGRAPHSC(cur_console))) {
 	do_bell(scp, BELL_PITCH, BELL_DURATION);
 	return EINVAL;
     }
@@ -2721,25 +2310,26 @@ exchange_scr(void)
 {
     move_crsr(old_scp, old_scp->xpos, old_scp->ypos);
     cur_console = new_scp;
-    if (old_scp->mode != new_scp->mode || (old_scp->status & UNKNOWN_MODE)){
-	if (crtc_type == KD_VGA)
+    if (old_scp->mode != new_scp->mode || ISUNKNOWNSC(old_scp)) {
+	if (adp_flags & V_ADP_MODECHANGE)
 	    set_mode(new_scp);
     }
     move_crsr(new_scp, new_scp->xpos, new_scp->ypos);
-    if (!(new_scp->status & UNKNOWN_MODE) && (flags & CHAR_CURSOR))
+    if (ISTEXTSC(new_scp) && (flags & CHAR_CURSOR))
 	set_destructive_cursor(new_scp);
-    if ((old_scp->status & UNKNOWN_MODE) && crtc_type == KD_VGA)
-	load_palette(palette);
+    if (ISGRAPHSC(old_scp))
+	load_palette(new_scp, palette);
     if (old_scp->status & KBD_RAW_MODE || new_scp->status & KBD_RAW_MODE ||
         old_scp->status & KBD_CODE_MODE || new_scp->status & KBD_CODE_MODE)
 	shfts = ctls = alts = agrs = metas = accents = 0;
-    set_border(new_scp->border);
+    set_border(new_scp, new_scp->border);
     update_leds(new_scp->status);
     delayed_next_scr = FALSE;
     mark_all(new_scp);
-    if (new_scp->mode == 0x102) {
-	bzero(Crtat, 800*600/8);
-    }
+
+    /* FIXME: the screen size may be larger than a 64K segment. */
+    if (ISPIXELSC(new_scp))
+	bzero(Crtat, new_scp->xpixel*new_scp->ypixel/8);
 }
 
 static void
@@ -2788,7 +2378,7 @@ scan_esc(scr_stat *scp, u_char c)
 	    return;
 #endif
 	case 'c':   /* Clear screen & home */
-	    clear_screen(scp);
+	    sc_clear_screen(scp);
 	    break;
 
 	case '(':   /* iso-2022: designate 94 character set to G0 */
@@ -2874,7 +2464,7 @@ scan_esc(scr_stat *scp, u_char c)
 		      scp->cursor_pos,
 		      scp->scr_buf + scp->xsize * scp->ysize - scp->cursor_pos);
     		mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
-    		mark_for_update(scp, scp->xsize * scp->ysize);
+    		mark_for_update(scp, scp->xsize * scp->ysize - 1);
 		remove_cutmarking(scp);
 		break;
 	    case 1: /* clear from beginning of display to cursor */
@@ -2936,7 +2526,7 @@ scan_esc(scr_stat *scp, u_char c)
 	    fillw(scp->term.cur_color | scr_map[0x20], src,
 		  n * scp->xsize);
 	    mark_for_update(scp, scp->ypos * scp->xsize);
-	    mark_for_update(scp, scp->xsize * scp->ysize);
+	    mark_for_update(scp, scp->xsize * scp->ysize - 1);
 	    break;
 
 	case 'M':   /* Delete n lines */
@@ -2951,7 +2541,7 @@ scan_esc(scr_stat *scp, u_char c)
 	    fillw(scp->term.cur_color | scr_map[0x20], src,
 		  n * scp->xsize);
 	    mark_for_update(scp, scp->ypos * scp->xsize);
-	    mark_for_update(scp, scp->xsize * scp->ysize);
+	    mark_for_update(scp, scp->xsize * scp->ysize - 1);
 	    break;
 
 	case 'P':   /* Delete n chars */
@@ -3192,7 +2782,7 @@ scan_esc(scr_stat *scp, u_char c)
 	    if (scp->term.num_param == 1) {
 		scp->border=scp->term.param[0] & 0xff;
 		if (scp == cur_console)
-		    set_border(scp->border);
+		    set_border(cur_console, scp->border);
             }
 	    break;
 
@@ -3209,8 +2799,8 @@ scan_esc(scr_stat *scp, u_char c)
 		    flags |= BLINK_CURSOR;
 		else
 		    flags &= ~BLINK_CURSOR;
-		if ((scp->term.param[0] & 0x02) && 
-		    crtc_type == KD_VGA && !VESA_MODE(bios_video_mode))
+		if ((scp->term.param[0] & 0x02) 
+		    && ISFONTAVAIL(get_adapter(scp)->va_flags)) 
 		    flags |= CHAR_CURSOR;
 		else
 		    flags &= ~CHAR_CURSOR;
@@ -3223,9 +2813,9 @@ scan_esc(scr_stat *scp, u_char c)
 	     * The cursor shape is global property; all virtual consoles
 	     * are affected. Update the cursor in the current console...
 	     */
-	    if (!(cur_console->status & UNKNOWN_MODE)) {
+	    if (!ISGRAPHSC(cur_console)) {
 		remove_cursor_image(cur_console);
-		if (crtc_type == KD_VGA && (flags & CHAR_CURSOR))
+		if (flags & CHAR_CURSOR)
 	            set_destructive_cursor(cur_console);
 		draw_cursor_image(cur_console);
 	    }
@@ -3366,7 +2956,7 @@ outloop:
 	    break;
 
 	case 0x0c:  /* form feed, clears screen */
-	    clear_screen(scp);
+	    sc_clear_screen(scp);
 	    break;
 
 	case 0x0d:  /* return, return to pos 0 */
@@ -3413,42 +3003,17 @@ outloop:
 static void
 scinit(void)
 {
-    u_int hw_cursor;
+    int col;
+    int row;
     u_int i;
 
     if (init_done != COLD)
 	return;
     init_done = WARM;
 
-    /*
-     * Ensure a zero start address.  This is mainly to recover after
-     * switching from pcvt using userconfig().  The registers are w/o
-     * for old hardware so it's too hard to relocate the active screen
-     * memory.
-     */
-    outb(crtc_addr, 12);
-    outb(crtc_addr + 1, 0);
-    outb(crtc_addr, 13);
-    outb(crtc_addr + 1, 0);
-
-    /* extract cursor location */
-    outb(crtc_addr, 14);
-    hw_cursor = inb(crtc_addr + 1) << 8;
-    outb(crtc_addr, 15);
-    hw_cursor |= inb(crtc_addr + 1);
-
-    /*
-     * Validate cursor location.  It may be off the screen.  Then we must
-     * not use it for the initial buffer offset.
-     */
-    if (hw_cursor >= ROW * COL)
-	hw_cursor = (ROW - 1) * COL;
-
-    /* move hardware cursor out of the way */
-    outb(crtc_addr, 14);
-    outb(crtc_addr + 1, 0xff);
-    outb(crtc_addr, 15);
-    outb(crtc_addr + 1, 0xff);
+    /* extract the hardware cursor location and move it out of the way */
+    (*biosvidsw.read_hw_cursor)(V_ADP_PRIMARY, &col, &row);
+    (*biosvidsw.set_hw_cursor)(V_ADP_PRIMARY, -1, -1);
 
     /* set up the first console */
     current_default = &user_default;
@@ -3456,51 +3021,22 @@ scinit(void)
     init_scp(console[0]);
     cur_console = console[0];
 
-    /* discard the video mode table if we are not familiar with it... */
-    if (video_mode_ptr) {
-        bzero(mode_map, sizeof(mode_map));
-	bcopy(video_mode_ptr + MODE_PARAM_SIZE*console[0]->mode, 
-	      vgaregs2, sizeof(vgaregs2));
-        switch (comp_vgaregs(vgaregs, video_mode_ptr 
-                    + MODE_PARAM_SIZE*console[0]->mode)) {
-        case COMP_IDENTICAL:
-            map_mode_table(mode_map, video_mode_ptr, M_VGA_CG320 + 1);
-            /* 
-             * This is a kludge for Toshiba DynaBook SS433 whose BIOS video
-             * mode table entry has the actual # of rows at the offset 1; 
-	     * BIOSes from other manufacturers store the # of rows - 1 there. 
-	     * XXX
-             */
-	    rows_offset = vgaregs[1] + 1 
-		- video_mode_ptr[MODE_PARAM_SIZE*console[0]->mode + 1];
-            break;
-        case COMP_SIMILAR:
-            map_mode_table(mode_map, video_mode_ptr, M_VGA_CG320 + 1);
-            mode_map[console[0]->mode] = vgaregs;
-	    rows_offset = vgaregs[1] + 1 
-		- video_mode_ptr[MODE_PARAM_SIZE*console[0]->mode + 1];
-            vgaregs[1] -= rows_offset - 1;
-            break;
-        case COMP_DIFFERENT:
-        default:
-            video_mode_ptr = NULL;
-            mode_map[console[0]->mode] = vgaregs;
-	    rows_offset = 1;
-            break;
-        }
-    }
-
     /* copy screen to temporary buffer */
-    if (!VESA_MODE(console[0]->mode))
+    if (ISTEXTSC(console[0]))
 	    generic_bcopy(Crtat, sc_buffer,
 		   console[0]->xsize * console[0]->ysize * sizeof(u_short));
 
     console[0]->scr_buf = console[0]->mouse_pos = console[0]->mouse_oldpos
 	= sc_buffer;
-    console[0]->cursor_pos = console[0]->cursor_oldpos = sc_buffer + hw_cursor;
+    if (col >= console[0]->xsize)
+	col = 0;
+    if (row >= console[0]->ysize)
+	row = console[0]->ysize - 1;
+    console[0]->xpos = col;
+    console[0]->ypos = row;
+    console[0]->cursor_pos = console[0]->cursor_oldpos =
+	sc_buffer + row*console[0]->xsize + col;
     console[0]->cursor_saveunder = *console[0]->cursor_pos;
-    console[0]->xpos = hw_cursor % COL;
-    console[0]->ypos = hw_cursor / COL;
     for (i=1; i<MAXCONS; i++)
 	console[i] = NULL;
     kernel_console.esc = 0;
@@ -3515,28 +3051,26 @@ scinit(void)
 	scr_map[i] = scr_rmap[i] = i;
     }
 
-    /* Save font and palette if VGA */
-    if (crtc_type == KD_VGA) {
-	if (!VESA_MODE(bios_video_mode)) {
-	    if (fonts_loaded & FONT_16) {
-		copy_font(LOAD, FONT_16, font_16);
-	    } else {
-		copy_font(SAVE, FONT_16, font_16);
-		fonts_loaded = FONT_16;
-	    }
-	    set_destructive_cursor(console[0]);
+    /* Save font and palette */
+    if (ISFONTAVAIL(get_adapter(cur_console)->va_flags)) {
+	if (fonts_loaded & FONT_16) {
+	    copy_font(cur_console, LOAD, 16, font_16);
+	} else {
+	    copy_font(cur_console, SAVE, 16, font_16);
+	    fonts_loaded = FONT_16;
+	    set_destructive_cursor(cur_console);
 	}
-	save_palette();
+	/*
+	 * FONT KLUDGE
+	 * Always use the font page #0. XXX
+	 */
+	(*biosvidsw.show_font)(cur_console->adp, 0);
     }
+    save_palette(cur_console, palette);
 
 #ifdef SC_SPLASH_SCREEN
-    /* 
-     * If not booting verbosely, put up the splash.
-     * Note that the splash screen is not currently supported in 
-     * the VESA mode.
-     */
-    if (!(boothowto & RB_VERBOSE) && !VESA_MODE(bios_video_mode))
-	scsplash_init();
+    /* put up the splash. */
+    scsplash_init(cur_console);
 #endif
 }
 
@@ -3551,52 +3085,79 @@ scshutdown(int howto, void *arg)
     shutdown_in_progress = TRUE;
 }
 
-static void
-map_mode_table(char *map[], char *table, int max)
+int
+sc_clean_up(scr_stat *scp)
 {
-    int i;
+    int error;
 
-    for(i = 0; i < max; ++i)
-	map[i] = table + i*MODE_PARAM_SIZE;
-    for(; i < MODE_MAP_SIZE; ++i)
-	map[i] = NULL;
+    if ((error = wait_scrn_saver_stop()))
+	return error;
+    scp->status &= ~MOUSE_VISIBLE;
+    remove_cutmarking(scp);
+    return 0;
 }
 
-static int
-map_mode_num(int mode)
+void
+sc_alloc_scr_buffer(scr_stat *scp, int wait, int clear)
 {
-    static struct {
-        int from;
-        int to;
-    } mode_map[] = {
-        { M_ENH_B80x43, M_ENH_B80x25 },
-        { M_ENH_C80x43, M_ENH_C80x25 },
-        { M_VGA_M80x30, M_VGA_M80x25 },
-        { M_VGA_C80x30, M_VGA_C80x25 },
-        { M_VGA_M80x50, M_VGA_M80x25 },
-        { M_VGA_C80x50, M_VGA_C80x25 },
-        { M_VGA_M80x60, M_VGA_M80x25 },
-        { M_VGA_C80x60, M_VGA_C80x25 },
-        { M_VGA_MODEX,  M_VGA_CG320 },
-    };
-    int i;
+    if (scp->scr_buf)
+	free(scp->scr_buf, M_DEVBUF);
+    scp->scr_buf = (u_short *)malloc(scp->xsize*scp->ysize*sizeof(u_short), 
+				     M_DEVBUF, (wait) ? M_WAITOK : M_NOWAIT);
 
-    for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) {
-        if (mode_map[i].from == mode)
-            return mode_map[i].to;
+    if (clear) {
+        /* clear the screen and move the text cursor to the top-left position */
+	sc_clear_screen(scp);
+    } else {
+	/* retain the current cursor position, but adjust pointers */
+	move_crsr(scp, scp->xpos, scp->ypos);
+	scp->cursor_oldpos = scp->cursor_pos;
     }
-    return mode;
+
+    /* move the mouse cursor at the center of the screen */
+    sc_move_mouse(scp, scp->xpixel / 2, scp->ypixel / 2);
 }
 
-static char 
-*get_mode_param(scr_stat *scp, int mode)
+void
+sc_alloc_cut_buffer(scr_stat *scp, int wait)
 {
-    if (mode >= MODE_MAP_SIZE)
-	mode = map_mode_num(mode);
-    if (mode < MODE_MAP_SIZE)
-	return mode_map[mode];
-    else
-	return NULL;
+    if ((cut_buffer == NULL)
+	|| (cut_buffer_size < scp->xsize * scp->ysize + 1)) {
+	if (cut_buffer != NULL)
+	    free(cut_buffer, M_DEVBUF);
+	cut_buffer_size = scp->xsize * scp->ysize + 1;
+	cut_buffer = (u_char *)malloc(cut_buffer_size, 
+				    M_DEVBUF, (wait) ? M_WAITOK : M_NOWAIT);
+	if (cut_buffer != NULL)
+	    cut_buffer[0] = '\0';
+    }
+}
+
+void
+sc_alloc_history_buffer(scr_stat *scp, int lines, int extra, int wait)
+{
+    u_short *usp;
+
+    if (lines < scp->ysize)
+	lines = scp->ysize;
+
+    usp = scp->history;
+    scp->history = NULL;
+    if (usp != NULL) {
+	free(usp, M_DEVBUF);
+	if (extra > 0)
+	    extra_history_size += extra;
+    }
+
+    scp->history_size = lines * scp->xsize;
+    if (lines > imax(sc_history_size, scp->ysize))
+	extra_history_size -= lines - imax(sc_history_size, scp->ysize);
+    usp = (u_short *)malloc(scp->history_size * sizeof(u_short), 
+			    M_DEVBUF, (wait) ? M_WAITOK : M_NOWAIT);
+    if (usp != NULL)
+	bzero(usp, scp->history_size * sizeof(u_short));
+    scp->history_head = scp->history_pos = usp;
+    scp->history = usp;
 }
 
 static scr_stat
@@ -3606,22 +3167,15 @@ static scr_stat
 
     scp = (scr_stat *)malloc(sizeof(scr_stat), M_DEVBUF, M_WAITOK);
     init_scp(scp);
-    scp->scr_buf = scp->cursor_pos = scp->cursor_oldpos =
-	(u_short *)malloc(scp->xsize*scp->ysize*sizeof(u_short),
-			  M_DEVBUF, M_WAITOK);
-    scp->mouse_pos = scp->mouse_oldpos = 
-	scp->scr_buf + ((scp->mouse_ypos/scp->font_size)*scp->xsize +
-			scp->mouse_xpos/8);
-    scp->history_head = scp->history_pos =
-	(u_short *)malloc(scp->history_size*sizeof(u_short),
-			  M_DEVBUF, M_WAITOK);
-    bzero(scp->history_head, scp->history_size*sizeof(u_short));
-    scp->history = scp->history_head;
+    sc_alloc_scr_buffer(scp, TRUE, TRUE);
+    if (ISMOUSEAVAIL(get_adapter(scp)->va_flags))
+	sc_alloc_cut_buffer(scp, TRUE);
+    sc_alloc_history_buffer(scp, sc_history_size, 0, TRUE);
 /* SOS
-    if (crtc_type == KD_VGA && video_mode_ptr)
+    if (get_adapter(scp)->va_flags & V_ADP_MODECHANGE)
 	set_mode(scp);
 */
-    clear_screen(scp);
+    sc_clear_screen(scp);
     scp->cursor_saveunder = *scp->cursor_pos;
     return scp;
 }
@@ -3629,43 +3183,29 @@ static scr_stat
 static void
 init_scp(scr_stat *scp)
 {
-    switch(crtc_type) {
-    case KD_VGA:
-	if (VESA_MODE(bios_video_mode))
-	    scp->mode = bios_video_mode;
-	else if (crtc_addr == MONO_BASE)
-	    scp->mode = M_VGA_M80x25;
-	else
-	    scp->mode = M_VGA_C80x25;
-	scp->font_size = 16;
-	break;
-    case KD_CGA:
-	if (crtc_addr == MONO_BASE)
-	    scp->mode = M_B80x25;
-	else
-	    scp->mode = M_C80x25;
-	scp->font_size = 8;
-	break;
-    case KD_EGA:
-	if (crtc_addr == MONO_BASE)
-	    scp->mode = M_B80x25;
-	else
-	    scp->mode = M_C80x25;
-	scp->font_size = 14;
-	break;
-    case KD_MONO:
-    case KD_HERCULES:
-    default:
-	scp->mode = M_EGAMONO80x25;
-	scp->font_size = 14;
-	break;
+    video_info_t info;
+
+    scp->adp = V_ADP_PRIMARY;
+    (*biosvidsw.get_info)(scp->adp, initial_video_mode, &info);
+
+    scp->status = 0;
+    scp->mode = scp->initial_mode = initial_video_mode;
+    scp->scr_buf = NULL;
+    if (info.vi_flags & V_INFO_GRAPHICS) {
+	scp->status |= GRAPHICS_MODE;
+	scp->xpixel = info.vi_width;
+	scp->ypixel = info.vi_height;
+	scp->xsize = info.vi_width/8;
+	scp->ysize = info.vi_height/info.vi_cheight;
+	scp->font_size = FONT_NONE;
+    } else {
+	scp->xsize = info.vi_width;
+	scp->ysize = info.vi_height;
+	scp->xpixel = scp->xsize*8;
+	scp->ypixel = scp->ysize*info.vi_cheight;
+	scp->font_size = info.vi_cheight;
     }
-    scp->initial_mode = scp->mode;
-
-    scp->xsize = COL;
-    scp->ysize = ROW;
-    scp->xpixel = scp->xsize * 8;
-    scp->ypixel = scp->ysize * scp->font_size;
+    scp->xoff = scp->yoff = 0;
     scp->xpos = scp->ypos = 0;
     scp->saved_xpos = scp->saved_ypos = -1;
     scp->start = scp->xsize * scp->ysize;
@@ -3677,8 +3217,8 @@ init_scp(scr_stat *scp)
 	current_default->std_color;
     scp->term.rev_color = current_default->rev_color;
     scp->border = BG_BLACK;
-    scp->cursor_start = *(char *)pa_to_va(0x461);
-    scp->cursor_end = *(char *)pa_to_va(0x460);
+    scp->cursor_start = *(u_int8_t *)pa_to_va(0x461);
+    scp->cursor_end = *(u_int8_t *)pa_to_va(0x460);
     scp->mouse_xpos = scp->xsize*8/2;
     scp->mouse_ypos = scp->ysize*scp->font_size/2;
     scp->mouse_cut_start = scp->mouse_cut_end = NULL;
@@ -3687,13 +3227,13 @@ init_scp(scr_stat *scp)
     scp->mouse_proc = NULL;
     scp->bell_pitch = BELL_PITCH;
     scp->bell_duration = BELL_DURATION;
-    scp->status = (*(char *)pa_to_va(0x417) & 0x20) ? NLKED : 0;
+    scp->status |= (*(u_int8_t *)pa_to_va(0x417) & 0x20) ? NLKED : 0;
     scp->status |= CURSOR_ENABLED;
     scp->pid = 0;
     scp->proc = NULL;
     scp->smode.mode = VT_AUTO;
     scp->history_head = scp->history_pos = scp->history = NULL;
-    scp->history_size = imax(SC_HISTORY_SIZE, scp->ysize) * scp->xsize;
+    scp->history_size = imax(sc_history_size, scp->ysize) * scp->xsize;
 }
 
 static u_char
@@ -4140,9 +3680,9 @@ next_code:
 			scsplash_stick(FALSE);
 			stop_scrn_saver(current_saver);
 		    } else {
-			if ((cur_console->status & UNKNOWN_MODE) == 0) {
+			if (!ISGRAPHSC(cur_console)) {
 			    scsplash_stick(TRUE);
-			    (*current_saver)(TRUE);
+			    scrn_saver(current_saver, TRUE);
 			}
 		    }
 		}
@@ -4409,475 +3949,100 @@ update_leds(int which)
     set_keyboard(KBDC_SET_LEDS, xlate_leds[which & LED_MASK]);
 }
 
-void
+int
 set_mode(scr_stat *scp)
 {
-    char special_modetable[MODE_PARAM_SIZE];
-    char *mp;
-    int s;
-    int i;
+    video_info_t info;
+    video_adapter_t *adp;
 
-    if (scp != cur_console)
-	return;
+    /* reject unsupported mode */
+    if ((*biosvidsw.get_info)(scp->adp, scp->mode, &info))
+	return 1;
 
-    /* 
-     * even if mode switching is disabled, we can change back
-     * to the initial mode or the custom mode based on the initial
-     * mode if we have saved register values upon start-up.
-     */
-    mp = get_mode_param(scp, scp->mode);
-    if (mp == NULL)
-	return;
-    bcopy(mp, &special_modetable, sizeof(special_modetable));
+    /* if this vty is not currently showing, do nothing */
+    if (scp != cur_console)
+	return 0;
 
     /* setup video hardware for the given mode */
-    switch (scp->mode) {
-    case M_VGA_C80x60: case M_VGA_M80x60:
-	special_modetable[2]  = 0x08;
-	special_modetable[19] = 0x47;
-	goto special_480l;
-
-    case M_VGA_C80x30: case M_VGA_M80x30:
-	special_modetable[19] = 0x4f;
-special_480l:
-	special_modetable[9] |= 0xc0;
-	special_modetable[16] = 0x08;
-	special_modetable[17] = 0x3e;
-	special_modetable[26] = 0xea;
-	special_modetable[28] = 0xdf;
-	special_modetable[31] = 0xe7;
-	special_modetable[32] = 0x04;
-	goto setup_mode;
-
-    case M_ENH_C80x43: case M_ENH_B80x43:
-	special_modetable[28] = 87;
-	goto special_80x50;
-
-    case M_VGA_C80x50: case M_VGA_M80x50:
-special_80x50:
-	special_modetable[2] = 8;
-	special_modetable[19] = 7;
-	goto setup_mode;
-
-    case M_VGA_C40x25: case M_VGA_C80x25:
-    case M_VGA_M80x25:
-    case M_B40x25:     case M_C40x25:
-    case M_B80x25:     case M_C80x25:
-    case M_ENH_B40x25: case M_ENH_C40x25:
-    case M_ENH_B80x25: case M_ENH_C80x25:
-    case M_EGAMONO80x25:
-
-setup_mode:
-	set_vgaregs(special_modetable);
-	scp->font_size = special_modetable[2];
-
-	/* set font type (size) */
-	if (scp->font_size < 14) {
-	    if (fonts_loaded & FONT_8)
-		copy_font(LOAD, FONT_8, font_8);
-	    i = 0x0a;				/* font 2 */
-	} else if (scp->font_size >= 16) {
-	    if (fonts_loaded & FONT_16)
-		copy_font(LOAD, FONT_16, font_16);
-	    i = 0x00;				/* font 0 */
-	} else {
-	    if (fonts_loaded & FONT_14)
-		copy_font(LOAD, FONT_14, font_14);
-	    i = 0x05;				/* font 1 */
+    adp = get_adapter(scp);
+    (*biosvidsw.set_mode)(scp->adp, scp->mode);
+    Crtat = (u_short *)adp->va_window;
+
+    if (!(scp->status & GRAPHICS_MODE)) {
+	/* load appropriate font */
+	if (!(scp->status & PIXEL_MODE) 
+	    && ISFONTAVAIL(get_adapter(scp)->va_flags)) {
+	    if (scp->font_size < 14) {
+		if (fonts_loaded & FONT_8)
+		    copy_font(scp, LOAD, 8, font_8);
+	    } else if (scp->font_size >= 16) {
+		if (fonts_loaded & FONT_16)
+		    copy_font(scp, LOAD, 16, font_16);
+	    } else {
+		if (fonts_loaded & FONT_14)
+		    copy_font(scp, LOAD, 14, font_14);
+	    }
+	    /*
+	    * FONT KLUDGE:
+	    * This is an interim kludge to display correct font.
+	    * Always use the font page #0 on the video plane 2.
+	    * Somehow we cannot show the font in other font pages on
+	    * some video cards... XXX
+	    */ 
+	    (*biosvidsw.show_font)(scp->adp, 0);
 	}
-	/*
-	 * FONT KLUDGE:
-	 * This is an interim kludge to display correct font.
-	 * Always use the font page #0 on the video plane 2.
-	 * Somehow we cannot show the font in other font pages on
-	 * some video cards... XXX
-	 */
-	i = 0x00;
-	s = splhigh();
-	outb(TSIDX, 0x00); outb(TSREG, 0x01);
-	outb(TSIDX, 0x03); outb(TSREG, i);
-	outb(TSIDX, 0x00); outb(TSREG, 0x03);
-	splx(s);
-	if (flags & CHAR_CURSOR)
-	    set_destructive_cursor(scp);
 	mark_all(scp);
-	break;
-
-    case M_VGA_MODEX:
-	/* "unchain" the VGA mode */
-	special_modetable[5-1+0x04] &= 0xf7;
-	special_modetable[5-1+0x04] |= 0x04;
-	/* turn off doubleword mode */
-	special_modetable[10+0x14] &= 0xbf;
-	/* turn off word adressing */
-	special_modetable[10+0x17] |= 0x40;
-	/* set logical screen width */
-	special_modetable[10+0x13] = 80;
-	/* set 240 lines */
-	special_modetable[10+0x11] = 0x2c;
-	special_modetable[10+0x06] = 0x0d;
-	special_modetable[10+0x07] = 0x3e;
-	special_modetable[10+0x10] = 0xea;
-	special_modetable[10+0x11] = 0xac;
-	special_modetable[10+0x12] = 0xdf;
-	special_modetable[10+0x15] = 0xe7;
-	special_modetable[10+0x16] = 0x06;
-	/* set vertical sync polarity to reflect aspect ratio */
-	special_modetable[9] = 0xe3;
-	goto setup_grmode;
-
-    case M_BG320:     case M_CG320:     case M_BG640:
-    case M_CG320_D:   case M_CG640_E:
-    case M_CG640x350: case M_ENH_CG640:
-    case M_BG640x480: case M_CG640x480: case M_VGA_CG320:
-
-setup_grmode:
-	set_vgaregs(special_modetable);
-	scp->font_size = FONT_NONE;
-	break;
-
-    default:
-	/* call user defined function XXX */
-	break;
-    }
-
-    /* set border color for this (virtual) console */
-    set_border(scp->border);
-    return;
-}
-
-void
-set_border(u_char color)
-{
-    switch (crtc_type) {
-    case KD_EGA:
-    case KD_VGA:
-        inb(crtc_addr + 6);		/* reset flip-flop */
-        outb(ATC, 0x31); outb(ATC, color);
-	break;
-    case KD_CGA:
-	outb(crtc_addr + 5, color & 0x0f); /* color select register */
-	break;
-    case KD_MONO:
-    case KD_HERCULES:
-    default:
-	break;
     }
-}
-
-static void
-set_vgaregs(char *modetable)
-{
-    int i, s = splhigh();
-
-    outb(TSIDX, 0x00); outb(TSREG, 0x01);   	/* stop sequencer */
-    for (i=0; i<4; i++) {           		/* program sequencer */
-	outb(TSIDX, i+1);
-	outb(TSREG, modetable[i+5]);
-    }
-    outb(MISC, modetable[9]);       		/* set dot-clock */
-    outb(TSIDX, 0x00); outb(TSREG, 0x03);   	/* start sequencer */
-    outb(crtc_addr, 0x11);
-    outb(crtc_addr+1, inb(crtc_addr+1) & 0x7F);
-    for (i=0; i<25; i++) {          		/* program crtc */
-	outb(crtc_addr, i);
-	if (i == 14 || i == 15)     		/* no hardware cursor */
-	    outb(crtc_addr+1, 0xff);
-	else
-	    outb(crtc_addr+1, modetable[i+10]);
-    }
-    inb(crtc_addr+6);           		/* reset flip-flop */
-    for (i=0; i<20; i++) {          		/* program attribute ctrl */
-	outb(ATC, i);
-	outb(ATC, modetable[i+35]);
-    }
-    for (i=0; i<9; i++) {           		/* program graph data ctrl */
-	outb(GDCIDX, i);
-	outb(GDCREG, modetable[i+55]);
-    }
-    inb(crtc_addr+6);           		/* reset flip-flop */
-    outb(ATC, 0x20);            		/* enable palette */
-    splx(s);
-}
-
-static void
-read_vgaregs(char *buf)
-{
-    int i, j;
-    int s;
+    set_border(scp, scp->border);
 
-    bzero(buf, MODE_PARAM_SIZE);
-
-    s = splhigh();
-
-    outb(TSIDX, 0x00); outb(TSREG, 0x01);   	/* stop sequencer */
-    for (i=0, j=5; i<4; i++) {           
-	outb(TSIDX, i+1);
-	buf[j++] = inb(TSREG);
-    }
-    buf[9] = inb(MISC + 10);      		/* dot-clock */
-    outb(TSIDX, 0x00); outb(TSREG, 0x03);   	/* start sequencer */
-
-    for (i=0, j=10; i<25; i++) {       		/* crtc */
-	outb(crtc_addr, i);
-	buf[j++] = inb(crtc_addr+1);
-    }
-    for (i=0, j=35; i<20; i++) {          	/* attribute ctrl */
-        inb(crtc_addr+6);           		/* reset flip-flop */
-	outb(ATC, i);
-	buf[j++] = inb(ATC + 1);
-    }
-    for (i=0, j=55; i<9; i++) {           	/* graph data ctrl */
-	outb(GDCIDX, i);
-	buf[j++] = inb(GDCREG);
-    }
-    inb(crtc_addr+6);           		/* reset flip-flop */
-    outb(ATC, 0x20);            		/* enable palette */
-
-    buf[0] = *(char *)pa_to_va(0x44a);		/* COLS */
-    buf[1] = *(char *)pa_to_va(0x484);		/* ROWS */
-    buf[2] = *(char *)pa_to_va(0x485);		/* POINTS */
-    buf[3] = *(char *)pa_to_va(0x44c);
-    buf[4] = *(char *)pa_to_va(0x44d);
-
-    splx(s);
-}
-
-static int 
-comp_vgaregs(u_char *buf1, u_char *buf2)
-{
-    static struct {
-        u_char mask;
-    } params[MODE_PARAM_SIZE] = {
-	0xff, 0x00, 0xff, 		/* COLS, ROWS, POINTS */
-	0xff, 0xff, 			/* page length */
-	0xfe, 0xff, 0xff, 0xff,		/* sequencer registers */
-	0xf3,				/* misc register */
-	0xff, 0xff, 0xff, 0x7f, 0xff,	/* CRTC */
-	0xff, 0xff, 0xff, 0x7f, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xff, 0x7f, 0xff, 0xff,
-	0x7f, 0xff, 0xff, 0xef, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff,	/* attribute controller registers */
-	0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xf0,
-	0xff, 0xff, 0xff, 0xff, 0xff,	/* GDC register */
-	0xff, 0xff, 0xff, 0xff, 
-    }; 
-    int identical = TRUE;
-    int i;
-
-    for (i = 0; i < sizeof(params)/sizeof(params[0]); ++i) {
-	if (params[i].mask == 0)	/* don't care */
-	    continue;
-	if ((buf1[i] & params[i].mask) != (buf2[i] & params[i].mask))
-	    return COMP_DIFFERENT;
-	if (buf1[i] != buf2[i])
-	    identical = FALSE;
-    }
-    return (identical) ? COMP_IDENTICAL : COMP_SIMILAR;
-
-#if 0
-    for(i = 0; i < 20; ++i) {
-	if (*buf1++ != *buf2++)
-	    return COMP_DIFFERENT;
-    }
-    buf1 += 2;  /* skip the cursor shape */
-    buf2 += 2;
-    for(i = 22; i < 24; ++i) {
-	if (*buf1++ != *buf2++)
-	    return COMP_DIFFERENT;
-    }
-    buf1 += 2;  /* skip the cursor position */
-    buf2 += 2;
-    for(i = 26; i < MODE_PARAM_SIZE; ++i) {
-	if (*buf1++ != *buf2++)
-	    return COMP_DIFFERENT;
-    }
-    return COMP_IDENTICAL;
-#endif
-}
-
-static void
-dump_vgaregs(u_char *buf)
-{
-    int i;
+    /* move hardware cursor out of the way */
+    (*biosvidsw.set_hw_cursor)(scp->adp, -1, -1);
 
-    for(i = 0; i < MODE_PARAM_SIZE;) {
-	printf("%02x ", buf[i]);
-	if ((++i % 16) == 0)
-	    printf("\n");
-    }
+    return 0;
 }
 
-static void
-set_font_mode(u_char *buf)
+void
+copy_font(scr_stat *scp, int operation, int font_size, u_char *buf)
 {
-    int s = splhigh();
-
+    /*
+     * FONT KLUDGE:
+     * This is an interim kludge to display correct font.
+     * Always use the font page #0 on the video plane 2.
+     * Somehow we cannot show the font in other font pages on
+     * some video cards... XXX
+     */ 
     font_loading_in_progress = TRUE;
-
-    /* save register values */
-    outb(TSIDX, 0x02); buf[0] = inb(TSREG);
-    outb(TSIDX, 0x04); buf[1] = inb(TSREG);
-    outb(GDCIDX, 0x04); buf[2] = inb(GDCREG);
-    outb(GDCIDX, 0x05); buf[3] = inb(GDCREG);
-    outb(GDCIDX, 0x06); buf[4] = inb(GDCREG);
-    inb(crtc_addr + 6);
-    outb(ATC, 0x10); buf[5] = inb(ATC + 1);
-
-    /* setup vga for loading fonts */
-    inb(crtc_addr+6);           		/* reset flip-flop */
-    outb(ATC, 0x10); outb(ATC, buf[5] & ~0x01);
-    inb(crtc_addr+6);               		/* reset flip-flop */
-    outb(ATC, 0x20);            		/* enable palette */
-
-#if SLOW_VGA
-#ifndef SC_BAD_FLICKER
-    outb(TSIDX, 0x00); outb(TSREG, 0x01);
-#endif
-    outb(TSIDX, 0x02); outb(TSREG, 0x04);
-    outb(TSIDX, 0x04); outb(TSREG, 0x07);
-#ifndef SC_BAD_FLICKER
-    outb(TSIDX, 0x00); outb(TSREG, 0x03);
-#endif
-    outb(GDCIDX, 0x04); outb(GDCREG, 0x02);
-    outb(GDCIDX, 0x05); outb(GDCREG, 0x00);
-    outb(GDCIDX, 0x06); outb(GDCREG, 0x04);
-#else
-#ifndef SC_BAD_FLICKER
-    outw(TSIDX, 0x0100);
-#endif
-    outw(TSIDX, 0x0402);
-    outw(TSIDX, 0x0704);
-#ifndef SC_BAD_FLICKER
-    outw(TSIDX, 0x0300);
-#endif
-    outw(GDCIDX, 0x0204);
-    outw(GDCIDX, 0x0005);
-    outw(GDCIDX, 0x0406);               /* addr = a0000, 64kb */
-#endif
-    splx(s);
-}
-
-static void
-set_normal_mode(u_char *buf)
-{
-    char *modetable;
-    int s = splhigh();
-
-    /* setup vga for normal operation mode again */
-    inb(crtc_addr+6);           		/* reset flip-flop */
-    outb(ATC, 0x10); outb(ATC, buf[5]);
-    inb(crtc_addr+6);               		/* reset flip-flop */
-    outb(ATC, 0x20);            		/* enable palette */
-
-#if SLOW_VGA
-#ifndef SC_BAD_FLICKER
-    outb(TSIDX, 0x00); outb(TSREG, 0x01);
-#endif
-    outb(TSIDX, 0x02); outb(TSREG, buf[0]);
-    outb(TSIDX, 0x04); outb(TSREG, buf[1]);
-#ifndef SC_BAD_FLICKER
-    outb(TSIDX, 0x00); outb(TSREG, 0x03);
-#endif
-    outb(GDCIDX, 0x04); outb(GDCREG, buf[2]);
-    outb(GDCIDX, 0x05); outb(GDCREG, buf[3]);
-    if (crtc_addr == MONO_BASE) {
-	outb(GDCIDX, 0x06); outb(GDCREG,(buf[4] & 0x03) | 0x08);
-    } else {
-	outb(GDCIDX, 0x06); outb(GDCREG,(buf[4] & 0x03) | 0x0c);
+    if (operation == LOAD) {
+	(*biosvidsw.load_font)(scp->adp, 0, font_size, buf, 0, 256);
+	if (flags & CHAR_CURSOR)
+	    set_destructive_cursor(scp);
+    } else if (operation == SAVE) {
+	(*biosvidsw.save_font)(scp->adp, 0, font_size, buf, 0, 256);
     }
-#else
-#ifndef SC_BAD_FLICKER
-    outw(TSIDX, 0x0100);
-#endif
-    outw(TSIDX, 0x0002 | (buf[0] << 8));
-    outw(TSIDX, 0x0004 | (buf[1] << 8));
-#ifndef SC_BAD_FLICKER
-    outw(TSIDX, 0x0300);
-#endif
-    outw(GDCIDX, 0x0004 | (buf[2] << 8));
-    outw(GDCIDX, 0x0005 | (buf[3] << 8));
-    if (crtc_addr == MONO_BASE)
-        outw(GDCIDX, 0x0006 | (((buf[4] & 0x03) | 0x08)<<8));
-    else
-        outw(GDCIDX, 0x0006 | (((buf[4] & 0x03) | 0x0c)<<8));
-#endif
-
     font_loading_in_progress = FALSE;
-    splx(s);
-}
-
-void
-copy_font(int operation, int font_type, char* font_image)
-{
-    int ch, line, segment, fontsize;
-    u_char buf[PARAM_BUFSIZE];
-    u_char val;
-
-    switch (font_type) {
-    default:
-    case FONT_8:
-	segment = 0x8000;
-	fontsize = 8;
-	break;
-    case FONT_14:
-	segment = 0x4000;
-	fontsize = 14;
-	break;
-    case FONT_16:
-	segment = 0x0000;
-	fontsize = 16;
-	break;
-    }
-    /*
-     * FONT KLUDGE
-     * Always use the font page #0. XXX
-     */
-    segment = 0x0000;
-    outb(TSIDX, 0x01); val = inb(TSREG);        /* disable screen */
-    outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
-    set_font_mode(buf);
-    for (ch=0; ch < 256; ch++)
-	for (line=0; line < fontsize; line++)
-	if (operation)
-	    *(char *)pa_to_va(VIDEOMEM+(segment)+(ch*32)+line) =
-		    font_image[(ch*fontsize)+line];
-	else
-	    font_image[(ch*fontsize)+line] =
-	    *(char *)pa_to_va(VIDEOMEM+(segment)+(ch*32)+line);
-    set_normal_mode(buf);
-    outb(TSIDX, 0x01); outb(TSREG, val & 0xDF); /* enable screen */
 }
 
 static void
 set_destructive_cursor(scr_stat *scp)
 {
-    u_char buf[PARAM_BUFSIZE];
     u_char cursor[32];
-    caddr_t address;
+    u_char *font_buffer;
+    int font_size;
     int i;
-    char *font_buffer;
+
+    if (!ISFONTAVAIL(get_adapter(scp)->va_flags) || !ISTEXTSC(scp))
+	return;
 
     if (scp->font_size < 14) {
 	font_buffer = font_8;
-	address = (caddr_t)VIDEOMEM + 0x8000;
-    }
-    else if (scp->font_size >= 16) {
+	font_size = 8;
+    } else if (scp->font_size >= 16) {
 	font_buffer = font_16;
-	address = (caddr_t)VIDEOMEM;
-    }
-    else {
+	font_size = 16;
+    } else {
 	font_buffer = font_14;
-	address = (caddr_t)VIDEOMEM + 0x4000;
+	font_size = 14;
     }
-    /*
-     * FONT KLUDGE
-     * Always use the font page #0. XXX
-     */
-    address = (caddr_t)VIDEOMEM;
 
     if (scp->status & MOUSE_VISIBLE) {
 	if ((scp->cursor_saveunder & 0xff) == SC_MOUSE_CHAR)
@@ -4902,9 +4067,18 @@ set_destructive_cursor(scr_stat *scp)
 #if 1
     while (!(inb(crtc_addr+6) & 0x08)) /* wait for vertical retrace */ ;
 #endif
-    set_font_mode(buf);
-    generic_bcopy(cursor, (char *)pa_to_va(address) + DEAD_CHAR * 32, 32);
-    set_normal_mode(buf);
+    font_loading_in_progress = TRUE;
+    (*biosvidsw.load_font)(scp->adp, 0, font_size, cursor, DEAD_CHAR, 1);
+    font_loading_in_progress = FALSE;
+}
+
+void
+sc_move_mouse(scr_stat *scp, int x, int y)
+{
+    scp->mouse_xpos = x;
+    scp->mouse_ypos = y;
+    scp->mouse_pos = scp->mouse_oldpos = 
+	scp->scr_buf + (y / scp->font_size) * scp->xsize + x / 8;
 }
 
 static void
@@ -4916,7 +4090,7 @@ set_mouse_pos(scr_stat *scp)
 	scp->mouse_xpos = 0;
     if (scp->mouse_ypos < 0)
 	scp->mouse_ypos = 0;
-    if (scp->status & UNKNOWN_MODE) {
+    if (!ISTEXTSC(scp)) {
         if (scp->mouse_xpos > scp->xpixel-1)
 	    scp->mouse_xpos = scp->xpixel-1;
         if (scp->mouse_ypos > scp->ypixel-1)
@@ -5146,35 +4320,26 @@ mouse_paste(scr_stat *scp)
 static void
 draw_mouse_image(scr_stat *scp)
 {
-    caddr_t address;
-    int i;
-    char *font_buffer;
-    u_char buf[PARAM_BUFSIZE];
     u_short buffer[32];
     u_short xoffset, yoffset;
     u_short *crt_pos = Crtat + (scp->mouse_pos - scp->scr_buf);
-    int font_size = scp->font_size;
+    u_char *font_buffer;
+    int font_size;
+    int i;
 
-    if (font_size < 14) {
+    if (scp->font_size < 14) {
 	font_buffer = font_8;
-	address = (caddr_t)VIDEOMEM + 0x8000;
-    }
-    else if (font_size >= 16) {
+	font_size = 8;
+    } else if (scp->font_size >= 16) {
 	font_buffer = font_16;
-	address = (caddr_t)VIDEOMEM;
-    }
-    else {
+	font_size = 16;
+    } else {
 	font_buffer = font_14;
-	address = (caddr_t)VIDEOMEM + 0x4000;
+	font_size = 14;
     }
-    /*
-     * FONT KLUDGE
-     * Always use the font page #0. XXX
-     */
-    address = (caddr_t)VIDEOMEM;
 
     xoffset = scp->mouse_xpos % 8;
-    yoffset = scp->mouse_ypos % font_size;
+    yoffset = scp->mouse_ypos % scp->font_size;
 
     /* prepare mousepointer char's bitmaps */
     bcopy(font_buffer + ((*(scp->mouse_pos) & 0xff) * font_size),
@@ -5209,9 +4374,11 @@ draw_mouse_image(scr_stat *scp)
     /* wait for vertical retrace to avoid jitter on some videocards */
     while (!(inb(crtc_addr+6) & 0x08)) /* idle */ ;
 #endif
-    set_font_mode(buf);
-    generic_bcopy(scp->mouse_cursor, (char *)pa_to_va(address) + SC_MOUSE_CHAR * 32, 128);
-    set_normal_mode(buf);
+    font_loading_in_progress = TRUE;
+    (*biosvidsw.load_font)(scp->adp, 0, 32, scp->mouse_cursor, 
+			   SC_MOUSE_CHAR, 4); 
+    font_loading_in_progress = FALSE;
+
     *(crt_pos) = (*(scp->mouse_pos) & 0xff00) | SC_MOUSE_CHAR;
     *(crt_pos+scp->xsize) = 
 	(*(scp->mouse_pos + scp->xsize) & 0xff00) | (SC_MOUSE_CHAR + 2);
@@ -5229,6 +4396,8 @@ remove_mouse_image(scr_stat *scp)
 {
     u_short *crt_pos = Crtat + (scp->mouse_oldpos - scp->scr_buf);
 
+    if (!ISTEXTSC(scp))
+	return;
     *(crt_pos) = *(scp->mouse_oldpos);
     *(crt_pos+1) = *(scp->mouse_oldpos+1);
     *(crt_pos+scp->xsize) = *(scp->mouse_oldpos+scp->xsize);
@@ -5278,30 +4447,6 @@ remove_cutmarking(scr_stat *scp)
     mark_all(scp);
 }
 
-static void
-save_palette(void)
-{
-    int i;
-
-    outb(PALRADR, 0x00);
-    for (i=0x00; i<0x300; i++)
-	palette[i] = inb(PALDATA);
-    inb(crtc_addr+6);           /* reset flip/flop */
-}
-
-void
-load_palette(char *palette)
-{
-    int i;
-
-    outb(PIXMASK, 0xFF);            /* no pixelmask */
-    outb(PALWADR, 0x00);
-    for (i=0x00; i<0x300; i++)
-	 outb(PALDATA, palette[i]);
-    inb(crtc_addr+6);           /* reset flip/flop */
-    outb(ATC, 0x20);            /* enable palette */
-}
-
 static void
 do_bell(scr_stat *scp, int pitch, int duration)
 {
@@ -5330,7 +4475,7 @@ blink_screen(void *arg)
 {
     scr_stat *scp = arg;
 
-    if ((scp->status & UNKNOWN_MODE) || (blink_in_progress <= 1)) {
+    if (!ISTEXTSC(scp) || (blink_in_progress <= 1)) {
 	blink_in_progress = FALSE;
     	mark_all(scp);
 	if (delayed_next_scr)
@@ -5351,25 +4496,41 @@ blink_screen(void *arg)
 void 
 sc_bcopy(scr_stat *scp, u_short *p, int from, int to, int mark)
 {
-    if (!VESA_MODE(scp->mode)) {
-	generic_bcopy(p+from, Crtat+from, (to-from+1)*sizeof (u_short));
-    } else if (scp->mode == 0x102) {
-	u_char *d, *e;
-	int i,j;
+    u_char *font;
+    u_char *d, *e;
+    u_char *f;
+    int font_size;
+    int line_length;
+    int xsize;
+    int i, j;
 
+    if (ISTEXTSC(scp)) {
+	generic_bcopy(p+from, Crtat+from, (to-from+1)*sizeof (u_short));
+    } else /* if ISPIXELSC(scp) */ {
 	if (mark)
-		mark = 255;
-	d = (u_char *)Crtat;
-	d += 10 + 6*16*100 + (from%80) + 16*100*(from/80);
+	    mark = 255;
+	font_size = scp->font_size;
+	if (font_size < 14)
+	    font = font_8;
+	else if (font_size >= 16)
+	    font = font_16;
+	else
+	    font = font_14;
+	line_length = scp->xpixel/8;
+	xsize = scp->xsize;
+	d = (u_char *)Crtat 
+	    + scp->xoff + scp->yoff*font_size*line_length 
+	    + (from%xsize) + font_size*line_length*(from/xsize);
 	for (i = from ; i <= to ; i++) {
 	    e = d;
-	    for (j = 0 ; j < 16; j++) {
-	        *e = mark^font_16[(p[i]&0xff)*16+j];
-		e+=100;
+	    f = &font[(p[i] & 0x00ff)*font_size];
+	    for (j = 0 ; j < font_size; j++, f++) {
+	        *e = mark^*f;
+		e += line_length;
 	    }
 	    d++;
-	    if ((i % 80) == 79)
-		d += 20 + 15*100;
+	    if ((i % xsize) == xsize - 1)
+		d += scp->xoff*2 + (font_size - 1)*line_length;
 	}
     }
 }
@@ -5377,34 +4538,36 @@ sc_bcopy(scr_stat *scp, u_short *p, int from, int to, int mark)
 #ifdef SC_SPLASH_SCREEN
 
 static void
-scsplash_init(void)
+scsplash_init(scr_stat *scp)
 {
+    video_info_t info;
+
     /* 
      * We currently assume the splash screen always use
      * VGA_CG320 mode and abort installation if this mode is not
      * supported with this video card. XXX
      */
-    if (crtc_type != KD_VGA || get_mode_param(cur_console, M_VGA_CG320) == NULL)
+    if ((*biosvidsw.get_info)(scp->adp, M_VGA_CG320, &info))
 	return;
 
-    if (splash_load() == 0 && add_scrn_saver(scsplash) == 0) {
-	default_saver = scsplash;
+    if (scsplash_load(scp) == 0 && add_scrn_saver(scsplash_saver) == 0) {
+	default_saver = scsplash_saver;
 	scrn_blank_time = DEFAULT_BLANKTIME;
 	run_scrn_saver = TRUE;
-	if (!(boothowto & RB_CONFIG)) {
+	if (!(boothowto & (RB_VERBOSE | RB_CONFIG))) {
 	    scsplash_stick(TRUE);
-	    scsplash(TRUE);
+	    scsplash_saver(TRUE);
 	}
     }
 }
 
 static void
-scsplash(int show)
+scsplash_saver(int show)
 {
     if (show)
-	splash(TRUE);
+	scsplash(TRUE);
     else if (!sticky_splash)
-	splash(FALSE);
+	scsplash(FALSE);
 }
 
 #endif /* SC_SPLASH_SCREEN */
diff --git a/sys/i386/isa/syscons.h b/sys/i386/isa/syscons.h
index b23a2ae7c5da..315946b57305 100644
--- a/sys/i386/isa/syscons.h
+++ b/sys/i386/isa/syscons.h
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995-1997 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.h,v 1.38 1998/08/03 09:09:35 yokota Exp $
+ *	$Id$
  */
 
 #ifndef _I386_ISA_SYSCONS_H_
@@ -65,6 +65,9 @@
 #define MOUSE_MOVED	0x01000
 #define MOUSE_CUTTING	0x02000
 #define MOUSE_VISIBLE	0x04000
+#define GRAPHICS_MODE	0x08000
+#define PIXEL_MODE	0x10000
+#define SAVER_RUNNING	0x20000
 
 /* configuration flags */
 #define VISUAL_BELL	0x00001
@@ -74,6 +77,7 @@
 #define XT_KEYBD	0x00010
 #define KBD_NORESET	0x00020
 #define QUIET_BELL	0x00040
+#define VESA800X600	0x00080
 
 /* attribute flags */
 #define NORMAL_ATTR             0x00
@@ -84,9 +88,6 @@
 #define FOREGROUND_CHANGED      0x10
 #define BACKGROUND_CHANGED      0x20
 
-/* video hardware memory addresses */
-#define VIDEOMEM	0x000A0000
-
 /* misc defines */
 #define FALSE		0
 #define TRUE		1
@@ -104,20 +105,6 @@
 #define FONT_14		4
 #define FONT_16		8
 
-/* defines related to hardware addresses */
-#define	MONO_BASE	0x3B4			/* crt controller base mono */
-#define	COLOR_BASE	0x3D4			/* crt controller base color */
-#define MISC		0x3C2			/* misc output register */
-#define ATC		IO_VGA+0x00		/* attribute controller */
-#define TSIDX		IO_VGA+0x04		/* timing sequencer idx */
-#define TSREG		IO_VGA+0x05		/* timing sequencer data */
-#define PIXMASK		IO_VGA+0x06		/* pixel write mask */
-#define PALRADR		IO_VGA+0x07		/* palette read address */
-#define PALWADR		IO_VGA+0x08		/* palette write address */
-#define PALDATA		IO_VGA+0x09		/* palette data register */
-#define GDCIDX		IO_VGA+0x0E		/* graph data controller idx */
-#define GDCREG		IO_VGA+0x0F		/* graph data controller data */
-
 /* special characters */
 #define cntlc		0x03
 #define cntld		0x04
@@ -141,6 +128,7 @@ typedef struct term_stat {
 } term_stat;
 
 typedef struct scr_stat {
+	int		adp;			/* video adapter index */
 	u_short 	*scr_buf;		/* buffer when off screen */
 	int 		xpos;			/* current X position */
 	int 		ypos;			/* current Y position */
@@ -150,6 +138,8 @@ typedef struct scr_stat {
 	int 		ysize;			/* Y text size */
 	int 		xpixel;			/* X graphics size */
 	int 		ypixel;			/* Y graphics size */
+	int		xoff;			/* X offset in pixel mode */
+	int		yoff;			/* Y offset in pixel mode */
 	int		font_size;		/* fontsize in Y direction */
 	int		start;			/* modified area start */
 	int		end;			/* modified area end */
@@ -186,7 +176,8 @@ typedef struct scr_stat {
 	int		history_size;		/* size of history buffer */
 	struct apmhook  r_hook;			/* reconfiguration support */
 #ifdef SC_SPLASH_SCREEN
-	u_char		splash_save_mode;	/* saved mode for splash screen */
+	int		splash_save_mode;	/* saved mode for splash screen */
+	int		splash_save_status;	/* saved status for splash screen */
 #endif
 } scr_stat;
 
@@ -195,18 +186,59 @@ typedef struct default_attr {
 	int             rev_color;              /* reverse hardware color */
 } default_attr;
 
+
+#define ISTEXTSC(scp)	(!((scp)->status 				\
+			  & (UNKNOWN_MODE | GRAPHICS_MODE | PIXEL_MODE)))
+#define ISGRAPHSC(scp)	(((scp)->status 				\
+			  & (UNKNOWN_MODE | GRAPHICS_MODE)))
+#define ISPIXELSC(scp)	(((scp)->status 				\
+			  & (UNKNOWN_MODE | GRAPHICS_MODE | PIXEL_MODE))\
+			  == PIXEL_MODE)
+#define ISUNKNOWNSC(scp) ((scp)->status & UNKNOWN_MODE)
+
+#define ISFONTAVAIL(af)	((af) & V_ADP_FONT)
+#define ISMOUSEAVAIL(af) ((af) & V_ADP_FONT)
+#define ISPALAVAIL(af)	((af) & V_ADP_PALETTE)
+
 /* misc prototypes used by different syscons related LKM's */
-void set_border(u_char color);
-void set_mode(scr_stat *scp);
-void copy_font(int operation, int font_type, char* font_image);
-void load_palette(char *palette);
+
+/* syscons.c */
+extern int (*sc_user_ioctl)(dev_t dev, int cmd, caddr_t data, int flag, 
+			    struct proc *p);
+
+int set_mode(scr_stat *scp);
+scr_stat *sc_get_scr_stat(dev_t dev);
+
+void copy_font(scr_stat *scp, int operation, int font_size, u_char *font_image);
+#define save_palette(scp, pal)	(*biosvidsw.save_palette)((scp)->adp, pal)
+#define load_palette(scp, pal)	(*biosvidsw.load_palette)((scp)->adp, pal)
+#define set_border(scp, col)	(*biosvidsw.set_border)((scp)->adp, col)
+#define get_adapter(scp)	(*biosvidsw.adapter)((scp)->adp)
+
 int add_scrn_saver(void (*this)(int));
 int remove_scrn_saver(void (*this)(int));
 
+void sc_clear_screen(scr_stat *scp);
+void sc_move_mouse(scr_stat *scp, int x, int y);
+int sc_clean_up(scr_stat *scp);
+void sc_alloc_scr_buffer(scr_stat *scp, int wait, int clear);
+void sc_alloc_cut_buffer(scr_stat *scp, int wait);
+void sc_alloc_history_buffer(scr_stat *scp, int lines, int extra, int wait);
+
+/* scvidctl.c */
+int sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode,
+		     int xsize, int ysize, int fontsize);
+int sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode);
+int sc_set_pixel_mode(scr_stat *scp, struct tty *tp,
+		      int xsize, int ysize, int fontsize);
+int sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, 
+		 struct proc *p);
+
 #ifdef SC_SPLASH_SCREEN
-void splash(int);
-int splash_load(void);
-int splash_unload(void);
+/* splash.c */
+void scsplash(int);
+int scsplash_load(scr_stat *scp);
+int scsplash_unload(scr_stat *scp);
 #endif
 
 #endif /* !_I386_ISA_SYSCONS_H_ */
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
new file mode 100644
index 000000000000..768b647e5cd1
--- /dev/null
+++ b/sys/i386/isa/vesa.c
@@ -0,0 +1,868 @@
+/*-
+ * Copyright (c) 1998 Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote 
+ *    products derived from this software without specific prior written 
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id$
+ */
+
+#include "sc.h"
+#include "opt_vesa.h"
+#include "opt_vm86.h"
+
+#if (NSC > 0 && defined(VESA) && defined(VM86)) || defined(VESA_MODULE)
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <machine/console.h>
+#include <machine/md_var.h>
+#include <machine/vm86.h>
+#include <machine/pc/bios.h>
+#include <machine/pc/vesa.h>
+
+#include <i386/isa/videoio.h>
+
+#ifdef VESA_MODULE
+#include <sys/exec.h>
+#include <sys/sysent.h>
+#include <sys/lkm.h>
+
+MOD_MISC(vesa);
+#endif
+
+/* VESA video adapter state buffer stub */
+struct adp_state {
+	int		sig;
+#define V_STATE_SIG	0x61736576
+	u_char		regs[1];
+};
+typedef struct adp_state adp_state_t;
+
+/* VESA video adapter */
+static video_adapter_t *vesa_adp = NULL;
+static int vesa_state_buf_size = 0;
+static void *vesa_state_buf = NULL;
+
+/* VESA functions */
+static vi_init_t		vesa_init;
+static vi_adapter_t		vesa_adapter;
+static vi_get_info_t		vesa_get_info;
+static vi_query_mode_t		vesa_query_mode;
+static vi_set_mode_t		vesa_set_mode;
+static vi_save_font_t		vesa_save_font;
+static vi_load_font_t		vesa_load_font;
+static vi_show_font_t		vesa_show_font;
+static vi_save_palette_t	vesa_save_palette;
+static vi_load_palette_t	vesa_load_palette;
+static vi_set_border_t		vesa_set_border;
+static vi_save_state_t		vesa_save_state;
+static vi_load_state_t		vesa_load_state;
+static vi_set_win_org_t		vesa_set_origin;
+static vi_read_hw_cursor_t	vesa_read_hw_cursor;
+static vi_set_hw_cursor_t	vesa_set_hw_cursor;
+static vi_diag_t		vesa_diag;
+
+static struct vidsw vesavidsw = {
+	vesa_init,	vesa_adapter,	vesa_get_info,	vesa_query_mode,
+	vesa_set_mode,	vesa_save_font,	vesa_load_font,	vesa_show_font,
+	vesa_save_palette,vesa_load_palette,vesa_set_border,vesa_save_state,
+	vesa_load_state,vesa_set_origin,vesa_read_hw_cursor,vesa_set_hw_cursor,
+	vesa_diag,
+};
+
+static struct vidsw prevvidsw;
+
+/* VESA BIOS video modes */
+#define VESA_MAXMODES	64
+#define EOT		(-1)
+#define NA		(-2)
+
+static video_info_t vesa_vmode[VESA_MAXMODES + 1] = {
+	{ EOT, },
+};
+
+static int vesa_init_done = FALSE;
+static int has_vesa_bios = FALSE;
+static struct vesa_info *vesa_adp_info = NULL;
+static u_int16_t *vesa_vmodetab = NULL;
+
+/* local macros and functions */
+#define BIOS_SADDRTOLADDR(p) ((((p) & 0xffff0000) >> 12) + ((p) & 0x0000ffff))
+
+static int vesa_bios_get_mode(int mode, struct vesa_mode *vmode);
+static int vesa_bios_set_mode(int mode);
+static int vesa_bios_set_dac(int bits);
+static int vesa_bios_save_palette(int start, int colors, u_char *palette);
+static int vesa_bios_load_palette(int start, int colors, u_char *palette);
+#define STATE_SIZE	0
+#define STATE_SAVE	1
+#define STATE_LOAD	2
+#define STATE_HW	(1<<0)
+#define STATE_DATA	(1<<1)
+#define STATE_DAC	(1<<2)
+#define STATE_REG	(1<<3)
+#define STATE_MOST	(STATE_HW | STATE_DATA | STATE_REG)
+#define STATE_ALL	(STATE_HW | STATE_DATA | STATE_DAC | STATE_REG)
+static int vesa_bios_state_buf_size(void);
+static int vesa_bios_save_restore(int code, void *p, size_t size);
+static int translate_flags(u_int16_t vflags);
+static int vesa_bios_init(void);
+static void clear_modes(video_info_t *info, int color);
+
+static void
+dump_buffer(u_char *buf, size_t len)
+{
+    int i;
+
+    for(i = 0; i < len;) {
+	printf("%02x ", buf[i]);
+	if ((++i % 16) == 0)
+	    printf("\n");
+    }
+}
+
+/* VESA BIOS calls */
+static int
+vesa_bios_get_mode(int mode, struct vesa_mode *vmode)
+{
+	struct vm86frame vmf;
+	u_char buf[256];
+	int err;
+
+	bzero(&vmf, sizeof(vmf));
+	bzero(buf, sizeof(buf));  
+	vmf.vmf_eax = 0x4f01; 
+	vmf.vmf_ecx = mode;
+	err = vm86_datacall(0x10, &vmf, (char *)buf, sizeof(buf),
+			  &vmf.vmf_es, &vmf.vmf_di);
+	if ((err != 0) || (vmf.vmf_eax != 0x4f))
+		return 1;
+	bcopy(buf, vmode, sizeof(*vmode));
+	return 0;
+}
+
+static int
+vesa_bios_set_mode(int mode)
+{
+	struct vm86frame vmf;
+	int err;
+
+	bzero(&vmf, sizeof(vmf));
+	vmf.vmf_eax = 0x4f02;
+	vmf.vmf_ebx = mode;
+	err = vm86_intcall(0x10, &vmf);
+	return ((err != 0) || (vmf.vmf_eax != 0x4f));
+}
+
+static int
+vesa_bios_set_dac(int bits)
+{
+	struct vm86frame vmf;
+	int err;
+
+	bzero(&vmf, sizeof(vmf));
+	vmf.vmf_eax = 0x4f08;
+	vmf.vmf_ebx = (bits << 8);
+	err = vm86_intcall(0x10, &vmf);
+	return ((err != 0) || (vmf.vmf_eax != 0x4f));
+}
+
+static int
+vesa_bios_save_palette(int start, int colors, u_char *palette)
+{
+	struct vm86frame vmf;
+	u_char *p;
+	int err;
+	int i;
+
+	p = malloc(colors*4, M_DEVBUF, M_WAITOK);
+
+	bzero(&vmf, sizeof(vmf));
+	vmf.vmf_eax = 0x4f09;
+	vmf.vmf_ebx = 1;	/* get primary palette data */
+	vmf.vmf_ecx = colors;
+	vmf.vmf_edx = start;
+	err = vm86_datacall(0x10, &vmf, p, colors*4, &vmf.vmf_es, &vmf.vmf_di);
+	if ((err != 0) || (vmf.vmf_eax != 0x4f)) {
+		free(p, M_DEVBUF);
+		return 1;
+	}
+
+	for (i = 0; i < colors; ++i) {
+		palette[i*3]     = p[i*4 + 1];
+		palette[i*3 + 1] = p[i*4 + 2];
+		palette[i*3 + 2] = p[i*4 + 3];
+	}
+	free(p, M_DEVBUF);
+	return 0;
+}
+
+static int
+vesa_bios_load_palette(int start, int colors, u_char *palette)
+{
+	struct vm86frame vmf;
+	u_char *p;
+	int err;
+	int i;
+
+	p = malloc(colors*4, M_DEVBUF, M_WAITOK);
+	for (i = 0; i < colors; ++i) {
+		p[i*4]     = 0;
+		p[i*4 + 1] = palette[i*3];
+		p[i*4 + 2] = palette[i*3 + 1];
+		p[i*4 + 3] = palette[i*3 + 2];
+	}
+
+	bzero(&vmf, sizeof(vmf));
+	vmf.vmf_eax = 0x4f09;
+	vmf.vmf_ebx = 0;	/* set primary palette data */
+	vmf.vmf_ecx = colors;
+	vmf.vmf_edx = start;
+	err = vm86_datacall(0x10, &vmf, p, colors*4, &vmf.vmf_es, &vmf.vmf_di);
+	free(p, M_DEVBUF);
+	return ((err != 0) || (vmf.vmf_eax != 0x4f));
+}
+
+static int
+vesa_bios_state_buf_size(void)
+{
+	struct vm86frame vmf;
+	int err;
+
+	bzero(&vmf, sizeof(vmf));
+	vmf.vmf_eax = 0x4f04; 
+	vmf.vmf_ecx = STATE_MOST;
+	vmf.vmf_edx = STATE_SIZE;
+	err = vm86_intcall(0x10, &vmf);
+	if ((err != 0) || (vmf.vmf_eax != 0x4f))
+		return 0;
+	return vmf.vmf_ebx*64;
+}
+
+static int
+vesa_bios_save_restore(int code, void *p, size_t size)
+{
+	struct vm86frame vmf;
+	int err;
+
+	bzero(&vmf, sizeof(vmf));
+	vmf.vmf_eax = 0x4f04; 
+	vmf.vmf_ecx = STATE_MOST;
+	vmf.vmf_edx = code;	/* STATE_SAVE/STATE_LOAD */
+	err = vm86_datacall(0x10, &vmf, (char *)p, size,
+			  &vmf.vmf_es, &vmf.vmf_bx);
+	return ((err != 0) || (vmf.vmf_eax != 0x4f));
+}
+
+static int
+translate_flags(u_int16_t vflags)
+{
+	static struct {
+		u_int16_t mask;
+		int set;
+		int reset;
+	} ftable[] = {
+		{ V_MODECOLOR, V_INFO_COLOR, 0 },
+		{ V_MODEGRAPHICS, V_INFO_GRAPHICS, 0 },
+		{ V_MODELFB, V_INFO_LENEAR, 0 },
+	};
+	int flags;
+	int i;
+
+	for (flags = 0, i = 0; i < sizeof(ftable)/sizeof(ftable[0]); ++i) {
+		flags |= (vflags & ftable[i].mask) ? 
+			 ftable[i].set : ftable[i].reset;
+	}
+	return flags;
+}
+
+static int
+vesa_bios_init(void)
+{
+	static u_char buf[512];
+	struct vm86frame vmf;
+	struct vesa_mode vmode;
+	u_int32_t p;
+	int modes;
+	int err;
+	int i;
+
+	if (vesa_init_done)
+		return 0;
+
+	has_vesa_bios = FALSE;
+	vesa_adp_info = NULL;
+	vesa_vmode[0].vi_mode = EOT;
+
+	bzero(&vmf, sizeof(vmf));	/* paranoia */
+	bzero(buf, sizeof(buf));
+	bcopy("VBE2", buf, 4);		/* try for VBE2 data */
+	vmf.vmf_eax = 0x4f00;
+	err = vm86_datacall(0x10, &vmf, (char *)buf, sizeof(buf), 
+			  &vmf.vmf_es, &vmf.vmf_di);
+	if ((err != 0) || (vmf.vmf_eax != 0x4f) || bcmp("VESA", buf, 4))
+		return 1;
+	vesa_adp_info = (struct vesa_info *)buf;
+	if (bootverbose)
+		dump_buffer(buf, 64);
+	if (vesa_adp_info->v_flags & V_NONVGA)
+		return 1;
+
+	/* obtain video mode information */
+	p = BIOS_SADDRTOLADDR(vesa_adp_info->v_modetable);
+	vesa_vmodetab = (u_int16_t *)BIOS_PADDRTOVADDR(p);
+	for (i = 0, modes = 0; vesa_vmodetab[i] != 0xffff; ++i) {
+		if (modes >= VESA_MAXMODES)
+			break;
+		if (vesa_bios_get_mode(vesa_vmodetab[i], &vmode))
+			continue;
+
+		/* reject unsupported modes */
+#if 0
+		if ((vmode.v_modeattr & (V_MODESUPP | V_MODEOPTINFO 
+					| V_MODENONVGA))
+		    != (V_MODESUPP | V_MODEOPTINFO))
+			continue;
+#else
+		if ((vmode.v_modeattr & (V_MODEOPTINFO | V_MODENONVGA))
+		    != (V_MODEOPTINFO))
+			continue;
+#endif
+
+		/* copy some fields */
+		bzero(&vesa_vmode[modes], sizeof(vesa_vmode[modes]));
+		vesa_vmode[modes].vi_mode = vesa_vmodetab[i];
+		vesa_vmode[modes].vi_width = vmode.v_width;
+		vesa_vmode[modes].vi_height = vmode.v_height;
+		vesa_vmode[modes].vi_depth = vmode.v_bpp;
+		vesa_vmode[modes].vi_planes = vmode.v_planes;
+		vesa_vmode[modes].vi_cwidth = vmode.v_cwidth;
+		vesa_vmode[modes].vi_cheight = vmode.v_cheight;
+		vesa_vmode[modes].vi_window = (u_int)vmode.v_waseg << 4;
+		/* XXX window B */
+		vesa_vmode[modes].vi_window_size = vmode.v_wsize;
+		vesa_vmode[modes].vi_window_gran = vmode.v_wgran;
+		vesa_vmode[modes].vi_buffer = vmode.v_lfb;
+		vesa_vmode[modes].vi_buffer_size = vmode.v_offscreen;
+		/* pixel format, memory model... */
+		vesa_vmode[modes].vi_flags = translate_flags(vmode.v_modeattr)
+					     | V_INFO_VESA;
+		++modes;
+	}
+	vesa_vmode[modes].vi_mode = EOT;
+	if (bootverbose)
+		printf("VESA: %d mode(s) found\n", modes);
+
+	has_vesa_bios = TRUE;
+	return 0;
+}
+
+static void
+clear_modes(video_info_t *info, int color)
+{
+	while (info->vi_mode != EOT) {
+		if ((info->vi_flags & V_INFO_COLOR) != color)
+			info->vi_mode = NA;
+		++info;
+	}
+}
+
+/* exported functions */
+
+static int
+vesa_init(void)
+{
+	int adapters;
+	int i;
+
+	adapters = (*prevvidsw.init)();
+	for (i = 0; i < adapters; ++i) {
+		if ((vesa_adp = (*prevvidsw.adapter)(i)) == NULL)
+			continue;
+		if (vesa_adp->va_type == KD_VGA) {
+			vesa_adp->va_flags |= V_ADP_VESA;
+			return adapters;
+		}
+	}
+	vesa_adp = NULL;
+	return adapters;
+}
+
+static video_adapter_t
+*vesa_adapter(int ad)
+{
+	return (*prevvidsw.adapter)(ad);
+}
+
+static int
+vesa_get_info(int ad, int mode, video_info_t *info)
+{
+	int i;
+
+	if ((*prevvidsw.get_info)(ad, mode, info) == 0)
+		return 0;
+
+	if (ad != vesa_adp->va_index)
+		return 1;
+	for (i = 0; vesa_vmode[i].vi_mode != EOT; ++i) {
+		if (vesa_vmode[i].vi_mode == NA)
+			continue;
+		if (vesa_vmode[i].vi_mode == mode) {
+			*info = vesa_vmode[i];
+			return 0;
+		}
+	}
+	return 1;
+}
+
+static int
+vesa_query_mode(int ad, video_info_t *info)
+{
+	int i;
+
+	if ((i = (*prevvidsw.query_mode)(ad, info)) != -1)
+		return i;
+	if (ad != vesa_adp->va_index)
+		return -1;
+
+	for (i = 0; vesa_vmode[i].vi_mode != EOT; ++i) {
+		if ((info->vi_width != 0)
+		    && (info->vi_width != vesa_vmode[i].vi_width))
+			continue;
+		if ((info->vi_height != 0)
+		    && (info->vi_height != vesa_vmode[i].vi_height))
+			continue;
+		if ((info->vi_cwidth != 0)
+		    && (info->vi_cwidth != vesa_vmode[i].vi_cwidth))
+			continue;
+		if ((info->vi_cheight != 0)
+		    && (info->vi_cheight != vesa_vmode[i].vi_cheight))
+			continue;
+		if ((info->vi_depth != 0)
+		    && (info->vi_depth != vesa_vmode[i].vi_depth))
+			continue;
+		if ((info->vi_planes != 0)
+		    && (info->vi_planes != vesa_vmode[i].vi_planes))
+			continue;
+		/* pixel format, memory model */
+		if ((info->vi_flags != 0)
+		    && (info->vi_flags != vesa_vmode[i].vi_flags))
+			continue;
+		return vesa_vmode[i].vi_mode;
+	}
+	return -1;
+}
+
+static int
+vesa_set_mode(int ad, int mode)
+{
+	video_info_t info;
+	size_t len;
+
+	if (ad != vesa_adp->va_index)
+		return (*prevvidsw.set_mode)(ad, mode);
+
+#ifdef SC_VIDEO_DEBUG
+	printf("VESA: set_mode(): %d(%x) -> %d(%x)\n",
+		vesa_adp->va_mode, vesa_adp->va_mode, mode, mode);
+#endif
+	/* 
+	 * If the current mode is a VESA mode and the new mode is not,
+	 * restore the state of the adapter first, so that non-standard, 
+	 * extended SVGA registers are set to the state compatible with
+	 * the standard VGA modes. Otherwise (*prevvidsw.set_mode)() 
+	 * may not be able to set up the new mode correctly.
+	 */
+	if (VESA_MODE(vesa_adp->va_mode)) {
+		if ((*prevvidsw.get_info)(ad, mode, &info) == 0) {
+			/* assert(vesa_state_buf != NULL); */
+		    	if ((vesa_state_buf == NULL)
+			    || vesa_load_state(ad, vesa_state_buf))
+				return 1;
+			free(vesa_state_buf, M_DEVBUF);
+			vesa_state_buf = NULL;
+#ifdef SC_VIDEO_DEBUG
+			printf("VESA: restored\n");
+#endif
+		}
+		/* 
+		 * once (*prevvidsw.get_info)() succeeded, 
+		 * (*prevvidsw.set_mode)() below won't fail...
+		 */
+	}
+
+	/* we may not need to handle this mode after all... */
+	if ((*prevvidsw.set_mode)(ad, mode) == 0)
+		return 0;
+
+	/* is the new mode supported? */
+	if (vesa_get_info(ad, mode, &info))
+		return 1;
+	/* assert(VESA_MODE(mode)); */
+
+#ifdef SC_VIDEO_DEBUG
+	printf("VESA: about to set a VESA mode...\n");
+#endif
+	/* 
+	 * If the current mode is not a VESA mode, save the current state
+	 * so that the adapter state can be restored later when a non-VESA
+	 * mode is to be set up. See above.
+	 */
+	if (!VESA_MODE(vesa_adp->va_mode) && (vesa_state_buf == NULL)) {
+		len = vesa_save_state(ad, NULL, 0);
+		vesa_state_buf = malloc(len, M_DEVBUF, M_WAITOK);
+		if (vesa_save_state(ad, vesa_state_buf, len)) {
+#ifdef SC_VIDEO_DEBUG
+			printf("VESA: state save failed! (len=%d)\n", len);
+#endif
+			free(vesa_state_buf, M_DEVBUF);
+			vesa_state_buf = NULL;
+			return 1;
+		}
+#ifdef SC_VIDEO_DEBUG
+		printf("VESA: saved (len=%d)\n", len);
+		dump_buffer(vesa_state_buf, len);
+#endif
+	}
+
+	if (vesa_bios_set_mode(mode))
+		return 1;
+
+#ifdef SC_VIDEO_DEBUG
+	printf("VESA: mode set!\n");
+#endif
+	vesa_adp->va_mode = mode;
+	vesa_adp->va_flags &= ~V_ADP_COLOR;
+	vesa_adp->va_flags |= 
+		(info.vi_flags & V_INFO_COLOR) ? V_ADP_COLOR : 0;
+	vesa_adp->va_crtc_addr =
+		(vesa_adp->va_flags & V_ADP_COLOR) ? COLOR_BASE : MONO_BASE;
+	vesa_adp->va_window = BIOS_PADDRTOVADDR(info.vi_window);
+	vesa_adp->va_window_size = info.vi_window_size;
+	vesa_adp->va_window_gran = info.vi_window_gran;
+	if (info.vi_buffer_size == 0) {
+		vesa_adp->va_buffer = 0;
+		vesa_adp->va_buffer_size = 0;
+	} else {
+		vesa_adp->va_buffer = BIOS_PADDRTOVADDR(info.vi_buffer);
+		vesa_adp->va_buffer_size = info.vi_buffer_size;
+	}
+
+	return 0;
+}
+
+static int
+vesa_save_font(int ad, int page, int fontsize, u_char *data, int ch, int count)
+{
+	return (*prevvidsw.save_font)(ad, page, fontsize, data, ch, count);
+}
+
+static int
+vesa_load_font(int ad, int page, int fontsize, u_char *data, int ch, int count)
+{
+	return (*prevvidsw.load_font)(ad, page, fontsize, data, ch, count);
+}
+
+static int
+vesa_show_font(int ad, int page)
+{
+	return (*prevvidsw.show_font)(ad, page);
+}
+
+static int
+vesa_save_palette(int ad, u_char *palette)
+{
+	if ((ad != vesa_adp->va_index) || !(vesa_adp_info->v_flags & V_DAC8) 
+	    || vesa_bios_set_dac(8))
+		return (*prevvidsw.save_palette)(ad, palette);
+
+	return vesa_bios_save_palette(0, 256, palette);
+}
+
+static int
+vesa_load_palette(int ad, u_char *palette)
+{
+	if ((ad != vesa_adp->va_index) || !(vesa_adp_info->v_flags & V_DAC8) 
+	    || vesa_bios_set_dac(8))
+		return (*prevvidsw.load_palette)(ad, palette);
+
+	return vesa_bios_load_palette(0, 256, palette);
+}
+
+static int
+vesa_set_border(int ad, int color)
+{
+	return (*prevvidsw.set_border)(ad, color);
+}
+
+static int
+vesa_save_state(int ad, void *p, size_t size)
+{
+	if (ad != vesa_adp->va_index)
+		return (*prevvidsw.save_state)(ad, p, size);
+
+	if (vesa_state_buf_size == 0)
+		vesa_state_buf_size = vesa_bios_state_buf_size();
+	if (size == 0)
+		return (sizeof(int) + vesa_state_buf_size);
+	else if (size < (sizeof(int) + vesa_state_buf_size))
+		return 1;
+
+	((adp_state_t *)p)->sig = V_STATE_SIG;
+	bzero(((adp_state_t *)p)->regs, vesa_state_buf_size);
+	return vesa_bios_save_restore(STATE_SAVE, ((adp_state_t *)p)->regs, 
+				      vesa_state_buf_size);
+}
+
+static int
+vesa_load_state(int ad, void *p)
+{
+	if ((ad != vesa_adp->va_index) 
+	    || (((adp_state_t *)p)->sig != V_STATE_SIG))
+		return (*prevvidsw.load_state)(ad, p);
+
+	return vesa_bios_save_restore(STATE_LOAD, ((adp_state_t *)p)->regs, 
+				      vesa_state_buf_size);
+}
+
+static int
+vesa_set_origin(int ad, off_t offset)
+{
+	struct vm86frame vmf;
+	int err;
+
+	/*
+	 * This function should return as quickly as possible to 
+	 * maintain good performance of the system. For this reason,
+	 * error checking is kept minimal and let the VESA BIOS to 
+	 * detect error.
+	 */
+	if (ad != vesa_adp->va_index) 
+		return (*prevvidsw.set_win_org)(ad, offset);
+
+	if (vesa_adp->va_window_gran == 0)
+		return 1;
+	bzero(&vmf, sizeof(vmf));
+	vmf.vmf_eax = 0x4f05; 
+	vmf.vmf_ebx = 0;		/* WINDOW_A, XXX */
+	vmf.vmf_edx = offset/vesa_adp->va_window_gran;
+	err = vm86_intcall(0x10, &vmf); 
+	return ((err != 0) || (vmf.vmf_eax != 0x4f));
+}
+
+static int
+vesa_read_hw_cursor(int ad, int *col, int *row)
+{
+	return (*prevvidsw.read_hw_cursor)(ad, col, row);
+}
+
+static int
+vesa_set_hw_cursor(int ad, int col, int row)
+{
+	return (*prevvidsw.set_hw_cursor)(ad, col, row);
+}
+
+static int
+vesa_diag(int level)
+{
+	struct vesa_mode vmode;
+	u_int32_t p;
+	int i;
+
+	/* general adapter information */
+	printf("VESA: v%d.%d, %dk memory, flags:0x%x, mode table:%p (%x)\n", 
+	       ((vesa_adp_info->v_version & 0xf000) >> 12) * 10 
+		   + ((vesa_adp_info->v_version & 0x0f00) >> 8),
+	       ((vesa_adp_info->v_version & 0x00f0) >> 4) * 10 
+		   + (vesa_adp_info->v_version & 0x000f),
+	       vesa_adp_info->v_memsize * 64, vesa_adp_info->v_flags,
+	       vesa_vmodetab, vesa_adp_info->v_modetable);
+	/* OEM string */
+	p = BIOS_SADDRTOLADDR(vesa_adp_info->v_oemstr);
+	if (p != 0)
+		printf("VESA: %s\n", (char *)BIOS_PADDRTOVADDR(p));
+
+	if (level <= 0)
+		return 0;
+
+	if (vesa_adp_info->v_version >= 0x0200) {
+		/* vendor name */
+		p = BIOS_SADDRTOLADDR(vesa_adp_info->v_venderstr);
+		if (p != 0)
+			printf("VESA: %s, ", (char *)BIOS_PADDRTOVADDR(p));
+		/* product name */
+		p = BIOS_SADDRTOLADDR(vesa_adp_info->v_prodstr);
+		if (p != 0)
+			printf("%s, ", (char *)BIOS_PADDRTOVADDR(p));
+		/* product revision */
+		p = BIOS_SADDRTOLADDR(vesa_adp_info->v_revstr);
+		if (p != 0)
+			printf("%s\n", (char *)BIOS_PADDRTOVADDR(p));
+	}
+
+	/* mode information */
+	for (i = 0; vesa_vmodetab[i] != 0xffff; ++i) {
+		if (vesa_bios_get_mode(vesa_vmodetab[i], &vmode))
+			continue;
+
+		/* print something for diagnostic purpose */
+		printf("VESA: mode:0x%03x, flags:0x%04x", 
+		       vesa_vmodetab[i], vmode.v_modeattr);
+		if (vmode.v_modeattr & V_MODEOPTINFO) {
+			if (vmode.v_modeattr & V_MODEGRAPHICS) {
+				printf(", G %dx%dx%d %d, ", 
+				       vmode.v_width, vmode.v_height,
+				       vmode.v_bpp, vmode.v_planes);
+			} else {
+				printf(", T %dx%d, ", 
+				       vmode.v_width, vmode.v_height);
+			}
+			printf("font:%dx%d", 
+			       vmode.v_cwidth, vmode.v_cheight);
+		}
+		if (vmode.v_modeattr & V_MODELFB) {
+			printf(", mem:%d, LFB:0x%x, off:0x%x", 
+			       vmode.v_memmodel, vmode.v_lfb, 
+			       vmode.v_offscreen);
+		}
+		printf("\n");
+		printf("VESA: window A:0x%x (%x), window B:0x%x (%x), ",
+		       vmode.v_waseg, vmode.v_waattr,
+		       vmode.v_wbseg, vmode.v_wbattr);
+		printf("size:%dk, gran:%dk\n",
+		       vmode.v_wsize, vmode.v_wgran);
+	}
+
+	return 0;
+}
+
+/* module loading */
+
+#ifdef VESA_MODULE
+static int
+vesa_load(struct lkm_table *lkmtp, int cmd)
+#else
+int
+vesa_load(void)
+#endif
+{
+	int adapters;
+	int error;
+	int s;
+	int i;
+
+	if (vesa_init_done)
+		return 0;
+
+	/*
+	 * If the VESA module is statically linked to the kernel, or
+	 * it has already been loaded, abort loading this module this time.
+	 */
+	vesa_adp = NULL;
+	adapters = (*biosvidsw.init)();
+	for (i = 0; i < adapters; ++i) {
+		if ((vesa_adp = (*biosvidsw.adapter)(i)) == NULL)
+			continue;
+		if (vesa_adp->va_flags & V_ADP_VESA)
+			return ENXIO;
+		if (vesa_adp->va_type == KD_VGA)
+			break;
+	}
+	/* if a VGA adapter is not found, abort */
+	if (i >= adapters)
+		return ENXIO;
+
+	if (vesa_bios_init())
+		return ENXIO;
+	vesa_adp->va_flags |= V_ADP_VESA;
+
+	/* remove conflicting modes if we have more than one adapter */
+	if (adapters > 1) {
+		clear_modes(vesa_vmode,
+			    (vesa_adp->va_flags & V_ADP_COLOR) ? 
+				V_INFO_COLOR : 0);
+	}
+
+#ifdef VESA_MODULE
+	s = spltty();
+#endif
+	if ((error = vesa_load_ioctl()) == 0) {
+		bcopy(&biosvidsw, &prevvidsw, sizeof(prevvidsw));
+		bcopy(&vesavidsw, &biosvidsw, sizeof(vesavidsw));
+		vesa_init_done = TRUE;
+	}
+#ifdef VESA_MODULE
+	splx(s);
+
+	if (error == 0)
+		vesa_diag(bootverbose);
+#endif
+
+	return error;
+}
+
+#ifdef VESA_MODULE
+
+static int
+vesa_unload(struct lkm_table *lkmtp, int cmd)
+{
+	int error;
+	int s;
+
+	/* if the adapter is currently in a VESA mode, don't unload */
+	if ((vesa_adp != NULL) && VESA_MODE(vesa_adp->va_mode))
+		return EBUSY;
+	/* 
+	 * FIXME: if there is at least one vty which is in a VESA mode,
+	 * we shouldn't be unloading! XXX
+	 */
+
+	s = spltty();
+	if ((error = vesa_unload_ioctl()) == 0) {
+		if (vesa_adp)
+			vesa_adp->va_flags &= ~V_ADP_VESA;
+		bcopy(&prevvidsw, &biosvidsw, sizeof(biosvidsw));
+	}
+	splx(s);
+
+	return error;
+}
+
+int
+vesa_mod(struct lkm_table *lkmtp, int cmd, int ver)
+{
+	MOD_DISPATCH(vesa, lkmtp, cmd, ver,
+		vesa_load, vesa_unload, lkm_nullcmd);
+}
+
+#endif /* VESA_MODULE */
+
+#endif /* (NSC > 0 && VESA && VM86) || VESA_MODULE */
diff --git a/sys/i386/isa/videoio.c b/sys/i386/isa/videoio.c
new file mode 100644
index 000000000000..85c8f8d56ba8
--- /dev/null
+++ b/sys/i386/isa/videoio.c
@@ -0,0 +1,1612 @@
+/*-
+ * Copyright (c) 1998 Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote 
+ *    products derived from this software without specific prior written 
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id$
+ */
+
+#include "sc.h"
+#include "opt_syscons.h"
+
+#if NSC > 0
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <machine/clock.h>
+#include <machine/console.h>
+#include <machine/md_var.h>
+#include <machine/pc/bios.h>
+
+#include <i386/isa/isa.h>
+#include <i386/isa/videoio.h>
+
+/* this should really be in `rtc.h' */
+#define RTC_EQUIPMENT           0x14
+
+/* video adapter state buffer */
+struct adp_state {
+    int			sig;
+#define V_STATE_SIG	0x736f6962
+    u_char		regs[V_MODE_PARAM_SIZE];
+};
+typedef struct adp_state adp_state_t;
+
+/* video adapter information */
+#define DCC_MONO	0
+#define DCC_CGA40	1
+#define DCC_CGA80	2
+#define DCC_EGAMONO	3
+#define DCC_EGA40	4
+#define DCC_EGA80	5
+
+/* 
+ * NOTE: `va_window' should have a virtual address, but is initialized
+ * with a physical address in the following table, as verify_adapter()
+ * will perform address conversion at run-time.
+ */
+static video_adapter_t adapter_init_value[] = {
+    { 0, KD_MONO, 0, 	      MONO_BASE,  0xb0000, 32, 32, 0, 0, 0, 7, 0 },
+    { 0, KD_CGA, V_ADP_COLOR, COLOR_BASE, 0xb8000, 32, 32, 0, 0, 0, 3, 0 },
+    { 0, KD_CGA, V_ADP_COLOR, COLOR_BASE, 0xb8000, 32, 32, 0, 0, 0, 3, 0 },
+    { 0, KD_EGA, 0,	      MONO_BASE,  0xb0000, 32, 32, 0, 0, 0, 7, 0 },
+    { 0, KD_EGA, V_ADP_COLOR, COLOR_BASE, 0xb8000, 32, 32, 0, 0, 0, 3, 0 },
+    { 0, KD_EGA, V_ADP_COLOR, COLOR_BASE, 0xb8000, 32, 32, 0, 0, 0, 3, 0 },
+};
+
+static video_adapter_t adapter[V_MAX_ADAPTERS];
+static int adapters = 0;
+
+/* VGA function entries */
+static vi_init_t		vid_init;
+static vi_adapter_t		vid_adapter;
+static vi_get_info_t		vid_get_info;
+static vi_query_mode_t		vid_query_mode;
+static vi_set_mode_t		vid_set_mode;
+static vi_save_font_t		vid_save_font;
+static vi_load_font_t		vid_load_font;
+static vi_show_font_t		vid_show_font;
+static vi_save_palette_t	vid_save_palette;
+static vi_load_palette_t	vid_load_palette;
+static vi_set_border_t		vid_set_border;
+static vi_save_state_t		vid_save_state;
+static vi_load_state_t		vid_load_state;
+static vi_set_win_org_t		vid_set_origin;
+static vi_read_hw_cursor_t	vid_read_hw_cursor;
+static vi_set_hw_cursor_t	vid_set_hw_cursor;
+static vi_diag_t		vid_diag;
+
+struct vidsw biosvidsw = {
+	vid_init,	vid_adapter,	vid_get_info,	vid_query_mode,	
+	vid_set_mode,	vid_save_font,	vid_load_font,	vid_show_font,
+	vid_save_palette,vid_load_palette,vid_set_border,vid_save_state,
+	vid_load_state,	vid_set_origin,	vid_read_hw_cursor, vid_set_hw_cursor,
+	vid_diag,
+};
+
+/* VGA BIOS standard video modes */
+#define EOT		(-1)
+#define NA		(-2)
+
+static video_info_t bios_vmode[] = {
+    /* CGA */
+    { M_B40x25,     V_INFO_COLOR, 40, 25, 8,  8, 2, 1, 0xb8000, 32, 32, 0, 32 },
+    { M_C40x25,     V_INFO_COLOR, 40, 25, 8,  8, 4, 1, 0xb8000, 32, 32, 0, 32 },
+    { M_B80x25,     V_INFO_COLOR, 80, 25, 8,  8, 2, 1, 0xb8000, 32, 32, 0, 32 },
+    { M_C80x25,     V_INFO_COLOR, 80, 25, 8,  8, 4, 1, 0xb8000, 32, 32, 0, 32 },
+    /* EGA */
+    { M_ENH_B40x25, V_INFO_COLOR, 40, 25, 8, 14, 2, 1, 0xb8000, 32, 32, 0, 32 },
+    { M_ENH_C40x25, V_INFO_COLOR, 40, 25, 8, 14, 4, 1, 0xb8000, 32, 32, 0, 32 },
+    { M_ENH_B80x25, V_INFO_COLOR, 80, 25, 8, 14, 2, 1, 0xb8000, 32, 32, 0, 32 },
+    { M_ENH_C80x25, V_INFO_COLOR, 80, 25, 8, 14, 4, 1, 0xb8000, 32, 32, 0, 32 },
+    /* VGA */
+    { M_VGA_C40x25, V_INFO_COLOR, 40, 25, 8, 16, 4, 1, 0xb8000, 32, 32, 0, 32 },
+    { M_VGA_M80x25, 0,		  80, 25, 8, 16, 2, 1, 0xb0000, 32, 32, 0, 32 },
+    { M_VGA_C80x25, V_INFO_COLOR, 80, 25, 8, 16, 4, 1, 0xb8000, 32, 32, 0, 32 },
+    /* MDA */
+    { M_EGAMONO80x25, 0,          80, 25, 8, 14, 2, 1, 0xb0000, 32, 32, 0, 32 },
+    /* EGA */
+    { M_ENH_B80x43, V_INFO_COLOR, 80, 43, 8,  8, 2, 1, 0xb8000, 32, 32, 0, 32 },
+    { M_ENH_C80x43, V_INFO_COLOR, 80, 43, 8,  8, 4, 1, 0xb8000, 32, 32, 0, 32 },
+    /* VGA */
+    { M_VGA_M80x30, 0,		  80, 30, 8, 16, 2, 1, 0xb0000, 32, 32, 0, 32 },
+    { M_VGA_C80x30, V_INFO_COLOR, 80, 30, 8, 16, 4, 1, 0xb8000, 32, 32, 0, 32 },
+    { M_VGA_M80x50, 0,		  80, 50, 8,  8, 2, 1, 0xb0000, 32, 32, 0, 32 },
+    { M_VGA_C80x50, V_INFO_COLOR, 80, 50, 8,  8, 4, 1, 0xb8000, 32, 32, 0, 32 },
+    { M_VGA_M80x60, 0,		  80, 60, 8,  8, 2, 1, 0xb0000, 32, 32, 0, 32 },
+    { M_VGA_C80x60, V_INFO_COLOR, 80, 60, 8,  8, 4, 1, 0xb8000, 32, 32, 0, 32 },
+    /* CGA */
+    { M_BG320,      V_INFO_COLOR | V_INFO_GRAPHICS,                
+      320, 200, 8,  8, 2, 1, 0xb8000, 32, 32, 0, 32 },
+    { M_CG320,      V_INFO_COLOR | V_INFO_GRAPHICS, 
+      320, 200, 8,  8, 2, 1, 0xb8000, 32, 32, 0, 32 },
+    { M_BG640,      V_INFO_COLOR | V_INFO_GRAPHICS,                
+      640, 200, 8,  8, 1, 1, 0xb8000, 32, 32, 0, 32 },
+    /* EGA */
+    { M_CG320_D,    V_INFO_COLOR | V_INFO_GRAPHICS,
+      320, 200, 8,  8, 4, 4, 0xa0000, 64, 64, 0, 64 },
+    { M_CG640_E,    V_INFO_COLOR | V_INFO_GRAPHICS, 
+      640, 200, 8,  8, 4, 4, 0xa0000, 64, 64, 0, 64 },
+    { M_EGAMONOAPA, V_INFO_GRAPHICS, 		    
+      640, 350, 8, 14, 4, 4, 0xa0000, 64, 64, 0, 64 },
+    { M_ENHMONOAPA2,V_INFO_GRAPHICS, 		    
+      640, 350, 8, 14, 4, 4, 0xa0000, 64, 64, 0, 64 },
+    { M_CG640x350,  V_INFO_COLOR | V_INFO_GRAPHICS, 
+      640, 350, 8, 14, 2, 2, 0xa0000, 64, 64, 0, 64 },
+    { M_ENH_CG640,  V_INFO_COLOR | V_INFO_GRAPHICS, 
+      640, 350, 8, 14, 4, 4, 0xa0000, 64, 64, 0, 64 },
+    /* VGA */
+    { M_BG640x480,  V_INFO_COLOR | V_INFO_GRAPHICS,                
+      640, 480, 8, 16, 4, 4, 0xa0000, 64, 64, 0, 64 },
+    { M_CG640x480,  V_INFO_COLOR | V_INFO_GRAPHICS, 
+      640, 480, 8, 16, 4, 4, 0xa0000, 64, 64, 0, 64 },
+    { M_VGA_CG320,  V_INFO_COLOR | V_INFO_GRAPHICS, 
+      320, 200, 8,  8, 8, 1, 0xa0000, 64, 64, 0, 64 },
+    { M_VGA_MODEX,  V_INFO_COLOR | V_INFO_GRAPHICS, 
+      320, 240, 8,  8, 8, 1, 0xa0000, 64, 64, 0, 64 },
+
+    { EOT },
+};
+
+static int		init_done = FALSE;
+static u_char		*video_mode_ptr = NULL;		/* EGA/VGA */
+static u_char		*video_mode_ptr2 = NULL;	/* CGA/MDA */
+static u_char		*mode_map[V_MODE_MAP_SIZE];
+static adp_state_t	adpstate;
+static adp_state_t	adpstate2;
+static int		rows_offset = 1;
+
+/* local macros and functions */
+#define BIOS_SADDRTOLADDR(p) ((((p) & 0xffff0000) >> 12) + ((p) & 0x0000ffff))
+
+static void map_mode_table(u_char *map[], u_char *table, int max);
+static void clear_mode_map(int ad, u_char *map[], int max, int color);
+static int map_mode_num(int mode);
+static int map_bios_mode_num(int type, int color, int bios_mode);
+static u_char *get_mode_param(int mode);
+static void fill_adapter_param(int code, video_adapter_t *adp);
+static int verify_adapter(video_adapter_t *adp);
+#define COMP_IDENTICAL	0
+#define COMP_SIMILAR	1
+#define COMP_DIFFERENT	2
+static int comp_adpregs(u_char *buf1, u_char *buf2);
+
+#define PARAM_BUFSIZE	6
+static void set_font_mode(video_adapter_t *adp, u_char *buf);
+static void set_normal_mode(video_adapter_t *adp, u_char *buf);
+
+static char *adapter_name(int type);
+static void dump_adp_info(int ad, video_adapter_t *adp, int level);
+static void dump_mode_info(int ad, video_info_t *info, int level);
+static void dump_buffer(u_char *buf, size_t len);
+
+extern void generic_bcopy(const void *, void *, size_t);
+
+#define	ISMAPPED(pa, width) \
+	(((pa) <= (u_long)0x1000 - (width)) 		\
+	 || ((pa) >= ISA_HOLE_START && (pa) <= 0x100000 - (width)))
+
+#define	prologue(ad, flag, err)	\
+	if (!init_done					\
+	    || ((ad) < 0) || ((ad) >= adapters)		\
+	    || !(adapter[(ad)].va_flags & (flag)))	\
+	    return (err)
+
+/* construct the mode parameter map */
+static void
+map_mode_table(u_char *map[], u_char *table, int max)
+{
+    int i;
+
+    for(i = 0; i < max; ++i)
+	map[i] = table + i*V_MODE_PARAM_SIZE;
+    for(; i < V_MODE_MAP_SIZE; ++i)
+	map[i] = NULL;
+}
+
+static void
+clear_mode_map(int ad, u_char *map[], int max, int color)
+{
+    video_info_t info;
+    int i;
+
+    /*
+     * NOTE: we don't touch `bios_vmode[]' because it is shared
+     * by all adapters.
+     */
+    for(i = 0; i < max; ++i) {
+	if (vid_get_info(ad, i, &info))
+	    continue;
+	if ((info.vi_flags & V_INFO_COLOR) != color)
+	    map[i] = NULL;
+    }
+}
+
+/* the non-standard video mode is based on a standard mode... */
+static int
+map_mode_num(int mode)
+{
+    static struct {
+        int from;
+        int to;
+    } mode_map[] = {
+        { M_ENH_B80x43, M_ENH_B80x25 },
+        { M_ENH_C80x43, M_ENH_C80x25 },
+        { M_VGA_M80x30, M_VGA_M80x25 },
+        { M_VGA_C80x30, M_VGA_C80x25 },
+        { M_VGA_M80x50, M_VGA_M80x25 },
+        { M_VGA_C80x50, M_VGA_C80x25 },
+        { M_VGA_M80x60, M_VGA_M80x25 },
+        { M_VGA_C80x60, M_VGA_C80x25 },
+        { M_VGA_MODEX,  M_VGA_CG320 },
+    };
+    int i;
+
+    for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) {
+        if (mode_map[i].from == mode)
+            return mode_map[i].to;
+    }
+    return mode;
+}
+
+/* turn the BIOS video number into our video mode number */
+static int
+map_bios_mode_num(int type, int color, int bios_mode)
+{
+    static int cga_modes[7] = {
+	M_B40x25, M_C40x25,		/* 0, 1 */
+	M_B80x25, M_C80x25,		/* 2, 3 */
+	M_BG320, M_CG320,
+	M_BG640,
+    };
+    static int ega_modes[17] = {
+	M_ENH_B40x25, M_ENH_C40x25,	/* 0, 1 */
+	M_ENH_B80x25, M_ENH_C80x25,	/* 2, 3 */
+	M_BG320, M_CG320,
+	M_BG640,
+	M_EGAMONO80x25,			/* 7 */
+	8, 9, 10, 11, 12,
+	M_CG320_D,
+	M_CG640_E,
+	M_ENHMONOAPA2,			/* XXX: video momery > 64K */
+	M_ENH_CG640,			/* XXX: video momery > 64K */
+    };
+    static int vga_modes[20] = {
+	M_VGA_C40x25, M_VGA_C40x25,	/* 0, 1 */
+	M_VGA_C80x25, M_VGA_C80x25,	/* 2, 3 */
+	M_BG320, M_CG320,
+	M_BG640,
+	M_VGA_M80x25,			/* 7 */
+	8, 9, 10, 11, 12,
+	M_CG320_D,
+	M_CG640_E,
+	M_ENHMONOAPA2,
+	M_ENH_CG640,
+	M_BG640x480, M_CG640x480, 
+	M_VGA_CG320,
+    };
+
+    switch (type) {
+
+    case KD_VGA:
+	if (bios_mode < sizeof(vga_modes)/sizeof(vga_modes[0]))
+	    return vga_modes[bios_mode];
+	else if (color)
+	    return M_VGA_C80x25;
+	else
+	    return M_VGA_M80x25;
+	break;
+
+    case KD_EGA:
+	if (bios_mode < sizeof(ega_modes)/sizeof(ega_modes[0]))
+	    return ega_modes[bios_mode];
+	else if (color)
+	    return M_ENH_C80x25;
+	else
+	    return M_EGAMONO80x25;
+	break;
+
+    case KD_CGA:
+	if (bios_mode < sizeof(cga_modes)/sizeof(cga_modes[0]))
+	    return cga_modes[bios_mode];
+	else
+	    return M_C80x25;
+	break;
+
+    case KD_MONO:
+    case KD_HERCULES:
+	return M_EGAMONO80x25;		/* XXX: this name is confusing */
+
+    default:
+	break;
+    }
+    return -1;
+}
+
+/* look up a parameter table entry */
+static u_char 
+*get_mode_param(int mode)
+{
+    if (mode >= V_MODE_MAP_SIZE)
+	mode = map_mode_num(mode);
+    if (mode < V_MODE_MAP_SIZE)
+	return mode_map[mode];
+    else
+	return NULL;
+}
+
+static void
+fill_adapter_param(int code, video_adapter_t *adp)
+{
+    static struct {
+	int primary;
+	int secondary;
+    } dcc[] = {
+	{ DCC_MONO, 			DCC_EGA40 /* CGA monitor */ },
+	{ DCC_MONO, 			DCC_EGA80 /* CGA monitor */ },
+	{ DCC_MONO, 			DCC_EGA80 /* CGA emulation */ },	
+	{ DCC_MONO, 			DCC_EGA80 },
+	{ DCC_CGA40, 			DCC_EGAMONO },
+	{ DCC_CGA80, 			DCC_EGAMONO },
+	{ DCC_EGA40 /* CGA monitor */, 	DCC_MONO},
+	{ DCC_EGA80 /* CGA monitor */, 	DCC_MONO},
+	{ DCC_EGA80 /* CGA emulation */,DCC_MONO },	
+	{ DCC_EGA80, 			DCC_MONO },
+	{ DCC_EGAMONO, 			DCC_CGA40 },
+	{ DCC_EGAMONO, 			DCC_CGA40 },
+    };
+
+    if ((code < 0) || (code >= sizeof(dcc)/sizeof(dcc[0]))) {
+	adp[V_ADP_PRIMARY] = adapter_init_value[DCC_MONO];
+	adp[V_ADP_SECONDARY] = adapter_init_value[DCC_CGA80];
+    } else {
+	adp[V_ADP_PRIMARY] = adapter_init_value[dcc[code].primary];
+	adp[V_ADP_SECONDARY] = adapter_init_value[dcc[code].secondary];
+    }
+}
+
+static int
+verify_adapter(video_adapter_t *adp)
+{
+    u_short volatile *buf;
+    u_short v;
+    u_int32_t p;
+
+    buf = (u_short *)BIOS_PADDRTOVADDR(adp->va_window);
+    v = *buf;
+    *buf = (u_short) 0xA55A;
+    if (*buf != 0xA55A)
+	return 1;
+    *buf = v;
+
+    switch (adp->va_type) {
+
+    case KD_EGA:
+	outb(adp->va_crtc_addr, 7);
+	if (inb(adp->va_crtc_addr) == 7) {
+	    adp->va_type = KD_VGA;
+	    adp->va_flags |= V_ADP_STATESAVE | V_ADP_PALETTE;
+	}
+	adp->va_flags |= V_ADP_STATELOAD | V_ADP_FONT | V_ADP_BORDER;
+	/* the color adapter may be in the 40x25 mode... XXX */
+
+	/* get the BIOS video mode pointer */
+	p = *(u_int32_t *)BIOS_PADDRTOVADDR(0x4a8);
+	p = BIOS_SADDRTOLADDR(p);
+	if (ISMAPPED(p, sizeof(u_int32_t))) {
+	    p = *(u_int32_t *)BIOS_PADDRTOVADDR(p);
+	    p = BIOS_SADDRTOLADDR(p);
+	    if (ISMAPPED(p, V_MODE_PARAM_SIZE))
+		video_mode_ptr = (u_char *)BIOS_PADDRTOVADDR(p);
+	}
+	break;
+
+    case KD_CGA:
+	adp->va_flags |= V_ADP_COLOR | V_ADP_BORDER;
+	/* may be in the 40x25 mode... XXX */
+	break;
+
+    case KD_MONO:
+	break;
+    }
+
+    return 0;
+}
+
+/* compare two parameter table entries */
+static int 
+comp_adpregs(u_char *buf1, u_char *buf2)
+{
+    static struct {
+        u_char mask;
+    } params[V_MODE_PARAM_SIZE] = {
+	0xff, 0x00, 0xff, 		/* COLS, ROWS, POINTS */
+	0x00, 0x00, 			/* page length */
+	0xfe, 0xff, 0xff, 0xff,		/* sequencer registers */
+	0xf3,				/* misc register */
+	0xff, 0xff, 0xff, 0x7f, 0xff,	/* CRTC */
+	0xff, 0xff, 0xff, 0x7f, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xff, 0x7f, 0xff, 0xff,
+	0x7f, 0xff, 0xff, 0xef, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff,	/* attribute controller registers */
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xf0,
+	0xff, 0xff, 0xff, 0xff, 0xff,	/* GDC register */
+	0xff, 0xff, 0xff, 0xff, 
+    }; 
+    int identical = TRUE;
+    int i;
+
+    if ((buf1 == NULL) || (buf2 == NULL))
+	return COMP_DIFFERENT;
+
+    for (i = 0; i < sizeof(params)/sizeof(params[0]); ++i) {
+	if (params[i].mask == 0)	/* don't care */
+	    continue;
+	if ((buf1[i] & params[i].mask) != (buf2[i] & params[i].mask))
+	    return COMP_DIFFERENT;
+	if (buf1[i] != buf2[i])
+	    identical = FALSE;
+    }
+    return (identical) ? COMP_IDENTICAL : COMP_SIMILAR;
+}
+
+/* exported functions */
+
+/* all adapters */
+static int
+vid_init(void)
+{
+    video_adapter_t *adp;
+    video_info_t info;
+    u_char *mp;
+    int i;
+
+    /* do this test only once */
+    if (init_done)
+	return adapters;
+    init_done = TRUE;
+
+    /* 
+     * Locate display adapters. 
+     * The AT architecture supports upto two adapters. `syscons' allows
+     * the following combinations of adapters: 
+     *     1) MDA + CGA
+     *     2) MDA + EGA/VGA color 
+     *     3) CGA + EGA/VGA mono
+     * Note that `syscons' doesn't bother with MCGA as it is only
+     * avaiable for low end PS/2 models which has 80286 or earlier CPUs,
+     * thus, they are not running FreeBSD!
+     * When there are two adapaters in the system, one becomes `primary'
+     * and the other `secondary'. The EGA adapter has a set of DIP 
+     * switches on board for this information and the EGA BIOS copies 
+     * it in the BIOS data area BIOSDATA_VIDEOSWITCH (40:88). 
+     * The VGA BIOS has more sophisticated mechanism and has this 
+     * information in BIOSDATA_DCCINDEX (40:8a), but it also maintains 
+     * compatibility with the EGA BIOS by updating BIOSDATA_VIDEOSWITCH.
+     */
+
+    /* check rtc and BIOS date area */
+    /* 
+     * XXX: don't use BIOSDATA_EQUIPMENT, it is not a dead copy
+     * of RTC_EQUIPMENT. The bit 4 and 5 of the ETC_EQUIPMENT are
+     * zeros for EGA and VGA. However, the EGA/VGA BIOS will set 
+     * these bits in BIOSDATA_EQUIPMENT according to the monitor
+     * type detected.
+     */
+    switch ((rtcin(RTC_EQUIPMENT) >> 4) & 3) {	/* bit 4 and 5 */
+    case 0:
+	/* EGA/VGA */
+	fill_adapter_param(*(u_int8_t *)BIOS_PADDRTOVADDR(0x488) & 0x0f, 
+			   adapter);
+	break;
+    case 1:
+	/* CGA 40x25 */
+	/* FIXME: switch to the 80x25 mode? XXX */
+	adapter[V_ADP_PRIMARY] = adapter_init_value[DCC_CGA40];
+	adapter[V_ADP_SECONDARY] = adapter_init_value[DCC_MONO];
+	break;
+    case 2:
+	/* CGA 80x25 */
+	adapter[V_ADP_PRIMARY] = adapter_init_value[DCC_CGA80];
+	adapter[V_ADP_SECONDARY] = adapter_init_value[DCC_MONO];
+	break;
+    case 3:
+	/* MDA */
+	adapter[V_ADP_PRIMARY] = adapter_init_value[DCC_MONO];
+	adapter[V_ADP_SECONDARY] = adapter_init_value[DCC_CGA80];
+	break;
+    }
+
+    adapters = 0;
+    if (verify_adapter(&adapter[V_ADP_SECONDARY]) == 0) {
+	++adapters;
+	adapter[V_ADP_SECONDARY].va_mode = 
+	    adapter[V_ADP_SECONDARY].va_initial_mode =
+	    map_bios_mode_num(adapter[V_ADP_SECONDARY].va_type, 
+			      adapter[V_ADP_SECONDARY].va_flags & V_ADP_COLOR,
+			      adapter[V_ADP_SECONDARY].va_initial_bios_mode);
+    } else {
+	adapter[V_ADP_SECONDARY].va_type = -1;
+    }
+    if (verify_adapter(&adapter[V_ADP_PRIMARY]) == 0) {
+	++adapters;
+	adapter[V_ADP_PRIMARY].va_initial_bios_mode = 
+	    *(u_int8_t *)BIOS_PADDRTOVADDR(0x449);
+	adapter[V_ADP_PRIMARY].va_mode = 
+	    adapter[V_ADP_PRIMARY].va_initial_mode =
+	    map_bios_mode_num(adapter[V_ADP_PRIMARY].va_type, 
+			      adapter[V_ADP_PRIMARY].va_flags & V_ADP_COLOR,
+			      adapter[V_ADP_PRIMARY].va_initial_bios_mode);
+    } else {
+	adapter[V_ADP_PRIMARY] = adapter[V_ADP_SECONDARY];
+	adapter[V_ADP_SECONDARY].va_type = -1;
+    }
+    if (adapters == 0)
+	return adapters;
+    adapter[V_ADP_PRIMARY].va_index = V_ADP_PRIMARY;
+    adapter[V_ADP_SECONDARY].va_index = V_ADP_SECONDARY;
+
+#if 0
+    /*
+     * We cannot have two video adapter of the same type; there must be
+     * only one of color or mono adapter, or one each of them.
+     */
+    if (adapters > 1) {
+	if (!((adapter[0].va_flags ^ adapter[1].va_flags) & V_ADP_COLOR))
+	    /* we have two mono or color adapters!! */
+	    return (adapters = 0);
+    }
+#endif
+
+    /*
+     * Ensure a zero start address.  This is mainly to recover after
+     * switching from pcvt using userconfig().  The registers are w/o
+     * for old hardware so it's too hard to relocate the active screen
+     * memory.
+     * This must be done before vid_save_state() for VGA.
+     */
+    outb(adapter[V_ADP_PRIMARY].va_crtc_addr, 12);
+    outb(adapter[V_ADP_PRIMARY].va_crtc_addr + 1, 0);
+    outb(adapter[V_ADP_PRIMARY].va_crtc_addr, 13);
+    outb(adapter[V_ADP_PRIMARY].va_crtc_addr + 1, 0);
+
+    /* the video mode parameter table in EGA/VGA BIOS */
+    /* NOTE: there can be only one EGA/VGA, wheather color or mono,
+     * recognized by the video BIOS.
+     */
+    if ((adapter[V_ADP_PRIMARY].va_type == KD_EGA) ||
+	(adapter[V_ADP_PRIMARY].va_type == KD_VGA)) {
+	adp = &adapter[V_ADP_PRIMARY];
+    } else if ((adapter[V_ADP_SECONDARY].va_type == KD_EGA) ||
+	       (adapter[V_ADP_SECONDARY].va_type == KD_VGA)) {
+	adp = &adapter[V_ADP_SECONDARY];
+    } else {
+	adp = NULL;
+    }
+    bzero(mode_map, sizeof(mode_map));
+    if (adp != NULL) {
+	if (adp->va_type == KD_VGA) {
+	    vid_save_state(adp - adapter, &adpstate, sizeof(adpstate));
+	    if (video_mode_ptr == NULL) {
+		mode_map[map_mode_num(adp->va_initial_mode)] = adpstate.regs;
+		rows_offset = 1;
+	    } else {
+		/* discard the table if we are not familiar with it... */
+		map_mode_table(mode_map, video_mode_ptr, M_VGA_CG320 + 1);
+		mp = get_mode_param(adp->va_initial_mode);
+		if (mp != NULL)
+		    bcopy(mp, adpstate2.regs, sizeof(adpstate2.regs));
+		switch (comp_adpregs(adpstate.regs, mp)) {
+		case COMP_IDENTICAL:
+		    /*
+		     * OK, this parameter table looks reasonably familiar
+		     * to us...
+		     */
+		    /* 
+		     * This is a kludge for Toshiba DynaBook SS433 
+		     * whose BIOS video mode table entry has the actual # 
+		     * of rows at the offset 1; BIOSes from other 
+		     * manufacturers store the # of rows - 1 there. XXX
+		     */
+		    rows_offset = adpstate.regs[1] + 1 - mp[1];
+		    break;
+
+		case COMP_SIMILAR:
+		    /*
+		     * Not exactly the same, but similar enough to be
+		     * trusted. However, use the saved register values
+		     * for the initial mode and other modes which are
+		     * based on the initial mode.
+		     */
+		    mode_map[map_mode_num(adp->va_initial_mode)] = 
+			adpstate.regs;
+		    rows_offset = adpstate.regs[1] + 1 - mp[1];
+		    adpstate.regs[1] -= rows_offset - 1;
+		    break;
+
+		case COMP_DIFFERENT:
+		default:
+		    /*
+		     * Don't use the paramter table in BIOS. It doesn't
+		     * look familiar to us. Video mode switching is allowed
+		     * only if the new mode is the same as or based on
+		     * the initial mode. 
+		     */
+		    video_mode_ptr = NULL;
+		    bzero(mode_map, sizeof(mode_map));
+		    mode_map[map_mode_num(adp->va_initial_mode)] = 
+			adpstate.regs;
+		    rows_offset = 1;
+		    break;
+		}
+	    }
+	    adp->va_flags |= V_ADP_MODECHANGE;
+	} else if (adp->va_type == KD_EGA) {
+	    if (video_mode_ptr == NULL) {
+		adp->va_flags &= ~V_ADP_FONT;
+		rows_offset = 1;
+	    } else {
+		map_mode_table(mode_map, video_mode_ptr, M_ENH_C80x25 + 1);
+		/* XXX how can one validate the EGA table... */
+		mp = get_mode_param(adp->va_initial_mode);
+		if (mp != NULL) {
+		    adp->va_flags |= V_ADP_MODECHANGE;
+		    rows_offset = 1;
+		} else {
+		    /*
+		     * This is serious. We will not be able to switch video
+		     * modes at all...
+		     */
+		    adp->va_flags &= ~V_ADP_FONT;
+		    video_mode_ptr = NULL;
+		    bzero(mode_map, sizeof(mode_map));
+		    rows_offset = 1;
+                }
+	    }
+	}
+    }
+
+    /* remove conflicting modes if we have more than one adapter */
+    if (adapters > 1) {
+	for (i = 0; i < adapters; ++i) {
+	    if (!(adapter[i].va_flags & V_ADP_MODECHANGE))
+		continue;
+	    clear_mode_map(i, mode_map, M_VGA_CG320 + 1,
+			   (adapter[i].va_flags & V_ADP_COLOR) ? 
+			       V_INFO_COLOR : 0);
+	}
+    }
+
+    /* buffer address */
+    vid_get_info(V_ADP_PRIMARY, 
+		 adapter[V_ADP_PRIMARY].va_initial_mode, &info);
+    adapter[V_ADP_PRIMARY].va_window = BIOS_PADDRTOVADDR(info.vi_window);
+    adapter[V_ADP_PRIMARY].va_window_size = info.vi_window_size;
+    adapter[V_ADP_PRIMARY].va_window_gran = info.vi_window_gran;
+    adapter[V_ADP_PRIMARY].va_buffer = BIOS_PADDRTOVADDR(info.vi_buffer);
+    adapter[V_ADP_PRIMARY].va_buffer_size = info.vi_buffer_size;
+    if (adapters > 1) {
+	vid_get_info(V_ADP_SECONDARY, 
+		     adapter[V_ADP_SECONDARY].va_initial_mode, &info);
+	adapter[V_ADP_SECONDARY].va_window = BIOS_PADDRTOVADDR(info.vi_window);
+	adapter[V_ADP_SECONDARY].va_window_size = info.vi_window_size;
+	adapter[V_ADP_SECONDARY].va_window_gran = info.vi_window_gran;
+	adapter[V_ADP_SECONDARY].va_buffer = BIOS_PADDRTOVADDR(info.vi_buffer);
+	adapter[V_ADP_SECONDARY].va_buffer_size = info.vi_buffer_size;
+    }
+
+    /*
+     * XXX: we should verify the following values for the primary adapter...
+     * crtc I/O port address: *(u_int16_t *)BIOS_PADDRTOVADDR(0x463);
+     * color/mono display: (*(u_int8_t *)BIOS_PADDRTOVADDR(0x487) & 0x02) 
+     *                     ? 0 : V_ADP_COLOR;
+     * columns: *(u_int8_t *)BIOS_PADDRTOVADDR(0x44a);
+     * rows: *(u_int8_t *)BIOS_PADDRTOVADDR(0x484);
+     * font size: *(u_int8_t *)BIOS_PADDRTOVADDR(0x485);
+     * buffer size: *(u_int16_t *)BIOS_PADDRTOVADDR(0x44c);
+     */
+
+    return adapters;
+}
+
+/* all adapters */
+static video_adapter_t
+*vid_adapter(int ad)
+{
+    if (!init_done)
+	return NULL;
+    if ((ad < 0) || (ad >= adapters))
+	return NULL;
+    return &adapter[ad];
+}
+
+/* all adapters */
+static int
+vid_get_info(int ad, int mode, video_info_t *info)
+{
+    int i;
+
+    if (!init_done)
+	return 1;
+    if ((ad < 0) || (ad >= adapters))
+	return 1;
+
+    if (adapter[ad].va_flags & V_ADP_MODECHANGE) {
+	/*
+	 * If the parameter table entry for this mode is not found, 
+	 * the mode is not supported...
+	 */
+	if (get_mode_param(mode) == NULL)
+	    return 1;
+    } else {
+	/* 
+	 * Even if we don't support video mode switching on this adapter,
+	 * the information on the initial (thus current) video mode 
+	 * should be made available.
+	 */
+	if (mode != adapter[ad].va_initial_mode)
+	    return 1;
+    }
+
+    for (i = 0; bios_vmode[i].vi_mode != EOT; ++i) {
+	if (bios_vmode[i].vi_mode == NA)
+	    continue;
+	if (mode == bios_vmode[i].vi_mode) {
+	    *info = bios_vmode[i];
+	    return 0;
+	}
+    }
+    return 1;
+}
+
+/* all adapters */
+static int
+vid_query_mode(int ad, video_info_t *info)
+{
+    video_info_t buf;
+    int i;
+
+    if (!init_done)
+	return -1;
+    if ((ad < 0) || (ad >= adapters))
+	return -1;
+
+    for (i = 0; bios_vmode[i].vi_mode != EOT; ++i) {
+	if (bios_vmode[i].vi_mode == NA)
+	    continue;
+
+	if ((info->vi_width != 0)
+	    && (info->vi_width != bios_vmode[i].vi_width))
+		continue;
+	if ((info->vi_height != 0)
+	    && (info->vi_height != bios_vmode[i].vi_height))
+		continue;
+	if ((info->vi_cwidth != 0)
+	    && (info->vi_cwidth != bios_vmode[i].vi_cwidth))
+		continue;
+	if ((info->vi_cheight != 0)
+	    && (info->vi_cheight != bios_vmode[i].vi_cheight))
+		continue;
+	if ((info->vi_depth != 0)
+	    && (info->vi_depth != bios_vmode[i].vi_depth))
+		continue;
+	if ((info->vi_planes != 0)
+	    && (info->vi_planes != bios_vmode[i].vi_planes))
+		continue;
+	/* XXX: should check pixel format, memory model */
+	if ((info->vi_flags != 0)
+	    && (info->vi_flags != bios_vmode[i].vi_flags))
+		continue;
+
+	/* verify if this mode is supported on this adapter */
+	if (vid_get_info(ad, bios_vmode[i].vi_mode, &buf))
+		continue;
+	return bios_vmode[i].vi_mode;
+    }
+    return -1;
+}
+
+/* EGA/VGA */
+static int
+vid_set_mode(int ad, int mode)
+{
+    video_info_t info;
+    adp_state_t params;
+
+    prologue(ad, V_ADP_MODECHANGE, 1);
+
+    if (vid_get_info(ad, mode, &info))
+	return 1;
+    params.sig = V_STATE_SIG;
+    bcopy(get_mode_param(mode), params.regs, sizeof(params.regs));
+
+    switch (mode) {
+    case M_VGA_C80x60: case M_VGA_M80x60:
+	params.regs[2]  = 0x08;
+	params.regs[19] = 0x47;
+	goto special_480l;
+
+    case M_VGA_C80x30: case M_VGA_M80x30:
+	params.regs[19] = 0x4f;
+special_480l:
+	params.regs[9] |= 0xc0;
+	params.regs[16] = 0x08;
+	params.regs[17] = 0x3e;
+	params.regs[26] = 0xea;
+	params.regs[28] = 0xdf;
+	params.regs[31] = 0xe7;
+	params.regs[32] = 0x04;
+	goto setup_mode;
+
+    case M_ENH_C80x43: case M_ENH_B80x43:
+	params.regs[28] = 87;
+	goto special_80x50;
+
+    case M_VGA_C80x50: case M_VGA_M80x50:
+special_80x50:
+	params.regs[2] = 8;
+	params.regs[19] = 7;
+	goto setup_mode;
+
+    case M_VGA_C40x25: case M_VGA_C80x25:
+    case M_VGA_M80x25:
+    case M_B40x25:     case M_C40x25:
+    case M_B80x25:     case M_C80x25:
+    case M_ENH_B40x25: case M_ENH_C40x25:
+    case M_ENH_B80x25: case M_ENH_C80x25:
+    case M_EGAMONO80x25:
+
+setup_mode:
+	vid_load_state(ad, &params);
+	break;
+
+    case M_VGA_MODEX:
+	/* "unchain" the VGA mode */
+	params.regs[5-1+0x04] &= 0xf7;
+	params.regs[5-1+0x04] |= 0x04;
+	/* turn off doubleword mode */
+	params.regs[10+0x14] &= 0xbf;
+	/* turn off word adressing */
+	params.regs[10+0x17] |= 0x40;
+	/* set logical screen width */
+	params.regs[10+0x13] = 80;
+	/* set 240 lines */
+	params.regs[10+0x11] = 0x2c;
+	params.regs[10+0x06] = 0x0d;
+	params.regs[10+0x07] = 0x3e;
+	params.regs[10+0x10] = 0xea;
+	params.regs[10+0x11] = 0xac;
+	params.regs[10+0x12] = 0xdf;
+	params.regs[10+0x15] = 0xe7;
+	params.regs[10+0x16] = 0x06;
+	/* set vertical sync polarity to reflect aspect ratio */
+	params.regs[9] = 0xe3;
+	goto setup_grmode;
+
+    case M_BG320:     case M_CG320:     case M_BG640:
+    case M_CG320_D:   case M_CG640_E:
+    case M_CG640x350: case M_ENH_CG640:
+    case M_BG640x480: case M_CG640x480: case M_VGA_CG320:
+
+setup_grmode:
+	vid_load_state(ad, &params);
+	break;
+
+    default:
+	return 1;
+    }
+
+    adapter[ad].va_mode = mode;
+    adapter[ad].va_flags &= ~V_ADP_COLOR;
+    adapter[ad].va_flags |= 
+	(info.vi_flags & V_INFO_COLOR) ? V_ADP_COLOR : 0;
+    adapter[ad].va_crtc_addr =
+	(adapter[ad].va_flags & V_ADP_COLOR) ? COLOR_BASE : MONO_BASE;
+    adapter[ad].va_window = BIOS_PADDRTOVADDR(info.vi_window);
+    adapter[ad].va_window_size = info.vi_window_size;
+    adapter[ad].va_window_gran = info.vi_window_gran;
+    if (info.vi_buffer_size == 0) {
+    	adapter[ad].va_buffer = 0;
+    	adapter[ad].va_buffer_size = 0;
+    } else {
+    	adapter[ad].va_buffer = BIOS_PADDRTOVADDR(info.vi_buffer);
+    	adapter[ad].va_buffer_size = info.vi_buffer_size;
+    }
+
+    return 0;
+}
+
+static void
+set_font_mode(video_adapter_t *adp, u_char *buf)
+{
+    u_char *mp;
+    int s;
+
+    s = splhigh();
+
+    /* save register values */
+    if (adp->va_type == KD_VGA) {
+	outb(TSIDX, 0x02); buf[0] = inb(TSREG);
+	outb(TSIDX, 0x04); buf[1] = inb(TSREG);
+	outb(GDCIDX, 0x04); buf[2] = inb(GDCREG);
+	outb(GDCIDX, 0x05); buf[3] = inb(GDCREG);
+	outb(GDCIDX, 0x06); buf[4] = inb(GDCREG);
+	inb(adp->va_crtc_addr + 6);
+	outb(ATC, 0x10); buf[5] = inb(ATC + 1);
+    } else /* if (adp->va_type == KD_EGA) */ {
+	/* 
+	 * EGA cannot be read; copy parameters from the mode parameter 
+	 * table. 
+	 */
+	mp = get_mode_param(adp->va_mode);
+	buf[0] = mp[5 + 0x02 - 1];
+	buf[1] = mp[5 + 0x04 - 1];
+	buf[2] = mp[55 + 0x04];
+	buf[3] = mp[55 + 0x05];
+	buf[4] = mp[55 + 0x06];
+	buf[5] = mp[35 + 0x10];
+    }
+
+    /* setup vga for loading fonts */
+    inb(adp->va_crtc_addr + 6);			/* reset flip-flop */
+    outb(ATC, 0x10); outb(ATC, buf[5] & ~0x01);
+    inb(adp->va_crtc_addr + 6);			/* reset flip-flop */
+    outb(ATC, 0x20);				/* enable palette */
+
+#if SLOW_VGA
+#ifndef SC_BAD_FLICKER
+    outb(TSIDX, 0x00); outb(TSREG, 0x01);
+#endif
+    outb(TSIDX, 0x02); outb(TSREG, 0x04);
+    outb(TSIDX, 0x04); outb(TSREG, 0x07);
+#ifndef SC_BAD_FLICKER
+    outb(TSIDX, 0x00); outb(TSREG, 0x03);
+#endif
+    outb(GDCIDX, 0x04); outb(GDCREG, 0x02);
+    outb(GDCIDX, 0x05); outb(GDCREG, 0x00);
+    outb(GDCIDX, 0x06); outb(GDCREG, 0x04);
+#else
+#ifndef SC_BAD_FLICKER
+    outw(TSIDX, 0x0100);
+#endif
+    outw(TSIDX, 0x0402);
+    outw(TSIDX, 0x0704);
+#ifndef SC_BAD_FLICKER
+    outw(TSIDX, 0x0300);
+#endif
+    outw(GDCIDX, 0x0204);
+    outw(GDCIDX, 0x0005);
+    outw(GDCIDX, 0x0406);               /* addr = a0000, 64kb */
+#endif
+
+    splx(s);
+}
+
+static void
+set_normal_mode(video_adapter_t *adp, u_char *buf)
+{
+    int s;
+
+    s = splhigh();
+
+    /* setup vga for normal operation mode again */
+    inb(adp->va_crtc_addr + 6);			/* reset flip-flop */
+    outb(ATC, 0x10); outb(ATC, buf[5]);
+    inb(adp->va_crtc_addr + 6);			/* reset flip-flop */
+    outb(ATC, 0x20);				/* enable palette */
+
+#if SLOW_VGA
+#ifndef SC_BAD_FLICKER
+    outb(TSIDX, 0x00); outb(TSREG, 0x01);
+#endif
+    outb(TSIDX, 0x02); outb(TSREG, buf[0]);
+    outb(TSIDX, 0x04); outb(TSREG, buf[1]);
+#ifndef SC_BAD_FLICKER
+    outb(TSIDX, 0x00); outb(TSREG, 0x03);
+#endif
+    outb(GDCIDX, 0x04); outb(GDCREG, buf[2]);
+    outb(GDCIDX, 0x05); outb(GDCREG, buf[3]);
+    if (adp->va_crtc_addr == MONO_BASE) {
+	outb(GDCIDX, 0x06); outb(GDCREG,(buf[4] & 0x03) | 0x08);
+    } else {
+	outb(GDCIDX, 0x06); outb(GDCREG,(buf[4] & 0x03) | 0x0c);
+    }
+#else
+#ifndef SC_BAD_FLICKER
+    outw(TSIDX, 0x0100);
+#endif
+    outw(TSIDX, 0x0002 | (buf[0] << 8));
+    outw(TSIDX, 0x0004 | (buf[1] << 8));
+#ifndef SC_BAD_FLICKER
+    outw(TSIDX, 0x0300);
+#endif
+    outw(GDCIDX, 0x0004 | (buf[2] << 8));
+    outw(GDCIDX, 0x0005 | (buf[3] << 8));
+    if (adp->va_crtc_addr == MONO_BASE)
+        outw(GDCIDX, 0x0006 | (((buf[4] & 0x03) | 0x08)<<8));
+    else
+        outw(GDCIDX, 0x0006 | (((buf[4] & 0x03) | 0x0c)<<8));
+#endif
+
+    splx(s);
+}
+
+/* EGA/VGA */
+static int
+vid_save_font(int ad, int page, int fontsize, u_char *data, int ch, int count)
+{
+    u_char buf[PARAM_BUFSIZE];
+    u_char val = 0;
+    u_int32_t segment;
+    int c;
+    int s;
+
+    prologue(ad, V_ADP_FONT, 1);
+
+    if (fontsize < 14) {
+	/* FONT_8 */
+	fontsize = 8;
+    } else if (fontsize >= 32) {
+	fontsize = 32;
+    } else if (fontsize >= 16) {
+	/* FONT_16 */
+	fontsize = 16;
+    } else {
+	/* FONT_14 */
+	fontsize = 14;
+    }
+
+    if (page < 0 || page >= 8)
+	return 1;
+    segment = VIDEOMEM + 0x4000*page;
+    if (page > 3)
+	segment -= 0xe000;
+
+    if (adapter[ad].va_type == KD_VGA) {	/* what about EGA? XXX */
+	s = splhigh();
+	outb(TSIDX, 0x00); outb(TSREG, 0x01);
+	outb(TSIDX, 0x01); val = inb(TSREG);	/* disable screen */
+	outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
+	outb(TSIDX, 0x00); outb(TSREG, 0x03);
+	splx(s);
+    }
+
+    set_font_mode(&adapter[ad], buf);
+    if (fontsize == 32) {
+	generic_bcopy((void *)BIOS_PADDRTOVADDR(segment + ch*32), data, 
+		      fontsize*count);
+    } else {
+	for (c = ch; count > 0; ++c, --count) {
+	    generic_bcopy((void *)BIOS_PADDRTOVADDR(segment + c*32), data, 
+			  fontsize);
+	    data += fontsize;
+	}
+    }
+    set_normal_mode(&adapter[ad], buf);
+
+    if (adapter[ad].va_type == KD_VGA) {
+	s = splhigh();
+	outb(TSIDX, 0x00); outb(TSREG, 0x01);
+	outb(TSIDX, 0x01); outb(TSREG, val & 0xdf);	/* enable screen */
+	outb(TSIDX, 0x00); outb(TSREG, 0x03);
+	splx(s);
+    }
+
+    return 0;
+}
+
+/* EGA/VGA */
+static int
+vid_load_font(int ad, int page, int fontsize, u_char *data, int ch, int count)
+{
+    u_char buf[PARAM_BUFSIZE];
+    u_char val = 0;
+    u_int32_t segment;
+    int c;
+    int s;
+
+    prologue(ad, V_ADP_FONT, 1);
+
+    if (fontsize < 14) {
+	/* FONT_8 */
+	fontsize = 8;
+    } else if (fontsize >= 32) {
+	fontsize = 32;
+    } else if (fontsize >= 16) {
+	/* FONT_16 */
+	fontsize = 16;
+    } else {
+	/* FONT_14 */
+	fontsize = 14;
+    }
+
+    if (page < 0 || page >= 8)
+	return 1;
+    segment = VIDEOMEM + 0x4000*page;
+    if (page > 3)
+	segment -= 0xe000;
+
+    if (adapter[ad].va_type == KD_VGA) {	/* what about EGA? XXX */
+	s = splhigh();
+	outb(TSIDX, 0x00); outb(TSREG, 0x01);
+	outb(TSIDX, 0x01); val = inb(TSREG);	/* disable screen */
+	outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
+	outb(TSIDX, 0x00); outb(TSREG, 0x03);
+	splx(s);
+    }
+
+    set_font_mode(&adapter[ad], buf);
+    if (fontsize == 32) {
+	generic_bcopy(data, (void *)BIOS_PADDRTOVADDR(segment + ch*32),
+		      fontsize*count);
+    } else {
+	for (c = ch; count > 0; ++c, --count) {
+	    generic_bcopy(data, (void *)BIOS_PADDRTOVADDR(segment + c*32), 
+			  fontsize);
+	    data += fontsize;
+	}
+    }
+    set_normal_mode(&adapter[ad], buf);
+
+    if (adapter[ad].va_type == KD_VGA) {
+	s = splhigh();
+	outb(TSIDX, 0x00); outb(TSREG, 0x01);
+	outb(TSIDX, 0x01); outb(TSREG, val & 0xdf);	/* enable screen */
+	outb(TSIDX, 0x00); outb(TSREG, 0x03);
+	splx(s);
+    }
+
+    return 0;
+}
+
+/* EGA/VGA */
+static int
+vid_show_font(int ad, int page)
+{
+    static u_char cg[] = { 0x00, 0x05, 0x0a, 0x0f, 0x30, 0x35, 0x3a, 0x3f };
+    int s;
+
+    prologue(ad, V_ADP_FONT, 1);
+    if (page < 0 || page >= 8)
+	return 1;
+
+    s = splhigh();
+    outb(TSIDX, 0x03); outb(TSREG, cg[page]);
+    splx(s);
+
+    return 0;
+}
+
+/* VGA */
+static int
+vid_save_palette(int ad, u_char *palette)
+{
+    int i;
+
+    prologue(ad, V_ADP_PALETTE, 1);
+
+    /* 
+     * We store 8 bit values in the palette buffer, while the standard
+     * VGA has 6 bit DAC .
+     */
+    outb(PALRADR, 0x00);
+    for (i = 0; i < 256*3; ++i)
+	palette[i] = inb(PALDATA) << 2; 
+    inb(adapter[ad].va_crtc_addr + 6);	/* reset flip/flop */
+    return 0;
+}
+
+/* VGA */
+static int
+vid_load_palette(int ad, u_char *palette)
+{
+    int i;
+
+    prologue(ad, V_ADP_PALETTE, 1);
+
+    outb(PIXMASK, 0xff);		/* no pixelmask */
+    outb(PALWADR, 0x00);
+    for (i = 0; i < 256*3; ++i)
+	outb(PALDATA, palette[i] >> 2);
+    inb(adapter[ad].va_crtc_addr + 6);	/* reset flip/flop */
+    outb(ATC, 0x20);			/* enable palette */
+    return 0;
+}
+
+/* CGA/EGA/VGA */
+static int
+vid_set_border(int ad, int color)
+{
+    prologue(ad, V_ADP_BORDER, 1);
+
+    switch (adapter[ad].va_type) {
+    case KD_EGA:
+    case KD_VGA:    
+	inb(adapter[ad].va_crtc_addr + 6);	/* reset flip-flop */
+	outb(ATC, 0x31); outb(ATC, color & 0xff); 
+	break;  
+    case KD_CGA:    
+	outb(adapter[ad].va_crtc_addr + 5, color & 0x0f); /* color select register */
+	break;  
+    case KD_MONO:   
+    case KD_HERCULES:
+    default:
+	break;  
+    }
+    return 0;
+}
+
+/* VGA */
+static int
+vid_save_state(int ad, void *p, size_t size)
+{
+    video_info_t info;
+    u_char *buf;
+    int crtc_addr;
+    int i, j;
+    int s;
+
+    if (size == 0) {
+	/* return the required buffer size */
+	prologue(ad, V_ADP_STATESAVE, 0);
+	return sizeof(adp_state_t);
+    } else {
+	prologue(ad, V_ADP_STATESAVE, 1);
+	if (size < sizeof(adp_state_t))
+	    return 1;
+    }
+
+    ((adp_state_t *)p)->sig = V_STATE_SIG;
+    buf = ((adp_state_t *)p)->regs;
+    bzero(buf, V_MODE_PARAM_SIZE);
+    crtc_addr = adapter[ad].va_crtc_addr;
+
+    s = splhigh();
+
+    outb(TSIDX, 0x00); outb(TSREG, 0x01);	/* stop sequencer */
+    for (i = 0, j = 5; i < 4; i++) {           
+	outb(TSIDX, i + 1);
+	buf[j++]  =  inb(TSREG);
+    }
+    buf[9]  =  inb(MISC + 10);			/* dot-clock */
+    outb(TSIDX, 0x00); outb(TSREG, 0x03);	/* start sequencer */
+
+    for (i = 0, j = 10; i < 25; i++) {		/* crtc */
+	outb(crtc_addr, i);
+	buf[j++]  =  inb(crtc_addr + 1);
+    }
+    for (i = 0, j = 35; i < 20; i++) {		/* attribute ctrl */
+        inb(crtc_addr + 6);			/* reset flip-flop */
+	outb(ATC, i);
+	buf[j++]  =  inb(ATC + 1);
+    }
+    for (i = 0, j = 55; i < 9; i++) {		/* graph data ctrl */
+	outb(GDCIDX, i);
+	buf[j++]  =  inb(GDCREG);
+    }
+    inb(crtc_addr + 6);				/* reset flip-flop */
+    outb(ATC, 0x20);				/* enable palette */
+
+    splx(s);
+
+#if 1
+    if (vid_get_info(ad, adapter[ad].va_mode, &info) == 0) {
+	if (info.vi_flags & V_INFO_GRAPHICS) {
+	    buf[0] = info.vi_width/info.vi_cwidth; /* COLS */
+	    buf[1] = info.vi_height/info.vi_cheight - 1; /* ROWS */
+	} else {
+	    buf[0] = info.vi_width;		/* COLS */
+	    buf[1] = info.vi_height - 1;	/* ROWS */
+	}
+	buf[2] = info.vi_cheight;		/* POINTS */
+    } else {
+	/* XXX: shouldn't be happening... */
+	printf("video#%d: failed to obtain mode info. (vid_save_state())\n",
+	       ad);
+    }
+#else
+    buf[0] = *(u_int8_t *)BIOS_PADDRTOVADDR(0x44a);	/* COLS */
+    buf[1] = *(u_int8_t *)BIOS_PADDRTOVADDR(0x484);	/* ROWS */
+    buf[2] = *(u_int8_t *)BIOS_PADDRTOVADDR(0x485);	/* POINTS */
+    buf[3] = *(u_int8_t *)BIOS_PADDRTOVADDR(0x44c);
+    buf[4] = *(u_int8_t *)BIOS_PADDRTOVADDR(0x44d);
+#endif
+
+    return 0;
+}
+
+/* EGA/VGA */
+static int
+vid_load_state(int ad, void *p)
+{
+    u_char *buf;
+    int crtc_addr;
+    int s;
+    int i;
+
+    prologue(ad, V_ADP_STATELOAD, 1);
+    if (((adp_state_t *)p)->sig != V_STATE_SIG)
+	return 1;
+
+    buf = ((adp_state_t *)p)->regs;
+    crtc_addr = adapter[ad].va_crtc_addr;
+
+    s = splhigh();
+
+    outb(TSIDX, 0x00); outb(TSREG, 0x01);	/* stop sequencer */
+    for (i = 0; i < 4; ++i) {			/* program sequencer */
+	outb(TSIDX, i + 1);
+	outb(TSREG, buf[i + 5]);
+    }
+    outb(MISC, buf[9]);				/* set dot-clock */
+    outb(TSIDX, 0x00); outb(TSREG, 0x03);	/* start sequencer */
+    outb(crtc_addr, 0x11);
+    outb(crtc_addr + 1, inb(crtc_addr + 1) & 0x7F);
+    for (i = 0; i < 25; ++i) {			/* program crtc */
+	outb(crtc_addr, i);
+	outb(crtc_addr + 1, buf[i + 10]);
+    }
+    inb(crtc_addr+6);				/* reset flip-flop */
+    for (i = 0; i < 20; ++i) {			/* program attribute ctrl */
+	outb(ATC, i);
+	outb(ATC, buf[i + 35]);
+    }
+    for (i = 0; i < 9; ++i) {			/* program graph data ctrl */
+	outb(GDCIDX, i);
+	outb(GDCREG, buf[i + 55]);
+    }
+    inb(crtc_addr + 6);				/* reset flip-flop */
+    outb(ATC, 0x20);				/* enable palette */
+
+    if (ad == V_ADP_PRIMARY) {
+	*(u_int8_t *)BIOS_PADDRTOVADDR(0x44a) = buf[0];	/* COLS */
+	*(u_int8_t *)BIOS_PADDRTOVADDR(0x484) = buf[1] + rows_offset - 1; /* ROWS */
+	*(u_int8_t *)BIOS_PADDRTOVADDR(0x485) = buf[2];	/* POINTS */
+#if 0
+	*(u_int8_t *)BIOS_PADDRTOVADDR(0x44c) = buf[3];
+	*(u_int8_t *)BIOS_PADDRTOVADDR(0x44d) = buf[4];
+#endif
+    }
+
+    splx(s);
+    return 0;
+}
+
+/* all */
+static int
+vid_set_origin(int ad, off_t offset)
+{
+    /* 
+     * The standard video modes do not require window mapping; 
+     * always return error.
+     */
+    return 1;
+}
+
+/* all */
+static int
+vid_read_hw_cursor(int ad, int *col, int *row)
+{
+    video_info_t info;
+    u_int16_t off;
+
+    if (!init_done)
+	return 1;
+    if ((ad < 0) || (ad >= adapters))
+	return 1;
+
+    (*biosvidsw.get_info)(ad, adapter[ad].va_mode, &info);
+    if (info.vi_flags & V_INFO_GRAPHICS)
+	return 1;
+
+    outb(adapter[ad].va_crtc_addr, 14);
+    off = inb(adapter[ad].va_crtc_addr + 1);
+    outb(adapter[ad].va_crtc_addr, 15);
+    off = (off << 8) | inb(adapter[ad].va_crtc_addr + 1);
+
+    *row = off / info.vi_width;
+    *col = off % info.vi_width;
+
+    return 0;
+}
+
+/* all */
+static int
+vid_set_hw_cursor(int ad, int col, int row)
+{
+    video_info_t info;
+    u_int16_t off;
+
+    if (!init_done)
+	return 1;
+    if ((ad < 0) || (ad >= adapters))
+	return 1;
+
+    (*biosvidsw.get_info)(ad, adapter[ad].va_mode, &info);
+    if (info.vi_flags & V_INFO_GRAPHICS)
+	return 1;
+
+    if ((col == -1) || (row == -1))
+	off = 0xffff;
+    else
+	off = row*info.vi_width + col;
+    outb(adapter[ad].va_crtc_addr, 14);
+    outb(adapter[ad].va_crtc_addr + 1, off >> 8);
+    outb(adapter[ad].va_crtc_addr, 15);
+    outb(adapter[ad].va_crtc_addr + 1, off & 0x00ff);
+
+    return 0;
+}
+
+static char
+*adapter_name(int type)
+{
+    static struct {
+	int type;
+	char *name;
+    } names[] = {
+	{ KD_MONO,	"MDA" },
+	{ KD_HERCULES,	"Hercules" },
+	{ KD_CGA,	"CGA" },
+	{ KD_EGA,	"EGA" },
+	{ KD_VGA,	"VGA" },
+	{ KD_PC98,	"PC-98xx" },
+	{ -1,		"Unknown" },
+    };
+    int i;
+
+    for (i = 0; names[i].type != -1; ++i)
+	if (names[i].type == type)
+	    break;
+    return names[i].name;
+}
+
+static void
+dump_adp_info(int ad, video_adapter_t *adp, int level)
+{
+    if (level <= 0)
+	return;
+
+    printf("video#%d: adapter type:%s (%d), flags:0x%x, CRTC:0x%x\n", 
+	   ad, adapter_name(adp->va_type), adp->va_type, 
+	   adp->va_flags, adp->va_crtc_addr);
+    printf("video#%d: init mode:%d, bios mode:%d, current mode:%d\n",
+	   ad, adp->va_initial_mode, adp->va_initial_bios_mode, adp->va_mode);
+    printf("video#%d: window:0x%x size:%dk gran:%dk, buf:0x%x size:%dk\n",
+	   ad, 
+	   adp->va_window, adp->va_window_size, adp->va_window_gran,
+	   adp->va_buffer, adp->va_buffer_size);
+}
+
+static void
+dump_mode_info(int ad, video_info_t *info, int level)
+{
+    if (level <= 0)
+	return;
+
+    printf("video#%d: mode:%d, flags:0x%x ", 
+	   ad, info->vi_mode, info->vi_flags);
+    if (info->vi_flags & V_INFO_GRAPHICS)
+	printf("G %dx%dx%d, %d plane(s), font:%dx%d, ",
+	       info->vi_width, info->vi_height, 
+	       info->vi_depth, info->vi_planes, 
+	       info->vi_cwidth, info->vi_cheight); 
+    else
+	printf("T %dx%d, font:%dx%d, ",
+	       info->vi_width, info->vi_height, 
+	       info->vi_cwidth, info->vi_cheight); 
+    printf("win:0x%x\n", info->vi_window);
+}
+
+static void
+dump_buffer(u_char *buf, size_t len)
+{
+    int i;
+
+    for(i = 0; i < len;) {
+	printf("%02x ", buf[i]);
+	if ((++i % 16) == 0)
+	    printf("\n");
+    }
+}
+
+static int
+vid_diag(int level)
+{
+    video_info_t info;
+    u_char *mp;
+    int ad;
+    int i;
+
+    if (!init_done)
+	return 1;
+
+    if (level > 0) {
+	printf("video: RTC equip. code:0x%02x, DCC code:0x%02x\n",
+	       rtcin(RTC_EQUIPMENT), *(u_int8_t *)BIOS_PADDRTOVADDR(0x488));
+	printf("video: CRTC:0x%x, video option:0x%02x, ",
+	       *(u_int16_t *)BIOS_PADDRTOVADDR(0x463),
+	       *(u_int8_t *)BIOS_PADDRTOVADDR(0x487));
+	printf("rows:%d, cols:%d, font height:%d\n",
+	       *(u_int8_t *)BIOS_PADDRTOVADDR(0x44a),
+	       *(u_int8_t *)BIOS_PADDRTOVADDR(0x484) + 1,
+	       *(u_int8_t *)BIOS_PADDRTOVADDR(0x485));
+	printf("video: param table EGA/VGA:%p, CGA/MDA:%p\n", 
+	       video_mode_ptr, video_mode_ptr2);
+	printf("video: rows_offset:%d\n", rows_offset);
+    }
+
+    for (ad = 0; ad < adapters; ++ad) {
+	dump_adp_info(ad, &adapter[ad], level);
+
+	if (!(adapter[ad].va_flags & V_ADP_MODECHANGE)) {
+	    vid_get_info(ad, adapter[ad].va_initial_mode, &info);
+	    dump_mode_info(ad, &info, level);
+	} else {
+	    for (i = 0; bios_vmode[i].vi_mode != EOT; ++i) {
+		if (bios_vmode[i].vi_mode == NA)
+		    continue;
+		if (get_mode_param(bios_vmode[i].vi_mode) == NULL)
+		    continue;
+		dump_mode_info(ad, &bios_vmode[i], level);
+	    }
+	}
+	if ((adapter[ad].va_type != KD_EGA) && (adapter[ad].va_type != KD_VGA))
+	    continue;
+
+	if (video_mode_ptr == NULL)
+	    printf("video#%d: WARNING: video mode switching is not fully supported on this adapter\n", ad);
+
+	if (level <= 0)
+	    continue;
+
+	if (adapter[ad].va_type == KD_VGA) {
+	    printf("VGA parameters upon power-up\n");
+	    dump_buffer(adpstate.regs, sizeof(adpstate.regs));
+	    printf("VGA parameters in BIOS for mode %d\n", 
+		adapter[ad].va_initial_mode);
+	    dump_buffer(adpstate2.regs, sizeof(adpstate2.regs));
+	}
+
+	mp = get_mode_param(adapter[ad].va_initial_mode);
+	if (mp == NULL)	/* this shouldn't be happening */
+	    continue;
+	printf("EGA/VGA parameters to be used for mode %d\n", 
+	    adapter[ad].va_initial_mode);
+	dump_buffer(mp, V_MODE_PARAM_SIZE);
+    }
+
+    return 0;
+}
+
+#endif /* NSC > 0 */
diff --git a/sys/i386/isa/videoio.h b/sys/i386/isa/videoio.h
new file mode 100644
index 000000000000..74d17d0bf0ec
--- /dev/null
+++ b/sys/i386/isa/videoio.h
@@ -0,0 +1,107 @@
+/*-
+ * Copyright (c) 1998 Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote 
+ *    products derived from this software without specific prior written 
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id$
+ */
+
+#ifndef _I386_ISA_VIDEOIO_H_
+#define _I386_ISA_VIDEOIO_H_
+
+#ifdef KERNEL
+
+#define V_MAX_ADAPTERS		2
+
+#define V_MODE_MAP_SIZE		(M_VGA_CG320 + 1)
+#define V_MODE_PARAM_SIZE	64
+
+/* physical addresses */
+#define MONO_BUF		BIOS_PADDRTOVADDR(0xb0000)
+#define CGA_BUF			BIOS_PADDRTOVADDR(0xb8000)
+#define GRAPHICS_BUF		BIOS_PADDRTOVADDR(0xa0000)
+#define VIDEOMEM		0x000A0000
+
+/* I/O port addresses */
+#define MONO_BASE	0x3B4			/* crt controller base mono */
+#define COLOR_BASE	0x3D4			/* crt controller base color */
+#define MISC		0x3C2			/* misc output register */
+#define ATC		IO_VGA+0x00		/* attribute controller */
+#define TSIDX		IO_VGA+0x04		/* timing sequencer idx */
+#define TSREG		IO_VGA+0x05		/* timing sequencer data */
+#define PIXMASK		IO_VGA+0x06		/* pixel write mask */
+#define PALRADR		IO_VGA+0x07		/* palette read address */
+#define PALWADR		IO_VGA+0x08		/* palette write address */
+#define PALDATA		IO_VGA+0x09		/* palette data register */
+#define GDCIDX		IO_VGA+0x0E		/* graph data controller idx */
+#define GDCREG		IO_VGA+0x0F		/* graph data controller data */
+
+/* video function table */
+typedef int vi_init_t(void);
+typedef video_adapter_t *vi_adapter_t(int ad);
+typedef int vi_get_info_t(int ad, int mode, video_info_t *info);
+typedef int vi_query_mode_t(int ad, video_info_t *info);
+typedef int vi_set_mode_t(int ad, int mode);
+typedef int vi_save_font_t(int ad, int page, int size, u_char *data, 
+			   int c, int count);
+typedef int vi_load_font_t(int ad, int page, int size, u_char *data, 
+			   int c, int count);
+typedef int vi_show_font_t(int ad, int page);
+typedef int vi_save_palette_t(int ad, u_char *palette);
+typedef int vi_load_palette_t(int ad, u_char *palette);
+typedef int vi_set_border_t(int ad, int border);
+typedef int vi_save_state_t(int ad, void *p, size_t size);
+typedef int vi_load_state_t(int ad, void *p);
+typedef int vi_set_win_org_t(int ad, off_t offset);
+typedef int vi_read_hw_cursor_t(int ad, int *col, int *row);
+typedef int vi_set_hw_cursor_t(int ad, int col, int row);
+typedef int vi_diag_t(int level);
+
+struct vidsw {
+    vi_init_t		*init;			/* all */
+    vi_adapter_t	*adapter;		/* all */
+    vi_get_info_t	*get_info;		/* all */
+    vi_query_mode_t	*query_mode;		/* all */
+    vi_set_mode_t	*set_mode;		/* EGA/VGA */
+    vi_save_font_t	*save_font;		/* EGA/VGA */
+    vi_load_font_t	*load_font;		/* EGA/VGA */
+    vi_show_font_t	*show_font;		/* EGA/VGA */
+    vi_save_palette_t	*save_palette;		/* VGA */
+    vi_load_palette_t	*load_palette;		/* VGA */
+    vi_set_border_t	*set_border;		/* CGA/EGA/VGA */
+    vi_save_state_t	*save_state;		/* VGA */
+    vi_load_state_t	*load_state;		/* EGA/VGA */
+    vi_set_win_org_t	*set_win_org;		/* all */
+    vi_read_hw_cursor_t	*read_hw_cursor;	/* all */
+    vi_set_hw_cursor_t	*set_hw_cursor;		/* all */
+    vi_diag_t		*diag;			/* all */
+};
+
+extern struct vidsw biosvidsw;
+
+#endif /* KERNEL */
+
+#endif /* !_I386_ISA_VIDEOIO_H_ */
diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c
index 390eb2c35efb..ff5f5435f31e 100644
--- a/sys/i386/isa/wst.c
+++ b/sys/i386/isa/wst.c
@@ -6,13 +6,13 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer 
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: wst.c,v 1.10 1998/08/24 02:28:16 bde Exp $
+ *	$Id$
  */
 
 #include "wdc.h"
diff --git a/sys/modules/syscons/blank/blank_saver.c b/sys/modules/syscons/blank/blank_saver.c
index 451dc9a4b241..d5f4cf0bf560 100644
--- a/sys/modules/syscons/blank/blank_saver.c
+++ b/sys/modules/syscons/blank/blank_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.10 1997/07/15 14:49:09 yokota Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index f3cf3dce7736..688df41f274a 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.8 1998/01/16 17:58:43 bde Exp $
+ *	$Id: daemon_saver.c,v 1.9 1998/08/06 09:14:20 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -205,7 +205,7 @@ daemon_saver(int blank)
 			/* clear the screen and set the border color */
 			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
 			      Crtat, scp->xsize * scp->ysize);
-			set_border(0);
+			set_border(scp, 0);
 			xlen = ylen = tlen = 0;
 		}
 		if (scrn_blanked++ < 2)
@@ -322,7 +322,7 @@ daemon_saver(int blank)
 		draw_string(txpos, typos, toff, (char *)message, tlen);
 	} else {
 		if (scrn_blanked > 0) {
-			set_border(scp->border);
+			set_border(scp, scp->border);
 			scrn_blanked = 0;
 		}
 	}
diff --git a/sys/modules/syscons/fade/fade_saver.c b/sys/modules/syscons/fade/fade_saver.c
index 341f7e8d240c..41176e76e092 100644
--- a/sys/modules/syscons/fade/fade_saver.c
+++ b/sys/modules/syscons/fade/fade_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995-1997 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.11 1997/07/15 14:49:25 yokota Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
@@ -84,7 +84,7 @@ fade_saver(int blank)
 	else {
 		switch (crtc_type) {
 		case KD_VGA:
-			load_palette(palette);
+			load_palette(cur_console, palette);
 			count = 0;
 			break;
 		case KD_EGA:
diff --git a/sys/modules/syscons/green/green_saver.c b/sys/modules/syscons/green/green_saver.c
index b8c82958ac34..667866284681 100644
--- a/sys/modules/syscons/green/green_saver.c
+++ b/sys/modules/syscons/green/green_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.10 1997/07/15 14:49:29 yokota Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/saver.h b/sys/modules/syscons/saver.h
index 7118e4588e22..96cc010e9b81 100644
--- a/sys/modules/syscons/saver.h
+++ b/sys/modules/syscons/saver.h
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995-1997 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,12 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: saver.h,v 1.9 1997/07/15 14:48:11 yokota Exp $
+ *	$Id$
  */
-
 #include <machine/apm_bios.h>
 #include <machine/console.h>
 
+#include <i386/isa/videoio.h>
 #include <i386/isa/syscons.h>
 
 extern scr_stat	*cur_console;
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index c3fa1fe7ce38..c5011d04bac2 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.16 1998/01/16 17:58:50 bde Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
@@ -63,7 +63,7 @@ snake_saver(int blank)
 		if (scrn_blanked <= 0) {
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8 | scr_map[0x20],
 			      Crtat, scp->xsize * scp->ysize);
-			set_border(0);
+			set_border(scp, 0);
 			dirx = (scp->xpos ? 1 : -1);
 			diry = (scp->ypos ?
 				scp->xsize : -scp->xsize);
@@ -99,7 +99,7 @@ snake_saver(int blank)
 	}
 	else {
 		if (scrn_blanked > 0) {
-			set_border(scp->border);
+			set_border(scp, scp->border);
 			scrn_blanked = 0;
 		}
 	}
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 517a5579968f..8ac65bdba71c 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -1,18 +1,18 @@
 /*-
- * Copyright (c) 1995 Søren Schmidt
+ * Copyright (c) 1995-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.13 1998/01/16 17:58:55 bde Exp $
+ *	$Id$
  */
 
 #include <sys/param.h>
@@ -62,7 +62,7 @@ star_saver(int blank)
 			scrn_blanked = 1;
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat,
 			      scp->xsize * scp->ysize);
-			set_border(0);
+			set_border(scp, 0);
 			for(i=0; i<NUM_STARS; i++) {
 				stars[i][0] =
 					random() % (scp->xsize*scp->ysize);
@@ -80,7 +80,7 @@ star_saver(int blank)
 	}
 	else {
 		if (scrn_blanked > 0) {
-			set_border(scp->border);
+			set_border(scp, scp->border);
 			scrn_blanked = 0;
 		}
 	}
diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c
index 390eb2c35efb..ff5f5435f31e 100644
--- a/sys/pc98/pc98/wst.c
+++ b/sys/pc98/pc98/wst.c
@@ -6,13 +6,13 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer 
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: wst.c,v 1.10 1998/08/24 02:28:16 bde Exp $
+ *	$Id$
  */
 
 #include "wdc.h"
diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1
index aea546717aec..f4c9d211a55c 100644
--- a/usr.sbin/vidcontrol/vidcontrol.1
+++ b/usr.sbin/vidcontrol/vidcontrol.1
@@ -11,7 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)vidcontrol.1
-.\"	$Id: vidcontrol.1,v 1.11 1997/07/24 23:46:35 wosch Exp $
+.\"	$Id: vidcontrol.1,v 1.12 1997/10/27 07:52:08 charnier Exp $
 .\"
 .Dd May 22, 1994
 .Dt VIDCONTROL 1
@@ -25,6 +25,7 @@
 .Op Fl b Ar color
 .Op Fl c Ar appearance
 .Op Fl d
+.Op Fl i Ar adapter|mode
 .Op Fl l Ar scrmap
 .Op Fl L
 .Op Fl m Ar on|off
@@ -84,6 +85,10 @@ Install screen output map file from
 .Ar scrmap
 .It Fl L
 Install default screen output map.
+.It Fl i Ar adapter
+Shows info about the current videoadapter.
+.It Fl i Ar mode
+Shows the possible videomodes with the current video hardware.
 .It Fl m Ar on|off
 Switch the mousepointer
 .Ar on
diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c
index 81f13da223e9..4c97cabf2166 100644
--- a/usr.sbin/vidcontrol/vidcontrol.c
+++ b/usr.sbin/vidcontrol/vidcontrol.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: vidcontrol.c,v 1.18 1997/10/27 07:52:10 charnier Exp $";
+	"$Id: vidcontrol.c,v 1.19 1998/07/14 10:32:27 bde Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
@@ -259,6 +259,7 @@ void
 video_mode(int argc, char **argv, int *index)
 {
 	unsigned long mode;
+	int size[3];
 
 	if (*index < argc) {
 		if (!strcmp(argv[*index], "VGA_40x25"))
@@ -277,10 +278,27 @@ video_mode(int argc, char **argv, int *index)
 			mode = SW_ENH_C80x25;
 		else if (!strcmp(argv[*index], "EGA_80x43"))
 			mode = SW_ENH_C80x43;
+		else if (!strcmp(argv[*index], "VESA_132x25"))
+			mode = SW_VESA_C132x25;
+		else if (!strcmp(argv[*index], "VESA_132x43"))
+			mode = SW_VESA_C132x43;
+		else if (!strcmp(argv[*index], "VESA_132x50"))
+			mode = SW_VESA_C132x50;
+		else if (!strcmp(argv[*index], "VESA_132x60"))
+			mode = SW_VESA_C132x60;
+		else if (!strcmp(argv[*index], "VESA_800x600"))
+			mode = SW_VESA_800x600;
 		else
 			return;
 		if (ioctl(0, mode, NULL) < 0)
 			warn("cannot set videomode");
+		if (mode == SW_VESA_800x600) {
+			size[0] = 80;	/* columns */
+			size[1] = 25;	/* rows */
+			size[2] = 16;	/* font size */
+			if (ioctl(0, KDRASTER, size))
+				warn("cannot activate raster display");
+		}
 		(*index)++;
 	}
 	return;
@@ -375,6 +393,103 @@ set_mouse(char *arg)
 	ioctl(0, CONS_MOUSECTL, &mouse);
 }
 
+static char
+*adapter_name(int type)
+{
+    static struct {
+	int type;
+	char *name;
+    } names[] = {
+	{ KD_MONO,	"MDA" },
+	{ KD_HERCULES,	"Hercules" },
+	{ KD_CGA,	"CGA" },
+	{ KD_EGA,	"EGA" },
+	{ KD_VGA,	"VGA" },
+	{ KD_PC98,	"PC-98xx" },
+	{ -1,		"Unknown" },
+    };
+    int i;
+
+    for (i = 0; names[i].type != -1; ++i)
+	if (names[i].type == type)
+	    break;
+    return names[i].name;
+}
+
+void
+show_adapter_info(void)
+{
+	struct video_adapter ad;
+
+	ad.va_index = 0;
+	if (ioctl(0, CONS_ADPINFO, &ad)) {
+		warn("failed to obtain adapter information");
+		return;
+	}
+
+	printf("adapter %d:\n", ad.va_index);
+	printf("    type:%s%s (%d), flags:0x%08x, CRTC:0x%x\n", 
+	       (ad.va_flags & V_ADP_VESA) ? "VESA " : "",
+	       adapter_name(ad.va_type), ad.va_type, 
+	       ad.va_flags, ad.va_crtc_addr);
+	printf("    initial mode:%d, current mode:%d, BIOS mode:%d\n",
+	       ad.va_initial_mode, ad.va_mode, ad.va_initial_bios_mode);
+}
+
+void
+show_mode_info(void)
+{
+	struct video_info info;
+	char buf[80];
+	int mode;
+	int c;
+
+	printf("    mode#     flags   type    size       "
+	       "font      window      linear buffer\n");
+	printf("---------------------------------------"
+	       "---------------------------------------\n");
+	for (mode = 0; mode < M_VESA_MODE_MAX; ++mode) {
+		info.vi_mode = mode;
+		if (ioctl(0, CONS_MODEINFO, &info))
+			continue;
+
+		printf("%3d (0x%03x)", mode, mode);
+    		printf(" 0x%08x", info.vi_flags);
+		if (info.vi_flags & V_INFO_GRAPHICS) {
+			c = 'G';
+			snprintf(buf, sizeof(buf), "%dx%dx%d %d",
+				 info.vi_width, info.vi_height, 
+				 info.vi_depth, info.vi_planes);
+		} else {
+			c = 'T';
+			snprintf(buf, sizeof(buf), "%dx%d",
+				 info.vi_width, info.vi_height);
+		}
+		printf(" %c %-15s", c, buf);
+		snprintf(buf, sizeof(buf), "%dx%d", 
+			 info.vi_cwidth, info.vi_cheight); 
+		printf(" %-5s", buf);
+    		printf(" 0x%05x %2dk %2dk", 
+		       info.vi_window, info.vi_window_size, 
+		       info.vi_window_gran);
+    		printf(" 0x%08x %2dk\n",
+		       info.vi_buffer, info.vi_buffer_size);
+	}
+}
+
+void
+show_info(char *arg)
+{
+	if (!strcmp(arg, "adapter"))
+		show_adapter_info();
+	else if (!strcmp(arg, "mode"))
+		show_mode_info();
+	else {
+		warnx("argument to -i must either adapter or mode");
+		return;
+	}
+}
+
 void
 test_frame()
 {
@@ -402,7 +517,7 @@ main(int argc, char **argv)
 	info.size = sizeof(info);
 	if (ioctl(0, CONS_GETINFO, &info) < 0)
 		err(1, "must be on a virtual console");
-	while((opt = getopt(argc, argv, "b:c:df:l:Lm:r:s:t:x")) != -1)
+	while((opt = getopt(argc, argv, "b:c:df:i:l:Lm:r:s:t:x")) != -1)
 		switch(opt) {
 			case 'b':
 				set_border_color(optarg);
@@ -417,6 +532,9 @@ main(int argc, char **argv)
 				load_font(optarg,
 					nextarg(argc, argv, &optind, 'f'));
 				break;
+			case 'i':
+				show_info(optarg);
+				break;
 			case 'l':
 				load_scrnmap(optarg);
 				break;
-- 
cgit v1.3


From d74e86d9e30043893d6b308468008b65640ddcae Mon Sep 17 00:00:00 2001
From: Søren Schmidt <sos@FreeBSD.org>
Date: Thu, 17 Sep 1998 19:40:30 +0000
Subject: Fix the sreensavers so the work again with the new syscons & friends.

Submitted by: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
---
 lkm/syscons/blank/blank_saver.c           |  4 +++-
 lkm/syscons/daemon/daemon_saver.c         | 15 +++++++++------
 lkm/syscons/fade/fade_saver.c             | 22 ++++++++++------------
 lkm/syscons/green/green_saver.c           |  4 +++-
 lkm/syscons/saver.h                       |  3 +--
 lkm/syscons/snake/snake_saver.c           | 17 ++++++++++-------
 lkm/syscons/star/star_saver.c             | 16 ++++++++++------
 sys/dev/syscons/blank/blank_saver.c       |  4 +++-
 sys/dev/syscons/daemon/daemon_saver.c     | 15 +++++++++------
 sys/dev/syscons/fade/fade_saver.c         | 22 ++++++++++------------
 sys/dev/syscons/green/green_saver.c       |  4 +++-
 sys/dev/syscons/snake/snake_saver.c       | 17 ++++++++++-------
 sys/dev/syscons/star/star_saver.c         | 16 ++++++++++------
 sys/modules/syscons/blank/blank_saver.c   |  4 +++-
 sys/modules/syscons/daemon/daemon_saver.c | 15 +++++++++------
 sys/modules/syscons/fade/fade_saver.c     | 22 ++++++++++------------
 sys/modules/syscons/green/green_saver.c   |  4 +++-
 sys/modules/syscons/saver.h               |  3 +--
 sys/modules/syscons/snake/snake_saver.c   | 17 ++++++++++-------
 sys/modules/syscons/star/star_saver.c     | 16 ++++++++++------
 20 files changed, 137 insertions(+), 103 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/lkm/syscons/blank/blank_saver.c b/lkm/syscons/blank/blank_saver.c
index d5f4cf0bf560..1bb73233e790 100644
--- a/lkm/syscons/blank/blank_saver.c
+++ b/lkm/syscons/blank/blank_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: blank_saver.c,v 1.12 1998/09/15 18:16:38 sos Exp $
  */
 
 #include <sys/param.h>
@@ -46,6 +46,7 @@ blank_saver(int blank)
 	u_char val;
 	if (blank) {
 		scrn_blanked = 1;
+		cur_console->status |= SAVER_RUNNING;
 		switch (crtc_type) {
 		case KD_VGA:
 			outb(TSIDX, 0x01); val = inb(TSREG);
@@ -84,6 +85,7 @@ blank_saver(int blank)
 		default:
 			break;
 		}
+		cur_console->status &= ~SAVER_RUNNING;
 		scrn_blanked = 0;
 	}
 }
diff --git a/lkm/syscons/daemon/daemon_saver.c b/lkm/syscons/daemon/daemon_saver.c
index 688df41f274a..59e99f0fe328 100644
--- a/lkm/syscons/daemon/daemon_saver.c
+++ b/lkm/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.9 1998/08/06 09:14:20 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.10 1998/09/15 18:16:38 sos Exp $
  */
 
 #include <sys/param.h>
@@ -43,7 +43,7 @@
 #include <saver.h>
 
 #define CONSOLE_VECT(x, y) \
-	((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
+	(window + (y)*cur_console->xsize + (x))
 
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
@@ -52,6 +52,7 @@ MOD_MISC(daemon_saver);
 
 static char *message;
 static int messagelen;
+static u_short *window;
 
 /* Who is the author of this ASCII pic? */
 
@@ -201,10 +202,14 @@ daemon_saver(int blank)
 	int min, max;
 
 	if (blank) {
+		if (!ISTEXTSC(scp))
+			return;
 		if (scrn_blanked == 0) {
+			scp->status |= SAVER_RUNNING;
+			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
 			/* clear the screen and set the border color */
 			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
-			      Crtat, scp->xsize * scp->ysize);
+			      window, scp->xsize * scp->ysize);
 			set_border(scp, 0);
 			xlen = ylen = tlen = 0;
 		}
@@ -324,6 +329,7 @@ daemon_saver(int blank)
 		if (scrn_blanked > 0) {
 			set_border(scp, scp->border);
 			scrn_blanked = 0;
+			scp->status &= ~SAVER_RUNNING;
 		}
 	}
 }
@@ -333,9 +339,6 @@ daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
-	if (cur_console->mode >= M_VESA_BASE)
-		return ENODEV;
-
 	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
 	    strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
diff --git a/lkm/syscons/fade/fade_saver.c b/lkm/syscons/fade/fade_saver.c
index 41176e76e092..0d31bd6de526 100644
--- a/lkm/syscons/fade/fade_saver.c
+++ b/lkm/syscons/fade/fade_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: fade_saver.c,v 1.13 1998/09/15 18:16:39 sos Exp $
  */
 
 #include <sys/param.h>
@@ -44,26 +44,23 @@ static void
 fade_saver(int blank)
 {
 	static int count = 0;
+	u_char pal[256*3];
 	int i;
 
 	if (blank) {
 		scrn_blanked = 1;
+		cur_console->status |= SAVER_RUNNING;
 		switch (crtc_type) {
 		case KD_VGA:
 			if (count < 64) {
-				outb(PIXMASK, 0xFF);	/* no pixelmask */
-				outb(PALWADR, 0x00);
-				outb(PALDATA, 0);
-				outb(PALDATA, 0);
-				outb(PALDATA, 0);
-				for (i = 3; i < 768; i++) {
-					if (palette[i] - count > 15)
-						outb(PALDATA, palette[i]-count);
+				pal[0] = pal[1] = pal[2] = 0;
+				for (i = 3; i < 256*3; i++) {
+					if (palette[i] - count > 60)
+						pal[i] = palette[i] - count;
 					else
-						outb(PALDATA, 15);
+						pal[i] = 60;
 				}
-				inb(crtc_addr+6);	/* reset flip/flop */
-				outb(ATC, 0x20);	/* enable palette */
+				load_palette(cur_console, pal);
 				count++;
 			}
 			break;
@@ -100,6 +97,7 @@ fade_saver(int blank)
 		default:
 			break;
 		}
+		cur_console->status &= ~SAVER_RUNNING;
 		scrn_blanked = 0;
 	}
 }
diff --git a/lkm/syscons/green/green_saver.c b/lkm/syscons/green/green_saver.c
index 667866284681..0e61c2e2102b 100644
--- a/lkm/syscons/green/green_saver.c
+++ b/lkm/syscons/green/green_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: green_saver.c,v 1.12 1998/09/15 18:16:39 sos Exp $
  */
 
 #include <sys/param.h>
@@ -46,6 +46,7 @@ green_saver(int blank)
 	u_char val;
 	if (blank) {
 		scrn_blanked = 1;
+		cur_console->status |= SAVER_RUNNING;
 		switch (crtc_type) {
 		case KD_VGA:
 			outb(TSIDX, 0x01); val = inb(TSREG);
@@ -88,6 +89,7 @@ green_saver(int blank)
 		default:
 			break;
 		}
+		cur_console->status &= ~SAVER_RUNNING;
 		scrn_blanked = 0;
 	}
 }
diff --git a/lkm/syscons/saver.h b/lkm/syscons/saver.h
index 96cc010e9b81..9eb19956327f 100644
--- a/lkm/syscons/saver.h
+++ b/lkm/syscons/saver.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: saver.h,v 1.11 1998/09/15 18:16:38 sos Exp $
  */
 #include <machine/apm_bios.h>
 #include <machine/console.h>
@@ -42,4 +42,3 @@ extern int	scrn_blanked;
 extern int	fonts_loaded;
 extern char	font_8[], font_14[], font_16[];
 extern char	palette[];
-extern char	*video_mode_ptr;
diff --git a/lkm/syscons/snake/snake_saver.c b/lkm/syscons/snake/snake_saver.c
index c5011d04bac2..efb76d505df7 100644
--- a/lkm/syscons/snake/snake_saver.c
+++ b/lkm/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: snake_saver.c,v 1.18 1998/09/15 18:16:39 sos Exp $
  */
 
 #include <sys/param.h>
@@ -47,6 +47,7 @@ MOD_MISC(snake_saver);
 static char	*message;
 static u_char	**messagep;
 static int	messagelen;
+static u_short	*window;
 
 static void
 snake_saver(int blank)
@@ -60,15 +61,19 @@ snake_saver(int blank)
 #define	savs	messagep
 
 	if (blank) {
+		if (!ISTEXTSC(scp))
+			return;
 		if (scrn_blanked <= 0) {
+			scp->status |= SAVER_RUNNING;
+			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8 | scr_map[0x20],
-			      Crtat, scp->xsize * scp->ysize);
+			      window, scp->xsize * scp->ysize);
 			set_border(scp, 0);
 			dirx = (scp->xpos ? 1 : -1);
 			diry = (scp->ypos ?
 				scp->xsize : -scp->xsize);
 			for (f=0; f< messagelen; f++)
-				savs[f] = (u_char *)Crtat + 2 *
+				savs[f] = (u_char *)window + 2 *
 					  (scp->xpos+scp->ypos*scp->xsize);
 			*(savs[0]) = scr_map[*save];
 			f = scp->ysize * scp->xsize + 5;
@@ -84,7 +89,7 @@ snake_saver(int blank)
 		*(savs[messagelen-1]) = scr_map[0x20];
 		for (f=messagelen-1; f > 0; f--)
 			savs[f] = savs[f-1];
-		f = (savs[0] - (u_char *)Crtat) / 2;
+		f = (savs[0] - (u_char *)window) / 2;
 		if ((f % scp->xsize) == 0 ||
 		    (f % scp->xsize) == scp->xsize - 1 ||
 		    (random() % 50) == 0)
@@ -101,6 +106,7 @@ snake_saver(int blank)
 		if (scrn_blanked > 0) {
 			set_border(scp, scp->border);
 			scrn_blanked = 0;
+			scp->status &= ~SAVER_RUNNING;
 		}
 	}
 }
@@ -110,9 +116,6 @@ snake_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
-	if (cur_console->mode >= M_VESA_BASE)
-		return ENODEV;
-
 	messagelen = strlen(ostype) + 1 + strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s %s", ostype, osrelease);
diff --git a/lkm/syscons/star/star_saver.c b/lkm/syscons/star/star_saver.c
index 8ac65bdba71c..2e56a3c96fbd 100644
--- a/lkm/syscons/star/star_saver.c
+++ b/lkm/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: star_saver.c,v 1.15 1998/09/15 18:16:39 sos Exp $
  */
 
 #include <sys/param.h>
@@ -43,6 +43,8 @@ MOD_MISC(star_saver);
 
 #define NUM_STARS	50
 
+static u_short *window;
+
 /*
  * Alternate saver that got its inspiration from a well known utility
  * package for an inferior^H^H^H^H^H^Hfamous OS.
@@ -58,9 +60,13 @@ star_saver(int blank)
 	static u_short 	stars[NUM_STARS][2];
 
 	if (blank) {
+		if (!ISTEXTSC(scp))
+			return;
 		if (scrn_blanked <= 0) {
+			scp->status |= SAVER_RUNNING;
+			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
 			scrn_blanked = 1;
-			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat,
+			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], window,
 			      scp->xsize * scp->ysize);
 			set_border(scp, 0);
 			for(i=0; i<NUM_STARS; i++) {
@@ -70,7 +76,7 @@ star_saver(int blank)
 			}
 		}
 		cell = random() % NUM_STARS;
-		*((u_short*)(Crtat + stars[cell][0])) =
+		*((u_short*)(window + stars[cell][0])) =
 			scr_map[pattern[stars[cell][1]]] |
 				colors[random()%sizeof(colors)] << 8;
 		if ((stars[cell][1]+=(random()%4)) >= sizeof(pattern)-1) {
@@ -82,6 +88,7 @@ star_saver(int blank)
 		if (scrn_blanked > 0) {
 			set_border(scp, scp->border);
 			scrn_blanked = 0;
+			scp->status &= ~SAVER_RUNNING;
 		}
 	}
 }
@@ -89,9 +96,6 @@ star_saver(int blank)
 static int
 star_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	if (cur_console->mode >= M_VESA_BASE)
-		return ENODEV;
-
 	return add_scrn_saver(star_saver);
 }
 
diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index d5f4cf0bf560..1bb73233e790 100644
--- a/sys/dev/syscons/blank/blank_saver.c
+++ b/sys/dev/syscons/blank/blank_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: blank_saver.c,v 1.12 1998/09/15 18:16:38 sos Exp $
  */
 
 #include <sys/param.h>
@@ -46,6 +46,7 @@ blank_saver(int blank)
 	u_char val;
 	if (blank) {
 		scrn_blanked = 1;
+		cur_console->status |= SAVER_RUNNING;
 		switch (crtc_type) {
 		case KD_VGA:
 			outb(TSIDX, 0x01); val = inb(TSREG);
@@ -84,6 +85,7 @@ blank_saver(int blank)
 		default:
 			break;
 		}
+		cur_console->status &= ~SAVER_RUNNING;
 		scrn_blanked = 0;
 	}
 }
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 688df41f274a..59e99f0fe328 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.9 1998/08/06 09:14:20 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.10 1998/09/15 18:16:38 sos Exp $
  */
 
 #include <sys/param.h>
@@ -43,7 +43,7 @@
 #include <saver.h>
 
 #define CONSOLE_VECT(x, y) \
-	((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
+	(window + (y)*cur_console->xsize + (x))
 
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
@@ -52,6 +52,7 @@ MOD_MISC(daemon_saver);
 
 static char *message;
 static int messagelen;
+static u_short *window;
 
 /* Who is the author of this ASCII pic? */
 
@@ -201,10 +202,14 @@ daemon_saver(int blank)
 	int min, max;
 
 	if (blank) {
+		if (!ISTEXTSC(scp))
+			return;
 		if (scrn_blanked == 0) {
+			scp->status |= SAVER_RUNNING;
+			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
 			/* clear the screen and set the border color */
 			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
-			      Crtat, scp->xsize * scp->ysize);
+			      window, scp->xsize * scp->ysize);
 			set_border(scp, 0);
 			xlen = ylen = tlen = 0;
 		}
@@ -324,6 +329,7 @@ daemon_saver(int blank)
 		if (scrn_blanked > 0) {
 			set_border(scp, scp->border);
 			scrn_blanked = 0;
+			scp->status &= ~SAVER_RUNNING;
 		}
 	}
 }
@@ -333,9 +339,6 @@ daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
-	if (cur_console->mode >= M_VESA_BASE)
-		return ENODEV;
-
 	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
 	    strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index 41176e76e092..0d31bd6de526 100644
--- a/sys/dev/syscons/fade/fade_saver.c
+++ b/sys/dev/syscons/fade/fade_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: fade_saver.c,v 1.13 1998/09/15 18:16:39 sos Exp $
  */
 
 #include <sys/param.h>
@@ -44,26 +44,23 @@ static void
 fade_saver(int blank)
 {
 	static int count = 0;
+	u_char pal[256*3];
 	int i;
 
 	if (blank) {
 		scrn_blanked = 1;
+		cur_console->status |= SAVER_RUNNING;
 		switch (crtc_type) {
 		case KD_VGA:
 			if (count < 64) {
-				outb(PIXMASK, 0xFF);	/* no pixelmask */
-				outb(PALWADR, 0x00);
-				outb(PALDATA, 0);
-				outb(PALDATA, 0);
-				outb(PALDATA, 0);
-				for (i = 3; i < 768; i++) {
-					if (palette[i] - count > 15)
-						outb(PALDATA, palette[i]-count);
+				pal[0] = pal[1] = pal[2] = 0;
+				for (i = 3; i < 256*3; i++) {
+					if (palette[i] - count > 60)
+						pal[i] = palette[i] - count;
 					else
-						outb(PALDATA, 15);
+						pal[i] = 60;
 				}
-				inb(crtc_addr+6);	/* reset flip/flop */
-				outb(ATC, 0x20);	/* enable palette */
+				load_palette(cur_console, pal);
 				count++;
 			}
 			break;
@@ -100,6 +97,7 @@ fade_saver(int blank)
 		default:
 			break;
 		}
+		cur_console->status &= ~SAVER_RUNNING;
 		scrn_blanked = 0;
 	}
 }
diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index 667866284681..0e61c2e2102b 100644
--- a/sys/dev/syscons/green/green_saver.c
+++ b/sys/dev/syscons/green/green_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: green_saver.c,v 1.12 1998/09/15 18:16:39 sos Exp $
  */
 
 #include <sys/param.h>
@@ -46,6 +46,7 @@ green_saver(int blank)
 	u_char val;
 	if (blank) {
 		scrn_blanked = 1;
+		cur_console->status |= SAVER_RUNNING;
 		switch (crtc_type) {
 		case KD_VGA:
 			outb(TSIDX, 0x01); val = inb(TSREG);
@@ -88,6 +89,7 @@ green_saver(int blank)
 		default:
 			break;
 		}
+		cur_console->status &= ~SAVER_RUNNING;
 		scrn_blanked = 0;
 	}
 }
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index c5011d04bac2..efb76d505df7 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: snake_saver.c,v 1.18 1998/09/15 18:16:39 sos Exp $
  */
 
 #include <sys/param.h>
@@ -47,6 +47,7 @@ MOD_MISC(snake_saver);
 static char	*message;
 static u_char	**messagep;
 static int	messagelen;
+static u_short	*window;
 
 static void
 snake_saver(int blank)
@@ -60,15 +61,19 @@ snake_saver(int blank)
 #define	savs	messagep
 
 	if (blank) {
+		if (!ISTEXTSC(scp))
+			return;
 		if (scrn_blanked <= 0) {
+			scp->status |= SAVER_RUNNING;
+			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8 | scr_map[0x20],
-			      Crtat, scp->xsize * scp->ysize);
+			      window, scp->xsize * scp->ysize);
 			set_border(scp, 0);
 			dirx = (scp->xpos ? 1 : -1);
 			diry = (scp->ypos ?
 				scp->xsize : -scp->xsize);
 			for (f=0; f< messagelen; f++)
-				savs[f] = (u_char *)Crtat + 2 *
+				savs[f] = (u_char *)window + 2 *
 					  (scp->xpos+scp->ypos*scp->xsize);
 			*(savs[0]) = scr_map[*save];
 			f = scp->ysize * scp->xsize + 5;
@@ -84,7 +89,7 @@ snake_saver(int blank)
 		*(savs[messagelen-1]) = scr_map[0x20];
 		for (f=messagelen-1; f > 0; f--)
 			savs[f] = savs[f-1];
-		f = (savs[0] - (u_char *)Crtat) / 2;
+		f = (savs[0] - (u_char *)window) / 2;
 		if ((f % scp->xsize) == 0 ||
 		    (f % scp->xsize) == scp->xsize - 1 ||
 		    (random() % 50) == 0)
@@ -101,6 +106,7 @@ snake_saver(int blank)
 		if (scrn_blanked > 0) {
 			set_border(scp, scp->border);
 			scrn_blanked = 0;
+			scp->status &= ~SAVER_RUNNING;
 		}
 	}
 }
@@ -110,9 +116,6 @@ snake_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
-	if (cur_console->mode >= M_VESA_BASE)
-		return ENODEV;
-
 	messagelen = strlen(ostype) + 1 + strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s %s", ostype, osrelease);
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 8ac65bdba71c..2e56a3c96fbd 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: star_saver.c,v 1.15 1998/09/15 18:16:39 sos Exp $
  */
 
 #include <sys/param.h>
@@ -43,6 +43,8 @@ MOD_MISC(star_saver);
 
 #define NUM_STARS	50
 
+static u_short *window;
+
 /*
  * Alternate saver that got its inspiration from a well known utility
  * package for an inferior^H^H^H^H^H^Hfamous OS.
@@ -58,9 +60,13 @@ star_saver(int blank)
 	static u_short 	stars[NUM_STARS][2];
 
 	if (blank) {
+		if (!ISTEXTSC(scp))
+			return;
 		if (scrn_blanked <= 0) {
+			scp->status |= SAVER_RUNNING;
+			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
 			scrn_blanked = 1;
-			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat,
+			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], window,
 			      scp->xsize * scp->ysize);
 			set_border(scp, 0);
 			for(i=0; i<NUM_STARS; i++) {
@@ -70,7 +76,7 @@ star_saver(int blank)
 			}
 		}
 		cell = random() % NUM_STARS;
-		*((u_short*)(Crtat + stars[cell][0])) =
+		*((u_short*)(window + stars[cell][0])) =
 			scr_map[pattern[stars[cell][1]]] |
 				colors[random()%sizeof(colors)] << 8;
 		if ((stars[cell][1]+=(random()%4)) >= sizeof(pattern)-1) {
@@ -82,6 +88,7 @@ star_saver(int blank)
 		if (scrn_blanked > 0) {
 			set_border(scp, scp->border);
 			scrn_blanked = 0;
+			scp->status &= ~SAVER_RUNNING;
 		}
 	}
 }
@@ -89,9 +96,6 @@ star_saver(int blank)
 static int
 star_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	if (cur_console->mode >= M_VESA_BASE)
-		return ENODEV;
-
 	return add_scrn_saver(star_saver);
 }
 
diff --git a/sys/modules/syscons/blank/blank_saver.c b/sys/modules/syscons/blank/blank_saver.c
index d5f4cf0bf560..1bb73233e790 100644
--- a/sys/modules/syscons/blank/blank_saver.c
+++ b/sys/modules/syscons/blank/blank_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: blank_saver.c,v 1.12 1998/09/15 18:16:38 sos Exp $
  */
 
 #include <sys/param.h>
@@ -46,6 +46,7 @@ blank_saver(int blank)
 	u_char val;
 	if (blank) {
 		scrn_blanked = 1;
+		cur_console->status |= SAVER_RUNNING;
 		switch (crtc_type) {
 		case KD_VGA:
 			outb(TSIDX, 0x01); val = inb(TSREG);
@@ -84,6 +85,7 @@ blank_saver(int blank)
 		default:
 			break;
 		}
+		cur_console->status &= ~SAVER_RUNNING;
 		scrn_blanked = 0;
 	}
 }
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index 688df41f274a..59e99f0fe328 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.9 1998/08/06 09:14:20 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.10 1998/09/15 18:16:38 sos Exp $
  */
 
 #include <sys/param.h>
@@ -43,7 +43,7 @@
 #include <saver.h>
 
 #define CONSOLE_VECT(x, y) \
-	((u_short*)(Crtat + (y)*cur_console->xsize + (x)))
+	(window + (y)*cur_console->xsize + (x))
 
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
@@ -52,6 +52,7 @@ MOD_MISC(daemon_saver);
 
 static char *message;
 static int messagelen;
+static u_short *window;
 
 /* Who is the author of this ASCII pic? */
 
@@ -201,10 +202,14 @@ daemon_saver(int blank)
 	int min, max;
 
 	if (blank) {
+		if (!ISTEXTSC(scp))
+			return;
 		if (scrn_blanked == 0) {
+			scp->status |= SAVER_RUNNING;
+			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
 			/* clear the screen and set the border color */
 			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
-			      Crtat, scp->xsize * scp->ysize);
+			      window, scp->xsize * scp->ysize);
 			set_border(scp, 0);
 			xlen = ylen = tlen = 0;
 		}
@@ -324,6 +329,7 @@ daemon_saver(int blank)
 		if (scrn_blanked > 0) {
 			set_border(scp, scp->border);
 			scrn_blanked = 0;
+			scp->status &= ~SAVER_RUNNING;
 		}
 	}
 }
@@ -333,9 +339,6 @@ daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
-	if (cur_console->mode >= M_VESA_BASE)
-		return ENODEV;
-
 	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
 	    strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
diff --git a/sys/modules/syscons/fade/fade_saver.c b/sys/modules/syscons/fade/fade_saver.c
index 41176e76e092..0d31bd6de526 100644
--- a/sys/modules/syscons/fade/fade_saver.c
+++ b/sys/modules/syscons/fade/fade_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: fade_saver.c,v 1.13 1998/09/15 18:16:39 sos Exp $
  */
 
 #include <sys/param.h>
@@ -44,26 +44,23 @@ static void
 fade_saver(int blank)
 {
 	static int count = 0;
+	u_char pal[256*3];
 	int i;
 
 	if (blank) {
 		scrn_blanked = 1;
+		cur_console->status |= SAVER_RUNNING;
 		switch (crtc_type) {
 		case KD_VGA:
 			if (count < 64) {
-				outb(PIXMASK, 0xFF);	/* no pixelmask */
-				outb(PALWADR, 0x00);
-				outb(PALDATA, 0);
-				outb(PALDATA, 0);
-				outb(PALDATA, 0);
-				for (i = 3; i < 768; i++) {
-					if (palette[i] - count > 15)
-						outb(PALDATA, palette[i]-count);
+				pal[0] = pal[1] = pal[2] = 0;
+				for (i = 3; i < 256*3; i++) {
+					if (palette[i] - count > 60)
+						pal[i] = palette[i] - count;
 					else
-						outb(PALDATA, 15);
+						pal[i] = 60;
 				}
-				inb(crtc_addr+6);	/* reset flip/flop */
-				outb(ATC, 0x20);	/* enable palette */
+				load_palette(cur_console, pal);
 				count++;
 			}
 			break;
@@ -100,6 +97,7 @@ fade_saver(int blank)
 		default:
 			break;
 		}
+		cur_console->status &= ~SAVER_RUNNING;
 		scrn_blanked = 0;
 	}
 }
diff --git a/sys/modules/syscons/green/green_saver.c b/sys/modules/syscons/green/green_saver.c
index 667866284681..0e61c2e2102b 100644
--- a/sys/modules/syscons/green/green_saver.c
+++ b/sys/modules/syscons/green/green_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: green_saver.c,v 1.12 1998/09/15 18:16:39 sos Exp $
  */
 
 #include <sys/param.h>
@@ -46,6 +46,7 @@ green_saver(int blank)
 	u_char val;
 	if (blank) {
 		scrn_blanked = 1;
+		cur_console->status |= SAVER_RUNNING;
 		switch (crtc_type) {
 		case KD_VGA:
 			outb(TSIDX, 0x01); val = inb(TSREG);
@@ -88,6 +89,7 @@ green_saver(int blank)
 		default:
 			break;
 		}
+		cur_console->status &= ~SAVER_RUNNING;
 		scrn_blanked = 0;
 	}
 }
diff --git a/sys/modules/syscons/saver.h b/sys/modules/syscons/saver.h
index 96cc010e9b81..9eb19956327f 100644
--- a/sys/modules/syscons/saver.h
+++ b/sys/modules/syscons/saver.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: saver.h,v 1.11 1998/09/15 18:16:38 sos Exp $
  */
 #include <machine/apm_bios.h>
 #include <machine/console.h>
@@ -42,4 +42,3 @@ extern int	scrn_blanked;
 extern int	fonts_loaded;
 extern char	font_8[], font_14[], font_16[];
 extern char	palette[];
-extern char	*video_mode_ptr;
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index c5011d04bac2..efb76d505df7 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: snake_saver.c,v 1.18 1998/09/15 18:16:39 sos Exp $
  */
 
 #include <sys/param.h>
@@ -47,6 +47,7 @@ MOD_MISC(snake_saver);
 static char	*message;
 static u_char	**messagep;
 static int	messagelen;
+static u_short	*window;
 
 static void
 snake_saver(int blank)
@@ -60,15 +61,19 @@ snake_saver(int blank)
 #define	savs	messagep
 
 	if (blank) {
+		if (!ISTEXTSC(scp))
+			return;
 		if (scrn_blanked <= 0) {
+			scp->status |= SAVER_RUNNING;
+			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8 | scr_map[0x20],
-			      Crtat, scp->xsize * scp->ysize);
+			      window, scp->xsize * scp->ysize);
 			set_border(scp, 0);
 			dirx = (scp->xpos ? 1 : -1);
 			diry = (scp->ypos ?
 				scp->xsize : -scp->xsize);
 			for (f=0; f< messagelen; f++)
-				savs[f] = (u_char *)Crtat + 2 *
+				savs[f] = (u_char *)window + 2 *
 					  (scp->xpos+scp->ypos*scp->xsize);
 			*(savs[0]) = scr_map[*save];
 			f = scp->ysize * scp->xsize + 5;
@@ -84,7 +89,7 @@ snake_saver(int blank)
 		*(savs[messagelen-1]) = scr_map[0x20];
 		for (f=messagelen-1; f > 0; f--)
 			savs[f] = savs[f-1];
-		f = (savs[0] - (u_char *)Crtat) / 2;
+		f = (savs[0] - (u_char *)window) / 2;
 		if ((f % scp->xsize) == 0 ||
 		    (f % scp->xsize) == scp->xsize - 1 ||
 		    (random() % 50) == 0)
@@ -101,6 +106,7 @@ snake_saver(int blank)
 		if (scrn_blanked > 0) {
 			set_border(scp, scp->border);
 			scrn_blanked = 0;
+			scp->status &= ~SAVER_RUNNING;
 		}
 	}
 }
@@ -110,9 +116,6 @@ snake_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
-	if (cur_console->mode >= M_VESA_BASE)
-		return ENODEV;
-
 	messagelen = strlen(ostype) + 1 + strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s %s", ostype, osrelease);
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 8ac65bdba71c..2e56a3c96fbd 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: star_saver.c,v 1.15 1998/09/15 18:16:39 sos Exp $
  */
 
 #include <sys/param.h>
@@ -43,6 +43,8 @@ MOD_MISC(star_saver);
 
 #define NUM_STARS	50
 
+static u_short *window;
+
 /*
  * Alternate saver that got its inspiration from a well known utility
  * package for an inferior^H^H^H^H^H^Hfamous OS.
@@ -58,9 +60,13 @@ star_saver(int blank)
 	static u_short 	stars[NUM_STARS][2];
 
 	if (blank) {
+		if (!ISTEXTSC(scp))
+			return;
 		if (scrn_blanked <= 0) {
+			scp->status |= SAVER_RUNNING;
+			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
 			scrn_blanked = 1;
-			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat,
+			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], window,
 			      scp->xsize * scp->ysize);
 			set_border(scp, 0);
 			for(i=0; i<NUM_STARS; i++) {
@@ -70,7 +76,7 @@ star_saver(int blank)
 			}
 		}
 		cell = random() % NUM_STARS;
-		*((u_short*)(Crtat + stars[cell][0])) =
+		*((u_short*)(window + stars[cell][0])) =
 			scr_map[pattern[stars[cell][1]]] |
 				colors[random()%sizeof(colors)] << 8;
 		if ((stars[cell][1]+=(random()%4)) >= sizeof(pattern)-1) {
@@ -82,6 +88,7 @@ star_saver(int blank)
 		if (scrn_blanked > 0) {
 			set_border(scp, scp->border);
 			scrn_blanked = 0;
+			scp->status &= ~SAVER_RUNNING;
 		}
 	}
 }
@@ -89,9 +96,6 @@ star_saver(int blank)
 static int
 star_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	if (cur_console->mode >= M_VESA_BASE)
-		return ENODEV;
-
 	return add_scrn_saver(star_saver);
 }
 
-- 
cgit v1.3


From 0640d357f29fb1c0daaaffadd0416c5981413afd Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 4 Nov 1998 03:49:39 +0000
Subject: Simple update to make these work as kld and preload modules.

---
 sys/dev/syscons/blank/blank_saver.c       | 20 ++++++--------------
 sys/dev/syscons/daemon/daemon_saver.c     | 19 +++++--------------
 sys/dev/syscons/fade/fade_saver.c         | 20 ++++++--------------
 sys/dev/syscons/green/green_saver.c       | 20 ++++++--------------
 sys/dev/syscons/snake/snake_saver.c       | 19 +++++--------------
 sys/dev/syscons/star/star_saver.c         | 20 ++++++--------------
 sys/modules/syscons/blank/blank_saver.c   | 20 ++++++--------------
 sys/modules/syscons/daemon/daemon_saver.c | 19 +++++--------------
 sys/modules/syscons/fade/fade_saver.c     | 20 ++++++--------------
 sys/modules/syscons/green/green_saver.c   | 20 ++++++--------------
 sys/modules/syscons/saver.h               | 23 ++++++++++++++++++++++-
 sys/modules/syscons/snake/snake_saver.c   | 19 +++++--------------
 sys/modules/syscons/star/star_saver.c     | 20 ++++++--------------
 13 files changed, 90 insertions(+), 169 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index 1bb73233e790..9ad6e3f0d698 100644
--- a/sys/dev/syscons/blank/blank_saver.c
+++ b/sys/dev/syscons/blank/blank_saver.c
@@ -25,21 +25,18 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.12 1998/09/15 18:16:38 sos Exp $
+ *	$Id: blank_saver.c,v 1.13 1998/09/17 19:40:29 sos Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
 
 #include <i386/isa/isa.h>
 
 #include <saver.h>
 
-MOD_MISC(blank_saver);
-
 static void
 blank_saver(int blank)
 {
@@ -91,7 +88,7 @@ blank_saver(int blank)
 }
 
 static int
-blank_saver_load(struct lkm_table *lkmtp, int cmd)
+blank_saver_load(void)
 {
 	switch (crtc_type) {
 	case KD_MONO:
@@ -108,14 +105,9 @@ blank_saver_load(struct lkm_table *lkmtp, int cmd)
 }
 
 static int
-blank_saver_unload(struct lkm_table *lkmtp, int cmd)
+blank_saver_unload(void)
 {
 	return remove_scrn_saver(blank_saver);
 }
 
-int
-blank_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	MOD_DISPATCH(blank_saver, lkmtp, cmd, ver,
-		blank_saver_load, blank_saver_unload, lkm_nullcmd);
-}
+SAVER_MODULE(blank_saver);
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 59e99f0fe328..d3f9036cb420 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,14 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.10 1998/09/15 18:16:38 sos Exp $
+ *	$Id: daemon_saver.c,v 1.11 1998/09/17 19:40:30 sos Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
+#include <sys/module.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
@@ -48,8 +46,6 @@
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
-MOD_MISC(daemon_saver);
-
 static char *message;
 static int messagelen;
 static u_short *window;
@@ -335,7 +331,7 @@ daemon_saver(int blank)
 }
 
 static int
-daemon_saver_load(struct lkm_table *lkmtp, int cmd)
+daemon_saver_load(void)
 {
 	int err;
 
@@ -351,7 +347,7 @@ daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 }
 
 static int
-daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
+daemon_saver_unload(void)
 {
 	int err;
 
@@ -361,9 +357,4 @@ daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
 	return err;
 }
 
-int
-daemon_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	MOD_DISPATCH(daemon_saver, lkmtp, cmd, ver,
-		daemon_saver_load, daemon_saver_unload, lkm_nullcmd);
-}
+SAVER_MODULE(daemon_saver);
diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index 0d31bd6de526..3a2cc0c6f50b 100644
--- a/sys/dev/syscons/fade/fade_saver.c
+++ b/sys/dev/syscons/fade/fade_saver.c
@@ -25,21 +25,18 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.13 1998/09/15 18:16:39 sos Exp $
+ *	$Id: fade_saver.c,v 1.14 1998/09/17 19:40:30 sos Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
 
 #include <i386/isa/isa.h>
 
 #include <saver.h>
 
-MOD_MISC(fade_saver);
-
 static void
 fade_saver(int blank)
 {
@@ -103,7 +100,7 @@ fade_saver(int blank)
 }
 
 static int
-fade_saver_load(struct lkm_table *lkmtp, int cmd)
+fade_saver_load(void)
 {
 	switch (crtc_type) {
 	case KD_MONO:
@@ -124,14 +121,9 @@ fade_saver_load(struct lkm_table *lkmtp, int cmd)
 }
 
 static int
-fade_saver_unload(struct lkm_table *lkmtp, int cmd)
+fade_saver_unload(void)
 {
 	return remove_scrn_saver(fade_saver);
 }
 
-int
-fade_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	MOD_DISPATCH(fade_saver, lkmtp, cmd, ver,
-		fade_saver_load, fade_saver_unload, lkm_nullcmd);
-}
+SAVER_MODULE(fade_saver);
diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index 0e61c2e2102b..0491c67dbe14 100644
--- a/sys/dev/syscons/green/green_saver.c
+++ b/sys/dev/syscons/green/green_saver.c
@@ -25,21 +25,18 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.12 1998/09/15 18:16:39 sos Exp $
+ *	$Id: green_saver.c,v 1.13 1998/09/17 19:40:30 sos Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
 
 #include <i386/isa/isa.h>
 
 #include <saver.h>
 
-MOD_MISC(green_saver);
-
 static void
 green_saver(int blank)
 {
@@ -95,7 +92,7 @@ green_saver(int blank)
 }
 
 static int
-green_saver_load(struct lkm_table *lkmtp, int cmd)
+green_saver_load(void)
 {
 	switch (crtc_type) {
 	case KD_MONO:
@@ -116,14 +113,9 @@ green_saver_load(struct lkm_table *lkmtp, int cmd)
 }
 
 static int
-green_saver_unload(struct lkm_table *lkmtp, int cmd)
+green_saver_unload(void)
 {
 	return remove_scrn_saver(green_saver);
 }
 
-int
-green_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	MOD_DISPATCH(green_saver, lkmtp, cmd, ver,
-		green_saver_load, green_saver_unload, lkm_nullcmd);
-}
+SAVER_MODULE(green_saver);
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index efb76d505df7..3100ff3038d5 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -25,14 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.18 1998/09/15 18:16:39 sos Exp $
+ *	$Id: snake_saver.c,v 1.19 1998/09/17 19:40:30 sos Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
+#include <sys/module.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
@@ -42,8 +40,6 @@
 
 #include <saver.h>
 
-MOD_MISC(snake_saver);
-
 static char	*message;
 static u_char	**messagep;
 static int	messagelen;
@@ -112,7 +108,7 @@ snake_saver(int blank)
 }
 
 static int
-snake_saver_load(struct lkm_table *lkmtp, int cmd)
+snake_saver_load(void)
 {
 	int err;
 
@@ -130,7 +126,7 @@ snake_saver_load(struct lkm_table *lkmtp, int cmd)
 }
 
 static int
-snake_saver_unload(struct lkm_table *lkmtp, int cmd)
+snake_saver_unload(void)
 {
 	int err;
 
@@ -142,9 +138,4 @@ snake_saver_unload(struct lkm_table *lkmtp, int cmd)
 	return err;
 }
 
-int
-snake_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	MOD_DISPATCH(snake_saver, lkmtp, cmd, ver,
-		snake_saver_load, snake_saver_unload, lkm_nullcmd);
-}
+SAVER_MODULE(snake_saver);
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 2e56a3c96fbd..719d502ec699 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -25,22 +25,19 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.15 1998/09/15 18:16:39 sos Exp $
+ *	$Id: star_saver.c,v 1.16 1998/09/17 19:40:30 sos Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
 
 #include <machine/md_var.h>
 #include <machine/pc/display.h>
 
 #include <saver.h>
 
-MOD_MISC(star_saver);
-
 #define NUM_STARS	50
 
 static u_short *window;
@@ -94,20 +91,15 @@ star_saver(int blank)
 }
 
 static int
-star_saver_load(struct lkm_table *lkmtp, int cmd)
+star_saver_load(void)
 {
 	return add_scrn_saver(star_saver);
 }
 
 static int
-star_saver_unload(struct lkm_table *lkmtp, int cmd)
+star_saver_unload(void)
 {
 	return remove_scrn_saver(star_saver);
 }
 
-int
-star_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	MOD_DISPATCH(star_saver, lkmtp, cmd, ver,
-		star_saver_load, star_saver_unload, lkm_nullcmd);
-}
+SAVER_MODULE(star_saver);
diff --git a/sys/modules/syscons/blank/blank_saver.c b/sys/modules/syscons/blank/blank_saver.c
index 1bb73233e790..9ad6e3f0d698 100644
--- a/sys/modules/syscons/blank/blank_saver.c
+++ b/sys/modules/syscons/blank/blank_saver.c
@@ -25,21 +25,18 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.12 1998/09/15 18:16:38 sos Exp $
+ *	$Id: blank_saver.c,v 1.13 1998/09/17 19:40:29 sos Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
 
 #include <i386/isa/isa.h>
 
 #include <saver.h>
 
-MOD_MISC(blank_saver);
-
 static void
 blank_saver(int blank)
 {
@@ -91,7 +88,7 @@ blank_saver(int blank)
 }
 
 static int
-blank_saver_load(struct lkm_table *lkmtp, int cmd)
+blank_saver_load(void)
 {
 	switch (crtc_type) {
 	case KD_MONO:
@@ -108,14 +105,9 @@ blank_saver_load(struct lkm_table *lkmtp, int cmd)
 }
 
 static int
-blank_saver_unload(struct lkm_table *lkmtp, int cmd)
+blank_saver_unload(void)
 {
 	return remove_scrn_saver(blank_saver);
 }
 
-int
-blank_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	MOD_DISPATCH(blank_saver, lkmtp, cmd, ver,
-		blank_saver_load, blank_saver_unload, lkm_nullcmd);
-}
+SAVER_MODULE(blank_saver);
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index 59e99f0fe328..d3f9036cb420 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,14 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.10 1998/09/15 18:16:38 sos Exp $
+ *	$Id: daemon_saver.c,v 1.11 1998/09/17 19:40:30 sos Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
+#include <sys/module.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
@@ -48,8 +46,6 @@
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
-MOD_MISC(daemon_saver);
-
 static char *message;
 static int messagelen;
 static u_short *window;
@@ -335,7 +331,7 @@ daemon_saver(int blank)
 }
 
 static int
-daemon_saver_load(struct lkm_table *lkmtp, int cmd)
+daemon_saver_load(void)
 {
 	int err;
 
@@ -351,7 +347,7 @@ daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 }
 
 static int
-daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
+daemon_saver_unload(void)
 {
 	int err;
 
@@ -361,9 +357,4 @@ daemon_saver_unload(struct lkm_table *lkmtp, int cmd)
 	return err;
 }
 
-int
-daemon_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	MOD_DISPATCH(daemon_saver, lkmtp, cmd, ver,
-		daemon_saver_load, daemon_saver_unload, lkm_nullcmd);
-}
+SAVER_MODULE(daemon_saver);
diff --git a/sys/modules/syscons/fade/fade_saver.c b/sys/modules/syscons/fade/fade_saver.c
index 0d31bd6de526..3a2cc0c6f50b 100644
--- a/sys/modules/syscons/fade/fade_saver.c
+++ b/sys/modules/syscons/fade/fade_saver.c
@@ -25,21 +25,18 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.13 1998/09/15 18:16:39 sos Exp $
+ *	$Id: fade_saver.c,v 1.14 1998/09/17 19:40:30 sos Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
 
 #include <i386/isa/isa.h>
 
 #include <saver.h>
 
-MOD_MISC(fade_saver);
-
 static void
 fade_saver(int blank)
 {
@@ -103,7 +100,7 @@ fade_saver(int blank)
 }
 
 static int
-fade_saver_load(struct lkm_table *lkmtp, int cmd)
+fade_saver_load(void)
 {
 	switch (crtc_type) {
 	case KD_MONO:
@@ -124,14 +121,9 @@ fade_saver_load(struct lkm_table *lkmtp, int cmd)
 }
 
 static int
-fade_saver_unload(struct lkm_table *lkmtp, int cmd)
+fade_saver_unload(void)
 {
 	return remove_scrn_saver(fade_saver);
 }
 
-int
-fade_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	MOD_DISPATCH(fade_saver, lkmtp, cmd, ver,
-		fade_saver_load, fade_saver_unload, lkm_nullcmd);
-}
+SAVER_MODULE(fade_saver);
diff --git a/sys/modules/syscons/green/green_saver.c b/sys/modules/syscons/green/green_saver.c
index 0e61c2e2102b..0491c67dbe14 100644
--- a/sys/modules/syscons/green/green_saver.c
+++ b/sys/modules/syscons/green/green_saver.c
@@ -25,21 +25,18 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.12 1998/09/15 18:16:39 sos Exp $
+ *	$Id: green_saver.c,v 1.13 1998/09/17 19:40:30 sos Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
 
 #include <i386/isa/isa.h>
 
 #include <saver.h>
 
-MOD_MISC(green_saver);
-
 static void
 green_saver(int blank)
 {
@@ -95,7 +92,7 @@ green_saver(int blank)
 }
 
 static int
-green_saver_load(struct lkm_table *lkmtp, int cmd)
+green_saver_load(void)
 {
 	switch (crtc_type) {
 	case KD_MONO:
@@ -116,14 +113,9 @@ green_saver_load(struct lkm_table *lkmtp, int cmd)
 }
 
 static int
-green_saver_unload(struct lkm_table *lkmtp, int cmd)
+green_saver_unload(void)
 {
 	return remove_scrn_saver(green_saver);
 }
 
-int
-green_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	MOD_DISPATCH(green_saver, lkmtp, cmd, ver,
-		green_saver_load, green_saver_unload, lkm_nullcmd);
-}
+SAVER_MODULE(green_saver);
diff --git a/sys/modules/syscons/saver.h b/sys/modules/syscons/saver.h
index 9eb19956327f..8eba276b1bde 100644
--- a/sys/modules/syscons/saver.h
+++ b/sys/modules/syscons/saver.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: saver.h,v 1.11 1998/09/15 18:16:38 sos Exp $
+ *	$Id: saver.h,v 1.12 1998/09/17 19:40:29 sos Exp $
  */
 #include <machine/apm_bios.h>
 #include <machine/console.h>
@@ -42,3 +42,24 @@ extern int	scrn_blanked;
 extern int	fonts_loaded;
 extern char	font_8[], font_14[], font_16[];
 extern char	palette[];
+
+#define SAVER_MODULE(name) \
+	static int name ## _modevent(module_t mod, modeventtype_t type, \
+		void *data) \
+	{ \
+		switch (type) { \
+		case MOD_LOAD: \
+			return name ## _load(); \
+		case MOD_UNLOAD: \
+			return name ## _unload(); \
+		default: \
+			break; \
+		} \
+		return 0; \
+	} \
+	static moduledata_t name ## _mod = { \
+		#name, \
+		name ## _modevent, \
+		NULL \
+	}; \
+	DECLARE_MODULE(name, name ## _mod, SI_SUB_PSEUDO, SI_ORDER_MIDDLE)
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index efb76d505df7..3100ff3038d5 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -25,14 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.18 1998/09/15 18:16:39 sos Exp $
+ *	$Id: snake_saver.c,v 1.19 1998/09/17 19:40:30 sos Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
+#include <sys/module.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
@@ -42,8 +40,6 @@
 
 #include <saver.h>
 
-MOD_MISC(snake_saver);
-
 static char	*message;
 static u_char	**messagep;
 static int	messagelen;
@@ -112,7 +108,7 @@ snake_saver(int blank)
 }
 
 static int
-snake_saver_load(struct lkm_table *lkmtp, int cmd)
+snake_saver_load(void)
 {
 	int err;
 
@@ -130,7 +126,7 @@ snake_saver_load(struct lkm_table *lkmtp, int cmd)
 }
 
 static int
-snake_saver_unload(struct lkm_table *lkmtp, int cmd)
+snake_saver_unload(void)
 {
 	int err;
 
@@ -142,9 +138,4 @@ snake_saver_unload(struct lkm_table *lkmtp, int cmd)
 	return err;
 }
 
-int
-snake_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	MOD_DISPATCH(snake_saver, lkmtp, cmd, ver,
-		snake_saver_load, snake_saver_unload, lkm_nullcmd);
-}
+SAVER_MODULE(snake_saver);
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 2e56a3c96fbd..719d502ec699 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -25,22 +25,19 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.15 1998/09/15 18:16:39 sos Exp $
+ *	$Id: star_saver.c,v 1.16 1998/09/17 19:40:30 sos Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
 
 #include <machine/md_var.h>
 #include <machine/pc/display.h>
 
 #include <saver.h>
 
-MOD_MISC(star_saver);
-
 #define NUM_STARS	50
 
 static u_short *window;
@@ -94,20 +91,15 @@ star_saver(int blank)
 }
 
 static int
-star_saver_load(struct lkm_table *lkmtp, int cmd)
+star_saver_load(void)
 {
 	return add_scrn_saver(star_saver);
 }
 
 static int
-star_saver_unload(struct lkm_table *lkmtp, int cmd)
+star_saver_unload(void)
 {
 	return remove_scrn_saver(star_saver);
 }
 
-int
-star_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	MOD_DISPATCH(star_saver, lkmtp, cmd, ver,
-		star_saver_load, star_saver_unload, lkm_nullcmd);
-}
+SAVER_MODULE(star_saver);
-- 
cgit v1.3


From 2ad872c5794e4c26fdf6ed219ad3f09ca0d5304a Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Mon, 11 Jan 1999 03:18:56 +0000
Subject: The first stage of console driver reorganization: activate new
 keyboard and video card drivers.

Because of the changes, you are required to update your kernel
configuration file now!

The files in sys/dev/syscons are still i386-specific (but less so than
before), and won't compile for alpha and PC98 yet.

syscons still directly accesses the video card registers here and
there; this will be rectified in the later stages.
---
 sys/amd64/conf/GENERIC                    |   18 +-
 sys/conf/NOTES                            |   35 +-
 sys/conf/files.i386                       |   25 +-
 sys/conf/options.i386                     |   27 +-
 sys/dev/syscons/blank/blank_saver.c       |   41 +-
 sys/dev/syscons/daemon/daemon_saver.c     |   56 +-
 sys/dev/syscons/fade/fade_saver.c         |   51 +-
 sys/dev/syscons/green/green_saver.c       |   36 +-
 sys/dev/syscons/logo/logo_saver.c         |   79 +-
 sys/dev/syscons/rain/rain_saver.c         |   65 +-
 sys/dev/syscons/scvesactl.c               |   27 +-
 sys/dev/syscons/scvidctl.c                |  161 ++-
 sys/dev/syscons/snake/snake_saver.c       |   69 +-
 sys/dev/syscons/star/star_saver.c         |   45 +-
 sys/dev/syscons/syscons.c                 | 1640 ++++++++++++-----------------
 sys/dev/syscons/syscons.h                 |   41 +-
 sys/dev/syscons/warp/warp_saver.c         |   56 +-
 sys/i386/conf/GENERIC                     |   18 +-
 sys/i386/conf/LINT                        |   35 +-
 sys/i386/conf/NOTES                       |   35 +-
 sys/i386/conf/files.i386                  |   25 +-
 sys/i386/conf/options.i386                |   27 +-
 sys/i386/include/console.h                |   75 +-
 sys/i386/include/pc/vesa.h                |    6 +-
 sys/i386/isa/pcvt/pcvt_drv.c              |  162 ++-
 sys/i386/isa/pcvt/pcvt_hdr.h              |   32 +-
 sys/i386/isa/pcvt/pcvt_kbd.c              |  284 ++---
 sys/i386/isa/psm.c                        |    7 +-
 sys/i386/isa/vesa.c                       |  372 ++++---
 sys/modules/syscons/blank/blank_saver.c   |   41 +-
 sys/modules/syscons/daemon/daemon_saver.c |   56 +-
 sys/modules/syscons/fade/fade_saver.c     |   51 +-
 sys/modules/syscons/green/green_saver.c   |   36 +-
 sys/modules/syscons/logo/logo_saver.c     |   79 +-
 sys/modules/syscons/rain/rain_saver.c     |   65 +-
 sys/modules/syscons/saver.h               |   44 +-
 sys/modules/syscons/snake/snake_saver.c   |   69 +-
 sys/modules/syscons/star/star_saver.c     |   45 +-
 sys/modules/syscons/warp/warp_saver.c     |   56 +-
 sys/modules/vesa/Makefile                 |   22 +-
 40 files changed, 2000 insertions(+), 2114 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 88943bbba776..76781f47b02a 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.141 1999/01/01 08:09:57 peter Exp $
+#	$Id: GENERIC,v 1.142 1999/01/09 18:12:07 wpaul Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -108,10 +108,20 @@ controller	matcd0	at isa? port 0x230 bio
 
 device		scd0	at isa? port 0x230 bio
 
+# atkbdc0 controlls both the keyboard and the PS/2 mouse
+controller	atkbdc0	at isa? port IO_KBD tty
+device		atkbd0	at isa? tty irq 1
+device		psm0	at isa? tty irq 12
+
+device		vga0	at isa? port ? conflicts
+
+# splash screen/screen saver
+pseudo-device	splash
+
 # syscons is the default console driver, resembling an SCO console
-device		sc0	at isa? port IO_KBD conflicts tty irq 1
+device		sc0	at isa? tty
 # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
-#device		vt0	at isa? port IO_KBD conflicts tty irq 1
+#device		vt0	at isa? tty
 #options		XSERVER			# support for X server
 #options		FAT_CURSOR		# start with block cursor
 # If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines
@@ -136,8 +146,6 @@ device		sio3	at isa? disable port "IO_COM4" tty irq 9
 
 device		lpt0	at isa? port? tty irq 7
 
-device		psm0	at isa? port IO_KBD conflicts tty irq 12
-
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
 # Right now it appears that the ie0 must be probed before ep0. See
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 7e937639c82e..80171ee18d13 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.529 1999/01/09 18:12:07 wpaul Exp $
+#	$Id: LINT,v 1.531 1999/01/10 07:45:33 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -842,15 +842,35 @@ options		"NTIMECOUNTER=20"
 # configure cards from USERCONFIG.  See pnp(4) for more info.
 controller	pnp0
 
+# The keyboard controller; it controlls the keyboard and the PS/2 mouse.
+controller	atkbdc0	at isa? port IO_KBD tty
+
+# The AT keyboard
+device		atkbd0	at isa? tty irq 1
+
+# PS/2 mouse
+device		psm0	at isa? tty irq 12
+
+# Options for psm:
+options		PSM_HOOKAPM		#hook the APM resume event, useful
+					#for some laptops
+options		PSM_RESETAFTERSUSPEND	#reset the device at the resume event
+
+# The video card driver.
+device		vga0	at isa? port ? conflicts
+
+# Splash screen at start up!  Screen savers require this too.
+pseudo-device	splash
+
 # The pcvt console driver (vt220 compatible).
-device		vt0	at isa? port IO_KBD conflicts tty irq 1
+device		vt0	at isa? tty
 options		XSERVER			# support for running an X server.
 options		FAT_CURSOR		# start with block cursor
 # This PCVT option is for keyboards such as those used on IBM ThinkPad laptops
 options		PCVT_SCANSET=2 		# IBM keyboards are non-std
 
 # The syscons console driver (sco color console compatible).
-device		sc0	at isa? port IO_KBD conflicts tty irq 1
+device		sc0	at isa? tty
 options		MAXCONS=16		# number of virtual consoles
 options		SLOW_VGA		# do byte-wide i/o's to TS and GDC regs
 options		"STD8X16FONT"		# Compile font in
@@ -1050,7 +1070,7 @@ disk		fd0	at fdc0 drive 0
 disk		fd1	at fdc0 drive 1
 
 #
-# Other standard PC hardware: `lpt', `mse', `psm', `sio', etc.
+# Other standard PC hardware: `lpt', `mse', `sio', etc.
 #
 # lpt: printer port
 #	lpt specials:
@@ -1059,18 +1079,11 @@ disk		fd1	at fdc0 drive 1
 #		The irq clause may be omitted.  This will force the port
 #		into polling mode.
 # mse: Logitech and ATI InPort bus mouse ports
-# psm: PS/2 mouse port [note: conflicts with sc0/vt0, thus "conflicts" keywd]
 # sio: serial ports (see sio(4))
 
 device		lpt0	at isa? port? tty irq 7
 device		lpt1	at isa? port "IO_LPT3" tty irq 5
 device		mse0	at isa? port 0x23c tty irq 5
-device		psm0	at isa? port IO_KBD conflicts tty irq 12
-
-# Options for psm:
-options		PSM_HOOKAPM		#hook the APM resume event, useful
-					#for some laptops
-options		PSM_RESETAFTERSUSPEND	#reset the device at the resume event
 
 device		sio0	at isa? port "IO_COM1" tty flags 0x10 irq 4
 
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index f9558632ec0b..9aa97d40a7ce 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.216 1998/12/31 08:17:08 luigi Exp $
+#	$Id: files.i386,v 1.217 1999/01/01 08:09:58 peter Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -24,6 +24,17 @@ font8x16.o			optional	std8x16font		\
 	no-implicit-rule before-depend \
 	clean		"${STD8X16FONT}-8x16 font8x16.c" 
 #
+dev/fb/fb.c			optional	fb	device-driver
+dev/fb/fb.c			optional	vga	device-driver
+dev/fb/splash.c			optional	splash
+dev/kbd/atkbd.c			optional	atkbd	device-driver
+dev/kbd/atkbdc.c		optional	atkbdc	device-driver
+dev/kbd/kbd.c			optional	atkbd	device-driver
+dev/kbd/kbd.c			optional	kbd	device-driver
+#dev/kbd/kbd.c			optional	ukbd	device-driver
+dev/syscons/syscons.c		optional	sc	device-driver
+dev/syscons/scvidctl.c		optional	sc	device-driver
+dev/syscons/scvesactl.c		optional	sc	device-driver
 i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
 i386/eisa/dpt_eisa.c		optional	eisa dpt device-driver
@@ -98,6 +109,8 @@ i386/isa/aha_isa.c		optional	aha	device-driver
 #i386/isa/aic6360.c              optional        aic     device-driver
 i386/isa/aic_isa.c              optional        aic     device-driver
 i386/isa/alog.c                 optional        alog    device-driver
+i386/isa/atkbd_isa.c		optional	atkbd	device-driver
+i386/isa/atkbdc_isa.c		optional	atkbdc	device-driver
 i386/isa/bt_isa.c		optional	bt	device-driver
 i386/isa/clock.c		standard
 i386/isa/cronyx.c		optional	cx	device-driver
@@ -133,9 +146,6 @@ i386/isa/intr_machdep.c		standard
 i386/isa/isa.c			optional	isa	device-driver
 i386/isa/istallion.c		optional	stli	device-driver
 i386/isa/joy.c			optional        joy     device-driver
-i386/isa/kbdio.c		optional        psm     device-driver
-i386/isa/kbdio.c		optional        sc      device-driver
-i386/isa/kbdio.c		optional        vt      device-driver
 i386/isa/loran.c		optional	loran	device-driver
 i386/isa/lpt.c			optional	lpt	device-driver
 i386/isa/labpc.c		optional	labpc	device-driver
@@ -235,11 +245,8 @@ i386/isa/sound/cs4232.c		optional	css	device-driver
 i386/isa/spigot.c		optional	spigot	device-driver
 i386/isa/spkr.c			optional	speaker	device-driver
 i386/isa/stallion.c		optional	stl	device-driver
-i386/isa/syscons.c		optional	sc	device-driver
-i386/isa/scvidctl.c		optional	sc	device-driver
-i386/isa/scvesactl.c		optional	sc	device-driver
-i386/isa/videoio.c		optional	sc	device-driver
-i386/isa/vesa.c			optional	sc	device-driver
+i386/isa/vesa.c			optional	vga	device-driver
+i386/isa/vga_isa.c		optional	vga	device-driver
 i386/isa/tw.c			optional	tw	device-driver
 i386/isa/wd.c			optional	wdc	device-driver
 i386/isa/wd.c			optional	wd	device-driver
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 1b844a62dcbf..2704d563788d 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.101 1999/01/01 08:09:58 peter Exp $
+#	$Id: options.i386,v 1.102 1999/01/10 17:41:33 nsouch Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -66,16 +66,26 @@ I486_CPU		opt_global.h
 I586_CPU		opt_global.h
 I686_CPU		opt_global.h
 
-SC_SPLASH_SCREEN	opt_syscons.h
 MAXCONS			opt_syscons.h
-SLOW_VGA		opt_syscons.h
+# obsolete, use VGA_SLOW_IOACCESS
+#SLOW_VGA		opt_syscons.h
 STD8X16FONT		opt_syscons.h
 SC_HISTORY_SIZE		opt_syscons.h
 SC_DISABLE_REBOOT	opt_syscons.h
 SC_MOUSE_CHAR		opt_syscons.h
-SC_ALT_SEQACCESS	opt_syscons.h
+# obsolete, use VGA_ALT_SEQACCESS
+#SC_ALT_SEQACCESS	opt_syscons.h
+
+FB_INSTALL_CDEV		opt_fb.h
+
+VGA_ALT_SEQACCESS	opt_vga.h
+VGA_DEBUG		opt_vga.h
+VGA_NO_FONT_LOADING	opt_vga.h
+VGA_NO_MODE_CHANGE	opt_vga.h
+VGA_SLOW_IOACCESS	opt_vga.h
 
 VESA			opt_vesa.h
+VESA_DEBUG		opt_vesa.h
 
 PSM_HOOKAPM		opt_psm.h
 PSM_RESETAFTERSUSPEND	opt_psm.h
@@ -83,10 +93,11 @@ PSM_DEBUG		opt_psm.h
 
 PCIC_RESUME_RESET	opt_pcic.h
 
-KBD_RESETDELAY		opt_kbdio.h
-KBD_MAXRETRY		opt_kbdio.h
-KBD_MAXWAIT		opt_kbdio.h
-KBDIO_DEBUG		opt_kbdio.h
+KBD_INSTALL_CDEV	opt_kbd.h
+KBD_MAXRETRY		opt_kbd.h
+KBD_MAXWAIT		opt_kbd.h
+KBD_RESETDELAY		opt_kbd.h
+KBDIO_DEBUG		opt_kbd.h
 
 ATAPI			opt_atapi.h
 ATAPI_STATIC		opt_atapi.h
diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index 9ad6e3f0d698..89dd199815f5 100644
--- a/sys/dev/syscons/blank/blank_saver.c
+++ b/sys/dev/syscons/blank/blank_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.13 1998/09/17 19:40:29 sos Exp $
+ *	$Id: blank_saver.c,v 1.14 1998/11/04 03:49:38 peter Exp $
  */
 
 #include <sys/param.h>
@@ -33,18 +33,18 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 
+#include <dev/fb/vgareg.h>
+
 #include <i386/isa/isa.h>
 
 #include <saver.h>
 
-static void
-blank_saver(int blank)
+static int
+blank_saver(video_adapter_t *adp, int blank)
 {
 	u_char val;
 	if (blank) {
-		scrn_blanked = 1;
-		cur_console->status |= SAVER_RUNNING;
-		switch (crtc_type) {
+		switch (adp->va_type) {
 		case KD_VGA:
 			outb(TSIDX, 0x01); val = inb(TSREG);
 			outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
@@ -53,18 +53,18 @@ blank_saver(int blank)
 			/* not yet done XXX */
 			break;
 		case KD_CGA:
-			outb(crtc_addr + 4, 0x25);
+			outb(adp->va_crtc_addr + 4, 0x25);
 			break;
 		case KD_MONO:
 		case KD_HERCULES:
-			outb(crtc_addr + 4, 0x21);
+			outb(adp->va_crtc_addr + 4, 0x21);
 			break;
 		default:
 			break;
 		}
 	}
 	else {
-		switch (crtc_type) {
+		switch (adp->va_type) {
 		case KD_VGA:
 			outb(TSIDX, 0x01); val = inb(TSREG);
 			outb(TSIDX, 0x01); outb(TSREG, val & 0xDF);
@@ -73,24 +73,23 @@ blank_saver(int blank)
 			/* not yet done XXX */
 			break;
 		case KD_CGA:
-			outb(crtc_addr + 4, 0x2d);
+			outb(adp->va_crtc_addr + 4, 0x2d);
 			break;
 		case KD_MONO:
 		case KD_HERCULES:
-			outb(crtc_addr + 4, 0x29);
+			outb(adp->va_crtc_addr + 4, 0x29);
 			break;
 		default:
 			break;
 		}
-		cur_console->status &= ~SAVER_RUNNING;
-		scrn_blanked = 0;
 	}
+	return 0;
 }
 
 static int
-blank_saver_load(void)
+blank_init(video_adapter_t *adp)
 {
-	switch (crtc_type) {
+	switch (adp->va_type) {
 	case KD_MONO:
 	case KD_HERCULES:
 	case KD_CGA:
@@ -101,13 +100,17 @@ blank_saver_load(void)
 	default:
 		return ENODEV;
 	}
-	return add_scrn_saver(blank_saver);
+	return 0;
 }
 
 static int
-blank_saver_unload(void)
+blank_term(video_adapter_t *adp)
 {
-	return remove_scrn_saver(blank_saver);
+	return 0;
 }
 
-SAVER_MODULE(blank_saver);
+static scrn_saver_t blank_module = {
+	"blank_saver", blank_init, blank_term, blank_saver, NULL,
+};
+
+SAVER_MODULE(blank_saver, blank_module);
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index d3f9036cb420..8e45a723c03a 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.11 1998/09/17 19:40:30 sos Exp $
+ *	$Id: daemon_saver.c,v 1.12 1998/11/04 03:49:38 peter Exp $
  */
 
 #include <sys/param.h>
@@ -49,6 +49,7 @@
 static char *message;
 static int messagelen;
 static u_short *window;
+static int blanked;
 
 /* Who is the author of this ASCII pic? */
 
@@ -184,8 +185,8 @@ draw_string(int xpos, int ypos, int xoff, char *s, int len)
 			scr_map[s[x]]|(FG_LIGHTGREEN|BG_BLACK)<<8;
 }
 
-static void
-daemon_saver(int blank)
+static int
+daemon_saver(video_adapter_t *adp, int blank)
 {
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
@@ -198,20 +199,19 @@ daemon_saver(int blank)
 	int min, max;
 
 	if (blank) {
-		if (!ISTEXTSC(scp))
-			return;
-		if (scrn_blanked == 0) {
-			scp->status |= SAVER_RUNNING;
-			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
+		if (adp->va_mode_flags & V_INFO_GRAPHICS)
+			return ENODEV;
+		if (blanked == 0) {
+			window = (u_short *)adp->va_window;
 			/* clear the screen and set the border color */
 			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
 			      window, scp->xsize * scp->ysize);
 			set_border(scp, 0);
 			xlen = ylen = tlen = 0;
 		}
-		if (scrn_blanked++ < 2)
-			return;
-		scrn_blanked = 1;
+		if (blanked++ < 2)
+			return 0;
+		blanked = 1;
 
  		clear_daemon(dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
 		clear_string(txpos, typos, toff, (char *)message, tlen);
@@ -322,39 +322,31 @@ daemon_saver(int blank)
  		draw_daemon(dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
 		draw_string(txpos, typos, toff, (char *)message, tlen);
 	} else {
-		if (scrn_blanked > 0) {
-			set_border(scp, scp->border);
-			scrn_blanked = 0;
-			scp->status &= ~SAVER_RUNNING;
-		}
+		blanked = 0;
 	}
+	return 0;
 }
 
 static int
-daemon_saver_load(void)
+daemon_init(video_adapter_t *adp)
 {
-	int err;
-
 	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
 	    strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s - %s %s", hostname, ostype, osrelease);
-
-	err = add_scrn_saver(daemon_saver);
-	if (err != 0)
-		free(message, M_DEVBUF);
-	return err;
+	blanked = 0;
+	return 0;
 }
 
 static int
-daemon_saver_unload(void)
+daemon_term(video_adapter_t *adp)
 {
-	int err;
-
-	err = remove_scrn_saver(daemon_saver);
-	if (err == 0)
-		free(message, M_DEVBUF);
-	return err;
+	free(message, M_DEVBUF);
+	return 0;
 }
 
-SAVER_MODULE(daemon_saver);
+static scrn_saver_t daemon_module = {
+	"daemon_saver", daemon_init, daemon_term, daemon_saver, NULL,
+};
+
+SAVER_MODULE(daemon_saver, daemon_module);
diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index 3a2cc0c6f50b..70d36c9c1e0c 100644
--- a/sys/dev/syscons/fade/fade_saver.c
+++ b/sys/dev/syscons/fade/fade_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.14 1998/09/17 19:40:30 sos Exp $
+ *	$Id: fade_saver.c,v 1.15 1998/11/04 03:49:38 peter Exp $
  */
 
 #include <sys/param.h>
@@ -37,18 +37,22 @@
 
 #include <saver.h>
 
-static void
-fade_saver(int blank)
+static u_char palette[256*3];
+static int blanked;
+
+static int
+fade_saver(video_adapter_t *adp, int blank)
 {
 	static int count = 0;
 	u_char pal[256*3];
 	int i;
 
 	if (blank) {
-		scrn_blanked = 1;
-		cur_console->status |= SAVER_RUNNING;
-		switch (crtc_type) {
+		blanked = TRUE;
+		switch (adp->va_type) {
 		case KD_VGA:
+			if (count <= 0)
+				save_palette(adp, palette);
 			if (count < 64) {
 				pal[0] = pal[1] = pal[2] = 0;
 				for (i = 3; i < 256*3; i++) {
@@ -57,7 +61,7 @@ fade_saver(int blank)
 					else
 						pal[i] = 60;
 				}
-				load_palette(cur_console, pal);
+				load_palette(adp, pal);
 				count++;
 			}
 			break;
@@ -65,44 +69,44 @@ fade_saver(int blank)
 			/* not yet done XXX */
 			break;
 		case KD_CGA:
-			outb(crtc_addr + 4, 0x25);
+			outb(adp->va_crtc_addr + 4, 0x25);
 			break;
 		case KD_MONO:
 		case KD_HERCULES:
-			outb(crtc_addr + 4, 0x21);
+			outb(adp->va_crtc_addr + 4, 0x21);
 			break;
 		default:
 			break;
 		}
 	}
 	else {
-		switch (crtc_type) {
+		switch (adp->va_type) {
 		case KD_VGA:
-			load_palette(cur_console, palette);
+			load_palette(adp, palette);
 			count = 0;
 			break;
 		case KD_EGA:
 			/* not yet done XXX */
 			break;
 		case KD_CGA:
-			outb(crtc_addr + 4, 0x2d);
+			outb(adp->va_crtc_addr + 4, 0x2d);
 			break;
 		case KD_MONO:
 		case KD_HERCULES:
-			outb(crtc_addr + 4, 0x29);
+			outb(adp->va_crtc_addr + 4, 0x29);
 			break;
 		default:
 			break;
 		}
-		cur_console->status &= ~SAVER_RUNNING;
-		scrn_blanked = 0;
+		blanked = FALSE;
 	}
+	return 0;
 }
 
 static int
-fade_saver_load(void)
+fade_init(video_adapter_t *adp)
 {
-	switch (crtc_type) {
+	switch (adp->va_type) {
 	case KD_MONO:
 	case KD_HERCULES:
 	case KD_CGA:
@@ -117,13 +121,18 @@ fade_saver_load(void)
 	default:
 		return ENODEV;
 	}
-	return add_scrn_saver(fade_saver);
+	blanked = FALSE;
+	return 0;
 }
 
 static int
-fade_saver_unload(void)
+fade_term(video_adapter_t *adp)
 {
-	return remove_scrn_saver(fade_saver);
+	return 0;
 }
 
-SAVER_MODULE(fade_saver);
+static scrn_saver_t fade_module = {
+	"fade_saver", fade_init, fade_term, fade_saver, NULL,
+};
+
+SAVER_MODULE(fade_saver, fade_module);
diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index 0491c67dbe14..9decd7282f9f 100644
--- a/sys/dev/syscons/green/green_saver.c
+++ b/sys/dev/syscons/green/green_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.13 1998/09/17 19:40:30 sos Exp $
+ *	$Id: green_saver.c,v 1.14 1998/11/04 03:49:38 peter Exp $
  */
 
 #include <sys/param.h>
@@ -33,18 +33,21 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 
+#include <dev/fb/vgareg.h>
+
 #include <i386/isa/isa.h>
 
 #include <saver.h>
 
-static void
-green_saver(int blank)
+static int
+green_saver(video_adapter_t *adp, int blank)
 {
+	int crtc_addr;
 	u_char val;
+
+	crtc_addr = adp->va_crtc_addr;
 	if (blank) {
-		scrn_blanked = 1;
-		cur_console->status |= SAVER_RUNNING;
-		switch (crtc_type) {
+		switch (adp->va_type) {
 		case KD_VGA:
 			outb(TSIDX, 0x01); val = inb(TSREG);
 			outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
@@ -66,7 +69,7 @@ green_saver(int blank)
 		}
 	}
 	else {
-		switch (crtc_type) {
+		switch (adp->va_type) {
 		case KD_VGA:
 			outb(TSIDX, 0x01); val = inb(TSREG);
 			outb(TSIDX, 0x01); outb(TSREG, val & 0xDF);
@@ -86,15 +89,14 @@ green_saver(int blank)
 		default:
 			break;
 		}
-		cur_console->status &= ~SAVER_RUNNING;
-		scrn_blanked = 0;
 	}
+	return 0;
 }
 
 static int
-green_saver_load(void)
+green_init(video_adapter_t *adp)
 {
-	switch (crtc_type) {
+	switch (adp->va_type) {
 	case KD_MONO:
 	case KD_HERCULES:
 	case KD_CGA:
@@ -109,13 +111,17 @@ green_saver_load(void)
 	default:
 		return ENODEV;
 	}
-	return add_scrn_saver(green_saver);
+	return 0;
 }
 
 static int
-green_saver_unload(void)
+green_term(video_adapter_t *adp)
 {
-	return remove_scrn_saver(green_saver);
+	return 0;
 }
 
-SAVER_MODULE(green_saver);
+static scrn_saver_t green_module = {
+	"green_saver", green_init, green_term, green_saver, NULL,
+};
+
+SAVER_MODULE(green_saver, green_module);
diff --git a/sys/dev/syscons/logo/logo_saver.c b/sys/dev/syscons/logo/logo_saver.c
index ff42be0f3569..105fcae16e8c 100644
--- a/sys/dev/syscons/logo/logo_saver.c
+++ b/sys/dev/syscons/logo/logo_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: logo_saver.c,v 1.1 1998/12/28 14:22:57 des Exp $
+ *	$Id: logo_saver.c,v 1.2 1999/01/01 14:40:49 des Exp $
  */
 
 #include <sys/param.h>
@@ -34,26 +34,24 @@
 #include <sys/module.h>
 #include <sys/syslog.h>
 
-#include <machine/md_var.h>
-
 #include <saver.h>
 
 static u_char *vid;
 static int banksize, scrmode, scrw, scrh;
-static u_char save_pal[768];
+static int blanked;
 
 #include "logo.c"
 
-#define set_origin(scp, o) (*biosvidsw.set_win_org)((scp)->adp, o)
+#define set_origin(adp, o) (*vidsw[(adp)->va_index]->set_win_org)(adp, o)
 
 static void
-logo_blit(int x, int y)
+logo_blit(video_adapter_t *adp, int x, int y)
 {
     int d, l, o, p;
     
     for (o = 0, p = y * scrw + x; p > banksize; p -= banksize)
 	o += banksize;
-    set_origin(cur_console, o);
+    set_origin(adp, o);
 
     for (d = 0; d < sizeof logo_img; d += logo_w) {
 	if (p + logo_w < banksize) {
@@ -62,12 +60,12 @@ logo_blit(int x, int y)
 	} else if (p < banksize) {
 	    l = banksize - p;
 	    bcopy(logo_img + d, vid + p, l);
-	    set_origin(cur_console, (o += banksize));
+	    set_origin(adp, (o += banksize));
 	    bcopy(logo_img + d + l, vid, logo_w - l);
 	    p += scrw - banksize;
 	} else {
 	    p -= banksize;
-	    set_origin(cur_console, (o += banksize));
+	    set_origin(adp, (o += banksize));
 	    bcopy(logo_img + d, vid + p, logo_w);
 	    p += scrw;
 	}
@@ -75,7 +73,7 @@ logo_blit(int x, int y)
 }
 
 static void
-logo_update(void)
+logo_update(video_adapter_t *adp)
 {
     static int xpos = 0, ypos = 0;
     static int xinc = 1, yinc = 1;
@@ -89,62 +87,42 @@ logo_update(void)
     ypos += yinc;
 	
     /* XXX Relies on margin around logo to erase trail */
-    logo_blit(xpos, ypos);
+    logo_blit(adp, xpos, ypos);
 }
 
-static void
-logo_saver(int blank)
+static int
+logo_saver(video_adapter_t *adp, int blank)
 {
-    scr_stat *scp = cur_console;
-    static int saved_mode;
     int i, pl;
 
     if (blank) {
 	/* switch to graphics mode */
-	if (scrn_blanked <= 0) {
+	if (blanked <= 0) {
 	    pl = splhigh();
-	    saved_mode = scp->mode;
-	    scp->mode = scrmode;
-	    scp->status |= SAVER_RUNNING|GRAPHICS_MODE;
-	    save_palette(scp, (char *)save_pal);
-	    set_mode(scp);
-	    load_palette(scp, (char *)logo_pal);
-	    scrn_blanked++;
-	    vid = (u_char *)Crtat;
+	    set_video_mode(adp, scrmode, logo_pal, 0);
+	    blanked++;
+	    vid = (u_char *)adp->va_window;
 	    splx(pl);
 	    for (i = 0; i < scrw*scrh; i += banksize) {
-		set_origin(scp, i);
+		set_origin(adp, i);
 		bzero(vid, banksize);
 	    }
 	}
-	logo_update();
+	logo_update(adp);
     } else {
-	/* return to previous video mode */
-	if (scrn_blanked > 0) {
-	    if (saved_mode) {
-		pl = splhigh();
-		scrn_blanked = 0;
-		scp->mode = saved_mode;
-		scp->status &= ~(SAVER_RUNNING|GRAPHICS_MODE);
-		set_mode(scp);
-		load_palette(scp, (char *)save_pal);
-		saved_mode = 0;
-		splx(pl);
-	    }
-	}
+	blanked = 0;
     }
+    return 0;
 }
 
 static int
-logo_saver_load(void)
+logo_init(video_adapter_t *adp)
 {
     video_info_t info;
-    int adp;
     
-    adp = cur_console->adp;
-    if (!(*biosvidsw.get_info)(adp, M_VESA_CG800x600, &info)) {
+    if (!get_mode_info(adp, M_VESA_CG800x600, &info)) {
 	scrmode = M_VESA_CG800x600;
-    } else if (!(*biosvidsw.get_info)(adp, M_VGA_CG320, &info)) {
+    } else if (!get_mode_info(adp, M_VGA_CG320, &info)) {
 	scrmode = M_VGA_CG320;
     } else {
         log(LOG_NOTICE, "logo_saver: no suitable graphics mode\n");
@@ -154,14 +132,19 @@ logo_saver_load(void)
     banksize = info.vi_window_size;
     scrw = info.vi_width;
     scrh = info.vi_height;
+    blanked = 0;
     
-    return add_scrn_saver(logo_saver);
+    return 0;
 }
 
 static int
-logo_saver_unload(void)
+logo_term(video_adapter_t *adp)
 {
-    return remove_scrn_saver(logo_saver);
+    return 0;
 }
 
-SAVER_MODULE(logo_saver);
+static scrn_saver_t logo_module = {
+    "logo_saver", logo_init, logo_term, logo_saver, NULL,
+};
+
+SAVER_MODULE(logo_saver, logo_module);
diff --git a/sys/dev/syscons/rain/rain_saver.c b/sys/dev/syscons/rain/rain_saver.c
index 0ca46c8accb3..0b4b2ee3e9e2 100644
--- a/sys/dev/syscons/rain/rain_saver.c
+++ b/sys/dev/syscons/rain/rain_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: rain_saver.c,v 1.1 1998/12/31 13:41:40 des Exp $
  */
 
 #include <sys/param.h>
@@ -34,7 +34,6 @@
 #include <sys/module.h>
 #include <sys/syslog.h>
 
-#include <machine/md_var.h>
 #include <machine/random.h>
 
 #include <saver.h>
@@ -45,11 +44,11 @@ static u_char *vid;
 #define SCRH 200
 #define MAX 63
 
-static u_char save_pal[768];
 static u_char rain_pal[768];
+static int blanked;
 
 static void
-rain_update(void)
+rain_update(video_adapter_t *adp)
 {
     int i, t;
 
@@ -57,28 +56,21 @@ rain_update(void)
     for (i = (MAX*3+2); i > 5; i -= 3)
 	rain_pal[i] = rain_pal[i-3];
     rain_pal[5] = t;
-    load_palette(cur_console, rain_pal);
+    load_palette(adp, rain_pal);
 }
 
-static void
-rain_saver(int blank)
+static int
+rain_saver(video_adapter_t *adp, int blank)
 {
-    scr_stat *scp = cur_console;
-    static int saved_mode;
     int i, j, k, pl;
 
     if (blank) {
 	/* switch to graphics mode */
-	if (scrn_blanked <= 0) {
+	if (blanked <= 0) {
 	    pl = splhigh();
-	    saved_mode = scp->mode;
-	    scp->mode = M_VGA_CG320;
-	    scp->status |= SAVER_RUNNING|GRAPHICS_MODE;
-	    save_palette(scp, save_pal);
-	    set_mode(scp);
-	    load_palette(scp, rain_pal);
-	    scrn_blanked++;
-	    vid = (u_char *)Crtat;
+	    set_video_mode(adp, M_VGA_CG320, rain_pal, 0);
+	    blanked++;
+	    vid = (u_char *)adp->va_window;
 	    splx(pl);
 	    bzero(vid, SCRW*SCRH);
 	    for (i = 0; i < SCRW; i += 2)
@@ -89,33 +81,22 @@ rain_saver(int blank)
 	}
 
 	/* update display */
-	rain_update();
+	rain_update(adp);
 	
     } else {
-	/* return to previous video mode */
-	if (scrn_blanked > 0) {
-	    if (saved_mode) {
-		pl = splhigh();
-		scrn_blanked = 0;
-		scp->mode = saved_mode;
-		scp->status &= ~(SAVER_RUNNING|GRAPHICS_MODE);
-		set_mode(scp);
-		load_palette(scp, save_pal);
-		saved_mode = 0;
-		splx(pl);
-	    }
-	}
+	blanked = 0;
     }
+    return 0;
 }
 
 static int
-rain_saver_load(void)
+rain_init(video_adapter_t *adp)
 {
     video_info_t info;
     int i;
 
     /* check that the console is capable of running in 320x200x256 */
-    if ((*biosvidsw.get_info)(cur_console->adp, M_VGA_CG320, &info)) {
+    if (get_mode_info(adp, M_VGA_CG320, &info)) {
         log(LOG_NOTICE, "rain_saver: the console does not support M_VGA_CG320\n");
 	return ENODEV;
     }
@@ -123,14 +104,20 @@ rain_saver_load(void)
     /* intialize the palette */
     for (i = 3; i < (MAX+1)*3; i += 3)
 	rain_pal[i+2] = rain_pal[i-1] + 4;
-	    
-    return add_scrn_saver(rain_saver);
+
+    blanked = 0;
+
+    return 0;
 }
 
 static int
-rain_saver_unload(void)
+rain_term(video_adapter_t *adp)
 {
-    return remove_scrn_saver(rain_saver);
+    return 0;
 }
 
-SAVER_MODULE(rain_saver);
+static scrn_saver_t rain_module = {
+    "rain_saver", rain_init, rain_term, rain_saver, NULL,
+};
+
+SAVER_MODULE(rain_saver, rain_module);
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index a1507c8191e5..6f48630e276c 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -23,14 +23,21 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvesactl.c,v 1.7 1998/12/07 21:58:22 archie Exp $
+ * $Id: $
  */
 
 #include "sc.h"
+#include "vga.h"
+#include "opt_syscons.h"
+#include "opt_vga.h"
 #include "opt_vesa.h"
 #include "opt_vm86.h"
 
-#if (NSC > 0 && defined(VESA) && defined(VM86)) || defined(KLD_MODULE)
+#ifdef VGA_NO_MODE_CHANGE
+#undef VESA
+#endif
+
+#if (NSC > 0 && NVGA > 0 && defined(VESA) && defined(VM86)) || defined(KLD_MODULE)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -42,8 +49,8 @@
 #include <machine/console.h>
 #include <machine/pc/vesa.h>
 
-#include <i386/isa/videoio.h>
-#include <i386/isa/syscons.h>
+#include <dev/fb/fbreg.h>
+#include <dev/syscons/syscons.h>
 
 static d_ioctl_t *prev_user_ioctl;
 
@@ -52,7 +59,6 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	scr_stat *scp;
 	struct tty *tp;
-	video_adapter_t *adp;
 	int mode;
 
 	tp = scdevtotty(dev);
@@ -66,8 +72,7 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	case SW_TEXT_132x25: case SW_TEXT_132x30:
 	case SW_TEXT_132x43: case SW_TEXT_132x50:
 	case SW_TEXT_132x60:
-		adp = get_adapter(scp);
-		if (!(adp->va_flags & V_ADP_MODECHANGE))
+		if (!(scp->adp->va_flags & V_ADP_MODECHANGE))
 			return ENODEV;
 		return sc_set_text_mode(scp, tp, cmd & 0xff, 0, 0, 0);
 
@@ -77,8 +82,7 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	case SW_VESA_C132x43:
 	case SW_VESA_C132x50:
 	case SW_VESA_C132x60:
-		adp = get_adapter(scp);
-		if (!(adp->va_flags & V_ADP_MODECHANGE))
+		if (!(scp->adp->va_flags & V_ADP_MODECHANGE))
 			return ENODEV;
 		mode = (cmd & 0xff) + M_VESA_BASE;
 		return sc_set_text_mode(scp, tp, mode, 0, 0, 0);
@@ -104,8 +108,7 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	case SW_VESA_1280x1024:	case SW_VESA_CG1280x1024:
 	case SW_VESA_32K_1280:	case SW_VESA_64K_1280:
 	case SW_VESA_FULL_1280:
-		adp = get_adapter(scp);
-		if (!(adp->va_flags & V_ADP_MODECHANGE))
+		if (!(scp->adp->va_flags & V_ADP_MODECHANGE))
 			return ENODEV;
 		mode = (cmd & 0xff) + M_VESA_BASE;
 		return sc_set_graphics_mode(scp, tp, mode);
@@ -137,4 +140,4 @@ vesa_unload_ioctl(void)
 	return 0;
 }
 
-#endif /* (NSC > 0 && VESA && VM86) || KLD_MODULE */
+#endif /* (NSC > 0 && NVGA > 0 && VESA && VM86) || KLD_MODULE */
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 065dee28357a..f267e6e9b0e3 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvidctl.c,v 1.4 1998/09/29 02:00:56 ache Exp $
+ * $Id: $
  */
 
 #include "sc.h"
@@ -40,11 +40,36 @@
 #include <machine/apm_bios.h>
 #include <machine/console.h>
 
-#include <i386/isa/videoio.h>
-#include <i386/isa/syscons.h>
-
-/* video ioctl */
-
+#include <dev/fb/fbreg.h>
+#include <dev/syscons/syscons.h>
+
+/* for compatibility with previous versions */
+typedef struct old_video_adapter {
+    int			va_index;
+    int			va_type;
+    int			va_flags;
+#define V_ADP_COLOR	(1<<0)
+#define V_ADP_MODECHANGE (1<<1)
+#define V_ADP_STATESAVE	(1<<2)
+#define V_ADP_STATELOAD	(1<<3)
+#define V_ADP_FONT	(1<<4)
+#define V_ADP_PALETTE	(1<<5)
+#define V_ADP_BORDER	(1<<6)
+#define V_ADP_VESA	(1<<7)
+    int			va_crtc_addr;
+    u_int		va_window;	/* virtual address */
+    size_t		va_window_size;
+    size_t		va_window_gran;
+    u_int		va_buffer;	/* virtual address */
+    size_t		va_buffer_size;
+    int			va_initial_mode;
+    int			va_initial_bios_mode;
+    int			va_mode;
+} old_video_adapter_t;
+
+#define OLD_CONS_ADPINFO _IOWR('c', 101, old_video_adapter_t)
+
+/* variables */
 extern scr_stat *cur_console;
 extern int fonts_loaded;
 extern int sc_history_size;
@@ -54,15 +79,13 @@ int
 sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
 		 int fontsize)
 {
-    video_adapter_t *adp;
     video_info_t info;
     int error;
     int s;
     int i;
 
-    if ((*biosvidsw.get_info)(scp->adp, mode, &info))
+    if ((*vidsw[scp->ad]->get_info)(scp->adp, mode, &info))
 	return ENODEV;
-    adp = get_adapter(scp);
  
     /* adjust argument values */
     if (fontsize <= 0)
@@ -108,12 +131,14 @@ sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
     scp->font_size = fontsize;
     scp->xsize = xsize;
     scp->ysize = ysize;
+    scp->xoff = 0;
+    scp->yoff = 0;
     scp->xpixel = scp->xsize*8;
     scp->ypixel = scp->ysize*fontsize;
 
     /* allocate buffers */
     sc_alloc_scr_buffer(scp, TRUE, TRUE);
-    if (ISMOUSEAVAIL(adp->va_flags))
+    if (ISMOUSEAVAIL(scp->adp->va_flags))
 	sc_alloc_cut_buffer(scp, FALSE);
     sc_alloc_history_buffer(scp, sc_history_size, i, FALSE);
     splx(s);
@@ -137,14 +162,12 @@ sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
 int
 sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode)
 {
-    video_adapter_t *adp;
     video_info_t info;
     int error;
     int s;
 
-    if ((*biosvidsw.get_info)(scp->adp, mode, &info))
+    if ((*vidsw[scp->ad]->get_info)(scp->adp, mode, &info))
 	return ENODEV;
-    adp = get_adapter(scp);
 
     /* stop screen saver, etc */
     s = spltty();
@@ -157,6 +180,8 @@ sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode)
     scp->status |= (UNKNOWN_MODE | GRAPHICS_MODE);
     scp->status &= ~PIXEL_MODE;
     scp->mode = mode;
+    scp->xoff = 0;
+    scp->yoff = 0;
     scp->xpixel = info.vi_width;
     scp->ypixel = info.vi_height;
     scp->xsize = info.vi_width/8;
@@ -187,15 +212,13 @@ int
 sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize, 
 		  int fontsize)
 {
-    video_adapter_t *adp;
     video_info_t info;
     int error;
     int s;
     int i;
 
-    if ((*biosvidsw.get_info)(scp->adp, scp->mode, &info))
+    if ((*vidsw[scp->ad]->get_info)(scp->adp, scp->mode, &info))
 	return ENODEV;		/* this shouldn't happen */
-    adp = get_adapter(scp);
 
 #ifdef SC_VIDEO_DEBUG
     if (scp->scr_buf != NULL) {
@@ -230,7 +253,7 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize,
 	printf("set_pixel_mode(): mode:%x, col:%d, row:%d, font:%d\n",
 	       scp->mode, xsize, ysize, fontsize);
 	printf("set_pixel_mode(): window:%x, %dx%d, xoff:%d, yoff:%d\n",
-	       adp->va_window, info.vi_width, info.vi_height, 
+	       scp->adp->va_window, info.vi_width, info.vi_height, 
 	       (info.vi_width/8 - xsize)/2,
 	       (info.vi_height/fontsize - ysize)/2);
     }
@@ -274,7 +297,7 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize,
 
     /* allocate buffers */
     sc_alloc_scr_buffer(scp, TRUE, TRUE);
-    if (ISMOUSEAVAIL(adp->va_flags))
+    if (ISMOUSEAVAIL(scp->adp->va_flags))
 	sc_alloc_cut_buffer(scp, FALSE);
     sc_alloc_history_buffer(scp, sc_history_size, i, FALSE);
     splx(s);
@@ -304,7 +327,6 @@ int
 sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
     scr_stat *scp;
-    video_adapter_t *adp;
     int error;
     int s;
 
@@ -313,19 +335,66 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
     switch (cmd) {
 
     case CONS_CURRENT:  	/* get current adapter type */
-	adp = get_adapter(scp);
-	*(int *)data = adp->va_type;
+	if (scp->adp == NULL)
+	    return ENODEV;
+	*(int *)data = scp->adp->va_type;
 	return 0;
 
     case CONS_CURRENTADP:	/* get current adapter index */
-	*(int *)data = scp->adp;
+	*(int *)data = scp->ad;
+	return 0;
+
+    case OLD_CONS_ADPINFO:	/* adapter information */
+	if (scp->adp == NULL)
+	    return ENODEV;
+	((old_video_adapter_t *)data)->va_index = scp->adp->va_index;
+	((old_video_adapter_t *)data)->va_type = scp->adp->va_type;
+	((old_video_adapter_t *)data)->va_flags = scp->adp->va_flags;
+	((old_video_adapter_t *)data)->va_crtc_addr = scp->adp->va_crtc_addr;
+	((old_video_adapter_t *)data)->va_window = scp->adp->va_window;
+	((old_video_adapter_t *)data)->va_window_size
+	    = scp->adp->va_window_size;
+	((old_video_adapter_t *)data)->va_window_gran
+	    = scp->adp->va_window_gran;
+	((old_video_adapter_t *)data)->va_buffer = scp->adp->va_buffer;
+	((old_video_adapter_t *)data)->va_buffer_size
+	    = scp->adp->va_buffer_size;
+	((old_video_adapter_t *)data)->va_mode = scp->adp->va_mode;
+	((old_video_adapter_t *)data)->va_initial_mode
+	    = scp->adp->va_initial_mode;
+	((old_video_adapter_t *)data)->va_initial_bios_mode
+	    = scp->adp->va_initial_bios_mode;
 	return 0;
 
     case CONS_ADPINFO:		/* adapter information */
-	adp = (*biosvidsw.adapter)(((video_adapter_t *)data)->va_index);
-	if (adp == NULL)
+	if (scp->adp == NULL)
 	    return ENODEV;
-	bcopy(adp, data, sizeof(*adp));
+	((video_adapter_info_t *)data)->va_index = scp->adp->va_index;
+	((video_adapter_info_t *)data)->va_type = scp->adp->va_type;
+	bcopy(scp->adp->va_name, ((video_adapter_info_t *)data)->va_name,
+	      imin(strlen(scp->adp->va_name) + 1,
+		   sizeof(((video_adapter_info_t *)data)->va_name))); 
+	((video_adapter_info_t *)data)->va_unit = scp->adp->va_unit;
+	((video_adapter_info_t *)data)->va_flags = scp->adp->va_flags;
+	((video_adapter_info_t *)data)->va_io_base = scp->adp->va_io_base;
+	((video_adapter_info_t *)data)->va_io_size = scp->adp->va_io_size;
+	((video_adapter_info_t *)data)->va_crtc_addr = scp->adp->va_crtc_addr;
+	((video_adapter_info_t *)data)->va_mem_base = scp->adp->va_mem_base;
+	((video_adapter_info_t *)data)->va_mem_size = scp->adp->va_mem_size;
+	((video_adapter_info_t *)data)->va_window = scp->adp->va_window;
+	((video_adapter_info_t *)data)->va_window_size
+	    = scp->adp->va_window_size;
+	((video_adapter_info_t *)data)->va_window_gran
+	    = scp->adp->va_window_gran;
+	((video_adapter_info_t *)data)->va_buffer = scp->adp->va_buffer;
+	((video_adapter_info_t *)data)->va_buffer_size
+	    = scp->adp->va_buffer_size;
+	((video_adapter_info_t *)data)->va_mode = scp->adp->va_mode;
+	((video_adapter_info_t *)data)->va_mode_flags = scp->adp->va_mode_flags;
+	((video_adapter_info_t *)data)->va_initial_mode
+	    = scp->adp->va_initial_mode;
+	((video_adapter_info_t *)data)->va_initial_bios_mode
+	    = scp->adp->va_initial_bios_mode;
 	return 0;
 
     case CONS_GET:      	/* get current video mode */
@@ -333,16 +402,16 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case CONS_MODEINFO:		/* get mode information */
-	return ((*biosvidsw.get_info)(scp->adp, 
+	return ((*vidsw[scp->ad]->get_info)(scp->adp, 
 		    ((video_info_t *)data)->vi_mode, (video_info_t *)data) 
 		? ENODEV : 0);
 
     case CONS_FINDMODE:		/* find a matching video mode */
-	return ((*biosvidsw.query_mode)(scp->adp, (video_info_t *)data) 
+	return ((*vidsw[scp->ad]->query_mode)(scp->adp, (video_info_t *)data) 
 		? ENODEV : 0);
 
     case CONS_SETWINORG:
-	return ((*biosvidsw.set_win_org)(scp->adp, *(u_int *)data) 
+	return ((*vidsw[scp->ad]->set_win_org)(scp->adp, *(u_int *)data) 
 		   ? ENODEV : 0);
 
     /* generic text modes */
@@ -363,8 +432,13 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
     case SW_ENH_B80x25: case SW_ENH_C80x25:
     case SW_ENH_B80x43: case SW_ENH_C80x43:
     case SW_EGAMONO80x25:
-	adp = get_adapter(scp);
-	if (!(adp->va_flags & V_ADP_MODECHANGE))
+
+#ifdef PC98
+    /* PC98 TEXT MODES */
+    case SW_PC98_80x25:
+    case SW_PC98_80x30:
+#endif
+	if (!(scp->adp->va_flags & V_ADP_MODECHANGE))
  	    return ENODEV;
 	return sc_set_text_mode(scp, tp, cmd & 0xff, 0, 0, 0);
 
@@ -374,8 +448,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
     case SW_CG640x350: case SW_ENH_CG640:
     case SW_BG640x480: case SW_CG640x480: case SW_VGA_CG320:
     case SW_VGA_MODEX:
-	adp = get_adapter(scp);
-	if (!(adp->va_flags & V_ADP_MODECHANGE))
+	if (!(scp->adp->va_flags & V_ADP_MODECHANGE))
 	    return ENODEV;
 	return sc_set_graphics_mode(scp, tp, cmd & 0xff);
 
@@ -390,8 +463,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 		return EINVAL;
 	    /* restore fonts & palette ! */
 #if 0
-	    adp = get_adapter(scp);
-	    if (ISFONTAVAIL(adp->va_flags) 
+	    if (ISFONTAVAIL(scp->adp->va_flags) 
 		&& !(scp->status & (GRAPHICS_MODE | PIXEL_MODE)))
 		/*
 		 * FONT KLUDGE
@@ -405,10 +477,10 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 		    copy_font(scp, LOAD, 16, font_16);
 	    }
 #endif
-	    load_palette(scp, palette);
+	    load_palette(scp->adp, palette);
 
 	    /* move hardware cursor out of the way */
-	    (*biosvidsw.set_hw_cursor)(scp->adp, -1, -1);
+	    (*vidsw[scp->ad]->set_hw_cursor)(scp->adp, -1, -1);
 
 	    /* FALL THROUGH */
 
@@ -424,6 +496,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 		splx(s);
 		return error;
 	    }
+#ifndef PC98
 	    scp->status |= UNKNOWN_MODE;
 	    splx(s);
 	    /* no restore fonts & palette */
@@ -431,6 +504,14 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 		set_mode(scp);
 	    sc_clear_screen(scp);
 	    scp->status &= ~UNKNOWN_MODE;
+#else /* PC98 */
+	    scp->status &= ~UNKNOWN_MODE;
+	    /* no restore fonts & palette */
+	    if (scp == cur_console)
+		set_mode(scp);
+	    sc_clear_screen(scp);
+	    splx(s);
+#endif /* PC98 */
 	    return 0;
 
 	case KD_PIXEL:		/* pixel (raster) display */
@@ -448,7 +529,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    splx(s);
 	    if (scp == cur_console) {
 		set_mode(scp);
-		load_palette(scp, palette);
+		load_palette(scp->adp, palette);
 	    }
 	    sc_clear_screen(scp);
 	    scp->status &= ~UNKNOWN_MODE;
@@ -462,6 +543,10 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    }
 	    scp->status |= UNKNOWN_MODE;
 	    splx(s);
+#ifdef PC98
+	    if (scp == cur_console)
+		set_mode(scp);
+#endif
 	    return 0;
 
 	default:
@@ -486,7 +571,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
     case KDSBORDER:     	/* set border color of this (virtual) console */
 	scp->border = *data;
 	if (scp == cur_console)
-	    set_border(cur_console, scp->border);
+	    set_border(scp, scp->border);
 	return 0;
     }
 
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index 3100ff3038d5..c7c9ff59f925 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.19 1998/09/17 19:40:30 sos Exp $
+ *	$Id: snake_saver.c,v 1.20 1998/11/04 03:49:39 peter Exp $
  */
 
 #include <sys/param.h>
@@ -44,9 +44,10 @@ static char	*message;
 static u_char	**messagep;
 static int	messagelen;
 static u_short	*window;
+static int	blanked;
 
-static void
-snake_saver(int blank)
+static int
+snake_saver(video_adapter_t *adp, int blank)
 {
 	static int	dirx, diry;
 	int		f;
@@ -57,12 +58,11 @@ snake_saver(int blank)
 #define	savs	messagep
 
 	if (blank) {
-		if (!ISTEXTSC(scp))
-			return;
-		if (scrn_blanked <= 0) {
-			scp->status |= SAVER_RUNNING;
-			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
-			fillw((FG_LIGHTGREY|BG_BLACK)<<8 | scr_map[0x20],
+		if (adp->va_mode_flags & V_INFO_GRAPHICS)
+			return ENODEV;
+		if (blanked <= 0) {
+			window = (u_short *)adp->va_window;
+			fillw(((FG_LIGHTGREY|BG_BLACK)<<8) | scr_map[0x20],
 			      window, scp->xsize * scp->ysize);
 			set_border(scp, 0);
 			dirx = (scp->xpos ? 1 : -1);
@@ -72,16 +72,11 @@ snake_saver(int blank)
 				savs[f] = (u_char *)window + 2 *
 					  (scp->xpos+scp->ypos*scp->xsize);
 			*(savs[0]) = scr_map[*save];
-			f = scp->ysize * scp->xsize + 5;
-			outb(crtc_addr, 14);
-			outb(crtc_addr+1, f >> 8);
-			outb(crtc_addr, 15);
-			outb(crtc_addr+1, f & 0xff);
-			scrn_blanked = 1;
+			blanked = 1;
 		}
-		if (scrn_blanked++ < 4)
-			return;
-		scrn_blanked = 1;
+		if (blanked++ < 4)
+			return 0;
+		blanked = 1;
 		*(savs[messagelen-1]) = scr_map[0x20];
 		for (f=messagelen-1; f > 0; f--)
 			savs[f] = savs[f-1];
@@ -99,43 +94,31 @@ snake_saver(int blank)
 			*(savs[f]) = scr_map[save[f]];
 	}
 	else {
-		if (scrn_blanked > 0) {
-			set_border(scp, scp->border);
-			scrn_blanked = 0;
-			scp->status &= ~SAVER_RUNNING;
-		}
+		blanked = 0;
 	}
+	return 0;
 }
 
 static int
-snake_saver_load(void)
+snake_init(video_adapter_t *adp)
 {
-	int err;
-
 	messagelen = strlen(ostype) + 1 + strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s %s", ostype, osrelease);
 	messagep = malloc(messagelen * sizeof *messagep, M_DEVBUF, M_WAITOK);
-
-	err = add_scrn_saver(snake_saver);
-	if (err != 0) {
-		free(message, M_DEVBUF);
-		free(messagep, M_DEVBUF);
-	}
-	return err;
+	return 0;
 }
 
 static int
-snake_saver_unload(void)
+snake_term(video_adapter_t *adp)
 {
-	int err;
-
-	err = remove_scrn_saver(snake_saver);
-	if (err == 0) {
-		free(message, M_DEVBUF);
-		free(messagep, M_DEVBUF);
-	}
-	return err;
+	free(message, M_DEVBUF);
+	free(messagep, M_DEVBUF);
+	return 0;
 }
 
-SAVER_MODULE(snake_saver);
+static scrn_saver_t snake_module = {
+	"snake_saver", snake_init, snake_term, snake_saver, NULL,
+};
+
+SAVER_MODULE(snake_saver, snake_module);
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 719d502ec699..ca4b588004b9 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.16 1998/09/17 19:40:30 sos Exp $
+ *	$Id: star_saver.c,v 1.17 1998/11/04 03:49:39 peter Exp $
  */
 
 #include <sys/param.h>
@@ -41,13 +41,14 @@
 #define NUM_STARS	50
 
 static u_short *window;
+static int blanked;
 
 /*
  * Alternate saver that got its inspiration from a well known utility
  * package for an inferior^H^H^H^H^H^Hfamous OS.
  */
-static void
-star_saver(int blank)
+static int
+star_saver(video_adapter_t *adp, int blank)
 {
 	scr_stat	*scp = cur_console;
 	int		cell, i;
@@ -57,15 +58,15 @@ star_saver(int blank)
 	static u_short 	stars[NUM_STARS][2];
 
 	if (blank) {
-		if (!ISTEXTSC(scp))
-			return;
-		if (scrn_blanked <= 0) {
-			scp->status |= SAVER_RUNNING;
-			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
-			scrn_blanked = 1;
-			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], window,
-			      scp->xsize * scp->ysize);
+		if (adp->va_mode_flags & V_INFO_GRAPHICS)
+			return ENODEV;
+		if (!blanked) {
+			window = (u_short *)adp->va_window;
+			/* clear the screen and set the border color */
+			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
+			      window, scp->xsize * scp->ysize);
 			set_border(scp, 0);
+			blanked = TRUE;
 			for(i=0; i<NUM_STARS; i++) {
 				stars[i][0] =
 					random() % (scp->xsize*scp->ysize);
@@ -82,24 +83,26 @@ star_saver(int blank)
 		}
 	}
 	else {
-		if (scrn_blanked > 0) {
-			set_border(scp, scp->border);
-			scrn_blanked = 0;
-			scp->status &= ~SAVER_RUNNING;
-		}
+		blanked = FALSE;
 	}
+	return 0;
 }
 
 static int
-star_saver_load(void)
+star_init(video_adapter_t *adp)
 {
-	return add_scrn_saver(star_saver);
+	blanked = FALSE;
+	return 0;
 }
 
 static int
-star_saver_unload(void)
+star_term(video_adapter_t *adp)
 {
-	return remove_scrn_saver(star_saver);
+	return 0;
 }
 
-SAVER_MODULE(star_saver);
+static scrn_saver_t star_module = {
+	"star_saver", star_init, star_term, star_saver, NULL,
+};
+
+SAVER_MODULE(star_saver, star_module);
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index fbc0b16c4bcf..57672bc7d197 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,10 +25,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.c,v 1.288 1998/12/07 21:58:23 archie Exp $
+ *	$Id: syscons.c,v 1.289 1999/01/07 14:14:22 yokota Exp $
  */
 
 #include "sc.h"
+#include "splash.h"
 #include "apm.h"
 #include "opt_ddb.h"
 #include "opt_devfs.h"
@@ -67,13 +68,15 @@
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
+#include <dev/kbd/kbdreg.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/vgareg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
+
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/timerreg.h>
-#include <i386/isa/kbdtables.h>
-#include <i386/isa/kbdio.h>
-#include <i386/isa/videoio.h>
-#include <i386/isa/syscons.h>
 
 #if !defined(MAXCONS)
 #define MAXCONS 16
@@ -119,10 +122,6 @@ typedef struct old_mouse_info {
     } u;
 } old_mouse_info_t;
 
-/* XXX use sc_bcopy where video memory is concerned */
-extern void generic_bcopy(const void *, void *, size_t);
-extern void generic_bzero(void *, size_t);
-
 static default_attr user_default = {
     (FG_LIGHTGREY | BG_BLACK) << 8,
     (FG_BLACK | BG_LIGHTGREY) << 8
@@ -145,8 +144,6 @@ static  scr_stat    	*new_scp, *old_scp;
 static  term_stat   	kernel_console;
 static  default_attr    *current_default;
 static  int		sc_flags;
-static  int		sc_port = IO_KBD;
-static  KBDC		sc_kbdc = NULL;
 static  char        	init_done = COLD;
 static  u_short		sc_buffer[ROW*COL];
 static  char		shutdown_in_progress = FALSE;
@@ -155,17 +152,12 @@ static  char        	switch_in_progress = FALSE;
 static  char        	write_in_progress = FALSE;
 static  char        	blink_in_progress = FALSE;
 static  int        	blinkrate = 0;
-	u_int       	crtc_addr = MONO_BASE;
-	char		crtc_type = KD_MONO;
-static	char        	crtc_vga = FALSE;
-static	int		adp_flags;
-static  u_char      	shfts = 0, ctls = 0, alts = 0, agrs = 0, metas = 0;
-static  u_char		accents = 0;
-static  u_char      	nlkcnt = 0, clkcnt = 0, slkcnt = 0, alkcnt = 0;
-static  const u_int     n_fkey_tab = sizeof(fkey_tab) / sizeof(*fkey_tab);
+static	int		adapter = -1;
+static	int		keyboard = -1;
+static	keyboard_t	*kbd;
 static  int     	delayed_next_scr = FALSE;
 static  long        	scrn_blank_time = 0;    /* screen saver timeout value */
-	int     	scrn_blanked = 0;       /* screen saver active flag */
+static	int     	scrn_blanked = FALSE;	/* screen saver active flag */
 static  long		scrn_time_stamp;
 static	int		saver_mode = CONS_LKM_SAVER; /* LKM/user saver */
 static	int		run_scrn_saver = FALSE;	/* should run the saver? */
@@ -173,7 +165,6 @@ static	int		scrn_idle = FALSE;	/* about to run the saver */
 	u_char      	scr_map[256];
 	u_char      	scr_rmap[256];
 static	int		initial_video_mode;	/* initial video mode # */
-static	int		bios_video_mode;	/* video mode # set by BIOS */
 	int     	fonts_loaded = 0
 #ifdef STD8X16FONT
 	| FONT_16
@@ -210,7 +201,6 @@ static	int		extra_history_size =
 
 static void    		none_saver(int blank) { }
 static void    		(*current_saver)(int blank) = none_saver;
-static void    		(*default_saver)(int blank) = none_saver;
        d_ioctl_t  	*sc_user_ioctl;
 
 static int		sticky_splash = FALSE;
@@ -237,20 +227,40 @@ static const int	nsccons = MAXCONS+2;
     + (offset)) % (scp)->history_size))
 #define ISSIGVALID(sig)	((sig) > 0 && (sig) < NSIG)
 
+/* some useful macros */
+#define kbd_read_char(kbd, wait)					\
+		(*kbdsw[(kbd)->kb_index]->read_char)((kbd), (wait))
+#define kbd_check_char(kbd)						\
+		(*kbdsw[(kbd)->kb_index]->check_char)((kbd))
+#define kbd_enable(kbd)							\
+		(*kbdsw[(kbd)->kb_index]->enable)((kbd))
+#define kbd_disable(kbd)						\
+		(*kbdsw[(kbd)->kb_index]->disable)((kbd))
+#define kbd_lock(kbd, lockf)						\
+		(*kbdsw[(kbd)->kb_index]->lock)((kbd), (lockf))
+#define kbd_ioctl(kbd, cmd, arg)					\
+	    (((kbd) == NULL) ?						\
+		ENODEV : (*kbdsw[(kbd)->kb_index]->ioctl)((kbd), (cmd), (arg)))
+#define kbd_clear_state(kbd)						\
+		(*kbdsw[(kbd)->kb_index]->clear_state)((kbd))
+#define kbd_get_fkeystr(kbd, fkey, len)					\
+		(*kbdsw[(kbd)->kb_index]->get_fkeystr)((kbd), (fkey), (len))
+
 /* prototypes */
 static int scattach(struct isa_device *dev);
-static ointhand2_t scintr;
+static kbd_callback_func_t sckbdevent;
 static int scparam(struct tty *tp, struct termios *t);
 static int scprobe(struct isa_device *dev);
-static int scvidprobe(int unit, int flags);
-static int sckbdprobe(int unit, int flags);
+static int scvidprobe(int unit, int flags, int cons);
+static int sckbdprobe(int unit, int flags, int cons);
 static void scstart(struct tty *tp);
 static void scmousestart(struct tty *tp);
 static void scinit(void);
 static void scshutdown(int howto, void *arg);
-static u_int scgetc(u_int flags);
+static u_int scgetc(keyboard_t *kbd, u_int flags);
 #define SCGETC_CN	1
 #define SCGETC_NONBLOCK	2
+static int sccngetch(int flags);
 static void sccnupdate(scr_stat *scp);
 static scr_stat *alloc_scp(void);
 static void init_scp(scr_stat *scp);
@@ -258,7 +268,10 @@ static void sc_bcopy(scr_stat *scp, u_short *p, int from, int to, int mark);
 static int get_scr_num(void);
 static timeout_t scrn_timer;
 static void scrn_update(scr_stat *scp, int show_cursor);
-static void scrn_saver(void (*saver)(int), int blank);
+static int add_scrn_saver(void (*this_saver)(int));
+static int remove_scrn_saver(void (*this_saver)(int));
+static int set_scrn_saver_mode(scr_stat *scp, int mode, u_char *pal, int border);
+static int restore_scrn_saver_mode(scr_stat *scp);
 static void stop_scrn_saver(void (*saver)(int));
 static int wait_scrn_saver_stop(void);
 static int switch_scr(scr_stat *scp, u_int next_scr);
@@ -268,13 +281,13 @@ static void ansi_put(scr_stat *scp, u_char *buf, int len);
 static void draw_cursor_image(scr_stat *scp); 
 static void remove_cursor_image(scr_stat *scp); 
 static void move_crsr(scr_stat *scp, int x, int y);
-static u_char *get_fstr(u_int c, u_int *len);
 static void history_to_screen(scr_stat *scp);
 static int history_up_line(scr_stat *scp);
 static int history_down_line(scr_stat *scp);
 static int mask2attr(struct term_stat *term);
-static void set_keyboard(int command, int data);
-static void update_leds(int which);
+static int save_kbd_state(scr_stat *scp);
+static int update_kbd_state(int state, int mask);
+static int update_kbd_leds(int which);
 static void set_destructive_cursor(scr_stat *scp);
 static void set_mouse_pos(scr_stat *scp);
 static int skip_spc_right(scr_stat *scp, u_short *p);
@@ -292,14 +305,13 @@ static void draw_cutmarking(scr_stat *scp);
 static void remove_cutmarking(scr_stat *scp); 
 static void do_bell(scr_stat *scp, int pitch, int duration);
 static timeout_t blink_screen;
-#ifdef SC_SPLASH_SCREEN
-static void scsplash_init(scr_stat *scp);
-static void scsplash_term(scr_stat *scp);
+#if NSPLASH > 0
+static int scsplash_callback(int);
 static void scsplash_saver(int show);
 #define scsplash_stick(stick)		(sticky_splash = (stick))
 #else
 #define scsplash_stick(stick)
-#endif
+#endif /* NSPLASH */
 
 static cn_probe_t	sccnprobe;
 static cn_init_t	sccninit;
@@ -342,7 +354,7 @@ draw_cursor_image(scr_stat *scp)
 	return;
     }
 
-    ptr = (u_short *)(get_adapter(scp)->va_window)
+    ptr = (u_short *)(scp->adp->va_window)
 			 + (scp->cursor_pos - scp->scr_buf);
 
     /* do we have a destructive cursor ? */
@@ -395,7 +407,7 @@ remove_cursor_image(scr_stat *scp)
 	sc_bcopy(scp, scp->scr_buf, scp->cursor_oldpos - scp->scr_buf, 
 		 scp->cursor_oldpos - scp->scr_buf, 0);
     else
-	*((u_short *)(get_adapter(scp)->va_window)
+	*((u_short *)(scp->adp->va_window)
 			 + (scp->cursor_oldpos - scp->scr_buf))
 	    = scp->cursor_saveunder;
 }
@@ -419,228 +431,69 @@ move_crsr(scr_stat *scp, int x, int y)
 static int
 scprobe(struct isa_device *dev)
 {
-    if (!scvidprobe(dev->id_unit, dev->id_flags)) {
+    if (!scvidprobe(dev->id_unit, dev->id_flags, FALSE)) {
 	if (bootverbose)
 	    printf("sc%d: no video adapter is found.\n", dev->id_unit);
 	return (0);
     }
 
-#if defined(VESA) && defined(VM86)
-    if (vesa_load())
-	return FALSE;
-#endif
-
-    (*biosvidsw.diag)(bootverbose);
-
-    sc_port = dev->id_iobase;
-    if (sckbdprobe(dev->id_unit, dev->id_flags))
-	return (IO_KBDSIZE);
-    else
-        return ((dev->id_flags & DETECT_KBD) ? 0 : IO_KBDSIZE);
+    return ((sckbdprobe(dev->id_unit, dev->id_flags, FALSE)) ? -1 : 0);
 }
 
 /* probe video adapters, return TRUE if found */ 
 static int
-scvidprobe(int unit, int flags)
+scvidprobe(int unit, int flags, int cons)
 {
     video_adapter_t *adp;
 
-    /* do this test only once */
-    if (init_done != COLD)
-	return (crtc_type != -1);
+    /*
+     * Access the video adapter driver through the back door!
+     * Video adapter drivers need to be configured before syscons.
+     * However, when syscons is being probed as the low-level console,
+     * they have not been initialized yet.  We force them to initialize
+     * themselves here. XXX
+     */
+    vid_configure(cons ? VIO_PROBE_ONLY : 0);
 
-    if ((*biosvidsw.init)() <= 0)
-	return FALSE;
-    if ((adp = (*biosvidsw.adapter)(V_ADP_PRIMARY)) == NULL)
-	return FALSE;
+    /* allocate a frame buffer */
+    if (adapter < 0) {
+	adapter = vid_allocate("*", -1, (void *)&adapter);
+	if (adapter < 0)
+	    return FALSE;
+    }
+    adp = vid_get_adapter(adapter);	/* shouldn't fail */
 
-    crtc_type = adp->va_type;
-    crtc_vga = (crtc_type == KD_VGA);
-    crtc_addr = adp->va_crtc_addr;
     Crtat = (u_short *)adp->va_window;
-    adp_flags = adp->va_flags;
     initial_video_mode = adp->va_initial_mode;
-    bios_video_mode = adp->va_initial_bios_mode;
 
     return TRUE;
 }
 
 /* probe the keyboard, return TRUE if found */
 static int
-sckbdprobe(int unit, int flags)
+sckbdprobe(int unit, int flags, int cons)
 {
-    int codeset;
-    int c = -1;
-    int m;
-    int res, id;
-
-    sc_kbdc = kbdc_open(sc_port);
-
-    if (!kbdc_lock(sc_kbdc, TRUE)) {
-	/* driver error? */
-	printf("sc%d: unable to lock the controller.\n", unit);
-        return ((flags & DETECT_KBD) ? FALSE : TRUE);
+    /* access the keyboard driver through the backdoor! */
+    kbd_configure(cons ? KB_CONF_PROBE_ONLY : 0);
+
+    /* allocate a keyboard and register the keyboard event handler */
+    if (keyboard < 0) {
+	keyboard = kbd_allocate("*", -1, (void *)&keyboard, sckbdevent, NULL);
+	if (keyboard < 0)
+	    return FALSE;
     }
+    kbd = kbd_get_keyboard(keyboard);	/* shouldn't fail */
 
-    /* flush any noise in the buffer */
-    empty_both_buffers(sc_kbdc, 10);
-
-    /* save the current keyboard controller command byte */
-    m = kbdc_get_device_mask(sc_kbdc) & ~KBD_KBD_CONTROL_BITS;
-    c = get_controller_command_byte(sc_kbdc);
-    if (c == -1) {
-	/* CONTROLLER ERROR */
-	printf("sc%d: unable to get the current command byte value.\n", unit);
-	goto fail;
-    }
-    if (bootverbose)
-	printf("sc%d: the current keyboard controller command byte %04x\n",
-	    unit, c);
-#if 0
-    /* override the keyboard lock switch */
-    c |= KBD_OVERRIDE_KBD_LOCK;
-#endif
-
-    /* 
-     * The keyboard may have been screwed up by the boot block.
-     * We may just be able to recover from error by testing the controller
-     * and the keyboard port. The controller command byte needs to be saved
-     * before this recovery operation, as some controllers seem to set 
-     * the command byte to particular values.
-     */
-    test_controller(sc_kbdc);
-    test_kbd_port(sc_kbdc);
-
-    /* enable the keyboard port, but disable the keyboard intr. */
-    if (!set_controller_command_byte(sc_kbdc,
-            KBD_KBD_CONTROL_BITS,
-            KBD_ENABLE_KBD_PORT | KBD_DISABLE_KBD_INT)) {
-	/* CONTROLLER ERROR 
-	 * there is very little we can do...
-	 */
-	printf("sc%d: unable to set the command byte.\n", unit);
-	goto fail;
-     }
-
-     /* 
-      * Check if we have an XT keyboard before we attempt to reset it. 
-      * The procedure assumes that the keyboard and the controller have 
-      * been set up properly by BIOS and have not been messed up 
-      * during the boot process.
-      */
-     codeset = -1;
-     if (flags & XT_KEYBD)
-	 /* the user says there is a XT keyboard */
-	 codeset = 1;
-#ifdef DETECT_XT_KEYBOARD
-     else if ((c & KBD_TRANSLATION) == 0) {
-	 /* SET_SCANCODE_SET is not always supported; ignore error */
-	 if (send_kbd_command_and_data(sc_kbdc, KBDC_SET_SCANCODE_SET, 0)
-		 == KBD_ACK) 
-	     codeset = read_kbd_data(sc_kbdc);
-     }
-     if (bootverbose)
-         printf("sc%d: keyboard scancode set %d\n", unit, codeset);
-#endif /* DETECT_XT_KEYBOARD */
- 
-    if (flags & KBD_NORESET) {
-        write_kbd_command(sc_kbdc, KBDC_ECHO);
-        if (read_kbd_data(sc_kbdc) != KBD_ECHO) {
-            empty_both_buffers(sc_kbdc, 10);
-            test_controller(sc_kbdc);
-            test_kbd_port(sc_kbdc);
-            if (bootverbose)
-                printf("sc%d: failed to get response from the keyboard.\n", 
-		    unit);
-	    goto fail;
-	}
-    } else {
-        /* reset keyboard hardware */
-        if (!reset_kbd(sc_kbdc)) {
-            /* KEYBOARD ERROR
-             * Keyboard reset may fail either because the keyboard doen't
-             * exist, or because the keyboard doesn't pass the self-test,
-             * or the keyboard controller on the motherboard and the keyboard
-             * somehow fail to shake hands. It is just possible, particularly
-             * in the last case, that the keyoard controller may be left 
-             * in a hung state. test_controller() and test_kbd_port() appear
-             * to bring the keyboard controller back (I don't know why and
-             * how, though.)
-             */
-            empty_both_buffers(sc_kbdc, 10);
-            test_controller(sc_kbdc);
-            test_kbd_port(sc_kbdc);
-            /* We could disable the keyboard port and interrupt... but, 
-             * the keyboard may still exist (see above). 
-             */
-            if (bootverbose)
-                printf("sc%d: failed to reset the keyboard.\n", unit);
-            goto fail;
-        }
-    }
-
-    /*
-     * Allow us to set the XT_KEYBD flag in UserConfig so that keyboards
-     * such as those on the IBM ThinkPad laptop computers can be used
-     * with the standard console driver.
-     */
-    if (codeset == 1) {
-	if (send_kbd_command_and_data(
-	        sc_kbdc, KBDC_SET_SCANCODE_SET, codeset) == KBD_ACK) {
-	    /* XT kbd doesn't need scan code translation */
-	    c &= ~KBD_TRANSLATION;
-	} else {
-	    /* KEYBOARD ERROR 
-	     * The XT kbd isn't usable unless the proper scan code set
-	     * is selected. 
-	     */
-	    printf("sc%d: unable to set the XT keyboard mode.\n", unit);
-	    goto fail;
-	}
-    }
-    /* enable the keyboard port and intr. */
-    if (!set_controller_command_byte(sc_kbdc, 
-            KBD_KBD_CONTROL_BITS | KBD_TRANSLATION | KBD_OVERRIDE_KBD_LOCK,
-	    (c & (KBD_TRANSLATION | KBD_OVERRIDE_KBD_LOCK))
-	        | KBD_ENABLE_KBD_PORT | KBD_ENABLE_KBD_INT)) {
-	/* CONTROLLER ERROR 
-	 * This is serious; we are left with the disabled keyboard intr. 
-	 */
-	printf("sc%d: unable to enable the keyboard port and intr.\n", unit);
-	goto fail;
-    }
-    
-    /* Get the ID of the keyboard, if any */
-    empty_kbd_buffer(sc_kbdc, 5);
-    res = send_kbd_command(sc_kbdc, KBDC_SEND_DEV_ID);
-    if (res == KBD_ACK) {
-	/* 10ms delay */
-	DELAY(10000);
-	id = (read_kbd_data(sc_kbdc) << 8) | read_kbd_data(sc_kbdc);
-	if (bootverbose)
-	    printf("sc%d: keyboard device ID: %04x\n", unit, id);
-    }
-
-    kbdc_set_device_mask(sc_kbdc, m | KBD_KBD_CONTROL_BITS),
-    kbdc_lock(sc_kbdc, FALSE);
     return TRUE;
-
-fail:
-    if (c != -1)
-        /* try to restore the command byte as before, if possible */
-        set_controller_command_byte(sc_kbdc, 0xff, c);
-    kbdc_set_device_mask(sc_kbdc, 
-        (flags & DETECT_KBD) ? m : m | KBD_KBD_CONTROL_BITS);
-    kbdc_lock(sc_kbdc, FALSE);
-    return FALSE;
 }
 
 #if NAPM > 0
 static int
 scresume(void *dummy)
 {
-	shfts = ctls = alts = agrs = metas = accents = 0; 
-	return 0;
+    if (kbd != NULL)
+	kbd_clear_state(kbd);
+    return 0;
 }
 #endif
 
@@ -656,21 +509,19 @@ scattach(struct isa_device *dev)
     int vc;
 #endif
 
-    dev->id_ointr = scintr;
     scinit();
+    scp = console[0];
     sc_flags = dev->id_flags;
-    if (!ISFONTAVAIL(adp_flags))
+    if (!ISFONTAVAIL(scp->adp->va_flags))
 	sc_flags &= ~CHAR_CURSOR;
 
-    scp = console[0];
-
     /* copy temporary buffer to final buffer */
     scp->scr_buf = NULL;
     sc_alloc_scr_buffer(scp, FALSE, FALSE);
     bcopy(sc_buffer, scp->scr_buf, scp->xsize*scp->ysize*sizeof(u_short));
 
     /* cut buffer is available only when the mouse pointer is used */
-    if (ISMOUSEAVAIL(adp_flags))
+    if (ISMOUSEAVAIL(scp->adp->va_flags))
 	sc_alloc_cut_buffer(scp, FALSE);
 
     /* initialize history buffer & pointers */
@@ -678,15 +529,16 @@ scattach(struct isa_device *dev)
 
 #if defined(VESA) && defined(VM86)
     if ((sc_flags & VESA800X600)
-	&& ((*biosvidsw.get_info)(scp->adp, M_VESA_800x600, &info) == 0)) {
-#ifdef SC_SPLASH_SCREEN
-	scsplash_term(scp);
+	&& ((*vidsw[scp->ad]->get_info)(scp->adp, M_VESA_800x600, &info) == 0)) {
+#if NSPLASH > 0
+	splash_term(scp->adp);
 #endif
 	sc_set_graphics_mode(scp, NULL, M_VESA_800x600);
 	sc_set_pixel_mode(scp, NULL, COL, ROW, 16);
 	initial_video_mode = M_VESA_800x600;
-#ifdef SC_SPLASH_SCREEN
-	scsplash_init(scp);
+#if NSPLASH > 0
+	/* put up the splash again! */
+    	splash_init(scp->adp, scsplash_callback);
 #endif
     }
 #endif /* VESA && VM86 */
@@ -698,15 +550,25 @@ scattach(struct isa_device *dev)
     /* get screen update going */
     scrn_timer((void *)TRUE);
 
-    update_leds(scp->status);
-
+    /* set up the keyboard */
+    kbd_ioctl(kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode);
+    update_kbd_state(scp->status, LOCK_MASK);
+
+    if (bootverbose) {
+	printf("sc%d:", dev->id_unit);
+    	if (adapter >= 0)
+	    printf(" fb%d", adapter);
+	if (keyboard >= 0)
+	    printf(" kbd%d", keyboard);
+	printf("\n");
+    }
     printf("sc%d: ", dev->id_unit);
-    switch(crtc_type) {
+    switch(scp->adp->va_type) {
     case KD_VGA:
-	printf("VGA %s", (adp_flags & V_ADP_COLOR) ? "color" : "mono");
+	printf("VGA %s", (scp->adp->va_flags & V_ADP_COLOR) ? "color" : "mono");
 	break;
     case KD_EGA:
-	printf("EGA %s", (adp_flags & V_ADP_COLOR) ? "color" : "mono");
+	printf("EGA %s", (scp->adp->va_flags & V_ADP_COLOR) ? "color" : "mono");
 	break;
     case KD_CGA:
 	printf("CGA");
@@ -763,6 +625,7 @@ int
 scopen(dev_t dev, int flag, int mode, struct proc *p)
 {
     struct tty *tp = scdevtotty(dev);
+    keyarg_t key;
 
     if (!tp)
 	return(ENXIO);
@@ -774,7 +637,9 @@ scopen(dev_t dev, int flag, int mode, struct proc *p)
 	ttychars(tp);
         /* Use the current setting of the <-- key as default VERASE. */  
         /* If the Delete key is preferable, an stty is necessary     */
-        tp->t_cc[VERASE] = key_map.key[0x0e].map[0];
+	key.keynum = 0x0e;	/* how do we know this magic number... XXX */
+	kbd_ioctl(kbd, GIO_KEYMAPENT, (caddr_t)&key);
+        tp->t_cc[VERASE] = key.key.map[0];
 	tp->t_iflag = TTYDEF_IFLAG;
 	tp->t_oflag = TTYDEF_OFLAG;
 	tp->t_cflag = TTYDEF_CFLAG;
@@ -863,38 +728,53 @@ scwrite(dev_t dev, struct uio *uio, int flag)
     return((*linesw[tp->t_line].l_write)(tp, uio, flag));
 }
 
-static void
-scintr(int unit)
+static int
+sckbdevent(keyboard_t *thiskbd, int event, void *arg)
 {
     static struct tty *cur_tty;
-    int c, len;
+    int c; 
+    size_t len;
     u_char *cp;
 
+    /* assert(thiskbd == kbd) */
+
+    switch (event) {
+    case KBDIO_KEYINPUT:
+	break;
+    case KBDIO_UNLOADING:
+	kbd = NULL;
+	kbd_release(thiskbd, (void *)keyboard);
+	return 0;
+    default:
+	return EINVAL;
+    }
+
     /* 
      * Loop while there is still input to get from the keyboard.
      * I don't think this is nessesary, and it doesn't fix
      * the Xaccel-2.1 keyboard hang, but it can't hurt.		XXX
      */
-    while ((c = scgetc(SCGETC_NONBLOCK)) != NOKEY) {
+    while ((c = scgetc(thiskbd, SCGETC_NONBLOCK)) != NOKEY) {
 
 	cur_tty = VIRTUAL_TTY(get_scr_num());
 	if (!(cur_tty->t_state & TS_ISOPEN))
 	    if (!((cur_tty = CONSOLE_TTY)->t_state & TS_ISOPEN))
 		continue;
 
-	switch (c & 0xff00) {
+	switch (KEYFLAGS(c)) {
 	case 0x0000: /* normal key */
-	    (*linesw[cur_tty->t_line].l_rint)(c & 0xFF, cur_tty);
+	    (*linesw[cur_tty->t_line].l_rint)(KEYCHAR(c), cur_tty);
 	    break;
 	case FKEY:  /* function key, return string */
-	    if (cp = get_fstr((u_int)c, (u_int *)&len)) {
+	    cp = kbd_get_fkeystr(thiskbd, KEYCHAR(c), &len);
+	    if (cp != NULL) {
 	    	while (len-- >  0)
-		    (*linesw[cur_tty->t_line].l_rint)(*cp++ & 0xFF, cur_tty);
+		    (*linesw[cur_tty->t_line].l_rint)(*cp++, cur_tty);
 	    }
 	    break;
 	case MKEY:  /* meta is active, prepend ESC */
 	    (*linesw[cur_tty->t_line].l_rint)(0x1b, cur_tty);
-	    (*linesw[cur_tty->t_line].l_rint)(c & 0xFF, cur_tty);
+	    (*linesw[cur_tty->t_line].l_rint)(KEYCHAR(c), cur_tty);
 	    break;
 	case BKEY:  /* backtab fixed sequence (esc [ Z) */
 	    (*linesw[cur_tty->t_line].l_rint)(0x1b, cur_tty);
@@ -904,17 +784,12 @@ scintr(int unit)
 	}
     }
 
-#if 0
-    if (cur_console->status & MOUSE_ENABLED) {
-	cur_console->status &= ~MOUSE_VISIBLE;
-	remove_mouse_image(cur_console);
-    }
-#else
     if (cur_console->status & MOUSE_VISIBLE) {
 	remove_mouse_image(cur_console);
 	cur_console->status &= ~MOUSE_VISIBLE;
     }
-#endif
+
+    return 0;
 }
 
 static int
@@ -959,7 +834,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case GIO_COLOR:     	/* is this a color console ? */
-	*(int *)data = (adp_flags & V_ADP_COLOR) ? 1 : 0;
+	*(int *)data = (scp->adp->va_flags & V_ADP_COLOR) ? 1 : 0;
 	return 0;
 
     case CONS_BLANKTIME:    	/* set screen saver timeout (0 = no saver) */
@@ -977,7 +852,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	else
 	    sc_flags &= ~BLINK_CURSOR;
 	if ((*(int*)data) & 0x02) {
-	    if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
+	    if (!ISFONTAVAIL(scp->adp->va_flags))
 		return ENXIO;
 	    sc_flags |= CHAR_CURSOR;
 	} else
@@ -1054,7 +929,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	mouse_info_t buf;
 
 	/* FIXME: */
-	if (!ISMOUSEAVAIL(get_adapter(scp)->va_flags))
+	if (!ISMOUSEAVAIL(scp->adp->va_flags))
 	    return ENODEV;
 	
 	if (cmd == OLD_CONS_MOUSECTL) {
@@ -1317,8 +1192,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    return EINVAL;
 	}
 	/* make screensaver happy */
-	scsplash_stick(FALSE);
-	run_scrn_saver = FALSE;
+	sc_touch_scrn_saver();
 	return 0;
     }
 
@@ -1439,7 +1313,9 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    ptr->mv_grfc.fore = 0;      /* not supported */
 	    ptr->mv_grfc.back = 0;      /* not supported */
 	    ptr->mv_ovscan = scp->border;
-	    ptr->mk_keylock = scp->status & LOCK_KEY_MASK;
+	    if (scp == cur_console)
+		save_kbd_state(scp);
+	    ptr->mk_keylock = scp->status & LOCK_MASK;
 	    return 0;
 	}
 	return EINVAL;
@@ -1607,41 +1483,36 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case KDSKBSTATE:    	/* set keyboard state (locks) */
-	if (*(int *)data & ~LOCK_KEY_MASK)
+	if (*(int *)data & ~LOCK_MASK)
 	    return EINVAL;
-	scp->status &= ~LOCK_KEY_MASK;
+	scp->status &= ~LOCK_MASK;
 	scp->status |= *(int *)data;
 	if (scp == cur_console)
-	    update_leds(scp->status);
+	    update_kbd_state(scp->status, LOCK_MASK);
 	return 0;
 
     case KDGKBSTATE:    	/* get keyboard state (locks) */
-	*(int *)data = scp->status & LOCK_KEY_MASK;
+	if (scp == cur_console)
+	    save_kbd_state(scp);
+	*(int *)data = scp->status & LOCK_MASK;
 	return 0;
 
     case KDSETRAD:      	/* set keyboard repeat & delay rates */
 	if (*(int *)data & ~0x7f)
 	    return EINVAL;
-	if (sc_kbdc != NULL) 
-	    set_keyboard(KBDC_SET_TYPEMATIC, *(int *)data);
-	return 0;
+	error = kbd_ioctl(kbd, KDSETRAD, data);
+	if (error == ENOIOCTL)
+	    error = ENODEV;
+	return error;
 
     case KDSKBMODE:     	/* set keyboard mode */
 	switch (*(int *)data) {
+	case K_XLATE:   	/* switch to XLT ascii mode */
 	case K_RAW: 		/* switch to RAW scancode mode */
-	    scp->status &= ~KBD_CODE_MODE;
-	    scp->status |= KBD_RAW_MODE;
-	    return 0;
-
 	case K_CODE: 		/* switch to CODE mode */
-	    scp->status &= ~KBD_RAW_MODE;
-	    scp->status |= KBD_CODE_MODE;
-	    return 0;
-
-	case K_XLATE:   	/* switch to XLT ascii mode */
-	    if (scp == cur_console && scp->status & KBD_RAW_MODE)
-		shfts = ctls = alts = agrs = metas = accents = 0;
-	    scp->status &= ~(KBD_RAW_MODE | KBD_CODE_MODE);
+	    scp->kbd_mode = *(int *)data;
+	    if (scp == cur_console)
+		kbd_ioctl(kbd, cmd, data);
 	    return 0;
 	default:
 	    return EINVAL;
@@ -1649,10 +1520,15 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	/* NOT REACHED */
 
     case KDGKBMODE:     	/* get keyboard mode */
-	*(int *)data = (scp->status & KBD_RAW_MODE) ? K_RAW : 
-		((scp->status & KBD_CODE_MODE) ? K_CODE : K_XLATE);
+	*(int *)data = scp->kbd_mode;
 	return 0;
 
+    case KDGKBINFO:
+	error = kbd_ioctl(kbd, cmd, data);
+	if (error == ENOIOCTL)
+	    error = ENODEV;
+	return error;
+
     case KDMKTONE:      	/* sound the bell */
 	if (*(int*)data)
 	    do_bell(scp, (*(int*)data)&0xffff,
@@ -1686,43 +1562,73 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case KDGKBTYPE:     	/* get keyboard type */
-	*(int *)data = 0;  	/* type not known (yet) */
+	error = kbd_ioctl(kbd, cmd, data);
+	if (error == ENOIOCTL) {
+	    /* always return something? XXX */
+	    *(int *)data = 0;
+	}
 	return 0;
 
     case KDSETLED:      	/* set keyboard LED status */
-	if (*(int *)data & ~LED_MASK)
+	if (*(int *)data & ~LED_MASK)	/* FIXME: LOCK_MASK? */
 	    return EINVAL;
 	scp->status &= ~LED_MASK;
 	scp->status |= *(int *)data;
 	if (scp == cur_console)
-	    update_leds(scp->status);
+	    update_kbd_leds(scp->status);
 	return 0;
 
     case KDGETLED:      	/* get keyboard LED status */
+	if (scp == cur_console)
+	    save_kbd_state(scp);
 	*(int *)data = scp->status & LED_MASK;
 	return 0;
 
-    case GETFKEY:       	/* get functionkey string */
-	if (*(u_short*)data < n_fkey_tab) {
-	    fkeyarg_t *ptr = (fkeyarg_t*)data;
-	    bcopy(&fkey_tab[ptr->keynum].str, ptr->keydef,
-		  fkey_tab[ptr->keynum].len);
-	    ptr->flen = fkey_tab[ptr->keynum].len;
-	    return 0;
+    case CONS_SETKBD: 		/* set the new keyboard */
+	{
+	    keyboard_t *newkbd;
+
+	    s = spltty();
+	    newkbd = kbd_get_keyboard(*(int *)data);
+	    if (newkbd == NULL) {
+		splx(s);
+		return EINVAL;
+	    }
+	    error = 0;
+	    if (kbd != newkbd) {
+		i = kbd_allocate(newkbd->kb_name, newkbd->kb_unit,
+				 (void *)&keyboard, sckbdevent, NULL);
+		/* i == newkbd->kb_index */
+		if (i >= 0) {
+		    if (kbd != NULL) {
+			save_kbd_state(cur_console);
+			kbd_release(kbd, (void *)&keyboard);
+		    }
+		    kbd = kbd_get_keyboard(i);	/* kbd == newkbd */
+		    keyboard = i;
+		    kbd_ioctl(kbd, KDSKBMODE, (caddr_t)&cur_console->kbd_mode);
+		    update_kbd_state(cur_console->status, LOCK_MASK);
+		} else {
+		    error = EPERM;	/* XXX */
+		}
+	    }
+	    splx(s);
+	    return error;
 	}
-	else
-	    return EINVAL;
 
-    case SETFKEY:       	/* set functionkey string */
-	if (*(u_short*)data < n_fkey_tab) {
-	    fkeyarg_t *ptr = (fkeyarg_t*)data;
-	    bcopy(ptr->keydef, &fkey_tab[ptr->keynum].str,
-		  min(ptr->flen, MAXFK));
-	    fkey_tab[ptr->keynum].len = min(ptr->flen, MAXFK);
-	    return 0;
+    case CONS_RELKBD: 		/* release the current keyboard */
+	s = spltty();
+	error = 0;
+	if (kbd != NULL) {
+	    save_kbd_state(cur_console);
+	    error = kbd_release(kbd, (void *)&keyboard);
+	    if (error == 0) {
+		kbd = NULL;
+		keyboard = -1;
+	    }
 	}
-	else
-	    return EINVAL;
+	splx(s);
+	return error;
 
     case GIO_SCRNMAP:   	/* get output translation table */
 	bcopy(&scr_map, data, sizeof(scr_map));
@@ -1734,27 +1640,19 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    scr_rmap[scr_map[i]] = i;
 	return 0;
 
-    case GIO_KEYMAP:    	/* get keyboard translation table */
-	bcopy(&key_map, data, sizeof(key_map));
-	return 0;
-
-    case PIO_KEYMAP:    	/* set keyboard translation table */
-	accents = 0;
-	bzero(&accent_map, sizeof(accent_map));
-	bcopy(data, &key_map, sizeof(key_map));
-	return 0;
-
-    case GIO_DEADKEYMAP:    	/* get accent key translation table */
-	bcopy(&accent_map, data, sizeof(accent_map));
-	return 0;
-
-    case PIO_DEADKEYMAP:    	/* set accent key translation table */
-	accents = 0;
-	bcopy(data, &accent_map, sizeof(accent_map));
-	return 0;
+    case GIO_KEYMAP:		/* get keyboard translation table */
+    case PIO_KEYMAP:		/* set keyboard translation table */
+    case GIO_DEADKEYMAP:	/* get accent key translation table */
+    case PIO_DEADKEYMAP:	/* set accent key translation table */
+    case GETFKEY:		/* get function key string */
+    case SETFKEY:		/* set function key string */
+	error = kbd_ioctl(kbd, cmd, data);
+	if (error == ENOIOCTL)
+	    error = ENODEV;
+	return error;
 
     case PIO_FONT8x8:   	/* set 8x8 dot font */
-	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
+	if (!ISFONTAVAIL(scp->adp->va_flags))
 	    return ENXIO;
 	bcopy(data, font_8, 8*256);
 	fonts_loaded |= FONT_8;
@@ -1768,7 +1666,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case GIO_FONT8x8:   	/* get 8x8 dot font */
-	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
+	if (!ISFONTAVAIL(scp->adp->va_flags))
 	    return ENXIO;
 	if (fonts_loaded & FONT_8) {
 	    bcopy(font_8, data, 8*256);
@@ -1778,7 +1676,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    return ENXIO;
 
     case PIO_FONT8x14:  	/* set 8x14 dot font */
-	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
+	if (!ISFONTAVAIL(scp->adp->va_flags))
 	    return ENXIO;
 	bcopy(data, font_14, 14*256);
 	fonts_loaded |= FONT_14;
@@ -1793,7 +1691,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case GIO_FONT8x14:  	/* get 8x14 dot font */
-	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
+	if (!ISFONTAVAIL(scp->adp->va_flags))
 	    return ENXIO;
 	if (fonts_loaded & FONT_14) {
 	    bcopy(font_14, data, 14*256);
@@ -1803,7 +1701,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    return ENXIO;
 
     case PIO_FONT8x16:  	/* set 8x16 dot font */
-	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
+	if (!ISFONTAVAIL(scp->adp->va_flags))
 	    return ENXIO;
 	bcopy(data, font_16, 16*256);
 	fonts_loaded |= FONT_16;
@@ -1817,7 +1715,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case GIO_FONT8x16:  	/* get 8x16 dot font */
-	if (!ISFONTAVAIL(get_adapter(scp)->va_flags))
+	if (!ISFONTAVAIL(scp->adp->va_flags))
 	    return ENXIO;
 	if (fonts_loaded & FONT_16) {
 	    bcopy(font_16, data, 16*256);
@@ -1898,16 +1796,15 @@ sccnprobe(struct consdev *cp)
 	return;
     }
 
-    if (!scvidprobe(dvp->id_unit, dvp->id_flags)) {
+    if (!scvidprobe(dvp->id_unit, dvp->id_flags, TRUE)) {
 	cp->cn_pri = CN_DEAD;
 	return;
     }
+    sckbdprobe(dvp->id_unit, dvp->id_flags, TRUE);
 
     /* initialize required fields */
     cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLE);
     cp->cn_pri = CN_INTERNAL;
-
-    sc_kbdc = kbdc_open(sc_port);
 }
 
 static void
@@ -1920,9 +1817,34 @@ static void
 sccnputc(dev_t dev, int c)
 {
     u_char buf[1];
-    int s;
     scr_stat *scp = console[0];
     term_stat save = scp->term;
+    u_short *p;
+    int s;
+    int i;
+
+    if (scp == cur_console && scp->status & SLKED) {
+	scp->status &= ~SLKED;
+	update_kbd_state(scp->status, SLKED);
+	if (cur_console->status & BUFFER_SAVED) {
+	    p = cur_console->history_save;
+	    for (i = 0; i < cur_console->ysize; ++i) {
+		bcopy(p, cur_console->scr_buf + (cur_console->xsize*i),
+		      cur_console->xsize*sizeof(u_short));
+		p += cur_console->xsize;
+		if (p + cur_console->xsize
+		    > cur_console->history + cur_console->history_size)
+		    p = cur_console->history;
+	    }
+	    cur_console->status &= ~BUFFER_SAVED;
+	    cur_console->history_head = cur_console->history_save;
+	    cur_console->status |= CURSOR_ENABLED;
+	    mark_all(cur_console);
+	}
+#if 1 /* XXX */
+	scstart(VIRTUAL_TTY(get_scr_num()));
+#endif
+    }
 
     scp->term = kernel_console;
     current_default = &kernel_default;
@@ -1934,7 +1856,7 @@ sccnputc(dev_t dev, int c)
     current_default = &user_default;
     scp->term = save;
 
-    s = spltty();	/* block scintr and scrn_timer */
+    s = spltty();	/* block sckbdevent and scrn_timer */
     sccnupdate(scp);
     splx(s);
 }
@@ -1942,35 +1864,63 @@ sccnputc(dev_t dev, int c)
 static int
 sccngetc(dev_t dev)
 {
-    int s = spltty();	/* block scintr and scrn_timer while we poll */
+    return sccngetch(0);
+}
+
+static int
+sccncheckc(dev_t dev)
+{
+    return sccngetch(SCGETC_NONBLOCK);
+}
+
+static int
+sccngetch(int flags)
+{
+    int cur_mode;
+    int s = spltty();	/* block sckbdevent and scrn_timer while we poll */
     int c;
 
     /* 
      * Stop the screen saver and update the screen if necessary.
      * What if we have been running in the screen saver code... XXX
      */
-    scsplash_stick(FALSE);
-    run_scrn_saver = FALSE;
+    sc_touch_scrn_saver();
     sccnupdate(cur_console);
 
-    c = scgetc(SCGETC_CN);
-    splx(s);
-    return(c);
-}
+    if (kbd == NULL) {
+	splx(s);
+	return -1;
+    }
 
-static int
-sccncheckc(dev_t dev)
-{
-    int s = spltty();	/* block scintr and scrn_timer while we poll */
-    int c;
+    /* 
+     * Make sure the keyboard is accessible even when the kbd device
+     * driver is disabled.
+     */
+    kbd_enable(kbd);
 
-    scsplash_stick(FALSE);
-    run_scrn_saver = FALSE;
-    sccnupdate(cur_console);
+    /* we shall always use the keyboard in the XLATE mode here */
+    cur_mode = cur_console->kbd_mode;
+    cur_console->kbd_mode = K_XLATE;
+    kbd_ioctl(kbd, KDSKBMODE, (caddr_t)&cur_console->kbd_mode);
 
-    c = scgetc(SCGETC_CN | SCGETC_NONBLOCK);
+    c = scgetc(kbd, SCGETC_CN | flags);
+
+    cur_console->kbd_mode = cur_mode;
+    kbd_ioctl(kbd, KDSKBMODE, (caddr_t)&cur_console->kbd_mode);
+    kbd_disable(kbd);
     splx(s);
-    return(c == NOKEY ? -1 : c);	/* c == -1 can't happen */
+
+    switch (KEYFLAGS(c)) {
+    case 0:	/* normal char */
+	return KEYCHAR(c);
+    case FKEY:	/* function key */
+	return c;	/* XXX */
+    case NOKEY:
+    case ERRKEY:
+    default:
+	return -1;
+    }
+    /* NOT REACHED */
 }
 
 static void
@@ -1982,8 +1932,7 @@ sccnupdate(scr_stat *scp)
 	return;
 
     if (panicstr || shutdown_in_progress) {
-	scsplash_stick(FALSE);
-	run_scrn_saver = FALSE;
+	sc_touch_scrn_saver();
     } else if (scp != cur_console) {
 	return;
     }
@@ -2026,6 +1975,7 @@ get_scr_num()
 static void
 scrn_timer(void *arg)
 {
+    static int kbd_interval = 0;
     struct timeval tv;
     scr_stat *scp;
     int s;
@@ -2038,37 +1988,26 @@ scrn_timer(void *arg)
     }
     s = spltty();
 
-    /* 
-     * With release 2.1 of the Xaccel server, the keyboard is left
-     * hanging pretty often. Apparently an interrupt from the
-     * keyboard is lost, and I don't know why (yet).
-     * This ugly hack calls scintr if input is ready for the keyboard
-     * and conveniently hides the problem.			XXX
-     */
-    /* Try removing anything stuck in the keyboard controller; whether
-     * it's a keyboard scan code or mouse data. `scintr()' doesn't
-     * read the mouse data directly, but `kbdio' routines will, as a
-     * side effect.
-     */
-    if (kbdc_lock(sc_kbdc, TRUE)) {
-	/*
-	 * We have seen the lock flag is not set. Let's reset the flag early;
-	 * otherwise `update_led()' failes which may want the lock 
-	 * during `scintr()'.
-	 */
-	kbdc_lock(sc_kbdc, FALSE);
-	if (kbdc_data_ready(sc_kbdc)) 
-	    scintr(0);
+    if ((kbd == NULL) && (sc_flags & AUTODETECT_KBD)) {
+	/* try to allocate a keyboard automatically */
+	if (++kbd_interval >= 25) {
+	    keyboard = kbd_allocate("*", -1, (void *)&keyboard,
+				    sckbdevent, NULL);
+	    if (keyboard >= 0) {
+		kbd = kbd_get_keyboard(keyboard);
+		kbd_ioctl(kbd, KDSKBMODE, (caddr_t)&cur_console->kbd_mode);
+		update_kbd_state(cur_console->status, LOCK_MASK);
+	    }
+	    kbd_interval = 0;
+	}
     }
 
     scp = cur_console;
 
     /* should we stop the screen saver? */
     getmicrouptime(&tv);
-    if (panicstr || shutdown_in_progress) {
-	scsplash_stick(FALSE);
-	run_scrn_saver = FALSE;
-    }
+    if (panicstr || shutdown_in_progress)
+	sc_touch_scrn_saver();
     if (run_scrn_saver) {
 	scrn_idle = (tv.tv_sec > scrn_time_stamp + scrn_blank_time);
     } else {
@@ -2096,7 +2035,7 @@ scrn_timer(void *arg)
     /* should we activate the screen saver? */
     if ((saver_mode == CONS_LKM_SAVER) && scrn_idle)
 	if (!ISGRAPHSC(scp) || (scp->status & SAVER_RUNNING))
-	    scrn_saver(current_saver, TRUE);
+	    (*current_saver)(TRUE);
 
     if (arg)
 	timeout(scrn_timer, (void *)TRUE, hz / 25);
@@ -2172,25 +2111,90 @@ scrn_update(scr_stat *scp, int show_cursor)
     scp->start = scp->xsize*scp->ysize - 1;
 }
 
-int
+#if NSPLASH > 0
+
+static int
+scsplash_callback(int event)
+{
+    int error;
+
+    switch (event) {
+    case SPLASH_INIT:
+	if (add_scrn_saver(scsplash_saver) == 0) {
+	    run_scrn_saver = TRUE;
+	    if (cold && !(boothowto & (RB_VERBOSE | RB_CONFIG))) {
+		scsplash_stick(TRUE);
+		(*current_saver)(TRUE);
+	    }
+	}
+	return 0;
+
+    case SPLASH_TERM:
+	if (current_saver == scsplash_saver) {
+	    scsplash_stick(FALSE);
+	    error = remove_scrn_saver(scsplash_saver);
+	    if (error)
+		return error;
+	}
+	return 0;
+
+    default:
+	return EINVAL;
+    }
+}
+
+static void
+scsplash_saver(int show)
+{
+    static int busy = FALSE;
+    static int failed = FALSE;
+    scr_stat *scp;
+
+    if (busy)
+	return;
+    busy = TRUE;
+
+    scp = cur_console;
+    if (show) {
+	if (!failed) {
+	    if (!scrn_blanked)
+		set_scrn_saver_mode(scp, -1, NULL, 0);
+	    if (splash(scp->adp, TRUE) == 0) {
+		scrn_blanked = TRUE;
+	    } else {
+		failed = TRUE;
+		scsplash_stick(FALSE);
+		printf("scsplash_saver(): failed to put up the image\n");
+		restore_scrn_saver_mode(scp);
+	    }
+	}
+    } else if (!sticky_splash) {
+	if (scrn_blanked && (splash(scp->adp, FALSE) == 0)) {
+	    restore_scrn_saver_mode(scp);
+	    scrn_blanked = FALSE;
+	}
+    }
+    busy = FALSE;
+}
+
+static int
 add_scrn_saver(void (*this_saver)(int))
 {
-#ifdef SC_SPLASH_SCREEN
-    if (current_saver == scsplash) {
-	scsplash_stick(FALSE);
-        stop_scrn_saver(scsplash);
+    int error;
+
+    if (current_saver != none_saver) {
+	error = remove_scrn_saver(current_saver);
+	if (error)
+	    return error;
     }
-#endif
 
-    if (current_saver != default_saver)
-	return EBUSY;
     run_scrn_saver = FALSE;
     saver_mode = CONS_LKM_SAVER;
     current_saver = this_saver;
     return 0;
 }
 
-int
+static int
 remove_scrn_saver(void (*this_saver)(int))
 {
     if (current_saver != this_saver)
@@ -2203,35 +2207,77 @@ remove_scrn_saver(void (*this_saver)(int))
      * before stopping the current saver, rather than blocking by `splXX()'.
      */
     current_saver = none_saver;
-    if (scrn_blanked > 0)
+    if (scrn_blanked)
         stop_scrn_saver(this_saver);
 
-    if (scrn_blanked > 0) 
-	return EBUSY;	/* XXX */
+    return (scrn_blanked ? EBUSY : 0);
+}
 
-    current_saver = default_saver;
-    return 0;
+static int
+set_scrn_saver_mode(scr_stat *scp, int mode, u_char *pal, int border)
+{
+    int s;
+
+    /* assert(scp == cur_console) */
+    s = spltty();
+    scp->splash_save_mode = scp->mode;
+    scp->splash_save_status = scp->status & (GRAPHICS_MODE | PIXEL_MODE);
+    scp->status &= ~PIXEL_MODE;
+    scp->status |= (UNKNOWN_MODE | SAVER_RUNNING);
+    splx(s);
+    if (mode < 0)
+	return 0;
+    scp->mode = mode;
+    if (set_mode(scp) == 0) {
+	if (scp->adp->va_mode_flags & V_INFO_GRAPHICS)
+	    scp->status |= GRAPHICS_MODE;
+	if (pal != NULL)
+	    load_palette(scp->adp, pal);
+	set_border(scp, border);
+	return 0;
+    } else {
+	s = spltty();
+	scp->mode = scp->splash_save_mode;
+	scp->status &= ~(UNKNOWN_MODE | SAVER_RUNNING);
+	scp->status |= scp->splash_save_status;
+	splx(s);
+	return 1;
+    }
 }
 
-static void
-scrn_saver(void (*saver)(int), int blank)
+static int
+restore_scrn_saver_mode(scr_stat *scp)
 {
-    static int busy = FALSE;
+    int mode;
+    int status;
+    int s;
 
-    if (busy)
-	return;
-    busy = TRUE;
-    (*saver)(blank);
-    busy = FALSE;
+    /* assert(scp == cur_console) */
+    s = spltty();
+    mode = scp->mode;
+    status = scp->status;
+    scp->mode = scp->splash_save_mode;
+    scp->status &= ~(UNKNOWN_MODE | GRAPHICS_MODE | SAVER_RUNNING);
+    scp->status |= scp->splash_save_status;
+    if (set_mode(scp) == 0) {
+	load_palette(scp->adp, palette);
+	splx(s);
+	return 0;
+    } else {
+	scp->mode = mode;
+	scp->status = status;
+	splx(s);
+	return 1;
+    }
 }
 
 static void
 stop_scrn_saver(void (*saver)(int))
 {
-    scrn_saver(saver, FALSE);
+    (*saver)(FALSE);
     run_scrn_saver = FALSE;
     /* the screen saver may have chosen not to stop after all... */
-    if (scrn_blanked > 0)
+    if (scrn_blanked)
 	return;
 
     mark_all(cur_console);
@@ -2245,7 +2291,7 @@ wait_scrn_saver_stop(void)
 {
     int error = 0;
 
-    while (scrn_blanked > 0) {
+    while (scrn_blanked) {
 	run_scrn_saver = FALSE;
 	error = tsleep((caddr_t)&scrn_blanked, PZERO | PCATCH, "scrsav", 0);
 	run_scrn_saver = FALSE;
@@ -2255,6 +2301,15 @@ wait_scrn_saver_stop(void)
     return error;
 }
 
+#endif /* NSPLASH */
+
+void
+sc_touch_scrn_saver(void)
+{
+    scsplash_stick(FALSE);
+    run_scrn_saver = FALSE;
+}
+
 void
 sc_clear_screen(scr_stat *scp)
 {
@@ -2270,9 +2325,8 @@ static int
 switch_scr(scr_stat *scp, u_int next_scr)
 {
     /* delay switch if actively updating screen */
-    if (scrn_blanked > 0 || write_in_progress || blink_in_progress) {
-	scsplash_stick(FALSE);
-	run_scrn_saver = FALSE;
+    if (scrn_blanked || write_in_progress || blink_in_progress) {
+	sc_touch_scrn_saver();
 	delayed_next_scr = next_scr+1;
 	return 0;
     }
@@ -2331,7 +2385,12 @@ switch_scr(scr_stat *scp, u_int next_scr)
 static void
 exchange_scr(void)
 {
+    /* save the current state of video and keyboard */
     move_crsr(old_scp, old_scp->xpos, old_scp->ypos);
+    if (old_scp->kbd_mode == K_XLATE)
+	save_kbd_state(old_scp);
+
+    /* set up the video for the new screen */
     cur_console = new_scp;
     if (old_scp->mode != new_scp->mode || ISUNKNOWNSC(old_scp))
 	set_mode(new_scp);
@@ -2339,12 +2398,14 @@ exchange_scr(void)
     if (ISTEXTSC(new_scp) && (sc_flags & CHAR_CURSOR))
 	set_destructive_cursor(new_scp);
     if (ISGRAPHSC(old_scp))
-	load_palette(new_scp, palette);
-    if (old_scp->status & KBD_RAW_MODE || new_scp->status & KBD_RAW_MODE ||
-        old_scp->status & KBD_CODE_MODE || new_scp->status & KBD_CODE_MODE)
-	shfts = ctls = alts = agrs = metas = accents = 0;
+	load_palette(new_scp->adp, palette);
     set_border(new_scp, new_scp->border);
-    update_leds(new_scp->status);
+
+    /* set up the keyboard for the new screen */
+    if (old_scp->kbd_mode != new_scp->kbd_mode)
+	kbd_ioctl(kbd, KDSKBMODE, (caddr_t)&new_scp->kbd_mode);
+    update_kbd_state(new_scp->status, LOCK_MASK);
+
     delayed_next_scr = FALSE;
     mark_all(new_scp);
 }
@@ -2817,7 +2878,7 @@ scan_esc(scr_stat *scp, u_char c)
 		else
 		    sc_flags &= ~BLINK_CURSOR;
 		if ((scp->term.param[0] & 0x02) 
-		    && ISFONTAVAIL(get_adapter(scp)->va_flags)) 
+		    && ISFONTAVAIL(scp->adp->va_flags)) 
 		    sc_flags |= CHAR_CURSOR;
 		else
 		    sc_flags &= ~CHAR_CURSOR;
@@ -3022,6 +3083,7 @@ outloop:
 static void
 scinit(void)
 {
+    video_adapter_t *adp;
     int col;
     int row;
     u_int i;
@@ -3030,9 +3092,10 @@ scinit(void)
 	return;
     init_done = WARM;
 
-    /* extract the hardware cursor location and move it out of the way */
-    (*biosvidsw.read_hw_cursor)(V_ADP_PRIMARY, &col, &row);
-    (*biosvidsw.set_hw_cursor)(V_ADP_PRIMARY, -1, -1);
+    /* extract the hardware cursor location and hide the cursor for now */
+    adp = vid_get_adapter(adapter);
+    (*vidsw[adapter]->read_hw_cursor)(adp, &col, &row);
+    (*vidsw[adapter]->set_hw_cursor)(adp, -1, -1);
 
     /* set up the first console */
     current_default = &user_default;
@@ -3042,7 +3105,7 @@ scinit(void)
 
     /* copy screen to temporary buffer */
     if (ISTEXTSC(console[0]))
-	generic_bcopy((ushort *)(get_adapter(console[0])->va_window), sc_buffer,
+	generic_bcopy((ushort *)(console[0]->adp->va_window), sc_buffer,
 		      console[0]->xsize * console[0]->ysize * sizeof(u_short));
 
     console[0]->scr_buf = console[0]->mouse_pos = console[0]->mouse_oldpos
@@ -3071,7 +3134,7 @@ scinit(void)
     }
 
     /* Save font and palette */
-    if (ISFONTAVAIL(get_adapter(cur_console)->va_flags)) {
+    if (ISFONTAVAIL(cur_console->adp->va_flags)) {
 	if (fonts_loaded & FONT_16) {
 	    copy_font(cur_console, LOAD, 16, font_16);
 	} else {
@@ -3083,21 +3146,20 @@ scinit(void)
 	 * FONT KLUDGE
 	 * Always use the font page #0. XXX
 	 */
-	(*biosvidsw.show_font)(cur_console->adp, 0);
+	(*vidsw[cur_console->ad]->show_font)(cur_console->adp, 0);
     }
-    save_palette(cur_console, palette);
+    save_palette(cur_console->adp, palette);
 
-#ifdef SC_SPLASH_SCREEN
-    /* put up the splash. */
-    scsplash_init(cur_console);
+#if NSPLASH > 0
+    /* we are ready to put up the splash image! */
+    splash_init(cur_console->adp, scsplash_callback);
 #endif
 }
 
 static void
 scshutdown(int howto, void *arg)
 {
-    scsplash_stick(FALSE);
-    run_scrn_saver = FALSE;
+    sc_touch_scrn_saver();
     if (!cold && cur_console->smode.mode == VT_AUTO 
 	&& console[0]->smode.mode == VT_AUTO)
 	switch_scr(cur_console, 0);
@@ -3187,11 +3249,11 @@ static scr_stat
     scp = (scr_stat *)malloc(sizeof(scr_stat), M_DEVBUF, M_WAITOK);
     init_scp(scp);
     sc_alloc_scr_buffer(scp, TRUE, TRUE);
-    if (ISMOUSEAVAIL(get_adapter(scp)->va_flags))
+    if (ISMOUSEAVAIL(scp->adp->va_flags))
 	sc_alloc_cut_buffer(scp, TRUE);
     sc_alloc_history_buffer(scp, sc_history_size, 0, TRUE);
 /* SOS
-    if (get_adapter(scp)->va_flags & V_ADP_MODECHANGE)
+    if (scp->adp->va_flags & V_ADP_MODECHANGE)
 	set_mode(scp);
 */
     sc_clear_screen(scp);
@@ -3204,11 +3266,12 @@ init_scp(scr_stat *scp)
 {
     video_info_t info;
 
-    scp->adp = V_ADP_PRIMARY;
-    (*biosvidsw.get_info)(scp->adp, initial_video_mode, &info);
+    scp->ad = adapter;
+    scp->adp = vid_get_adapter(scp->ad);
+    (*vidsw[scp->ad]->get_info)(scp->adp, initial_video_mode, &info);
 
     scp->status = 0;
-    scp->mode = scp->initial_mode = initial_video_mode;
+    scp->mode = initial_video_mode;
     scp->scr_buf = NULL;
     if (info.vi_flags & V_INFO_GRAPHICS) {
 	scp->status |= GRAPHICS_MODE;
@@ -3244,6 +3307,7 @@ init_scp(scr_stat *scp)
     scp->mouse_signal = 0;
     scp->mouse_pid = 0;
     scp->mouse_proc = NULL;
+    scp->kbd_mode = K_XLATE;
     scp->bell_pitch = BELL_PITCH;
     scp->bell_duration = BELL_DURATION;
     scp->status |= (*(u_int8_t *)pa_to_va(0x417) & 0x20) ? NLKED : 0;
@@ -3255,20 +3319,6 @@ init_scp(scr_stat *scp)
     scp->history_size = imax(sc_history_size, scp->ysize) * scp->xsize;
 }
 
-static u_char
-*get_fstr(u_int c, u_int *len)
-{
-    u_int i;
-
-    if (!(c & FKEY))
-	return(NULL);
-    i = (c & 0xFF) - F_FN;
-    if (i > n_fkey_tab)
-	return(NULL);
-    *len = fkey_tab[i].len;
-    return(fkey_tab[i].str);
-}
-
 static void
 history_to_screen(scr_stat *scp)
 {
@@ -3314,151 +3364,46 @@ history_down_line(scr_stat *scp)
  * return NOKEY if there is nothing there.
  */
 static u_int
-scgetc(u_int flags)
+scgetc(keyboard_t *kbd, u_int flags)
 {
-    struct key_t *key;
-    u_char scancode, keycode;
-    u_int state, action;
-    int c;
-    static u_char esc_flag = 0, compose = 0;
-    static u_int chr = 0;
+    u_int c;
+    int this_scr;
+    int f;
+    int i;
+
+    if (kbd == NULL)
+	return NOKEY;
 
 next_code:
+    /* I don't like this, but... XXX */
+    if (flags & SCGETC_CN)
+	sccnupdate(cur_console);
     /* first see if there is something in the keyboard port */
-    if (flags & SCGETC_NONBLOCK) {
-	c = read_kbd_data_no_wait(sc_kbdc);
-	if (c == -1)
-	    return(NOKEY);
-    } else {
-	do {
-	    c = read_kbd_data(sc_kbdc);
-	} while(c == -1);
+    for (;;) {
+	c = kbd_read_char(kbd, !(flags & SCGETC_NONBLOCK));
+	if (c == ERRKEY) {
+	    if (!(flags & SCGETC_CN))
+		do_bell(cur_console, BELL_PITCH, BELL_DURATION);
+	} else if (c == NOKEY)
+	    return c;
+	else
+	    break;
     }
-    scancode = (u_char)c;
 
     /* make screensaver happy */
-    if (!(scancode & 0x80)) {
-	scsplash_stick(FALSE);
-	run_scrn_saver = FALSE;
-    }
+    if (!(c & RELKEY))
+	sc_touch_scrn_saver();
 
-    if (!(flags & SCGETC_CN)) {
+    if (!(flags & SCGETC_CN))
 	/* do the /dev/random device a favour */
-	add_keyboard_randomness(scancode);
+	add_keyboard_randomness(c);
 
-	if (cur_console->status & KBD_RAW_MODE)
-	    return scancode;
-    }
-
-    keycode = scancode & 0x7F;
-    switch (esc_flag) {
-    case 0x00:      /* normal scancode */
-	switch(scancode) {
-	case 0xB8:  /* left alt (compose key) */
-	    if (compose) {
-		compose = 0;
-		if (chr > 255) {
-		    do_bell(cur_console,
-			BELL_PITCH, BELL_DURATION);
-		    chr = 0;
-		}
-	    }
-	    break;
-	case 0x38:
-	    if (!compose) {
-		compose = 1;
-		chr = 0;
-	    }
-	    break;
-	case 0xE0:
-	case 0xE1:
-	    esc_flag = scancode;
-	    goto next_code;
-	}
-	break;
-    case 0xE0:      /* 0xE0 prefix */
-	esc_flag = 0;
-	switch (keycode) {
-	case 0x1C:  /* right enter key */
-	    keycode = 0x59;
-	    break;
-	case 0x1D:  /* right ctrl key */
-	    keycode = 0x5A;
-	    break;
-	case 0x35:  /* keypad divide key */
-	    keycode = 0x5B;
-	    break;
-	case 0x37:  /* print scrn key */
-	    keycode = 0x5C;
-	    break;
-	case 0x38:  /* right alt key (alt gr) */
-	    keycode = 0x5D;
-	    break;
-	case 0x47:  /* grey home key */
-	    keycode = 0x5E;
-	    break;
-	case 0x48:  /* grey up arrow key */
-	    keycode = 0x5F;
-	    break;
-	case 0x49:  /* grey page up key */
-	    keycode = 0x60;
-	    break;
-	case 0x4B:  /* grey left arrow key */
-	    keycode = 0x61;
-	    break;
-	case 0x4D:  /* grey right arrow key */
-	    keycode = 0x62;
-	    break;
-	case 0x4F:  /* grey end key */
-	    keycode = 0x63;
-	    break;
-	case 0x50:  /* grey down arrow key */
-	    keycode = 0x64;
-	    break;
-	case 0x51:  /* grey page down key */
-	    keycode = 0x65;
-	    break;
-	case 0x52:  /* grey insert key */
-	    keycode = 0x66;
-	    break;
-	case 0x53:  /* grey delete key */
-	    keycode = 0x67;
-	    break;
-
-	/* the following 3 are only used on the MS "Natural" keyboard */
-	case 0x5b:  /* left Window key */
-	    keycode = 0x69;
-	    break;
-	case 0x5c:  /* right Window key */
-	    keycode = 0x6a;
-	    break;
-	case 0x5d:  /* menu key */
-	    keycode = 0x6b;
-	    break;
-	default:    /* ignore everything else */
-	    goto next_code;
-	}
-	break;
-    case 0xE1:      /* 0xE1 prefix */
-	esc_flag = 0;
-	if (keycode == 0x1D)
-	    esc_flag = 0x1D;
-	goto next_code;
-	/* NOT REACHED */
-    case 0x1D:      /* pause / break */
-	esc_flag = 0;
-	if (keycode != 0x45)
-	    goto next_code;
-	keycode = 0x68;
-	break;
-    }
-
-    if (!(flags & SCGETC_CN) && (cur_console->status & KBD_CODE_MODE))
-	return (keycode | (scancode & 0x80));
+    if (cur_console->kbd_mode != K_XLATE)
+	return KEYCHAR(c);
 
     /* if scroll-lock pressed allow history browsing */
-    if (cur_console->history && cur_console->status & SLKED) {
-	int i;
+    if (!ISGRAPHSC(cur_console) && cur_console->history 
+	&& cur_console->status & SLKED) {
 
 	cur_console->status &= ~CURSOR_ENABLED;
 	if (!(cur_console->status & BUFFER_SAVED)) {
@@ -3478,170 +3423,81 @@ next_code:
 	    cur_console->history_pos = cur_console->history_head;
 	    history_to_screen(cur_console);
 	}
-	switch (scancode) {
-	case 0x47:  /* home key */
+	switch (c) {
+	/* FIXME: key codes */
+	case SPCLKEY | FKEY | F(49):  /* home key */
+	    remove_cutmarking(cur_console);
 	    cur_console->history_pos = cur_console->history_head;
 	    history_to_screen(cur_console);
 	    goto next_code;
 
-	case 0x4F:  /* end key */
+	case SPCLKEY | FKEY | F(57):  /* end key */
+	    remove_cutmarking(cur_console);
 	    cur_console->history_pos =
 		WRAPHIST(cur_console, cur_console->history_head,
 			 cur_console->xsize*cur_console->ysize);
 	    history_to_screen(cur_console);
 	    goto next_code;
 
-	case 0x48:  /* up arrow key */
+	case SPCLKEY | FKEY | F(50):  /* up arrow key */
+	    remove_cutmarking(cur_console);
 	    if (history_up_line(cur_console))
-		do_bell(cur_console, BELL_PITCH, BELL_DURATION);
+		if (!(flags & SCGETC_CN))
+		    do_bell(cur_console, BELL_PITCH, BELL_DURATION);
 	    goto next_code;
 
-	case 0x50:  /* down arrow key */
+	case SPCLKEY | FKEY | F(58):  /* down arrow key */
+	    remove_cutmarking(cur_console);
 	    if (history_down_line(cur_console))
-		do_bell(cur_console, BELL_PITCH, BELL_DURATION);
+		if (!(flags & SCGETC_CN))
+		    do_bell(cur_console, BELL_PITCH, BELL_DURATION);
 	    goto next_code;
 
-	case 0x49:  /* page up key */
+	case SPCLKEY | FKEY | F(51):  /* page up key */
+	    remove_cutmarking(cur_console);
 	    for (i=0; i<cur_console->ysize; i++)
 	    if (history_up_line(cur_console)) {
-		do_bell(cur_console, BELL_PITCH, BELL_DURATION);
+		if (!(flags & SCGETC_CN))
+		    do_bell(cur_console, BELL_PITCH, BELL_DURATION);
 		break;
 	    }
 	    goto next_code;
 
-	case 0x51:  /* page down key */
+	case SPCLKEY | FKEY | F(59):  /* page down key */
+	    remove_cutmarking(cur_console);
 	    for (i=0; i<cur_console->ysize; i++)
 	    if (history_down_line(cur_console)) {
-		do_bell(cur_console, BELL_PITCH, BELL_DURATION);
+		if (!(flags & SCGETC_CN))
+		    do_bell(cur_console, BELL_PITCH, BELL_DURATION);
 		break;
 	    }
 	    goto next_code;
 	}
     }
 
-    if (compose) {
-	switch (scancode) {
-	/* key pressed process it */
-	case 0x47: case 0x48: case 0x49:    /* keypad 7,8,9 */
-	    chr = (scancode - 0x40) + chr*10;
-	    goto next_code;
-	case 0x4B: case 0x4C: case 0x4D:    /* keypad 4,5,6 */
-	    chr = (scancode - 0x47) + chr*10;
-	    goto next_code;
-	case 0x4F: case 0x50: case 0x51:    /* keypad 1,2,3 */
-	    chr = (scancode - 0x4E) + chr*10;
-	    goto next_code;
-	case 0x52:              /* keypad 0 */
-	    chr *= 10;
-	    goto next_code;
-
-	/* key release, no interest here */
-	case 0xC7: case 0xC8: case 0xC9:    /* keypad 7,8,9 */
-	case 0xCB: case 0xCC: case 0xCD:    /* keypad 4,5,6 */
-	case 0xCF: case 0xD0: case 0xD1:    /* keypad 1,2,3 */
-	case 0xD2:              /* keypad 0 */
-	    goto next_code;
-
-	case 0x38:              /* left alt key */
-	    break;
-	default:
-	    if (chr) {
-		compose = chr = 0;
-		do_bell(cur_console, BELL_PITCH, BELL_DURATION);
-		goto next_code;
-	    }
-	    break;
-	}
-    }
-
-    state = (shfts ? 1 : 0 ) | (2 * (ctls ? 1 : 0)) | (4 * (alts ? 1 : 0));
-    if ((!agrs && (cur_console->status & ALKED))
-	|| (agrs && !(cur_console->status & ALKED)))
-	keycode += ALTGR_OFFSET;
-    key = &key_map.key[keycode];
-    if ( ((key->flgs & FLAG_LOCK_C) && (cur_console->status & CLKED))
-	 || ((key->flgs & FLAG_LOCK_N) && (cur_console->status & NLKED)) )
-	state ^= 1;
-
-    /* Check for make/break */
-    action = key->map[state];
-    if (scancode & 0x80) {      /* key released */
-	if (key->spcl & (0x80>>state)) {
-	    switch (action) {
-	    case LSH:
-		shfts &= ~1;
-		break;
-	    case RSH:
-		shfts &= ~2;
-		break;
-	    case LCTR:
-		ctls &= ~1;
-		break;
-	    case RCTR:
-		ctls &= ~2;
-		break;
-	    case LALT:
-		alts &= ~1;
-		break;
-	    case RALT:
-		alts &= ~2;
-		break;
-	    case NLK:
-		nlkcnt = 0;
-		break;
-	    case CLK:
-		clkcnt = 0;
-		break;
-	    case SLK:
-		slkcnt = 0;
-		break;
-	    case ASH:
-		agrs = 0;
-		break;
-	    case ALK:
-		alkcnt = 0;
-		break;
-	    case META:
-		metas = 0;
-		break;
-	    }
-	}
-	if (chr && !compose) {
-	    action = chr;
-	    chr = 0;
-	    return(action);
-	}
+    /* 
+     * Process and consume special keys here.  Return a plain char code
+     * or a char code with the META flag or a function key code.
+     */
+    if (c & RELKEY) {
+	/* key released */
+	/* goto next_code */
     } else {
 	/* key pressed */
-	if (key->spcl & (0x80>>state)) {
-	    switch (action) {
+	if (c & SPCLKEY) {
+	    c &= ~SPCLKEY;
+	    switch (KEYCHAR(c)) {
 	    /* LOCKING KEYS */
-	    case NLK:
-		if (!nlkcnt) {
-		    nlkcnt++;
-		    if (cur_console->status & NLKED)
-			cur_console->status &= ~NLKED;
-		    else
-			cur_console->status |= NLKED;
-		    update_leds(cur_console->status);
-		}
-		break;
-	    case CLK:
-		if (!clkcnt) {
-		    clkcnt++;
-		    if (cur_console->status & CLKED)
-			cur_console->status &= ~CLKED;
-		    else
-			cur_console->status |= CLKED;
-		    update_leds(cur_console->status);
-		}
+	    case NLK: case CLK: case ALK:
 		break;
 	    case SLK:
-		if (!slkcnt) {
-		    slkcnt++;
+		kbd_ioctl(kbd, KDGKBSTATE, (caddr_t)&f);
+		if (f & SLKED) {
+		    cur_console->status |= SLKED;
+		} else {
 		    if (cur_console->status & SLKED) {
 			cur_console->status &= ~SLKED;
-			if (cur_console->status & BUFFER_SAVED){
+			if (cur_console->status & BUFFER_SAVED) {
 			    int i;
 			    u_short *ptr = cur_console->history_save;
 
@@ -3663,73 +3519,64 @@ next_code:
 			}
 			scstart(VIRTUAL_TTY(get_scr_num()));
 		    }
-		    else
-			cur_console->status |= SLKED;
-		    update_leds(cur_console->status);
-		}
-		break;
-	    case ALK:
-		if (!alkcnt) {
-		    alkcnt++;
-		    if (cur_console->status & ALKED)
-			cur_console->status &= ~ALKED;
-		    else
-			cur_console->status |= ALKED;
-		    update_leds(cur_console->status);
 		}
 		break;
 
 	    /* NON-LOCKING KEYS */
 	    case NOP:
+	    case LSH:  case RSH:  case LCTR: case RCTR:
+	    case LALT: case RALT: case ASH:  case META:
 		break;
+
+	    case BTAB:
+		return c;
+
 	    case SPSC:
 		/* force activatation/deactivation of the screen saver */
-		accents = 0;
-		if (scrn_blanked <= 0) {
+		if (!scrn_blanked) {
 		    run_scrn_saver = TRUE;
 		    scrn_time_stamp -= scrn_blank_time;
 		}
-#ifdef SC_SPLASH_SCREEN
+#if NSPLASH > 0
 		if (cold) {
 		    /*
 		     * While devices are being probed, the screen saver need
 		     * to be invoked explictly. XXX
 		     */
-		    if (scrn_blanked > 0) {
+		    if (scrn_blanked) {
 			scsplash_stick(FALSE);
 			stop_scrn_saver(current_saver);
 		    } else {
 			if (!ISGRAPHSC(cur_console)) {
 			    scsplash_stick(TRUE);
-			    scrn_saver(current_saver, TRUE);
+			    (*current_saver)(TRUE);
 			}
 		    }
 		}
-#endif
+#endif /* NSPLASH */
 		break;
+
 	    case RBT:
 #ifndef SC_DISABLE_REBOOT
-		accents = 0;
 		shutdown_nice();
 #endif
 		break;
-	    case SUSP:
+
 #if NAPM > 0
-		accents = 0;
+	    case SUSP:
 		apm_suspend(PMST_SUSPEND);
-#endif
 		break;
-
 	    case STBY:
-#if NAPM > 0
-		accents = 0;
 		apm_suspend(PMST_STANDBY);
-#endif
 		break;
+#else
+	    case SUSP:
+	    case STBY:
+		break;
+#endif
 
 	    case DBG:
-#ifdef DDB          /* try to switch to console 0 */
-		accents = 0;
+#ifdef DDB      /* try to switch to console 0 */
 		/*
 		 * TRY to make sure the screen saver is stopped, 
 		 * and the screen is updated before switching to 
@@ -3744,131 +3591,47 @@ next_code:
 		printf("No debugger in kernel\n");
 #endif
 		break;
-	    case LSH:
-		shfts |= 1;
-		break;
-	    case RSH:
-		shfts |= 2;
-		break;
-	    case LCTR:
-		ctls |= 1;
-		break;
-	    case RCTR:
-		ctls |= 2;
-		break;
-	    case LALT:
-		alts |= 1;
-		break;
-	    case RALT:
-		alts |= 2;
-		break;
-	    case ASH:
-		agrs = 1;
-		break;
-	    case META:
-		metas = 1;
-		break;
+
 	    case NEXT:
-		{
-		int next, this = get_scr_num();
-		accents = 0;
-		for (next = this+1; next != this; next = (next+1)%MAXCONS) {
-		    struct tty *tp = VIRTUAL_TTY(next);
+    		this_scr = get_scr_num();
+		for (i = this_scr + 1; i != this_scr; i = (i + 1)%MAXCONS) {
+		    struct tty *tp = VIRTUAL_TTY(i);
 		    if (tp->t_state & TS_ISOPEN) {
-			switch_scr(cur_console, next);
+			switch_scr(cur_console, i);
 			break;
 		    }
 		}
-		}
 		break;
-	    case BTAB:
-		accents = 0;
-		return(BKEY);
+
 	    default:
-		if (action >= F_ACC && action <= L_ACC) {
-		    /* turn it into an index */
-		    action -= F_ACC - 1;
-		    if ((action > accent_map.n_accs) 
-			|| (accent_map.acc[action - 1].accchar == 0)) {
-			/* 
-			 * The index is out of range or pointing to an 
-			 * empty entry.
-			 */
-			accents = 0;
-			do_bell(cur_console, BELL_PITCH, BELL_DURATION);
-		    }
-		    /* 
-		     * If the same accent key has been hit twice,
-		     * produce the accent char itself.
-		     */
-		    if (action == accents) {
-			action = accent_map.acc[accents - 1].accchar;
-			accents = 0;
-			if (metas)
-			    action |= MKEY;
-			return (action);
-		    }
-		    /* remember the index and wait for the next key stroke */
-		    accents = action; 
+		if (KEYCHAR(c) >= F_SCR && KEYCHAR(c) <= L_SCR) {
+		    switch_scr(cur_console, KEYCHAR(c) - F_SCR);
 		    break;
 		}
-		if (accents > 0) {
-		    accents = 0;
-		    do_bell(cur_console, BELL_PITCH, BELL_DURATION);
-		}
-		if (action >= F_SCR && action <= L_SCR) {
-		    switch_scr(cur_console, action - F_SCR);
-		    break;
-		}
-		if (action >= F_FN && action <= L_FN)
-		    action |= FKEY;
-		return(action);
+		/* assert(c & FKEY) */
+		return c;
 	    }
-	}
-	else {
-	    if (accents) {
-		struct acc_t *acc;
-		int i;
-
-		acc = &accent_map.acc[accents - 1];
-		accents = 0;
-		/* 
-		 * If the accent key is followed by the space key,
-		 * produce the accent char itself.
-		 */
-		if (action == ' ') {
-		    action = acc->accchar;
-		    if (metas)
-			action |= MKEY;
-		    return (action);
-		}
-		for (i = 0; i < NUM_ACCENTCHARS; ++i) {
-		    if (acc->map[i][0] == 0)	/* end of the map entry */
-			break;
-		    if (acc->map[i][0] == action) {
-			action = acc->map[i][1];
-			if (metas)
-			    action |= MKEY;
-			return (action);
-		    }
-		}
-		do_bell(cur_console, BELL_PITCH, BELL_DURATION);
-		goto next_code;
-	    }
-	    if (metas)
-		action |= MKEY;
-	    return(action);
+	    /* goto next_code */
+	} else {
+	    /* regular keys (maybe MKEY is set) */
+	    return c;
 	}
     }
+
     goto next_code;
 }
 
 int
 scmmap(dev_t dev, vm_offset_t offset, int nprot)
 {
-    if (offset > 0x20000 - PAGE_SIZE)
-	return -1;
-    return i386_btop((VIDEOMEM + offset));
+    struct tty *tp;
+    struct scr_stat *scp;
+
+    tp = scdevtotty(dev);
+    if (!tp)
+	return ENXIO;
+    scp = sc_get_scr_stat(tp->t_dev);
+    return (*vidsw[scp->ad]->mmap)(scp->adp, offset);
 }
 
 /*
@@ -3900,82 +3663,64 @@ mask2attr(struct term_stat *term)
     return attr;
 }
 
-static void
-set_keyboard(int command, int data)
+static int
+save_kbd_state(scr_stat *scp)
 {
-    int s;
-
-    if (sc_kbdc == NULL)
-	return;
-
-    /* prevent the timeout routine from polling the keyboard */
-    if (!kbdc_lock(sc_kbdc, TRUE)) 
-	return;
+    int state;
+    int error;
 
-    /* disable the keyboard and mouse interrupt */
-    s = spltty();
-#if 0
-    c = get_controller_command_byte(sc_kbdc);
-    if ((c == -1) 
-	|| !set_controller_command_byte(sc_kbdc, 
-            kbdc_get_device_mask(sc_kbdc),
-            KBD_DISABLE_KBD_PORT | KBD_DISABLE_KBD_INT
-                | KBD_DISABLE_AUX_PORT | KBD_DISABLE_AUX_INT)) {
-	/* CONTROLLER ERROR */
-        kbdc_lock(sc_kbdc, FALSE);
-	splx(s);
-	return;
+    error = kbd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state);
+    if (error == ENOIOCTL)
+	error = ENODEV;
+    if (error == 0) {
+	scp->status &= ~LOCK_MASK;
+	scp->status |= state;
     }
-    /* 
-     * Now that the keyboard controller is told not to generate 
-     * the keyboard and mouse interrupts, call `splx()' to allow 
-     * the other tty interrupts. The clock interrupt may also occur, 
-     * but the timeout routine (`scrn_timer()') will be blocked 
-     * by the lock flag set via `kbdc_lock()'
-     */
-    splx(s);
-#endif
+    return error;
+}
 
-    if (send_kbd_command_and_data(sc_kbdc, command, data) != KBD_ACK)
-        send_kbd_command(sc_kbdc, KBDC_ENABLE_KBD);
+static int
+update_kbd_state(int new_bits, int mask)
+{
+    int state;
+    int error;
 
-#if 0
-    /* restore the interrupts */
-    if (!set_controller_command_byte(sc_kbdc,
-            kbdc_get_device_mask(sc_kbdc),
-	    c & (KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS))) { 
-	/* CONTROLLER ERROR */
+    if (mask != LOCK_MASK) {
+	error = kbd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state);
+	if (error == ENOIOCTL)
+	    error = ENODEV;
+	if (error)
+	    return error;
+	state &= ~mask;
+	state |= new_bits & mask;
+    } else {
+	state = new_bits & LOCK_MASK;
     }
-#else
-    splx(s);
-#endif
-    kbdc_lock(sc_kbdc, FALSE);
+    error = kbd_ioctl(kbd, KDSKBSTATE, (caddr_t)&state);
+    if (error == ENOIOCTL)
+	error = ENODEV;
+    return error;
 }
 
-static void
-update_leds(int which)
+static int
+update_kbd_leds(int which)
 {
-    static u_char xlate_leds[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
-
-    /* replace CAPS led with ALTGR led for ALTGR keyboards */
-    if (key_map.n_keys > ALTGR_OFFSET) {
-	if (which & ALKED)
-	    which |= CLKED;
-	else
-	    which &= ~CLKED;
-    }
+    int error;
 
-    set_keyboard(KBDC_SET_LEDS, xlate_leds[which & LED_MASK]);
+    which &= LOCK_MASK;
+    error = kbd_ioctl(kbd, KDSETLED, (caddr_t)&which);
+    if (error == ENOIOCTL)
+	error = ENODEV;
+    return error;
 }
 
 int
 set_mode(scr_stat *scp)
 {
     video_info_t info;
-    video_adapter_t *adp;
 
     /* reject unsupported mode */
-    if ((*biosvidsw.get_info)(scp->adp, scp->mode, &info))
+    if ((*vidsw[scp->ad]->get_info)(scp->adp, scp->mode, &info))
 	return 1;
 
     /* if this vty is not currently showing, do nothing */
@@ -3983,14 +3728,12 @@ set_mode(scr_stat *scp)
 	return 0;
 
     /* setup video hardware for the given mode */
-    adp = get_adapter(scp);
-    (*biosvidsw.set_mode)(scp->adp, scp->mode);
-    Crtat = (u_short *)adp->va_window;
+    (*vidsw[scp->ad]->set_mode)(scp->adp, scp->mode);
+    Crtat = (u_short *)scp->adp->va_window;
 
     if (!(scp->status & GRAPHICS_MODE)) {
 	/* load appropriate font */
-	if (!(scp->status & PIXEL_MODE) 
-	    && ISFONTAVAIL(get_adapter(scp)->va_flags)) {
+	if (!(scp->status & PIXEL_MODE) && ISFONTAVAIL(scp->adp->va_flags)) {
 	    if (scp->font_size < 14) {
 		if (fonts_loaded & FONT_8)
 		    copy_font(scp, LOAD, 8, font_8);
@@ -4002,23 +3745,24 @@ set_mode(scr_stat *scp)
 		    copy_font(scp, LOAD, 14, font_14);
 	    }
 	    /*
-	    * FONT KLUDGE:
-	    * This is an interim kludge to display correct font.
-	    * Always use the font page #0 on the video plane 2.
-	    * Somehow we cannot show the font in other font pages on
-	    * some video cards... XXX
-	    */ 
-	    (*biosvidsw.show_font)(scp->adp, 0);
+	     * FONT KLUDGE:
+	     * This is an interim kludge to display correct font.
+	     * Always use the font page #0 on the video plane 2.
+	     * Somehow we cannot show the font in other font pages on
+	     * some video cards... XXX
+	     */ 
+	    (*vidsw[scp->ad]->show_font)(scp->adp, 0);
 	}
 	mark_all(scp);
     }
 
     if (scp->status & PIXEL_MODE)
-	generic_bzero((u_char *)(adp->va_window), scp->xpixel*scp->ypixel/8);
+	generic_bzero((u_char *)(scp->adp->va_window),
+		      scp->xpixel*scp->ypixel/8);
     set_border(scp, scp->border);
 
     /* move hardware cursor out of the way */
-    (*biosvidsw.set_hw_cursor)(scp->adp, -1, -1);
+    (*vidsw[scp->ad]->set_hw_cursor)(scp->adp, -1, -1);
 
     return 0;
 }
@@ -4033,7 +3777,7 @@ set_border(scr_stat *scp, int color)
     int ylen;
     int i;
 
-    (*biosvidsw.set_border)(scp->adp, color);
+    (*vidsw[scp->ad]->set_border)(scp->adp, color);
 
     if (scp->status & PIXEL_MODE) {
 	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
@@ -4041,7 +3785,7 @@ set_border(scr_stat *scp, int color)
 	outw(GDCIDX, 0x0f01);		/* set/reset enable */
 	outw(GDCIDX, 0xff08);		/* bit mask */
 	outw(GDCIDX, (color << 8) | 0x00);	/* set/reset */
-	p = (u_char *)(get_adapter(scp)->va_window);
+	p = (u_char *)(scp->adp->va_window);
 	xoff = scp->xoff;
 	yoff = scp->yoff*scp->font_size;
 	xlen = scp->xpixel/8;
@@ -4075,11 +3819,11 @@ copy_font(scr_stat *scp, int operation, int font_size, u_char *buf)
      */ 
     font_loading_in_progress = TRUE;
     if (operation == LOAD) {
-	(*biosvidsw.load_font)(scp->adp, 0, font_size, buf, 0, 256);
+	(*vidsw[scp->ad]->load_font)(scp->adp, 0, font_size, buf, 0, 256);
 	if (sc_flags & CHAR_CURSOR)
 	    set_destructive_cursor(scp);
     } else if (operation == SAVE) {
-	(*biosvidsw.save_font)(scp->adp, 0, font_size, buf, 0, 256);
+	(*vidsw[scp->ad]->save_font)(scp->adp, 0, font_size, buf, 0, 256);
     }
     font_loading_in_progress = FALSE;
 }
@@ -4090,9 +3834,10 @@ set_destructive_cursor(scr_stat *scp)
     u_char cursor[32];
     u_char *font_buffer;
     int font_size;
+    int crtc_addr;
     int i;
 
-    if (!ISFONTAVAIL(get_adapter(scp)->va_flags)
+    if (!ISFONTAVAIL(scp->adp->va_flags)
 	|| (scp->status & (GRAPHICS_MODE | PIXEL_MODE)))
 	return;
 
@@ -4128,10 +3873,11 @@ set_destructive_cursor(scr_stat *scp)
 	    (scp->cursor_start >= scp->font_size && i == scp->font_size - 1))
 	    cursor[i] |= 0xff;
 #if 1
+    crtc_addr = scp->adp->va_crtc_addr;
     while (!(inb(crtc_addr+6) & 0x08)) /* wait for vertical retrace */ ;
 #endif
     font_loading_in_progress = TRUE;
-    (*biosvidsw.load_font)(scp->adp, 0, font_size, cursor, DEAD_CHAR, 1);
+    (*vidsw[scp->ad]->load_font)(scp->adp, 0, font_size, cursor, DEAD_CHAR, 1);
     font_loading_in_progress = FALSE;
 }
 
@@ -4385,10 +4131,11 @@ draw_mouse_image(scr_stat *scp)
 {
     u_short buffer[32];
     u_short xoffset, yoffset;
-    u_short *crt_pos = (u_short *)(get_adapter(scp)->va_window)
+    u_short *crt_pos = (u_short *)(scp->adp->va_window)
 				      + (scp->mouse_pos - scp->scr_buf);
     u_char *font_buffer;
     int font_size;
+    int crtc_addr;
     int i;
 
     if (scp->font_size < 14) {
@@ -4436,10 +4183,11 @@ draw_mouse_image(scr_stat *scp)
 
 #if 1
     /* wait for vertical retrace to avoid jitter on some videocards */
+    crtc_addr = scp->adp->va_crtc_addr;
     while (!(inb(crtc_addr+6) & 0x08)) /* idle */ ;
 #endif
     font_loading_in_progress = TRUE;
-    (*biosvidsw.load_font)(scp->adp, 0, 32, scp->mouse_cursor, 
+    (*vidsw[scp->ad]->load_font)(scp->adp, 0, 32, scp->mouse_cursor, 
 			   SC_MOUSE_CHAR, 4); 
     font_loading_in_progress = FALSE;
 
@@ -4463,7 +4211,7 @@ remove_mouse_image(scr_stat *scp)
     if (!ISTEXTSC(scp))
 	return;
 
-    crt_pos = (u_short *)(get_adapter(scp)->va_window)
+    crt_pos = (u_short *)(scp->adp->va_window)
 			     + (scp->mouse_oldpos - scp->scr_buf);
     *(crt_pos) = *(scp->mouse_oldpos);
     *(crt_pos+1) = *(scp->mouse_oldpos+1);
@@ -4480,7 +4228,7 @@ draw_cutmarking(scr_stat *scp)
     u_short *ptr;
     u_short och, nch;
 
-    crt_pos = (u_short *)(get_adapter(scp)->va_window);
+    crt_pos = (u_short *)(scp->adp->va_window);
     for (ptr=scp->scr_buf; ptr<=(scp->scr_buf+(scp->xsize*scp->ysize)); ptr++) {
 	nch = och = *(crt_pos + (ptr - scp->scr_buf));
 	/* are we outside the selected area ? */
@@ -4553,11 +4301,11 @@ blink_screen(void *arg)
     else {
 	if (blink_in_progress & 1)
 	    fillw(kernel_default.std_color | scr_map[0x20],
-		  (u_short *)(get_adapter(scp)->va_window),
+		  (u_short *)(scp->adp->va_window),
 		  scp->xsize * scp->ysize);
 	else
 	    fillw(kernel_default.rev_color | scr_map[0x20],
-		  (u_short *)(get_adapter(scp)->va_window),
+		  (u_short *)(scp->adp->va_window),
 		  scp->xsize * scp->ysize);
 	blink_in_progress--;
 	timeout(blink_screen, scp, hz / 10);
@@ -4579,7 +4327,7 @@ sc_bcopy(scr_stat *scp, u_short *p, int from, int to, int mark)
     u_char c;
 
     if (ISTEXTSC(scp)) {
-	generic_bcopy(p + from, (u_short *)(get_adapter(scp)->va_window) + from,
+	generic_bcopy(p + from, (u_short *)(scp->adp->va_window) + from,
 		      (to - from + 1)*sizeof(u_short));
     } else /* if ISPIXELSC(scp) */ {
 	if (mark)
@@ -4593,7 +4341,7 @@ sc_bcopy(scr_stat *scp, u_short *p, int from, int to, int mark)
 	    font = font_14;
 	line_length = scp->xpixel/8;
 	xsize = scp->xsize;
-	d = (u_char *)(get_adapter(scp)->va_window)
+	d = (u_char *)(scp->adp->va_window)
 	    + scp->xoff + scp->yoff*font_size*line_length 
 	    + (from%xsize) + font_size*line_length*(from/xsize);
 
@@ -4662,42 +4410,4 @@ sc_bcopy(scr_stat *scp, u_short *p, int from, int to, int mark)
     }
 }
 
-#ifdef SC_SPLASH_SCREEN
-
-static void
-scsplash_init(scr_stat *scp)
-{
-    video_info_t info;
-
-    if (scsplash_load(scp) == 0 && add_scrn_saver(scsplash_saver) == 0) {
-	default_saver = scsplash_saver;
-	scrn_blank_time = DEFAULT_BLANKTIME;
-	run_scrn_saver = TRUE;
-	if (!(boothowto & (RB_VERBOSE | RB_CONFIG))) {
-	    scsplash_stick(TRUE);
-	    scsplash_saver(TRUE);
-	}
-    }
-}
-
-static void
-scsplash_term(scr_stat *scp)
-{
-    default_saver = none_saver;
-    scsplash_stick(FALSE);
-    remove_scrn_saver(scsplash_saver);
-    scsplash_unload(scp);
-}
-
-static void
-scsplash_saver(int show)
-{
-    if (show)
-	scsplash(TRUE);
-    else if (!sticky_splash)
-	scsplash(FALSE);
-}
-
-#endif /* SC_SPLASH_SCREEN */
-
 #endif /* NSC */
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 0298cbbf2f40..c6129e467844 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -25,11 +25,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.h,v 1.43 1998/09/29 02:00:57 ache Exp $
+ *	$Id: syscons.h,v 1.44 1998/10/01 11:39:18 yokota Exp $
  */
 
-#ifndef _I386_ISA_SYSCONS_H_
-#define	_I386_ISA_SYSCONS_H_
+#ifndef _DEV_SYSCONS_SYSCONS_H_
+#define	_DEV_SYSCONS_SYSCONS_H_
 
 /* vm things */
 #define	ISMAPPED(pa, width) \
@@ -52,11 +52,7 @@
 				}
 
 /* status flags */
-#define LOCK_KEY_MASK	0x0000F
-#define LED_MASK	0x00007
 #define UNKNOWN_MODE	0x00010
-#define KBD_RAW_MODE	0x00020
-#define KBD_CODE_MODE	0x00040
 #define SWITCH_WAIT_REL	0x00080
 #define SWITCH_WAIT_ACQ	0x00100
 #define BUFFER_SAVED	0x00200
@@ -73,11 +69,15 @@
 #define VISUAL_BELL	0x00001
 #define BLINK_CURSOR	0x00002
 #define CHAR_CURSOR	0x00004
+/* these options are now obsolete; use corresponding options for kbd driver */
+#if 0
 #define DETECT_KBD	0x00008
 #define XT_KEYBD	0x00010
 #define KBD_NORESET	0x00020
+#endif
 #define QUIET_BELL	0x00040
 #define VESA800X600	0x00080
+#define AUTODETECT_KBD	0x00100
 
 /* attribute flags */
 #define NORMAL_ATTR             0x00
@@ -128,7 +128,8 @@ typedef struct term_stat {
 } term_stat;
 
 typedef struct scr_stat {
-	int		adp;			/* video adapter index */
+	int		ad;			/* video adapter index */
+	video_adapter_t	*adp;			/* video adapter structure */
 	u_short 	*scr_buf;		/* buffer when off screen */
 	int 		xpos;			/* current X position */
 	int 		ypos;			/* current Y position */
@@ -145,6 +146,7 @@ typedef struct scr_stat {
 	int		end;			/* modified area end */
 	term_stat 	term;			/* terminal emulation stuff */
 	int	 	status;			/* status (bitfield) */
+	int		kbd_mode;		/* keyboard I/O mode */
 	u_short 	*cursor_pos;		/* cursor buffer position */
 	u_short 	*cursor_oldpos;		/* cursor old buffer position */
 	u_short		cursor_saveunder;	/* saved chars under cursor */
@@ -164,7 +166,6 @@ typedef struct scr_stat {
 	u_short		bell_duration;
 	u_short		bell_pitch;
 	u_char		border;			/* border color */
-	int	 	initial_mode;		/* initial mode */
 	int	 	mode;			/* mode */
 	pid_t 		pid;			/* pid of controlling proc */
 	struct proc 	*proc;			/* proc* of controlling proc */
@@ -175,10 +176,8 @@ typedef struct scr_stat {
 	u_short		*history_save;		/* save area index */
 	int		history_size;		/* size of history buffer */
 	struct apmhook  r_hook;			/* reconfiguration support */
-#ifdef SC_SPLASH_SCREEN
 	int		splash_save_mode;	/* saved mode for splash screen */
 	int		splash_save_status;	/* saved status for splash screen */
-#endif
 } scr_stat;
 
 typedef struct default_attr {
@@ -211,13 +210,12 @@ scr_stat *sc_get_scr_stat(dev_t dev);
 
 void copy_font(scr_stat *scp, int operation, int font_size, u_char *font_image);
 void set_border(scr_stat *scp, int color);
-#define save_palette(scp, pal)	(*biosvidsw.save_palette)((scp)->adp, pal)
-#define load_palette(scp, pal)	(*biosvidsw.load_palette)((scp)->adp, pal)
-#define get_adapter(scp)	(*biosvidsw.adapter)((scp)->adp)
-
-int add_scrn_saver(void (*this)(int));
-int remove_scrn_saver(void (*this)(int));
+#define save_palette(adp, pal)				\
+	(*vidsw[(adp)->va_index]->save_palette)((adp), (pal))
+#define load_palette(adp, pal)				\
+	(*vidsw[(adp)->va_index]->load_palette)((adp), (pal))
 
+void sc_touch_scrn_saver(void);
 void sc_clear_screen(scr_stat *scp);
 void sc_move_mouse(scr_stat *scp, int x, int y);
 int sc_clean_up(scr_stat *scp);
@@ -235,11 +233,4 @@ int sc_set_pixel_mode(scr_stat *scp, struct tty *tp,
 int sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, 
 		 struct proc *p);
 
-#ifdef SC_SPLASH_SCREEN
-/* splash.c */
-void scsplash(int);
-int scsplash_load(scr_stat *scp);
-int scsplash_unload(scr_stat *scp);
-#endif
-
-#endif /* !_I386_ISA_SYSCONS_H_ */
+#endif /* !_DEV_SYSCONS_SYSCONS_H_ */
diff --git a/sys/dev/syscons/warp/warp_saver.c b/sys/dev/syscons/warp/warp_saver.c
index e84f1ada05ae..ef0afa2bebfa 100644
--- a/sys/dev/syscons/warp/warp_saver.c
+++ b/sys/dev/syscons/warp/warp_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: warp_saver.c,v 1.2 1998/12/28 14:20:13 des Exp $
+ *	$Id: warp_saver.c,v 1.3 1998/12/31 13:38:59 des Exp $
  */
 
 #include <sys/param.h>
@@ -40,6 +40,7 @@
 #include <saver.h>
 
 static u_char *vid;
+static int blanked;
 
 #define SCRW 320
 #define SCRH 200
@@ -47,7 +48,6 @@ static u_char *vid;
 #define STARS (SPP*(1+2+4+8))
 
 static int star[STARS];
-static u_char save_pal[768];
 static u_char warp_pal[768] = {
     0x00, 0x00, 0x00,
     0x66, 0x66, 0x66,
@@ -72,25 +72,18 @@ warp_update(void)
 	}
 }
 
-static void
-warp_saver(int blank)
+static int
+warp_saver(video_adapter_t *adp, int blank)
 {
-    scr_stat *scp = cur_console;
-    static int saved_mode;
     int pl;
 
     if (blank) {
 	/* switch to graphics mode */
-	if (scrn_blanked <= 0) {
+	if (blanked <= 0) {
 	    pl = splhigh();
-	    saved_mode = scp->mode;
-	    scp->mode = M_VGA_CG320;
-	    scp->status |= SAVER_RUNNING|GRAPHICS_MODE;
-	    save_palette(scp, save_pal);
-	    set_mode(scp);
-	    load_palette(scp, warp_pal);
-	    scrn_blanked++;
-	    vid = (u_char *)Crtat;
+	    set_video_mode(adp, M_VGA_CG320, warp_pal, 0);
+	    blanked++;
+	    vid = (u_char *)adp->va_window;
 	    splx(pl);
 	    bzero(vid, SCRW*SCRH);
 	}
@@ -99,30 +92,19 @@ warp_saver(int blank)
 	warp_update();
 	
     } else {
-	/* return to previous video mode */
-	if (scrn_blanked > 0) {
-	    if (saved_mode) {
-		pl = splhigh();
-		scrn_blanked = 0;
-		scp->mode = saved_mode;
-		scp->status &= ~(SAVER_RUNNING|GRAPHICS_MODE);
-		set_mode(scp);
-		load_palette(scp, save_pal);
-		saved_mode = 0;
-		splx(pl);
-	    }
-	}
+	blanked = 0;
     }
+    return 0;
 }
 
 static int
-warp_saver_load(void)
+warp_init(video_adapter_t *adp)
 {
     video_info_t info;
     int i;
 
     /* check that the console is capable of running in 320x200x256 */
-    if ((*biosvidsw.get_info)(cur_console->adp, M_VGA_CG320, &info)) {
+    if (get_mode_info(adp, M_VGA_CG320, &info)) {
         log(LOG_NOTICE, "warp_saver: the console does not support M_VGA_CG320\n");
 	return ENODEV;
     }
@@ -132,13 +114,19 @@ warp_saver_load(void)
 	star[i] = random() % (SCRW*SCRH);
     }
     
-    return add_scrn_saver(warp_saver);
+    blanked = 0;
+
+    return 0;
 }
 
 static int
-warp_saver_unload(void)
+warp_term(video_adapter_t *adp)
 {
-    return remove_scrn_saver(warp_saver);
+    return 0;
 }
 
-SAVER_MODULE(warp_saver);
+static scrn_saver_t warp_module = {
+    "warp_saver", warp_init, warp_term, warp_saver, NULL,
+};
+
+SAVER_MODULE(warp_saver, warp_module);
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 88943bbba776..76781f47b02a 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.141 1999/01/01 08:09:57 peter Exp $
+#	$Id: GENERIC,v 1.142 1999/01/09 18:12:07 wpaul Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -108,10 +108,20 @@ controller	matcd0	at isa? port 0x230 bio
 
 device		scd0	at isa? port 0x230 bio
 
+# atkbdc0 controlls both the keyboard and the PS/2 mouse
+controller	atkbdc0	at isa? port IO_KBD tty
+device		atkbd0	at isa? tty irq 1
+device		psm0	at isa? tty irq 12
+
+device		vga0	at isa? port ? conflicts
+
+# splash screen/screen saver
+pseudo-device	splash
+
 # syscons is the default console driver, resembling an SCO console
-device		sc0	at isa? port IO_KBD conflicts tty irq 1
+device		sc0	at isa? tty
 # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
-#device		vt0	at isa? port IO_KBD conflicts tty irq 1
+#device		vt0	at isa? tty
 #options		XSERVER			# support for X server
 #options		FAT_CURSOR		# start with block cursor
 # If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines
@@ -136,8 +146,6 @@ device		sio3	at isa? disable port "IO_COM4" tty irq 9
 
 device		lpt0	at isa? port? tty irq 7
 
-device		psm0	at isa? port IO_KBD conflicts tty irq 12
-
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
 # Right now it appears that the ie0 must be probed before ep0. See
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 7e937639c82e..80171ee18d13 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.529 1999/01/09 18:12:07 wpaul Exp $
+#	$Id: LINT,v 1.531 1999/01/10 07:45:33 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -842,15 +842,35 @@ options		"NTIMECOUNTER=20"
 # configure cards from USERCONFIG.  See pnp(4) for more info.
 controller	pnp0
 
+# The keyboard controller; it controlls the keyboard and the PS/2 mouse.
+controller	atkbdc0	at isa? port IO_KBD tty
+
+# The AT keyboard
+device		atkbd0	at isa? tty irq 1
+
+# PS/2 mouse
+device		psm0	at isa? tty irq 12
+
+# Options for psm:
+options		PSM_HOOKAPM		#hook the APM resume event, useful
+					#for some laptops
+options		PSM_RESETAFTERSUSPEND	#reset the device at the resume event
+
+# The video card driver.
+device		vga0	at isa? port ? conflicts
+
+# Splash screen at start up!  Screen savers require this too.
+pseudo-device	splash
+
 # The pcvt console driver (vt220 compatible).
-device		vt0	at isa? port IO_KBD conflicts tty irq 1
+device		vt0	at isa? tty
 options		XSERVER			# support for running an X server.
 options		FAT_CURSOR		# start with block cursor
 # This PCVT option is for keyboards such as those used on IBM ThinkPad laptops
 options		PCVT_SCANSET=2 		# IBM keyboards are non-std
 
 # The syscons console driver (sco color console compatible).
-device		sc0	at isa? port IO_KBD conflicts tty irq 1
+device		sc0	at isa? tty
 options		MAXCONS=16		# number of virtual consoles
 options		SLOW_VGA		# do byte-wide i/o's to TS and GDC regs
 options		"STD8X16FONT"		# Compile font in
@@ -1050,7 +1070,7 @@ disk		fd0	at fdc0 drive 0
 disk		fd1	at fdc0 drive 1
 
 #
-# Other standard PC hardware: `lpt', `mse', `psm', `sio', etc.
+# Other standard PC hardware: `lpt', `mse', `sio', etc.
 #
 # lpt: printer port
 #	lpt specials:
@@ -1059,18 +1079,11 @@ disk		fd1	at fdc0 drive 1
 #		The irq clause may be omitted.  This will force the port
 #		into polling mode.
 # mse: Logitech and ATI InPort bus mouse ports
-# psm: PS/2 mouse port [note: conflicts with sc0/vt0, thus "conflicts" keywd]
 # sio: serial ports (see sio(4))
 
 device		lpt0	at isa? port? tty irq 7
 device		lpt1	at isa? port "IO_LPT3" tty irq 5
 device		mse0	at isa? port 0x23c tty irq 5
-device		psm0	at isa? port IO_KBD conflicts tty irq 12
-
-# Options for psm:
-options		PSM_HOOKAPM		#hook the APM resume event, useful
-					#for some laptops
-options		PSM_RESETAFTERSUSPEND	#reset the device at the resume event
 
 device		sio0	at isa? port "IO_COM1" tty flags 0x10 irq 4
 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 7e937639c82e..80171ee18d13 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.529 1999/01/09 18:12:07 wpaul Exp $
+#	$Id: LINT,v 1.531 1999/01/10 07:45:33 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -842,15 +842,35 @@ options		"NTIMECOUNTER=20"
 # configure cards from USERCONFIG.  See pnp(4) for more info.
 controller	pnp0
 
+# The keyboard controller; it controlls the keyboard and the PS/2 mouse.
+controller	atkbdc0	at isa? port IO_KBD tty
+
+# The AT keyboard
+device		atkbd0	at isa? tty irq 1
+
+# PS/2 mouse
+device		psm0	at isa? tty irq 12
+
+# Options for psm:
+options		PSM_HOOKAPM		#hook the APM resume event, useful
+					#for some laptops
+options		PSM_RESETAFTERSUSPEND	#reset the device at the resume event
+
+# The video card driver.
+device		vga0	at isa? port ? conflicts
+
+# Splash screen at start up!  Screen savers require this too.
+pseudo-device	splash
+
 # The pcvt console driver (vt220 compatible).
-device		vt0	at isa? port IO_KBD conflicts tty irq 1
+device		vt0	at isa? tty
 options		XSERVER			# support for running an X server.
 options		FAT_CURSOR		# start with block cursor
 # This PCVT option is for keyboards such as those used on IBM ThinkPad laptops
 options		PCVT_SCANSET=2 		# IBM keyboards are non-std
 
 # The syscons console driver (sco color console compatible).
-device		sc0	at isa? port IO_KBD conflicts tty irq 1
+device		sc0	at isa? tty
 options		MAXCONS=16		# number of virtual consoles
 options		SLOW_VGA		# do byte-wide i/o's to TS and GDC regs
 options		"STD8X16FONT"		# Compile font in
@@ -1050,7 +1070,7 @@ disk		fd0	at fdc0 drive 0
 disk		fd1	at fdc0 drive 1
 
 #
-# Other standard PC hardware: `lpt', `mse', `psm', `sio', etc.
+# Other standard PC hardware: `lpt', `mse', `sio', etc.
 #
 # lpt: printer port
 #	lpt specials:
@@ -1059,18 +1079,11 @@ disk		fd1	at fdc0 drive 1
 #		The irq clause may be omitted.  This will force the port
 #		into polling mode.
 # mse: Logitech and ATI InPort bus mouse ports
-# psm: PS/2 mouse port [note: conflicts with sc0/vt0, thus "conflicts" keywd]
 # sio: serial ports (see sio(4))
 
 device		lpt0	at isa? port? tty irq 7
 device		lpt1	at isa? port "IO_LPT3" tty irq 5
 device		mse0	at isa? port 0x23c tty irq 5
-device		psm0	at isa? port IO_KBD conflicts tty irq 12
-
-# Options for psm:
-options		PSM_HOOKAPM		#hook the APM resume event, useful
-					#for some laptops
-options		PSM_RESETAFTERSUSPEND	#reset the device at the resume event
 
 device		sio0	at isa? port "IO_COM1" tty flags 0x10 irq 4
 
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index f9558632ec0b..9aa97d40a7ce 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.216 1998/12/31 08:17:08 luigi Exp $
+#	$Id: files.i386,v 1.217 1999/01/01 08:09:58 peter Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -24,6 +24,17 @@ font8x16.o			optional	std8x16font		\
 	no-implicit-rule before-depend \
 	clean		"${STD8X16FONT}-8x16 font8x16.c" 
 #
+dev/fb/fb.c			optional	fb	device-driver
+dev/fb/fb.c			optional	vga	device-driver
+dev/fb/splash.c			optional	splash
+dev/kbd/atkbd.c			optional	atkbd	device-driver
+dev/kbd/atkbdc.c		optional	atkbdc	device-driver
+dev/kbd/kbd.c			optional	atkbd	device-driver
+dev/kbd/kbd.c			optional	kbd	device-driver
+#dev/kbd/kbd.c			optional	ukbd	device-driver
+dev/syscons/syscons.c		optional	sc	device-driver
+dev/syscons/scvidctl.c		optional	sc	device-driver
+dev/syscons/scvesactl.c		optional	sc	device-driver
 i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
 i386/eisa/dpt_eisa.c		optional	eisa dpt device-driver
@@ -98,6 +109,8 @@ i386/isa/aha_isa.c		optional	aha	device-driver
 #i386/isa/aic6360.c              optional        aic     device-driver
 i386/isa/aic_isa.c              optional        aic     device-driver
 i386/isa/alog.c                 optional        alog    device-driver
+i386/isa/atkbd_isa.c		optional	atkbd	device-driver
+i386/isa/atkbdc_isa.c		optional	atkbdc	device-driver
 i386/isa/bt_isa.c		optional	bt	device-driver
 i386/isa/clock.c		standard
 i386/isa/cronyx.c		optional	cx	device-driver
@@ -133,9 +146,6 @@ i386/isa/intr_machdep.c		standard
 i386/isa/isa.c			optional	isa	device-driver
 i386/isa/istallion.c		optional	stli	device-driver
 i386/isa/joy.c			optional        joy     device-driver
-i386/isa/kbdio.c		optional        psm     device-driver
-i386/isa/kbdio.c		optional        sc      device-driver
-i386/isa/kbdio.c		optional        vt      device-driver
 i386/isa/loran.c		optional	loran	device-driver
 i386/isa/lpt.c			optional	lpt	device-driver
 i386/isa/labpc.c		optional	labpc	device-driver
@@ -235,11 +245,8 @@ i386/isa/sound/cs4232.c		optional	css	device-driver
 i386/isa/spigot.c		optional	spigot	device-driver
 i386/isa/spkr.c			optional	speaker	device-driver
 i386/isa/stallion.c		optional	stl	device-driver
-i386/isa/syscons.c		optional	sc	device-driver
-i386/isa/scvidctl.c		optional	sc	device-driver
-i386/isa/scvesactl.c		optional	sc	device-driver
-i386/isa/videoio.c		optional	sc	device-driver
-i386/isa/vesa.c			optional	sc	device-driver
+i386/isa/vesa.c			optional	vga	device-driver
+i386/isa/vga_isa.c		optional	vga	device-driver
 i386/isa/tw.c			optional	tw	device-driver
 i386/isa/wd.c			optional	wdc	device-driver
 i386/isa/wd.c			optional	wd	device-driver
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 1b844a62dcbf..2704d563788d 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.101 1999/01/01 08:09:58 peter Exp $
+#	$Id: options.i386,v 1.102 1999/01/10 17:41:33 nsouch Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -66,16 +66,26 @@ I486_CPU		opt_global.h
 I586_CPU		opt_global.h
 I686_CPU		opt_global.h
 
-SC_SPLASH_SCREEN	opt_syscons.h
 MAXCONS			opt_syscons.h
-SLOW_VGA		opt_syscons.h
+# obsolete, use VGA_SLOW_IOACCESS
+#SLOW_VGA		opt_syscons.h
 STD8X16FONT		opt_syscons.h
 SC_HISTORY_SIZE		opt_syscons.h
 SC_DISABLE_REBOOT	opt_syscons.h
 SC_MOUSE_CHAR		opt_syscons.h
-SC_ALT_SEQACCESS	opt_syscons.h
+# obsolete, use VGA_ALT_SEQACCESS
+#SC_ALT_SEQACCESS	opt_syscons.h
+
+FB_INSTALL_CDEV		opt_fb.h
+
+VGA_ALT_SEQACCESS	opt_vga.h
+VGA_DEBUG		opt_vga.h
+VGA_NO_FONT_LOADING	opt_vga.h
+VGA_NO_MODE_CHANGE	opt_vga.h
+VGA_SLOW_IOACCESS	opt_vga.h
 
 VESA			opt_vesa.h
+VESA_DEBUG		opt_vesa.h
 
 PSM_HOOKAPM		opt_psm.h
 PSM_RESETAFTERSUSPEND	opt_psm.h
@@ -83,10 +93,11 @@ PSM_DEBUG		opt_psm.h
 
 PCIC_RESUME_RESET	opt_pcic.h
 
-KBD_RESETDELAY		opt_kbdio.h
-KBD_MAXRETRY		opt_kbdio.h
-KBD_MAXWAIT		opt_kbdio.h
-KBDIO_DEBUG		opt_kbdio.h
+KBD_INSTALL_CDEV	opt_kbd.h
+KBD_MAXRETRY		opt_kbd.h
+KBD_MAXWAIT		opt_kbd.h
+KBD_RESETDELAY		opt_kbd.h
+KBDIO_DEBUG		opt_kbd.h
 
 ATAPI			opt_atapi.h
 ATAPI_STATIC		opt_atapi.h
diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h
index b8d918f1815e..c79759c356bd 100644
--- a/sys/i386/include/console.h
+++ b/sys/i386/include/console.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: console.h,v 1.41 1998/10/01 11:39:09 yokota Exp $
+ *	$Id: console.h,v 1.42 1999/01/01 14:38:28 des Exp $
  */
 
 #ifndef	_MACHINE_CONSOLE_H_
@@ -52,6 +52,7 @@
 #define KDSETLED	_IO('K', 66 /*, int */)
 #define KDSETRAD	_IO('K', 67 /*, int */)
 #define KDRASTER	_IOW('K', 100, scr_size_t)
+#define KDGKBINFO	_IOR('K', 101, keyboard_info_t)
 
 #define GETFKEY		_IOWR('k', 0, fkeyarg_t)
 #define SETFKEY		_IOWR('k', 1, fkeyarg_t)
@@ -61,6 +62,8 @@
 #define PIO_KEYMAP 	_IOW('k', 7, keymap_t)
 #define GIO_DEADKEYMAP 	_IOR('k', 8, accentmap_t)
 #define PIO_DEADKEYMAP 	_IOW('k', 9, accentmap_t)
+#define GIO_KEYMAPENT 	_IOWR('k', 10, keyarg_t)
+#define PIO_KEYMAPENT 	_IOW('k', 11, keyarg_t)
 
 #define GIO_ATTR	_IOR('a', 0, int)
 #define GIO_COLOR	_IOR('c', 0, int)
@@ -86,11 +89,14 @@
 #define CONS_GETINFO    _IOWR('c', 73, vid_info_t)
 #define CONS_GETVERS	_IOR('c', 74, int)
 #define CONS_CURRENTADP	_IOR('c', 100, int)
-#define CONS_ADPINFO	_IOWR('c', 101, video_adapter_t)
+#define CONS_ADPINFO	_IOWR('c', 101, video_adapter_info_t)
 #define CONS_MODEINFO	_IOWR('c', 102, video_info_t)
 #define CONS_FINDMODE	_IOWR('c', 103, video_info_t)
 #define CONS_SETWINORG	_IO('c', 104 /* u_int */) 
 
+#define CONS_SETKBD	_IO('c', 110 /* int */)
+#define CONS_RELKBD	_IO('c', 111)
+
 /* CONS_SAVERMODE */
 #define CONS_LKM_SAVER	0
 #define CONS_USR_SAVER	1
@@ -189,9 +195,11 @@ struct mouse_info {
 #define NLKED		2		/* Num locked			*/
 #define SLKED		4		/* Scroll locked		*/
 #define ALKED		8		/* AltGr locked			*/
+#define LOCK_MASK	(CLKED | NLKED | SLKED | ALKED)
 #define LED_CAP		1		/* Caps lock LED 		*/
 #define LED_NUM		2		/* Num lock LED 		*/
 #define LED_SCR		4		/* Scroll lock LED 		*/
+#define LED_MASK	(LED_CAP | LED_NUM | LED_SCR)
 
 /* possible flag values */
 #define	FLAG_LOCK_O	0
@@ -204,7 +212,7 @@ struct mouse_info {
 
 #ifndef _KEYMAP_DECLARED
 #define	_KEYMAP_DECLARED
-struct key_t {
+struct keyent_t {
 	u_char map[NUM_STATES];
 	u_char spcl;
 	u_char flgs;
@@ -212,10 +220,17 @@ struct key_t {
 
 struct keymap {
 	u_short	n_keys;
-	struct key_t key[NUM_KEYS];
+	struct keyent_t key[NUM_KEYS];
 };
 
 typedef struct keymap keymap_t;
+
+struct keyarg {
+	u_short	keynum;
+	struct keyent_t key;
+};
+
+typedef struct keyarg keyarg_t;
 #endif /* !_KEYMAP_DECLARED */
 
 #define NUM_DEADKEYS	15		/* number of accent keys */
@@ -274,6 +289,9 @@ struct ssaver	{
 struct video_adapter {
     int			va_index;
     int			va_type;
+    char		*va_name;
+    int			va_unit;
+    int			va_minor;
     int			va_flags;
 #define V_ADP_COLOR	(1<<0)
 #define V_ADP_MODECHANGE (1<<1)
@@ -283,7 +301,14 @@ struct video_adapter {
 #define V_ADP_PALETTE	(1<<5)
 #define V_ADP_BORDER	(1<<6)
 #define V_ADP_VESA	(1<<7)
+#define V_ADP_PROBED	(1<<16)
+#define V_ADP_INITIALIZED (1<<17)
+#define V_ADP_REGISTERED (1<<18)
+    int			va_io_base;
+    int			va_io_size;
     int			va_crtc_addr;
+    int			va_mem_base;
+    int			va_mem_size;
     u_int		va_window;	/* virtual address */
     size_t		va_window_size;
     size_t		va_window_gran;
@@ -292,6 +317,30 @@ struct video_adapter {
     int			va_initial_mode;
     int			va_initial_bios_mode;
     int			va_mode;
+    int			va_mode_flags;	/* copy of vi_flags */
+    void		*va_token;
+};
+
+struct video_adapter_info {
+    int			va_index;
+    int			va_type;
+    char		va_name[16];
+    int			va_unit;
+    int			va_flags;
+    int			va_io_base;
+    int			va_io_size;
+    int			va_crtc_addr;
+    int			va_mem_base;
+    int			va_mem_size;
+    u_int		va_window;	/* virtual address */
+    size_t		va_window_size;
+    size_t		va_window_gran;
+    u_int		va_buffer;	/* virtual address */
+    size_t		va_buffer_size;
+    int			va_initial_mode;
+    int			va_initial_bios_mode;
+    int			va_mode;
+    int			va_mode_flags;
 };
 
 #define V_ADP_PRIMARY		0
@@ -319,6 +368,15 @@ struct video_info {
     /* XXX pixel format, memory model,... */
 };
 
+struct keyboard_info {
+    int			kb_index;	/* kbdio index# */
+    char		kb_name[16];	/* driver name */
+    int			kb_unit;	/* unit# */
+    int			kb_type;	/* KB_84, KB_101, KB_OTHER,... */
+    int			kb_config;	/* device configuration flags */
+    int			kb_flags;	/* internal flags */
+};
+
 typedef struct accentmap accentmap_t;
 typedef struct fkeytab fkeytab_t;
 typedef struct fkeyarg fkeyarg_t;
@@ -330,7 +388,9 @@ typedef struct {char fnt8x14[14*256];} fnt14_t;
 typedef struct {char fnt8x16[16*256];} fnt16_t;
 typedef struct ssaver ssaver_t;
 typedef struct video_adapter video_adapter_t;
+typedef struct video_adapter_info video_adapter_info_t;
 typedef struct video_info video_info_t;
+typedef struct keyboard_info keyboard_info_t;
 typedef struct {int scr_size[3];} scr_size_t;
 
 /* defines for "special" keys (spcl bit set in keymap) */
@@ -388,6 +448,13 @@ typedef struct {int scr_size[3];} scr_size_t;
 #define MKEY		0x400		/* meta key marker (prepend ESC)*/
 #define BKEY		0x800		/* backtab (ESC [ Z)		*/
 
+#define SPCLKEY		0x8000		/* special key */
+#define RELKEY		0x4000		/* key released */
+#define ERRKEY		0x2000		/* error */
+
+#define KEYCHAR(c)	((c) & 0x00ff)
+#define KEYFLAGS(c)	((c) & ~0x00ff)
+
 /* video mode definitions */
 #define M_B40x25	0	/* black & white 40 columns */
 #define M_C40x25	1	/* color 40 columns */
diff --git a/sys/i386/include/pc/vesa.h b/sys/i386/include/pc/vesa.h
index edbb7e4087cd..16b07098aad1 100644
--- a/sys/i386/include/pc/vesa.h
+++ b/sys/i386/include/pc/vesa.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vesa.h,v 1.2 1998/09/25 11:55:41 yokota Exp $
+ * $Id: vesa.h,v 1.3 1999/01/08 12:57:06 yokota Exp $
  */
 
 #ifndef _MACHINE_PC_VESA_H
@@ -115,10 +115,6 @@ struct vesa_mode
 int vesa_load_ioctl(void);
 int vesa_unload_ioctl(void);
 
-#ifndef KLD_MODULE
-int vesa_load(void);
-#endif
-
 #endif /* KERNEL */
 
 #endif /* !_MACHINE_PC_VESA_H */
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index 26c02f306cc7..c4ed5a1b634a 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -114,6 +114,11 @@ static void vgapelinit(void);	/* read initial VGA DAC palette */
 static int pcvt_xmode_set(int on, struct proc *p); /* initialize for X mode */
 #endif /* XSERVER && !PCVT_USL_VT_COMPAT */
 
+#ifdef _DEV_KBD_KBDREG_H_
+static void detect_kbd(void *arg);
+static kbd_callback_func_t pcevent;
+#endif
+
 static cn_probe_t	pccnprobe;
 static cn_init_t	pccninit;
 static cn_getc_t	pccngetc;
@@ -161,17 +166,19 @@ pcprobe(struct isa_device *dev)
 #endif /* PCVT_NETBSD > 9 */
 #endif /* PCVT_NETBSD > 100 */
 {
-#ifdef _I386_ISA_KBDIO_H_
-	kbdc = kbdc_open(IO_KBD);
+#ifdef _DEV_KBD_KBDREG_H_
+	int i;
 
-	if(kbdc == NULL)
+	kbd = NULL;
+	kbd_configure(KB_CONF_PROBE_ONLY);
+	i = kbd_allocate("*", -1, (void *)&kbd, pcevent, (void *)dev->id_unit);
+	if ((i < 0) || ((kbd = kbd_get_keyboard(i)) == NULL))
 	{
 		reset_keyboard = 0;
-		return 1;
+		return (-1);
 	}
-		
 	reset_keyboard = 1;		/* it's now safe to do kbd reset */
-#endif /* _I386_ISA_KBDIO_H_ */
+#endif /* _DEV_KBD_KBDREG_H_ */
 
 	kbd_code_init();
 
@@ -179,7 +186,9 @@ pcprobe(struct isa_device *dev)
 	((struct isa_attach_args *)aux)->ia_iosize = 16;
 	return 1;
 #else
-#if PCVT_NETBSD || PCVT_FREEBSD
+#ifdef _DEV_KBD_KBDREG_H_
+	return (-1);
+#elif PCVT_NETBSD || PCVT_FREEBSD
 	return (16);
 #else
 	return 1;
@@ -207,6 +216,11 @@ pcattach(struct isa_device *dev)
 
 	vt_coldmalloc();		/* allocate memory for screens */
 
+#ifdef _DEV_KBD_KBDREG_H_
+	if (kbd == NULL)
+		timeout(detect_kbd, (void *)dev->id_unit, hz*2);
+#endif /* _DEV_KBD_KBDREG_H_ */
+
 #if PCVT_NETBSD || PCVT_FREEBSD
 
 #if PCVT_NETBSD > 9
@@ -849,6 +863,50 @@ pcvt_timeout(void *arg)
 }
 #endif
 
+#ifdef _DEV_KBD_KBDREG_H_
+static void
+detect_kbd(void *arg)
+{
+	int unit = (int)arg;
+	int i;
+
+	if (kbd != NULL)
+		return;
+	i = kbd_allocate("*", -1, (void *)&kbd, pcevent, (void *)unit);
+	if (i >= 0)
+		kbd = kbd_get_keyboard(i);
+	if (kbd != NULL)
+	{
+		reset_keyboard = 1;	/* ok to reset the keyboard */
+		kbd_code_init();
+		return;
+	}
+	reset_keyboard = 0;
+	timeout(detect_kbd, (void *)unit, hz*2);
+}
+
+int
+pcevent(keyboard_t *thiskbd, int event, void *arg)
+{
+	int unit = (int)arg;
+
+	if (thiskbd != kbd)
+		return EINVAL;		/* shouldn't happen */
+
+	switch (event) {
+	case KBDIO_KEYINPUT:
+		pcrint(unit);
+		return 0;
+	case KBDIO_UNLOADING:
+		kbd = NULL;
+		kbd_release(thiskbd, (void *)&kbd);
+		timeout(detect_kbd, (void *)unit, hz*4);
+		return 0;
+	default:
+		return EINVAL;
+	}
+}
+#endif /* _DEV_KBD_KBDREG_H_ */
 
 void
 pcrint(int unit)
@@ -862,7 +920,7 @@ pcrint(int unit)
 	int	s;
 # endif
 
-# ifdef _I386_ISA_KBDIO_H_
+# ifdef _DEV_KBD_KBDREG_H_
 	int	c;
 # endif
 
@@ -870,25 +928,6 @@ pcrint(int unit)
 	u_char	*cp;
 #endif /* PCVT_KBD_FIFO */
 
-	/*
-	 * in case the keyboard was not plugged in while booting, kbdc
-	 * was set to NULL at that time. When a keyboard IRQ occurs and
-	 * kbdc is NULL, the keyboard was probably reconnected to the
-	 * keyboard controller and we have to initialize the keyboard.
-	 */
-	 
-	if(kbdc == NULL)
-	{
-		kbdc = kbdc_open(IO_KBD);
-		if(kbdc == NULL)
-		{
-			reset_keyboard = 0;
-			return;
-		}
-		reset_keyboard = 1;
-		kbd_code_init();
-	}
-
 #if PCVT_SCREENSAVER
 	pcvt_scrnsv_reset();
 #endif /* PCVT_SCREENSAVER */
@@ -900,7 +939,7 @@ pcrint(int unit)
 		return;
 	}
 
-# ifndef _I386_ISA_KBDIO_H_
+# ifndef _DEV_KBD_KBDREG_H_
 	while (inb(CONTROLLER_CTRL) & STATUS_OUTPBF)	/* check 8042 buffer */
 	{
 		ret = 1;				/* got something */
@@ -909,11 +948,11 @@ pcrint(int unit)
 
 		dt = inb(CONTROLLER_DATA);		/* get it 8042 data */
 # else 
-	while ((c = read_kbd_data_no_wait(kbdc)) != -1)
+	while ((c = (*kbdsw[kbd->kb_index]->read)(kbd, FALSE)) != -1)
 	{
 		ret = 1;				/* got something */
 		dt = c;
-# endif /* _I386_ISA_KBDIO_H_ */
+# endif /* _DEV_KBD_KBDREG_H_ */
 
 		if (pcvt_kbd_count >= PCVT_KBD_FIFO_SZ)	/* fifo overflow ? */
 		{
@@ -1131,32 +1170,40 @@ int
 pccnprobe(struct consdev *cp)
 {
 	struct isa_device *dvp;
+	int i;
+
+	/*
+	 * Take control if we are the highest priority enabled display device.
+	 */
+	dvp = find_display();
+	if (dvp == NULL || dvp->id_driver != &vtdriver) {
+		cp->cn_pri = CN_DEAD;
+		return;
+	}
+
+#ifdef _DEV_KBD_KBDREG_H_
+	kbd = NULL;
+	kbd_configure(KB_CONF_PROBE_ONLY);
+	i = kbd_allocate("*", -1, (void *)&kbd, pcevent, (void *)dvp->id_unit);
+	if (i >= 0)
+		kbd = kbd_get_keyboard(i);
 
-#ifdef _I386_ISA_KBDIO_H_
-	kbdc = kbdc_open(IO_KBD);
 	/*
 	 * Don't reset the keyboard via `kbdio' just yet.
 	 * The system clock has not been calibrated...
 	 */
 	reset_keyboard = 0;
+
 #if PCVT_SCANSET == 2
 	/*
 	 * Turn off scancode translation early so that UserConfig 
 	 * and DDB can read the keyboard.
 	 */
-	empty_both_buffers(kbdc, 10);
-	set_controller_command_byte(kbdc, KBD_TRANSLATION, 0);
+	empty_both_buffers(*(KBDC *)kbd->kb_data, 10);
+	set_controller_command_byte(*(KBDC *)kbd->kb_data, KBD_TRANSLATION, 0);
 #endif /* PCVT_SCANSET == 2 */
-#endif /* _I386_ISA_KBDIO_H_ */
 
-	/*
-	 * Take control if we are the highest priority enabled display device.
-	 */
-	dvp = find_display();
-	if (dvp == NULL || dvp->id_driver != &vtdriver) {
-		cp->cn_pri = CN_DEAD;
-		return;
-	}
+#endif /* _DEV_KBD_KBDREG_H_ */
 
 	/* initialize required fields */
 
@@ -1254,7 +1301,13 @@ pccngetc(Dev_t dev)
 
 	s = spltty();		/* block pcrint while we poll */
 	kbd_polling = 1;
+#ifdef _DEV_KBD_KBDREG_H_
+	(*kbdsw[kbd->kb_index]->enable)(kbd);
+#endif	
 	cp = sgetc(0);
+#ifdef _DEV_KBD_KBDREG_H_
+	(*kbdsw[kbd->kb_index]->disable)(kbd);
+#endif	
 	kbd_polling = 0;
 	splx(s);
 	c = *cp++;
@@ -1281,7 +1334,13 @@ pccncheckc(Dev_t dev)
 	char *cp;
 	int x = spltty();
 	kbd_polling = 1;
+#ifdef _DEV_KBD_KBDREG_H_
+	(*kbdsw[kbd->kb_index]->enable)(kbd);
+#endif	
 	cp = sgetc(1);
+#ifdef _DEV_KBD_KBDREG_H_
+	(*kbdsw[kbd->kb_index]->disable)(kbd);
+#endif	
 	kbd_polling = 0;
 	splx(x);
 	return (cp == NULL ? -1 : *cp);
@@ -1520,7 +1579,7 @@ pcvt_xmode_set(int on, struct proc *p)
 
 		vsp->Crtat = vsp->Memory;	/* operate in memory now */
 
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 
 #if PCVT_SCANSET == 2
 		/* put keyboard to return ancient PC scan codes */
@@ -1534,15 +1593,15 @@ pcvt_xmode_set(int on, struct proc *p)
 #endif /* PCVT_USEKBDSEC */
 #endif /* PCVT_SCANSET == 2 */
 
-#else /* _I386_ISA_KBDIO_H_ */
+#else /* _DEV_KBD_KBDREG_H_ */
 
 #if PCVT_SCANSET == 2
 		/* put keyboard to return ancient PC scan codes */
-		set_controller_command_byte(kbdc, 
+		set_controller_command_byte(*(KBDC *)kbd->kb_data, 
 			KBD_TRANSLATION, KBD_TRANSLATION); 
 #endif /* PCVT_SCANSET == 2 */
 
-#endif /* !_I386_ISA_KBDIO_H_ */
+#endif /* !_DEV_KBD_KBDREG_H_ */
 
 #if PCVT_NETBSD > 9
 		fp->tf_eflags |= PSL_IOPL;
@@ -1579,7 +1638,7 @@ pcvt_xmode_set(int on, struct proc *p)
 			pcvt_set_scrnsv_tmo(saved_scrnsv_tmo);
 #endif /* PCVT_SCREENSAVER */
 
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 
 #if PCVT_SCANSET == 2
 		kbc_8042cmd(CONTR_WRITE);
@@ -1592,13 +1651,14 @@ pcvt_xmode_set(int on, struct proc *p)
 #endif /* PCVT_USEKBDSEC */
 #endif /* PCVT_SCANSET == 2 */
 
-#else /* _I386_ISA_KBDIO_H_ */
+#else /* _DEV_KBD_KBDREG_H_ */
 
 #if PCVT_SCANSET == 2
-		set_controller_command_byte(kbdc, KBD_TRANSLATION, 0);
+		set_controller_command_byte(*(KBDC *)kbd->kb_data,
+			KBD_TRANSLATION, 0);
 #endif /* PCVT_SCANSET == 2 */
 
-#endif /* !_I386_ISA_KBDIO_H_ */
+#endif /* !_DEV_KBD_KBDREG_H_ */
 
 		if(adaptor_type == MDA_ADAPTOR)
 		{
diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h
index 11adc9c91d93..2c9aac8a29c5 100644
--- a/sys/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/i386/isa/pcvt/pcvt_hdr.h
@@ -107,7 +107,9 @@
 #endif /* PCVT_FREEBSD >= 200 */
 
 #include <i386/isa/pcvt/pcvt_conf.h>
-#include <i386/isa/kbdio.h>
+
+#include <dev/kbd/kbdreg.h>
+#include <dev/kbd/atkbdcreg.h>
 
 #if PCVT_NETBSD > 9
 #include "device.h"
@@ -168,6 +170,14 @@
 #include <machine/clock.h>
 #include <machine/md_var.h>
 #endif
+/*
+ * The following values are defined in machine/console.h, but the header
+ * file is not included here due to conflicts with pcvt_ioctl.h.
+ */
+#define KDGKBTYPE	_IOR('K', 64, int)
+#define KB_84		1
+#define KB_101		2
+#define KB_OTHER	3
 #else /* PCVT_FREEBSD >= 200 */
 #include "machine/pc/display.h"
 #endif /* PCVT_FREEBSD >= 200 */
@@ -260,7 +270,7 @@ in the config file"
  *	Keyboard and Keyboard Controller
  *---------------------------------------------------------------------------*/
 
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 
 #define CONTROLLER_CTRL	0x64	/* W - command, R - status	*/
 #define CONTROLLER_DATA	0x60	/* R/W - data			*/
@@ -308,7 +318,7 @@ in the config file"
 #define KEYB_C_ECHO	0xee	/* diagnostic, echo 0xee */
 #define KEYB_C_LEDS	0xed	/* set/reset numlock,capslock & scroll lock */
 
-#endif /* _I386_ISA_KBDIO_H_ */
+#endif /* _DEV_KBD_KBDREG_H_ */
 
 /* responses from the KEYBOARD (via the 8042 controller on mainboard..) */
 
@@ -1000,10 +1010,10 @@ u_char	chargen_access		= 0;		/* synchronize access */
 u_char	keyboard_type		= KB_UNKNOWN;	/* type of keyboard */
 u_char	keyboard_is_initialized = 0;		/* for ddb sanity */
 u_char	kbd_polling		= 0;		/* keyboard is being polled */
-#ifdef _I386_ISA_KBDIO_H_
+#ifdef _DEV_KBD_KBDREG_H_
 u_char	reset_keyboard		= 0;		/* OK to reset keyboard */
-KBDC	kbdc			= NULL;		/* keyboard controller */
-#endif /* _I386_ISA_KBDIO_H_ */
+keyboard_t *kbd			= NULL;
+#endif /* _DEV_KBD_KBDREG_H_ */
 
 #if PCVT_SHOWKEYS
 u_char	keyboard_show		= 0;		/* normal display */
@@ -1141,10 +1151,10 @@ extern u_char		can_do_132col;
 extern u_char		vga_family;
 extern u_char		keyboard_is_initialized;
 extern u_char		kbd_polling;
-#ifdef _I386_ISA_KBDIO_H_
+#ifdef _DEV_KBD_KBDREG_H_
 extern u_char		reset_keyboard;
-extern KBDC		kbdc;
-#endif /* _I386_ISA_KBDIO_H_ */
+extern keyboard_t	*kbd;
+#endif /* _DEV_KBD_KBDREG_H_ */
 
 #if PCVT_SHOWKEYS
 extern u_char		keyboard_show;
@@ -1268,10 +1278,10 @@ void	fkl_on ( struct video_state *svsp );
 struct tty *get_pccons ( Dev_t dev );
 void	init_sfkl ( struct video_state *svsp );
 void	init_ufkl ( struct video_state *svsp );
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 int	kbd_cmd ( int val );
 int	kbd_response ( void );
-#endif /* _I386_ISA_KBDIO_H_ */
+#endif /* _DEV_KBD_KBDREG_H_ */
 void	kbd_code_init ( void );
 void	kbd_code_init1 ( void );
 
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c
index 2113ee0ae140..c7a2cfc34387 100644
--- a/sys/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/i386/isa/pcvt/pcvt_kbd.c
@@ -91,11 +91,9 @@ static void	doreset ( void );
 static void	ovlinit ( int force );
 static void 	settpmrate ( int rate );
 static void	setlockkeys ( int snc );
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 static int	kbc_8042cmd ( int val );
-#else
-static int 	set_keyboard_param( int command, int data );
-#endif /* !_I386_ISA_KBDIO_H_ */
+#endif /* !_DEV_KBD_KBDREG_H_ */
 static int	getokeydef ( unsigned key, struct kbd_ovlkey *thisdef );
 static int 	getckeydef ( unsigned key, struct kbd_ovlkey *thisdef );
 static int	rmkeydef ( int key );
@@ -170,7 +168,7 @@ do_vgapage(int page)
 
 #define PCVT_UPDLED_LOSES_INTR	0	/* disabled for now */
 
-#if PCVT_UPDLED_LOSES_INTR || defined(_I386_ISA_KBDIO_H_)
+#if PCVT_UPDLED_LOSES_INTR || defined(_DEV_KBD_KBDREG_H_)
 
 /*---------------------------------------------------------------------------*
  *	check for lost keyboard interrupts
@@ -203,7 +201,7 @@ static struct callout_handle lost_intr_ch =
 static void
 check_for_lost_intr (void *arg)
 {
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 	lost_intr_timeout_queued = 0;
 	if (inb(CONTROLLER_CTRL) & STATUS_OUTPBF)
 	{
@@ -215,19 +213,20 @@ check_for_lost_intr (void *arg)
 	int opri;
 
 	lost_intr_timeout_queued = 0;
-	if (kbdc_lock(kbdc, TRUE)) {
+	if ((*kbdsw[kbd->kb_index]->lock)(kbd, TRUE)) {
 		opri = spltty ();
-		kbdc_lock(kbdc, FALSE);
-		if (kbdc_data_ready(kbdc)) 
+		(*kbdsw[kbd->kb_index]->lock)(kbd, FALSE);
+		if ((*kbdsw[kbd->kb_index]->check)(kbd))
 			pcrint (0);
 		splx (opri);
 	}
+
 	lost_intr_ch = timeout(check_for_lost_intr, (void *)NULL, hz);
 	lost_intr_timeout_queued = 1;
-#endif /* !_I386_ISA_KBDIO_H_ */
+#endif /* !_DEV_KBD_KBDREG_H_ */
 }
 
-#endif /* PCVT_UPDLED_LOSES_INTR || defined(_I386_ISA_KBDIO_H_) */
+#endif /* PCVT_UPDLED_LOSES_INTR || defined(_DEV_KBD_KBDREG_H_) */
 
 /*---------------------------------------------------------------------------*
  *	update keyboard led's
@@ -242,13 +241,19 @@ update_led(void)
 	int opri, new_ledstate;
 
 	opri = spltty();
+#ifndef _DEV_KBD_KBDREG_H_
 	new_ledstate = (vsp->scroll_lock) |
 		       (vsp->num_lock * 2) |
 		       (vsp->caps_lock * 4);
+#else
+	new_ledstate = ((vsp->scroll_lock) ? LED_SCR : 0) |
+		       ((vsp->num_lock) ? LED_NUM : 0) |
+		       ((vsp->caps_lock) ? LED_CAP : 0);
+#endif /* _DEV_KBD_KBDREG_H_ */
 
 	if (new_ledstate != ledstate)
 	{
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 		int response1, response2;
 
 		ledstate = LEDSTATE_UPDATE_PENDING;
@@ -296,19 +301,20 @@ update_led(void)
 			printf(
 			"Keyboard LED command not ACKed (responses %#x %#x)\n",
 			       response1, response2);
-#else /* _I386_ISA_KBDIO_H_ */
+#else /* _DEV_KBD_KBDREG_H_ */
 
-		if (kbdc == NULL) {
+		if (kbd == NULL) {
 			ledstate = new_ledstate;
 			splx(opri);
 		} else {
 			ledstate = LEDSTATE_UPDATE_PENDING;
 			splx(opri);
-			if (set_keyboard_param(KBDC_SET_LEDS, new_ledstate) == 0) 
+			if ((*kbdsw[kbd->kb_index]->ioctl)(kbd, KDSETLED,
+					(caddr_t)&new_ledstate) == 0) 
 				ledstate = new_ledstate;
 		}
 
-#endif /* !_I386_ISA_KBDIO_H_ */
+#endif /* !_DEV_KBD_KBDREG_H_ */
 
 #if PCVT_UPDLED_LOSES_INTR
 		if (lost_intr_timeout_queued)
@@ -320,7 +326,7 @@ update_led(void)
 
 	}
 
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 	splx(opri);
 #endif 
 
@@ -333,7 +339,7 @@ update_led(void)
 static void
 settpmrate(int rate)
 {
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 	tpmrate = rate & 0x7f;
 	if(kbd_cmd(KEYB_C_TYPEM) != 0)
 		printf("Keyboard TYPEMATIC command timeout\n");
@@ -341,12 +347,13 @@ settpmrate(int rate)
 		printf("Keyboard TYPEMATIC data timeout\n");
 #else
 	tpmrate = rate & 0x7f;
-	if (set_keyboard_param(KBDC_SET_TYPEMATIC, tpmrate) != 0)
+	if ((*kbdsw[kbd->kb_index]->ioctl)(kbd, KDSETRAD,
+					   (caddr_t)&tpmrate) == 0) 
 		printf("pcvt: failed to set keyboard TYPEMATIC.\n");
-#endif /* !_I386_ISA_KBDIO_H_ */
+#endif /* !_DEV_KBD_KBDREG_H_ */
 }
 
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 /*---------------------------------------------------------------------------*
  *	Pass command to keyboard controller (8042)
  *---------------------------------------------------------------------------*/
@@ -408,64 +415,7 @@ kbd_response(void)
 
 	return ch;
 }
-#else
-static int
-set_keyboard_param(int command, int data)
-{
-    int s;
-#if 0
-    int c;
-#endif
-
-    if (kbdc == NULL)
-	return 1;
-
-    /* prevent the timeout routine from polling the keyboard */
-    if (!kbdc_lock(kbdc, TRUE)) 
-	return 1;
-
-    /* disable the keyboard and mouse interrupt */
-    s = spltty();
-#if 0
-    c = get_controller_command_byte(kbdc);
-    if ((c == -1) 
-	|| !set_controller_command_byte(kbdc, 
-            kbdc_get_device_mask(kbdc),
-            KBD_DISABLE_KBD_PORT | KBD_DISABLE_KBD_INT
-                | KBD_DISABLE_AUX_PORT | KBD_DISABLE_AUX_INT)) {
-	/* CONTROLLER ERROR */
-        kbdc_lock(kbdc, FALSE);
-	splx(s);
-	return 1;
-    }
-    /* 
-     * Now that the keyboard controller is told not to generate 
-     * the keyboard and mouse interrupts, call `splx()' to allow 
-     * the other tty interrupts. The clock interrupt may also occur, 
-     * but the timeout routine (`scrn_timer()') will be blocked 
-     * by the lock flag set via `kbdc_lock()'
-     */
-    splx(s);
-#endif
-
-    if (send_kbd_command_and_data(kbdc, command, data) != KBD_ACK)
-        send_kbd_command(kbdc, KBDC_ENABLE_KBD);
-
-#if 0
-    /* restore the interrupts */
-    if (!set_controller_command_byte(kbdc,
-            kbdc_get_device_mask(kbdc),
-	    c & (KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS))) { 
-	/* CONTROLLER ERROR */
-    }
-#else
-    splx(s);
-#endif
-    kbdc_lock(kbdc, FALSE);
-
-    return 0;
-}
-#endif /* !_I386_ISA_KBDIO_H_ */
+#endif /* _DEV_KBD_KBDREG_H_ */
 
 #if PCVT_SCANSET > 1
 /*---------------------------------------------------------------------------*
@@ -474,7 +424,7 @@ set_keyboard_param(int command, int data)
 void
 kbd_emulate_pc(int do_emulation)
 {
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 	int cmd, timeo = 10000;
 
 	cmd = COMMAND_SYSFLG|COMMAND_IRQEN; /* common base cmd */
@@ -492,9 +442,9 @@ kbd_emulate_pc(int do_emulation)
 			break;
 	outb(CONTROLLER_DATA, cmd);
 #else
-	set_controller_command_byte(kbdc, KBD_TRANSLATION, 
+	set_controller_command_byte(*(KBDC *)kbd->kb_data, KBD_TRANSLATION, 
 		(do_emulation) ? KBD_TRANSLATION : 0);
-#endif /* !_I386_ISA_KBDIO_H_ */
+#endif /* !_DEV_KBD_KBDREG_H_ */
 }
 
 #endif /* PCVT_SCANSET > 1 */
@@ -510,7 +460,7 @@ kbd_emulate_pc(int do_emulation)
 static
 void doreset(void)
 {
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 	int again = 0;
 	int once = 0;
 	int response, opri;
@@ -671,10 +621,8 @@ r_entry:
 
 #endif /* PCVT_KEYBDID */
 
-#else /* _I386_ISA_KBDIO_H_ */
-	int c;
-	int m;
-	int s;
+#else /* _DEV_KBD_KBDREG_H_ */
+	int type;
 
 	if (!reset_keyboard)	/* no, we are not ready to reset */
 		return;
@@ -684,29 +632,11 @@ r_entry:
 		lost_intr_timeout_queued = 0;
 	}
 
-	if (kbdc == NULL)
-		kbdc = kbdc_open(IO_KBD);
+	if (kbd == NULL)
+		return;		/* shouldn't happen */
+	(*kbdsw[kbd->kb_index]->init)(kbd);
 
-	if (!kbdc_lock(kbdc, TRUE))	/* strange, somebody got there first */
-		return;
-
-	/* remove any noise */
-	empty_both_buffers(kbdc, 10);
-
-	s = spltty();
-
-	/* save the current controller command byte */
-	m = kbdc_get_device_mask(kbdc) & ~KBD_KBD_CONTROL_BITS;
-	c = get_controller_command_byte(kbdc);
-	if (c == -1) {
-		/* CONTROLLER ERROR */
-		kbdc_set_device_mask(kbdc, m);
-		kbdc_lock(kbdc, FALSE);
-		kbdc = NULL;
-		splx(s);
-    		printf("pcvt: unable to get the command byte.\n");
-		return;
-	}
+	ledstate = LEDSTATE_UPDATE_PENDING;
 
 #if PCVT_USEKBDSEC		/* security enabled */
 
@@ -726,105 +656,33 @@ r_entry:
 
 #endif /* PCVT_USEKBDSEC */
 
-	/* disable the keyboard interrupt and the aux port and interrupt */
-        if (!set_controller_command_byte(kbdc,
-                KBD_KBD_CONTROL_BITS | KBD_TRANSLATION | KBD_OVERRIDE_KBD_LOCK,
-                KBD_ENABLE_KBD_PORT | KBD_DISABLE_KBD_INT | KBDINITCMD)) {
-    		/* CONTROLLER ERROR: there is very little we can do... */
-		kbdc_set_device_mask(kbdc, m);
-		kbdc_lock(kbdc, FALSE);
-		kbdc = NULL;
-		splx(s);
-    		printf("pcvt: unable to set the command byte.\n");
-		return;
-        }
-	splx(s);
-    
-        /* reset keyboard hardware */
-	ledstate = LEDSTATE_UPDATE_PENDING;
-        if (!reset_kbd(kbdc)) {
-		/* KEYBOARD ERROR */
-    		empty_both_buffers(kbdc, 10);
-    		test_controller(kbdc);
-    		test_kbd_port(kbdc);
-    		/* 
-		 * We could disable the keyboard port and interrupt now... 
-		 * but, the keyboard may still exist. 
-    		 */
-    		printf("pcvt: failed to reset the keyboard.\n"); 
-		/* try to restore the original command byte */
-		set_controller_command_byte(kbdc, 0xff, c);
-		kbdc_set_device_mask(kbdc, m);
-		kbdc_lock(kbdc, FALSE);
-		kbdc = NULL;
-		return;
-	}
-    
-#if PCVT_KEYBDID
-
-	keyboard_type = KB_UNKNOWN;
-	if (send_kbd_command(kbdc, KBDC_SEND_DEV_ID) == KBD_ACK) {
-		DELAY(10000);	/* 10msec delay */
-		switch (read_kbd_data(kbdc)) {
-		case KEYB_R_MF2ID1:
-			switch (read_kbd_data(kbdc)) {
-			case KEYB_R_MF2ID2:
-			case KEYB_R_MF2ID2HP:
-				keyboard_type = KB_MFII;
-				break;
-			case -1:
-			default:
-				break;
-			}
-			break;
-		case -1:
-			keyboard_type = KB_AT;
-			/* fall through */
-		default:
-			/* XXX: should we read the second byte? */
-    			empty_both_buffers(kbdc, 10);	/* XXX */
-			break;
-		}
-	} else {
-		/* 
-		 * The send ID command failed. This error is considered
-		 * benign, but may need recovery. 
-		 */ 
-    		empty_both_buffers(kbdc, 10);
-    		test_controller(kbdc);
-    		test_kbd_port(kbdc);
-	}
-
-#else /* PCVT_KEYBDID */
+	set_controller_command_byte(*(KBDC *)kbd->kb_data,
+		KBD_OVERRIDE_KBD_LOCK | KBD_TRANSLATION, KBDINITCMD);
 
 	keyboard_type = KB_MFII;	/* force it .. */
-
-#endif /* PCVT_KEYBDID */
-
-	/* enable the keyboard port and intr. */
-	if (!set_controller_command_byte(kbdc, 
-        	KBD_KBD_CONTROL_BITS, 
-    	        KBD_ENABLE_KBD_PORT | KBD_ENABLE_KBD_INT)) {
-    		/* CONTROLLER ERROR 
-    		 * This is serious; we are left with the disabled 
-		 * keyboard intr. 
-    		 */
-    		printf("pcvt: failed to enable the keyboard port and intr.\n");
-		kbdc_set_device_mask(kbdc, m);
-		kbdc_lock(kbdc, FALSE);
-		kbdc = NULL;
-		return;
+#if PCVT_KEYBDID
+	type = KB_101;
+	(*kbdsw[kbd->kb_index]->ioctl)(kbd, KDGKBTYPE, (caddr_t)&type);
+	switch (type)
+	{
+	case KB_84:
+		keyboard_type = KB_AT;
+		break;
+	case KB_101:
+		keyboard_type = KB_MFII;
+		break;
+	default:
+		keyboard_type = KB_UNKNOWN;
+		break;
 	}
-    
-	kbdc_set_device_mask(kbdc, m | KBD_KBD_CONTROL_BITS);
-	kbdc_lock(kbdc, FALSE);
+#endif /* PCVT_KEYBDID */
 
 	update_led();
 
 	lost_intr_ch = timeout(check_for_lost_intr, (void *)NULL, hz);
 	lost_intr_timeout_queued = 1;
 
-#endif /* !_I386_ISA_KBDIO_H_ */
+#endif /* !_DEV_KBD_KBDREG_H_ */
 }
 
 /*---------------------------------------------------------------------------*
@@ -1246,15 +1104,15 @@ sgetc(int noblock)
 	static char	keybuf[2] = {0}; /* the second 0 is a delimiter! */
 #endif /* XSERVER */
 
-#ifdef _I386_ISA_KBDIO_H_
+#ifdef _DEV_KBD_KBDREG_H_
 	int 		c;
-#endif /* _I386_ISA_KBDIO_H_ */
+#endif /* _DEV_KBD_KBDREG_H_ */
 
 loop:
 
 #ifdef XSERVER
 
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 
 #if PCVT_KBD_FIFO
 
@@ -1289,7 +1147,7 @@ loop:
 
 #endif /* !PCVT_KBD_FIFO */
 
-#else /* _I386_ISA_KBDIO_H_ */
+#else /* _DEV_KBD_KBDREG_H_ */
 
 #if PCVT_KBD_FIFO
 	if (pcvt_kbd_count) {
@@ -1302,18 +1160,18 @@ loop:
 	} else
 #endif /* PCVT_KBD_FIFO */
 	if (!noblock) {
-		while ((c = read_kbd_data(kbdc)) == -1)
+		while ((c = (*kbdsw[kbd->kb_index]->read)(kbd, TRUE)) == -1)
 			;
 		dt = c;
 	} else {
-		if ((c = read_kbd_data_no_wait(kbdc)) == -1)
+		if ((c = (*kbdsw[kbd->kb_index]->read)(kbd, FALSE)) == -1)
 			return NULL;
 		dt = c;
 	}
 
 	{
 
-#endif /* !_I386_ISA_KBDIO_H_ */
+#endif /* !_DEV_KBD_KBDREG_H_ */
 
 		/*
 		 * If x mode is active, only care for locking keys, then
@@ -1591,7 +1449,7 @@ no_mouse_event:
 
 #else /* !XSERVER */
 
-#ifndef  _I386_ISA_KBDIO_H_
+#ifndef  _DEV_KBD_KBDREG_H_
 
 #  if PCVT_KBD_FIFO
 
@@ -1628,7 +1486,7 @@ no_mouse_event:
 
 #endif /* !PCVT_KBD_FIFO */
 
-#else /* _I386_ISA_KBDIO_H_ */
+#else /* _DEV_KBD_KBDREG_H_ */
 
 #if PCVT_KBD_FIFO
 	if (pcvt_kbd_count) {
@@ -1641,20 +1499,20 @@ no_mouse_event:
 	} else
 #endif /* PCVT_KBD_FIFO */
 	if (!noblock) {
-		while ((c = read_kbd_data(kbdc)) == -1)
+		while ((c = (*kbdsw[kbd->kb_index]->read)(kbd, TRUE)) == -1)
 			;
 		dt = c;
 	} else {
-		if ((c = read_kbd_data_no_wait(kbdc)) == -1)
+		if ((c = (*kbdsw[kbd->kb_index]->read)(kbd, FALSE)) == -1)
 			return NULL;
 		dt = c;
 	}
 
-#endif /* !_I386_ISA_KBDIO_H_ */
+#endif /* !_DEV_KBD_KBDREG_H_ */
 
 #endif /* !XSERVER */
 
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 	else
 	{
 		if(noblock)
@@ -1662,7 +1520,7 @@ no_mouse_event:
 		else
 			goto loop;
 	}
-#endif /* !_I386_ISA_KBDIO_H_ */
+#endif /* !_DEV_KBD_KBDREG_H_ */
 
 #if PCVT_SHOWKEYS
 	showkey (' ', dt);
diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c
index 4cee9842791b..07290afea781 100644
--- a/sys/i386/isa/psm.c
+++ b/sys/i386/isa/psm.c
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: psm.c,v 1.57 1998/11/20 11:46:43 yokota Exp $
+ * $Id: psm.c,v 1.58 1999/01/06 05:40:01 yokota Exp $
  */
 
 /*
@@ -86,9 +86,10 @@
 #include <machine/limits.h>
 #include <machine/mouse.h>
 
+#include <dev/kbd/atkbdcreg.h>
+
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
-#include <i386/isa/kbdio.h>
 
 /*
  * Driver specific options: the following options may be set by
@@ -1003,7 +1004,7 @@ psmprobe(struct isa_device *dvp)
     psm_softc[unit] = sc;
     kbdc_set_device_mask(sc->kbdc, mask | KBD_AUX_CONTROL_BITS);
     kbdc_lock(sc->kbdc, FALSE);
-    return (IO_PSMSIZE);
+    return ((dvp->id_iobase < 0) ? -1 : IO_PSMSIZE);
 }
 
 static int
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index 2e932397b4bc..306aaa4828d2 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -23,14 +23,20 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vesa.c,v 1.10 1998/12/30 11:21:08 yokota Exp $
+ * $Id: $
  */
 
-#include "sc.h"
+#include "vga.h"
+#include "opt_vga.h"
 #include "opt_vesa.h"
 #include "opt_vm86.h"
+#include "opt_fb.h"
 
-#if (NSC > 0 && defined(VESA) && defined(VM86)) || defined(KLD_MODULE)
+#ifdef VGA_NO_MODE_CHANGE
+#undef VESA
+#endif
+
+#if (NVGA > 0 && defined(VESA) && defined(VM86)) || defined(KLD_MODULE)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,7 +52,18 @@
 #include <machine/pc/bios.h>
 #include <machine/pc/vesa.h>
 
-#include <i386/isa/videoio.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/vgareg.h>
+
+#ifndef __i386__
+#include <isa/isareg.h>
+#else
+#include <i386/isa/isa.h>
+#endif
+
+#ifndef VESA_DEBUG
+#define VESA_DEBUG	1
+#endif
 
 /* VESA video adapter state buffer stub */
 struct adp_state {
@@ -59,11 +76,14 @@ typedef struct adp_state adp_state_t;
 /* VESA video adapter */
 static video_adapter_t *vesa_adp = NULL;
 static int vesa_state_buf_size = 0;
+#if 0
 static void *vesa_state_buf = NULL;
+#endif
 
 /* VESA functions */
+static int			vesa_nop(void);
+static vi_probe_t		vesa_probe;
 static vi_init_t		vesa_init;
-static vi_adapter_t		vesa_adapter;
 static vi_get_info_t		vesa_get_info;
 static vi_query_mode_t		vesa_query_mode;
 static vi_set_mode_t		vesa_set_mode;
@@ -78,17 +98,34 @@ static vi_load_state_t		vesa_load_state;
 static vi_set_win_org_t		vesa_set_origin;
 static vi_read_hw_cursor_t	vesa_read_hw_cursor;
 static vi_set_hw_cursor_t	vesa_set_hw_cursor;
+static vi_set_hw_cursor_shape_t	vesa_set_hw_cursor_shape;
+static vi_mmap_t		vesa_mmap;
 static vi_diag_t		vesa_diag;
 
-static struct vidsw vesavidsw = {
-	vesa_init,	vesa_adapter,	vesa_get_info,	vesa_query_mode,
-	vesa_set_mode,	vesa_save_font,	vesa_load_font,	vesa_show_font,
-	vesa_save_palette,vesa_load_palette,vesa_set_border,vesa_save_state,
-	vesa_load_state,vesa_set_origin,vesa_read_hw_cursor,vesa_set_hw_cursor,
+static video_switch_t vesavidsw = {
+	vesa_probe,
+	vesa_init,
+	vesa_get_info,
+	vesa_query_mode,
+	vesa_set_mode,
+	vesa_save_font,
+	vesa_load_font,
+	vesa_show_font,
+	vesa_save_palette,
+	vesa_load_palette,
+	vesa_set_border,
+	vesa_save_state,
+	vesa_load_state,
+	vesa_set_origin,
+	vesa_read_hw_cursor,
+	vesa_set_hw_cursor,
+	vesa_set_hw_cursor_shape,
+	(vi_blank_display_t *)vesa_nop,
+	vesa_mmap,
 	vesa_diag,
 };
 
-static struct vidsw prevvidsw;
+static video_switch_t *prevvidsw;
 
 /* VESA BIOS video modes */
 #define VESA_MAXMODES	64
@@ -111,6 +148,7 @@ static char *vesa_revstr = NULL;
 /* local macros and functions */
 #define BIOS_SADDRTOLADDR(p) ((((p) & 0xffff0000) >> 12) + ((p) & 0x0000ffff))
 
+static int int10_set_mode(int mode);
 static int vesa_bios_get_mode(int mode, struct vesa_mode *vmode);
 static int vesa_bios_set_mode(int mode);
 static int vesa_bios_set_dac(int bits);
@@ -146,6 +184,18 @@ dump_buffer(u_char *buf, size_t len)
     }
 }
 
+/* INT 10 BIOS calls */
+static int
+int10_set_mode(int mode)
+{
+	struct vm86frame vmf;
+
+	bzero(&vmf, sizeof(vmf));
+	vmf.vmf_eax = 0x0000 | mode;
+	vm86_intcall(0x10, &vmf);
+	return 0;
+}
+
 /* VESA BIOS calls */
 static int
 vesa_bios_get_mode(int mode, struct vesa_mode *vmode)
@@ -362,8 +412,10 @@ vesa_bios_init(void)
 	if ((err != 0) || (vmf.vmf_eax != 0x4f) || bcmp("VESA", buf, 4))
 		return 1;
 	vesa_adp_info = (struct vesa_info *)buf;
-	if (bootverbose)
+	if (bootverbose) {
+		printf("VESA: information block\n");
 		dump_buffer(buf, 64);
+	}
 	if (vesa_adp_info->v_flags & V_NONVGA)
 		return 1;
 
@@ -446,42 +498,101 @@ vesa_clear_modes(video_info_t *info, int color)
 	}
 }
 
-/* exported functions */
+/* entry points */
 
 static int
-vesa_init(void)
+vesa_configure(int flags)
 {
+	video_adapter_t *adp;
 	int adapters;
+	int error;
 	int i;
 
-	adapters = (*prevvidsw.init)();
-	for (i = 0; i < adapters; ++i) {
-		if ((vesa_adp = (*prevvidsw.adapter)(i)) == NULL)
-			continue;
-		if (vesa_adp->va_type == KD_VGA) {
-			vesa_adp->va_flags |= V_ADP_VESA;
-			return adapters;
-		}
+	if (vesa_init_done)
+		return 0;
+	if (flags & VIO_PROBE_ONLY)
+		return 0;		/* XXX */
+
+	/*
+	 * If the VESA module has already been loaded, abort loading 
+	 * the module this time.
+	 */
+	for (i = 0; (adp = vid_get_adapter(i)) != NULL; ++i) {
+		if (adp->va_flags & V_ADP_VESA)
+			return ENXIO;
+		if (adp->va_type == KD_VGA)
+			break;
 	}
-	vesa_adp = NULL;
-	return adapters;
+	/*
+	 * The VGA adapter is not found.  This is because either 
+	 * 1) the VGA driver has not been initialized, or 2) the VGA card
+	 * is not present.  If 1) is the case, we shall defer
+	 * initialization for now and try again later.
+	 */
+	if (adp == NULL) {
+		vga_sub_configure = vesa_configure;
+		return ENODEV;
+	}
+
+	/* count number of registered adapters */
+	for (++i; vid_get_adapter(i) != NULL; ++i)
+		;
+	adapters = i;
+
+	/* call VESA BIOS */
+	vesa_adp = adp;
+	if (vesa_bios_init()) {
+		vesa_adp = NULL;
+		return ENXIO;
+	}
+	vesa_adp->va_flags |= V_ADP_VESA;
+
+	/* remove conflicting modes if we have more than one adapter */
+	if (adapters > 1) {
+		vesa_clear_modes(vesa_vmode,
+				 (vesa_adp->va_flags & V_ADP_COLOR) ? 
+				     V_INFO_COLOR : 0);
+	}
+
+	if ((error = vesa_load_ioctl()) == 0) {
+		prevvidsw = vidsw[vesa_adp->va_index];
+		vidsw[vesa_adp->va_index] = &vesavidsw;
+		vesa_init_done = TRUE;
+	} else {
+		vesa_adp = NULL;
+		return error;
+	}
+
+	return 0;
 }
 
-static video_adapter_t
-*vesa_adapter(int ad)
+static int
+vesa_nop(void)
+{
+	return 0;
+}
+
+static int
+vesa_probe(int unit, video_adapter_t **adpp, void *arg, int flags)
 {
-	return (*prevvidsw.adapter)(ad);
+	return (*prevvidsw->probe)(unit, adpp, arg, flags);
 }
 
 static int
-vesa_get_info(int ad, int mode, video_info_t *info)
+vesa_init(int unit, video_adapter_t *adp, int flags)
+{
+	return (*prevvidsw->init)(unit, adp, flags);
+}
+
+static int
+vesa_get_info(video_adapter_t *adp, int mode, video_info_t *info)
 {
 	int i;
 
-	if ((*prevvidsw.get_info)(ad, mode, info) == 0)
+	if ((*prevvidsw->get_info)(adp, mode, info) == 0)
 		return 0;
 
-	if (ad != vesa_adp->va_index)
+	if (adp != vesa_adp)
 		return 1;
 
 	mode = vesa_map_gen_mode_num(vesa_adp->va_type, 
@@ -498,13 +609,13 @@ vesa_get_info(int ad, int mode, video_info_t *info)
 }
 
 static int
-vesa_query_mode(int ad, video_info_t *info)
+vesa_query_mode(video_adapter_t *adp, video_info_t *info)
 {
 	int i;
 
-	if ((i = (*prevvidsw.query_mode)(ad, info)) != -1)
+	if ((i = (*prevvidsw->query_mode)(adp, info)) != -1)
 		return i;
-	if (ad != vesa_adp->va_index)
+	if (adp != vesa_adp)
 		return -1;
 
 	for (i = 0; vesa_vmode[i].vi_mode != EOT; ++i) {
@@ -536,17 +647,19 @@ vesa_query_mode(int ad, video_info_t *info)
 }
 
 static int
-vesa_set_mode(int ad, int mode)
+vesa_set_mode(video_adapter_t *adp, int mode)
 {
 	video_info_t info;
+#if 0
 	size_t len;
+#endif
 
-	if (ad != vesa_adp->va_index)
-		return (*prevvidsw.set_mode)(ad, mode);
+	if (adp != vesa_adp)
+		return (*prevvidsw->set_mode)(adp, mode);
 
 	mode = vesa_map_gen_mode_num(vesa_adp->va_type, 
 				     vesa_adp->va_flags & V_ADP_COLOR, mode);
-#ifdef SC_VIDEO_DEBUG
+#if VESA_DEBUG > 0
 	printf("VESA: set_mode(): %d(%x) -> %d(%x)\n",
 		vesa_adp->va_mode, vesa_adp->va_mode, mode, mode);
 #endif
@@ -554,37 +667,40 @@ vesa_set_mode(int ad, int mode)
 	 * If the current mode is a VESA mode and the new mode is not,
 	 * restore the state of the adapter first, so that non-standard, 
 	 * extended SVGA registers are set to the state compatible with
-	 * the standard VGA modes. Otherwise (*prevvidsw.set_mode)() 
+	 * the standard VGA modes. Otherwise (*prevvidsw->set_mode)() 
 	 * may not be able to set up the new mode correctly.
 	 */
 	if (VESA_MODE(vesa_adp->va_mode)) {
-		if ((*prevvidsw.get_info)(ad, mode, &info) == 0) {
+		if ((*prevvidsw->get_info)(adp, mode, &info) == 0) {
+			int10_set_mode(vesa_adp->va_initial_bios_mode);
+#if 0
 			/* assert(vesa_state_buf != NULL); */
 		    	if ((vesa_state_buf == NULL)
-			    || vesa_load_state(ad, vesa_state_buf))
+			    || vesa_load_state(adp, vesa_state_buf))
 				return 1;
 			free(vesa_state_buf, M_DEVBUF);
 			vesa_state_buf = NULL;
-#ifdef SC_VIDEO_DEBUG
+#if VESA_DEBUG > 0
 			printf("VESA: restored\n");
 #endif
+#endif /* 0 */
 		}
 		/* 
-		 * once (*prevvidsw.get_info)() succeeded, 
-		 * (*prevvidsw.set_mode)() below won't fail...
+		 * once (*prevvidsw->get_info)() succeeded, 
+		 * (*prevvidsw->set_mode)() below won't fail...
 		 */
 	}
 
 	/* we may not need to handle this mode after all... */
-	if ((*prevvidsw.set_mode)(ad, mode) == 0)
+	if ((*prevvidsw->set_mode)(adp, mode) == 0)
 		return 0;
 
 	/* is the new mode supported? */
-	if (vesa_get_info(ad, mode, &info))
+	if (vesa_get_info(adp, mode, &info))
 		return 1;
 	/* assert(VESA_MODE(mode)); */
 
-#ifdef SC_VIDEO_DEBUG
+#if VESA_DEBUG > 0
 	printf("VESA: about to set a VESA mode...\n");
 #endif
 	/* 
@@ -592,27 +708,29 @@ vesa_set_mode(int ad, int mode)
 	 * so that the adapter state can be restored later when a non-VESA
 	 * mode is to be set up. See above.
 	 */
+#if 0
 	if (!VESA_MODE(vesa_adp->va_mode) && (vesa_state_buf == NULL)) {
-		len = vesa_save_state(ad, NULL, 0);
+		len = vesa_save_state(adp, NULL, 0);
 		vesa_state_buf = malloc(len, M_DEVBUF, M_WAITOK);
-		if (vesa_save_state(ad, vesa_state_buf, len)) {
-#ifdef SC_VIDEO_DEBUG
+		if (vesa_save_state(adp, vesa_state_buf, len)) {
+#if VESA_DEBUG > 0
 			printf("VESA: state save failed! (len=%d)\n", len);
 #endif
 			free(vesa_state_buf, M_DEVBUF);
 			vesa_state_buf = NULL;
 			return 1;
 		}
-#ifdef SC_VIDEO_DEBUG
+#if VESA_DEBUG > 0
 		printf("VESA: saved (len=%d)\n", len);
 		dump_buffer(vesa_state_buf, len);
 #endif
 	}
+#endif /* 0 */
 
 	if (vesa_bios_set_mode(mode))
 		return 1;
 
-#ifdef SC_VIDEO_DEBUG
+#if VESA_DEBUG > 0
 	printf("VESA: mode set!\n");
 #endif
 	vesa_adp->va_mode = mode;
@@ -620,7 +738,7 @@ vesa_set_mode(int ad, int mode)
 	vesa_adp->va_flags |= 
 		(info.vi_flags & V_INFO_COLOR) ? V_ADP_COLOR : 0;
 	vesa_adp->va_crtc_addr =
-		(vesa_adp->va_flags & V_ADP_COLOR) ? COLOR_BASE : MONO_BASE;
+		(vesa_adp->va_flags & V_ADP_COLOR) ? COLOR_CRTC : MONO_CRTC;
 	vesa_adp->va_window = BIOS_PADDRTOVADDR(info.vi_window);
 	vesa_adp->va_window_size = info.vi_window_size;
 	vesa_adp->va_window_gran = info.vi_window_gran;
@@ -632,58 +750,63 @@ vesa_set_mode(int ad, int mode)
 		vesa_adp->va_buffer_size = info.vi_buffer_size;
 	}
 
+	/* move hardware cursor out of the way */
+	(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
+
 	return 0;
 }
 
 static int
-vesa_save_font(int ad, int page, int fontsize, u_char *data, int ch, int count)
+vesa_save_font(video_adapter_t *adp, int page, int fontsize, u_char *data,
+	       int ch, int count)
 {
-	return (*prevvidsw.save_font)(ad, page, fontsize, data, ch, count);
+	return (*prevvidsw->save_font)(adp, page, fontsize, data, ch, count);
 }
 
 static int
-vesa_load_font(int ad, int page, int fontsize, u_char *data, int ch, int count)
+vesa_load_font(video_adapter_t *adp, int page, int fontsize, u_char *data,
+	       int ch, int count)
 {
-	return (*prevvidsw.load_font)(ad, page, fontsize, data, ch, count);
+	return (*prevvidsw->load_font)(adp, page, fontsize, data, ch, count);
 }
 
 static int
-vesa_show_font(int ad, int page)
+vesa_show_font(video_adapter_t *adp, int page)
 {
-	return (*prevvidsw.show_font)(ad, page);
+	return (*prevvidsw->show_font)(adp, page);
 }
 
 static int
-vesa_save_palette(int ad, u_char *palette)
+vesa_save_palette(video_adapter_t *adp, u_char *palette)
 {
-	if ((ad != vesa_adp->va_index) || !(vesa_adp_info->v_flags & V_DAC8) 
+	if ((adp != vesa_adp) || !(vesa_adp_info->v_flags & V_DAC8) 
 	    || vesa_bios_set_dac(8))
-		return (*prevvidsw.save_palette)(ad, palette);
+		return (*prevvidsw->save_palette)(adp, palette);
 
 	return vesa_bios_save_palette(0, 256, palette);
 }
 
 static int
-vesa_load_palette(int ad, u_char *palette)
+vesa_load_palette(video_adapter_t *adp, u_char *palette)
 {
-	if ((ad != vesa_adp->va_index) || !(vesa_adp_info->v_flags & V_DAC8) 
+	if ((adp != vesa_adp) || !(vesa_adp_info->v_flags & V_DAC8) 
 	    || vesa_bios_set_dac(8))
-		return (*prevvidsw.load_palette)(ad, palette);
+		return (*prevvidsw->load_palette)(adp, palette);
 
 	return vesa_bios_load_palette(0, 256, palette);
 }
 
 static int
-vesa_set_border(int ad, int color)
+vesa_set_border(video_adapter_t *adp, int color)
 {
-	return (*prevvidsw.set_border)(ad, color);
+	return (*prevvidsw->set_border)(adp, color);
 }
 
 static int
-vesa_save_state(int ad, void *p, size_t size)
+vesa_save_state(video_adapter_t *adp, void *p, size_t size)
 {
-	if (ad != vesa_adp->va_index)
-		return (*prevvidsw.save_state)(ad, p, size);
+	if (adp != vesa_adp)
+		return (*prevvidsw->save_state)(adp, p, size);
 
 	if (vesa_state_buf_size == 0)
 		vesa_state_buf_size = vesa_bios_state_buf_size();
@@ -699,18 +822,17 @@ vesa_save_state(int ad, void *p, size_t size)
 }
 
 static int
-vesa_load_state(int ad, void *p)
+vesa_load_state(video_adapter_t *adp, void *p)
 {
-	if ((ad != vesa_adp->va_index) 
-	    || (((adp_state_t *)p)->sig != V_STATE_SIG))
-		return (*prevvidsw.load_state)(ad, p);
+	if ((adp != vesa_adp) || (((adp_state_t *)p)->sig != V_STATE_SIG))
+		return (*prevvidsw->load_state)(adp, p);
 
 	return vesa_bios_save_restore(STATE_LOAD, ((adp_state_t *)p)->regs, 
 				      vesa_state_buf_size);
 }
 
 static int
-vesa_set_origin(int ad, off_t offset)
+vesa_set_origin(video_adapter_t *adp, off_t offset)
 {
 	struct vm86frame vmf;
 	int err;
@@ -721,8 +843,8 @@ vesa_set_origin(int ad, off_t offset)
 	 * error checking is kept minimal and let the VESA BIOS to 
 	 * detect error.
 	 */
-	if (ad != vesa_adp->va_index) 
-		return (*prevvidsw.set_win_org)(ad, offset);
+	if (adp != vesa_adp) 
+		return (*prevvidsw->set_win_org)(adp, offset);
 
 	if (vesa_adp->va_window_gran == 0)
 		return 1;
@@ -735,26 +857,45 @@ vesa_set_origin(int ad, off_t offset)
 }
 
 static int
-vesa_read_hw_cursor(int ad, int *col, int *row)
+vesa_read_hw_cursor(video_adapter_t *adp, int *col, int *row)
 {
-	return (*prevvidsw.read_hw_cursor)(ad, col, row);
+	return (*prevvidsw->read_hw_cursor)(adp, col, row);
 }
 
 static int
-vesa_set_hw_cursor(int ad, int col, int row)
+vesa_set_hw_cursor(video_adapter_t *adp, int col, int row)
 {
-	return (*prevvidsw.set_hw_cursor)(ad, col, row);
+	return (*prevvidsw->set_hw_cursor)(adp, col, row);
 }
 
 static int
-vesa_diag(int level)
+vesa_set_hw_cursor_shape(video_adapter_t *adp, int base, int height,
+			 int celsize, int blink)
 {
+	return (*prevvidsw->set_hw_cursor_shape)(adp, base, height, celsize,
+						 blink);
+}
+
+static int
+vesa_mmap(video_adapter_t *adp, vm_offset_t offset)
+{
+	return (*prevvidsw->mmap)(adp, offset);
+}
+
+static int
+vesa_diag(video_adapter_t *adp, int level)
+{
+#if VESA_DEBUG > 1
 	struct vesa_mode vmode;
 	int i;
+#endif
+
+	if (adp != vesa_adp)
+		return 1;
 
 #ifndef KLD_MODULE
 	/* call the previous handler first */
-	(*prevvidsw.diag)(level);
+	(*prevvidsw->diag)(adp, level);
 #endif
 
 	/* general adapter information */
@@ -784,6 +925,7 @@ vesa_diag(int level)
 			printf("VESA: %s\n", vesa_revstr);
 	}
 
+#if VESA_DEBUG > 1
 	/* mode information */
 	for (i = 0;
 		(i < (M_VESA_MODE_MAX - M_VESA_BASE + 1))
@@ -818,70 +960,31 @@ vesa_diag(int level)
 		printf("size:%dk, gran:%dk\n",
 		       vmode.v_wsize, vmode.v_wgran);
 	}
+#endif
 
 	return 0;
 }
 
 /* module loading */
 
-#ifdef KLD_MODULE
-static
-#endif
-int
+static int
 vesa_load(void)
 {
-	int adapters;
 	int error;
-#ifdef KLD_MODULE
 	int s;
-#endif
-	int i;
 
 	if (vesa_init_done)
 		return 0;
 
-	/*
-	 * If the VESA module is statically linked to the kernel, or
-	 * it has already been loaded, abort loading this module this time.
-	 */
-	vesa_adp = NULL;
-	adapters = (*biosvidsw.init)();
-	for (i = 0; i < adapters; ++i) {
-		if ((vesa_adp = (*biosvidsw.adapter)(i)) == NULL)
-			continue;
-		if (vesa_adp->va_flags & V_ADP_VESA)
-			return ENXIO;
-		if (vesa_adp->va_type == KD_VGA)
-			break;
-	}
-	/* if a VGA adapter is not found, abort */
-	if (i >= adapters)
-		return ENXIO;
-
-	if (vesa_bios_init())
-		return ENXIO;
-	vesa_adp->va_flags |= V_ADP_VESA;
-
-	/* remove conflicting modes if we have more than one adapter */
-	if (adapters > 1) {
-		vesa_clear_modes(vesa_vmode,
-				 (vesa_adp->va_flags & V_ADP_COLOR) ? 
-				     V_INFO_COLOR : 0);
-	}
-
-#ifdef KLD_MODULE
+	/* locate a VGA adapter */
 	s = spltty();
-#endif
-	if ((error = vesa_load_ioctl()) == 0) {
-		bcopy(&biosvidsw, &prevvidsw, sizeof(prevvidsw));
-		bcopy(&vesavidsw, &biosvidsw, sizeof(vesavidsw));
-		vesa_init_done = TRUE;
-	}
-#ifdef KLD_MODULE
+	vesa_adp = NULL;
+	error = vesa_configure(0);
 	splx(s);
 
+#ifdef KLD_MODULE
 	if (error == 0)
-		vesa_diag(bootverbose);
+		vesa_diag(vesa_adp, bootverbose);
 #endif
 
 	return error;
@@ -905,9 +1008,9 @@ vesa_unload(void)
 
 	s = spltty();
 	if ((error = vesa_unload_ioctl()) == 0) {
-		if (vesa_adp)
+		if (vesa_adp != NULL)
 			vesa_adp->va_flags &= ~V_ADP_VESA;
-		bcopy(&prevvidsw, &biosvidsw, sizeof(biosvidsw));
+		vidsw[vesa_adp->va_index] = prevvidsw;
 	}
 	splx(s);
 
@@ -934,8 +1037,13 @@ static moduledata_t vesa_mod = {
 	NULL,
 };
 
-DECLARE_MODULE(vesa, vesa_mod, SI_SUB_PSEUDO, SI_ORDER_MIDDLE);
+DECLARE_MODULE(vesa, vesa_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE);
+
+#else /* KLD_MODULE */
+
+SYSINIT(vesa, SI_SUB_DRIVERS, SI_ORDER_MIDDLE,
+	(void (*)(void *))vesa_load, NULL);
 
 #endif /* KLD_MODULE */
 
-#endif /* (NSC > 0 && VESA && VM86) || KLD_MODULE */
+#endif /* (NVGA > 0 && VESA && VM86) || KLD_MODULE */
diff --git a/sys/modules/syscons/blank/blank_saver.c b/sys/modules/syscons/blank/blank_saver.c
index 9ad6e3f0d698..89dd199815f5 100644
--- a/sys/modules/syscons/blank/blank_saver.c
+++ b/sys/modules/syscons/blank/blank_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.13 1998/09/17 19:40:29 sos Exp $
+ *	$Id: blank_saver.c,v 1.14 1998/11/04 03:49:38 peter Exp $
  */
 
 #include <sys/param.h>
@@ -33,18 +33,18 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 
+#include <dev/fb/vgareg.h>
+
 #include <i386/isa/isa.h>
 
 #include <saver.h>
 
-static void
-blank_saver(int blank)
+static int
+blank_saver(video_adapter_t *adp, int blank)
 {
 	u_char val;
 	if (blank) {
-		scrn_blanked = 1;
-		cur_console->status |= SAVER_RUNNING;
-		switch (crtc_type) {
+		switch (adp->va_type) {
 		case KD_VGA:
 			outb(TSIDX, 0x01); val = inb(TSREG);
 			outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
@@ -53,18 +53,18 @@ blank_saver(int blank)
 			/* not yet done XXX */
 			break;
 		case KD_CGA:
-			outb(crtc_addr + 4, 0x25);
+			outb(adp->va_crtc_addr + 4, 0x25);
 			break;
 		case KD_MONO:
 		case KD_HERCULES:
-			outb(crtc_addr + 4, 0x21);
+			outb(adp->va_crtc_addr + 4, 0x21);
 			break;
 		default:
 			break;
 		}
 	}
 	else {
-		switch (crtc_type) {
+		switch (adp->va_type) {
 		case KD_VGA:
 			outb(TSIDX, 0x01); val = inb(TSREG);
 			outb(TSIDX, 0x01); outb(TSREG, val & 0xDF);
@@ -73,24 +73,23 @@ blank_saver(int blank)
 			/* not yet done XXX */
 			break;
 		case KD_CGA:
-			outb(crtc_addr + 4, 0x2d);
+			outb(adp->va_crtc_addr + 4, 0x2d);
 			break;
 		case KD_MONO:
 		case KD_HERCULES:
-			outb(crtc_addr + 4, 0x29);
+			outb(adp->va_crtc_addr + 4, 0x29);
 			break;
 		default:
 			break;
 		}
-		cur_console->status &= ~SAVER_RUNNING;
-		scrn_blanked = 0;
 	}
+	return 0;
 }
 
 static int
-blank_saver_load(void)
+blank_init(video_adapter_t *adp)
 {
-	switch (crtc_type) {
+	switch (adp->va_type) {
 	case KD_MONO:
 	case KD_HERCULES:
 	case KD_CGA:
@@ -101,13 +100,17 @@ blank_saver_load(void)
 	default:
 		return ENODEV;
 	}
-	return add_scrn_saver(blank_saver);
+	return 0;
 }
 
 static int
-blank_saver_unload(void)
+blank_term(video_adapter_t *adp)
 {
-	return remove_scrn_saver(blank_saver);
+	return 0;
 }
 
-SAVER_MODULE(blank_saver);
+static scrn_saver_t blank_module = {
+	"blank_saver", blank_init, blank_term, blank_saver, NULL,
+};
+
+SAVER_MODULE(blank_saver, blank_module);
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index d3f9036cb420..8e45a723c03a 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.11 1998/09/17 19:40:30 sos Exp $
+ *	$Id: daemon_saver.c,v 1.12 1998/11/04 03:49:38 peter Exp $
  */
 
 #include <sys/param.h>
@@ -49,6 +49,7 @@
 static char *message;
 static int messagelen;
 static u_short *window;
+static int blanked;
 
 /* Who is the author of this ASCII pic? */
 
@@ -184,8 +185,8 @@ draw_string(int xpos, int ypos, int xoff, char *s, int len)
 			scr_map[s[x]]|(FG_LIGHTGREEN|BG_BLACK)<<8;
 }
 
-static void
-daemon_saver(int blank)
+static int
+daemon_saver(video_adapter_t *adp, int blank)
 {
 	static int txpos = 10, typos = 10;
 	static int txdir = -1, tydir = -1;
@@ -198,20 +199,19 @@ daemon_saver(int blank)
 	int min, max;
 
 	if (blank) {
-		if (!ISTEXTSC(scp))
-			return;
-		if (scrn_blanked == 0) {
-			scp->status |= SAVER_RUNNING;
-			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
+		if (adp->va_mode_flags & V_INFO_GRAPHICS)
+			return ENODEV;
+		if (blanked == 0) {
+			window = (u_short *)adp->va_window;
 			/* clear the screen and set the border color */
 			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
 			      window, scp->xsize * scp->ysize);
 			set_border(scp, 0);
 			xlen = ylen = tlen = 0;
 		}
-		if (scrn_blanked++ < 2)
-			return;
-		scrn_blanked = 1;
+		if (blanked++ < 2)
+			return 0;
+		blanked = 1;
 
  		clear_daemon(dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
 		clear_string(txpos, typos, toff, (char *)message, tlen);
@@ -322,39 +322,31 @@ daemon_saver(int blank)
  		draw_daemon(dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
 		draw_string(txpos, typos, toff, (char *)message, tlen);
 	} else {
-		if (scrn_blanked > 0) {
-			set_border(scp, scp->border);
-			scrn_blanked = 0;
-			scp->status &= ~SAVER_RUNNING;
-		}
+		blanked = 0;
 	}
+	return 0;
 }
 
 static int
-daemon_saver_load(void)
+daemon_init(video_adapter_t *adp)
 {
-	int err;
-
 	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
 	    strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s - %s %s", hostname, ostype, osrelease);
-
-	err = add_scrn_saver(daemon_saver);
-	if (err != 0)
-		free(message, M_DEVBUF);
-	return err;
+	blanked = 0;
+	return 0;
 }
 
 static int
-daemon_saver_unload(void)
+daemon_term(video_adapter_t *adp)
 {
-	int err;
-
-	err = remove_scrn_saver(daemon_saver);
-	if (err == 0)
-		free(message, M_DEVBUF);
-	return err;
+	free(message, M_DEVBUF);
+	return 0;
 }
 
-SAVER_MODULE(daemon_saver);
+static scrn_saver_t daemon_module = {
+	"daemon_saver", daemon_init, daemon_term, daemon_saver, NULL,
+};
+
+SAVER_MODULE(daemon_saver, daemon_module);
diff --git a/sys/modules/syscons/fade/fade_saver.c b/sys/modules/syscons/fade/fade_saver.c
index 3a2cc0c6f50b..70d36c9c1e0c 100644
--- a/sys/modules/syscons/fade/fade_saver.c
+++ b/sys/modules/syscons/fade/fade_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.14 1998/09/17 19:40:30 sos Exp $
+ *	$Id: fade_saver.c,v 1.15 1998/11/04 03:49:38 peter Exp $
  */
 
 #include <sys/param.h>
@@ -37,18 +37,22 @@
 
 #include <saver.h>
 
-static void
-fade_saver(int blank)
+static u_char palette[256*3];
+static int blanked;
+
+static int
+fade_saver(video_adapter_t *adp, int blank)
 {
 	static int count = 0;
 	u_char pal[256*3];
 	int i;
 
 	if (blank) {
-		scrn_blanked = 1;
-		cur_console->status |= SAVER_RUNNING;
-		switch (crtc_type) {
+		blanked = TRUE;
+		switch (adp->va_type) {
 		case KD_VGA:
+			if (count <= 0)
+				save_palette(adp, palette);
 			if (count < 64) {
 				pal[0] = pal[1] = pal[2] = 0;
 				for (i = 3; i < 256*3; i++) {
@@ -57,7 +61,7 @@ fade_saver(int blank)
 					else
 						pal[i] = 60;
 				}
-				load_palette(cur_console, pal);
+				load_palette(adp, pal);
 				count++;
 			}
 			break;
@@ -65,44 +69,44 @@ fade_saver(int blank)
 			/* not yet done XXX */
 			break;
 		case KD_CGA:
-			outb(crtc_addr + 4, 0x25);
+			outb(adp->va_crtc_addr + 4, 0x25);
 			break;
 		case KD_MONO:
 		case KD_HERCULES:
-			outb(crtc_addr + 4, 0x21);
+			outb(adp->va_crtc_addr + 4, 0x21);
 			break;
 		default:
 			break;
 		}
 	}
 	else {
-		switch (crtc_type) {
+		switch (adp->va_type) {
 		case KD_VGA:
-			load_palette(cur_console, palette);
+			load_palette(adp, palette);
 			count = 0;
 			break;
 		case KD_EGA:
 			/* not yet done XXX */
 			break;
 		case KD_CGA:
-			outb(crtc_addr + 4, 0x2d);
+			outb(adp->va_crtc_addr + 4, 0x2d);
 			break;
 		case KD_MONO:
 		case KD_HERCULES:
-			outb(crtc_addr + 4, 0x29);
+			outb(adp->va_crtc_addr + 4, 0x29);
 			break;
 		default:
 			break;
 		}
-		cur_console->status &= ~SAVER_RUNNING;
-		scrn_blanked = 0;
+		blanked = FALSE;
 	}
+	return 0;
 }
 
 static int
-fade_saver_load(void)
+fade_init(video_adapter_t *adp)
 {
-	switch (crtc_type) {
+	switch (adp->va_type) {
 	case KD_MONO:
 	case KD_HERCULES:
 	case KD_CGA:
@@ -117,13 +121,18 @@ fade_saver_load(void)
 	default:
 		return ENODEV;
 	}
-	return add_scrn_saver(fade_saver);
+	blanked = FALSE;
+	return 0;
 }
 
 static int
-fade_saver_unload(void)
+fade_term(video_adapter_t *adp)
 {
-	return remove_scrn_saver(fade_saver);
+	return 0;
 }
 
-SAVER_MODULE(fade_saver);
+static scrn_saver_t fade_module = {
+	"fade_saver", fade_init, fade_term, fade_saver, NULL,
+};
+
+SAVER_MODULE(fade_saver, fade_module);
diff --git a/sys/modules/syscons/green/green_saver.c b/sys/modules/syscons/green/green_saver.c
index 0491c67dbe14..9decd7282f9f 100644
--- a/sys/modules/syscons/green/green_saver.c
+++ b/sys/modules/syscons/green/green_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.13 1998/09/17 19:40:30 sos Exp $
+ *	$Id: green_saver.c,v 1.14 1998/11/04 03:49:38 peter Exp $
  */
 
 #include <sys/param.h>
@@ -33,18 +33,21 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 
+#include <dev/fb/vgareg.h>
+
 #include <i386/isa/isa.h>
 
 #include <saver.h>
 
-static void
-green_saver(int blank)
+static int
+green_saver(video_adapter_t *adp, int blank)
 {
+	int crtc_addr;
 	u_char val;
+
+	crtc_addr = adp->va_crtc_addr;
 	if (blank) {
-		scrn_blanked = 1;
-		cur_console->status |= SAVER_RUNNING;
-		switch (crtc_type) {
+		switch (adp->va_type) {
 		case KD_VGA:
 			outb(TSIDX, 0x01); val = inb(TSREG);
 			outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
@@ -66,7 +69,7 @@ green_saver(int blank)
 		}
 	}
 	else {
-		switch (crtc_type) {
+		switch (adp->va_type) {
 		case KD_VGA:
 			outb(TSIDX, 0x01); val = inb(TSREG);
 			outb(TSIDX, 0x01); outb(TSREG, val & 0xDF);
@@ -86,15 +89,14 @@ green_saver(int blank)
 		default:
 			break;
 		}
-		cur_console->status &= ~SAVER_RUNNING;
-		scrn_blanked = 0;
 	}
+	return 0;
 }
 
 static int
-green_saver_load(void)
+green_init(video_adapter_t *adp)
 {
-	switch (crtc_type) {
+	switch (adp->va_type) {
 	case KD_MONO:
 	case KD_HERCULES:
 	case KD_CGA:
@@ -109,13 +111,17 @@ green_saver_load(void)
 	default:
 		return ENODEV;
 	}
-	return add_scrn_saver(green_saver);
+	return 0;
 }
 
 static int
-green_saver_unload(void)
+green_term(video_adapter_t *adp)
 {
-	return remove_scrn_saver(green_saver);
+	return 0;
 }
 
-SAVER_MODULE(green_saver);
+static scrn_saver_t green_module = {
+	"green_saver", green_init, green_term, green_saver, NULL,
+};
+
+SAVER_MODULE(green_saver, green_module);
diff --git a/sys/modules/syscons/logo/logo_saver.c b/sys/modules/syscons/logo/logo_saver.c
index ff42be0f3569..105fcae16e8c 100644
--- a/sys/modules/syscons/logo/logo_saver.c
+++ b/sys/modules/syscons/logo/logo_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: logo_saver.c,v 1.1 1998/12/28 14:22:57 des Exp $
+ *	$Id: logo_saver.c,v 1.2 1999/01/01 14:40:49 des Exp $
  */
 
 #include <sys/param.h>
@@ -34,26 +34,24 @@
 #include <sys/module.h>
 #include <sys/syslog.h>
 
-#include <machine/md_var.h>
-
 #include <saver.h>
 
 static u_char *vid;
 static int banksize, scrmode, scrw, scrh;
-static u_char save_pal[768];
+static int blanked;
 
 #include "logo.c"
 
-#define set_origin(scp, o) (*biosvidsw.set_win_org)((scp)->adp, o)
+#define set_origin(adp, o) (*vidsw[(adp)->va_index]->set_win_org)(adp, o)
 
 static void
-logo_blit(int x, int y)
+logo_blit(video_adapter_t *adp, int x, int y)
 {
     int d, l, o, p;
     
     for (o = 0, p = y * scrw + x; p > banksize; p -= banksize)
 	o += banksize;
-    set_origin(cur_console, o);
+    set_origin(adp, o);
 
     for (d = 0; d < sizeof logo_img; d += logo_w) {
 	if (p + logo_w < banksize) {
@@ -62,12 +60,12 @@ logo_blit(int x, int y)
 	} else if (p < banksize) {
 	    l = banksize - p;
 	    bcopy(logo_img + d, vid + p, l);
-	    set_origin(cur_console, (o += banksize));
+	    set_origin(adp, (o += banksize));
 	    bcopy(logo_img + d + l, vid, logo_w - l);
 	    p += scrw - banksize;
 	} else {
 	    p -= banksize;
-	    set_origin(cur_console, (o += banksize));
+	    set_origin(adp, (o += banksize));
 	    bcopy(logo_img + d, vid + p, logo_w);
 	    p += scrw;
 	}
@@ -75,7 +73,7 @@ logo_blit(int x, int y)
 }
 
 static void
-logo_update(void)
+logo_update(video_adapter_t *adp)
 {
     static int xpos = 0, ypos = 0;
     static int xinc = 1, yinc = 1;
@@ -89,62 +87,42 @@ logo_update(void)
     ypos += yinc;
 	
     /* XXX Relies on margin around logo to erase trail */
-    logo_blit(xpos, ypos);
+    logo_blit(adp, xpos, ypos);
 }
 
-static void
-logo_saver(int blank)
+static int
+logo_saver(video_adapter_t *adp, int blank)
 {
-    scr_stat *scp = cur_console;
-    static int saved_mode;
     int i, pl;
 
     if (blank) {
 	/* switch to graphics mode */
-	if (scrn_blanked <= 0) {
+	if (blanked <= 0) {
 	    pl = splhigh();
-	    saved_mode = scp->mode;
-	    scp->mode = scrmode;
-	    scp->status |= SAVER_RUNNING|GRAPHICS_MODE;
-	    save_palette(scp, (char *)save_pal);
-	    set_mode(scp);
-	    load_palette(scp, (char *)logo_pal);
-	    scrn_blanked++;
-	    vid = (u_char *)Crtat;
+	    set_video_mode(adp, scrmode, logo_pal, 0);
+	    blanked++;
+	    vid = (u_char *)adp->va_window;
 	    splx(pl);
 	    for (i = 0; i < scrw*scrh; i += banksize) {
-		set_origin(scp, i);
+		set_origin(adp, i);
 		bzero(vid, banksize);
 	    }
 	}
-	logo_update();
+	logo_update(adp);
     } else {
-	/* return to previous video mode */
-	if (scrn_blanked > 0) {
-	    if (saved_mode) {
-		pl = splhigh();
-		scrn_blanked = 0;
-		scp->mode = saved_mode;
-		scp->status &= ~(SAVER_RUNNING|GRAPHICS_MODE);
-		set_mode(scp);
-		load_palette(scp, (char *)save_pal);
-		saved_mode = 0;
-		splx(pl);
-	    }
-	}
+	blanked = 0;
     }
+    return 0;
 }
 
 static int
-logo_saver_load(void)
+logo_init(video_adapter_t *adp)
 {
     video_info_t info;
-    int adp;
     
-    adp = cur_console->adp;
-    if (!(*biosvidsw.get_info)(adp, M_VESA_CG800x600, &info)) {
+    if (!get_mode_info(adp, M_VESA_CG800x600, &info)) {
 	scrmode = M_VESA_CG800x600;
-    } else if (!(*biosvidsw.get_info)(adp, M_VGA_CG320, &info)) {
+    } else if (!get_mode_info(adp, M_VGA_CG320, &info)) {
 	scrmode = M_VGA_CG320;
     } else {
         log(LOG_NOTICE, "logo_saver: no suitable graphics mode\n");
@@ -154,14 +132,19 @@ logo_saver_load(void)
     banksize = info.vi_window_size;
     scrw = info.vi_width;
     scrh = info.vi_height;
+    blanked = 0;
     
-    return add_scrn_saver(logo_saver);
+    return 0;
 }
 
 static int
-logo_saver_unload(void)
+logo_term(video_adapter_t *adp)
 {
-    return remove_scrn_saver(logo_saver);
+    return 0;
 }
 
-SAVER_MODULE(logo_saver);
+static scrn_saver_t logo_module = {
+    "logo_saver", logo_init, logo_term, logo_saver, NULL,
+};
+
+SAVER_MODULE(logo_saver, logo_module);
diff --git a/sys/modules/syscons/rain/rain_saver.c b/sys/modules/syscons/rain/rain_saver.c
index 0ca46c8accb3..0b4b2ee3e9e2 100644
--- a/sys/modules/syscons/rain/rain_saver.c
+++ b/sys/modules/syscons/rain/rain_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: rain_saver.c,v 1.1 1998/12/31 13:41:40 des Exp $
  */
 
 #include <sys/param.h>
@@ -34,7 +34,6 @@
 #include <sys/module.h>
 #include <sys/syslog.h>
 
-#include <machine/md_var.h>
 #include <machine/random.h>
 
 #include <saver.h>
@@ -45,11 +44,11 @@ static u_char *vid;
 #define SCRH 200
 #define MAX 63
 
-static u_char save_pal[768];
 static u_char rain_pal[768];
+static int blanked;
 
 static void
-rain_update(void)
+rain_update(video_adapter_t *adp)
 {
     int i, t;
 
@@ -57,28 +56,21 @@ rain_update(void)
     for (i = (MAX*3+2); i > 5; i -= 3)
 	rain_pal[i] = rain_pal[i-3];
     rain_pal[5] = t;
-    load_palette(cur_console, rain_pal);
+    load_palette(adp, rain_pal);
 }
 
-static void
-rain_saver(int blank)
+static int
+rain_saver(video_adapter_t *adp, int blank)
 {
-    scr_stat *scp = cur_console;
-    static int saved_mode;
     int i, j, k, pl;
 
     if (blank) {
 	/* switch to graphics mode */
-	if (scrn_blanked <= 0) {
+	if (blanked <= 0) {
 	    pl = splhigh();
-	    saved_mode = scp->mode;
-	    scp->mode = M_VGA_CG320;
-	    scp->status |= SAVER_RUNNING|GRAPHICS_MODE;
-	    save_palette(scp, save_pal);
-	    set_mode(scp);
-	    load_palette(scp, rain_pal);
-	    scrn_blanked++;
-	    vid = (u_char *)Crtat;
+	    set_video_mode(adp, M_VGA_CG320, rain_pal, 0);
+	    blanked++;
+	    vid = (u_char *)adp->va_window;
 	    splx(pl);
 	    bzero(vid, SCRW*SCRH);
 	    for (i = 0; i < SCRW; i += 2)
@@ -89,33 +81,22 @@ rain_saver(int blank)
 	}
 
 	/* update display */
-	rain_update();
+	rain_update(adp);
 	
     } else {
-	/* return to previous video mode */
-	if (scrn_blanked > 0) {
-	    if (saved_mode) {
-		pl = splhigh();
-		scrn_blanked = 0;
-		scp->mode = saved_mode;
-		scp->status &= ~(SAVER_RUNNING|GRAPHICS_MODE);
-		set_mode(scp);
-		load_palette(scp, save_pal);
-		saved_mode = 0;
-		splx(pl);
-	    }
-	}
+	blanked = 0;
     }
+    return 0;
 }
 
 static int
-rain_saver_load(void)
+rain_init(video_adapter_t *adp)
 {
     video_info_t info;
     int i;
 
     /* check that the console is capable of running in 320x200x256 */
-    if ((*biosvidsw.get_info)(cur_console->adp, M_VGA_CG320, &info)) {
+    if (get_mode_info(adp, M_VGA_CG320, &info)) {
         log(LOG_NOTICE, "rain_saver: the console does not support M_VGA_CG320\n");
 	return ENODEV;
     }
@@ -123,14 +104,20 @@ rain_saver_load(void)
     /* intialize the palette */
     for (i = 3; i < (MAX+1)*3; i += 3)
 	rain_pal[i+2] = rain_pal[i-1] + 4;
-	    
-    return add_scrn_saver(rain_saver);
+
+    blanked = 0;
+
+    return 0;
 }
 
 static int
-rain_saver_unload(void)
+rain_term(video_adapter_t *adp)
 {
-    return remove_scrn_saver(rain_saver);
+    return 0;
 }
 
-SAVER_MODULE(rain_saver);
+static scrn_saver_t rain_module = {
+    "rain_saver", rain_init, rain_term, rain_saver, NULL,
+};
+
+SAVER_MODULE(rain_saver, rain_module);
diff --git a/sys/modules/syscons/saver.h b/sys/modules/syscons/saver.h
index 6be8a7010143..6e4c8f532a84 100644
--- a/sys/modules/syscons/saver.h
+++ b/sys/modules/syscons/saver.h
@@ -25,40 +25,24 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: saver.h,v 1.13 1998/11/04 03:49:38 peter Exp $
+ *	$Id: saver.h,v 1.14 1998/12/31 13:40:26 des Exp $
  */
 #include <machine/apm_bios.h>
 #include <machine/console.h>
 
-#include <i386/isa/videoio.h>
-#include <i386/isa/syscons.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
 
+#include <dev/syscons/syscons.h>
+
+#define set_video_mode(adp, mode, pal, border)				\
+	{								\
+		(*vidsw[(adp)->va_index]->set_mode)((adp), (mode));	\
+		(*vidsw[(adp)->va_index]->load_palette)((adp), (pal));	\
+		(*vidsw[(adp)->va_index]->set_border)((adp), (border));	\
+	}
+#define get_mode_info(adp, mode, buf)					\
+	(*vidsw[(adp)->va_index]->get_info)((adp), (mode), (buf))
+	
 extern scr_stat	*cur_console;
-extern u_short	*Crtat;
-extern u_int	crtc_addr;
-extern char	crtc_type;
 extern char	scr_map[];
-extern int	scrn_blanked;
-extern int	fonts_loaded;
-extern char	font_8[], font_14[], font_16[];
-extern char	palette[];
-
-#define SAVER_MODULE(name) \
-	static int name ## _modevent(module_t mod, int type, void *data) \
-	{ \
-		switch ((modeventtype_t)type) { \
-		case MOD_LOAD: \
-			return name ## _load(); \
-		case MOD_UNLOAD: \
-			return name ## _unload(); \
-		default: \
-			break; \
-		} \
-		return 0; \
-	} \
-	static moduledata_t name ## _mod = { \
-		#name, \
-		name ## _modevent, \
-		NULL \
-	}; \
-	DECLARE_MODULE(name, name ## _mod, SI_SUB_PSEUDO, SI_ORDER_MIDDLE)
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index 3100ff3038d5..c7c9ff59f925 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.19 1998/09/17 19:40:30 sos Exp $
+ *	$Id: snake_saver.c,v 1.20 1998/11/04 03:49:39 peter Exp $
  */
 
 #include <sys/param.h>
@@ -44,9 +44,10 @@ static char	*message;
 static u_char	**messagep;
 static int	messagelen;
 static u_short	*window;
+static int	blanked;
 
-static void
-snake_saver(int blank)
+static int
+snake_saver(video_adapter_t *adp, int blank)
 {
 	static int	dirx, diry;
 	int		f;
@@ -57,12 +58,11 @@ snake_saver(int blank)
 #define	savs	messagep
 
 	if (blank) {
-		if (!ISTEXTSC(scp))
-			return;
-		if (scrn_blanked <= 0) {
-			scp->status |= SAVER_RUNNING;
-			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
-			fillw((FG_LIGHTGREY|BG_BLACK)<<8 | scr_map[0x20],
+		if (adp->va_mode_flags & V_INFO_GRAPHICS)
+			return ENODEV;
+		if (blanked <= 0) {
+			window = (u_short *)adp->va_window;
+			fillw(((FG_LIGHTGREY|BG_BLACK)<<8) | scr_map[0x20],
 			      window, scp->xsize * scp->ysize);
 			set_border(scp, 0);
 			dirx = (scp->xpos ? 1 : -1);
@@ -72,16 +72,11 @@ snake_saver(int blank)
 				savs[f] = (u_char *)window + 2 *
 					  (scp->xpos+scp->ypos*scp->xsize);
 			*(savs[0]) = scr_map[*save];
-			f = scp->ysize * scp->xsize + 5;
-			outb(crtc_addr, 14);
-			outb(crtc_addr+1, f >> 8);
-			outb(crtc_addr, 15);
-			outb(crtc_addr+1, f & 0xff);
-			scrn_blanked = 1;
+			blanked = 1;
 		}
-		if (scrn_blanked++ < 4)
-			return;
-		scrn_blanked = 1;
+		if (blanked++ < 4)
+			return 0;
+		blanked = 1;
 		*(savs[messagelen-1]) = scr_map[0x20];
 		for (f=messagelen-1; f > 0; f--)
 			savs[f] = savs[f-1];
@@ -99,43 +94,31 @@ snake_saver(int blank)
 			*(savs[f]) = scr_map[save[f]];
 	}
 	else {
-		if (scrn_blanked > 0) {
-			set_border(scp, scp->border);
-			scrn_blanked = 0;
-			scp->status &= ~SAVER_RUNNING;
-		}
+		blanked = 0;
 	}
+	return 0;
 }
 
 static int
-snake_saver_load(void)
+snake_init(video_adapter_t *adp)
 {
-	int err;
-
 	messagelen = strlen(ostype) + 1 + strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s %s", ostype, osrelease);
 	messagep = malloc(messagelen * sizeof *messagep, M_DEVBUF, M_WAITOK);
-
-	err = add_scrn_saver(snake_saver);
-	if (err != 0) {
-		free(message, M_DEVBUF);
-		free(messagep, M_DEVBUF);
-	}
-	return err;
+	return 0;
 }
 
 static int
-snake_saver_unload(void)
+snake_term(video_adapter_t *adp)
 {
-	int err;
-
-	err = remove_scrn_saver(snake_saver);
-	if (err == 0) {
-		free(message, M_DEVBUF);
-		free(messagep, M_DEVBUF);
-	}
-	return err;
+	free(message, M_DEVBUF);
+	free(messagep, M_DEVBUF);
+	return 0;
 }
 
-SAVER_MODULE(snake_saver);
+static scrn_saver_t snake_module = {
+	"snake_saver", snake_init, snake_term, snake_saver, NULL,
+};
+
+SAVER_MODULE(snake_saver, snake_module);
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 719d502ec699..ca4b588004b9 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.16 1998/09/17 19:40:30 sos Exp $
+ *	$Id: star_saver.c,v 1.17 1998/11/04 03:49:39 peter Exp $
  */
 
 #include <sys/param.h>
@@ -41,13 +41,14 @@
 #define NUM_STARS	50
 
 static u_short *window;
+static int blanked;
 
 /*
  * Alternate saver that got its inspiration from a well known utility
  * package for an inferior^H^H^H^H^H^Hfamous OS.
  */
-static void
-star_saver(int blank)
+static int
+star_saver(video_adapter_t *adp, int blank)
 {
 	scr_stat	*scp = cur_console;
 	int		cell, i;
@@ -57,15 +58,15 @@ star_saver(int blank)
 	static u_short 	stars[NUM_STARS][2];
 
 	if (blank) {
-		if (!ISTEXTSC(scp))
-			return;
-		if (scrn_blanked <= 0) {
-			scp->status |= SAVER_RUNNING;
-			window = (u_short *)(*biosvidsw.adapter)(scp->adp)->va_window;
-			scrn_blanked = 1;
-			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], window,
-			      scp->xsize * scp->ysize);
+		if (adp->va_mode_flags & V_INFO_GRAPHICS)
+			return ENODEV;
+		if (!blanked) {
+			window = (u_short *)adp->va_window;
+			/* clear the screen and set the border color */
+			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
+			      window, scp->xsize * scp->ysize);
 			set_border(scp, 0);
+			blanked = TRUE;
 			for(i=0; i<NUM_STARS; i++) {
 				stars[i][0] =
 					random() % (scp->xsize*scp->ysize);
@@ -82,24 +83,26 @@ star_saver(int blank)
 		}
 	}
 	else {
-		if (scrn_blanked > 0) {
-			set_border(scp, scp->border);
-			scrn_blanked = 0;
-			scp->status &= ~SAVER_RUNNING;
-		}
+		blanked = FALSE;
 	}
+	return 0;
 }
 
 static int
-star_saver_load(void)
+star_init(video_adapter_t *adp)
 {
-	return add_scrn_saver(star_saver);
+	blanked = FALSE;
+	return 0;
 }
 
 static int
-star_saver_unload(void)
+star_term(video_adapter_t *adp)
 {
-	return remove_scrn_saver(star_saver);
+	return 0;
 }
 
-SAVER_MODULE(star_saver);
+static scrn_saver_t star_module = {
+	"star_saver", star_init, star_term, star_saver, NULL,
+};
+
+SAVER_MODULE(star_saver, star_module);
diff --git a/sys/modules/syscons/warp/warp_saver.c b/sys/modules/syscons/warp/warp_saver.c
index e84f1ada05ae..ef0afa2bebfa 100644
--- a/sys/modules/syscons/warp/warp_saver.c
+++ b/sys/modules/syscons/warp/warp_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: warp_saver.c,v 1.2 1998/12/28 14:20:13 des Exp $
+ *	$Id: warp_saver.c,v 1.3 1998/12/31 13:38:59 des Exp $
  */
 
 #include <sys/param.h>
@@ -40,6 +40,7 @@
 #include <saver.h>
 
 static u_char *vid;
+static int blanked;
 
 #define SCRW 320
 #define SCRH 200
@@ -47,7 +48,6 @@ static u_char *vid;
 #define STARS (SPP*(1+2+4+8))
 
 static int star[STARS];
-static u_char save_pal[768];
 static u_char warp_pal[768] = {
     0x00, 0x00, 0x00,
     0x66, 0x66, 0x66,
@@ -72,25 +72,18 @@ warp_update(void)
 	}
 }
 
-static void
-warp_saver(int blank)
+static int
+warp_saver(video_adapter_t *adp, int blank)
 {
-    scr_stat *scp = cur_console;
-    static int saved_mode;
     int pl;
 
     if (blank) {
 	/* switch to graphics mode */
-	if (scrn_blanked <= 0) {
+	if (blanked <= 0) {
 	    pl = splhigh();
-	    saved_mode = scp->mode;
-	    scp->mode = M_VGA_CG320;
-	    scp->status |= SAVER_RUNNING|GRAPHICS_MODE;
-	    save_palette(scp, save_pal);
-	    set_mode(scp);
-	    load_palette(scp, warp_pal);
-	    scrn_blanked++;
-	    vid = (u_char *)Crtat;
+	    set_video_mode(adp, M_VGA_CG320, warp_pal, 0);
+	    blanked++;
+	    vid = (u_char *)adp->va_window;
 	    splx(pl);
 	    bzero(vid, SCRW*SCRH);
 	}
@@ -99,30 +92,19 @@ warp_saver(int blank)
 	warp_update();
 	
     } else {
-	/* return to previous video mode */
-	if (scrn_blanked > 0) {
-	    if (saved_mode) {
-		pl = splhigh();
-		scrn_blanked = 0;
-		scp->mode = saved_mode;
-		scp->status &= ~(SAVER_RUNNING|GRAPHICS_MODE);
-		set_mode(scp);
-		load_palette(scp, save_pal);
-		saved_mode = 0;
-		splx(pl);
-	    }
-	}
+	blanked = 0;
     }
+    return 0;
 }
 
 static int
-warp_saver_load(void)
+warp_init(video_adapter_t *adp)
 {
     video_info_t info;
     int i;
 
     /* check that the console is capable of running in 320x200x256 */
-    if ((*biosvidsw.get_info)(cur_console->adp, M_VGA_CG320, &info)) {
+    if (get_mode_info(adp, M_VGA_CG320, &info)) {
         log(LOG_NOTICE, "warp_saver: the console does not support M_VGA_CG320\n");
 	return ENODEV;
     }
@@ -132,13 +114,19 @@ warp_saver_load(void)
 	star[i] = random() % (SCRW*SCRH);
     }
     
-    return add_scrn_saver(warp_saver);
+    blanked = 0;
+
+    return 0;
 }
 
 static int
-warp_saver_unload(void)
+warp_term(video_adapter_t *adp)
 {
-    return remove_scrn_saver(warp_saver);
+    return 0;
 }
 
-SAVER_MODULE(warp_saver);
+static scrn_saver_t warp_module = {
+    "warp_saver", warp_init, warp_term, warp_saver, NULL,
+};
+
+SAVER_MODULE(warp_saver, warp_module);
diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile
index a44334c22ddc..6de1c879120c 100644
--- a/sys/modules/vesa/Makefile
+++ b/sys/modules/vesa/Makefile
@@ -1,18 +1,32 @@
-#	$Id: Makefile,v 1.3 1998/10/16 04:30:51 peter Exp $
+#	$Id: Makefile,v 1.4 1998/12/30 11:21:07 yokota Exp $
 
-.PATH:	${.CURDIR}/../../i386/isa
+.PATH:	${.CURDIR}/../../dev/syscons ${.CURDIR}/../../i386/isa
 KMOD	=	vesa
-SRCS	=	vesa.c scvesactl.c sc.h opt_vesa.h opt_vm86.h
+SRCS	=	vesa.c scvesactl.c sc.h vga.h opt_syscons.h opt_vga.h \
+		opt_vesa.h opt_vm86.h opt_fb.h
 NOMAN	=
-CLEANFILES +=	sc.h opt_vesa.h opt_vm86.h
+CLEANFILES +=	sc.h vga.h opt_syscons.h opt_vga.h opt_vesa.h opt_vm86.h \
+		opt_fb.h
 
 sc.h:
 	echo "#define NSC 1" > sc.h
 
+vga.h:
+	echo "#define NVGA 1" > vga.h
+
+opt_syscons.h:
+	touch opt_syscons.h
+
+opt_vga.h:
+	touch opt_vga.h
+
 opt_vesa.h:
 	echo "#define VESA 1" > opt_vesa.h
 
 opt_vm86.h:
 	echo "#define VM86 1" > opt_vm86.h
 
+opt_fb.h:
+	touch opt_fb.h
+
 .include <bsd.kmod.mk>
-- 
cgit v1.3


From f9e730bbb343d0a6aff3a9d4a7ea18dc1cf3ddc5 Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Sun, 17 Jan 1999 14:25:19 +0000
Subject: Retrun EAGAIN if the current video mode is a graphics mode.

---
 sys/dev/syscons/daemon/daemon_saver.c     | 4 ++--
 sys/dev/syscons/snake/snake_saver.c       | 4 ++--
 sys/dev/syscons/star/star_saver.c         | 4 ++--
 sys/modules/syscons/daemon/daemon_saver.c | 4 ++--
 sys/modules/syscons/snake/snake_saver.c   | 4 ++--
 sys/modules/syscons/star/star_saver.c     | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 8e45a723c03a..09f6caf36189 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.12 1998/11/04 03:49:38 peter Exp $
+ *	$Id: daemon_saver.c,v 1.13 1999/01/11 03:18:45 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -200,7 +200,7 @@ daemon_saver(video_adapter_t *adp, int blank)
 
 	if (blank) {
 		if (adp->va_mode_flags & V_INFO_GRAPHICS)
-			return ENODEV;
+			return EAGAIN;
 		if (blanked == 0) {
 			window = (u_short *)adp->va_window;
 			/* clear the screen and set the border color */
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index c7c9ff59f925..642e6b15b309 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.20 1998/11/04 03:49:39 peter Exp $
+ *	$Id: snake_saver.c,v 1.21 1999/01/11 03:18:52 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -59,7 +59,7 @@ snake_saver(video_adapter_t *adp, int blank)
 
 	if (blank) {
 		if (adp->va_mode_flags & V_INFO_GRAPHICS)
-			return ENODEV;
+			return EAGAIN;
 		if (blanked <= 0) {
 			window = (u_short *)adp->va_window;
 			fillw(((FG_LIGHTGREY|BG_BLACK)<<8) | scr_map[0x20],
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index ca4b588004b9..463a0ae0f3f8 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.17 1998/11/04 03:49:39 peter Exp $
+ *	$Id: star_saver.c,v 1.18 1999/01/11 03:18:53 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -59,7 +59,7 @@ star_saver(video_adapter_t *adp, int blank)
 
 	if (blank) {
 		if (adp->va_mode_flags & V_INFO_GRAPHICS)
-			return ENODEV;
+			return EAGAIN;
 		if (!blanked) {
 			window = (u_short *)adp->va_window;
 			/* clear the screen and set the border color */
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index 8e45a723c03a..09f6caf36189 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.12 1998/11/04 03:49:38 peter Exp $
+ *	$Id: daemon_saver.c,v 1.13 1999/01/11 03:18:45 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -200,7 +200,7 @@ daemon_saver(video_adapter_t *adp, int blank)
 
 	if (blank) {
 		if (adp->va_mode_flags & V_INFO_GRAPHICS)
-			return ENODEV;
+			return EAGAIN;
 		if (blanked == 0) {
 			window = (u_short *)adp->va_window;
 			/* clear the screen and set the border color */
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index c7c9ff59f925..642e6b15b309 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.20 1998/11/04 03:49:39 peter Exp $
+ *	$Id: snake_saver.c,v 1.21 1999/01/11 03:18:52 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -59,7 +59,7 @@ snake_saver(video_adapter_t *adp, int blank)
 
 	if (blank) {
 		if (adp->va_mode_flags & V_INFO_GRAPHICS)
-			return ENODEV;
+			return EAGAIN;
 		if (blanked <= 0) {
 			window = (u_short *)adp->va_window;
 			fillw(((FG_LIGHTGREY|BG_BLACK)<<8) | scr_map[0x20],
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index ca4b588004b9..463a0ae0f3f8 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.17 1998/11/04 03:49:39 peter Exp $
+ *	$Id: star_saver.c,v 1.18 1999/01/11 03:18:53 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -59,7 +59,7 @@ star_saver(video_adapter_t *adp, int blank)
 
 	if (blank) {
 		if (adp->va_mode_flags & V_INFO_GRAPHICS)
-			return ENODEV;
+			return EAGAIN;
 		if (!blanked) {
 			window = (u_short *)adp->va_window;
 			/* clear the screen and set the border color */
-- 
cgit v1.3


From 2da199da53835ee2d9228a60717fd2d0fccf9e50 Mon Sep 17 00:00:00 2001
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Fri, 5 Feb 1999 12:40:16 +0000
Subject: Followup to yokota's last commit:

 - va_mode_flags -> va_info.vi_flags
 - scanline width may be different from screen width
---
 sys/dev/syscons/daemon/daemon_saver.c     |  4 ++--
 sys/dev/syscons/logo/logo_saver.c         | 15 ++++++++-------
 sys/dev/syscons/snake/snake_saver.c       |  4 ++--
 sys/dev/syscons/star/star_saver.c         |  4 ++--
 sys/modules/syscons/daemon/daemon_saver.c |  4 ++--
 sys/modules/syscons/logo/logo_saver.c     | 15 ++++++++-------
 sys/modules/syscons/snake/snake_saver.c   |  4 ++--
 sys/modules/syscons/star/star_saver.c     |  4 ++--
 8 files changed, 28 insertions(+), 26 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 09f6caf36189..423e6c70451d 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.13 1999/01/11 03:18:45 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.14 1999/01/17 14:25:08 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -199,7 +199,7 @@ daemon_saver(video_adapter_t *adp, int blank)
 	int min, max;
 
 	if (blank) {
-		if (adp->va_mode_flags & V_INFO_GRAPHICS)
+		if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
 			return EAGAIN;
 		if (blanked == 0) {
 			window = (u_short *)adp->va_window;
diff --git a/sys/dev/syscons/logo/logo_saver.c b/sys/dev/syscons/logo/logo_saver.c
index 1db8dcc496b6..c55b565de2ad 100644
--- a/sys/dev/syscons/logo/logo_saver.c
+++ b/sys/dev/syscons/logo/logo_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: logo_saver.c,v 1.3 1999/01/11 03:18:49 yokota Exp $
+ *	$Id: logo_saver.c,v 1.4 1999/01/16 10:20:16 des Exp $
  */
 
 #include <sys/param.h>
@@ -37,7 +37,7 @@
 #include <saver.h>
 
 static u_char *vid;
-static int banksize, scrmode, scrw, scrh;
+static int banksize, scrmode, bpsl, scrw, scrh;
 static int blanked;
 
 #include "logo.c"
@@ -47,25 +47,25 @@ logo_blit(video_adapter_t *adp, int x, int y)
 {
     int d, l, o, p;
     
-    for (o = 0, p = y * scrw + x; p > banksize; p -= banksize)
+    for (o = 0, p = y * bpsl + x; p > banksize; p -= banksize)
 	o += banksize;
     set_origin(adp, o);
 
     for (d = 0; d < sizeof logo_img; d += logo_w) {
 	if (p + logo_w < banksize) {
 	    bcopy(logo_img + d, vid + p, logo_w);
-	    p += scrw;
+	    p += bpsl;
 	} else if (p < banksize) {
 	    l = banksize - p;
 	    bcopy(logo_img + d, vid + p, l);
 	    set_origin(adp, (o += banksize));
 	    bcopy(logo_img + d + l, vid, logo_w - l);
-	    p += scrw - banksize;
+	    p += bpsl - banksize;
 	} else {
 	    p -= banksize;
 	    set_origin(adp, (o += banksize));
 	    bcopy(logo_img + d, vid + p, logo_w);
-	    p += scrw;
+	    p += bpsl;
 	}
     }
 }
@@ -100,8 +100,9 @@ logo_saver(video_adapter_t *adp, int blank)
 	    set_video_mode(adp, scrmode, logo_pal, 0);
 	    blanked++;
 	    vid = (u_char *)adp->va_window;
+	    bpsl = adp->va_line_width;
 	    splx(pl);
-	    for (i = 0; i < scrw*scrh; i += banksize) {
+	    for (i = 0; i < bpsl*scrh; i += banksize) {
 		set_origin(adp, i);
 		bzero(vid, banksize);
 	    }
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index 642e6b15b309..ef64741942ea 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.21 1999/01/11 03:18:52 yokota Exp $
+ *	$Id: snake_saver.c,v 1.22 1999/01/17 14:25:19 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -58,7 +58,7 @@ snake_saver(video_adapter_t *adp, int blank)
 #define	savs	messagep
 
 	if (blank) {
-		if (adp->va_mode_flags & V_INFO_GRAPHICS)
+		if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
 			return EAGAIN;
 		if (blanked <= 0) {
 			window = (u_short *)adp->va_window;
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 463a0ae0f3f8..aaa23fbde073 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.18 1999/01/11 03:18:53 yokota Exp $
+ *	$Id: star_saver.c,v 1.19 1999/01/17 14:25:19 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -58,7 +58,7 @@ star_saver(video_adapter_t *adp, int blank)
 	static u_short 	stars[NUM_STARS][2];
 
 	if (blank) {
-		if (adp->va_mode_flags & V_INFO_GRAPHICS)
+		if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
 			return EAGAIN;
 		if (!blanked) {
 			window = (u_short *)adp->va_window;
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index 09f6caf36189..423e6c70451d 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.13 1999/01/11 03:18:45 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.14 1999/01/17 14:25:08 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -199,7 +199,7 @@ daemon_saver(video_adapter_t *adp, int blank)
 	int min, max;
 
 	if (blank) {
-		if (adp->va_mode_flags & V_INFO_GRAPHICS)
+		if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
 			return EAGAIN;
 		if (blanked == 0) {
 			window = (u_short *)adp->va_window;
diff --git a/sys/modules/syscons/logo/logo_saver.c b/sys/modules/syscons/logo/logo_saver.c
index 1db8dcc496b6..c55b565de2ad 100644
--- a/sys/modules/syscons/logo/logo_saver.c
+++ b/sys/modules/syscons/logo/logo_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: logo_saver.c,v 1.3 1999/01/11 03:18:49 yokota Exp $
+ *	$Id: logo_saver.c,v 1.4 1999/01/16 10:20:16 des Exp $
  */
 
 #include <sys/param.h>
@@ -37,7 +37,7 @@
 #include <saver.h>
 
 static u_char *vid;
-static int banksize, scrmode, scrw, scrh;
+static int banksize, scrmode, bpsl, scrw, scrh;
 static int blanked;
 
 #include "logo.c"
@@ -47,25 +47,25 @@ logo_blit(video_adapter_t *adp, int x, int y)
 {
     int d, l, o, p;
     
-    for (o = 0, p = y * scrw + x; p > banksize; p -= banksize)
+    for (o = 0, p = y * bpsl + x; p > banksize; p -= banksize)
 	o += banksize;
     set_origin(adp, o);
 
     for (d = 0; d < sizeof logo_img; d += logo_w) {
 	if (p + logo_w < banksize) {
 	    bcopy(logo_img + d, vid + p, logo_w);
-	    p += scrw;
+	    p += bpsl;
 	} else if (p < banksize) {
 	    l = banksize - p;
 	    bcopy(logo_img + d, vid + p, l);
 	    set_origin(adp, (o += banksize));
 	    bcopy(logo_img + d + l, vid, logo_w - l);
-	    p += scrw - banksize;
+	    p += bpsl - banksize;
 	} else {
 	    p -= banksize;
 	    set_origin(adp, (o += banksize));
 	    bcopy(logo_img + d, vid + p, logo_w);
-	    p += scrw;
+	    p += bpsl;
 	}
     }
 }
@@ -100,8 +100,9 @@ logo_saver(video_adapter_t *adp, int blank)
 	    set_video_mode(adp, scrmode, logo_pal, 0);
 	    blanked++;
 	    vid = (u_char *)adp->va_window;
+	    bpsl = adp->va_line_width;
 	    splx(pl);
-	    for (i = 0; i < scrw*scrh; i += banksize) {
+	    for (i = 0; i < bpsl*scrh; i += banksize) {
 		set_origin(adp, i);
 		bzero(vid, banksize);
 	    }
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index 642e6b15b309..ef64741942ea 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.21 1999/01/11 03:18:52 yokota Exp $
+ *	$Id: snake_saver.c,v 1.22 1999/01/17 14:25:19 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -58,7 +58,7 @@ snake_saver(video_adapter_t *adp, int blank)
 #define	savs	messagep
 
 	if (blank) {
-		if (adp->va_mode_flags & V_INFO_GRAPHICS)
+		if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
 			return EAGAIN;
 		if (blanked <= 0) {
 			window = (u_short *)adp->va_window;
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 463a0ae0f3f8..aaa23fbde073 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.18 1999/01/11 03:18:53 yokota Exp $
+ *	$Id: star_saver.c,v 1.19 1999/01/17 14:25:19 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -58,7 +58,7 @@ star_saver(video_adapter_t *adp, int blank)
 	static u_short 	stars[NUM_STARS][2];
 
 	if (blank) {
-		if (adp->va_mode_flags & V_INFO_GRAPHICS)
+		if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
 			return EAGAIN;
 		if (!blanked) {
 			window = (u_short *)adp->va_window;
-- 
cgit v1.3


From 6e8394b8baa7d5d9153ab90de6824bcd19b3b4e1 Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Tue, 22 Jun 1999 14:14:06 +0000
Subject: The second phase of syscons reorganization.

- Split syscons source code into manageable chunks and reorganize
  some of complicated functions.

- Many static variables are moved to the softc structure.

- Added a new key function, PREV.  When this key is pressed, the vty
  immediately before the current vty will become foreground.  Analogue
  to PREV, which is usually assigned to the PrntScrn key.
  PR: kern/10113
  Submitted by: Christian Weisgerber <naddy@mips.rhein-neckar.de>

- Modified the kernel console input function sccngetc() so that it
  handles function keys properly.

- Reorganized the screen update routine.

- VT switching code is reorganized.  It now should be slightly more
  robust than before.

- Added the DEVICE_RESUME function so that syscons no longer hooks the
  APM resume event directly.

- New kernel configuration options: SC_NO_CUTPASTE, SC_NO_FONT_LOADING,
  SC_NO_HISTORY and SC_NO_SYSMOUSE.
  Various parts of syscons can be omitted so that the kernel size is
  reduced.

  SC_PIXEL_MODE
  Made the VESA 800x600 mode an option, rather than a standard part of
  syscons.

  SC_DISABLE_DDBKEY
  Disables the `debug' key combination.

  SC_ALT_MOUSE_IMAGE
  Inverse the character cell at the mouse cursor position in the text
  console, rather than drawing an arrow on the screen.
  Submitted by: Nick Hibma (n_hibma@FreeBSD.ORG)

  SC_DFLT_FONT
  makeoptions "SC_DFLT_FONT=_font_name_"
  Include the named font as the default font of syscons.  16-line,
  14-line and 8-line font data will be compiled in.  This option replaces
  the existing STD8X16FONT option, which loads 16-line font data only.

- The VGA driver is split into /sys/dev/fb/vga.c and /sys/isa/vga_isa.c.

- The video driver provides a set of ioctl commands to manipulate the
  frame buffer.

- New kernel configuration option: VGA_WIDTH90
  Enables 90 column modes: 90x25, 90x30, 90x43, 90x50, 90x60.  These
  modes are mot always supported by the video card.
  PR: i386/7510
  Submitted by: kbyanc@freedomnet.com and alexv@sui.gda.itesm.mx.

- The header file machine/console.h is reorganized; its contents is now
  split into sys/fbio.h, sys/kbio.h (a new file) and sys/consio.h
  (another new file).  machine/console.h is still maintained for
  compatibility reasons.

- Kernel console selection/installation routines are fixed and
  slightly rebumped so that it should now be possible to switch between
  the interanl kernel console (sc or vt) and a remote kernel console
  (sio) again, as it was in 2.x, 3.0 and 3.1.

- Screen savers and splash screen decoders
  Because of the header file reorganization described above, screen
  savers and splash screen decoders are slightly modified.  After this
  update, /sys/modules/syscons/saver.h is no longer necessary and is
  removed.
---
 sys/alpha/alpha/cons.c                    |   38 +-
 sys/alpha/conf/files.alpha                |    7 +-
 sys/alpha/conf/options.alpha              |   20 +-
 sys/alpha/include/cons.h                  |   12 +-
 sys/alpha/include/console.h               |  638 +----
 sys/conf/NOTES                            |   31 +-
 sys/conf/files.alpha                      |    7 +-
 sys/conf/files.i386                       |   15 +-
 sys/conf/options.alpha                    |   20 +-
 sys/conf/options.i386                     |   21 +-
 sys/dev/fb/fb.c                           |  473 +++-
 sys/dev/fb/fbreg.h                        |   65 +-
 sys/dev/fb/splash.c                       |   15 +-
 sys/dev/fb/splash_bmp.c                   |    5 +-
 sys/dev/fb/splash_pcx.c                   |    5 +-
 sys/dev/fb/splashreg.h                    |    5 +-
 sys/dev/fb/vga.c                          | 3041 +++++++++++++++++++++
 sys/dev/fb/vgareg.h                       |   34 +-
 sys/dev/sio/sio.c                         |   15 +-
 sys/dev/syscons/blank/blank_saver.c       |   71 +-
 sys/dev/syscons/daemon/daemon_saver.c     |  103 +-
 sys/dev/syscons/fade/fade_saver.c         |   69 +-
 sys/dev/syscons/fire/fire_saver.c         |    9 +-
 sys/dev/syscons/green/green_saver.c       |   82 +-
 sys/dev/syscons/logo/logo_saver.c         |   10 +-
 sys/dev/syscons/rain/rain_saver.c         |    8 +-
 sys/dev/syscons/scgfbrndr.c               |  829 ++++++
 sys/dev/syscons/schistory.c               |  222 ++
 sys/dev/syscons/scmouse.c                 | 1083 ++++++++
 sys/dev/syscons/scvesactl.c               |    9 +-
 sys/dev/syscons/scvgarndr.c               |  829 ++++++
 sys/dev/syscons/scvidctl.c                |  474 +++-
 sys/dev/syscons/scvtb.c                   |  283 ++
 sys/dev/syscons/snake/snake_saver.c       |   56 +-
 sys/dev/syscons/star/star_saver.c         |   49 +-
 sys/dev/syscons/syscons.c                 | 4249 +++++++++++++----------------
 sys/dev/syscons/syscons.h                 |  411 ++-
 sys/dev/syscons/warp/warp_saver.c         |    9 +-
 sys/i386/conf/LINT                        |   31 +-
 sys/i386/conf/NOTES                       |   31 +-
 sys/i386/conf/files.i386                  |   15 +-
 sys/i386/conf/options.i386                |   21 +-
 sys/i386/i386/cons.c                      |   17 +-
 sys/i386/i386/cons.h                      |   13 +-
 sys/i386/include/console.h                |  637 +----
 sys/i386/isa/pcvt/pcvt_drv.c              |    9 +-
 sys/i386/isa/vesa.c                       |  668 ++++-
 sys/isa/sio.c                             |   15 +-
 sys/isa/syscons_isa.c                     |  170 +-
 sys/isa/vga_isa.c                         | 2129 +--------------
 sys/kern/tty_cons.c                       |   17 +-
 sys/modules/splash/bmp/splash_bmp.c       |    5 +-
 sys/modules/splash/pcx/splash_pcx.c       |    5 +-
 sys/modules/syscons/blank/blank_saver.c   |   71 +-
 sys/modules/syscons/daemon/daemon_saver.c |  103 +-
 sys/modules/syscons/fade/fade_saver.c     |   69 +-
 sys/modules/syscons/fire/fire_saver.c     |    9 +-
 sys/modules/syscons/green/green_saver.c   |   82 +-
 sys/modules/syscons/logo/logo_saver.c     |   10 +-
 sys/modules/syscons/rain/rain_saver.c     |    8 +-
 sys/modules/syscons/saver.h               |   39 -
 sys/modules/syscons/snake/snake_saver.c   |   56 +-
 sys/modules/syscons/star/star_saver.c     |   49 +-
 sys/modules/syscons/warp/warp_saver.c     |    9 +-
 sys/sys/cons.h                            |   13 +-
 sys/sys/consio.h                          |  385 +++
 sys/sys/fbio.h                            |  289 +-
 sys/sys/kbio.h                            |  228 ++
 68 files changed, 11803 insertions(+), 6722 deletions(-)
 create mode 100644 sys/dev/fb/vga.c
 create mode 100644 sys/dev/syscons/scgfbrndr.c
 create mode 100644 sys/dev/syscons/schistory.c
 create mode 100644 sys/dev/syscons/scmouse.c
 create mode 100644 sys/dev/syscons/scvgarndr.c
 create mode 100644 sys/dev/syscons/scvtb.c
 delete mode 100644 sys/modules/syscons/saver.h
 create mode 100644 sys/sys/consio.h
 create mode 100644 sys/sys/kbio.h

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/sys/alpha/alpha/cons.c b/sys/alpha/alpha/cons.c
index 161fecf598f2..7194a33584c1 100644
--- a/sys/alpha/alpha/cons.c
+++ b/sys/alpha/alpha/cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.9 1999/05/31 11:23:35 phk Exp $
+ *	$Id: cons.c,v 1.10 1999/06/01 20:26:04 dt Exp $
  */
 
 #include "opt_devfs.h"
@@ -57,25 +57,6 @@
 #include <machine/cpu.h>
 #include <machine/cons.h>
 
-/* XXX this should be config(8)ed. */
-#if 0
-#include "sc.h"
-#include "vt.h"
-#include "sio.h"
-#endif
-static struct consdev constab[] = {
-#if NSC > 0
-	{ sccnprobe,	sccninit,	sccngetc,	sccncheckc,	sccnputc },
-#endif
-#if NVT > 0
-	{ pccnprobe,	pccninit,	pccngetc,	pccncheckc,	pccnputc },
-#endif
-#if NSIO > 0
-	{ siocnprobe,	siocninit,	siocngetc,	siocncheckc,	siocnputc },
-#endif
-	{ 0 },
-};
-
 static	d_open_t	cnopen;
 static	d_close_t	cnclose;
 static	d_read_t	cnread;
@@ -129,16 +110,22 @@ static struct tty *cn_tp;		/* physical console tty struct */
 static void *cn_devfs_token;		/* represents the devfs entry */
 #endif /* DEVFS */
 
+CONS_DRIVER(cons, NULL, NULL, NULL, NULL, NULL, NULL);
+
 void
 cninit()
 {
 	struct consdev *best_cp, *cp;
+	struct consdev **list;
 
 	/*
 	 * Find the first console with the highest priority.
 	 */
 	best_cp = NULL;
-	for (cp = constab; cp->cn_probe; cp++) {
+	list = (struct consdev **)cons_set.ls_items;
+	while ((cp = *list++) != NULL) {
+		if (cp->cn_probe == NULL)
+			continue;
 		(*cp->cn_probe)(cp);
 		if (cp->cn_pri > CN_DEAD &&
 		    (best_cp == NULL || cp->cn_pri > best_cp->cn_pri))
@@ -161,6 +148,8 @@ cninit()
 	 * If no console, give up.
 	 */
 	if (best_cp == NULL) {
+		if (cn_tab != NULL && cn_tab->cn_term != NULL)
+			(*cn_tab->cn_term)(cn_tab);
 		cn_tab = best_cp;
 		return;
 	}
@@ -168,10 +157,13 @@ cninit()
 	/*
 	 * Initialize console, then attach to it.  This ordering allows
 	 * debugging using the previous console, if any.
-	 * XXX if there was a previous console, then its driver should
-	 * be informed when we forget about it.
 	 */
 	(*best_cp->cn_init)(best_cp);
+	if (cn_tab != NULL && cn_tab != best_cp) {
+		/* Turn off the previous console.  */
+		if (cn_tab->cn_term != NULL)
+			(*cn_tab->cn_term)(cn_tab);
+	}
 	cn_tab = best_cp;
 }
 
diff --git a/sys/alpha/conf/files.alpha b/sys/alpha/conf/files.alpha
index 112d8f877106..fb69c9aaca28 100644
--- a/sys/alpha/conf/files.alpha
+++ b/sys/alpha/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.alpha,v 1.20 1999/06/05 13:29:57 dfr Exp $
+#	$Id: files.alpha,v 1.21 1999/06/19 13:12:51 dfr Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -152,6 +152,7 @@ libkern/alpha/ntohs.S		standard
 isa/sio.c			optional	sio device-driver
 dev/fb/fb.c			optional	fb	device-driver
 dev/fb/fb.c			optional	vga	device-driver
+dev/fb/vga.c			optional	vga	device-driver
 isa/vga_isa.c			optional	vga	device-driver
 dev/fb/splash.c			optional	splash
 dev/kbd/atkbd.c			optional	atkbd	device-driver
@@ -162,7 +163,11 @@ dev/kbd/kbd.c			optional	atkbd	device-driver
 dev/kbd/kbd.c			optional	kbd	device-driver
 dev/kbd/kbd.c			optional	ukbd	device-driver
 dev/syscons/syscons.c		optional	sc	device-driver
+dev/syscons/schistory.c		optional	sc	device-driver
+dev/syscons/scmouse.c		optional	sc	device-driver
+dev/syscons/scvgarndr.c		optional	sc	device-driver
 dev/syscons/scvidctl.c		optional	sc	device-driver
+dev/syscons/scvtb.c		optional	sc	device-driver
 isa/syscons_isa.c		optional	sc	device-driver
 isa/psm.c			optional	psm	device-driver
 isa/fd.c			optional	fd	device-driver
diff --git a/sys/alpha/conf/options.alpha b/sys/alpha/conf/options.alpha
index 9c8e8e18fbe8..d78c2205e96e 100644
--- a/sys/alpha/conf/options.alpha
+++ b/sys/alpha/conf/options.alpha
@@ -1,4 +1,4 @@
-#	$Id: options.alpha,v 1.10 1999/03/10 10:36:50 yokota Exp $
+#	$Id: options.alpha,v 1.11 1999/05/27 22:03:31 gallatin Exp $
 
 EV5			opt_global.h
 EV4			opt_global.h
@@ -21,25 +21,35 @@ CMD640			opt_wd.h
 SHOW_BUSYBUFS
 PANIC_REBOOT_WAIT_TIME	opt_panic.h
 
-SC_SPLASH_SCREEN	opt_syscons.h
 MAXCONS			opt_syscons.h
-SLOW_VGA		opt_syscons.h
-STD8X16FONT		opt_syscons.h
-SC_HISTORY_SIZE		opt_syscons.h
+SC_ALT_MOUSE_IMAGE	opt_syscons.h
+SC_DEBUG_LEVEL		opt_syscons.h
+SC_DFLT_FONT		opt_syscons.h
+SC_DISABLE_DDB		opt_syscons.h
 SC_DISABLE_REBOOT	opt_syscons.h
+SC_HISTORY_SIZE		opt_syscons.h
 SC_MOUSE_CHAR		opt_syscons.h
+SC_NO_CUTPASTE		opt_syscons.h
+SC_NO_FONT_LOADING	opt_syscons.h
+SC_NO_HISTORY		opt_syscons.h
+SC_NO_SYSMOUSE		opt_syscons.h
+SC_PIXEL_MODE		opt_syscons.h
+SC_RENDER_DEBUG		opt_syscons.h
+SC_VIDEO_DEBUG		opt_syscons.h
 
 VGA_ALT_SEQACCESS	opt_vga.h
 VGA_DEBUG		opt_vga.h
 VGA_NO_FONT_LOADING	opt_vga.h
 VGA_NO_MODE_CHANGE	opt_vga.h
 VGA_SLOW_IOACCESS	opt_vga.h
+VGA_WIDTH90		opt_vga.h
 
 PSM_HOOKAPM		opt_psm.h
 PSM_RESETAFTERSUSPEND	opt_psm.h
 PSM_DEBUG		opt_psm.h
 
 # Fb options
+FB_DEBUG		opt_fb.h
 FB_INSTALL_CDEV		opt_fb.h
 
 # Atkbd options
diff --git a/sys/alpha/include/cons.h b/sys/alpha/include/cons.h
index 057a2fa70c0a..fdc0da0493cf 100644
--- a/sys/alpha/include/cons.h
+++ b/sys/alpha/include/cons.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
- *	$Id: cons.h,v 1.1 1998/06/10 10:54:42 dfr Exp $
+ *	$Id: cons.h,v 1.2 1999/01/23 16:53:27 dfr Exp $
  */
 
 #ifndef _MACHINE_CONS_H_
@@ -45,6 +45,7 @@
 struct consdev;
 typedef	void	cn_probe_t __P((struct consdev *));
 typedef	void	cn_init_t __P((struct consdev *));
+typedef	void	cn_term_t __P((struct consdev *));
 typedef	int	cn_getc_t __P((dev_t));
 typedef	int	cn_checkc_t __P((dev_t));
 typedef	void	cn_putc_t __P((dev_t, int));
@@ -66,6 +67,8 @@ struct consdev {
 				/* probe hardware and fill in consdev info */
 	cn_init_t	*cn_init;
 				/* turn on as console */
+	cn_term_t	*cn_term;
+				/* turn off as console */
 	cn_getc_t	*cn_getc;
 				/* kernel getchar interface */
 	cn_checkc_t	*cn_checkc;
@@ -84,8 +87,15 @@ struct consdev {
 #define CN_REMOTE	3	/* serial interface with remote bit set */
 
 #ifdef KERNEL
+extern	struct linker_set cons_set;
 extern	int cons_unavail;
 
+#define CONS_DRIVER(name, probe, init, term, getc, checkc, putc)	\
+	static struct consdev name##_consdev = {			\
+		probe, init, term, getc, checkc, putc			\
+	};								\
+	DATA_SET(cons_set, name##_consdev)
+
 /* Other kernel entry points. */
 int	cncheckc __P((void));
 int	cngetc __P((void));
diff --git a/sys/alpha/include/console.h b/sys/alpha/include/console.h
index 9521dfa9ddc1..79a6b576528c 100644
--- a/sys/alpha/include/console.h
+++ b/sys/alpha/include/console.h
@@ -1,636 +1,8 @@
-/*-
- * Copyright (c) 1991-1996 Søren Schmidt
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: console.h,v 1.43 1999/02/05 11:51:56 yokota Exp $
- *	from: i386/include console.h,v 1.43
- */
+#ifndef _MACHINE_CONSOLE_H_
+#define _MACHINE_CONSOLE_H_
 
-#ifndef	_MACHINE_CONSOLE_H_
-#define	_MACHINE_CONSOLE_H_
-
-#ifndef KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-#define KDGKBMODE 	_IOR('K', 6, int)
-#define KDSKBMODE 	_IO('K', 7 /*, int */)
-#define KDMKTONE	_IO('K', 8 /*, int */)
-#define KDGETMODE	_IOR('K', 9, int)
-#define KDSETMODE	_IO('K', 10 /*, int */)
-#define KDSBORDER	_IO('K', 13 /*, int */)
-#define KDGKBSTATE	_IOR('K', 19, int)
-#define KDSKBSTATE	_IO('K', 20 /*, int */)
-#define KDENABIO	_IO('K', 60)
-#define KDDISABIO	_IO('K', 61)
-#define KIOCSOUND	_IO('K', 63 /*, int */)
-#define KDGKBTYPE	_IOR('K', 64, int)
-#define KDGETLED	_IOR('K', 65, int)
-#define KDSETLED	_IO('K', 66 /*, int */)
-#define KDSETRAD	_IO('K', 67 /*, int */)		/* obsolete */
-#define KDRASTER	_IOW('K', 100, scr_size_t)
-#define KDGKBINFO	_IOR('K', 101, keyboard_info_t)
-#define KDSETREPEAT	_IOW('K', 102, keyboard_delay_t)
-
-#define GETFKEY		_IOWR('k', 0, fkeyarg_t)
-#define SETFKEY		_IOWR('k', 1, fkeyarg_t)
-#define GIO_SCRNMAP	_IOR('k', 2, scrmap_t)
-#define PIO_SCRNMAP	_IOW('k', 3, scrmap_t)
-#define GIO_KEYMAP 	_IOR('k', 6, keymap_t)
-#define PIO_KEYMAP 	_IOW('k', 7, keymap_t)
-#define GIO_DEADKEYMAP 	_IOR('k', 8, accentmap_t)
-#define PIO_DEADKEYMAP 	_IOW('k', 9, accentmap_t)
-#define GIO_KEYMAPENT 	_IOWR('k', 10, keyarg_t)
-#define PIO_KEYMAPENT 	_IOW('k', 11, keyarg_t)
-
-#define GIO_ATTR	_IOR('a', 0, int)
-#define GIO_COLOR	_IOR('c', 0, int)
-#define CONS_CURRENT	_IOR('c', 1, int)
-#define CONS_GET	_IOR('c', 2, int)
-#define CONS_IO		_IO('c', 3)
-#define CONS_BLANKTIME	_IOW('c', 4, int)
-#define CONS_SSAVER	_IOW('c', 5, ssaver_t)
-#define CONS_GSAVER	_IOWR('c', 6, ssaver_t)
-#define CONS_CURSORTYPE	_IOW('c', 7, int)
-#define CONS_BELLTYPE	_IOW('c', 8, int)
-#define CONS_HISTORY	_IOW('c', 9, int)
-#define CONS_MOUSECTL	_IOWR('c', 10, mouse_info_t)
-#define CONS_IDLE	_IOR('c', 11, int)
-#define CONS_SAVERMODE	_IOW('c', 12, int)
-#define CONS_SAVERSTART	_IOW('c', 13, int)
-#define PIO_FONT8x8	_IOW('c', 64, fnt8_t)
-#define GIO_FONT8x8	_IOR('c', 65, fnt8_t)
-#define PIO_FONT8x14	_IOW('c', 66, fnt14_t)
-#define GIO_FONT8x14	_IOR('c', 67, fnt14_t)
-#define PIO_FONT8x16	_IOW('c', 68, fnt16_t)
-#define GIO_FONT8x16	_IOR('c', 69, fnt16_t)
-#define CONS_GETINFO    _IOWR('c', 73, vid_info_t)
-#define CONS_GETVERS	_IOR('c', 74, int)
-#define CONS_CURRENTADP	_IOR('c', 100, int)
-#define CONS_ADPINFO	_IOWR('c', 101, video_adapter_info_t)
-#define CONS_MODEINFO	_IOWR('c', 102, video_info_t)
-#define CONS_FINDMODE	_IOWR('c', 103, video_info_t)
-#define CONS_SETWINORG	_IO('c', 104 /* u_int */) 
-
-#define CONS_SETKBD	_IO('c', 110 /* int */)
-#define CONS_RELKBD	_IO('c', 111)
-
-/* CONS_SAVERMODE */
-#define CONS_LKM_SAVER	0
-#define CONS_USR_SAVER	1
-
-#ifdef PC98
-#define ADJUST_CLOCK		_IO('t',100)		/* for 98note resume */
-#endif
-
-#define VT_OPENQRY	_IOR('v', 1, int)
-#define VT_SETMODE	_IOW('v', 2, vtmode_t)
-#define VT_GETMODE	_IOR('v', 3, vtmode_t)
-#define VT_RELDISP	_IO('v', 4 /*, int */)
-#define VT_ACTIVATE	_IO('v', 5 /*, int */)
-#define VT_WAITACTIVE	_IO('v', 6 /*, int */)
-#define VT_GETACTIVE	_IOR('v', 7, int)
-
-#define VT_FALSE	0
-#define VT_TRUE		1
-#define VT_ACKACQ	2
-
-#define VT_AUTO		0		/* switching is automatic 	*/
-#define VT_PROCESS	1		/* switching controlled by prog */
-#define VT_KERNEL	255		/* switching controlled in kernel */
-
-#ifndef _VT_MODE_DECLARED
-#define	_VT_MODE_DECLARED
-struct vt_mode {
-	char	mode;
-	char	waitv;			/* not implemented yet 	SOS	*/
-	short	relsig;
-	short	acqsig;
-	short	frsig;			/* not implemented yet	SOS	*/
-};
-
-typedef struct vt_mode vtmode_t;
-#endif /* !_VT_MODE_DECLARED */
-
-struct mouse_data {
-	int	x;
-	int 	y;
-	int 	z;
-	int 	buttons;
-};
-
-struct mouse_mode {
-	int	mode;
-	int	signal;
-};
-
-struct mouse_event {
-	int	id;			/* one based */
-	int	value;
-};
-
-#define MOUSE_SHOW		0x01
-#define MOUSE_HIDE		0x02
-#define MOUSE_MOVEABS		0x03
-#define MOUSE_MOVEREL		0x04
-#define MOUSE_GETINFO		0x05
-#define MOUSE_MODE		0x06
-#define MOUSE_ACTION		0x07
-#define MOUSE_MOTION_EVENT	0x08
-#define MOUSE_BUTTON_EVENT	0x09
-
-struct mouse_info {
-	int	operation;
-	union {
-		struct mouse_data data;
-		struct mouse_mode mode;
-		struct mouse_event event;
-	}u;
-};
-
-#define KD_MONO		1		/* monochrome adapter        	*/
-#define KD_HERCULES	2		/* hercules adapter          	*/
-#define KD_CGA		3		/* color graphics adapter    	*/
-#define KD_EGA		4		/* enhanced graphics adapter 	*/
-#define KD_VGA		5		/* video graphics adapter    	*/
-#define KD_PC98		6		/* PC-98 display            	*/
-
-#define KD_TEXT		0		/* set text mode restore fonts  */
-#define KD_TEXT0	0		/* ditto			*/
-#define KD_TEXT1	2		/* set text mode !restore fonts */
-#define KD_GRAPHICS	1		/* set graphics mode 		*/
-#define KD_PIXEL	3		/* set pixel mode		*/
-
-#define K_RAW		0		/* keyboard returns scancodes	*/
-#define K_XLATE		1		/* keyboard returns ascii 	*/
-#define K_CODE		2		/* keyboard returns keycodes 	*/
-
-#define KB_84		1		/* 'old' 84 key AT-keyboard	*/
-#define KB_101		2		/* MF-101 or MF-102 keyboard	*/
-#define KB_OTHER	3		/* keyboard not known 		*/
-
-#define CLKED		1		/* Caps locked			*/
-#define NLKED		2		/* Num locked			*/
-#define SLKED		4		/* Scroll locked		*/
-#define ALKED		8		/* AltGr locked			*/
-#define LOCK_MASK	(CLKED | NLKED | SLKED | ALKED)
-#define LED_CAP		1		/* Caps lock LED 		*/
-#define LED_NUM		2		/* Num lock LED 		*/
-#define LED_SCR		4		/* Scroll lock LED 		*/
-#define LED_MASK	(LED_CAP | LED_NUM | LED_SCR)
-
-/* possible flag values */
-#define	FLAG_LOCK_O	0
-#define	FLAG_LOCK_C	1
-#define FLAG_LOCK_N	2
-
-#define NUM_KEYS	256		/* number of keys in table	*/
-#define NUM_STATES	8		/* states per key		*/
-#define ALTGR_OFFSET	128		/* offset for altlock keys	*/
-
-#ifndef _KEYMAP_DECLARED
-#define	_KEYMAP_DECLARED
-struct keyent_t {
-	u_char map[NUM_STATES];
-	u_char spcl;
-	u_char flgs;
-};
-
-struct keymap {
-	u_short	n_keys;
-	struct keyent_t key[NUM_KEYS];
-};
-
-typedef struct keymap keymap_t;
-
-struct keyarg {
-	u_short	keynum;
-	struct keyent_t key;
-};
-
-typedef struct keyarg keyarg_t;
-#endif /* !_KEYMAP_DECLARED */
-
-#define NUM_DEADKEYS	15		/* number of accent keys */
-#define NUM_ACCENTCHARS	52		/* max number of accent chars */
-
-struct acc_t {
-	u_char accchar;
-	u_char map[NUM_ACCENTCHARS][2];
-};
-
-struct accentmap {
-	u_short n_accs;
-	struct acc_t acc[NUM_DEADKEYS];
-};
-
-#define MAXFK		16
-#define NUM_FKEYS	96
-
-struct fkeytab {
-	u_char	str[MAXFK];
-	u_char	len;
-};
-
-struct fkeyarg {
-	u_short	keynum;
-	char	keydef[MAXFK];
-	char	flen;
-};
-
-struct colors	{
-	char	fore;
-	char	back;
-};
-
-struct vid_info {
-	short	size;
-	short	m_num;
-	u_short	mv_row, mv_col;
-	u_short	mv_rsz, mv_csz;
-	struct colors	mv_norm,
-			mv_rev,
-			mv_grfc;
-	u_char	mv_ovscan;
-	u_char	mk_keylock;
-};
-
-#define MAXSSAVER	16
-
-struct ssaver	{
-	char	name[MAXSSAVER];
-	int	num;
-	long	time;
-};
-
-/* video mode information block */
-struct video_info {
-    int			vi_mode;
-    int			vi_flags;
-#define V_INFO_COLOR	(1<<0)
-#define V_INFO_GRAPHICS	(1<<1)
-#define V_INFO_LINEAR	(1<<2)
-#define V_INFO_VESA	(1<<3)
-    int			vi_width;
-    int			vi_height;
-    int			vi_cwidth;
-    int			vi_cheight;
-    int			vi_depth;
-    int			vi_planes;
-    u_int		vi_window;	/* physical address */
-    size_t		vi_window_size;
-    size_t		vi_window_gran;
-    u_int		vi_buffer;	/* physical address */
-    size_t		vi_buffer_size;
-    /* XXX pixel format, memory model,... */
-};
-
-/* adapter infromation block */
-struct video_adapter {
-    int			va_index;
-    int			va_type;
-    char		*va_name;
-    int			va_unit;
-    int			va_minor;
-    int			va_flags;
-#define V_ADP_COLOR	(1<<0)
-#define V_ADP_MODECHANGE (1<<1)
-#define V_ADP_STATESAVE	(1<<2)
-#define V_ADP_STATELOAD	(1<<3)
-#define V_ADP_FONT	(1<<4)
-#define V_ADP_PALETTE	(1<<5)
-#define V_ADP_BORDER	(1<<6)
-#define V_ADP_VESA	(1<<7)
-#define V_ADP_PROBED	(1<<16)
-#define V_ADP_INITIALIZED (1<<17)
-#define V_ADP_REGISTERED (1<<18)
-    int			va_io_base;
-    int			va_io_size;
-    int			va_crtc_addr;
-    int			va_mem_base;
-    int			va_mem_size;
-    u_int		va_window;	/* virtual address */
-    size_t		va_window_size;
-    size_t		va_window_gran;
-    u_int		va_buffer;	/* virtual address */
-    size_t		va_buffer_size;
-    int			va_initial_mode;
-    int			va_initial_bios_mode;
-    int			va_mode;
-    struct video_info	va_info;
-    int			va_line_width;
-    void		*va_token;
-};
-
-struct video_adapter_info {
-    int			va_index;
-    int			va_type;
-    char		va_name[16];
-    int			va_unit;
-    int			va_flags;
-    int			va_io_base;
-    int			va_io_size;
-    int			va_crtc_addr;
-    int			va_mem_base;
-    int			va_mem_size;
-    u_int		va_window;	/* virtual address */
-    size_t		va_window_size;
-    size_t		va_window_gran;
-    u_int		va_buffer;	/* virtual address */
-    size_t		va_buffer_size;
-    int			va_initial_mode;
-    int			va_initial_bios_mode;
-    int			va_mode;
-    int			va_line_width;
-};
-
-#define V_ADP_PRIMARY		0
-#define V_ADP_SECONDARY		1
-
-struct keyboard_info {
-    int			kb_index;	/* kbdio index# */
-    char		kb_name[16];	/* driver name */
-    int			kb_unit;	/* unit# */
-    int			kb_type;	/* KB_84, KB_101, KB_OTHER,... */
-    int			kb_config;	/* device configuration flags */
-    int			kb_flags;	/* internal flags */
-};
-
-typedef struct accentmap accentmap_t;
-typedef struct fkeytab fkeytab_t;
-typedef struct fkeyarg fkeyarg_t;
-typedef struct vid_info vid_info_t;
-typedef struct mouse_info mouse_info_t;
-typedef struct {char scrmap[256];} scrmap_t;
-typedef struct {char fnt8x8[8*256];} fnt8_t;
-typedef struct {char fnt8x14[14*256];} fnt14_t;
-typedef struct {char fnt8x16[16*256];} fnt16_t;
-typedef struct ssaver ssaver_t;
-typedef struct video_adapter video_adapter_t;
-typedef struct video_adapter_info video_adapter_info_t;
-typedef struct video_info video_info_t;
-typedef struct keyboard_info keyboard_info_t;
-typedef struct {int scr_size[3];} scr_size_t;
-typedef struct {int kbd_delay[2];} keyboard_delay_t;
-
-/* defines for "special" keys (spcl bit set in keymap) */
-#define NOP		0x00		/* nothing (dead key)		*/
-#define LSH		0x02		/* left shift key		*/
-#define RSH		0x03		/* right shift key		*/
-#define CLK		0x04		/* caps lock key		*/
-#define NLK		0x05		/* num lock key			*/
-#define SLK		0x06		/* scroll lock key		*/
-#define LALT		0x07		/* left alt key			*/
-#define BTAB		0x08		/* backwards tab		*/
-#define LCTR		0x09		/* left control key		*/
-#define NEXT		0x0a		/* switch to next screen 	*/
-#define F_SCR		0x0b		/* switch to first screen 	*/
-#define L_SCR		0x1a		/* switch to last screen 	*/
-#define F_FN		0x1b		/* first function key 		*/
-#define L_FN		0x7a		/* last function key 		*/
-/*			0x7b-0x7f	   reserved do not use !	*/
-#define RCTR		0x80		/* right control key		*/
-#define RALT		0x81		/* right alt (altgr) key	*/
-#define ALK		0x82		/* alt lock key			*/
-#define ASH		0x83		/* alt shift key		*/
-#define META		0x84		/* meta key			*/
-#define RBT		0x85		/* boot machine			*/
-#define DBG		0x86		/* call debugger		*/
-#define SUSP		0x87		/* suspend power (APM)		*/
-#define SPSC		0x88		/* toggle splash/text screen	*/
-
-#define F_ACC		DGRA		/* first accent key		*/
-#define DGRA		0x89		/* grave			*/
-#define DACU		0x8a		/* acute			*/
-#define DCIR		0x8b		/* circumflex			*/
-#define DTIL		0x8c		/* tilde			*/
-#define DMAC		0x8d		/* macron			*/
-#define DBRE		0x8e		/* breve			*/
-#define DDOT		0x8f		/* dot				*/
-#define DUML		0x90		/* umlaut/diaresis		*/
-#define DDIA		0x90		/* diaresis			*/
-#define DSLA		0x91		/* slash			*/
-#define DRIN		0x92		/* ring				*/
-#define DCED		0x93		/* cedilla			*/
-#define DAPO		0x94		/* apostrophe			*/
-#define DDAC		0x95		/* double acute			*/
-#define DOGO		0x96		/* ogonek			*/
-#define DCAR		0x97		/* caron			*/
-#define L_ACC		DCAR		/* last accent key		*/
-
-#define STBY		0x98		/* Go into standby mode (apm)   */
-
-#define F(x)		((x)+F_FN-1)
-#define	S(x)		((x)+F_SCR-1)
-#define ACC(x)		((x)+F_ACC)
-#define NOKEY		0x100		/* no key pressed marker 	*/
-#define FKEY		0x200		/* function key marker 		*/
-#define MKEY		0x400		/* meta key marker (prepend ESC)*/
-#define BKEY		0x800		/* backtab (ESC [ Z)		*/
-
-#define SPCLKEY		0x8000		/* special key */
-#define RELKEY		0x4000		/* key released */
-#define ERRKEY		0x2000		/* error */
-
-#define KEYCHAR(c)	((c) & 0x00ff)
-#define KEYFLAGS(c)	((c) & ~0x00ff)
-
-/* video mode definitions */
-#define M_B40x25	0	/* black & white 40 columns */
-#define M_C40x25	1	/* color 40 columns */
-#define M_B80x25	2	/* black & white 80 columns */
-#define M_C80x25	3	/* color 80 columns */
-#define M_BG320		4	/* black & white graphics 320x200 */
-#define M_CG320		5	/* color graphics 320x200 */
-#define M_BG640		6	/* black & white graphics 640x200 hi-res */
-#define M_EGAMONO80x25  7       /* ega-mono 80x25 */
-#define M_CG320_D	13	/* ega mode D */
-#define M_CG640_E	14	/* ega mode E */
-#define M_EGAMONOAPA	15	/* ega mode F */
-#define M_CG640x350	16	/* ega mode 10 */
-#define M_ENHMONOAPA2	17	/* ega mode F with extended memory */
-#define M_ENH_CG640	18	/* ega mode 10* */
-#define M_ENH_B40x25    19      /* ega enhanced black & white 40 columns */
-#define M_ENH_C40x25    20      /* ega enhanced color 40 columns */
-#define M_ENH_B80x25    21      /* ega enhanced black & white 80 columns */
-#define M_ENH_C80x25    22      /* ega enhanced color 80 columns */
-#define M_VGA_C40x25	23	/* vga 8x16 font on color */
-#define M_VGA_C80x25	24	/* vga 8x16 font on color */
-#define M_VGA_M80x25	25	/* vga 8x16 font on mono */
-
-#define M_VGA11		26	/* vga 640x480 2 colors */
-#define M_BG640x480	26
-#define M_VGA12		27	/* vga 640x480 16 colors */
-#define M_CG640x480	27
-#define M_VGA13		28	/* vga 640x200 256 colors */
-#define M_VGA_CG320	28
-
-#define M_VGA_C80x50	30	/* vga 8x8 font on color */
-#define M_VGA_M80x50	31	/* vga 8x8 font on color */
-#define M_VGA_C80x30	32	/* vga 8x16 font on color */
-#define M_VGA_M80x30	33	/* vga 8x16 font on color */
-#define M_VGA_C80x60	34	/* vga 8x8 font on color */
-#define M_VGA_M80x60	35	/* vga 8x8 font on color */
-#define M_VGA_CG640	36	/* vga 640x400 256 color */
-#define M_VGA_MODEX	37	/* vga 320x240 256 color */
-
-#define M_ENH_B80x43	0x70	/* ega black & white 80x43 */
-#define M_ENH_C80x43	0x71	/* ega color 80x43 */
-
-#define M_PC98_80x25	98	/* PC98 80x25 */
-#define M_PC98_80x30	99	/* PC98 80x30 */
-
-#define M_HGC_P0	0xe0	/* hercules graphics - page 0 @ B0000 */
-#define M_HGC_P1	0xe1	/* hercules graphics - page 1 @ B8000 */
-#define M_MCA_MODE	0xff	/* monochrome adapter mode */
-
-#define M_TEXT_80x25	200	/* generic text modes */
-#define M_TEXT_80x30	201
-#define M_TEXT_80x43	202
-#define M_TEXT_80x50	203
-#define M_TEXT_80x60	204
-#define M_TEXT_132x25	205
-#define M_TEXT_132x30	206
-#define M_TEXT_132x43	207
-#define M_TEXT_132x50	208
-#define M_TEXT_132x60	209
-
-#define SW_PC98_80x25	_IO('S', M_PC98_80x25)
-#define SW_PC98_80x30	_IO('S', M_PC98_80x30)
-#define SW_B40x25 	_IO('S', M_B40x25)
-#define SW_C40x25  	_IO('S', M_C40x25)
-#define SW_B80x25  	_IO('S', M_B80x25)
-#define SW_C80x25  	_IO('S', M_C80x25)
-#define SW_BG320   	_IO('S', M_BG320)
-#define SW_CG320   	_IO('S', M_CG320)
-#define SW_BG640   	_IO('S', M_BG640)
-#define SW_EGAMONO80x25 _IO('S', M_EGAMONO80x25)
-#define SW_CG320_D    	_IO('S', M_CG320_D)
-#define SW_CG640_E    	_IO('S', M_CG640_E)
-#define SW_EGAMONOAPA 	_IO('S', M_EGAMONOAPA)
-#define SW_CG640x350  	_IO('S', M_CG640x350)
-#define SW_ENH_MONOAPA2 _IO('S', M_ENHMONOAPA2)
-#define SW_ENH_CG640  	_IO('S', M_ENH_CG640)
-#define SW_ENH_B40x25  	_IO('S', M_ENH_B40x25)
-#define SW_ENH_C40x25  	_IO('S', M_ENH_C40x25)
-#define SW_ENH_B80x25  	_IO('S', M_ENH_B80x25)
-#define SW_ENH_C80x25  	_IO('S', M_ENH_C80x25)
-#define SW_ENH_B80x43  	_IO('S', M_ENH_B80x43)
-#define SW_ENH_C80x43  	_IO('S', M_ENH_C80x43)
-#define SW_MCAMODE    	_IO('S', M_MCA_MODE)
-#define SW_VGA_C40x25	_IO('S', M_VGA_C40x25)
-#define SW_VGA_C80x25	_IO('S', M_VGA_C80x25)
-#define SW_VGA_C80x30	_IO('S', M_VGA_C80x30)
-#define SW_VGA_C80x50	_IO('S', M_VGA_C80x50)
-#define SW_VGA_C80x60	_IO('S', M_VGA_C80x60)
-#define SW_VGA_M80x25	_IO('S', M_VGA_M80x25)
-#define SW_VGA_M80x30	_IO('S', M_VGA_M80x30)
-#define SW_VGA_M80x50	_IO('S', M_VGA_M80x50)
-#define SW_VGA_M80x60	_IO('S', M_VGA_M80x60)
-#define SW_VGA11	_IO('S', M_VGA11)
-#define SW_BG640x480	_IO('S', M_VGA11)
-#define SW_VGA12	_IO('S', M_VGA12)
-#define SW_CG640x480	_IO('S', M_VGA12)
-#define SW_VGA13	_IO('S', M_VGA13)
-#define SW_VGA_CG320	_IO('S', M_VGA13)
-#define SW_VGA_CG640	_IO('S', M_VGA_CG640)
-#define SW_VGA_MODEX	_IO('S', M_VGA_MODEX)
-
-#define SW_TEXT_80x25	_IO('S', M_TEXT_80x25)
-#define SW_TEXT_80x30	_IO('S', M_TEXT_80x30)
-#define SW_TEXT_80x43	_IO('S', M_TEXT_80x43)
-#define SW_TEXT_80x50	_IO('S', M_TEXT_80x50)
-#define SW_TEXT_80x60	_IO('S', M_TEXT_80x60)
-#define SW_TEXT_132x25	_IO('S', M_TEXT_132x25)
-#define SW_TEXT_132x30	_IO('S', M_TEXT_132x30)
-#define SW_TEXT_132x43	_IO('S', M_TEXT_132x43)
-#define SW_TEXT_132x50	_IO('S', M_TEXT_132x50)
-#define SW_TEXT_132x60	_IO('S', M_TEXT_132x60)
-
-#define M_VESA_BASE		0x100	/* VESA mode number base */
-
-#define M_VESA_CG640x400	0x100	/* 640x400, 256 color */
-#define M_VESA_CG640x480	0x101	/* 640x480, 256 color */
-#define M_VESA_800x600		0x102	/* 800x600, 16 color */
-#define M_VESA_CG800x600	0x103	/* 800x600, 256 color */
-#define M_VESA_1024x768		0x104	/* 1024x768, 16 color */
-#define M_VESA_CG1024x768	0x105	/* 1024x768, 256 color */
-#define M_VESA_1280x1024	0x106	/* 1280x1024, 16 color */
-#define M_VESA_CG1280x1024	0x107	/* 1280x1024, 256 color */
-#define M_VESA_C80x60		0x108	/* 8x8 font */
-#define M_VESA_C132x25		0x109	/* 8x16 font */
-#define M_VESA_C132x43		0x10a	/* 8x14 font */
-#define M_VESA_C132x50		0x10b	/* 8x8 font */
-#define M_VESA_C132x60		0x10c	/* 8x8 font */
-#define M_VESA_32K_320		0x10d	/* 320x200, 5:5:5 */
-#define M_VESA_64K_320		0x10e	/* 320x200, 5:6:5 */
-#define M_VESA_FULL_320		0x10f	/* 320x200, 8:8:8 */
-#define M_VESA_32K_640		0x110	/* 640x480, 5:5:5 */
-#define M_VESA_64K_640		0x111	/* 640x480, 5:6:5 */
-#define M_VESA_FULL_640		0x112	/* 640x480, 8:8:8 */
-#define M_VESA_32K_800		0x113	/* 800x600, 5:5:5 */
-#define M_VESA_64K_800		0x114	/* 800x600, 5:6:5 */
-#define M_VESA_FULL_800		0x115	/* 800x600, 8:8:8 */
-#define M_VESA_32K_1024		0x116	/* 1024x768, 5:5:5 */
-#define M_VESA_64K_1024		0x117	/* 1024x768, 5:6:5 */
-#define M_VESA_FULL_1024	0x118	/* 1024x768, 8:8:8 */
-#define M_VESA_32K_1280		0x119	/* 1280x1024, 5:5:5 */
-#define M_VESA_64K_1280		0x11a	/* 1280x1024, 5:6:5 */
-#define M_VESA_FULL_1280	0x11b	/* 1280x1024, 8:8:8 */
-#define M_VESA_MODE_MAX		0x1ff
-
-#define SW_VESA_CG640x400	_IO('V', M_VESA_CG640x400 - M_VESA_BASE)
-#define SW_VESA_CG640x480	_IO('V', M_VESA_CG640x480 - M_VESA_BASE)
-#define SW_VESA_800x600		_IO('V', M_VESA_800x600 - M_VESA_BASE)
-#define SW_VESA_CG800x600	_IO('V', M_VESA_CG800x600 - M_VESA_BASE)
-#define SW_VESA_1024x768	_IO('V', M_VESA_1024x768 - M_VESA_BASE)
-#define SW_VESA_CG1024x768	_IO('V', M_VESA_CG1024x768 - M_VESA_BASE)
-#define SW_VESA_1280x1024	_IO('V', M_VESA_1280x1024 - M_VESA_BASE)
-#define SW_VESA_CG1280x1024	_IO('V', M_VESA_CG1280x1024 - M_VESA_BASE)
-#define SW_VESA_C80x60		_IO('V', M_VESA_C80x60 - M_VESA_BASE)
-#define SW_VESA_C132x25		_IO('V', M_VESA_C132x25 - M_VESA_BASE)
-#define SW_VESA_C132x43		_IO('V', M_VESA_C132x43 - M_VESA_BASE)
-#define SW_VESA_C132x50		_IO('V', M_VESA_C132x50 - M_VESA_BASE)
-#define SW_VESA_C132x60		_IO('V', M_VESA_C132x60 - M_VESA_BASE)
-#define SW_VESA_32K_320		_IO('V', M_VESA_32K_320 - M_VESA_BASE)
-#define SW_VESA_64K_320		_IO('V', M_VESA_64K_320 - M_VESA_BASE)
-#define SW_VESA_FULL_320	_IO('V', M_VESA_FULL_320 - M_VESA_BASE)
-#define SW_VESA_32K_640		_IO('V', M_VESA_32K_640 - M_VESA_BASE)
-#define SW_VESA_64K_640		_IO('V', M_VESA_64K_640 - M_VESA_BASE)
-#define SW_VESA_FULL_640	_IO('V', M_VESA_FULL_640 - M_VESA_BASE)
-#define SW_VESA_32K_800		_IO('V', M_VESA_32K_800 - M_VESA_BASE)
-#define SW_VESA_64K_800		_IO('V', M_VESA_64K_800 - M_VESA_BASE)
-#define SW_VESA_FULL_800	_IO('V', M_VESA_FULL_800 - M_VESA_BASE)
-#define SW_VESA_32K_1024	_IO('V', M_VESA_32K_1024 - M_VESA_BASE)
-#define SW_VESA_64K_1024	_IO('V', M_VESA_64K_1024 - M_VESA_BASE)
-#define SW_VESA_FULL_1024	_IO('V', M_VESA_FULL_1024 - M_VESA_BASE)
-#define SW_VESA_32K_1280	_IO('V', M_VESA_32K_1280 - M_VESA_BASE)
-#define SW_VESA_64K_1280	_IO('V', M_VESA_64K_1280 - M_VESA_BASE)
-#define SW_VESA_FULL_1280	_IO('V', M_VESA_FULL_1280 - M_VESA_BASE)
+#include <sys/fbio.h>
+#include <sys/kbio.h>
+#include <sys/consio.h>
 
 #endif /* !_MACHINE_CONSOLE_H_ */
-
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 556314606276..cc51183e9e90 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.606 1999/06/15 13:14:40 des Exp $
+#	$Id: LINT,v 1.607 1999/06/19 20:20:52 rnordier Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -912,6 +912,9 @@ options		VGA_NO_MODE_CHANGE	# don't change video modes
 # Older video cards may require this option for proper operation.
 options		VGA_SLOW_IOACCESS	# do byte-wide i/o's to TS and GDC regs
 
+# The following option probably won't work with the LCD displays.
+options		VGA_WIDTH90		# support 90 column modes
+
 # To include support for VESA video modes
 options		VESA
 
@@ -939,18 +942,20 @@ options		PCVT_VT220KEYB
 # The syscons console driver (sco color console compatible).
 device		sc0	at isa?
 options		MAXCONS=16		# number of virtual consoles
-options		STD8X16FONT		# Compile font in
-makeoptions	STD8X16FONT=cp850
-options		SC_HISTORY_SIZE=200	# number of history buffer lines
+options		SC_ALT_MOUSE_IMAGE	# simplified mouse cursor in text mode
+options		SC_DFLT_FONT		# compile font in
+makeoptions	SC_DFLT_FONT="cp850"
+options		SC_DISABLE_DDBKEY	# disable `debug' key
 options		SC_DISABLE_REBOOT	# disable reboot key sequence
+options		SC_HISTORY_SIZE=200	# number of history buffer lines
+options		SC_MOUSE_CHAR=0x3	# char code for text mode mouse cursor
+options		SC_PIXEL_MODE		# add support for the raster text mode
 
-#
-# `flags' for sc0:
-#       0x01    Use a 'visual' bell
-#       0x02    Use a 'blink' cursor
-#       0x04    Use a 'underline' cursor
-#       0x06    Use a 'blinking underline' (destructive) cursor
-#	0x40	Make the bell quiet if it is rung in the background vty.
+# You can selectively disable features in syscons.
+options		SC_NO_CUTPASTE
+options		SC_NO_FONT_LOADING
+options		SC_NO_HISTORY
+options		SC_NO_SYSMOUSE
 
 #
 # The Numeric Processing eXtension driver.  This should be configured if
@@ -2155,6 +2160,10 @@ options		ULPT_DEBUG
 options		UMASS_DEBUG
 options		UMS_DEBUG
 
+# options for ukbd:
+options		UKBD_DFLT_KEYMAP	# specify the built-in keymap
+makeoptions	UKBD_DFLT_KEYMAP="it.iso"
+
 #
 # Embedded system options:
 #
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index 112d8f877106..fb69c9aaca28 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.alpha,v 1.20 1999/06/05 13:29:57 dfr Exp $
+#	$Id: files.alpha,v 1.21 1999/06/19 13:12:51 dfr Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -152,6 +152,7 @@ libkern/alpha/ntohs.S		standard
 isa/sio.c			optional	sio device-driver
 dev/fb/fb.c			optional	fb	device-driver
 dev/fb/fb.c			optional	vga	device-driver
+dev/fb/vga.c			optional	vga	device-driver
 isa/vga_isa.c			optional	vga	device-driver
 dev/fb/splash.c			optional	splash
 dev/kbd/atkbd.c			optional	atkbd	device-driver
@@ -162,7 +163,11 @@ dev/kbd/kbd.c			optional	atkbd	device-driver
 dev/kbd/kbd.c			optional	kbd	device-driver
 dev/kbd/kbd.c			optional	ukbd	device-driver
 dev/syscons/syscons.c		optional	sc	device-driver
+dev/syscons/schistory.c		optional	sc	device-driver
+dev/syscons/scmouse.c		optional	sc	device-driver
+dev/syscons/scvgarndr.c		optional	sc	device-driver
 dev/syscons/scvidctl.c		optional	sc	device-driver
+dev/syscons/scvtb.c		optional	sc	device-driver
 isa/syscons_isa.c		optional	sc	device-driver
 isa/psm.c			optional	psm	device-driver
 isa/fd.c			optional	fd	device-driver
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 44c115c9c270..ae19e96a059b 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.246 1999/06/01 18:18:38 jlemon Exp $
+#	$Id: files.i386,v 1.247 1999/06/18 19:55:50 green Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -19,10 +19,10 @@ linux_assym.h			optional	compat_linux		   \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"linux_assym.h"
 #
-font8x16.o			optional	std8x16font		\
-	compile-with	"uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c" \
-	no-implicit-rule before-depend \
-	clean		"${STD8X16FONT}-8x16 font8x16.c" 
+font.h				optional	sc_dflt_font		\
+	compile-with	"uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \
+	no-obj no-implicit-rule before-depend				\
+	clean		"font.h"
 #
 atkbdmap.h			optional	atkbd_dflt_keymap	\
 	compile-with	"kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"				\
@@ -44,14 +44,19 @@ dev/ata/atapi-tape.c		optional	atapist	device-driver
 dev/fb/fb.c			optional	fb	device-driver
 dev/fb/fb.c			optional	vga	device-driver
 dev/fb/splash.c			optional	splash
+dev/fb/vga.c			optional	vga	device-driver
 dev/kbd/atkbd.c			optional	atkbd	device-driver
 dev/kbd/atkbdc.c		optional	atkbdc	device-driver
 dev/kbd/kbd.c			optional	atkbd	device-driver
 dev/kbd/kbd.c			optional	kbd	device-driver
 dev/kbd/kbd.c			optional	ukbd	device-driver
 dev/syscons/syscons.c		optional	sc	device-driver
+dev/syscons/schistory.c		optional	sc	device-driver
+dev/syscons/scmouse.c		optional	sc	device-driver
 dev/syscons/scvidctl.c		optional	sc	device-driver
 dev/syscons/scvesactl.c		optional	sc	device-driver
+dev/syscons/scvgarndr.c		optional	sc	device-driver
+dev/syscons/scvtb.c		optional	sc	device-driver
 i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
 i386/eisa/dpt_eisa.c		optional	eisa dpt device-driver
diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha
index 9c8e8e18fbe8..d78c2205e96e 100644
--- a/sys/conf/options.alpha
+++ b/sys/conf/options.alpha
@@ -1,4 +1,4 @@
-#	$Id: options.alpha,v 1.10 1999/03/10 10:36:50 yokota Exp $
+#	$Id: options.alpha,v 1.11 1999/05/27 22:03:31 gallatin Exp $
 
 EV5			opt_global.h
 EV4			opt_global.h
@@ -21,25 +21,35 @@ CMD640			opt_wd.h
 SHOW_BUSYBUFS
 PANIC_REBOOT_WAIT_TIME	opt_panic.h
 
-SC_SPLASH_SCREEN	opt_syscons.h
 MAXCONS			opt_syscons.h
-SLOW_VGA		opt_syscons.h
-STD8X16FONT		opt_syscons.h
-SC_HISTORY_SIZE		opt_syscons.h
+SC_ALT_MOUSE_IMAGE	opt_syscons.h
+SC_DEBUG_LEVEL		opt_syscons.h
+SC_DFLT_FONT		opt_syscons.h
+SC_DISABLE_DDB		opt_syscons.h
 SC_DISABLE_REBOOT	opt_syscons.h
+SC_HISTORY_SIZE		opt_syscons.h
 SC_MOUSE_CHAR		opt_syscons.h
+SC_NO_CUTPASTE		opt_syscons.h
+SC_NO_FONT_LOADING	opt_syscons.h
+SC_NO_HISTORY		opt_syscons.h
+SC_NO_SYSMOUSE		opt_syscons.h
+SC_PIXEL_MODE		opt_syscons.h
+SC_RENDER_DEBUG		opt_syscons.h
+SC_VIDEO_DEBUG		opt_syscons.h
 
 VGA_ALT_SEQACCESS	opt_vga.h
 VGA_DEBUG		opt_vga.h
 VGA_NO_FONT_LOADING	opt_vga.h
 VGA_NO_MODE_CHANGE	opt_vga.h
 VGA_SLOW_IOACCESS	opt_vga.h
+VGA_WIDTH90		opt_vga.h
 
 PSM_HOOKAPM		opt_psm.h
 PSM_RESETAFTERSUSPEND	opt_psm.h
 PSM_DEBUG		opt_psm.h
 
 # Fb options
+FB_DEBUG		opt_fb.h
 FB_INSTALL_CDEV		opt_fb.h
 
 # Atkbd options
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index c3aa0d98743d..d7cc7b4c824a 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.116 1999/06/06 22:45:04 steve Exp $
+#	$Id: options.i386,v 1.117 1999/06/15 13:14:43 des Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -65,17 +65,30 @@ I586_CPU		opt_global.h
 I686_CPU		opt_global.h
 
 MAXCONS			opt_syscons.h
-STD8X16FONT		opt_syscons.h
-SC_HISTORY_SIZE		opt_syscons.h
+SC_ALT_MOUSE_IMAGE	opt_syscons.h
+SC_DEBUG_LEVEL		opt_syscons.h
+SC_DFLT_FONT		opt_syscons.h
+SC_DISABLE_DDBKEY	opt_syscons.h
 SC_DISABLE_REBOOT	opt_syscons.h
+SC_HISTORY_SIZE		opt_syscons.h
 SC_MOUSE_CHAR		opt_syscons.h
-
+SC_NO_CUTPASTE		opt_syscons.h
+SC_NO_FONT_LOADING	opt_syscons.h
+SC_NO_HISTORY		opt_syscons.h
+SC_NO_SYSMOUSE		opt_syscons.h
+SC_PIXEL_MODE		opt_syscons.h
+SC_RENDER_DEBUG		opt_syscons.h
+SC_VIDEO_DEBUG		opt_syscons.h
+
+FB_DEBUG		opt_fb.h
 FB_INSTALL_CDEV		opt_fb.h
 
 VGA_ALT_SEQACCESS	opt_vga.h
+VGA_DEBUG		opt_vga.h
 VGA_NO_FONT_LOADING	opt_vga.h
 VGA_NO_MODE_CHANGE	opt_vga.h
 VGA_SLOW_IOACCESS	opt_vga.h
+VGA_WIDTH90		opt_vga.h
 
 VESA			opt_vesa.h
 VESA_DEBUG		opt_vesa.h
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index a1d5f112918d..e10b75b162f5 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: fb.c,v 1.4 1999/05/30 16:51:23 phk Exp $
+ * $Id: fb.c,v 1.5 1999/05/31 11:24:38 phk Exp $
  */
 
 #include "fb.h"
@@ -34,10 +34,14 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#include <sys/uio.h>
+#include <sys/fbio.h>
 
-#include <machine/console.h>
+#include <vm/vm.h>
+#include <vm/pmap.h>
 
 #include <dev/fb/fbreg.h>
 
@@ -49,6 +53,7 @@
  * when necessary.
  */
 
+static int		vid_malloc;
 static int		adapters = 1;
 static video_adapter_t	*adp_ini;
 static video_adapter_t	**adapter = &adp_ini;
@@ -56,48 +61,69 @@ static video_switch_t	*vidsw_ini;
        video_switch_t	**vidsw = &vidsw_ini;
 
 #ifdef FB_INSTALL_CDEV
-
-#define ARRAY_DELTA	4
-
 static struct cdevsw	*vidcdevsw_ini;
 static struct cdevsw	**vidcdevsw = &vidcdevsw_ini;
+#endif
 
-static void
+#define ARRAY_DELTA	4
+
+static int
 vid_realloc_array(void)
 {
 	video_adapter_t **new_adp;
 	video_switch_t **new_vidsw;
+#ifdef FB_INSTALL_CDEV
 	struct cdevsw **new_cdevsw;
+#endif
 	int newsize;
 	int s;
 
+	if (!vid_malloc)
+		return ENOMEM;
+
 	s = spltty();
 	newsize = ((adapters + ARRAY_DELTA)/ARRAY_DELTA)*ARRAY_DELTA;
 	new_adp = malloc(sizeof(*new_adp)*newsize, M_DEVBUF, M_WAITOK);
 	new_vidsw = malloc(sizeof(*new_vidsw)*newsize, M_DEVBUF, M_WAITOK);
+#ifdef FB_INSTALL_CDEV
 	new_cdevsw = malloc(sizeof(*new_cdevsw)*newsize, M_DEVBUF, M_WAITOK);
+#endif
 	bzero(new_adp, sizeof(*new_adp)*newsize);
 	bzero(new_vidsw, sizeof(*new_vidsw)*newsize);
-	bzero(new_cdevsw, sizeof(*new_cdevsw)*newsize);
 	bcopy(adapter, new_adp, sizeof(*adapter)*adapters);
 	bcopy(vidsw, new_vidsw, sizeof(*vidsw)*adapters);
+#ifdef FB_INSTALL_CDEV
+	bzero(new_cdevsw, sizeof(*new_cdevsw)*newsize);
 	bcopy(vidcdevsw, new_cdevsw, sizeof(*vidcdevsw)*adapters);
+#endif
 	if (adapters > 1) {
 		free(adapter, M_DEVBUF);
 		free(vidsw, M_DEVBUF);
+#ifdef FB_INSTALL_CDEV
 		free(vidcdevsw, M_DEVBUF);
+#endif
 	}
 	adapter = new_adp;
 	vidsw = new_vidsw;
+#ifdef FB_INSTALL_CDEV
 	vidcdevsw = new_cdevsw;
+#endif
 	adapters = newsize;
 	splx(s);
 
 	if (bootverbose)
 		printf("fb: new array size %d\n", adapters);
+
+	return 0;
 }
 
-#endif /* FB_INSTALL_CDEV */
+static void
+vid_malloc_init(void *arg)
+{
+	vid_malloc = TRUE;
+}
+
+SYSINIT(vid_mem, SI_SUB_KMEM, SI_ORDER_ANY, vid_malloc_init, NULL);
 
 /*
  * Low-level frame buffer driver functions
@@ -120,20 +146,22 @@ vid_init_struct(video_adapter_t *adp, char *name, int type, int unit)
 int
 vid_register(video_adapter_t *adp)
 {
-	video_driver_t **list;
-	video_driver_t *p;
+	const video_driver_t **list;
+	const video_driver_t *p;
 	int index;
 
 	for (index = 0; index < adapters; ++index) {
 		if (adapter[index] == NULL)
 			break;
 	}
-	if (index >= adapters)
-		return -1;
+	if (index >= adapters) {
+		if (vid_realloc_array())
+			return -1;
+	}
 
 	adp->va_index = index;
 	adp->va_token = NULL;
-	list = (video_driver_t **)videodriver_set.ls_items;
+	list = (const video_driver_t **)videodriver_set.ls_items;
 	while ((p = *list++) != NULL) {
 		if (strcmp(p->name, adp->va_name) == 0) {
 			adapter[index] = adp;
@@ -162,10 +190,10 @@ vid_unregister(video_adapter_t *adp)
 video_switch_t
 *vid_get_switch(char *name)
 {
-	video_driver_t **list;
-	video_driver_t *p;
+	const video_driver_t **list;
+	const video_driver_t *p;
 
-	list = (video_driver_t **)videodriver_set.ls_items;
+	list = (const video_driver_t **)videodriver_set.ls_items;
 	while ((p = *list++) != NULL) {
 		if (strcmp(p->name, name) == 0)
 			return p->vidsw;
@@ -251,10 +279,10 @@ video_adapter_t
 int
 vid_configure(int flags)
 {
-	video_driver_t **list;
-	video_driver_t *p;
+	const video_driver_t **list;
+	const video_driver_t *p;
 
-	list = (video_driver_t **)videodriver_set.ls_items;
+	list = (const video_driver_t **)videodriver_set.ls_items;
 	while ((p = *list++) != NULL) {
 		if (p->configure != NULL)
 			(*p->configure)(flags);
@@ -269,27 +297,73 @@ vid_configure(int flags)
  * appropriate subdrivers.
  */
 
-#define DRIVER_NAME	"fb"
+#define FB_DRIVER_NAME	"fb"
 
 #ifdef FB_INSTALL_CDEV
 
+#if experimental
+
+static devclass_t	fb_devclass;
+
+static int		fbprobe(device_t dev);
+static int		fbattach(device_t dev);
+
+static device_method_t fb_methods[] = {
+	DEVMETHOD(device_probe,		fbprobe),
+	DEVMETHOD(device_attach,	fbattach),
+
+	DEVMETHOD(bus_print_child,	bus_generic_print_child),
+	{ 0, 0 }
+};
+
+static driver_t fb_driver = {
+	FB_DRIVER_NAME,
+	fb_methods,
+	0,
+};
+
+static int
+fbprobe(device_t dev)
+{
+	int unit;
+
+	unit = device_get_unit(dev);
+	if (unit >= adapters)
+		return ENXIO;
+	if (adapter[unit] == NULL)
+		return ENXIO;
+
+	device_set_desc(dev, "generic frame buffer");
+	return 0;
+}
+
+static int
+fbattach(device_t dev)
+{
+	printf("fbattach: about to attach children\n");
+	bus_generic_attach(dev);
+	return 0;
+}
+
+#endif /* experimental */
+
 #define FB_UNIT(dev)	minor(dev)
 #define FB_MKMINOR(unit) (u)
 
-#if notyet
-
 static d_open_t		fbopen;
 static d_close_t	fbclose;
+static d_read_t		fbread;
+static d_write_t	fbwrite;
 static d_ioctl_t	fbioctl;
 static d_mmap_t		fbmmap;
 
-#define CDEV_MAJOR	141	/* XXX */
+#define CDEV_MAJOR	123	/* XXX */
 
 static struct cdevsw fb_cdevsw = {
 	/* open */	fbopen,
 	/* close */	fbclose,
-	/* read */	noread,
-	/* write */	nowrite,
+	/* read */	fbread,
+	/* write */	fbwrite,
 	/* ioctl */	fbioctl,
 	/* stop */	nostop,
 	/* reset */	noreset,
@@ -297,7 +371,7 @@ static struct cdevsw fb_cdevsw = {
 	/* poll */	nopoll,
 	/* mmap */	fbmmap,
 	/* strategy */	nostrategy,
-	/* name */	DRIVER_NAME,
+	/* name */	FB_DRIVER_NAME,
 	/* parms */	noparms,
 	/* maj */	CDEV_MAJOR,
 	/* dump */	nodump,
@@ -320,10 +394,8 @@ vfbattach(void *arg)
 
 PSEUDO_SET(vfbattach, fb);
 
-#endif /* notyet */
-
 int
-fb_attach(dev_t dev, video_adapter *adp, struct cdevsw *cdevsw)
+fb_attach(dev_t dev, video_adapter_t *adp, struct cdevsw *cdevsw)
 {
 	int s;
 
@@ -339,15 +411,12 @@ fb_attach(dev_t dev, video_adapter *adp, struct cdevsw *cdevsw)
 
 	/* XXX: DEVFS? */
 
-	if (adp->va_index + 1 >= adapters)
-		vid_realloc_array();
-
 	printf("fb%d at %s%d\n", adp->va_index, adp->va_name, adp->va_unit);
 	return 0;
 }
 
 int
-fb_detach(dev_t dev, video_adapter *adp, struct cdevsw *cdevsw)
+fb_detach(dev_t dev, video_adapter_t *adp, struct cdevsw *cdevsw)
 {
 	int s;
 
@@ -364,6 +433,165 @@ fb_detach(dev_t dev, video_adapter *adp, struct cdevsw *cdevsw)
 	return 0;
 }
 
+static int
+fbopen(dev_t dev, int flag, int mode, struct proc *p)
+{
+	int unit;
+
+	unit = FB_UNIT(dev);
+	if (unit >= adapters)
+		return ENXIO;
+	if (vidcdevsw[unit] == NULL)
+		return ENXIO;
+	return (*vidcdevsw[unit]->d_open)(makedev(0, adapter[unit]->va_minor),
+					  flag, mode, p);
+}
+
+static int
+fbclose(dev_t dev, int flag, int mode, struct proc *p)
+{
+	int unit;
+
+	unit = FB_UNIT(dev);
+	if (vidcdevsw[unit] == NULL)
+		return ENXIO;
+	return (*vidcdevsw[unit]->d_close)(makedev(0, adapter[unit]->va_minor),
+					   flag, mode, p);
+}
+
+static int
+fbread(dev_t dev, struct uio *uio, int flag)
+{
+	int unit;
+
+	unit = FB_UNIT(dev);
+	if (vidcdevsw[unit] == NULL)
+		return ENXIO;
+	return (*vidcdevsw[unit]->d_read)(makedev(0, adapter[unit]->va_minor),
+					  uio, flag);
+}
+
+static int
+fbwrite(dev_t dev, struct uio *uio, int flag)
+{
+	int unit;
+
+	unit = FB_UNIT(dev);
+	if (vidcdevsw[unit] == NULL)
+		return ENXIO;
+	return (*vidcdevsw[unit]->d_write)(makedev(0, adapter[unit]->va_minor),
+					   uio, flag);
+}
+
+static int
+fbioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *p)
+{
+	int unit;
+
+	unit = FB_UNIT(dev);
+	if (vidcdevsw[unit] == NULL)
+		return ENXIO;
+	return (*vidcdevsw[unit]->d_ioctl)(makedev(0, adapter[unit]->va_minor),
+					   cmd, arg, flag, p);
+}
+
+static int
+fbmmap(dev_t dev, vm_offset_t offset, int nprot)
+{
+	int unit;
+
+	unit = FB_UNIT(dev);
+	if (vidcdevsw[unit] == NULL)
+		return ENXIO;
+	return (*vidcdevsw[unit]->d_mmap)(makedev(0, adapter[unit]->va_minor),
+					  offset, nprot);
+}
+
+#if experimental
+DEV_DRIVER_MODULE(fb, ???, fb_driver, fb_devclass,
+		  CDEV_MAJOR, NOMAJ, fb_cdevsw, 0, 0);
+#endif
+
+/*
+ * Generic frame buffer cdev driver functions
+ * Frame buffer subdrivers may call these functions to implement common
+ * driver functions.
+ */
+
+int genfbopen(genfb_softc_t *sc, video_adapter_t *adp, int flag, int mode,
+	      struct proc *p)
+{
+	int s;
+
+	s = spltty();
+	if (!(sc->gfb_flags & FB_OPEN))
+		sc->gfb_flags |= FB_OPEN;
+	splx(s);
+	return 0;
+}
+
+int genfbclose(genfb_softc_t *sc, video_adapter_t *adp, int flag, int mode,
+	       struct proc *p)
+{
+	int s;
+
+	s = spltty();
+	sc->gfb_flags &= ~FB_OPEN;
+	splx(s);
+	return 0;
+}
+
+int genfbread(genfb_softc_t *sc, video_adapter_t *adp, struct uio *uio,
+	      int flag)
+{
+	int size;
+	int offset;
+	int error;
+	int len;
+
+	error = 0;
+	size = adp->va_buffer_size/adp->va_info.vi_planes;
+	while (uio->uio_resid > 0) {
+		if (uio->uio_offset >= size)
+			break;
+		offset = uio->uio_offset%adp->va_window_size;
+		len = imin(uio->uio_resid, size - uio->uio_offset);
+		len = imin(len, adp->va_window_size - offset);
+		if (len <= 0)
+			break;
+		(*vidsw[adp->va_index]->set_win_org)(adp, uio->uio_offset);
+		error = uiomove((caddr_t)(adp->va_window + offset), len, uio);
+		if (error)
+			break;
+	}
+	return error;
+}
+
+int genfbwrite(genfb_softc_t *sc, video_adapter_t *adp, struct uio *uio,
+	       int flag)
+{
+	return ENODEV;
+}
+
+int genfbioctl(genfb_softc_t *sc, video_adapter_t *adp, u_long cmd,
+	       caddr_t arg, int flag, struct proc *p)
+{
+	int error;
+
+	if (adp == NULL)	/* XXX */
+		return ENXIO;
+	error = (*vidsw[adp->va_index]->ioctl)(adp, cmd, arg);
+	if (error == ENOIOCTL)
+		error = ENODEV;
+	return error;
+}
+
+int genfbmmap(genfb_softc_t *sc, video_adapter_t *adp, vm_offset_t offset,
+	      int prot)
+{
+	return (*vidsw[adp->va_index]->mmap)(adp, offset, prot);
+}
+
 #endif /* FB_INSTALL_CDEV */
 
 static char
@@ -379,6 +607,7 @@ static char
 	{ KD_EGA,	"EGA" },
 	{ KD_VGA,	"VGA" },
 	{ KD_PC98,	"PC-98x1" },
+	{ KD_TGA,	"TGA" },
 	{ -1,		"Unknown" },
     };
     int i;
@@ -389,6 +618,12 @@ static char
     return names[i].name;
 }
 
+/*
+ * Generic low-level frame buffer functions
+ * The low-level functions in the frame buffer subdriver may use these
+ * functions.
+ */
+
 void
 fb_dump_adp_info(char *driver, video_adapter_t *adp, int level)
 {
@@ -396,19 +631,19 @@ fb_dump_adp_info(char *driver, video_adapter_t *adp, int level)
 	return;
 
     printf("%s%d: %s%d, %s, type:%s (%d), flags:0x%x\n", 
-	   DRIVER_NAME, adp->va_index, driver, adp->va_unit, adp->va_name,
+	   FB_DRIVER_NAME, adp->va_index, driver, adp->va_unit, adp->va_name,
 	   adapter_name(adp->va_type), adp->va_type, adp->va_flags);
     printf("%s%d: port:0x%x-0x%x, crtc:0x%x, mem:0x%x 0x%x\n",
-	   DRIVER_NAME, adp->va_index,
+	   FB_DRIVER_NAME, adp->va_index,
 	   adp->va_io_base, adp->va_io_base + adp->va_io_size - 1,
 	   adp->va_crtc_addr, adp->va_mem_base, adp->va_mem_size);
     printf("%s%d: init mode:%d, bios mode:%d, current mode:%d\n",
-	   DRIVER_NAME, adp->va_index,
+	   FB_DRIVER_NAME, adp->va_index,
 	   adp->va_initial_mode, adp->va_initial_bios_mode, adp->va_mode);
-    printf("%s%d: window:0x%x size:%dk gran:%dk, buf:0x%x size:%dk\n",
-	   DRIVER_NAME, adp->va_index, 
-	   adp->va_window, (int)adp->va_window_size/1024,
-	   (int)adp->va_window_gran/1024, adp->va_buffer,
+    printf("%s%d: window:%p size:%dk gran:%dk, buf:%p size:%dk\n",
+	   FB_DRIVER_NAME, adp->va_index, 
+	   (void *)adp->va_window, (int)adp->va_window_size/1024,
+	   (int)adp->va_window_gran/1024, (void *)adp->va_buffer,
 	   (int)adp->va_buffer_size/1024);
 }
 
@@ -432,3 +667,161 @@ fb_dump_mode_info(char *driver, video_adapter_t *adp, video_info_t *info,
 	       info->vi_cwidth, info->vi_cheight); 
     printf("win:0x%x\n", info->vi_window);
 }
+
+int
+fb_type(int adp_type)
+{
+	static struct {
+		int	fb_type;
+		int	va_type;
+	} types[] = {
+		{ FBTYPE_MDA,		KD_MONO },
+		{ FBTYPE_HERCULES,	KD_HERCULES },
+		{ FBTYPE_CGA,		KD_CGA },
+		{ FBTYPE_EGA,		KD_EGA },
+		{ FBTYPE_VGA,		KD_VGA },
+		{ FBTYPE_PC98,		KD_PC98 },
+		{ FBTYPE_TGA,		KD_TGA },
+	};
+	int i;
+
+	for (i = 0; i < sizeof(types)/sizeof(types[0]); ++i) {
+		if (types[i].va_type == adp_type)
+			return types[i].fb_type;
+	}
+	return -1;
+}
+
+int
+fb_commonioctl(video_adapter_t *adp, u_long cmd, caddr_t arg)
+{
+	int error;
+	int s;
+
+	/* assert(adp != NULL) */
+
+	error = 0;
+	s = spltty();
+
+	switch (cmd) {
+
+	case FBIO_ADAPTER:	/* get video adapter index */
+		*(int *)arg = adp->va_index;
+		break;
+
+	case FBIO_ADPTYPE:	/* get video adapter type */
+		*(int *)arg = adp->va_type;
+		break;
+
+	case FBIO_ADPINFO:	/* get video adapter info */
+	        ((video_adapter_info_t *)arg)->va_index = adp->va_index;
+		((video_adapter_info_t *)arg)->va_type = adp->va_type;
+		bcopy(adp->va_name, ((video_adapter_info_t *)arg)->va_name,
+		      imin(strlen(adp->va_name) + 1,
+			   sizeof(((video_adapter_info_t *)arg)->va_name))); 
+		((video_adapter_info_t *)arg)->va_unit = adp->va_unit;
+		((video_adapter_info_t *)arg)->va_flags = adp->va_flags;
+		((video_adapter_info_t *)arg)->va_io_base = adp->va_io_base;
+		((video_adapter_info_t *)arg)->va_io_size = adp->va_io_size;
+		((video_adapter_info_t *)arg)->va_crtc_addr = adp->va_crtc_addr;
+		((video_adapter_info_t *)arg)->va_mem_base = adp->va_mem_base;
+		((video_adapter_info_t *)arg)->va_mem_size = adp->va_mem_size;
+		((video_adapter_info_t *)arg)->va_window
+			= vtophys(adp->va_window);
+		((video_adapter_info_t *)arg)->va_window_size
+			= adp->va_window_size;
+		((video_adapter_info_t *)arg)->va_window_gran
+			= adp->va_window_gran;
+		((video_adapter_info_t *)arg)->va_window_orig
+			= adp->va_window_orig;
+		((video_adapter_info_t *)arg)->va_unused0
+			= (adp->va_buffer) ? vtophys(adp->va_buffer) : 0;
+		((video_adapter_info_t *)arg)->va_buffer_size
+			= adp->va_buffer_size;
+		((video_adapter_info_t *)arg)->va_mode = adp->va_mode;
+		((video_adapter_info_t *)arg)->va_initial_mode
+			= adp->va_initial_mode;
+		((video_adapter_info_t *)arg)->va_initial_bios_mode
+			= adp->va_initial_bios_mode;
+		((video_adapter_info_t *)arg)->va_line_width
+			= adp->va_line_width;
+		((video_adapter_info_t *)arg)->va_disp_start.x
+			= adp->va_disp_start.x;
+		((video_adapter_info_t *)arg)->va_disp_start.y
+			= adp->va_disp_start.y;
+		break;
+
+	case FBIO_MODEINFO:	/* get mode information */
+		error = (*vidsw[adp->va_index]->get_info)(adp, 
+				((video_info_t *)arg)->vi_mode,
+				(video_info_t *)arg); 
+		if (error)
+			error = ENODEV;
+		break;
+
+	case FBIO_FINDMODE:	/* find a matching video mode */
+		error = (*vidsw[adp->va_index]->query_mode)(adp, 
+				(video_info_t *)arg); 
+		if (error < 0) {
+			error = EINVAL;
+		} else {
+			error = (*vidsw[adp->va_index]->get_info)(adp, 
+					error, (video_info_t *)arg); 
+			if (error)
+				error = ENODEV;	/* shouldn't happen */
+		}
+		break;
+
+	case FBIO_GETMODE:	/* get video mode */
+		*(int *)arg = adp->va_mode;
+		break;
+
+	case FBIO_SETMODE:	/* set video mode */
+		error = (*vidsw[adp->va_index]->set_mode)(adp, *(int *)arg);
+		if (error)
+			error = ENODEV;	/* EINVAL? */
+		break;
+
+	case FBIO_GETWINORG:	/* get frame buffer window origin */
+		*(u_int *)arg = adp->va_window_orig;
+		break;
+
+	case FBIO_GETDISPSTART:	/* get display start address */
+		((video_display_start_t *)arg)->x = adp->va_disp_start.x;
+		((video_display_start_t *)arg)->y = adp->va_disp_start.y;
+		break;
+
+	case FBIO_GETLINEWIDTH:	/* get scan line width in bytes */
+		*(u_int *)arg = adp->va_line_width;
+		break;
+
+	case FBIO_GETPALETTE:	/* get color palette */
+	case FBIO_SETPALETTE:	/* set color palette */
+		/* XXX */
+
+	case FBIOPUTCMAP:
+	case FBIOGETCMAP:
+		/* XXX */
+
+	case FBIO_SETWINORG:	/* set frame buffer window origin */
+	case FBIO_SETDISPSTART:	/* set display start address */
+	case FBIO_SETLINEWIDTH:	/* set scan line width in pixel */
+
+	case FBIOGTYPE:
+	case FBIOGATTR:
+	case FBIOSVIDEO:
+	case FBIOGVIDEO:
+	case FBIOSCURSOR:
+	case FBIOGCURSOR:
+	case FBIOSCURPOS:
+	case FBIOGCURPOS:
+	case FBIOGCURMAX:
+
+	default:
+		error = ENODEV;
+		break;
+	}
+
+	splx(s);
+	return error;
+}
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index 561ac5758cce..ff13bd8ae47d 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: fbreg.h,v 1.2 1999/01/19 11:31:11 yokota Exp $
+ * $Id: fbreg.h,v 1.3 1999/04/12 13:34:56 des Exp $
  */
 
 #ifndef _DEV_FB_FBREG_H_
@@ -35,15 +35,22 @@
 
 /* some macros */
 #ifdef __i386__
-#define bcopy_toio(s, d, c)	generic_bcopy((void *)(s), (void *)(d), c)
-#define bcopy_fromio(s, d, c)	generic_bcopy((void *)(s), (void *)(d), c)
-#define bzero_io(d, c)		generic_bzero((void *)(d), c)
+#define bcopy_io(s, d, c)	generic_bcopy((void *)(s), (void *)(d), (c))
+#define bcopy_toio(s, d, c)	generic_bcopy((void *)(s), (void *)(d), (c))
+#define bcopy_fromio(s, d, c)	generic_bcopy((void *)(s), (void *)(d), (c))
+#define bzero_io(d, c)		generic_bzero((void *)(d), (c))
+#define fill_io(p, d, c)	fill((p), (void *)(d), (c))
+#define fillw_io(p, d, c)	fillw((p), (void *)(d), (c))
 void generic_bcopy(const void *s, void *d, size_t c);
 void generic_bzero(void *d, size_t c);
 #else /* !__i386__ */
-#define bcopy_toio(s, d, c)	memcpy_toio(d, s, c)
-#define bcopy_fromio(s, d, c)	memcpy_fromio(d, s, c)
-#define bzero_io(d, c)		memset_io(d, 0, c)
+#define bcopy_io(s, d, c)	memcpy_io((d), (s), (c))
+#define bcopy_toio(s, d, c)	memcpy_toio((d), (void *)(s), (c))
+#define bcopy_fromio(s, d, c)	memcpy_fromio((void *)(d), (s), (c))
+#define bzero_io(d, c)		memset_io((d), 0, (c))
+#define fill_io(p, d, c)	memset_io((d), (p), (c))
+#define fillw(p, d, c)		memsetw((d), (p), (c))
+#define fillw_io(p, d, c)	memsetw_io((d), (p), (c))
 #endif /* !__i386__ */
 
 /* video function table */
@@ -68,12 +75,16 @@ typedef int vi_set_hw_cursor_t(video_adapter_t *adp, int col, int row);
 typedef int vi_set_hw_cursor_shape_t(video_adapter_t *adp, int base,
 				     int height, int celsize, int blink);
 typedef int vi_blank_display_t(video_adapter_t *adp, int mode);
-#define V_DISPLAY_POWER_ON	0
-#define V_DISPLAY_SUSPEND	1
-#define V_DISPLAY_SUSPEND1	1
-#define V_DISPLAY_SUSPEND2	2
-#define V_DISPLAY_POWER_OFF	3
-typedef int vi_mmap_t(video_adapter_t *adp, vm_offset_t offset);
+#define V_DISPLAY_ON		0
+#define V_DISPLAY_BLANK		1
+#define V_DISPLAY_STAND_BY	2
+#define V_DISPLAY_SUSPEND	3
+typedef int vi_mmap_t(video_adapter_t *adp, vm_offset_t offset, int prot);
+typedef int vi_ioctl_t(video_adapter_t *adp, u_long cmd, caddr_t data);
+typedef int vi_clear_t(video_adapter_t *adp);
+typedef int vi_fill_rect_t(video_adapter_t *adp, int val, int x, int y,
+			   int cx, int cy);
+typedef int vi_bitblt_t(video_adapter_t *adp,...);
 typedef int vi_diag_t(video_adapter_t *adp, int level);
 
 typedef struct video_switch {
@@ -96,6 +107,12 @@ typedef struct video_switch {
     vi_set_hw_cursor_shape_t *set_hw_cursor_shape;
     vi_blank_display_t	*blank_display;
     vi_mmap_t		*mmap;
+    vi_ioctl_t		*ioctl;
+    vi_clear_t		*clear;
+    vi_fill_rect_t	*fill_rect;
+    vi_bitblt_t		*bitblt;
+    int			(*reserved1)(void);
+    int			(*reserved2)(void);
     vi_diag_t		*diag;
 } video_switch_t;
 
@@ -158,6 +175,26 @@ int		fb_attach(dev_t dev, video_adapter_t *adp,
 int		fb_detach(dev_t dev, video_adapter_t *adp,
 			  struct cdevsw *cdevsw);
 
+/* generic frame buffer cdev driver functions */
+
+typedef struct genfb_softc {
+	int		gfb_flags;	/* flag/status bits */
+#define FB_OPEN		(1 << 0)
+} genfb_softc_t;
+
+int		genfbopen(genfb_softc_t *sc, video_adapter_t *adp,
+			  int flag, int mode, struct proc *p);
+int		genfbclose(genfb_softc_t *sc, video_adapter_t *adp,
+			   int flag, int mode, struct proc *p);
+int		genfbread(genfb_softc_t *sc, video_adapter_t *adp,
+			  struct uio *uio, int flag);
+int		genfbwrite(genfb_softc_t *sc, video_adapter_t *adp,
+			   struct uio *uio, int flag);
+int		genfbioctl(genfb_softc_t *sc, video_adapter_t *adp,
+			   u_long cmd, caddr_t arg, int flag, struct proc *p);
+int		genfbmmap(genfb_softc_t *sc, video_adapter_t *adp,
+			  vm_offset_t offset, int prot);
+
 #endif /* FB_INSTALL_CDEV */
 
 /* generic low-level driver functions */
@@ -165,6 +202,8 @@ int		fb_detach(dev_t dev, video_adapter_t *adp,
 void		fb_dump_adp_info(char *driver, video_adapter_t *adp, int level);
 void		fb_dump_mode_info(char *driver, video_adapter_t *adp,
 				  video_info_t *info, int level);
+int		fb_type(int adp_type);
+int		fb_commonioctl(video_adapter_t *adp, u_long cmd, caddr_t arg);
 
 #endif /* KERNEL */
 
diff --git a/sys/dev/fb/splash.c b/sys/dev/fb/splash.c
index e8f9cf237cc9..40f1d01a5585 100644
--- a/sys/dev/fb/splash.c
+++ b/sys/dev/fb/splash.c
@@ -35,8 +35,7 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/linker.h>
-
-#include <machine/console.h>
+#include <sys/fbio.h>
 
 #include <dev/fb/fbreg.h>
 #include <dev/fb/splashreg.h>
@@ -51,7 +50,8 @@ static splash_decoder_t **decoder_set;
 #define DECODER_ARRAY_DELTA 4
 
 /* console driver callback */
-static int		(*splash_callback)(int);
+static int		(*splash_callback)(int, void *);
+static void		*splash_arg;
 
 static int
 splash_find_data(splash_decoder_t *decoder)
@@ -98,7 +98,7 @@ splash_new(splash_decoder_t *decoder)
 {
 	splash_decoder = decoder;
 	if (splash_callback != NULL)
-		(*splash_callback)(SPLASH_INIT);
+		(*splash_callback)(SPLASH_INIT, splash_arg);
 }
 
 int
@@ -159,12 +159,13 @@ splash_unregister(splash_decoder_t *decoder)
 }
 
 int
-splash_init(video_adapter_t *adp, int (*callback)(int))
+splash_init(video_adapter_t *adp, int (*callback)(int, void *), void *arg)
 {
 	int i;
 
 	splash_adp = adp;
 	splash_callback = callback;
+	splash_arg = arg;
 
 	splash_decoder = NULL;
 	for (i = 0; i < decoders; ++i) {
@@ -187,9 +188,11 @@ splash_term(video_adapter_t *adp)
 {
 	int error = 0;
 
+	if (splash_adp != adp)
+		return EINVAL;
 	if (splash_decoder != NULL) {
 		if (splash_callback != NULL)
-			error = (*splash_callback)(SPLASH_TERM);
+			error = (*splash_callback)(SPLASH_TERM, splash_arg);
 		if (error == 0)
 			error = (*splash_decoder->term)(adp);
 		if (error == 0)
diff --git a/sys/dev/fb/splash_bmp.c b/sys/dev/fb/splash_bmp.c
index 44ac914fd436..6de5a28274d2 100644
--- a/sys/dev/fb/splash_bmp.c
+++ b/sys/dev/fb/splash_bmp.c
@@ -24,15 +24,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: splash_bmp.c,v 1.7 1999/03/29 15:13:53 yokota Exp $
+ * $Id: splash_bmp.c,v 1.8 1999/06/16 14:04:45 yokota Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/linker.h>
-
-#include <machine/console.h>
+#include <sys/fbio.h>
 
 #include <dev/fb/fbreg.h>
 #include <dev/fb/splashreg.h>
diff --git a/sys/dev/fb/splash_pcx.c b/sys/dev/fb/splash_pcx.c
index 3066bb36654f..5423295f4e93 100644
--- a/sys/dev/fb/splash_pcx.c
+++ b/sys/dev/fb/splash_pcx.c
@@ -27,15 +27,14 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: splash_pcx.c,v 1.1 1999/04/12 13:39:11 des Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/linker.h>
-
-#include <machine/console.h>
+#include <sys/fbio.h>
 
 #include <dev/fb/fbreg.h>
 #include <dev/fb/splashreg.h>
diff --git a/sys/dev/fb/splashreg.h b/sys/dev/fb/splashreg.h
index fb785346202d..a34a3b953b3e 100644
--- a/sys/dev/fb/splashreg.h
+++ b/sys/dev/fb/splashreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: splashreg.h,v 1.1 1999/01/09 02:44:49 yokota Exp $
+ * $Id: splashreg.h,v 1.2 1999/01/11 03:06:28 yokota Exp $
  */
 
 #ifndef _DEV_FB_SPLASHREG_H_
@@ -91,7 +91,8 @@ int	splash_register(splash_decoder_t *decoder);
 int	splash_unregister(splash_decoder_t *decoder);
 
 /* entry points for the console driver */
-int	splash_init(video_adapter_t *adp, int (*callback)(int));
+int	splash_init(video_adapter_t *adp, int (*callback)(int, void *),
+		    void *arg);
 int	splash_term(video_adapter_t *adp);
 int	splash(video_adapter_t *adp, int on);
 
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
new file mode 100644
index 000000000000..91f99e95c161
--- /dev/null
+++ b/sys/dev/fb/vga.c
@@ -0,0 +1,3041 @@
+/*-
+ * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+ * Copyright (c) 1992-1998 Søren Schmidt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: $
+ */
+
+#include "vga.h"
+#include "opt_vga.h"
+#include "opt_fb.h"
+#include "opt_syscons.h"	/* should be removed in the future, XXX */
+
+#if NVGA > 0
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/fcntl.h>
+#include <sys/malloc.h>
+#include <sys/fbio.h>
+
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
+
+#include <machine/md_var.h>
+#include <machine/pc/bios.h>
+
+#include <dev/fb/fbreg.h>
+#include <dev/fb/vgareg.h>
+
+#include <isa/isareg.h>
+
+#ifndef VGA_DEBUG
+#define VGA_DEBUG		0
+#endif
+
+int
+vga_probe_unit(int unit, video_adapter_t *buf, int flags)
+{
+	video_adapter_t *adp;
+	video_switch_t *sw;
+	int error;
+
+	sw = vid_get_switch(VGA_DRIVER_NAME);
+	if (sw == NULL)
+		return 0;
+	error = (*sw->probe)(unit, &adp, NULL, flags);
+	if (error)
+		return error;
+	bcopy(adp, buf, sizeof(*buf));
+	return 0;
+}
+
+int
+vga_attach_unit(int unit, vga_softc_t *sc, int flags)
+{
+	video_switch_t *sw;
+	int error;
+
+	sw = vid_get_switch(VGA_DRIVER_NAME);
+	if (sw == NULL)
+		return ENXIO;
+
+	error = (*sw->probe)(unit, &sc->adp, NULL, flags);
+	if (error)
+		return error;
+	return (*sw->init)(unit, sc->adp, flags);
+}
+
+/* cdev driver functions */
+
+#ifdef FB_INSTALL_CDEV
+
+int
+vga_open(dev_t dev, vga_softc_t *sc, int flag, int mode, struct proc *p)
+{
+	if (sc == NULL)
+		return ENXIO;
+	if (mode & (O_CREAT | O_APPEND | O_TRUNC))
+		return ENODEV;
+
+	return genfbopen(&sc->gensc, sc->adp, flag, mode, p);
+}
+
+int
+vga_close(dev_t dev, vga_softc_t *sc, int flag, int mode, struct proc *p)
+{
+	return genfbclose(&sc->gensc, sc->adp, flag, mode, p);
+}
+
+int
+vga_read(dev_t dev, vga_softc_t *sc, struct uio *uio, int flag)
+{
+	return genfbread(&sc->gensc, sc->adp, uio, flag);
+}
+
+int
+vga_write(dev_t dev, vga_softc_t *sc, struct uio *uio, int flag)
+{
+	return genfbread(&sc->gensc, sc->adp, uio, flag);
+}
+
+int
+vga_ioctl(dev_t dev, vga_softc_t *sc, u_long cmd, caddr_t arg, int flag,
+	  struct proc *p)
+{
+	return genfbioctl(&sc->gensc, sc->adp, cmd, arg, flag, p);
+}
+
+int
+vga_mmap(dev_t dev, vga_softc_t *sc, vm_offset_t offset, int prot)
+{
+	return genfbmmap(&sc->gensc, sc->adp, offset, prot);
+}
+
+#endif /* FB_INSTALL_CDEV */
+
+/* LOW-LEVEL */
+
+#include <machine/clock.h>
+#include <machine/pc/vesa.h>
+
+#define probe_done(adp)		((adp)->va_flags & V_ADP_PROBED)
+#define init_done(adp)		((adp)->va_flags & V_ADP_INITIALIZED)
+#define config_done(adp)	((adp)->va_flags & V_ADP_REGISTERED)
+
+/* for compatibility with old kernel options */
+#ifdef SC_ALT_SEQACCESS
+#undef SC_ALT_SEQACCESS
+#undef VGA_ALT_SEQACCESS
+#define VGA_ALT_SEQACCESS	1
+#endif
+
+#ifdef SLOW_VGA
+#undef SLOW_VGA
+#undef VGA_SLOW_IOACCESS
+#define VGA_SLOW_IOACCESS	1
+#endif
+
+/* architecture dependent option */
+#ifdef __alpha__
+#define VGA_NO_BIOS		1
+#endif
+
+/* this should really be in `rtc.h' */
+#define RTC_EQUIPMENT           0x14
+
+/* various sizes */
+#define V_MODE_MAP_SIZE		(M_VGA_CG320 + 1)
+#define V_MODE_PARAM_SIZE	64
+
+/* video adapter state buffer */
+struct adp_state {
+    int			sig;
+#define V_STATE_SIG	0x736f6962
+    u_char		regs[V_MODE_PARAM_SIZE];
+};
+typedef struct adp_state adp_state_t;
+
+/* video adapter information */
+#define DCC_MONO	0
+#define DCC_CGA40	1
+#define DCC_CGA80	2
+#define DCC_EGAMONO	3
+#define DCC_EGA40	4
+#define DCC_EGA80	5
+
+/* 
+ * NOTE: `va_window' should have a virtual address, but is initialized
+ * with a physical address in the following table, as verify_adapter()
+ * will perform address conversion at run-time.
+ */
+static video_adapter_t adapter_init_value[] = {
+    /* DCC_MONO */
+    { 0, KD_MONO, "mda", 0, 0, 0, 	    IO_MDA, IO_MDASIZE, MONO_CRTC,
+      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 
+      0, 0, 0, 0, 7, 0, },
+    /* DCC_CGA40 */
+    { 0, KD_CGA,  "cga", 0, 0, V_ADP_COLOR, IO_CGA, IO_CGASIZE, COLOR_CRTC,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 
+      0, 0, 0, 0, 3, 0, },
+    /* DCC_CGA80 */
+    { 0, KD_CGA,  "cga", 0, 0, V_ADP_COLOR, IO_CGA, IO_CGASIZE, COLOR_CRTC,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 
+      0, 0, 0, 0, 3, 0, },
+    /* DCC_EGAMONO */
+    { 0, KD_EGA,  "ega", 0, 0, 0,	    IO_MDA, 48,	  MONO_CRTC,
+      EGA_BUF_BASE, EGA_BUF_SIZE, MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 
+      0, 0, 0, 0, 7, 0, },
+    /* DCC_EGA40 */
+    { 0, KD_EGA,  "ega", 0, 0, V_ADP_COLOR, IO_MDA, 48,	  COLOR_CRTC,
+      EGA_BUF_BASE, EGA_BUF_SIZE, CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 
+      0, 0, 0, 0, 3, 0, },
+    /* DCC_EGA80 */
+    { 0, KD_EGA,  "ega", 0, 0, V_ADP_COLOR, IO_MDA, 48,	  COLOR_CRTC,
+      EGA_BUF_BASE, EGA_BUF_SIZE, CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 
+      0, 0, 0, 0, 3, 0, },
+};
+
+static video_adapter_t	biosadapter[2];
+static int		biosadapters = 0;
+
+/* video driver declarations */
+static int			vga_configure(int flags);
+       int			(*vga_sub_configure)(int flags);
+static int			vga_nop(void);
+static int			vga_error(void);
+static vi_probe_t		vga_probe;
+static vi_init_t		vga_init;
+static vi_get_info_t		vga_get_info;
+static vi_query_mode_t		vga_query_mode;
+static vi_set_mode_t		vga_set_mode;
+static vi_save_font_t		vga_save_font;
+static vi_load_font_t		vga_load_font;
+static vi_show_font_t		vga_show_font;
+static vi_save_palette_t	vga_save_palette;
+static vi_load_palette_t	vga_load_palette;
+static vi_set_border_t		vga_set_border;
+static vi_save_state_t		vga_save_state;
+static vi_load_state_t		vga_load_state;
+static vi_set_win_org_t		vga_set_origin;
+static vi_read_hw_cursor_t	vga_read_hw_cursor;
+static vi_set_hw_cursor_t	vga_set_hw_cursor;
+static vi_set_hw_cursor_shape_t	vga_set_hw_cursor_shape;
+static vi_blank_display_t	vga_blank_display;
+static vi_mmap_t		vga_mmap_buf;
+static vi_ioctl_t		vga_dev_ioctl;
+#ifndef VGA_NO_MODE_CHANGE
+static vi_clear_t		vga_clear;
+static vi_fill_rect_t		vga_fill_rect;
+static vi_bitblt_t		vga_bitblt;
+#else /* VGA_NO_MODE_CHANGE */
+#define vga_clear		(vi_clear_t *)vga_error
+#define vga_fill_rect		(vi_fill_rect_t *)vga_error
+#define vga_bitblt		(vi_bitblt_t *)vga_error
+#endif
+static vi_diag_t		vga_diag;
+
+static video_switch_t vgavidsw = {
+	vga_probe,
+	vga_init,
+	vga_get_info,
+	vga_query_mode,	
+	vga_set_mode,
+	vga_save_font,
+	vga_load_font,
+	vga_show_font,
+	vga_save_palette,
+	vga_load_palette,
+	vga_set_border,
+	vga_save_state,
+	vga_load_state,
+	vga_set_origin,
+	vga_read_hw_cursor,
+	vga_set_hw_cursor,
+	vga_set_hw_cursor_shape,
+	vga_blank_display,
+	vga_mmap_buf,
+	vga_dev_ioctl,
+	vga_clear,
+	vga_fill_rect,
+	vga_bitblt,
+	vga_error,
+	vga_error,
+	vga_diag,
+};
+
+VIDEO_DRIVER(mda, vgavidsw, NULL);
+VIDEO_DRIVER(cga, vgavidsw, NULL);
+VIDEO_DRIVER(ega, vgavidsw, NULL);
+VIDEO_DRIVER(vga, vgavidsw, vga_configure);
+
+/* VGA BIOS standard video modes */
+#define EOT		(-1)
+#define NA		(-2)
+
+static video_info_t bios_vmode[] = {
+    /* CGA */
+    { M_B40x25,     V_INFO_COLOR, 40, 25, 8,  8, 2, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_C40x25,     V_INFO_COLOR, 40, 25, 8,  8, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_B80x25,     V_INFO_COLOR, 80, 25, 8,  8, 2, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_C80x25,     V_INFO_COLOR, 80, 25, 8,  8, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    /* EGA */
+    { M_ENH_B40x25, V_INFO_COLOR, 40, 25, 8, 14, 2, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_ENH_C40x25, V_INFO_COLOR, 40, 25, 8, 14, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_ENH_B80x25, V_INFO_COLOR, 80, 25, 8, 14, 2, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_ENH_C80x25, V_INFO_COLOR, 80, 25, 8, 14, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    /* VGA */
+    { M_VGA_C40x25, V_INFO_COLOR, 40, 25, 8, 16, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_M80x25, 0,            80, 25, 8, 16, 2, 1,
+      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_C80x25, V_INFO_COLOR, 80, 25, 8, 16, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    /* MDA */
+    { M_EGAMONO80x25, 0,          80, 25, 8, 14, 2, 1,
+      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    /* EGA */
+    { M_ENH_B80x43, 0,            80, 43, 8,  8, 2, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_ENH_C80x43, V_INFO_COLOR, 80, 43, 8,  8, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    /* VGA */
+    { M_VGA_M80x30, 0,            80, 30, 8, 16, 2, 1,
+      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_C80x30, V_INFO_COLOR, 80, 30, 8, 16, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_M80x50, 0,            80, 50, 8,  8, 2, 1,
+      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_C80x50, V_INFO_COLOR, 80, 50, 8,  8, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_M80x60, 0,            80, 60, 8,  8, 2, 1,
+      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_C80x60, V_INFO_COLOR, 80, 60, 8,  8, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+
+#ifndef VGA_NO_MODE_CHANGE
+
+#ifdef VGA_WIDTH90
+    { M_VGA_M90x25, 0,            90, 25, 8, 16, 2, 1,
+      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_C90x25, V_INFO_COLOR, 90, 25, 8, 16, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_M90x30, 0,            90, 30, 8, 16, 2, 1,
+      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_C90x30, V_INFO_COLOR, 90, 30, 8, 16, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_M90x43, 0,            90, 43, 8,  8, 2, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_C90x43, V_INFO_COLOR, 90, 43, 8,  8, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_M90x50, 0,            90, 50, 8,  8, 2, 1,
+      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_C90x50, V_INFO_COLOR, 90, 50, 8,  8, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_M90x60, 0,            90, 60, 8,  8, 2, 1,
+      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+    { M_VGA_C90x60, V_INFO_COLOR, 90, 60, 8,  8, 4, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+#endif /* VGA_WIDTH90 */
+
+    /* CGA */
+    { M_BG320,      V_INFO_COLOR | V_INFO_GRAPHICS, 320, 200, 8,  8, 2, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_CGA },
+    { M_CG320,      V_INFO_COLOR | V_INFO_GRAPHICS, 320, 200, 8,  8, 2, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_CGA },
+    { M_BG640,      V_INFO_COLOR | V_INFO_GRAPHICS, 640, 200, 8,  8, 1, 1,
+      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_CGA },
+    /* EGA */
+    { M_CG320_D,    V_INFO_COLOR | V_INFO_GRAPHICS, 320, 200, 8,  8, 4, 4,
+      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0,
+      V_INFO_MM_PLANAR },
+    { M_CG640_E,    V_INFO_COLOR | V_INFO_GRAPHICS, 640, 200, 8,  8, 4, 4,
+      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 ,
+      V_INFO_MM_PLANAR },
+    { M_EGAMONOAPA, V_INFO_GRAPHICS,                640, 350, 8, 14, 4, 4,
+      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, 64*1024, 0, 0 ,
+      V_INFO_MM_PLANAR },
+    { M_ENHMONOAPA2,V_INFO_GRAPHICS,                640, 350, 8, 14, 4, 4,
+      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 ,
+      V_INFO_MM_PLANAR },
+    { M_CG640x350,  V_INFO_COLOR | V_INFO_GRAPHICS, 640, 350, 8, 14, 2, 2,
+      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 ,
+      V_INFO_MM_PLANAR },
+    { M_ENH_CG640,  V_INFO_COLOR | V_INFO_GRAPHICS, 640, 350, 8, 14, 4, 4,
+      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 ,
+      V_INFO_MM_PLANAR },
+    /* VGA */
+    { M_BG640x480,  V_INFO_COLOR | V_INFO_GRAPHICS, 640, 480, 8, 16, 4, 4,
+      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 ,
+      V_INFO_MM_PLANAR },
+    { M_CG640x480,  V_INFO_COLOR | V_INFO_GRAPHICS, 640, 480, 8, 16, 4, 4,
+      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 ,
+      V_INFO_MM_PLANAR },
+    { M_VGA_CG320,  V_INFO_COLOR | V_INFO_GRAPHICS, 320, 200, 8,  8, 8, 1,
+      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0,
+      V_INFO_MM_PACKED, 1 },
+    { M_VGA_MODEX,  V_INFO_COLOR | V_INFO_GRAPHICS, 320, 240, 8,  8, 8, 1,
+      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0,
+      V_INFO_MM_PACKED, 1 },
+#endif /* VGA_NO_MODE_CHANGE */
+
+    { EOT },
+};
+
+static int		vga_init_done = FALSE;
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+static u_char		*video_mode_ptr = NULL;		/* EGA/VGA */
+static u_char		*video_mode_ptr2 = NULL;	/* CGA/MDA */
+#endif
+static u_char		*mode_map[V_MODE_MAP_SIZE];
+static adp_state_t	adpstate;
+static adp_state_t	adpstate2;
+static int		rows_offset = 1;
+
+/* local macros and functions */
+#define BIOS_SADDRTOLADDR(p) ((((p) & 0xffff0000) >> 12) + ((p) & 0x0000ffff))
+
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+static void map_mode_table(u_char *map[], u_char *table, int max);
+#endif
+static void clear_mode_map(video_adapter_t *adp, u_char *map[], int max,
+			   int color);
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+static int map_mode_num(int mode);
+#endif
+static int map_gen_mode_num(int type, int color, int mode);
+static int map_bios_mode_num(int type, int color, int bios_mode);
+static u_char *get_mode_param(int mode);
+#ifndef VGA_NO_BIOS
+static void fill_adapter_param(int code, video_adapter_t *adp);
+#endif
+static int verify_adapter(video_adapter_t *adp);
+static void update_adapter_info(video_adapter_t *adp, video_info_t *info);
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+#define COMP_IDENTICAL	0
+#define COMP_SIMILAR	1
+#define COMP_DIFFERENT	2
+static int comp_adpregs(u_char *buf1, u_char *buf2);
+#endif
+static int probe_adapters(void);
+static int set_line_length(video_adapter_t *adp, int pixel);
+static int set_display_start(video_adapter_t *adp, int x, int y);
+static void filll_io(int val, vm_offset_t d, size_t size);
+
+#ifndef VGA_NO_MODE_CHANGE
+#ifdef VGA_WIDTH90
+static void set_width90(adp_state_t *params);
+#endif
+#endif /* !VGA_NO_MODE_CHANGE */
+
+#ifndef VGA_NO_FONT_LOADING
+#define PARAM_BUFSIZE	6
+static void set_font_mode(video_adapter_t *adp, u_char *buf);
+static void set_normal_mode(video_adapter_t *adp, u_char *buf);
+#endif
+
+#ifndef VGA_NO_MODE_CHANGE
+static void planar_fill(video_adapter_t *adp, int val);
+static void packed_fill(video_adapter_t *adp, int val);
+static void direct_fill(video_adapter_t *adp, int val);
+#ifdef notyet
+static void planar_fill_rect(video_adapter_t *adp, int val, int x, int y,
+			     int cx, int cy);
+static void packed_fill_rect(video_adapter_t *adp, int val, int x, int y,
+			     int cx, int cy);
+static void direct_fill_rect16(video_adapter_t *adp, int val, int x, int y,
+			       int cx, int cy);
+static void direct_fill_rect24(video_adapter_t *adp, int val, int x, int y,
+			       int cx, int cy);
+static void direct_fill_rect32(video_adapter_t *adp, int val, int x, int y,
+			       int cx, int cy);
+#endif /* notyet */
+#endif /* !VGA_NO_MODE_CHANGE */
+
+static void dump_buffer(u_char *buf, size_t len);
+
+#define	ISMAPPED(pa, width)				\
+	(((pa) <= (u_long)0x1000 - (width)) 		\
+	 || ((pa) >= ISA_HOLE_START && (pa) <= 0x100000 - (width)))
+
+#define	prologue(adp, flag, err)			\
+	if (!vga_init_done || !((adp)->va_flags & (flag)))	\
+	    return (err)
+
+/* a backdoor for the console driver */
+static int
+vga_configure(int flags)
+{
+    int i;
+
+    probe_adapters();
+    for (i = 0; i < biosadapters; ++i) {
+	if (!probe_done(&biosadapter[i]))
+	    continue;
+	biosadapter[i].va_flags |= V_ADP_INITIALIZED;
+	if (!config_done(&biosadapter[i])) {
+	    if (vid_register(&biosadapter[i]) < 0)
+		continue;
+	    biosadapter[i].va_flags |= V_ADP_REGISTERED;
+	}
+    }
+    if (vga_sub_configure != NULL)
+	(*vga_sub_configure)(flags);
+
+    return biosadapters;
+}
+
+/* local subroutines */
+
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+/* construct the mode parameter map */
+static void
+map_mode_table(u_char *map[], u_char *table, int max)
+{
+    int i;
+
+    for(i = 0; i < max; ++i)
+	map[i] = table + i*V_MODE_PARAM_SIZE;
+    for(; i < V_MODE_MAP_SIZE; ++i)
+	map[i] = NULL;
+}
+#endif /* !VGA_NO_BIOS && !VGA_NO_MODE_CHANGE */
+
+static void
+clear_mode_map(video_adapter_t *adp, u_char *map[], int max, int color)
+{
+    video_info_t info;
+    int i;
+
+    /*
+     * NOTE: we don't touch `bios_vmode[]' because it is shared
+     * by all adapters.
+     */
+    for(i = 0; i < max; ++i) {
+	if (vga_get_info(adp, i, &info))
+	    continue;
+	if ((info.vi_flags & V_INFO_COLOR) != color)
+	    map[i] = NULL;
+    }
+}
+
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+/* map the non-standard video mode to a known mode number */
+static int
+map_mode_num(int mode)
+{
+    static struct {
+        int from;
+        int to;
+    } mode_map[] = {
+        { M_ENH_B80x43, M_ENH_B80x25 },
+        { M_ENH_C80x43, M_ENH_C80x25 },
+        { M_VGA_M80x30, M_VGA_M80x25 },
+        { M_VGA_C80x30, M_VGA_C80x25 },
+        { M_VGA_M80x50, M_VGA_M80x25 },
+        { M_VGA_C80x50, M_VGA_C80x25 },
+        { M_VGA_M80x60, M_VGA_M80x25 },
+        { M_VGA_C80x60, M_VGA_C80x25 },
+#ifdef VGA_WIDTH90
+        { M_VGA_M90x25, M_VGA_M80x25 },
+        { M_VGA_C90x25, M_VGA_C80x25 },
+        { M_VGA_M90x30, M_VGA_M80x25 },
+        { M_VGA_C90x30, M_VGA_C80x25 },
+        { M_VGA_M90x43, M_ENH_B80x25 },
+        { M_VGA_C90x43, M_ENH_C80x25 },
+        { M_VGA_M90x50, M_VGA_M80x25 },
+        { M_VGA_C90x50, M_VGA_C80x25 },
+        { M_VGA_M90x60, M_VGA_M80x25 },
+        { M_VGA_C90x60, M_VGA_C80x25 },
+#endif
+        { M_VGA_MODEX,  M_VGA_CG320 },
+    };
+    int i;
+
+    for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) {
+        if (mode_map[i].from == mode)
+            return mode_map[i].to;
+    }
+    return mode;
+}
+#endif /* !VGA_NO_BIOS && !VGA_NO_MODE_CHANGE */
+
+/* map a generic video mode to a known mode number */
+static int
+map_gen_mode_num(int type, int color, int mode)
+{
+    static struct {
+	int from;
+	int to_color;
+	int to_mono;
+    } mode_map[] = {
+	{ M_TEXT_80x30,	M_VGA_C80x30, M_VGA_M80x30, },
+	{ M_TEXT_80x43,	M_ENH_C80x43, M_ENH_B80x43, },
+	{ M_TEXT_80x50,	M_VGA_C80x50, M_VGA_M80x50, },
+	{ M_TEXT_80x60,	M_VGA_C80x60, M_VGA_M80x60, },
+    };
+    int i;
+
+    if (mode == M_TEXT_80x25) {
+	switch (type) {
+
+	case KD_VGA:
+	    if (color)
+		return M_VGA_C80x25;
+	    else
+		return M_VGA_M80x25;
+	    break;
+
+	case KD_EGA:
+	    if (color)
+		return M_ENH_C80x25;
+	    else
+		return M_EGAMONO80x25;
+	    break;
+
+	case KD_CGA:
+	    return M_C80x25;
+
+	case KD_MONO:
+	case KD_HERCULES:
+	    return M_EGAMONO80x25;	/* XXX: this name is confusing */
+
+ 	default:
+	    return -1;
+	}
+    }
+
+    for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) {
+        if (mode_map[i].from == mode)
+            return ((color) ? mode_map[i].to_color : mode_map[i].to_mono);
+    }
+    return mode;
+}
+
+/* turn the BIOS video number into our video mode number */
+static int
+map_bios_mode_num(int type, int color, int bios_mode)
+{
+    static int cga_modes[7] = {
+	M_B40x25, M_C40x25,		/* 0, 1 */
+	M_B80x25, M_C80x25,		/* 2, 3 */
+	M_BG320, M_CG320,
+	M_BG640,
+    };
+    static int ega_modes[17] = {
+	M_ENH_B40x25, M_ENH_C40x25,	/* 0, 1 */
+	M_ENH_B80x25, M_ENH_C80x25,	/* 2, 3 */
+	M_BG320, M_CG320,
+	M_BG640,
+	M_EGAMONO80x25,			/* 7 */
+	8, 9, 10, 11, 12,
+	M_CG320_D,
+	M_CG640_E,
+	M_ENHMONOAPA2,			/* XXX: video momery > 64K */
+	M_ENH_CG640,			/* XXX: video momery > 64K */
+    };
+    static int vga_modes[20] = {
+	M_VGA_C40x25, M_VGA_C40x25,	/* 0, 1 */
+	M_VGA_C80x25, M_VGA_C80x25,	/* 2, 3 */
+	M_BG320, M_CG320,
+	M_BG640,
+	M_VGA_M80x25,			/* 7 */
+	8, 9, 10, 11, 12,
+	M_CG320_D,
+	M_CG640_E,
+	M_ENHMONOAPA2,
+	M_ENH_CG640,
+	M_BG640x480, M_CG640x480, 
+	M_VGA_CG320,
+    };
+
+    switch (type) {
+
+    case KD_VGA:
+	if (bios_mode < sizeof(vga_modes)/sizeof(vga_modes[0]))
+	    return vga_modes[bios_mode];
+	else if (color)
+	    return M_VGA_C80x25;
+	else
+	    return M_VGA_M80x25;
+	break;
+
+    case KD_EGA:
+	if (bios_mode < sizeof(ega_modes)/sizeof(ega_modes[0]))
+	    return ega_modes[bios_mode];
+	else if (color)
+	    return M_ENH_C80x25;
+	else
+	    return M_EGAMONO80x25;
+	break;
+
+    case KD_CGA:
+	if (bios_mode < sizeof(cga_modes)/sizeof(cga_modes[0]))
+	    return cga_modes[bios_mode];
+	else
+	    return M_C80x25;
+	break;
+
+    case KD_MONO:
+    case KD_HERCULES:
+	return M_EGAMONO80x25;		/* XXX: this name is confusing */
+
+    default:
+	break;
+    }
+    return -1;
+}
+
+/* look up a parameter table entry */
+static u_char 
+*get_mode_param(int mode)
+{
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+    if (mode >= V_MODE_MAP_SIZE)
+	mode = map_mode_num(mode);
+#endif
+    if ((mode >= 0) && (mode < V_MODE_MAP_SIZE))
+	return mode_map[mode];
+    else
+	return NULL;
+}
+
+#ifndef VGA_NO_BIOS
+static void
+fill_adapter_param(int code, video_adapter_t *adp)
+{
+    static struct {
+	int primary;
+	int secondary;
+    } dcc[] = {
+	{ DCC_MONO, 			DCC_EGA40 /* CGA monitor */ },
+	{ DCC_MONO, 			DCC_EGA80 /* CGA monitor */ },
+	{ DCC_MONO, 			DCC_EGA80 /* CGA emulation */ },	
+	{ DCC_MONO, 			DCC_EGA80 },
+	{ DCC_CGA40, 			DCC_EGAMONO },
+	{ DCC_CGA80, 			DCC_EGAMONO },
+	{ DCC_EGA40 /* CGA monitor */, 	DCC_MONO},
+	{ DCC_EGA80 /* CGA monitor */, 	DCC_MONO},
+	{ DCC_EGA80 /* CGA emulation */,DCC_MONO },	
+	{ DCC_EGA80, 			DCC_MONO },
+	{ DCC_EGAMONO, 			DCC_CGA40 },
+	{ DCC_EGAMONO, 			DCC_CGA40 },
+    };
+
+    if ((code < 0) || (code >= sizeof(dcc)/sizeof(dcc[0]))) {
+	adp[V_ADP_PRIMARY] = adapter_init_value[DCC_MONO];
+	adp[V_ADP_SECONDARY] = adapter_init_value[DCC_CGA80];
+    } else {
+	adp[V_ADP_PRIMARY] = adapter_init_value[dcc[code].primary];
+	adp[V_ADP_SECONDARY] = adapter_init_value[dcc[code].secondary];
+    }
+}
+#endif /* VGA_NO_BIOS */
+
+static int
+verify_adapter(video_adapter_t *adp)
+{
+    vm_offset_t buf;
+    u_int16_t v;
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+    u_int32_t p;
+#endif
+
+    buf = BIOS_PADDRTOVADDR(adp->va_window);
+    v = readw(buf);
+    writew(buf, 0xA55A);
+    if (readw(buf) != 0xA55A)
+	return ENXIO;
+    writew(buf, v);
+
+    switch (adp->va_type) {
+
+    case KD_EGA:
+	outb(adp->va_crtc_addr, 7);
+	if (inb(adp->va_crtc_addr) == 7) {
+	    adp->va_type = KD_VGA;
+	    adp->va_name = "vga";
+	    adp->va_flags |= V_ADP_STATESAVE | V_ADP_PALETTE;
+	}
+	adp->va_flags |= V_ADP_STATELOAD | V_ADP_BORDER;
+	/* the color adapter may be in the 40x25 mode... XXX */
+
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+	/* get the BIOS video mode pointer */
+	p = *(u_int32_t *)BIOS_PADDRTOVADDR(0x4a8);
+	p = BIOS_SADDRTOLADDR(p);
+	if (ISMAPPED(p, sizeof(u_int32_t))) {
+	    p = *(u_int32_t *)BIOS_PADDRTOVADDR(p);
+	    p = BIOS_SADDRTOLADDR(p);
+	    if (ISMAPPED(p, V_MODE_PARAM_SIZE))
+		video_mode_ptr = (u_char *)BIOS_PADDRTOVADDR(p);
+	}
+#endif
+	break;
+
+    case KD_CGA:
+	adp->va_flags |= V_ADP_COLOR | V_ADP_BORDER;
+	/* may be in the 40x25 mode... XXX */
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+	/* get the BIOS video mode pointer */
+	p = *(u_int32_t *)BIOS_PADDRTOVADDR(0x1d*4);
+	p = BIOS_SADDRTOLADDR(p);
+	video_mode_ptr2 = (u_char *)BIOS_PADDRTOVADDR(p);
+#endif
+	break;
+
+    case KD_MONO:
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+	/* get the BIOS video mode pointer */
+	p = *(u_int32_t *)BIOS_PADDRTOVADDR(0x1d*4);
+	p = BIOS_SADDRTOLADDR(p);
+	video_mode_ptr2 = (u_char *)BIOS_PADDRTOVADDR(p);
+#endif
+	break;
+    }
+
+    return 0;
+}
+
+static void
+update_adapter_info(video_adapter_t *adp, video_info_t *info)
+{
+    adp->va_flags &= ~V_ADP_COLOR;
+    adp->va_flags |= 
+	(info->vi_flags & V_INFO_COLOR) ? V_ADP_COLOR : 0;
+    adp->va_crtc_addr =
+	(adp->va_flags & V_ADP_COLOR) ? COLOR_CRTC : MONO_CRTC;
+    adp->va_window = BIOS_PADDRTOVADDR(info->vi_window);
+    adp->va_window_size = info->vi_window_size;
+    adp->va_window_gran = info->vi_window_gran;
+    adp->va_window_orig = 0;
+    /* XXX */
+    adp->va_buffer = info->vi_buffer;
+    adp->va_buffer_size = info->vi_buffer_size;
+    if (info->vi_flags & V_INFO_GRAPHICS) {
+	switch (info->vi_depth/info->vi_planes) {
+	case 1:
+	    adp->va_line_width = info->vi_width/8;
+	    break;
+	case 2:
+	    adp->va_line_width = info->vi_width/4;
+	    break;
+	case 4:
+	    adp->va_line_width = info->vi_width/2;
+	    break;
+	case 8:
+	default: /* shouldn't happen */
+	    adp->va_line_width = info->vi_width;
+	    break;
+	}
+    } else {
+	adp->va_line_width = info->vi_width;
+    }
+    adp->va_disp_start.x = 0;
+    adp->va_disp_start.y = 0;
+    bcopy(info, &adp->va_info, sizeof(adp->va_info));
+}
+
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+/* compare two parameter table entries */
+static int 
+comp_adpregs(u_char *buf1, u_char *buf2)
+{
+    static struct {
+        u_char mask;
+    } params[V_MODE_PARAM_SIZE] = {
+	{0xff}, {0x00}, {0xff}, 		/* COLS}, ROWS}, POINTS */
+	{0x00}, {0x00}, 			/* page length */
+	{0xfe}, {0xff}, {0xff}, {0xff},		/* sequencer registers */
+	{0xf3},					/* misc register */
+	{0xff}, {0xff}, {0xff}, {0x7f}, {0xff},	/* CRTC */
+	{0xff}, {0xff}, {0xff}, {0x7f}, {0xff},
+	{0x00}, {0x00}, {0x00}, {0x00}, {0x00},
+	{0x00}, {0xff}, {0x7f}, {0xff}, {0xff},
+	{0x7f}, {0xff}, {0xff}, {0xef}, {0xff},
+	{0xff}, {0xff}, {0xff}, {0xff}, {0xff},	/* attribute controller regs */
+	{0xff}, {0xff}, {0xff}, {0xff}, {0xff},
+	{0xff}, {0xff}, {0xff}, {0xff}, {0xff},
+	{0xff}, {0xff}, {0xff}, {0xff}, {0xf0},
+	{0xff}, {0xff}, {0xff}, {0xff}, {0xff},	/* GDC register */
+	{0xff}, {0xff}, {0xff}, {0xff}, 
+    }; 
+    int identical = TRUE;
+    int i;
+
+    if ((buf1 == NULL) || (buf2 == NULL))
+	return COMP_DIFFERENT;
+
+    for (i = 0; i < sizeof(params)/sizeof(params[0]); ++i) {
+	if (params[i].mask == 0)	/* don't care */
+	    continue;
+	if ((buf1[i] & params[i].mask) != (buf2[i] & params[i].mask))
+	    return COMP_DIFFERENT;
+	if (buf1[i] != buf2[i])
+	    identical = FALSE;
+    }
+    return (identical) ? COMP_IDENTICAL : COMP_SIMILAR;
+}
+#endif /* !VGA_NO_BIOS && !VGA_NO_MODE_CHANGE */
+
+/* probe video adapters and return the number of detected adapters */
+static int
+probe_adapters(void)
+{
+    video_adapter_t *adp;
+    video_info_t info;
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+    u_char *mp;
+#endif
+    int i;
+
+    /* do this test only once */
+    if (vga_init_done)
+	return biosadapters;
+    vga_init_done = TRUE;
+
+    /* 
+     * Locate display adapters. 
+     * The AT architecture supports upto two adapters. `syscons' allows
+     * the following combinations of adapters: 
+     *     1) MDA + CGA
+     *     2) MDA + EGA/VGA color 
+     *     3) CGA + EGA/VGA mono
+     * Note that `syscons' doesn't bother with MCGA as it is only
+     * avaiable for low end PS/2 models which has 80286 or earlier CPUs,
+     * thus, they are not running FreeBSD!
+     * When there are two adapaters in the system, one becomes `primary'
+     * and the other `secondary'. The EGA adapter has a set of DIP 
+     * switches on board for this information and the EGA BIOS copies 
+     * it in the BIOS data area BIOSDATA_VIDEOSWITCH (40:88). 
+     * The VGA BIOS has more sophisticated mechanism and has this 
+     * information in BIOSDATA_DCCINDEX (40:8a), but it also maintains 
+     * compatibility with the EGA BIOS by updating BIOSDATA_VIDEOSWITCH.
+     */
+
+    /* 
+     * Check rtc and BIOS data area.
+     * XXX: we don't use BIOSDATA_EQUIPMENT, since it is not a dead
+     * copy of RTC_EQUIPMENT.  Bits 4 and 5 of ETC_EQUIPMENT are
+     * zeros for EGA and VGA.  However, the EGA/VGA BIOS sets
+     * these bits in BIOSDATA_EQUIPMENT according to the monitor
+     * type detected.
+     */
+#ifndef VGA_NO_BIOS
+    switch ((rtcin(RTC_EQUIPMENT) >> 4) & 3) {	/* bit 4 and 5 */
+    case 0:
+	/* EGA/VGA */
+	fill_adapter_param(readb(BIOS_PADDRTOVADDR(0x488)) & 0x0f, 
+			   biosadapter);
+	break;
+    case 1:
+	/* CGA 40x25 */
+	/* FIXME: switch to the 80x25 mode? XXX */
+	biosadapter[V_ADP_PRIMARY] = adapter_init_value[DCC_CGA40];
+	biosadapter[V_ADP_SECONDARY] = adapter_init_value[DCC_MONO];
+	break;
+    case 2:
+	/* CGA 80x25 */
+	biosadapter[V_ADP_PRIMARY] = adapter_init_value[DCC_CGA80];
+	biosadapter[V_ADP_SECONDARY] = adapter_init_value[DCC_MONO];
+	break;
+    case 3:
+	/* MDA */
+	biosadapter[V_ADP_PRIMARY] = adapter_init_value[DCC_MONO];
+	biosadapter[V_ADP_SECONDARY] = adapter_init_value[DCC_CGA80];
+	break;
+    }
+#else
+    /* assume EGA/VGA? XXX */
+    biosadapter[V_ADP_PRIMARY] = adapter_init_value[DCC_EGA80];
+    biosadapter[V_ADP_SECONDARY] = adapter_init_value[DCC_MONO];
+#endif /* VGA_NO_BIOS */
+
+    biosadapters = 0;
+    if (verify_adapter(&biosadapter[V_ADP_SECONDARY]) == 0) {
+	++biosadapters;
+	biosadapter[V_ADP_SECONDARY].va_flags |= V_ADP_PROBED;
+	biosadapter[V_ADP_SECONDARY].va_mode = 
+	    biosadapter[V_ADP_SECONDARY].va_initial_mode =
+	    map_bios_mode_num(biosadapter[V_ADP_SECONDARY].va_type, 
+			      biosadapter[V_ADP_SECONDARY].va_flags
+				  & V_ADP_COLOR,
+			      biosadapter[V_ADP_SECONDARY].va_initial_bios_mode);
+    } else {
+	biosadapter[V_ADP_SECONDARY].va_type = -1;
+    }
+    if (verify_adapter(&biosadapter[V_ADP_PRIMARY]) == 0) {
+	++biosadapters;
+	biosadapter[V_ADP_PRIMARY].va_flags |= V_ADP_PROBED;
+#ifndef VGA_NO_BIOS
+	biosadapter[V_ADP_PRIMARY].va_initial_bios_mode = 
+	    readb(BIOS_PADDRTOVADDR(0x449));
+#else
+	biosadapter[V_ADP_PRIMARY].va_initial_bios_mode = 3;	/* XXX */
+#endif
+	biosadapter[V_ADP_PRIMARY].va_mode = 
+	    biosadapter[V_ADP_PRIMARY].va_initial_mode =
+	    map_bios_mode_num(biosadapter[V_ADP_PRIMARY].va_type, 
+			      biosadapter[V_ADP_PRIMARY].va_flags & V_ADP_COLOR,
+			      biosadapter[V_ADP_PRIMARY].va_initial_bios_mode);
+    } else {
+	biosadapter[V_ADP_PRIMARY] = biosadapter[V_ADP_SECONDARY];
+	biosadapter[V_ADP_SECONDARY].va_type = -1;
+    }
+    if (biosadapters == 0)
+	return biosadapters;
+    biosadapter[V_ADP_PRIMARY].va_unit = V_ADP_PRIMARY;
+    biosadapter[V_ADP_SECONDARY].va_unit = V_ADP_SECONDARY;
+
+#if 0 /* we don't need these... */
+    fb_init_struct(&biosadapter[V_ADP_PRIMARY], ...);
+    fb_init_struct(&biosadapter[V_ADP_SECONDARY], ...);
+#endif
+
+#if notyet
+    /*
+     * We cannot have two video adapter of the same type; there must be
+     * only one of color or mono adapter, or one each of them.
+     */
+    if (biosadapters > 1) {
+	if (!((biosadapter[0].va_flags ^ biosadapter[1].va_flags)
+	      & V_ADP_COLOR))
+	    /* we have two mono or color adapters!! */
+	    return (biosadapters = 0);
+    }
+#endif
+
+    /*
+     * Ensure a zero start address.  This is mainly to recover after
+     * switching from pcvt using userconfig().  The registers are w/o
+     * for old hardware so it's too hard to relocate the active screen
+     * memory.
+     * This must be done before vga_save_state() for VGA.
+     */
+    outb(biosadapter[V_ADP_PRIMARY].va_crtc_addr, 12);
+    outb(biosadapter[V_ADP_PRIMARY].va_crtc_addr + 1, 0);
+    outb(biosadapter[V_ADP_PRIMARY].va_crtc_addr, 13);
+    outb(biosadapter[V_ADP_PRIMARY].va_crtc_addr + 1, 0);
+
+    /* the video mode parameter table in EGA/VGA BIOS */
+    /* NOTE: there can be only one EGA/VGA, wheather color or mono,
+     * recognized by the video BIOS.
+     */
+    if ((biosadapter[V_ADP_PRIMARY].va_type == KD_EGA) ||
+	(biosadapter[V_ADP_PRIMARY].va_type == KD_VGA)) {
+	adp = &biosadapter[V_ADP_PRIMARY];
+    } else if ((biosadapter[V_ADP_SECONDARY].va_type == KD_EGA) ||
+	       (biosadapter[V_ADP_SECONDARY].va_type == KD_VGA)) {
+	adp = &biosadapter[V_ADP_SECONDARY];
+    } else {
+	adp = NULL;
+    }
+    bzero(mode_map, sizeof(mode_map));
+    if (adp != NULL) {
+	if (adp->va_type == KD_VGA) {
+	    vga_save_state(adp, &adpstate, sizeof(adpstate));
+#if defined(VGA_NO_BIOS) || defined(VGA_NO_MODE_CHANGE)
+	    mode_map[adp->va_initial_mode] = adpstate.regs;
+	    rows_offset = 1;
+#else /* VGA_NO_BIOS || VGA_NO_MODE_CHANGE */
+	    if (video_mode_ptr == NULL) {
+		mode_map[adp->va_initial_mode] = adpstate.regs;
+		rows_offset = 1;
+	    } else {
+		/* discard the table if we are not familiar with it... */
+		map_mode_table(mode_map, video_mode_ptr, M_VGA_CG320 + 1);
+		mp = get_mode_param(adp->va_initial_mode);
+		if (mp != NULL)
+		    bcopy(mp, adpstate2.regs, sizeof(adpstate2.regs));
+		switch (comp_adpregs(adpstate.regs, mp)) {
+		case COMP_IDENTICAL:
+		    /*
+		     * OK, this parameter table looks reasonably familiar
+		     * to us...
+		     */
+		    /* 
+		     * This is a kludge for Toshiba DynaBook SS433 
+		     * whose BIOS video mode table entry has the actual # 
+		     * of rows at the offset 1; BIOSes from other 
+		     * manufacturers store the # of rows - 1 there. XXX
+		     */
+		    rows_offset = adpstate.regs[1] + 1 - mp[1];
+		    break;
+
+		case COMP_SIMILAR:
+		    /*
+		     * Not exactly the same, but similar enough to be
+		     * trusted. However, use the saved register values
+		     * for the initial mode and other modes which are
+		     * based on the initial mode.
+		     */
+		    mode_map[adp->va_initial_mode] = adpstate.regs;
+		    rows_offset = adpstate.regs[1] + 1 - mp[1];
+		    adpstate.regs[1] -= rows_offset - 1;
+		    break;
+
+		case COMP_DIFFERENT:
+		default:
+		    /*
+		     * Don't use the paramter table in BIOS. It doesn't
+		     * look familiar to us. Video mode switching is allowed
+		     * only if the new mode is the same as or based on
+		     * the initial mode. 
+		     */
+		    video_mode_ptr = NULL;
+		    bzero(mode_map, sizeof(mode_map));
+		    mode_map[adp->va_initial_mode] = adpstate.regs;
+		    rows_offset = 1;
+		    break;
+		}
+	    }
+#endif /* VGA_NO_BIOS || VGA_NO_MODE_CHANGE */
+
+#ifndef VGA_NO_MODE_CHANGE
+	    adp->va_flags |= V_ADP_MODECHANGE;
+#endif
+#ifndef VGA_NO_FONT_LOADING
+	    adp->va_flags |= V_ADP_FONT;
+#endif
+	} else if (adp->va_type == KD_EGA) {
+#if defined(VGA_NO_BIOS) || defined(VGA_NO_MODE_CHANGE)
+	    rows_offset = 1;
+#else /* VGA_NO_BIOS || VGA_NO_MODE_CHANGE */
+	    if (video_mode_ptr == NULL) {
+		rows_offset = 1;
+	    } else {
+		map_mode_table(mode_map, video_mode_ptr, M_ENH_C80x25 + 1);
+		/* XXX how can one validate the EGA table... */
+		mp = get_mode_param(adp->va_initial_mode);
+		if (mp != NULL) {
+		    adp->va_flags |= V_ADP_MODECHANGE;
+#ifndef VGA_NO_FONT_LOADING
+		    adp->va_flags |= V_ADP_FONT;
+#endif
+		    rows_offset = 1;
+		} else {
+		    /*
+		     * This is serious. We will not be able to switch video
+		     * modes at all...
+		     */
+		    video_mode_ptr = NULL;
+		    bzero(mode_map, sizeof(mode_map));
+		    rows_offset = 1;
+                }
+	    }
+#endif /* VGA_NO_BIOS || VGA_NO_MODE_CHANGE */
+	}
+    }
+
+    /* remove conflicting modes if we have more than one adapter */
+    if (biosadapters > 1) {
+	for (i = 0; i < biosadapters; ++i) {
+	    if (!(biosadapter[i].va_flags & V_ADP_MODECHANGE))
+		continue;
+	    clear_mode_map(&biosadapter[i], mode_map, M_VGA_CG320 + 1,
+			   (biosadapter[i].va_flags & V_ADP_COLOR) ? 
+			       V_INFO_COLOR : 0);
+	    if ((biosadapter[i].va_type == KD_VGA)
+		|| (biosadapter[i].va_type == KD_EGA)) {
+		biosadapter[i].va_io_base =
+		    (biosadapter[i].va_flags & V_ADP_COLOR) ?
+			IO_VGA : IO_MDA;
+		biosadapter[i].va_io_size = 32;
+	    }
+	}
+    }
+
+    /* buffer address */
+    vga_get_info(&biosadapter[V_ADP_PRIMARY],
+		 biosadapter[V_ADP_PRIMARY].va_initial_mode, &info);
+    info.vi_flags &= ~V_INFO_LINEAR; /* XXX */
+    update_adapter_info(&biosadapter[V_ADP_PRIMARY], &info);
+
+    if (biosadapters > 1) {
+	vga_get_info(&biosadapter[V_ADP_SECONDARY],
+		     biosadapter[V_ADP_SECONDARY].va_initial_mode, &info);
+	info.vi_flags &= ~V_INFO_LINEAR; /* XXX */
+	update_adapter_info(&biosadapter[V_ADP_SECONDARY], &info);
+    }
+
+    /*
+     * XXX: we should verify the following values for the primary adapter...
+     * crtc I/O port address: *(u_int16_t *)BIOS_PADDRTOVADDR(0x463);
+     * color/mono display: (*(u_int8_t *)BIOS_PADDRTOVADDR(0x487) & 0x02) 
+     *                     ? 0 : V_ADP_COLOR;
+     * columns: *(u_int8_t *)BIOS_PADDRTOVADDR(0x44a);
+     * rows: *(u_int8_t *)BIOS_PADDRTOVADDR(0x484);
+     * font size: *(u_int8_t *)BIOS_PADDRTOVADDR(0x485);
+     * buffer size: *(u_int16_t *)BIOS_PADDRTOVADDR(0x44c);
+     */
+
+    return biosadapters;
+}
+
+/* set the scan line length in pixel */
+static int
+set_line_length(video_adapter_t *adp, int pixel)
+{
+    u_char *mp;
+    int ppw;	/* pixels per word */
+    int bpl;	/* bytes per line */
+    int count;
+
+    if ((adp->va_type != KD_VGA) && (adp->va_type != KD_EGA))
+	return ENODEV;
+    mp = get_mode_param(adp->va_mode);
+    if (mp == NULL)
+	return EINVAL;
+
+    switch (adp->va_info.vi_mem_model) {
+    case V_INFO_MM_PLANAR:
+	ppw = 16/(adp->va_info.vi_depth/adp->va_info.vi_planes);
+	count = (pixel + ppw - 1)/ppw/2;
+	bpl = ((pixel + ppw - 1)/ppw/2)*4;
+	break;
+    case V_INFO_MM_PACKED:
+	count = (pixel + 7)/8;
+	bpl = ((pixel + 7)/8)*8;
+	break;
+    case V_INFO_MM_TEXT:
+	count = (pixel + 7)/8;			/* columns */
+	bpl = (pixel + 7)/8;			/* columns */
+	break;
+    default:
+	return ENODEV;
+    }
+
+    if (mp[10 + 0x17] & 0x40)			/* CRTC mode control reg */
+	count *= 2;				/* byte mode */
+    outb(adp->va_crtc_addr, 0x13);
+    outb(adp->va_crtc_addr + 1, count);
+    adp->va_line_width = bpl;
+
+    return 0;
+}
+
+static int
+set_display_start(video_adapter_t *adp, int x, int y)
+{
+    int off;	/* byte offset (graphics mode)/word offset (text mode) */
+    int poff;	/* pixel offset */
+    int roff;	/* row offset */
+    int ppb;	/* pixels per byte */
+
+    if ((adp->va_type != KD_VGA) && (adp->va_type != KD_EGA))
+	x &= ~7;
+    if (adp->va_info.vi_flags & V_INFO_GRAPHICS) {
+	ppb = 8/(adp->va_info.vi_depth/adp->va_info.vi_planes);
+	off = y*adp->va_line_width + x/ppb;
+	roff = 0;
+	poff = x%ppb;
+    } else {
+	if ((adp->va_type == KD_VGA) || (adp->va_type == KD_EGA)) {
+	    outb(TSIDX, 1);
+	    if (inb(TSREG) & 1)
+		ppb = 9;
+	    else
+		ppb = 8;
+	} else {
+	    ppb = 8;
+	}
+	off = y/adp->va_info.vi_cheight*adp->va_line_width + x/ppb;
+	roff = y%adp->va_info.vi_cheight;
+	/* FIXME: is this correct? XXX */
+	if (ppb == 8)
+	    poff = x%ppb;
+	else
+	    poff = (x + 8)%ppb;
+    }
+
+    /* start address */
+    outb(adp->va_crtc_addr, 0xc);		/* high */
+    outb(adp->va_crtc_addr + 1, off >> 8);
+    outb(adp->va_crtc_addr, 0xd);		/* low */
+    outb(adp->va_crtc_addr + 1, off & 0xff);
+
+    /* horizontal pel pan */
+    if ((adp->va_type == KD_VGA) || (adp->va_type == KD_EGA)) {
+	inb(adp->va_crtc_addr + 6);
+	outb(ATC, 0x13 | 0x20);
+	outb(ATC, poff);
+	inb(adp->va_crtc_addr + 6);
+	outb(ATC, 0x20);
+    }
+
+    /* preset raw scan */
+    outb(adp->va_crtc_addr, 8);
+    outb(adp->va_crtc_addr + 1, roff);
+
+    adp->va_disp_start.x = x;
+    adp->va_disp_start.y = y;
+    return 0;
+}
+
+#ifdef __i386__	/* XXX */
+static void
+fill(int val, void *d, size_t size)
+{
+    u_char *p = d;
+
+    while (size-- > 0)
+	*p++ = val;
+}
+#endif /* __i386__ */
+
+static void
+filll_io(int val, vm_offset_t d, size_t size)
+{
+    while (size-- > 0) {
+	writel(d, val);
+	d += sizeof(u_int32_t);
+    }
+}
+
+/* entry points */
+
+static int
+vga_nop(void)
+{
+    return 0;
+}
+
+static int
+vga_error(void)
+{
+    return ENODEV;
+}
+
+static int
+vga_probe(int unit, video_adapter_t **adpp, void *arg, int flags)
+{
+    probe_adapters();
+    if (unit >= biosadapters)
+	return ENXIO;
+
+    *adpp = &biosadapter[unit];
+
+    return 0;
+}
+
+static int
+vga_init(int unit, video_adapter_t *adp, int flags)
+{
+    if ((unit >= biosadapters) || (adp == NULL) || !probe_done(adp))
+	return ENXIO;
+
+    if (!init_done(adp)) {
+	/* nothing to do really... */
+	adp->va_flags |= V_ADP_INITIALIZED;
+    }
+
+    if (!config_done(adp)) {
+	if (vid_register(adp) < 0)
+		return ENXIO;
+	adp->va_flags |= V_ADP_REGISTERED;
+    }
+    if (vga_sub_configure != NULL)
+	(*vga_sub_configure)(0);
+
+    return 0;
+}
+
+/*
+ * get_info():
+ * Return the video_info structure of the requested video mode.
+ *
+ * all adapters
+ */
+static int
+vga_get_info(video_adapter_t *adp, int mode, video_info_t *info)
+{
+    int i;
+
+    if (!vga_init_done)
+	return ENXIO;
+
+    mode = map_gen_mode_num(adp->va_type, adp->va_flags & V_ADP_COLOR, mode);
+#ifndef VGA_NO_MODE_CHANGE
+    if (adp->va_flags & V_ADP_MODECHANGE) {
+	/*
+	 * If the parameter table entry for this mode is not found, 
+	 * the mode is not supported...
+	 */
+	if (get_mode_param(mode) == NULL)
+	    return EINVAL;
+    } else
+#endif /* VGA_NO_MODE_CHANGE */
+    {
+	/* 
+	 * Even if we don't support video mode switching on this adapter,
+	 * the information on the initial (thus current) video mode 
+	 * should be made available.
+	 */
+	if (mode != adp->va_initial_mode)
+	    return EINVAL;
+    }
+
+    for (i = 0; bios_vmode[i].vi_mode != EOT; ++i) {
+	if (bios_vmode[i].vi_mode == NA)
+	    continue;
+	if (mode == bios_vmode[i].vi_mode) {
+	    *info = bios_vmode[i];
+	    /* XXX */
+	    info->vi_buffer_size = info->vi_window_size*info->vi_planes;
+	    return 0;
+	}
+    }
+    return EINVAL;
+}
+
+/*
+ * query_mode():
+ * Find a video mode matching the requested parameters.
+ * Fields filled with 0 are considered "don't care" fields and
+ * match any modes.
+ *
+ * all adapters
+ */
+static int
+vga_query_mode(video_adapter_t *adp, video_info_t *info)
+{
+    video_info_t buf;
+    int i;
+
+    if (!vga_init_done)
+	return -1;
+
+    for (i = 0; bios_vmode[i].vi_mode != EOT; ++i) {
+	if (bios_vmode[i].vi_mode == NA)
+	    continue;
+
+	if ((info->vi_width != 0)
+	    && (info->vi_width != bios_vmode[i].vi_width))
+		continue;
+	if ((info->vi_height != 0)
+	    && (info->vi_height != bios_vmode[i].vi_height))
+		continue;
+	if ((info->vi_cwidth != 0)
+	    && (info->vi_cwidth != bios_vmode[i].vi_cwidth))
+		continue;
+	if ((info->vi_cheight != 0)
+	    && (info->vi_cheight != bios_vmode[i].vi_cheight))
+		continue;
+	if ((info->vi_depth != 0)
+	    && (info->vi_depth != bios_vmode[i].vi_depth))
+		continue;
+	if ((info->vi_planes != 0)
+	    && (info->vi_planes != bios_vmode[i].vi_planes))
+		continue;
+	/* XXX: should check pixel format, memory model */
+	if ((info->vi_flags != 0)
+	    && (info->vi_flags != bios_vmode[i].vi_flags))
+		continue;
+
+	/* verify if this mode is supported on this adapter */
+	if (vga_get_info(adp, bios_vmode[i].vi_mode, &buf))
+		continue;
+	return bios_vmode[i].vi_mode;
+    }
+    return -1;
+}
+
+/*
+ * set_mode():
+ * Change the video mode.
+ *
+ * EGA/VGA
+ */
+
+#ifndef VGA_NO_MODE_CHANGE
+#ifdef VGA_WIDTH90
+static void
+set_width90(adp_state_t *params)
+{
+    /* 
+     * Based on code submitted by Kelly Yancey (kbyanc@freedomnet.com)
+     * and alexv@sui.gda.itesm.mx.
+     */
+    params->regs[5] |= 1;		/* toggle 8 pixel wide fonts */
+    params->regs[10+0x0] = 0x6b;
+    params->regs[10+0x1] = 0x59;
+    params->regs[10+0x2] = 0x5a;
+    params->regs[10+0x3] = 0x8e;
+    params->regs[10+0x4] = 0x5e;
+    params->regs[10+0x5] = 0x8a;
+    params->regs[10+0x13] = 45;
+    params->regs[35+0x13] = 0;
+}
+#endif /* VGA_WIDTH90 */
+#endif /* !VGA_NO_MODE_CHANGE */
+
+static int
+vga_set_mode(video_adapter_t *adp, int mode)
+{
+#ifndef VGA_NO_MODE_CHANGE
+    video_info_t info;
+    adp_state_t params;
+
+    prologue(adp, V_ADP_MODECHANGE, ENODEV);
+
+    mode = map_gen_mode_num(adp->va_type, 
+			    adp->va_flags & V_ADP_COLOR, mode);
+    if (vga_get_info(adp, mode, &info))
+	return EINVAL;
+
+#if VGA_DEBUG > 1
+    printf("vga_set_mode(): setting mode %d\n", mode);
+#endif
+
+    params.sig = V_STATE_SIG;
+    bcopy(get_mode_param(mode), params.regs, sizeof(params.regs));
+
+    switch (mode) {
+#ifdef VGA_WIDTH90
+    case M_VGA_C90x60: case M_VGA_M90x60:
+	set_width90(&params);
+	/* FALL THROUGH */
+#endif
+    case M_VGA_C80x60: case M_VGA_M80x60:
+	params.regs[2]  = 0x08;
+	params.regs[19] = 0x47;
+	goto special_480l;
+
+#ifdef VGA_WIDTH90
+    case M_VGA_C90x30: case M_VGA_M90x30:
+	set_width90(&params);
+	/* FALL THROUGH */
+#endif
+    case M_VGA_C80x30: case M_VGA_M80x30:
+	params.regs[19] = 0x4f;
+special_480l:
+	params.regs[9] |= 0xc0;
+	params.regs[16] = 0x08;
+	params.regs[17] = 0x3e;
+	params.regs[26] = 0xea;
+	params.regs[28] = 0xdf;
+	params.regs[31] = 0xe7;
+	params.regs[32] = 0x04;
+	goto setup_mode;
+
+#ifdef VGA_WIDTH90
+    case M_VGA_C90x43: case M_VGA_M90x43:
+	set_width90(&params);
+	/* FALL THROUGH */
+#endif
+    case M_ENH_C80x43: case M_ENH_B80x43:
+	params.regs[28] = 87;
+	goto special_80x50;
+
+#ifdef VGA_WIDTH90
+    case M_VGA_C90x50: case M_VGA_M90x50:
+	set_width90(&params);
+	/* FALL THROUGH */
+#endif
+    case M_VGA_C80x50: case M_VGA_M80x50:
+special_80x50:
+	params.regs[2] = 8;
+	params.regs[19] = 7;
+	goto setup_mode;
+
+#ifdef VGA_WIDTH90
+    case M_VGA_C90x25: case M_VGA_M90x25:
+	set_width90(&params);
+	/* FALL THROUGH */
+#endif
+    case M_VGA_C40x25: case M_VGA_C80x25:
+    case M_VGA_M80x25:
+    case M_B40x25:     case M_C40x25:
+    case M_B80x25:     case M_C80x25:
+    case M_ENH_B40x25: case M_ENH_C40x25:
+    case M_ENH_B80x25: case M_ENH_C80x25:
+    case M_EGAMONO80x25:
+
+setup_mode:
+	vga_load_state(adp, &params);
+	break;
+
+    case M_VGA_MODEX:
+	/* "unchain" the VGA mode */
+	params.regs[5-1+0x04] &= 0xf7;
+	params.regs[5-1+0x04] |= 0x04;
+	/* turn off doubleword mode */
+	params.regs[10+0x14] &= 0xbf;
+	/* turn off word adressing */
+	params.regs[10+0x17] |= 0x40;
+	/* set logical screen width */
+	params.regs[10+0x13] = 80;
+	/* set 240 lines */
+	params.regs[10+0x11] = 0x2c;
+	params.regs[10+0x06] = 0x0d;
+	params.regs[10+0x07] = 0x3e;
+	params.regs[10+0x10] = 0xea;
+	params.regs[10+0x11] = 0xac;
+	params.regs[10+0x12] = 0xdf;
+	params.regs[10+0x15] = 0xe7;
+	params.regs[10+0x16] = 0x06;
+	/* set vertical sync polarity to reflect aspect ratio */
+	params.regs[9] = 0xe3;
+	goto setup_grmode;
+
+    case M_BG320:     case M_CG320:     case M_BG640:
+    case M_CG320_D:   case M_CG640_E:
+    case M_CG640x350: case M_ENH_CG640:
+    case M_BG640x480: case M_CG640x480: case M_VGA_CG320:
+
+setup_grmode:
+	vga_load_state(adp, &params);
+	break;
+
+    default:
+	return EINVAL;
+    }
+
+    adp->va_mode = mode;
+    info.vi_flags &= ~V_INFO_LINEAR; /* XXX */
+    update_adapter_info(adp, &info);
+
+    /* move hardware cursor out of the way */
+    (*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
+
+    return 0;
+#else /* VGA_NO_MODE_CHANGE */
+    return ENODEV;
+#endif /* VGA_NO_MODE_CHANGE */
+}
+
+#ifndef VGA_NO_FONT_LOADING
+
+static void
+set_font_mode(video_adapter_t *adp, u_char *buf)
+{
+    u_char *mp;
+    int s;
+
+    s = splhigh();
+
+    /* save register values */
+    if (adp->va_type == KD_VGA) {
+	outb(TSIDX, 0x02); buf[0] = inb(TSREG);
+	outb(TSIDX, 0x04); buf[1] = inb(TSREG);
+	outb(GDCIDX, 0x04); buf[2] = inb(GDCREG);
+	outb(GDCIDX, 0x05); buf[3] = inb(GDCREG);
+	outb(GDCIDX, 0x06); buf[4] = inb(GDCREG);
+	inb(adp->va_crtc_addr + 6);
+	outb(ATC, 0x10); buf[5] = inb(ATC + 1);
+    } else /* if (adp->va_type == KD_EGA) */ {
+	/* 
+	 * EGA cannot be read; copy parameters from the mode parameter 
+	 * table. 
+	 */
+	mp = get_mode_param(adp->va_mode);
+	buf[0] = mp[5 + 0x02 - 1];
+	buf[1] = mp[5 + 0x04 - 1];
+	buf[2] = mp[55 + 0x04];
+	buf[3] = mp[55 + 0x05];
+	buf[4] = mp[55 + 0x06];
+	buf[5] = mp[35 + 0x10];
+    }
+
+    /* setup vga for loading fonts */
+    inb(adp->va_crtc_addr + 6);			/* reset flip-flop */
+    outb(ATC, 0x10); outb(ATC, buf[5] & ~0x01);
+    inb(adp->va_crtc_addr + 6);			/* reset flip-flop */
+    outb(ATC, 0x20);				/* enable palette */
+
+#if VGA_SLOW_IOACCESS
+#ifdef VGA_ALT_SEQACCESS
+    outb(TSIDX, 0x00); outb(TSREG, 0x01);
+#endif
+    outb(TSIDX, 0x02); outb(TSREG, 0x04);
+    outb(TSIDX, 0x04); outb(TSREG, 0x07);
+#ifdef VGA_ALT_SEQACCESS
+    outb(TSIDX, 0x00); outb(TSREG, 0x03);
+#endif
+    outb(GDCIDX, 0x04); outb(GDCREG, 0x02);
+    outb(GDCIDX, 0x05); outb(GDCREG, 0x00);
+    outb(GDCIDX, 0x06); outb(GDCREG, 0x04);
+#else /* VGA_SLOW_IOACCESS */
+#ifdef VGA_ALT_SEQACCESS
+    outw(TSIDX, 0x0100);
+#endif
+    outw(TSIDX, 0x0402);
+    outw(TSIDX, 0x0704);
+#ifdef VGA_ALT_SEQACCESS
+    outw(TSIDX, 0x0300);
+#endif
+    outw(GDCIDX, 0x0204);
+    outw(GDCIDX, 0x0005);
+    outw(GDCIDX, 0x0406);               /* addr = a0000, 64kb */
+#endif /* VGA_SLOW_IOACCESS */
+
+    splx(s);
+}
+
+static void
+set_normal_mode(video_adapter_t *adp, u_char *buf)
+{
+    int s;
+
+    s = splhigh();
+
+    /* setup vga for normal operation mode again */
+    inb(adp->va_crtc_addr + 6);			/* reset flip-flop */
+    outb(ATC, 0x10); outb(ATC, buf[5]);
+    inb(adp->va_crtc_addr + 6);			/* reset flip-flop */
+    outb(ATC, 0x20);				/* enable palette */
+
+#if VGA_SLOW_IOACCESS
+#ifdef VGA_ALT_SEQACCESS
+    outb(TSIDX, 0x00); outb(TSREG, 0x01);
+#endif
+    outb(TSIDX, 0x02); outb(TSREG, buf[0]);
+    outb(TSIDX, 0x04); outb(TSREG, buf[1]);
+#ifdef VGA_ALT_SEQACCESS
+    outb(TSIDX, 0x00); outb(TSREG, 0x03);
+#endif
+    outb(GDCIDX, 0x04); outb(GDCREG, buf[2]);
+    outb(GDCIDX, 0x05); outb(GDCREG, buf[3]);
+    if (adp->va_crtc_addr == MONO_CRTC) {
+	outb(GDCIDX, 0x06); outb(GDCREG,(buf[4] & 0x03) | 0x08);
+    } else {
+	outb(GDCIDX, 0x06); outb(GDCREG,(buf[4] & 0x03) | 0x0c);
+    }
+#else /* VGA_SLOW_IOACCESS */
+#ifdef VGA_ALT_SEQACCESS
+    outw(TSIDX, 0x0100);
+#endif
+    outw(TSIDX, 0x0002 | (buf[0] << 8));
+    outw(TSIDX, 0x0004 | (buf[1] << 8));
+#ifdef VGA_ALT_SEQACCESS
+    outw(TSIDX, 0x0300);
+#endif
+    outw(GDCIDX, 0x0004 | (buf[2] << 8));
+    outw(GDCIDX, 0x0005 | (buf[3] << 8));
+    if (adp->va_crtc_addr == MONO_CRTC)
+        outw(GDCIDX, 0x0006 | (((buf[4] & 0x03) | 0x08)<<8));
+    else
+        outw(GDCIDX, 0x0006 | (((buf[4] & 0x03) | 0x0c)<<8));
+#endif /* VGA_SLOW_IOACCESS */
+
+    splx(s);
+}
+
+#endif /* VGA_NO_FONT_LOADING */
+
+/*
+ * save_font():
+ * Read the font data in the requested font page from the video adapter.
+ *
+ * EGA/VGA
+ */
+static int
+vga_save_font(video_adapter_t *adp, int page, int fontsize, u_char *data,
+	      int ch, int count)
+{
+#ifndef VGA_NO_FONT_LOADING
+    u_char buf[PARAM_BUFSIZE];
+    u_int32_t segment;
+    int c;
+#ifdef VGA_ALT_SEQACCESS
+    int s;
+    u_char val = 0;
+#endif
+
+    prologue(adp, V_ADP_FONT, ENODEV);
+
+    if (fontsize < 14) {
+	/* FONT_8 */
+	fontsize = 8;
+    } else if (fontsize >= 32) {
+	fontsize = 32;
+    } else if (fontsize >= 16) {
+	/* FONT_16 */
+	fontsize = 16;
+    } else {
+	/* FONT_14 */
+	fontsize = 14;
+    }
+
+    if (page < 0 || page >= 8)
+	return EINVAL;
+    segment = FONT_BUF + 0x4000*page;
+    if (page > 3)
+	segment -= 0xe000;
+
+#ifdef VGA_ALT_SEQACCESS
+    if (adp->va_type == KD_VGA) {	/* what about EGA? XXX */
+	s = splhigh();
+	outb(TSIDX, 0x00); outb(TSREG, 0x01);
+	outb(TSIDX, 0x01); val = inb(TSREG);	/* disable screen */
+	outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
+	outb(TSIDX, 0x00); outb(TSREG, 0x03);
+	splx(s);
+    }
+#endif
+
+    set_font_mode(adp, buf);
+    if (fontsize == 32) {
+	bcopy_fromio(segment + ch*32, data, fontsize*count);
+    } else {
+	for (c = ch; count > 0; ++c, --count) {
+	    bcopy_fromio(segment + c*32, data, fontsize);
+	    data += fontsize;
+	}
+    }
+    set_normal_mode(adp, buf);
+
+#ifdef VGA_ALT_SEQACCESS
+    if (adp->va_type == KD_VGA) {
+	s = splhigh();
+	outb(TSIDX, 0x00); outb(TSREG, 0x01);
+	outb(TSIDX, 0x01); outb(TSREG, val & 0xdf);	/* enable screen */
+	outb(TSIDX, 0x00); outb(TSREG, 0x03);
+	splx(s);
+    }
+#endif
+
+    return 0;
+#else /* VGA_NO_FONT_LOADING */
+    return ENODEV;
+#endif /* VGA_NO_FONT_LOADING */
+}
+
+/*
+ * load_font():
+ * Set the font data in the requested font page.
+ * NOTE: it appears that some recent video adapters do not support
+ * the font page other than 0... XXX
+ *
+ * EGA/VGA
+ */
+static int
+vga_load_font(video_adapter_t *adp, int page, int fontsize, u_char *data,
+	      int ch, int count)
+{
+#ifndef VGA_NO_FONT_LOADING
+    u_char buf[PARAM_BUFSIZE];
+    u_int32_t segment;
+    int c;
+#ifdef VGA_ALT_SEQACCESS
+    int s;
+    u_char val = 0;
+#endif
+
+    prologue(adp, V_ADP_FONT, ENODEV);
+
+    if (fontsize < 14) {
+	/* FONT_8 */
+	fontsize = 8;
+    } else if (fontsize >= 32) {
+	fontsize = 32;
+    } else if (fontsize >= 16) {
+	/* FONT_16 */
+	fontsize = 16;
+    } else {
+	/* FONT_14 */
+	fontsize = 14;
+    }
+
+    if (page < 0 || page >= 8)
+	return EINVAL;
+    segment = FONT_BUF + 0x4000*page;
+    if (page > 3)
+	segment -= 0xe000;
+
+#ifdef VGA_ALT_SEQACCESS
+    if (adp->va_type == KD_VGA) {	/* what about EGA? XXX */
+	s = splhigh();
+	outb(TSIDX, 0x00); outb(TSREG, 0x01);
+	outb(TSIDX, 0x01); val = inb(TSREG);	/* disable screen */
+	outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
+	outb(TSIDX, 0x00); outb(TSREG, 0x03);
+	splx(s);
+    }
+#endif
+
+    set_font_mode(adp, buf);
+    if (fontsize == 32) {
+	bcopy_toio(data, segment + ch*32, fontsize*count);
+    } else {
+	for (c = ch; count > 0; ++c, --count) {
+	    bcopy_toio(data, segment + c*32, fontsize);
+	    data += fontsize;
+	}
+    }
+    set_normal_mode(adp, buf);
+
+#ifdef VGA_ALT_SEQACCESS
+    if (adp->va_type == KD_VGA) {
+	s = splhigh();
+	outb(TSIDX, 0x00); outb(TSREG, 0x01);
+	outb(TSIDX, 0x01); outb(TSREG, val & 0xdf);	/* enable screen */
+	outb(TSIDX, 0x00); outb(TSREG, 0x03);
+	splx(s);
+    }
+#endif
+
+    return 0;
+#else /* VGA_NO_FONT_LOADING */
+    return ENODEV;
+#endif /* VGA_NO_FONT_LOADING */
+}
+
+/*
+ * show_font():
+ * Activate the requested font page.
+ * NOTE: it appears that some recent video adapters do not support
+ * the font page other than 0... XXX
+ *
+ * EGA/VGA
+ */
+static int
+vga_show_font(video_adapter_t *adp, int page)
+{
+#ifndef VGA_NO_FONT_LOADING
+    static u_char cg[] = { 0x00, 0x05, 0x0a, 0x0f, 0x30, 0x35, 0x3a, 0x3f };
+    int s;
+
+    prologue(adp, V_ADP_FONT, ENODEV);
+    if (page < 0 || page >= 8)
+	return EINVAL;
+
+    s = splhigh();
+    outb(TSIDX, 0x03); outb(TSREG, cg[page]);
+    splx(s);
+
+    return 0;
+#else /* VGA_NO_FONT_LOADING */
+    return ENODEV;
+#endif /* VGA_NO_FONT_LOADING */
+}
+
+/*
+ * save_palette():
+ * Read DAC values. The values have expressed in 8 bits.
+ *
+ * VGA
+ */
+static int
+vga_save_palette(video_adapter_t *adp, u_char *palette)
+{
+    int i;
+
+    prologue(adp, V_ADP_PALETTE, ENODEV);
+
+    /* 
+     * We store 8 bit values in the palette buffer, while the standard
+     * VGA has 6 bit DAC .
+     */
+    outb(PALRADR, 0x00);
+    for (i = 0; i < 256*3; ++i)
+	palette[i] = inb(PALDATA) << 2; 
+    inb(adp->va_crtc_addr + 6);	/* reset flip/flop */
+    return 0;
+}
+
+static int
+vga_save_palette2(video_adapter_t *adp, int base, int count,
+		  u_char *r, u_char *g, u_char *b)
+{
+    int i;
+
+    prologue(adp, V_ADP_PALETTE, ENODEV);
+
+    outb(PALRADR, base);
+    for (i = 0; i < count; ++i) {
+	r[i] = inb(PALDATA) << 2; 
+	g[i] = inb(PALDATA) << 2; 
+	b[i] = inb(PALDATA) << 2; 
+    }
+    inb(adp->va_crtc_addr + 6);		/* reset flip/flop */
+    return 0;
+}
+
+/*
+ * load_palette():
+ * Set DAC values.
+ *
+ * VGA
+ */
+static int
+vga_load_palette(video_adapter_t *adp, u_char *palette)
+{
+    int i;
+
+    prologue(adp, V_ADP_PALETTE, ENODEV);
+
+    outb(PIXMASK, 0xff);		/* no pixelmask */
+    outb(PALWADR, 0x00);
+    for (i = 0; i < 256*3; ++i)
+	outb(PALDATA, palette[i] >> 2);
+    inb(adp->va_crtc_addr + 6);	/* reset flip/flop */
+    outb(ATC, 0x20);			/* enable palette */
+    return 0;
+}
+
+static int
+vga_load_palette2(video_adapter_t *adp, int base, int count,
+		  u_char *r, u_char *g, u_char *b)
+{
+    int i;
+
+    prologue(adp, V_ADP_PALETTE, ENODEV);
+
+    outb(PIXMASK, 0xff);		/* no pixelmask */
+    outb(PALWADR, base);
+    for (i = 0; i < count; ++i) {
+	outb(PALDATA, r[i] >> 2);
+	outb(PALDATA, g[i] >> 2);
+	outb(PALDATA, b[i] >> 2);
+    }
+    inb(adp->va_crtc_addr + 6);		/* reset flip/flop */
+    outb(ATC, 0x20);			/* enable palette */
+    return 0;
+}
+
+/*
+ * set_border():
+ * Change the border color.
+ *
+ * CGA/EGA/VGA
+ */
+static int
+vga_set_border(video_adapter_t *adp, int color)
+{
+    prologue(adp, V_ADP_BORDER, ENODEV);
+
+    switch (adp->va_type) {
+    case KD_EGA:
+    case KD_VGA:    
+	inb(adp->va_crtc_addr + 6);	/* reset flip-flop */
+	outb(ATC, 0x31); outb(ATC, color & 0xff); 
+	break;  
+    case KD_CGA:    
+	outb(adp->va_crtc_addr + 5, color & 0x0f); /* color select register */
+	break;  
+    case KD_MONO:   
+    case KD_HERCULES:
+    default:
+	break;  
+    }
+    return 0;
+}
+
+/*
+ * save_state():
+ * Read video register values.
+ * NOTE: this function only reads the standard EGA/VGA registers.
+ * any extra/extended registers of SVGA adapters are not saved.
+ *
+ * VGA
+ */
+static int
+vga_save_state(video_adapter_t *adp, void *p, size_t size)
+{
+    video_info_t info;
+    u_char *buf;
+    int crtc_addr;
+    int i, j;
+    int s;
+
+    if (size == 0) {
+	/* return the required buffer size */
+	prologue(adp, V_ADP_STATESAVE, 0);
+	return sizeof(adp_state_t);
+    } else {
+	prologue(adp, V_ADP_STATESAVE, ENODEV);
+	if (size < sizeof(adp_state_t))
+	    return EINVAL;
+    }
+
+    ((adp_state_t *)p)->sig = V_STATE_SIG;
+    buf = ((adp_state_t *)p)->regs;
+    bzero(buf, V_MODE_PARAM_SIZE);
+    crtc_addr = adp->va_crtc_addr;
+
+    s = splhigh();
+
+    outb(TSIDX, 0x00); outb(TSREG, 0x01);	/* stop sequencer */
+    for (i = 0, j = 5; i < 4; i++) {           
+	outb(TSIDX, i + 1);
+	buf[j++]  =  inb(TSREG);
+    }
+    buf[9]  =  inb(MISC + 10);			/* dot-clock */
+    outb(TSIDX, 0x00); outb(TSREG, 0x03);	/* start sequencer */
+
+    for (i = 0, j = 10; i < 25; i++) {		/* crtc */
+	outb(crtc_addr, i);
+	buf[j++]  =  inb(crtc_addr + 1);
+    }
+    for (i = 0, j = 35; i < 20; i++) {		/* attribute ctrl */
+        inb(crtc_addr + 6);			/* reset flip-flop */
+	outb(ATC, i);
+	buf[j++]  =  inb(ATC + 1);
+    }
+    for (i = 0, j = 55; i < 9; i++) {		/* graph data ctrl */
+	outb(GDCIDX, i);
+	buf[j++]  =  inb(GDCREG);
+    }
+    inb(crtc_addr + 6);				/* reset flip-flop */
+    outb(ATC, 0x20);				/* enable palette */
+
+    splx(s);
+
+#if 1
+    if (vga_get_info(adp, adp->va_mode, &info) == 0) {
+	if (info.vi_flags & V_INFO_GRAPHICS) {
+	    buf[0] = info.vi_width/info.vi_cwidth; /* COLS */
+	    buf[1] = info.vi_height/info.vi_cheight - 1; /* ROWS */
+	} else {
+	    buf[0] = info.vi_width;		/* COLS */
+	    buf[1] = info.vi_height - 1;	/* ROWS */
+	}
+	buf[2] = info.vi_cheight;		/* POINTS */
+    } else {
+	/* XXX: shouldn't be happening... */
+	printf("vga%d: %s: failed to obtain mode info. (vga_save_state())\n",
+	       adp->va_unit, adp->va_name);
+    }
+#else
+    buf[0] = readb(BIOS_PADDRTOVADDR(0x44a));	/* COLS */
+    buf[1] = readb(BIOS_PADDRTOVADDR(0x484));	/* ROWS */
+    buf[2] = readb(BIOS_PADDRTOVADDR(0x485));	/* POINTS */
+    buf[3] = readb(BIOS_PADDRTOVADDR(0x44c));
+    buf[4] = readb(BIOS_PADDRTOVADDR(0x44d));
+#endif
+
+    return 0;
+}
+
+/*
+ * load_state():
+ * Set video registers at once.
+ * NOTE: this function only updates the standard EGA/VGA registers.
+ * any extra/extended registers of SVGA adapters are not changed.
+ *
+ * EGA/VGA
+ */
+static int
+vga_load_state(video_adapter_t *adp, void *p)
+{
+    u_char *buf;
+    int crtc_addr;
+    int s;
+    int i;
+
+    prologue(adp, V_ADP_STATELOAD, ENODEV);
+    if (((adp_state_t *)p)->sig != V_STATE_SIG)
+	return EINVAL;
+
+    buf = ((adp_state_t *)p)->regs;
+    crtc_addr = adp->va_crtc_addr;
+
+#if VGA_DEBUG > 1
+    dump_buffer(buf, V_MODE_PARAM_SIZE);
+#endif
+
+    s = splhigh();
+
+    outb(TSIDX, 0x00); outb(TSREG, 0x01);	/* stop sequencer */
+    for (i = 0; i < 4; ++i) {			/* program sequencer */
+	outb(TSIDX, i + 1);
+	outb(TSREG, buf[i + 5]);
+    }
+    outb(MISC, buf[9]);				/* set dot-clock */
+    outb(TSIDX, 0x00); outb(TSREG, 0x03);	/* start sequencer */
+    outb(crtc_addr, 0x11);
+    outb(crtc_addr + 1, inb(crtc_addr + 1) & 0x7F);
+    for (i = 0; i < 25; ++i) {			/* program crtc */
+	outb(crtc_addr, i);
+	outb(crtc_addr + 1, buf[i + 10]);
+    }
+    inb(crtc_addr+6);				/* reset flip-flop */
+    for (i = 0; i < 20; ++i) {			/* program attribute ctrl */
+	outb(ATC, i);
+	outb(ATC, buf[i + 35]);
+    }
+    for (i = 0; i < 9; ++i) {			/* program graph data ctrl */
+	outb(GDCIDX, i);
+	outb(GDCREG, buf[i + 55]);
+    }
+    inb(crtc_addr + 6);				/* reset flip-flop */
+    outb(ATC, 0x20);				/* enable palette */
+
+#if notyet /* a temporary workaround for kernel panic, XXX */
+#ifndef VGA_NO_BIOS
+    if (adp->va_unit == V_ADP_PRIMARY) {
+	writeb(BIOS_PADDRTOVADDR(0x44a), buf[0]);	/* COLS */
+	writeb(BIOS_PADDRTOVADDR(0x484), buf[1] + rows_offset - 1); /* ROWS */
+	writeb(BIOS_PADDRTOVADDR(0x485), buf[2]);	/* POINTS */
+#if 0
+	writeb(BIOS_PADDRTOVADDR(0x44c), buf[3]);
+	writeb(BIOS_PADDRTOVADDR(0x44d), buf[4]);
+#endif
+    }
+#endif /* VGA_NO_BIOS */
+#endif /* notyet */
+
+    splx(s);
+    return 0;
+}
+
+/*
+ * set_origin():
+ * Change the origin (window mapping) of the banked frame buffer.
+ */
+static int
+vga_set_origin(video_adapter_t *adp, off_t offset)
+{
+    /* 
+     * The standard video modes do not require window mapping; 
+     * always return error.
+     */
+    return ENODEV;
+}
+
+/*
+ * read_hw_cursor():
+ * Read the position of the hardware text cursor.
+ *
+ * all adapters
+ */
+static int
+vga_read_hw_cursor(video_adapter_t *adp, int *col, int *row)
+{
+    u_int16_t off;
+    int s;
+
+    if (!vga_init_done)
+	return ENXIO;
+
+    if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
+	return ENODEV;
+
+    s = spltty();
+    outb(adp->va_crtc_addr, 14);
+    off = inb(adp->va_crtc_addr + 1);
+    outb(adp->va_crtc_addr, 15);
+    off = (off << 8) | inb(adp->va_crtc_addr + 1);
+    splx(s);
+
+    *row = off / adp->va_info.vi_width;
+    *col = off % adp->va_info.vi_width;
+
+    return 0;
+}
+
+/*
+ * set_hw_cursor():
+ * Move the hardware text cursor.  If col and row are both -1, 
+ * the cursor won't be shown.
+ *
+ * all adapters
+ */
+static int
+vga_set_hw_cursor(video_adapter_t *adp, int col, int row)
+{
+    u_int16_t off;
+    int s;
+
+    if (!vga_init_done)
+	return ENXIO;
+
+    if ((col == -1) && (row == -1)) {
+	off = -1;
+    } else {
+	if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
+	    return ENODEV;
+	off = row*adp->va_info.vi_width + col;
+    }
+
+    s = spltty();
+    outb(adp->va_crtc_addr, 14);
+    outb(adp->va_crtc_addr + 1, off >> 8);
+    outb(adp->va_crtc_addr, 15);
+    outb(adp->va_crtc_addr + 1, off & 0x00ff);
+    splx(s);
+
+    return 0;
+}
+
+/*
+ * set_hw_cursor_shape():
+ * Change the shape of the hardware text cursor. If the height is
+ * zero or negative, the cursor won't be shown.
+ *
+ * all adapters
+ */
+static int
+vga_set_hw_cursor_shape(video_adapter_t *adp, int base, int height,
+			int celsize, int blink)
+{
+    int s;
+
+    if (!vga_init_done)
+	return ENXIO;
+
+    s = spltty();
+    switch (adp->va_type) {
+    case KD_VGA:
+    case KD_CGA:
+    case KD_MONO:
+    case KD_HERCULES:
+    default:
+	if (height <= 0) {
+	    /* make the cursor invisible */
+	    outb(adp->va_crtc_addr, 10);
+	    outb(adp->va_crtc_addr + 1, 32);
+	    outb(adp->va_crtc_addr, 11);
+	    outb(adp->va_crtc_addr + 1, 0);
+	} else {
+	    outb(adp->va_crtc_addr, 10);
+	    outb(adp->va_crtc_addr + 1, celsize - base - height);
+	    outb(adp->va_crtc_addr, 11);
+	    outb(adp->va_crtc_addr + 1, celsize - base - 1);
+	}
+	break;
+    case KD_EGA:
+	if (height <= 0) {
+	    /* make the cursor invisible */
+	    outb(adp->va_crtc_addr, 10);
+	    outb(adp->va_crtc_addr + 1, celsize);
+	    outb(adp->va_crtc_addr, 11);
+	    outb(adp->va_crtc_addr + 1, 0);
+	} else {
+	    outb(adp->va_crtc_addr, 10);
+	    outb(adp->va_crtc_addr + 1, celsize - base - height);
+	    outb(adp->va_crtc_addr, 11);
+	    outb(adp->va_crtc_addr + 1, celsize - base);
+	}
+	break;
+    }
+    splx(s);
+
+    return 0;
+}
+
+/*
+ * blank_display()
+ * Put the display in power save/power off mode.
+ *
+ * all adapters
+ */
+static int
+vga_blank_display(video_adapter_t *adp, int mode)
+{
+    u_char val;
+    int s;
+
+    s = splhigh();
+    switch (adp->va_type) {
+    case KD_VGA:
+	switch (mode) {
+	case V_DISPLAY_SUSPEND:
+	case V_DISPLAY_STAND_BY:
+	    outb(TSIDX, 0x01);
+	    val = inb(TSREG);
+	    outb(TSIDX, 0x01);
+	    outb(TSREG, val | 0x20);
+	    outb(adp->va_crtc_addr, 0x17);
+	    val = inb(adp->va_crtc_addr + 1);
+	    outb(adp->va_crtc_addr + 1, val & ~0x80);
+	    break;
+	case V_DISPLAY_BLANK:
+	    outb(TSIDX, 0x01);
+	    val = inb(TSREG);
+	    outb(TSIDX, 0x01);
+	    outb(TSREG, val | 0x20);
+	    break;
+	case V_DISPLAY_ON:
+	    outb(TSIDX, 0x01);
+	    val = inb(TSREG);
+	    outb(TSIDX, 0x01);
+	    outb(TSREG, val & 0xDF);
+	    outb(adp->va_crtc_addr, 0x17);
+	    val = inb(adp->va_crtc_addr + 1);
+	    outb(adp->va_crtc_addr + 1, val | 0x80);
+	    break;
+	}
+	break;
+
+    case KD_EGA:
+	/* no support yet */
+	return ENODEV;
+
+    case KD_CGA:
+	switch (mode) {
+	case V_DISPLAY_SUSPEND:
+	case V_DISPLAY_STAND_BY:
+	case V_DISPLAY_BLANK:
+	    outb(adp->va_crtc_addr + 4, 0x25);
+	    break;
+	case V_DISPLAY_ON:
+	    outb(adp->va_crtc_addr + 4, 0x2d);
+	    break;
+	}
+	break;
+
+    case KD_MONO:
+    case KD_HERCULES:
+	switch (mode) {
+	case V_DISPLAY_SUSPEND:
+	case V_DISPLAY_STAND_BY:
+	case V_DISPLAY_BLANK:
+	    outb(adp->va_crtc_addr + 4, 0x21);
+	    break;
+	case V_DISPLAY_ON:
+	    outb(adp->va_crtc_addr + 4, 0x29);
+	    break;
+	}
+	break;
+    default:
+	break;
+    }
+    splx(s);
+
+    return 0;
+}
+
+/*
+ * mmap():
+ * Mmap frame buffer.
+ *
+ * all adapters
+ */
+static int
+vga_mmap_buf(video_adapter_t *adp, vm_offset_t offset, int prot)
+{
+    if (adp->va_info.vi_flags & V_INFO_LINEAR)
+	return -1;
+
+#if VGA_DEBUG > 0
+    printf("vga_mmap_buf(): window:0x%x, offset:0x%x\n", 
+	   adp->va_info.vi_window, offset);
+#endif
+
+    /* XXX: is this correct? */
+    if (offset > adp->va_window_size - PAGE_SIZE)
+	return -1;
+
+#ifdef __i386__
+    return i386_btop(adp->va_info.vi_window + offset);
+#endif
+#ifdef __alpha__
+    return alpha_btop(adp->va_info.vi_window + offset);
+#endif
+}
+
+#ifndef VGA_NO_MODE_CHANGE
+
+static void
+planar_fill(video_adapter_t *adp, int val)
+{
+    int length;
+    int at;			/* position in the frame buffer */
+    int l;
+
+    outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+    outw(GDCIDX, 0x0003);		/* data rotate/function select */
+    outw(GDCIDX, 0x0f01);		/* set/reset enable */
+    outw(GDCIDX, 0xff08);		/* bit mask */
+    outw(GDCIDX, (val << 8) | 0x00);	/* set/reset */
+    at = 0;
+    length = adp->va_line_width*adp->va_info.vi_height;
+    while (length > 0) {
+	l = imin(length, adp->va_window_size);
+	(*vidsw[adp->va_index]->set_win_org)(adp, at);
+	bzero_io(adp->va_window, l);
+	length -= l;
+	at += l;
+    }
+    outw(GDCIDX, 0x0000);		/* set/reset */
+    outw(GDCIDX, 0x0001);		/* set/reset enable */
+}
+
+static void
+packed_fill(video_adapter_t *adp, int val)
+{
+    int length;
+    int at;			/* position in the frame buffer */
+    int l;
+
+    at = 0;
+    length = adp->va_line_width*adp->va_info.vi_height;
+    while (length > 0) {
+	l = imin(length, adp->va_window_size);
+	(*vidsw[adp->va_index]->set_win_org)(adp, at);
+	fill_io(val, adp->va_window, l);
+	length -= l;
+	at += l;
+    }
+}
+
+static void
+direct_fill(video_adapter_t *adp, int val)
+{
+    int length;
+    int at;			/* position in the frame buffer */
+    int l;
+
+    at = 0;
+    length = adp->va_line_width*adp->va_info.vi_height;
+    while (length > 0) {
+	l = imin(length, adp->va_window_size);
+	(*vidsw[adp->va_index]->set_win_org)(adp, at);
+	switch (adp->va_info.vi_pixel_size) {
+	case sizeof(u_int16_t):
+	    fillw_io(val, adp->va_window, l/sizeof(u_int16_t));
+	    break;
+	case 3:
+	    /* FIXME */
+	    break;
+	case sizeof(u_int32_t):
+	    filll_io(val, adp->va_window, l/sizeof(u_int32_t));
+	    break;
+	}
+	length -= l;
+	at += l;
+    }
+}
+
+static int
+vga_clear(video_adapter_t *adp)
+{
+    switch (adp->va_info.vi_mem_model) {
+    case V_INFO_MM_TEXT:
+	/* do nothing? XXX */
+	break;
+    case V_INFO_MM_PLANAR:
+	planar_fill(adp, 0);
+	break;
+    case V_INFO_MM_PACKED:
+	packed_fill(adp, 0);
+	break;
+    case V_INFO_MM_DIRECT:
+	direct_fill(adp, 0);
+	break;
+    }
+    return 0;
+}
+
+#ifdef notyet
+static void
+planar_fill_rect(video_adapter_t *adp, int val, int x, int y, int cx, int cy)
+{
+    int banksize;
+    int bank;
+    int pos;
+    int offset;			/* offset within window */
+    int bx;
+    int l;
+
+    outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+    outw(GDCIDX, 0x0003);		/* data rotate/function select */
+    outw(GDCIDX, 0x0f01);		/* set/reset enable */
+    outw(GDCIDX, 0xff08);		/* bit mask */
+    outw(GDCIDX, (val << 8) | 0x00); /* set/reset */
+
+    banksize = adp->va_window_size;
+    bank = -1;
+    while (cy > 0) {
+	pos = adp->va_line_width*y + x/8;
+	if (bank != pos/banksize) {
+	    (*vidsw[adp->va_index]->set_win_org)(adp, pos);
+	    bank = pos/banksize;
+	}
+	offset = pos%banksize;
+	bx = (x + cx)/8 - x/8;
+	if (x % 8) {
+	    outw(GDCIDX, ((0xff00 >> (x % 8)) & 0xff00) | 0x08);
+	    writeb(adp->va_window + offset, 0);
+	    ++offset;
+	    --bx;
+	    if (offset >= banksize) {
+		offset = 0;
+		++bank;		/* next bank */
+		(*vidsw[adp->va_index]->set_win_org)(adp, bank*banksize);
+	    }
+	    outw(GDCIDX, 0xff08);	/* bit mask */
+	}
+	while (bx > 0) {
+	    l = imin(bx, banksize);
+	    bzero_io(adp->va_window + offset, l);
+	    offset += l;
+	    bx -= l;
+	    if (offset >= banksize) {
+		offset = 0;
+		++bank;		/* next bank */
+		(*vidsw[adp->va_index]->set_win_org)(adp, bank*banksize);
+	    }
+	}
+	if ((x + cx) % 8) {
+	    outw(GDCIDX, (~(0xff00 >> ((x + cx) % 8)) & 0xff00) | 0x08);
+	    writeb(adp->va_window + offset, 0);
+	    ++offset;
+	    if (offset >= banksize) {
+		offset = 0;
+		++bank;		/* next bank */
+		(*vidsw[adp->va_index]->set_win_org)(adp, bank*banksize);
+	    }
+	    outw(GDCIDX, 0xff08);	/* bit mask */
+	}
+	++y;
+	--cy;
+    }
+
+    outw(GDCIDX, 0xff08);		/* bit mask */
+    outw(GDCIDX, 0x0000);		/* set/reset */
+    outw(GDCIDX, 0x0001);		/* set/reset enable */
+}
+
+static void
+packed_fill_rect(video_adapter_t *adp, int val, int x, int y, int cx, int cy)
+{
+    int banksize;
+    int bank;
+    int pos;
+    int offset;			/* offset within window */
+    int end;
+
+    banksize = adp->va_window_size;
+    bank = -1;
+    cx *= adp->va_info.vi_pixel_size;
+    while (cy > 0) {
+	pos = adp->va_line_width*y + x*adp->va_info.vi_pixel_size;
+	if (bank != pos/banksize) {
+	    (*vidsw[adp->va_index]->set_win_org)(adp, pos);
+	    bank = pos/banksize;
+	}
+	offset = pos%banksize;
+	end = imin(offset + cx, banksize);
+	fill_io(val, adp->va_window + offset,
+		(end - offset)/adp->va_info.vi_pixel_size);
+	/* the line may cross the window boundary */
+	if (offset + cx > banksize) {
+	    ++bank;		/* next bank */
+	    (*vidsw[adp->va_index]->set_win_org)(adp, bank*banksize);
+	    end = offset + cx - banksize;
+	    fill_io(val, adp->va_window, end/adp->va_info.vi_pixel_size);
+	}
+	++y;
+	--cy;
+    }
+}
+
+static void
+direct_fill_rect16(video_adapter_t *adp, int val, int x, int y, int cx, int cy)
+{
+    int banksize;
+    int bank;
+    int pos;
+    int offset;			/* offset within window */
+    int end;
+
+    /*
+     * XXX: the function assumes that banksize is a muliple of
+     * sizeof(u_int16_t).
+     */
+    banksize = adp->va_window_size;
+    bank = -1;
+    cx *= sizeof(u_int16_t);
+    while (cy > 0) {
+	pos = adp->va_line_width*y + x*sizeof(u_int16_t);
+	if (bank != pos/banksize) {
+	    (*vidsw[adp->va_index]->set_win_org)(adp, pos);
+	    bank = pos/banksize;
+	}
+	offset = pos%banksize;
+	end = imin(offset + cx, banksize);
+	fillw_io(val, adp->va_window + offset,
+		 (end - offset)/sizeof(u_int16_t));
+	/* the line may cross the window boundary */
+	if (offset + cx > banksize) {
+	    ++bank;		/* next bank */
+	    (*vidsw[adp->va_index]->set_win_org)(adp, bank*banksize);
+	    end = offset + cx - banksize;
+	    fillw_io(val, adp->va_window, end/sizeof(u_int16_t));
+	}
+	++y;
+	--cy;
+    }
+}
+
+static void
+direct_fill_rect24(video_adapter_t *adp, int val, int x, int y, int cx, int cy)
+{
+    int banksize;
+    int bank;
+    int pos;
+    int offset;			/* offset within window */
+    int end;
+    int i;
+    int j;
+    u_int8_t b[3];
+
+    b[0] = val & 0x0000ff;
+    b[1] = (val >> 8) & 0x0000ff;
+    b[2] = (val >> 16) & 0x0000ff;
+    banksize = adp->va_window_size;
+    bank = -1;
+    cx *= 3;
+    while (cy > 0) {
+	pos = adp->va_line_width*y + x*3;
+	if (bank != pos/banksize) {
+	    (*vidsw[adp->va_index]->set_win_org)(adp, pos);
+	    bank = pos/banksize;
+	}
+	offset = pos%banksize;
+	end = imin(offset + cx, banksize);
+	for (i = 0, j = offset; j < end; i = (++i)%3, ++j) {
+	    writeb(adp->va_window + j, b[i]);
+	}
+	/* the line may cross the window boundary */
+	if (offset + cx >= banksize) {
+	    ++bank;		/* next bank */
+	    (*vidsw[adp->va_index]->set_win_org)(adp, bank*banksize);
+	    j = 0;
+	    end = offset + cx - banksize;
+	    for (; j < end; i = (++i)%3, ++j) {
+		writeb(adp->va_window + j, b[i]);
+	    }
+	}
+	++y;
+	--cy;
+    }
+}
+
+static void
+direct_fill_rect32(video_adapter_t *adp, int val, int x, int y, int cx, int cy)
+{
+    int banksize;
+    int bank;
+    int pos;
+    int offset;			/* offset within window */
+    int end;
+
+    /*
+     * XXX: the function assumes that banksize is a muliple of
+     * sizeof(u_int32_t).
+     */
+    banksize = adp->va_window_size;
+    bank = -1;
+    cx *= sizeof(u_int32_t);
+    while (cy > 0) {
+	pos = adp->va_line_width*y + x*sizeof(u_int32_t);
+	if (bank != pos/banksize) {
+	    (*vidsw[adp->va_index]->set_win_org)(adp, pos);
+	    bank = pos/banksize;
+	}
+	offset = pos%banksize;
+	end = imin(offset + cx, banksize);
+	filll_io(val, adp->va_window + offset,
+		 (end - offset)/sizeof(u_int32_t));
+	/* the line may cross the window boundary */
+	if (offset + cx > banksize) {
+	    ++bank;		/* next bank */
+	    (*vidsw[adp->va_index]->set_win_org)(adp, bank*banksize);
+	    end = offset + cx - banksize;
+	    filll_io(val, adp->va_window, end/sizeof(u_int32_t));
+	}
+	++y;
+	--cy;
+    }
+}
+
+static int
+vga_fill_rect(video_adapter_t *adp, int val, int x, int y, int cx, int cy)
+{
+    switch (adp->va_info.vi_mem_model) {
+    case V_INFO_MM_TEXT:
+	/* do nothing? XXX */
+	break;
+    case V_INFO_MM_PLANAR:
+	planar_fill_rect(adp, val, x, y, cx, cy);
+	break;
+    case V_INFO_MM_PACKED:
+	packed_fill_rect(adp, val, x, y, cx, cy);
+	break;
+    case V_INFO_MM_DIRECT:
+	switch (adp->va_info.vi_pixel_size) {
+	case sizeof(u_int16_t):
+	    direct_fill_rect16(adp, val, x, y, cx, cy);
+	    break;
+	case 3:
+	    direct_fill_rect24(adp, val, x, y, cx, cy);
+	    break;
+	case sizeof(u_int32_t):
+	    direct_fill_rect32(adp, val, x, y, cx, cy);
+	    break;
+	}
+	break;
+    }
+    return 0;
+}
+#else /* !notyet */
+static int
+vga_fill_rect(video_adapter_t *adp, int val, int x, int y, int cx, int cy)
+{
+    return ENODEV;
+}
+#endif /* notyet */
+
+static int
+vga_bitblt(video_adapter_t *adp,...)
+{
+    /* FIXME */
+    return ENODEV;
+}
+
+#endif /* !VGA_NO_MODE_CHANGE */
+
+static int
+get_palette(video_adapter_t *adp, int base, int count,
+	    u_char *red, u_char *green, u_char *blue, u_char *trans)
+{
+    u_char *r;
+    u_char *g;
+    u_char *b;
+
+    if ((base < 0) || (base >= 256) || (base + count > 256))
+	return EINVAL;
+
+    r = malloc(count*3, M_DEVBUF, M_WAITOK);
+    g = r + count;
+    b = g + count;
+    if (vga_save_palette2(adp, base, count, r, g, b))
+	return ENODEV;
+    copyout(r, red, count);
+    copyout(g, green, count);
+    copyout(b, blue, count);
+    if (trans != NULL) {
+	bzero(r, count);
+	copyout(r, trans, count);
+    }
+    free(r, M_DEVBUF);
+
+    return 0;
+}
+
+static int
+set_palette(video_adapter_t *adp, int base, int count,
+	    u_char *red, u_char *green, u_char *blue, u_char *trans)
+{
+    u_char *r;
+    u_char *g;
+    u_char *b;
+    int err;
+
+    if ((base < 0) || (base >= 256) || (base + count > 256))
+	return EINVAL;
+
+    r = malloc(count*3, M_DEVBUF, M_WAITOK);
+    g = r + count;
+    b = g + count;
+    copyin(red, r, count);
+    copyin(green, g, count);
+    copyin(blue, b, count);
+    err = vga_load_palette2(adp, base, count, r, g, b);
+    free(r, M_DEVBUF);
+
+    return (err ? ENODEV : 0);
+}
+
+static int
+vga_dev_ioctl(video_adapter_t *adp, u_long cmd, caddr_t arg)
+{
+    switch (cmd) {
+    case FBIO_GETWINORG:	/* get frame buffer window origin */
+	*(u_int *)arg = 0;
+	return 0;
+
+    case FBIO_SETWINORG:	/* set frame buffer window origin */
+	return ENODEV;
+
+    case FBIO_SETDISPSTART:	/* set display start address */
+	return (set_display_start(adp, 
+				  ((video_display_start_t *)arg)->x,
+			  	  ((video_display_start_t *)arg)->y)
+		? ENODEV : 0);
+
+    case FBIO_SETLINEWIDTH:	/* set scan line length in pixel */
+	return (set_line_length(adp, *(u_int *)arg) ? ENODEV : 0);
+
+    case FBIO_GETPALETTE:	/* get color palette */
+	return get_palette(adp, ((video_color_palette_t *)arg)->index,
+			   ((video_color_palette_t *)arg)->count,
+			   ((video_color_palette_t *)arg)->red,
+			   ((video_color_palette_t *)arg)->green,
+			   ((video_color_palette_t *)arg)->blue,
+			   ((video_color_palette_t *)arg)->transparent);
+
+    case FBIO_SETPALETTE:	/* set color palette */
+	return set_palette(adp, ((video_color_palette_t *)arg)->index,
+			   ((video_color_palette_t *)arg)->count,
+			   ((video_color_palette_t *)arg)->red,
+			   ((video_color_palette_t *)arg)->green,
+			   ((video_color_palette_t *)arg)->blue,
+			   ((video_color_palette_t *)arg)->transparent);
+
+    case FBIOGTYPE:		/* get frame buffer type info. */
+	((struct fbtype *)arg)->fb_type = fb_type(adp->va_type);
+	((struct fbtype *)arg)->fb_height = adp->va_info.vi_height;
+	((struct fbtype *)arg)->fb_width = adp->va_info.vi_width;
+	((struct fbtype *)arg)->fb_depth = adp->va_info.vi_depth;
+	if ((adp->va_info.vi_depth <= 1) || (adp->va_info.vi_depth > 8))
+	    ((struct fbtype *)arg)->fb_cmsize = 0;
+	else
+	    ((struct fbtype *)arg)->fb_cmsize = 1 << adp->va_info.vi_depth;
+	((struct fbtype *)arg)->fb_size = adp->va_buffer_size;
+	return 0;
+
+    case FBIOGETCMAP:		/* get color palette */
+	return get_palette(adp, ((struct fbcmap *)arg)->index,
+			   ((struct fbcmap *)arg)->count,
+			   ((struct fbcmap *)arg)->red,
+			   ((struct fbcmap *)arg)->green,
+			   ((struct fbcmap *)arg)->blue, NULL);
+
+    case FBIOPUTCMAP:		/* set color palette */
+	return set_palette(adp, ((struct fbcmap *)arg)->index,
+			   ((struct fbcmap *)arg)->count,
+			   ((struct fbcmap *)arg)->red,
+			   ((struct fbcmap *)arg)->green,
+			   ((struct fbcmap *)arg)->blue, NULL);
+
+    default:
+	return fb_commonioctl(adp, cmd, arg);
+    }
+}
+
+static void
+dump_buffer(u_char *buf, size_t len)
+{
+    int i;
+
+    for(i = 0; i < len;) {
+	printf("%02x ", buf[i]);
+	if ((++i % 16) == 0)
+	    printf("\n");
+    }
+}
+
+/*
+ * diag():
+ * Print some information about the video adapter and video modes,
+ * with requested level of details.
+ *
+ * all adapters
+ */
+static int
+vga_diag(video_adapter_t *adp, int level)
+{
+    u_char *mp;
+#if FB_DEBUG > 1
+    video_info_t info;
+    int i;
+#endif
+
+    if (!vga_init_done)
+	return ENXIO;
+
+#if FB_DEBUG > 1
+#ifndef VGA_NO_BIOS
+    printf("vga: RTC equip. code:0x%02x, DCC code:0x%02x\n",
+	   rtcin(RTC_EQUIPMENT), readb(BIOS_PADDRTOVADDR(0x488)));
+    printf("vga: CRTC:0x%x, video option:0x%02x, ",
+	   readw(BIOS_PADDRTOVADDR(0x463)),
+	   readb(BIOS_PADDRTOVADDR(0x487)));
+    printf("rows:%d, cols:%d, font height:%d\n",
+	   readb(BIOS_PADDRTOVADDR(0x44a)),
+	   readb(BIOS_PADDRTOVADDR(0x484)) + 1,
+	   readb(BIOS_PADDRTOVADDR(0x485)));
+#endif /* VGA_NO_BIOS */
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+    printf("vga: param table EGA/VGA:%p", video_mode_ptr);
+    printf(", CGA/MDA:%p\n", video_mode_ptr2);
+    printf("vga: rows_offset:%d\n", rows_offset);
+#endif
+#endif /* FB_DEBUG > 1 */
+
+    fb_dump_adp_info(VGA_DRIVER_NAME, adp, level);
+
+#if FB_DEBUG > 1
+    if (adp->va_flags & V_ADP_MODECHANGE) {
+	for (i = 0; bios_vmode[i].vi_mode != EOT; ++i) {
+	    if (bios_vmode[i].vi_mode == NA)
+		continue;
+	    if (get_mode_param(bios_vmode[i].vi_mode) == NULL)
+		continue;
+	    fb_dump_mode_info(VGA_DRIVER_NAME, adp, &bios_vmode[i], level);
+	}
+    } else {
+	vga_get_info(adp, adp->va_initial_mode, &info);	/* shouldn't fail */
+	fb_dump_mode_info(VGA_DRIVER_NAME, adp, &info, level);
+    }
+#endif /* FB_DEBUG > 1 */
+
+    if ((adp->va_type != KD_EGA) && (adp->va_type != KD_VGA))
+	return 0;
+#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
+    if (video_mode_ptr == NULL)
+	printf("vga%d: %s: WARNING: video mode switching is not "
+	       "fully supported on this adapter\n",
+	       adp->va_unit, adp->va_name);
+#endif
+    if (level <= 0)
+	return 0;
+
+    if (adp->va_type == KD_VGA) {
+	printf("VGA parameters upon power-up\n");
+	dump_buffer(adpstate.regs, sizeof(adpstate.regs));
+	printf("VGA parameters in BIOS for mode %d\n", adp->va_initial_mode);
+	dump_buffer(adpstate2.regs, sizeof(adpstate2.regs));
+    }
+
+    mp = get_mode_param(adp->va_initial_mode);
+    if (mp == NULL)	/* this shouldn't be happening */
+	return 0;
+    printf("EGA/VGA parameters to be used for mode %d\n", adp->va_initial_mode);
+    dump_buffer(mp, V_MODE_PARAM_SIZE);
+
+    return 0;
+}
+
+#endif /* NVGA > 0 */
diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h
index 841408e89879..e9e9eb24a35f 100644
--- a/sys/dev/fb/vgareg.h
+++ b/sys/dev/fb/vgareg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id:$
+ * $Id: vgareg.h,v 1.1 1999/01/09 02:44:49 yokota Exp $
  */
 
 #ifndef _DEV_FB_VGAREG_H_
@@ -60,8 +60,38 @@
 #define GDCIDX		(IO_VGA + 0x0E)		/* graph data controller idx */
 #define GDCREG		(IO_VGA + 0x0F)		/* graph data controller data */
 
+#define VGA_DRIVER_NAME		"vga"
+#define VGA_UNIT(dev)		minor(dev)
+#define VGA_MKMINOR(unit)	(unit)
+
 #ifdef KERNEL
-extern int		(*vga_sub_configure)(int flags);
+
+struct video_adapter;
+typedef struct vga_softc {
+	struct video_adapter	*adp;
+#ifdef FB_INSTALL_CDEV
+	genfb_softc_t		gensc;
 #endif
+} vga_softc_t;
+
+int		vga_probe_unit(int unit, struct video_adapter *adp, int flags);
+int		vga_attach_unit(int unit, vga_softc_t *sc, int flags);
+
+#ifdef FB_INSTALL_CDEV
+int		vga_open(dev_t dev, vga_softc_t *sc, int flag, int mode,
+			 struct proc *p);
+int		vga_close(dev_t dev, vga_softc_t *sc, int flag, int mode,
+			  struct proc *p);
+int		vga_read(dev_t dev, vga_softc_t *sc, struct uio *uio, int flag);
+int		vga_write(dev_t dev, vga_softc_t *sc, struct uio *uio, int flag);
+int		vga_ioctl(dev_t dev, vga_softc_t *sc, u_long cmd, caddr_t arg,
+			  int flag, struct proc *p);
+int		vga_mmap(dev_t dev, vga_softc_t *sc, vm_offset_t offset,
+			 int prot);
+#endif
+
+extern int	(*vga_sub_configure)(int flags);
+
+#endif /* KERNEL */
 
 #endif /* _DEV_FB_VGAREG_H_ */
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index c3be3104d509..6c17bc152963 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.248 1999/06/19 08:14:56 grog Exp $
+ *	$Id: sio.c,v 1.249 1999/06/20 13:10:09 peter Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
@@ -2656,7 +2656,7 @@ static cn_checkc_t siocncheckc;
 static cn_getc_t siocngetc;
 static cn_putc_t siocnputc;
 
-CONS_DRIVER(sio, siocnprobe, siocninit, siocngetc, siocncheckc, siocnputc);
+CONS_DRIVER(sio, siocnprobe, siocninit, NULL, siocngetc, siocncheckc, siocnputc);
 
 /* To get the GDB related variables */
 #if DDB > 0
@@ -2855,7 +2855,6 @@ siocnprobe(cp)
 				cp->cn_pri = COM_FORCECONSOLE(flags)
 					     || boothowto & RB_SERIAL
 					     ? CN_REMOTE : CN_NORMAL;
-				printf("sio%d: system console\n", unit);
 				siocniobase = iobase;
 				siocnunit = unit;
 			}
@@ -2897,10 +2896,7 @@ siocnprobe(cp)
 
 #ifdef __alpha__
 
-struct consdev siocons = {
-	NULL, NULL, siocngetc, siocncheckc, siocnputc,
-	NULL, 0, CN_NORMAL,
-};
+CONS_DRIVER(sio, NULL, NULL, NULL, siocngetc, siocncheckc, siocnputc);
 
 extern struct consdev *cn_tab;
 
@@ -2915,6 +2911,8 @@ siocnattach(port, speed)
 
 	siocniobase = port;
 	comdefaultrate = speed;
+	sio_consdev.cn_pri = CN_NORMAL;
+	sio_consdev.cn_dev = makedev(CDEV_MAJOR, 0);
 
 	s = spltty();
 
@@ -2938,8 +2936,7 @@ siocnattach(port, speed)
 	siocnopen(&sp, siocniobase, comdefaultrate);
 	splx(s);
 
-	siocons.cn_dev = makedev(CDEV_MAJOR, 0);
-	cn_tab = &siocons;
+	cn_tab = &sio_consdev;
 	return 0;
 }
 
diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index 89dd199815f5..2979c0da9442 100644
--- a/sys/dev/syscons/blank/blank_saver.c
+++ b/sys/dev/syscons/blank/blank_saver.c
@@ -25,82 +25,35 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.14 1998/11/04 03:49:38 peter Exp $
+ *	$Id: blank_saver.c,v 1.15 1999/01/11 03:18:44 yokota Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <dev/fb/vgareg.h>
-
-#include <i386/isa/isa.h>
-
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 static int
 blank_saver(video_adapter_t *adp, int blank)
 {
-	u_char val;
-	if (blank) {
-		switch (adp->va_type) {
-		case KD_VGA:
-			outb(TSIDX, 0x01); val = inb(TSREG);
-			outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
-			break;
-		case KD_EGA:
-			/* not yet done XXX */
-			break;
-		case KD_CGA:
-			outb(adp->va_crtc_addr + 4, 0x25);
-			break;
-		case KD_MONO:
-		case KD_HERCULES:
-			outb(adp->va_crtc_addr + 4, 0x21);
-			break;
-		default:
-			break;
-		}
-	}
-	else {
-		switch (adp->va_type) {
-		case KD_VGA:
-			outb(TSIDX, 0x01); val = inb(TSREG);
-			outb(TSIDX, 0x01); outb(TSREG, val & 0xDF);
-			break;
-		case KD_EGA:
-			/* not yet done XXX */
-			break;
-		case KD_CGA:
-			outb(adp->va_crtc_addr + 4, 0x2d);
-			break;
-		case KD_MONO:
-		case KD_HERCULES:
-			outb(adp->va_crtc_addr + 4, 0x29);
-			break;
-		default:
-			break;
-		}
-	}
+	(*vidsw[adp->va_index]->blank_display)(adp,
+					       (blank) ? V_DISPLAY_BLANK
+						       : V_DISPLAY_ON);
 	return 0;
 }
 
 static int
 blank_init(video_adapter_t *adp)
 {
-	switch (adp->va_type) {
-	case KD_MONO:
-	case KD_HERCULES:
-	case KD_CGA:
-	case KD_VGA:
-		break;
-	case KD_EGA:
-		/* EGA is yet to be supported */
-	default:
-		return ENODEV;
-	}
-	return 0;
+	if ((*vidsw[adp->va_index]->blank_display)(adp, V_DISPLAY_ON) == 0)
+		return 0;
+	return ENODEV;
 }
 
 static int
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 423e6c70451d..ebedfaa2e8c0 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.14 1999/01/17 14:25:08 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.15 1999/02/05 12:40:15 des Exp $
  */
 
 #include <sys/param.h>
@@ -34,21 +34,20 @@
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <machine/md_var.h>
 #include <machine/pc/display.h>
 
-#include <saver.h>
-
-#define CONSOLE_VECT(x, y) \
-	(window + (y)*cur_console->xsize + (x))
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
 static char *message;
 static int messagelen;
-static u_short *window;
 static int blanked;
 
 /* Who is the author of this ASCII pic? */
@@ -119,20 +118,23 @@ xflip_symbol(char symbol)
 }
 
 static void
-clear_daemon(int xpos, int ypos, int dxdir, int xoff, int yoff, 
+clear_daemon(sc_softc_t *sc, int xpos, int ypos, int dxdir, int xoff, int yoff, 
 	    int xlen, int ylen)
 {
 	int y;
 
 	if (xlen <= 0)
 		return;
-	for (y = yoff; y < ylen; y++)
-		fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20], 
-		      CONSOLE_VECT(xpos + xoff, ypos + y), xlen - xoff);
+	for (y = yoff; y < ylen; y++) {
+		sc_vtb_erase(&sc->cur_scp->scr,
+			     (ypos + y)*sc->cur_scp->xsize + xpos + xoff,
+			     xlen - xoff,
+			     sc->scr_map[0x20], (FG_LIGHTGREY | BG_BLACK) << 8);
+	}
 }
 
 static void
-draw_daemon(int xpos, int ypos, int dxdir, int xoff, int yoff, 
+draw_daemon(sc_softc_t *sc, int xpos, int ypos, int dxdir, int xoff, int yoff, 
 	    int xlen, int ylen)
 {
 	int x, y;
@@ -148,41 +150,60 @@ draw_daemon(int xpos, int ypos, int dxdir, int xoff, int yoff,
 			continue;
 		for (x = xoff; (x < xlen) && (daemon_pic[y][px] != '\0'); x++, px++) {
 			switch (daemon_attr[y][px]) {
+#ifndef PC98
 			case 'R': attr = (FG_LIGHTRED|BG_BLACK)<<8; break;
 			case 'Y': attr = (FG_YELLOW|BG_BLACK)<<8; break;
 			case 'B': attr = (FG_LIGHTBLUE|BG_BLACK)<<8; break;
 			case 'W': attr = (FG_LIGHTGREY|BG_BLACK)<<8; break;
 			case 'C': attr = (FG_CYAN|BG_BLACK)<<8; break;
 			default: attr = (FG_WHITE|BG_BLACK)<<8; break;
+#else /* PC98 */
+			case 'R': attr = (FG_RED|BG_BLACK)<<8; break;
+			case 'Y': attr = (FG_BROWN|BG_BLACK)<<8; break;
+			case 'B': attr = (FG_BLUE|BG_BLACK)<<8; break;
+			case 'W': attr = (FG_LIGHTGREY|BG_BLACK)<<8; break;
+			case 'C': attr = (FG_CYAN|BG_BLACK)<<8; break;
+			default: attr = (FG_LIGHTGREY|BG_BLACK)<<8; break;
+#endif /* PC98 */
 			}
 			if (dxdir < 0) {	/* Moving left */
-				*CONSOLE_VECT(xpos + x, ypos + y) =
-					scr_map[daemon_pic[y][px]]|attr;
+				sc_vtb_putc(&sc->cur_scp->scr,
+					    (ypos + y)*sc->cur_scp->xsize
+						 + xpos + x,
+					    sc->scr_map[daemon_pic[y][px]],
+					    attr);
 			} else {		/* Moving right */
-				*CONSOLE_VECT(xpos + DAEMON_MAX_WIDTH - px - 1, ypos + y) =
-					scr_map[xflip_symbol(daemon_pic[y][px])]|attr;
+				sc_vtb_putc(&sc->cur_scp->scr,
+					    (ypos + y)*sc->cur_scp->xsize
+						+ xpos + DAEMON_MAX_WIDTH 
+						- px - 1,
+					    sc->scr_map[xflip_symbol(daemon_pic[y][px])], 
+					    attr);
 			}
 		}
 	}
 }
 
 static void
-clear_string(int xpos, int ypos, int xoff, char *s, int len)
+clear_string(sc_softc_t *sc, int xpos, int ypos, int xoff, char *s, int len)
 {
 	if (len <= 0)
 		return;
-	fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20], 
-	      CONSOLE_VECT(xpos + xoff, ypos), len - xoff);
+	sc_vtb_erase(&sc->cur_scp->scr,
+		     ypos*sc->cur_scp->xsize + xpos + xoff, len - xoff,
+		     sc->scr_map[0x20], (FG_LIGHTGREY | BG_BLACK) << 8);
 }
 
 static void
-draw_string(int xpos, int ypos, int xoff, char *s, int len)
+draw_string(sc_softc_t *sc, int xpos, int ypos, int xoff, char *s, int len)
 {
 	int x;
 
-	for (x = xoff; x < len; x++)
-		*CONSOLE_VECT(xpos + x, ypos) =
-			scr_map[s[x]]|(FG_LIGHTGREEN|BG_BLACK)<<8;
+	for (x = xoff; x < len; x++) {
+		sc_vtb_putc(&sc->cur_scp->scr,
+			    ypos*sc->cur_scp->xsize + xpos + x,
+			    sc->scr_map[s[x]], (FG_LIGHTGREEN | BG_BLACK) << 8);
+	}
 }
 
 static int
@@ -195,17 +216,30 @@ daemon_saver(video_adapter_t *adp, int blank)
 	static int moved_daemon = 0;
 	static int xoff, yoff, toff;
 	static int xlen, ylen, tlen;
-	scr_stat *scp = cur_console;
+	sc_softc_t *sc;
+	scr_stat *scp;
 	int min, max;
 
+	sc = sc_find_softc(adp, NULL);
+	if (sc == NULL)
+		return EAGAIN;
+	scp = sc->cur_scp;
+
 	if (blank) {
 		if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
 			return EAGAIN;
 		if (blanked == 0) {
-			window = (u_short *)adp->va_window;
+#ifdef PC98
+			if (epson_machine_id == 0x20) {
+				outb(0x43f, 0x42);
+				outb(0x0c17, inb(0xc17) & ~0x08);
+				outb(0x43f, 0x40);
+			}
+#endif /* PC98 */
 			/* clear the screen and set the border color */
-			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
-			      window, scp->xsize * scp->ysize);
+			sc_vtb_clear(&scp->scr, sc->scr_map[0x20],
+				     (FG_LIGHTGREY | BG_BLACK) << 8);
+			(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
 			set_border(scp, 0);
 			xlen = ylen = tlen = 0;
 		}
@@ -213,8 +247,8 @@ daemon_saver(video_adapter_t *adp, int blank)
 			return 0;
 		blanked = 1;
 
- 		clear_daemon(dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
-		clear_string(txpos, typos, toff, (char *)message, tlen);
+ 		clear_daemon(sc, dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
+		clear_string(sc, txpos, typos, toff, (char *)message, tlen);
 
 		if (++moved_daemon) {
 			/*
@@ -319,9 +353,16 @@ daemon_saver(video_adapter_t *adp, int blank)
 		else if (txpos + tlen > scp->xsize)
 			tlen = scp->xsize - txpos;
 
- 		draw_daemon(dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
-		draw_string(txpos, typos, toff, (char *)message, tlen);
+ 		draw_daemon(sc, dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
+		draw_string(sc, txpos, typos, toff, (char *)message, tlen);
 	} else {
+#ifdef PC98
+		if (epson_machine_id == 0x20) {
+			outb(0x43f, 0x42);
+			outb(0x0c17, inb(0xc17) | 0x08);
+			outb(0x43f, 0x40);
+		}
+#endif /* PC98 */
 		blanked = 0;
 	}
 	return 0;
diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index 70d36c9c1e0c..4a44c8519bcc 100644
--- a/sys/dev/syscons/fade/fade_saver.c
+++ b/sys/dev/syscons/fade/fade_saver.c
@@ -25,17 +25,19 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.15 1998/11/04 03:49:38 peter Exp $
+ *	$Id: fade_saver.c,v 1.16 1999/01/11 03:18:46 yokota Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <i386/isa/isa.h>
-
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 static u_char palette[256*3];
 static int blanked;
@@ -49,11 +51,10 @@ fade_saver(video_adapter_t *adp, int blank)
 
 	if (blank) {
 		blanked = TRUE;
-		switch (adp->va_type) {
-		case KD_VGA:
+		if (ISPALAVAIL(adp->va_flags)) {
 			if (count <= 0)
 				save_palette(adp, palette);
-			if (count < 64) {
+			if (count < 256) {
 				pal[0] = pal[1] = pal[2] = 0;
 				for (i = 3; i < 256*3; i++) {
 					if (palette[i] - count > 60)
@@ -64,39 +65,17 @@ fade_saver(video_adapter_t *adp, int blank)
 				load_palette(adp, pal);
 				count++;
 			}
-			break;
-		case KD_EGA:
-			/* not yet done XXX */
-			break;
-		case KD_CGA:
-			outb(adp->va_crtc_addr + 4, 0x25);
-			break;
-		case KD_MONO:
-		case KD_HERCULES:
-			outb(adp->va_crtc_addr + 4, 0x21);
-			break;
-		default:
-			break;
+		} else {
+	    		(*vidsw[adp->va_index]->blank_display)(adp,
+							       V_DISPLAY_BLANK);
 		}
-	}
-	else {
-		switch (adp->va_type) {
-		case KD_VGA:
+	} else {
+		if (ISPALAVAIL(adp->va_flags)) {
 			load_palette(adp, palette);
 			count = 0;
-			break;
-		case KD_EGA:
-			/* not yet done XXX */
-			break;
-		case KD_CGA:
-			outb(adp->va_crtc_addr + 4, 0x2d);
-			break;
-		case KD_MONO:
-		case KD_HERCULES:
-			outb(adp->va_crtc_addr + 4, 0x29);
-			break;
-		default:
-			break;
+		} else {
+	    		(*vidsw[adp->va_index]->blank_display)(adp,
+							       V_DISPLAY_ON);
 		}
 		blanked = FALSE;
 	}
@@ -106,21 +85,9 @@ fade_saver(video_adapter_t *adp, int blank)
 static int
 fade_init(video_adapter_t *adp)
 {
-	switch (adp->va_type) {
-	case KD_MONO:
-	case KD_HERCULES:
-	case KD_CGA:
-		/* 
-		 * `fade' saver is not fully implemented for MDA and CGA.
-		 * It simply blanks the display instead.
-		 */
-	case KD_VGA:
-		break;
-	case KD_EGA:
-		/* EGA is yet to be supported */
-	default:
+	if (!ISPALAVAIL(adp->va_flags)
+	    && (*vidsw[adp->va_index]->blank_display)(adp, V_DISPLAY_ON) != 0)
 		return ENODEV;
-	}
 	blanked = FALSE;
 	return 0;
 }
diff --git a/sys/dev/syscons/fire/fire_saver.c b/sys/dev/syscons/fire/fire_saver.c
index aea36a9bf49f..db4b80b1a7b0 100644
--- a/sys/dev/syscons/fire/fire_saver.c
+++ b/sys/dev/syscons/fire/fire_saver.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fire_saver.c,v 1.2.2.1 1999/05/10 15:20:30 des Exp $
+ *	$Id: fire_saver.c,v 1.4 1999/05/10 15:25:50 des Exp $
  */
 
 /*
@@ -38,11 +38,14 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/syslog.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <machine/md_var.h>
 #include <machine/random.h>
 
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 #define X_SIZE 320
 #define Y_SIZE 200
diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index 9decd7282f9f..103154be7a8d 100644
--- a/sys/dev/syscons/green/green_saver.c
+++ b/sys/dev/syscons/green/green_saver.c
@@ -25,93 +25,35 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.14 1998/11/04 03:49:38 peter Exp $
+ *	$Id: green_saver.c,v 1.15 1999/01/11 03:18:48 yokota Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <dev/fb/vgareg.h>
-
-#include <i386/isa/isa.h>
-
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 static int
 green_saver(video_adapter_t *adp, int blank)
 {
-	int crtc_addr;
-	u_char val;
-
-	crtc_addr = adp->va_crtc_addr;
-	if (blank) {
-		switch (adp->va_type) {
-		case KD_VGA:
-			outb(TSIDX, 0x01); val = inb(TSREG);
-			outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
-			outb(crtc_addr, 0x17); val = inb(crtc_addr + 1);
-			outb(crtc_addr + 1, val & ~0x80);
-			break;
-		case KD_EGA:
-			/* not yet done XXX */
-			break;
-		case KD_CGA:
-			outb(crtc_addr + 4, 0x25);
-			break;
-		case KD_MONO:
-		case KD_HERCULES:
-			outb(crtc_addr + 4, 0x21);
-			break;
-		default:
-			break;
-		}
-	}
-	else {
-		switch (adp->va_type) {
-		case KD_VGA:
-			outb(TSIDX, 0x01); val = inb(TSREG);
-			outb(TSIDX, 0x01); outb(TSREG, val & 0xDF);
-			outb(crtc_addr, 0x17); val = inb(crtc_addr + 1);
-			outb(crtc_addr + 1, val | 0x80);
-			break;
-		case KD_EGA:
-			/* not yet done XXX */
-			break;
-		case KD_CGA:
-			outb(crtc_addr + 4, 0x2d);
-			break;
-		case KD_MONO:
-		case KD_HERCULES:
-			outb(crtc_addr + 4, 0x29);
-			break;
-		default:
-			break;
-		}
-	}
+	(*vidsw[adp->va_index]->blank_display)(adp,
+					       (blank) ? V_DISPLAY_STAND_BY
+						       : V_DISPLAY_ON);
 	return 0;
 }
 
 static int
 green_init(video_adapter_t *adp)
 {
-	switch (adp->va_type) {
-	case KD_MONO:
-	case KD_HERCULES:
-	case KD_CGA:
-		/* 
-		 * `green' saver is not fully implemented for MDA and CGA.
-		 * It simply blanks the display instead.
-		 */
-	case KD_VGA:
-		break;
-	case KD_EGA:
-		/* EGA is yet to be supported */
-	default:
-		return ENODEV;
-	}
-	return 0;
+	if ((*vidsw[adp->va_index]->blank_display)(adp, V_DISPLAY_ON) == 0)
+		return 0;
+	return ENODEV;
 }
 
 static int
diff --git a/sys/dev/syscons/logo/logo_saver.c b/sys/dev/syscons/logo/logo_saver.c
index b6a46acd312a..24da9644a17f 100644
--- a/sys/dev/syscons/logo/logo_saver.c
+++ b/sys/dev/syscons/logo/logo_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: logo_saver.c,v 1.5 1999/02/05 12:40:15 des Exp $
+ *	$Id: logo_saver.c,v 1.6 1999/04/12 13:34:57 des Exp $
  */
 
 #include <sys/param.h>
@@ -33,8 +33,12 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/syslog.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 static u_char *vid;
 static int banksize, scrmode, bpsl, scrw, scrh;
@@ -104,6 +108,7 @@ logo_saver(video_adapter_t *adp, int blank)
 #endif
 	    blanked++;
 	    vid = (u_char *)adp->va_window;
+	    banksize = adp->va_window_size;
 	    bpsl = adp->va_line_width;
 	    splx(pl);
 	    for (i = 0; i < bpsl*scrh; i += banksize) {
@@ -132,7 +137,6 @@ logo_init(video_adapter_t *adp)
 	return ENODEV;
     }
     
-    banksize = info.vi_window_size;
     scrw = info.vi_width;
     scrh = info.vi_height;
     blanked = 0;
diff --git a/sys/dev/syscons/rain/rain_saver.c b/sys/dev/syscons/rain/rain_saver.c
index 9aa7370074c1..200dc59931f0 100644
--- a/sys/dev/syscons/rain/rain_saver.c
+++ b/sys/dev/syscons/rain/rain_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: rain_saver.c,v 1.2 1999/01/11 03:18:50 yokota Exp $
+ *	$Id: rain_saver.c,v 1.3 1999/04/12 13:34:57 des Exp $
  */
 
 #include <sys/param.h>
@@ -33,10 +33,14 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/syslog.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
 #include <machine/random.h>
 
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 static u_char *vid;
 
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c
new file mode 100644
index 000000000000..16c40e26e566
--- /dev/null
+++ b/sys/dev/syscons/scgfbrndr.c
@@ -0,0 +1,829 @@
+/*-
+ * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id:$
+ */
+
+#include "sc.h"
+#include "vga.h"
+#include "opt_syscons.h"
+#include "opt_vga.h"
+
+#if NSC > 0 && NVGA > 0
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+
+#include <machine/console.h>
+#include <machine/md_var.h>
+
+#include <dev/fb/fbreg.h>
+#include <dev/fb/vgareg.h>
+#include <dev/syscons/syscons.h>
+
+#include <isa/isareg.h>
+
+#ifndef SC_MOUSE_CHAR
+#define SC_MOUSE_CHAR		(0xd0)
+#endif
+
+#ifndef SC_RENDER_DEBUG
+#define SC_RENDER_DEBUG		0
+#endif
+
+static vr_clear_t		vga_txtclear;
+static vr_draw_border_t		vga_txtborder;
+static vr_draw_t		vga_txtdraw;
+static vr_set_cursor_t		vga_txtcursor_shape;
+static vr_draw_cursor_t		vga_txtcursor;
+static vr_blink_cursor_t	vga_txtblink;
+#ifndef SC_NO_CUTPASTE
+static vr_draw_mouse_t		vga_txtmouse;
+#else
+#define vga_txtmouse		(vr_draw_mouse_t *)vga_nop
+#endif
+
+#ifdef SC_PIXEL_MODE
+static vr_clear_t		vga_pxlclear;
+static vr_draw_border_t		vga_pxlborder;
+static vr_draw_t		vga_egadraw;
+static vr_draw_t		vga_vgadraw;
+static vr_set_cursor_t		vga_pxlcursor_shape;
+static vr_draw_cursor_t		vga_pxlcursor;
+static vr_blink_cursor_t	vga_pxlblink;
+#ifndef SC_NO_CUTPASTE
+static vr_draw_mouse_t		vga_pxlmouse;
+#else
+#define vga_pxlmouse		(vr_draw_mouse_t *)vga_nop
+#endif
+#endif /* SC_PIXEL_MODE */
+
+#ifndef SC_NO_MODE_CHANGE
+static vr_draw_border_t		vga_grborder;
+#endif
+
+static void			vga_nop(scr_stat *scp, ...);
+
+static sc_rndr_sw_t txtrndrsw = {
+	vga_txtclear,
+	vga_txtborder,
+	vga_txtdraw,	
+	vga_txtcursor_shape,
+	vga_txtcursor,
+	vga_txtblink,
+	(vr_set_mouse_t *)vga_nop,
+	vga_txtmouse,
+};
+RENDERER(mda, 0, txtrndrsw);
+RENDERER(cga, 0, txtrndrsw);
+RENDERER(ega, 0, txtrndrsw);
+RENDERER(vga, 0, txtrndrsw);
+
+#ifdef SC_PIXEL_MODE
+static sc_rndr_sw_t egarndrsw = {
+	vga_pxlclear,
+	vga_pxlborder,
+	vga_egadraw,
+	vga_pxlcursor_shape,
+	vga_pxlcursor,
+	vga_pxlblink,
+	(vr_set_mouse_t *)vga_nop,
+	vga_pxlmouse,
+};
+RENDERER(ega, PIXEL_MODE, egarndrsw);
+
+static sc_rndr_sw_t vgarndrsw = {
+	vga_pxlclear,
+	vga_pxlborder,
+	vga_vgadraw,
+	vga_pxlcursor_shape,
+	vga_pxlcursor,
+	vga_pxlblink,
+	(vr_set_mouse_t *)vga_nop,
+	vga_pxlmouse,
+};
+RENDERER(vga, PIXEL_MODE, vgarndrsw);
+#endif /* SC_PIXEL_MODE */
+
+#ifndef SC_NO_MODE_CHANGE
+static sc_rndr_sw_t grrndrsw = {
+	(vr_clear_t *)vga_nop,
+	vga_grborder,
+	(vr_draw_t *)vga_nop,
+	(vr_set_cursor_t *)vga_nop,
+	(vr_draw_cursor_t *)vga_nop,
+	(vr_blink_cursor_t *)vga_nop,
+	(vr_set_mouse_t *)vga_nop,
+	(vr_draw_mouse_t *)vga_nop,
+};
+RENDERER(cga, GRAPHICS_MODE, grrndrsw);
+RENDERER(ega, GRAPHICS_MODE, grrndrsw);
+RENDERER(vga, GRAPHICS_MODE, grrndrsw);
+#endif /* SC_NO_MODE_CHANGE */
+
+#ifndef SC_NO_CUTPASTE
+static u_short mouse_and_mask[16] = {
+	0xc000, 0xe000, 0xf000, 0xf800, 0xfc00, 0xfe00, 0xff00, 0xff80,
+	0xfe00, 0x1e00, 0x1f00, 0x0f00, 0x0f00, 0x0000, 0x0000, 0x0000
+};
+static u_short mouse_or_mask[16] = {
+	0x0000, 0x4000, 0x6000, 0x7000, 0x7800, 0x7c00, 0x7e00, 0x6800,
+	0x0c00, 0x0c00, 0x0600, 0x0600, 0x0000, 0x0000, 0x0000, 0x0000
+};
+#endif
+
+static void
+vga_nop(scr_stat *scp, ...)
+{
+}
+
+/* text mode renderer */
+
+static void
+vga_txtclear(scr_stat *scp, int c, int attr)
+{
+	sc_vtb_clear(&scp->scr, c, attr);
+}
+
+static void
+vga_txtborder(scr_stat *scp, int color)
+{
+	(*vidsw[scp->sc->adapter]->set_border)(scp->sc->adp, color);
+}
+
+static void
+vga_txtdraw(scr_stat *scp, int from, int count, int flip)
+{
+	vm_offset_t p;
+	int c;
+	int a;
+
+	if (from + count > scp->xsize*scp->ysize)
+		count = scp->xsize*scp->ysize - from;
+
+	if (flip) {
+		for (p = sc_vtb_pointer(&scp->scr, from); count-- > 0; ++from) {
+			c = sc_vtb_getc(&scp->vtb, from);
+			a = sc_vtb_geta(&scp->vtb, from);
+			a = (a & 0x8800) | ((a & 0x7000) >> 4) 
+				| ((a & 0x0700) << 4);
+			p = sc_vtb_putchar(&scp->scr, p, c, a);
+		}
+	} else {
+		sc_vtb_copy(&scp->vtb, from, &scp->scr, from, count);
+	}
+}
+
+static void 
+vga_txtcursor_shape(scr_stat *scp, int base, int height, int blink)
+{
+	if (base < 0 || base >= scp->font_size)
+		return;
+	/* the caller may set height <= 0 in order to disable the cursor */
+#if 0
+	scp->cursor_base = base;
+	scp->cursor_height = height;
+#endif
+	(*vidsw[scp->sc->adapter]->set_hw_cursor_shape)(scp->sc->adp,
+							base, height,
+							scp->font_size, blink);
+}
+
+static void
+vga_txtcursor(scr_stat *scp, int at, int blink, int on, int flip)
+{
+	video_adapter_t *adp;
+	int cursor_attr;
+
+	if (scp->cursor_height <= 0)	/* the text cursor is disabled */
+		return;
+
+	adp = scp->sc->adp;
+	if (blink) {
+		scp->status |= VR_CURSOR_BLINK;
+		if (on) {
+			scp->status |= VR_CURSOR_ON;
+			(*vidsw[adp->va_index]->set_hw_cursor)(adp,
+							       at%scp->xsize,
+							       at/scp->xsize); 
+		} else {
+			if (scp->status & VR_CURSOR_ON)
+				(*vidsw[adp->va_index]->set_hw_cursor)(adp,
+								       -1, -1);
+			scp->status &= ~VR_CURSOR_ON;
+		}
+	} else {
+		scp->status &= ~VR_CURSOR_BLINK;
+		if (on) {
+			scp->status |= VR_CURSOR_ON;
+			cursor_attr = sc_vtb_geta(&scp->vtb, at);
+			scp->cursor_saveunder_char = sc_vtb_getc(&scp->scr, at);
+			scp->cursor_saveunder_attr = cursor_attr;
+			if ((cursor_attr & 0x7000) == 0x7000) {
+				cursor_attr &= 0x8f00;
+				if ((cursor_attr & 0x0700) == 0)
+					cursor_attr |= 0x0700;
+			} else {
+				cursor_attr |= 0x7000;
+				if ((cursor_attr & 0x0700) == 0x0700)
+					cursor_attr &= 0xf000;
+			}
+			if (flip)
+				cursor_attr = (cursor_attr & 0x8800)
+					| ((cursor_attr & 0x7000) >> 4)
+					| ((cursor_attr & 0x0700) << 4);
+			sc_vtb_putc(&scp->scr, at,
+				    sc_vtb_getc(&scp->scr, at),
+				    cursor_attr);
+		} else {
+			cursor_attr = scp->cursor_saveunder_attr;
+			if (flip)
+				cursor_attr = (cursor_attr & 0x8800)
+					| ((cursor_attr & 0x7000) >> 4)
+					| ((cursor_attr & 0x0700) << 4);
+			if (scp->status & VR_CURSOR_ON)
+				sc_vtb_putc(&scp->scr, at,
+					    scp->cursor_saveunder_char,
+					    cursor_attr);
+			scp->status &= ~VR_CURSOR_ON;
+		}
+	}
+}
+
+static void
+vga_txtblink(scr_stat *scp, int at, int flip)
+{
+}
+
+#ifndef SC_NO_CUTPASTE
+
+static void
+draw_txtmouse(scr_stat *scp, int x, int y)
+{
+#ifndef SC_ALT_MOUSE_IMAGE
+	u_char font_buf[128];
+	u_short cursor[32];
+	int pos;
+	int xoffset, yoffset;
+	int crtc_addr;
+	int i;
+
+	/* prepare mousepointer char's bitmaps */
+	pos = (y/scp->font_size - scp->yoff)*scp->xsize + x/8 - scp->xoff;
+	bcopy(scp->font + sc_vtb_getc(&scp->vtb, pos)*scp->font_size,
+	      &font_buf[0], scp->font_size);
+	bcopy(scp->font + sc_vtb_getc(&scp->vtb, pos + 1)*scp->font_size,
+	      &font_buf[32], scp->font_size);
+	bcopy(scp->font 
+		 + sc_vtb_getc(&scp->vtb, pos + scp->xsize)*scp->font_size,
+	      &font_buf[64], scp->font_size);
+	bcopy(scp->font
+		 + sc_vtb_getc(&scp->vtb, pos + scp->xsize + 1)*scp->font_size,
+	      &font_buf[96], scp->font_size);
+	for (i = 0; i < scp->font_size; ++i) {
+		cursor[i] = font_buf[i]<<8 | font_buf[i+32];
+		cursor[i + scp->font_size] = font_buf[i+64]<<8 | font_buf[i+96];
+	}
+
+	/* now and-or in the mousepointer image */
+	xoffset = x%8;
+	yoffset = y%scp->font_size;
+	for (i = 0; i < 16; ++i) {
+		cursor[i + yoffset] =
+	    		(cursor[i + yoffset] & ~(mouse_and_mask[i] >> xoffset))
+	    		| (mouse_or_mask[i] >> xoffset);
+	}
+	for (i = 0; i < scp->font_size; ++i) {
+		font_buf[i] = (cursor[i] & 0xff00) >> 8;
+		font_buf[i + 32] = cursor[i] & 0xff;
+		font_buf[i + 64] = (cursor[i + scp->font_size] & 0xff00) >> 8;
+		font_buf[i + 96] = cursor[i + scp->font_size] & 0xff;
+	}
+
+#if 1
+	/* wait for vertical retrace to avoid jitter on some videocards */
+	crtc_addr = scp->sc->adp->va_crtc_addr;
+	while (!(inb(crtc_addr + 6) & 0x08)) /* idle */ ;
+#endif
+	(*vidsw[scp->sc->adapter]->load_font)(scp->sc->adp, 0, 32, font_buf,
+					      SC_MOUSE_CHAR, 4); 
+
+	sc_vtb_putc(&scp->scr, pos, SC_MOUSE_CHAR, sc_vtb_geta(&scp->scr, pos));
+	/* FIXME: may be out of range! */
+	sc_vtb_putc(&scp->scr, pos + scp->xsize, SC_MOUSE_CHAR + 2,
+		    sc_vtb_geta(&scp->scr, pos + scp->xsize));
+	if (x < (scp->xsize - 1)*8) {
+		sc_vtb_putc(&scp->scr, pos + 1, SC_MOUSE_CHAR + 1,
+			    sc_vtb_geta(&scp->scr, pos + 1));
+		sc_vtb_putc(&scp->scr, pos + scp->xsize + 1, SC_MOUSE_CHAR + 3,
+			    sc_vtb_geta(&scp->scr, pos + scp->xsize + 1));
+	}
+#else /* SC_ALT_MOUSE_IMAGE */
+	/* Red, magenta and brown are mapped to green to to keep it readable */
+	static const int col_conv[16] = {
+		6, 6, 6, 6, 2, 2, 2, 6, 14, 14, 14, 14, 10, 10, 10, 14
+	};
+	int pos;
+	int color;
+	int a;
+
+	pos = (y/scp->font_size - scp->yoff)*scp->xsize + x/8 - scp->xoff;
+	a = sc_vtb_geta(&scp->scr, pos);
+	if (scp->sc->adp->va_flags & V_ADP_COLOR)
+		color = (col_conv[(a & 0xf000) >> 12] << 12)
+			| ((a & 0x0f00) | 0x0800);
+	else
+		color = ((a & 0xf000) >> 4) | ((a & 0x0f00) << 4);
+	sc_vtb_putc(&scp->scr, pos, sc_vtb_getc(&scp->scr, pos), color);
+#endif /* SC_ALT_MOUSE_IMAGE */
+}
+
+static void
+remove_txtmouse(scr_stat *scp, int x, int y)
+{
+}
+
+static void 
+vga_txtmouse(scr_stat *scp, int x, int y, int on)
+{
+	if (on)
+		draw_txtmouse(scp, x, y);
+	else
+		remove_txtmouse(scp, x, y);
+}
+
+#endif /* SC_NO_CUTPASTE */
+
+#ifdef SC_PIXEL_MODE
+
+/* pixel (raster text) mode renderer */
+
+static void
+vga_pxlclear(scr_stat *scp, int c, int attr)
+{
+	vm_offset_t p;
+	int line_width;
+	int lines;
+	int i;
+
+	/* XXX: we are just filling the screen with the background color... */
+	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+	outw(GDCIDX, 0x0003);		/* data rotate/function select */
+	outw(GDCIDX, 0x0f01);		/* set/reset enable */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+	outw(GDCIDX, ((attr & 0xf000) >> 4) | 0x00); /* set/reset */
+	line_width = scp->sc->adp->va_line_width;
+	lines = scp->ysize*scp->font_size; 
+	p = scp->sc->adp->va_window + line_width*scp->yoff*scp->font_size
+		+ scp->xoff;
+	for (i = 0; i < lines; ++i) {
+		bzero_io((void *)p, scp->xsize);
+		p += line_width;
+	}
+	outw(GDCIDX, 0x0000);		/* set/reset */
+	outw(GDCIDX, 0x0001);		/* set/reset enable */
+}
+
+static void
+vga_pxlborder(scr_stat *scp, int color)
+{
+	vm_offset_t p;
+	int line_width;
+	int i;
+
+	(*vidsw[scp->sc->adapter]->set_border)(scp->sc->adp, color);
+
+	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+	outw(GDCIDX, 0x0003);		/* data rotate/function select */
+	outw(GDCIDX, 0x0f01);		/* set/reset enable */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+	outw(GDCIDX, (color << 8) | 0x00);	/* set/reset */
+	line_width = scp->sc->adp->va_line_width;
+	p = scp->sc->adp->va_window;
+	if (scp->yoff > 0) {
+		bzero_io((void *)p, line_width*scp->yoff*scp->font_size);
+		bzero_io((void *)(p + line_width*(scp->yoff + scp->ysize)
+					  *scp->font_size),
+			 line_width*(scp->ypixel
+				     - (scp->yoff + scp->ysize)*scp->font_size));
+	}
+	if (scp->xoff > 0) {
+		for (i = 0; i < scp->ysize*scp->font_size; ++i) {
+			bzero_io((void *)(p + line_width
+					          *(scp->yoff*scp->font_size + i)),
+				 scp->xoff);
+			bzero_io((void *)(p + line_width
+						  *(scp->yoff*scp->font_size + i)
+				     + scp->xoff + scp->xsize), 
+				 scp->xpixel/8 - scp->xoff - scp->xsize);
+		}
+	}
+	outw(GDCIDX, 0x0000);		/* set/reset */
+	outw(GDCIDX, 0x0001);		/* set/reset enable */
+}
+
+static void 
+vga_egadraw(scr_stat *scp, int from, int count, int flip)
+{
+	vm_offset_t d;
+	vm_offset_t e;
+	u_char *f;
+	u_short bg;
+	u_short col1, col2;
+	int line_width;
+	int i, j;
+	int a;
+	u_char c;
+
+	line_width = scp->sc->adp->va_line_width;
+	d = scp->sc->adp->va_window
+		+ scp->xoff 
+		+ scp->yoff*scp->font_size*line_width 
+		+ (from%scp->xsize) 
+		+ scp->font_size*line_width*(from/scp->xsize);
+
+	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+	outw(GDCIDX, 0x0003);		/* data rotate/function select */
+	outw(GDCIDX, 0x0f01);		/* set/reset enable */
+	bg = -1;
+	if (from + count > scp->xsize*scp->ysize)
+		count = scp->xsize*scp->ysize - from;
+	for (i = from; count-- > 0; ++i) {
+		a = sc_vtb_geta(&scp->vtb, i);
+		if (flip) {
+			col1 = ((a & 0x7000) >> 4) | (a & 0x0800);
+			col2 = ((a & 0x8000) >> 4) | (a & 0x0700);
+		} else {
+			col1 = (a & 0x0f00);
+			col2 = (a & 0xf000) >> 4;
+		}
+		/* set background color in EGA/VGA latch */
+		if (bg != col2) {
+			bg = col2;
+			outw(GDCIDX, bg | 0x00);	/* set/reset */
+			outw(GDCIDX, 0xff08);		/* bit mask */
+			writeb(d, 0);
+			c = readb(d);	/* set bg color in the latch */
+		}
+		/* foreground color */
+		outw(GDCIDX, col1 | 0x00);		/* set/reset */
+		e = d;
+		f = &(scp->font[sc_vtb_getc(&scp->vtb, i)*scp->font_size]);
+		for (j = 0; j < scp->font_size; ++j, ++f) {
+			outw(GDCIDX, (*f << 8) | 0x08);	/* bit mask */
+	        	writeb(e, 0);
+			e += line_width;
+		}
+		++d;
+		if ((i % scp->xsize) == scp->xsize - 1)
+			d += scp->xoff*2 
+				 + (scp->font_size - 1)*line_width;
+	}
+	outw(GDCIDX, 0x0000);		/* set/reset */
+	outw(GDCIDX, 0x0001);		/* set/reset enable */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+}
+
+static void 
+vga_vgadraw(scr_stat *scp, int from, int count, int flip)
+{
+	vm_offset_t d;
+	vm_offset_t e;
+	u_char *f;
+	u_short bg;
+	u_short col1, col2;
+	int line_width;
+	int i, j;
+	int a;
+	u_char c;
+
+	line_width = scp->sc->adp->va_line_width;
+	d = scp->sc->adp->va_window
+		+ scp->xoff 
+		+ scp->yoff*scp->font_size*line_width 
+		+ (from%scp->xsize) 
+		+ scp->font_size*line_width*(from/scp->xsize);
+
+	outw(GDCIDX, 0x0305);		/* read mode 0, write mode 3 */
+	outw(GDCIDX, 0x0003);		/* data rotate/function select */
+	outw(GDCIDX, 0x0f01);		/* set/reset enable */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+	bg = -1;
+	if (from + count > scp->xsize*scp->ysize)
+		count = scp->xsize*scp->ysize - from;
+	for (i = from; count-- > 0; ++i) {
+		a = sc_vtb_geta(&scp->vtb, i);
+		if (flip) {
+			col1 = ((a & 0x7000) >> 4) | (a & 0x0800);
+			col2 = ((a & 0x8000) >> 4) | (a & 0x0700);
+		} else {
+			col1 = (a & 0x0f00);
+			col2 = (a & 0xf000) >> 4;
+		}
+		/* set background color in EGA/VGA latch */
+		if (bg != col2) {
+			bg = col2;
+			outw(GDCIDX, 0x0005);	/* read mode 0, write mode 0 */
+			outw(GDCIDX, bg | 0x00); /* set/reset */
+			writeb(d, 0);
+			c = readb(d);		/* set bg color in the latch */
+			outw(GDCIDX, 0x0305);	/* read mode 0, write mode 3 */
+		}
+		/* foreground color */
+		outw(GDCIDX, col1 | 0x00);	/* set/reset */
+		e = d;
+		f = &(scp->font[sc_vtb_getc(&scp->vtb, i)*scp->font_size]);
+		for (j = 0; j < scp->font_size; ++j, ++f) {
+	        	writeb(e, *f);
+			e += line_width;
+		}
+		++d;
+		if ((i % scp->xsize) == scp->xsize - 1)
+			d += scp->xoff*2 
+				 + (scp->font_size - 1)*line_width;
+	}
+	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+	outw(GDCIDX, 0x0000);		/* set/reset */
+	outw(GDCIDX, 0x0001);		/* set/reset enable */
+}
+
+static void 
+vga_pxlcursor_shape(scr_stat *scp, int base, int height, int blink)
+{
+	if (base < 0 || base >= scp->font_size)
+		return;
+	/* the caller may set height <= 0 in order to disable the cursor */
+#if 0
+	scp->cursor_base = base;
+	scp->cursor_height = height;
+#endif
+}
+
+static void 
+draw_pxlcursor(scr_stat *scp, int at, int on, int flip)
+{
+	vm_offset_t d;
+	u_char *f;
+	int line_width;
+	int height;
+	int col;
+	int a;
+	int i;
+	u_char c;
+
+	line_width = scp->sc->adp->va_line_width;
+	d = scp->sc->adp->va_window
+		+ scp->xoff 
+		+ scp->yoff*scp->font_size*line_width 
+		+ (at%scp->xsize) 
+		+ scp->font_size*line_width*(at/scp->xsize)
+		+ (scp->font_size - scp->cursor_base - 1)*line_width;
+
+	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+	outw(GDCIDX, 0x0003);		/* data rotate/function select */
+	outw(GDCIDX, 0x0f01);		/* set/reset enable */
+	/* set background color in EGA/VGA latch */
+	a = sc_vtb_geta(&scp->vtb, at);
+	if (flip)
+		col = (on) ? ((a & 0xf000) >> 4) : (a & 0x0f00);
+	else
+		col = (on) ? (a & 0x0f00) : ((a & 0xf000) >> 4);
+	outw(GDCIDX, col | 0x00);	/* set/reset */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+	writeb(d, 0);
+	c = readb(d);			/* set bg color in the latch */
+	/* foreground color */
+	if (flip)
+		col = (on) ? (a & 0x0f00) : ((a & 0xf000) >> 4);
+	else
+		col = (on) ? ((a & 0xf000) >> 4) : (a & 0x0f00);
+	outw(GDCIDX, col | 0x00);	/* set/reset */
+	f = &(scp->font[sc_vtb_getc(&scp->vtb, at)*scp->font_size
+		+ scp->font_size - scp->cursor_base - 1]);
+	height = imin(scp->cursor_height, scp->font_size);
+	for (i = 0; i < height; ++i, --f) {
+		outw(GDCIDX, (*f << 8) | 0x08);	/* bit mask */
+	       	writeb(d, 0);
+		d -= line_width;
+	}
+	outw(GDCIDX, 0x0000);		/* set/reset */
+	outw(GDCIDX, 0x0001);		/* set/reset enable */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+}
+
+static void 
+vga_pxlcursor(scr_stat *scp, int at, int blink, int on, int flip)
+{
+	if (scp->cursor_height <= 0)	/* the text cursor is disabled */
+		return;
+
+	if (on) {
+		scp->status |= VR_CURSOR_ON;
+		draw_pxlcursor(scp, at, on, flip);
+	} else {
+		if (scp->status & VR_CURSOR_ON)
+			draw_pxlcursor(scp, at, on, flip);
+		scp->status &= ~VR_CURSOR_ON;
+	}
+	if (blink)
+		scp->status |= VR_CURSOR_BLINK;
+	else
+		scp->status &= ~VR_CURSOR_BLINK;
+}
+
+static void
+vga_pxlblink(scr_stat *scp, int at, int flip)
+{
+	static int blinkrate = 0;
+
+	if (!(scp->status & VR_CURSOR_BLINK))
+		return;
+	if (!(++blinkrate & 4))
+		return;
+	blinkrate = 0;
+	scp->status ^= VR_CURSOR_ON;
+	draw_pxlcursor(scp, at, scp->status & VR_CURSOR_ON, flip);
+}
+
+#ifndef SC_NO_CUTPASTE
+
+static void
+draw_pxlmouse(scr_stat *scp, int x, int y)
+{
+	vm_offset_t p;
+	int line_width;
+	int xoff, yoff;
+	int ymax;
+	u_short m;
+	int i, j;
+
+	line_width = scp->sc->adp->va_line_width;
+	xoff = (x - scp->xoff*8)%8;
+	yoff = y - (y/line_width)*line_width;
+	ymax = imin(y + 16, scp->ypixel);
+
+	outw(GDCIDX, 0x0805);		/* read mode 1, write mode 0 */
+	outw(GDCIDX, 0x0001);		/* set/reset enable */
+	outw(GDCIDX, 0x0002);		/* color compare */
+	outw(GDCIDX, 0x0007);		/* color don't care */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+	outw(GDCIDX, 0x0803);		/* data rotate/function select (and) */
+	p = scp->sc->adp->va_window + line_width*y + x/8;
+	if (x < scp->xpixel - 16) {
+		for (i = y, j = 0; i < ymax; ++i, ++j) {
+			m = ~(mouse_and_mask[j] >> xoff);
+#ifdef __i386__
+			*(u_char *)p &= m >> 8;
+			*(u_char *)(p + 1) &= m;
+#elif defined(__alpha__)
+			writeb(p, readb(p) & (m >> 8));
+			writeb(p + 1, readb(p + 1) & (m >> 8));
+#endif
+			p += line_width;
+		}
+	} else {
+		xoff += 8;
+		for (i = y, j = 0; i < ymax; ++i, ++j) {
+			m = ~(mouse_and_mask[j] >> xoff);
+#ifdef __i386__
+			*(u_char *)p &= m;
+#elif defined(__alpha__)
+			writeb(p, readb(p) & (m >> 8));
+#endif
+			p += line_width;
+		}
+	}
+	outw(GDCIDX, 0x1003);		/* data rotate/function select (or) */
+	p = scp->sc->adp->va_window + line_width*y + x/8;
+	if (x < scp->xpixel - 16) {
+		for (i = y, j = 0; i < ymax; ++i, ++j) {
+			m = mouse_or_mask[j] >> xoff;
+#ifdef __i386__
+			*(u_char *)p &= m >> 8;
+			*(u_char *)(p + 1) &= m;
+#elif defined(__alpha__)
+			writeb(p, readb(p) & (m >> 8));
+			writeb(p + 1, readb(p + 1) & (m >> 8));
+#endif
+			p += line_width;
+		}
+	} else {
+		for (i = y, j = 0; i < ymax; ++i, ++j) {
+			m = mouse_or_mask[j] >> xoff;
+#ifdef __i386__
+			*(u_char *)p &= m;
+#elif defined(__alpha__)
+			writeb(p, readb(p) & (m >> 8));
+#endif
+			p += line_width;
+		}
+	}
+	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+	outw(GDCIDX, 0x0003);		/* data rotate/function select */
+}
+
+static void
+remove_pxlmouse(scr_stat *scp, int x, int y)
+{
+	vm_offset_t p;
+	int col, row;
+	int pos;
+	int line_width;
+	int ymax;
+	int i;
+
+	/* erase the mouse cursor image */
+	col = x/8 - scp->xoff;
+	row = y/scp->font_size - scp->yoff;
+	pos = row*scp->xsize + col;
+	i = (col < scp->xsize - 1) ? 2 : 1;
+	(*scp->rndr->draw)(scp, pos, i, FALSE);
+	if (row < scp->ysize - 1)
+		(*scp->rndr->draw)(scp, pos + scp->xsize, i, FALSE);
+
+	/* paint border if necessary */
+	line_width = scp->sc->adp->va_line_width;
+	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+	outw(GDCIDX, 0x0003);		/* data rotate/function select */
+	outw(GDCIDX, 0x0f01);		/* set/reset enable */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+	outw(GDCIDX, (scp->border << 8) | 0x00);	/* set/reset */
+	if (row == scp->ysize - 1) {
+		i = (scp->ysize + scp->yoff)*scp->font_size;
+		ymax = imin(i + scp->font_size, scp->ypixel);
+		p = scp->sc->adp->va_window + i*line_width + scp->xoff + col;
+		if (col < scp->xsize - 1) {
+			for (; i < ymax; ++i) {
+				writeb(p, 0);
+				writeb(p + 1, 0);
+				p += line_width;
+			}
+		} else {
+			for (; i < ymax; ++i) {
+				writeb(p, 0);
+				p += line_width;
+			}
+		}
+	}
+	if ((col == scp->xsize - 1) && (scp->xoff > 0)) {
+		i = (row + scp->yoff)*scp->font_size;
+		ymax = imin(i + scp->font_size*2, scp->ypixel);
+		p = scp->sc->adp->va_window + i*line_width
+			+ scp->xoff + scp->xsize;
+		for (; i < ymax; ++i) {
+			writeb(p, 0);
+			p += line_width;
+		}
+	}
+	outw(GDCIDX, 0x0000);		/* set/reset */
+	outw(GDCIDX, 0x0001);		/* set/reset enable */
+}
+
+static void 
+vga_pxlmouse(scr_stat *scp, int x, int y, int on)
+{
+	if (on)
+		draw_pxlmouse(scp, x, y);
+	else
+		remove_pxlmouse(scp, x, y);
+}
+
+#endif /* SC_NO_CUTPASTE */
+#endif /* SC_PIXEL_MODE */
+
+#ifndef SC_NO_MODE_CHANGE
+
+/* graphics mode renderer */
+
+static void
+vga_grborder(scr_stat *scp, int color)
+{
+	(*vidsw[scp->sc->adapter]->set_border)(scp->sc->adp, color);
+}
+
+#endif
+
+#endif /* NSC > 0 && NVGA > 0 */
diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c
new file mode 100644
index 000000000000..765733c0917f
--- /dev/null
+++ b/sys/dev/syscons/schistory.c
@@ -0,0 +1,222 @@
+/*-
+ * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+ * Copyright (c) 1992-1998 Søren Schmidt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id:$
+ */
+
+#include "sc.h"
+#include "opt_syscons.h"
+
+#if NSC > 0
+
+#ifndef SC_NO_HISTORY
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/tty.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+
+#include <machine/console.h>
+
+#include <dev/syscons/syscons.h>
+
+#if !defined(SC_MAX_HISTORY_SIZE)
+#define SC_MAX_HISTORY_SIZE	(1000 * MAXCONS * NSC)
+#endif
+
+#if !defined(SC_HISTORY_SIZE)
+#define SC_HISTORY_SIZE		(ROW * 4)
+#endif
+
+#if (SC_HISTORY_SIZE * MAXCONS * NSC) > SC_MAX_HISTORY_SIZE
+#undef SC_MAX_HISTORY_SIZE
+#define SC_MAX_HISTORY_SIZE	(SC_HISTORY_SIZE * MAXCONS * NSC)
+#endif
+
+/* local variables */
+static int		extra_history_size
+				= SC_MAX_HISTORY_SIZE - SC_HISTORY_SIZE*MAXCONS;
+
+/* local functions */
+static void history_to_screen(scr_stat *scp);
+
+/* allocate a history buffer */
+int
+sc_alloc_history_buffer(scr_stat *scp, int lines, int wait)
+{
+	/*
+	 * syscons unconditionally allocates buffers upto 
+	 * SC_HISTORY_SIZE lines or scp->ysize lines, whichever 
+	 * is larger. A value greater than that is allowed, 
+	 * subject to extra_history_size.
+	 */
+	sc_vtb_t *history;
+	int cur_lines;				/* current buffer size */
+	int min_lines;				/* guaranteed buffer size */
+
+	if (lines <= 0)
+		lines = SC_HISTORY_SIZE;	/* use the default value */
+	lines = imax(lines, scp->ysize);
+	min_lines = imax(SC_HISTORY_SIZE, scp->ysize);
+
+	history = scp->history;
+	scp->history = NULL;
+	if (history == NULL) {
+		cur_lines = 0;
+	} else {
+		cur_lines = sc_vtb_rows(history);
+		if (cur_lines > min_lines)
+			extra_history_size += cur_lines - min_lines;
+		sc_vtb_destroy(history);
+	}
+
+	if (lines > min_lines)
+		extra_history_size -= lines - min_lines;
+	history = (sc_vtb_t *)malloc(sizeof(*history),
+				     M_DEVBUF, (wait) ? M_WAITOK : M_NOWAIT);
+	if (history != NULL)
+		sc_vtb_init(history, VTB_RINGBUFFER, scp->xsize, lines,
+			    NULL, wait);
+	scp->history_pos = 0;
+	scp->history = history;
+
+	return 0;
+}
+
+/* copy entire screen into the top of the history buffer */
+void
+sc_hist_save(scr_stat *scp)
+{
+	sc_vtb_append(&scp->vtb, 0, scp->history, scp->xsize*scp->ysize);
+	scp->history_pos = sc_vtb_tail(scp->history);
+}
+
+/* restore the screen by copying from the history buffer */
+int
+sc_hist_restore(scr_stat *scp)
+{
+	int ret;
+
+	if (scp->history_pos != sc_vtb_tail(scp->history)) {
+		scp->history_pos = sc_vtb_tail(scp->history);
+		history_to_screen(scp);
+		ret =  0;
+	} else {
+		ret = 1;
+	}
+	sc_vtb_seek(scp->history, sc_vtb_pos(scp->history, 
+					     sc_vtb_tail(scp->history),
+					     -scp->xsize*scp->ysize));
+	return ret;
+}
+
+/* copy screen-full of saved lines */
+static void
+history_to_screen(scr_stat *scp)
+{
+	int pos;
+	int i;
+
+	pos = scp->history_pos;
+	for (i = 1; i <= scp->ysize; ++i) {
+		pos = sc_vtb_pos(scp->history, pos, -scp->xsize);
+		sc_vtb_copy(scp->history, pos,
+			    &scp->vtb, scp->xsize*(scp->ysize - i),
+			    scp->xsize);
+	}
+	mark_all(scp);
+}
+
+/* go to the tail of the history buffer */
+void
+sc_hist_home(scr_stat *scp)
+{
+	scp->history_pos = sc_vtb_tail(scp->history);
+	history_to_screen(scp);
+}
+
+/* go to the top of the history buffer */
+void
+sc_hist_end(scr_stat *scp)
+{
+	scp->history_pos = sc_vtb_pos(scp->history, sc_vtb_tail(scp->history),
+				      scp->xsize*scp->ysize);
+	history_to_screen(scp);
+}
+
+/* move one line up */
+int
+sc_hist_up_line(scr_stat *scp)
+{
+	if (sc_vtb_pos(scp->history, scp->history_pos, -(scp->xsize*scp->ysize))
+	    == sc_vtb_tail(scp->history))
+		return -1;
+	scp->history_pos = sc_vtb_pos(scp->history, scp->history_pos,
+				      -scp->xsize);
+	history_to_screen(scp);
+	return 0;
+}
+
+/* move one line down */
+int
+sc_hist_down_line(scr_stat *scp)
+{
+	if (scp->history_pos == sc_vtb_tail(scp->history))
+		return -1;
+	scp->history_pos = sc_vtb_pos(scp->history, scp->history_pos,
+				      scp->xsize);
+	history_to_screen(scp);
+	return 0;
+}
+
+int
+sc_hist_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
+	      struct proc *p)
+{
+	scr_stat *scp;
+
+	switch (cmd) {
+
+	case CONS_HISTORY:  	/* set history size */
+		scp = sc_get_scr_stat(tp->t_dev);
+		if (*(int *)data <= 0)
+			return EINVAL;
+		if (scp->status & BUFFER_SAVED)
+			return EBUSY;
+		return sc_alloc_history_buffer(scp, 
+					       imax(*(int *)data, scp->ysize),
+					       TRUE);
+	}
+
+	return ENOIOCTL;
+}
+
+#endif /* SC_NO_HISTORY */
+
+#endif /* NSC */
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
new file mode 100644
index 000000000000..8d8dc6775b8c
--- /dev/null
+++ b/sys/dev/syscons/scmouse.c
@@ -0,0 +1,1083 @@
+/*-
+ * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id:$
+ */
+
+#include "sc.h"
+#include "opt_syscons.h"
+
+#if NSC > 0
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/signalvar.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+
+#include <machine/console.h>
+#include <machine/mouse.h>
+
+#include <dev/syscons/syscons.h>
+
+#define SC_WAKEUP_DELTA		20
+
+/* for backward compatibility */
+#define OLD_CONS_MOUSECTL	_IOWR('c', 10, old_mouse_info_t)
+
+typedef struct old_mouse_data {
+    int x;
+    int y;
+    int buttons;
+} old_mouse_data_t;
+
+typedef struct old_mouse_info {
+    int operation;
+    union {
+	struct old_mouse_data data;
+	struct mouse_mode mode;
+    } u;
+} old_mouse_info_t;
+
+/* local variables */
+#ifndef SC_NO_SYSMOUSE
+static int		mouse_level;		/* sysmouse protocol level */
+static mousestatus_t	mouse_status = { 0, 0, 0, 0, 0, 0 };
+static int		cut_buffer_size;
+static u_char		*cut_buffer;
+#endif /* SC_NO_SYSMOUE */
+
+/* local functions */
+#ifndef SC_NO_SYSMOUSE
+static void set_mouse_pos(scr_stat *scp);
+#ifndef SC_NO_CUTPASTE
+static int skip_spc_right(scr_stat *scp, int p);
+static int skip_spc_left(scr_stat *scp, int p);
+static void mouse_cut(scr_stat *scp);
+static void mouse_cut_start(scr_stat *scp);
+static void mouse_cut_end(scr_stat *scp);
+static void mouse_cut_word(scr_stat *scp);
+static void mouse_cut_line(scr_stat *scp);
+static void mouse_cut_extend(scr_stat *scp);
+static void mouse_paste(scr_stat *scp);
+#endif /* SC_NO_CUTPASTE */
+#endif /* SC_NO_SYSMOUE */
+
+#ifndef SC_NO_CUTPASTE
+/* allocate a cut buffer */
+void
+sc_alloc_cut_buffer(scr_stat *scp, int wait)
+{
+    u_char *p;
+
+    if ((cut_buffer == NULL)
+	|| (cut_buffer_size < scp->xsize * scp->ysize + 1)) {
+	p = cut_buffer;
+	cut_buffer = NULL;
+	if (p != NULL)
+	    free(p, M_DEVBUF);
+	cut_buffer_size = scp->xsize * scp->ysize + 1;
+	p = (u_char *)malloc(cut_buffer_size, 
+			     M_DEVBUF, (wait) ? M_WAITOK : M_NOWAIT);
+	if (p != NULL)
+	    p[0] = '\0';
+	cut_buffer = p;
+    }
+}
+#endif /* SC_NO_CUTPASTE */
+
+#ifndef SC_NO_SYSMOUSE
+
+/* modify the sysmouse software level */
+void
+sc_mouse_set_level(int level)
+{
+    mouse_level = level;
+}
+
+/* move mouse */
+void
+sc_mouse_move(scr_stat *scp, int x, int y)
+{
+    int s;
+
+    s = spltty();
+    scp->mouse_xpos = x;
+    scp->mouse_ypos = y;
+    scp->mouse_pos = scp->mouse_oldpos = 
+	(y/scp->font_size - scp->yoff)*scp->xsize + x/8 - scp->xoff;
+    splx(s);
+}
+
+/* adjust mouse position */
+static void
+set_mouse_pos(scr_stat *scp)
+{
+    static int last_xpos = -1, last_ypos = -1;
+
+    if (scp->mouse_xpos < scp->xoff*8)
+	scp->mouse_xpos = scp->xoff*8;
+    if (scp->mouse_ypos < scp->yoff*scp->font_size)
+	scp->mouse_ypos = scp->yoff*scp->font_size;
+    if (ISGRAPHSC(scp)) {
+        if (scp->mouse_xpos > scp->xpixel-1)
+	    scp->mouse_xpos = scp->xpixel-1;
+        if (scp->mouse_ypos > scp->ypixel-1)
+	    scp->mouse_ypos = scp->ypixel-1;
+	return;
+    } else {
+	if (scp->mouse_xpos > (scp->xsize + scp->xoff)*8 - 1)
+	    scp->mouse_xpos = (scp->xsize + scp->xoff)*8 - 1;
+	if (scp->mouse_ypos > (scp->ysize + scp->yoff)*scp->font_size - 1)
+	    scp->mouse_ypos = (scp->ysize + scp->yoff)*scp->font_size - 1;
+    }
+
+    if (scp->mouse_xpos != last_xpos || scp->mouse_ypos != last_ypos) {
+	scp->status |= MOUSE_MOVED;
+    	scp->mouse_pos =
+	    (scp->mouse_ypos/scp->font_size - scp->yoff)*scp->xsize 
+		+ scp->mouse_xpos/8 - scp->xoff;
+#ifndef SC_NO_CUTPASTE
+	if ((scp->status & MOUSE_VISIBLE) && (scp->status & MOUSE_CUTTING))
+	    mouse_cut(scp);
+#endif
+    }
+}
+
+#ifndef SC_NO_CUTPASTE
+
+void
+sc_draw_mouse_image(scr_stat *scp)
+{
+    if (ISGRAPHSC(scp))
+	return;
+
+    ++scp->sc->videoio_in_progress;
+    (*scp->rndr->draw_mouse)(scp, scp->mouse_xpos, scp->mouse_ypos, TRUE);
+    scp->mouse_oldpos = scp->mouse_pos;
+    --scp->sc->videoio_in_progress;
+}
+
+void
+sc_remove_mouse_image(scr_stat *scp)
+{
+    int size;
+    int i;
+
+    if (ISGRAPHSC(scp))
+	return;
+
+    ++scp->sc->videoio_in_progress;
+    (*scp->rndr->draw_mouse)(scp,
+			     (scp->mouse_oldpos%scp->xsize + scp->xoff)*8,
+			     (scp->mouse_oldpos/scp->xsize + scp->yoff)
+				 * scp->font_size,
+			     FALSE);
+    size = scp->xsize*scp->ysize;
+    i = scp->mouse_oldpos;
+    mark_for_update(scp, i);
+    mark_for_update(scp, i);
+#ifndef PC98
+    if (i + scp->xsize + 1 < size) {
+	mark_for_update(scp, i + scp->xsize + 1);
+    } else if (i + scp->xsize < size) {
+	mark_for_update(scp, i + scp->xsize);
+    } else if (i + 1 < size) {
+	mark_for_update(scp, i + 1);
+    }
+#endif /* PC98 */
+    --scp->sc->videoio_in_progress;
+}
+
+int
+sc_inside_cutmark(scr_stat *scp, int pos)
+{
+    int start;
+    int end;
+
+    if (scp->mouse_cut_end < 0)
+	return FALSE;
+    if (scp->mouse_cut_start <= scp->mouse_cut_end) {
+	start = scp->mouse_cut_start;
+	end = scp->mouse_cut_end;
+    } else {
+	start = scp->mouse_cut_end;
+	end = scp->mouse_cut_start - 1;
+    }
+    return ((start <= pos) && (pos <= end));
+}
+
+void
+sc_remove_cutmarking(scr_stat *scp)
+{
+    int s;
+
+    s = spltty();
+    if (scp->mouse_cut_end >= 0) {
+	mark_for_update(scp, scp->mouse_cut_start);
+	mark_for_update(scp, scp->mouse_cut_end);
+    }
+    scp->mouse_cut_start = scp->xsize*scp->ysize;
+    scp->mouse_cut_end = -1;
+    splx(s);
+    scp->status &= ~MOUSE_CUTTING;
+}
+
+void
+sc_remove_all_cutmarkings(sc_softc_t *sc)
+{
+    int i;
+
+    /* delete cut markings in all vtys */
+    for (i = 0; i < sc->vtys; ++i) {
+	if (sc->console[i] == NULL)
+	    continue;
+	sc_remove_cutmarking(sc->console[i]);
+    }
+}
+
+void
+sc_remove_all_mouse(sc_softc_t *sc)
+{
+    int i;
+
+    for (i = 0; i < sc->vtys; ++i) {
+	if (sc->console[i] == NULL)
+	    continue;
+	if (sc->console[i]->status & MOUSE_VISIBLE) {
+	    sc->console[i]->status &= ~MOUSE_VISIBLE;
+	    mark_all(sc->console[i]);
+	}
+    }
+}
+
+#define isspace(c)	(((c) & 0xff) == ' ')
+
+/* skip spaces to right */
+static int
+skip_spc_right(scr_stat *scp, int p)
+{
+    int c;
+    int i;
+
+    for (i = p % scp->xsize; i < scp->xsize; ++i) {
+	c = sc_vtb_getc(&scp->vtb, p);
+	if (!isspace(c))
+	    break;
+	++p;
+    }
+    return i;
+}
+
+/* skip spaces to left */
+static int
+skip_spc_left(scr_stat *scp, int p)
+{
+    int c;
+    int i;
+
+    for (i = p-- % scp->xsize - 1; i >= 0; --i) {
+	c = sc_vtb_getc(&scp->vtb, p);
+	if (!isspace(c))
+	    break;
+	--p;
+    }
+    return i;
+}
+
+/* copy marked region to the cut buffer */
+static void
+mouse_cut(scr_stat *scp)
+{
+    int start;
+    int end;
+    int from;
+    int to;
+    int blank;
+    int c;
+    int p;
+    int s;
+    int i;
+
+    start = scp->mouse_cut_start;
+    end = scp->mouse_cut_end;
+    if (scp->mouse_pos >= start) {
+	from = start;
+	to = end = scp->mouse_pos;
+    } else {
+	from = end = scp->mouse_pos;
+	to = start - 1;
+    }
+    for (p = from, i = blank = 0; p <= to; ++p) {
+	cut_buffer[i] = sc_vtb_getc(&scp->vtb, p);
+	/* remember the position of the last non-space char */
+	if (!isspace(cut_buffer[i++]))
+	    blank = i;		/* the first space after the last non-space */
+	/* trim trailing blank when crossing lines */
+	if ((p % scp->xsize) == (scp->xsize - 1)) {
+	    cut_buffer[blank] = '\r';
+	    i = blank + 1;
+	}
+    }
+    cut_buffer[i] = '\0';
+
+    /* scan towards the end of the last line */
+    --p;
+    for (i = p % scp->xsize; i < scp->xsize; ++i) {
+	c = sc_vtb_getc(&scp->vtb, p);
+	if (!isspace(c))
+	    break;
+	++p;
+    }
+    /* if there is nothing but blank chars, trim them, but mark towards eol */
+    if (i >= scp->xsize) {
+	if (end >= start)
+	    to = end = p - 1;
+	else
+	    to = start = p;
+	cut_buffer[blank++] = '\r';
+	cut_buffer[blank] = '\0';
+    }
+
+    /* remove the current marking */
+    s = spltty();
+    if (scp->mouse_cut_start <= scp->mouse_cut_end) {
+	mark_for_update(scp, scp->mouse_cut_start);
+	mark_for_update(scp, scp->mouse_cut_end);
+    } else if (scp->mouse_cut_end >= 0) {
+	mark_for_update(scp, scp->mouse_cut_end);
+	mark_for_update(scp, scp->mouse_cut_start);
+    }
+
+    /* mark the new region */
+    scp->mouse_cut_start = start;
+    scp->mouse_cut_end = end;
+    mark_for_update(scp, from);
+    mark_for_update(scp, to);
+    splx(s);
+}
+
+/* a mouse button is pressed, start cut operation */
+static void
+mouse_cut_start(scr_stat *scp) 
+{
+    int i;
+    int j;
+    int s;
+
+    if (scp->status & MOUSE_VISIBLE) {
+	i = scp->mouse_cut_start;
+	j = scp->mouse_cut_end;
+	sc_remove_all_cutmarkings(scp->sc);
+	if (scp->mouse_pos == i && i == j) {
+	    cut_buffer[0] = '\0';
+	} else if (skip_spc_right(scp, scp->mouse_pos) >= scp->xsize) {
+	    /* if the pointer is on trailing blank chars, mark towards eol */
+	    i = skip_spc_left(scp, scp->mouse_pos) + 1;
+	    s = spltty();
+	    scp->mouse_cut_start =
+	        (scp->mouse_pos / scp->xsize) * scp->xsize + i;
+	    scp->mouse_cut_end =
+	        (scp->mouse_pos / scp->xsize + 1) * scp->xsize - 1;
+	    splx(s);
+	    cut_buffer[0] = '\r';
+	    cut_buffer[1] = '\0';
+	    scp->status |= MOUSE_CUTTING;
+	} else {
+	    s = spltty();
+	    scp->mouse_cut_start = scp->mouse_pos;
+	    scp->mouse_cut_end = scp->mouse_cut_start;
+	    splx(s);
+	    cut_buffer[0] = sc_vtb_getc(&scp->vtb, scp->mouse_cut_start);
+	    cut_buffer[1] = '\0';
+	    scp->status |= MOUSE_CUTTING;
+	}
+    	mark_all(scp);	/* this is probably overkill XXX */
+    }
+}
+
+/* end of cut operation */
+static void
+mouse_cut_end(scr_stat *scp) 
+{
+    if (scp->status & MOUSE_VISIBLE)
+	scp->status &= ~MOUSE_CUTTING;
+}
+
+/* copy a word under the mouse pointer */
+static void
+mouse_cut_word(scr_stat *scp)
+{
+    int start;
+    int end;
+    int sol;
+    int eol;
+    int c;
+    int s;
+    int i;
+    int j;
+
+    /*
+     * Because we don't have locale information in the kernel,
+     * we only distinguish space char and non-space chars.  Punctuation
+     * chars, symbols and other regular chars are all treated alike.
+     */
+    if (scp->status & MOUSE_VISIBLE) {
+	/* remove the current cut mark */
+	s = spltty();
+	if (scp->mouse_cut_start <= scp->mouse_cut_end) {
+	    mark_for_update(scp, scp->mouse_cut_start);
+	    mark_for_update(scp, scp->mouse_cut_end);
+	} else if (scp->mouse_cut_end >= 0) {
+	    mark_for_update(scp, scp->mouse_cut_end);
+	    mark_for_update(scp, scp->mouse_cut_start);
+	}
+	scp->mouse_cut_start = scp->xsize*scp->ysize;
+	scp->mouse_cut_end = -1;
+	splx(s);
+
+	sol = (scp->mouse_pos / scp->xsize) * scp->xsize;
+	eol = sol + scp->xsize;
+	c = sc_vtb_getc(&scp->vtb, scp->mouse_pos);
+	if (isspace(c)) {
+	    /* blank space */
+	    for (j = scp->mouse_pos; j >= sol; --j) {
+		c = sc_vtb_getc(&scp->vtb, j);
+	        if (!isspace(c))
+		    break;
+	    }
+	    start = ++j;
+	    for (j = scp->mouse_pos; j < eol; ++j) {
+		c = sc_vtb_getc(&scp->vtb, j);
+	        if (!isspace(c))
+		    break;
+	    }
+	    end = j - 1;
+	} else {
+	    /* non-space word */
+	    for (j = scp->mouse_pos; j >= sol; --j) {
+		c = sc_vtb_getc(&scp->vtb, j);
+	        if (isspace(c))
+		    break;
+	    }
+	    start = ++j;
+	    for (j = scp->mouse_pos; j < eol; ++j) {
+		c = sc_vtb_getc(&scp->vtb, j);
+	        if (isspace(c))
+		    break;
+	    }
+	    end = j - 1;
+	}
+
+	/* copy the found word */
+	for (i = 0, j = start; j <= end; ++j)
+	    cut_buffer[i++] = sc_vtb_getc(&scp->vtb, j);
+	cut_buffer[i] = '\0';
+	scp->status |= MOUSE_CUTTING;
+
+	/* mark the region */
+	s = spltty();
+	scp->mouse_cut_start = start;
+	scp->mouse_cut_end = end;
+	mark_for_update(scp, start);
+	mark_for_update(scp, end);
+	splx(s);
+    }
+}
+
+/* copy a line under the mouse pointer */
+static void
+mouse_cut_line(scr_stat *scp)
+{
+    int s;
+    int i;
+    int j;
+
+    if (scp->status & MOUSE_VISIBLE) {
+	/* remove the current cut mark */
+	s = spltty();
+	if (scp->mouse_cut_start <= scp->mouse_cut_end) {
+	    mark_for_update(scp, scp->mouse_cut_start);
+	    mark_for_update(scp, scp->mouse_cut_end);
+	} else if (scp->mouse_cut_end >= 0) {
+	    mark_for_update(scp, scp->mouse_cut_end);
+	    mark_for_update(scp, scp->mouse_cut_start);
+	}
+
+	/* mark the entire line */
+	scp->mouse_cut_start =
+	    (scp->mouse_pos / scp->xsize) * scp->xsize;
+	scp->mouse_cut_end = scp->mouse_cut_start + scp->xsize - 1;
+	mark_for_update(scp, scp->mouse_cut_start);
+	mark_for_update(scp, scp->mouse_cut_end);
+	splx(s);
+
+	/* copy the line into the cut buffer */
+	for (i = 0, j = scp->mouse_cut_start; j <= scp->mouse_cut_end; ++j)
+	    cut_buffer[i++] = sc_vtb_getc(&scp->vtb, j);
+	cut_buffer[i++] = '\r';
+	cut_buffer[i] = '\0';
+	scp->status |= MOUSE_CUTTING;
+    }
+}
+
+/* extend the marked region to the mouse pointer position */
+static void
+mouse_cut_extend(scr_stat *scp) 
+{
+    int start;
+    int end;
+    int s;
+
+    if ((scp->status & MOUSE_VISIBLE) && !(scp->status & MOUSE_CUTTING)
+	&& (scp->mouse_cut_end >= 0)) {
+	if (scp->mouse_cut_start <= scp->mouse_cut_end) {
+	    start = scp->mouse_cut_start;
+	    end = scp->mouse_cut_end;
+	} else {
+	    start = scp->mouse_cut_end;
+	    end = scp->mouse_cut_start - 1;
+	}
+	s = spltty();
+	if (scp->mouse_pos > end) {
+	    scp->mouse_cut_start = start;
+	    scp->mouse_cut_end = end;
+	} else if (scp->mouse_pos < start) {
+	    scp->mouse_cut_start = end + 1;
+	    scp->mouse_cut_end = start;
+	} else {
+	    if (scp->mouse_pos - start > end + 1 - scp->mouse_pos) {
+		scp->mouse_cut_start = start;
+		scp->mouse_cut_end = end;
+	    } else {
+		scp->mouse_cut_start = end + 1;
+		scp->mouse_cut_end = start;
+	    }
+	}
+	splx(s);
+	mouse_cut(scp);
+	scp->status |= MOUSE_CUTTING;
+    }
+}
+
+/* paste cut buffer contents into the current vty */
+static void
+mouse_paste(scr_stat *scp) 
+{
+    if (scp->status & MOUSE_VISIBLE)
+	sc_paste(scp, cut_buffer, strlen(cut_buffer));
+}
+
+#endif /* SC_NO_CUTPASTE */
+
+int
+sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
+	       struct proc *p)
+{
+
+    scr_stat *scp;
+    int s;
+    int i;
+
+    /* scp == NULL, if tp == sc_get_mouse_tty() (/dev/sysmouse) */
+    scp = sc_get_scr_stat(tp->t_dev);
+
+    switch (cmd) {
+
+    case CONS_MOUSECTL:		/* control mouse arrow */
+    case OLD_CONS_MOUSECTL:
+    {
+	/* MOUSE_BUTTON?DOWN -> MOUSE_MSC_BUTTON?UP */
+	static int butmap[8] = {
+            MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON2UP | MOUSE_MSC_BUTTON3UP,
+            MOUSE_MSC_BUTTON2UP | MOUSE_MSC_BUTTON3UP,
+            MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON3UP,
+            MOUSE_MSC_BUTTON3UP,
+            MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON2UP,
+            MOUSE_MSC_BUTTON2UP,
+            MOUSE_MSC_BUTTON1UP,
+            0,
+	};
+	mouse_info_t *mouse = (mouse_info_t*)data;
+	mouse_info_t buf;
+	scr_stat *cur_scp;
+	struct tty *mtty;
+
+	if (scp == NULL)
+	    return ENOTTY;
+
+	if (cmd == OLD_CONS_MOUSECTL) {
+	    static u_char swapb[] = { 0, 4, 2, 6, 1, 5, 3, 7 };
+	    old_mouse_info_t *old_mouse = (old_mouse_info_t *)data;
+
+	    mouse = &buf;
+	    mouse->operation = old_mouse->operation;
+	    switch (mouse->operation) {
+	    case MOUSE_MODE:
+		mouse->u.mode = old_mouse->u.mode;
+		break;
+	    case MOUSE_SHOW:
+	    case MOUSE_HIDE:
+		break;
+	    case MOUSE_MOVEABS:
+	    case MOUSE_MOVEREL:
+	    case MOUSE_ACTION:
+		mouse->u.data.x = old_mouse->u.data.x;
+		mouse->u.data.y = old_mouse->u.data.y;
+		mouse->u.data.z = 0;
+		mouse->u.data.buttons = swapb[old_mouse->u.data.buttons & 0x7];
+		break;
+	    case MOUSE_GETINFO:
+		old_mouse->u.data.x = scp->mouse_xpos;
+		old_mouse->u.data.y = scp->mouse_ypos;
+		old_mouse->u.data.buttons = swapb[scp->mouse_buttons & 0x7];
+		break;
+	    default:
+		return EINVAL;
+	    }
+	}
+
+	cur_scp = scp->sc->cur_scp;
+
+	switch (mouse->operation) {
+	case MOUSE_MODE:
+	    if (ISSIGVALID(mouse->u.mode.signal)) {
+		scp->mouse_signal = mouse->u.mode.signal;
+		scp->mouse_proc = p;
+		scp->mouse_pid = p->p_pid;
+	    }
+	    else {
+		scp->mouse_signal = 0;
+		scp->mouse_proc = NULL;
+		scp->mouse_pid = 0;
+	    }
+	    return 0;
+
+	case MOUSE_SHOW:
+	    if (!ISMOUSEAVAIL(scp->sc->adp->va_flags))
+		return EINVAL;
+	    s = spltty();
+	    if (!(scp->sc->flags & SC_MOUSE_ENABLED)) {
+		scp->sc->flags |= SC_MOUSE_ENABLED;
+		if (!ISGRAPHSC(cur_scp)) {
+		    cur_scp->status |= MOUSE_VISIBLE;
+		    mark_all(cur_scp);
+		}
+		splx(s);
+		return 0;
+	    } else {
+		splx(s);
+		return EINVAL;
+	    }
+	    break;
+#if 0
+	    if (!(scp->status & MOUSE_ENABLED)) {
+		scp->mouse_oldpos = scp->mouse_pos;
+		scp->status |= MOUSE_ENABLED;
+		if (!ISGRAPHSC(scp))
+		    scp->status |= MOUSE_VISIBLE;
+		splx(s);
+		mark_all(scp);
+		return 0;
+	    } else {
+		splx(s);
+		return EINVAL;
+	    }
+	    break;
+#endif
+
+	case MOUSE_HIDE:
+	    s = spltty();
+	    if (scp->sc->flags & SC_MOUSE_ENABLED) {
+		scp->sc->flags &= ~SC_MOUSE_ENABLED;
+		sc_remove_all_mouse(scp->sc);
+		splx(s);
+		return 0;
+	    } else {
+		splx(s);
+		return EINVAL;
+	    }
+	    break;
+#if 0
+	    if (scp->status & MOUSE_ENABLED) {
+		scp->status &= ~(MOUSE_ENABLED | MOUSE_VISIBLE);
+		mark_all(scp);
+		splx(s);
+		return 0;
+	    } else {
+		splx(s);
+		return EINVAL;
+	    }
+	    break;
+#endif
+
+	case MOUSE_MOVEABS:
+	    s = spltty();
+	    scp->mouse_xpos = mouse->u.data.x;
+	    scp->mouse_ypos = mouse->u.data.y;
+	    set_mouse_pos(scp);
+	    splx(s);
+	    break;
+
+	case MOUSE_MOVEREL:
+	    s = spltty();
+	    scp->mouse_xpos += mouse->u.data.x;
+	    scp->mouse_ypos += mouse->u.data.y;
+	    set_mouse_pos(scp);
+	    splx(s);
+	    break;
+
+	case MOUSE_GETINFO:
+	    mouse->u.data.x = scp->mouse_xpos;
+	    mouse->u.data.y = scp->mouse_ypos;
+	    mouse->u.data.z = 0;
+	    mouse->u.data.buttons = scp->mouse_buttons;
+	    return 0;
+
+	case MOUSE_ACTION:
+	case MOUSE_MOTION_EVENT:
+	    /* send out mouse event on /dev/sysmouse */
+#if 0
+	    /* this should maybe only be settable from /dev/consolectl SOS */
+	    if (SC_VTY(tp->t_dev) != SC_CONSOLECTL)
+		return ENOTTY;
+#endif
+	    mouse_status.dx += mouse->u.data.x;
+	    mouse_status.dy += mouse->u.data.y;
+	    mouse_status.dz += mouse->u.data.z;
+	    if (mouse->operation == MOUSE_ACTION)
+	        mouse_status.button = mouse->u.data.buttons;
+	    mouse_status.flags |= 
+		((mouse->u.data.x || mouse->u.data.y || mouse->u.data.z) ? 
+		    MOUSE_POSCHANGED : 0)
+		| (mouse_status.obutton ^ mouse_status.button);
+	    if (mouse_status.flags == 0)
+		return 0;
+
+	    mtty = sc_get_mouse_tty();
+	    if (mtty->t_state & TS_ISOPEN) {
+		u_char buf[MOUSE_SYS_PACKETSIZE];
+
+		/* the first five bytes are compatible with MouseSystems' */
+		buf[0] = MOUSE_MSC_SYNC
+		    | butmap[mouse_status.button & MOUSE_STDBUTTONS];
+		i = imax(imin(mouse->u.data.x, 255), -256);
+		buf[1] = i >> 1;
+		buf[3] = i - buf[1];
+		i = -imax(imin(mouse->u.data.y, 255), -256);
+		buf[2] = i >> 1;
+		buf[4] = i - buf[2];
+		for (i = 0; i < MOUSE_MSC_PACKETSIZE; i++)
+	    		(*linesw[mtty->t_line].l_rint)(buf[i], mtty);
+		if (mouse_level >= 1) { 	/* extended part */
+		    i = imax(imin(mouse->u.data.z, 127), -128);
+		    buf[5] = (i >> 1) & 0x7f;
+		    buf[6] = (i - (i >> 1)) & 0x7f;
+		    /* buttons 4-10 */
+		    buf[7] = (~mouse_status.button >> 3) & 0x7f;
+		    for (i = MOUSE_MSC_PACKETSIZE; 
+			 i < MOUSE_SYS_PACKETSIZE; i++)
+	    		(*linesw[mtty->t_line].l_rint)(buf[i], mtty);
+		}
+	    }
+
+	    if (cur_scp->mouse_signal) {
+		cur_scp->mouse_buttons = mouse->u.data.buttons;
+    		/* has controlling process died? */
+		if (cur_scp->mouse_proc && 
+		    (cur_scp->mouse_proc != pfind(cur_scp->mouse_pid))){
+		    	cur_scp->mouse_signal = 0;
+			cur_scp->mouse_proc = NULL;
+			cur_scp->mouse_pid = 0;
+		}
+		else
+		    psignal(cur_scp->mouse_proc, cur_scp->mouse_signal);
+		break;
+	    }
+
+	    /* 
+	     * If any buttons are down or the mouse has moved a lot, 
+	     * stop the screen saver.
+	     */
+	    if (((mouse->operation == MOUSE_ACTION) && mouse->u.data.buttons)
+		|| (mouse->u.data.x*mouse->u.data.x
+			+ mouse->u.data.y*mouse->u.data.y
+			>= SC_WAKEUP_DELTA*SC_WAKEUP_DELTA)) {
+		sc_touch_scrn_saver();
+	    }
+
+	    if (ISGRAPHSC(cur_scp) || (cut_buffer == NULL))
+		break;
+
+#ifndef SC_NO_CUTPASTE
+	    if (cur_scp->sc->flags & SC_MOUSE_ENABLED)
+	    	cur_scp->status |= MOUSE_VISIBLE;
+
+	    if (mouse->operation == MOUSE_ACTION) {
+		/* process button presses */
+		if (cur_scp->mouse_buttons ^ mouse->u.data.buttons) {
+		    cur_scp->mouse_buttons = mouse->u.data.buttons;
+		    if (cur_scp->mouse_buttons & MOUSE_BUTTON1DOWN)
+			mouse_cut_start(cur_scp);
+		    else
+			mouse_cut_end(cur_scp);
+		    if (cur_scp->mouse_buttons & MOUSE_BUTTON2DOWN ||
+			cur_scp->mouse_buttons & MOUSE_BUTTON3DOWN)
+			mouse_paste(cur_scp);
+		}
+	    }
+#else /* SC_NO_CUTPASTE */
+	    if (mouse->operation == MOUSE_ACTION)
+		cur_scp->mouse_buttons = mouse->u.data.buttons;
+#endif /* SC_NO_CUTPASTE */
+
+	    if (mouse->u.data.x != 0 || mouse->u.data.y != 0) {
+		s = spltty();
+		cur_scp->mouse_xpos += mouse->u.data.x;
+		cur_scp->mouse_ypos += mouse->u.data.y;
+		set_mouse_pos(cur_scp);
+		splx(s);
+	    }
+	    break;
+
+	case MOUSE_BUTTON_EVENT:
+	    if ((mouse->u.event.id & MOUSE_BUTTONS) == 0)
+		return EINVAL;
+	    if (mouse->u.event.value < 0)
+		return EINVAL;
+#if 0
+	    /* this should maybe only be settable from /dev/consolectl SOS */
+	    if (SC_VTY(tp->t_dev) != SC_CONSOLECTL)
+		return ENOTTY;
+#endif
+	    if (mouse->u.event.value > 0) {
+		cur_scp->mouse_buttons |= mouse->u.event.id;
+	        mouse_status.button |= mouse->u.event.id;
+	    } else {
+		cur_scp->mouse_buttons &= ~mouse->u.event.id;
+	        mouse_status.button &= ~mouse->u.event.id;
+	    }
+	    mouse_status.flags |= mouse_status.obutton ^ mouse_status.button;
+	    if (mouse_status.flags == 0)
+		return 0;
+
+	    mtty = sc_get_mouse_tty();
+	    if (mtty->t_state & TS_ISOPEN) {
+		u_char buf[MOUSE_SYS_PACKETSIZE];
+
+		buf[0] = MOUSE_MSC_SYNC 
+			 | butmap[mouse_status.button & MOUSE_STDBUTTONS];
+		buf[7] = (~mouse_status.button >> 3) & 0x7f;
+		buf[1] = buf[2] = buf[3] = buf[4] = buf[5] = buf[6] = 0;
+		for (i = 0; 
+		     i < ((mouse_level >= 1) ? MOUSE_SYS_PACKETSIZE 
+					     : MOUSE_MSC_PACKETSIZE); i++)
+	    	    (*linesw[mtty->t_line].l_rint)(buf[i], mtty);
+	    }
+
+	    if (cur_scp->mouse_signal) {
+		if (cur_scp->mouse_proc && 
+		    (cur_scp->mouse_proc != pfind(cur_scp->mouse_pid))){
+		    	cur_scp->mouse_signal = 0;
+			cur_scp->mouse_proc = NULL;
+			cur_scp->mouse_pid = 0;
+		}
+		else
+		    psignal(cur_scp->mouse_proc, cur_scp->mouse_signal);
+		break;
+	    }
+
+	    /* if a button is held down, stop the screen saver */
+	    if (mouse->u.event.value > 0)
+		sc_touch_scrn_saver();
+
+	    if (ISGRAPHSC(cur_scp) || (cut_buffer == NULL))
+		break;
+
+#ifndef SC_NO_CUTPASTE
+	    if (cur_scp->sc->flags & SC_MOUSE_ENABLED)
+	    	cur_scp->status |= MOUSE_VISIBLE;
+
+	    switch (mouse->u.event.id) {
+	    case MOUSE_BUTTON1DOWN:
+	        switch (mouse->u.event.value % 4) {
+		case 0:	/* up */
+		    mouse_cut_end(cur_scp);
+		    break;
+		case 1: /* single click: start cut operation */
+		    mouse_cut_start(cur_scp);
+		    break;
+		case 2:	/* double click: cut a word */
+		    mouse_cut_word(cur_scp);
+		    mouse_cut_end(cur_scp);
+		    break;
+		case 3:	/* triple click: cut a line */
+		    mouse_cut_line(cur_scp);
+		    mouse_cut_end(cur_scp);
+		    break;
+		}
+		break;
+	    case MOUSE_BUTTON2DOWN:
+	        switch (mouse->u.event.value) {
+		case 0:	/* up */
+		    break;
+		default:
+		    mouse_paste(cur_scp);
+		    break;
+		}
+		break;
+	    case MOUSE_BUTTON3DOWN:
+	        switch (mouse->u.event.value) {
+		case 0:	/* up */
+		    if (!(cur_scp->mouse_buttons & MOUSE_BUTTON1DOWN))
+		        mouse_cut_end(cur_scp);
+		    break;
+		default:
+		    mouse_cut_extend(cur_scp);
+		    break;
+		}
+		break;
+	    }
+#endif /* SC_NO_CUTPASTE */
+	    break;
+
+	default:
+	    return EINVAL;
+	}
+
+	return 0;
+    }
+
+    /* MOUSE_XXX: /dev/sysmouse ioctls */
+    case MOUSE_GETHWINFO:	/* get device information */
+    {
+	mousehw_t *hw = (mousehw_t *)data;
+
+	if (tp != sc_get_mouse_tty())
+	    return ENOTTY;
+	hw->buttons = 10;		/* XXX unknown */
+	hw->iftype = MOUSE_IF_SYSMOUSE;
+	hw->type = MOUSE_MOUSE;
+	hw->model = MOUSE_MODEL_GENERIC;
+	hw->hwid = 0;
+	return 0;
+    }
+
+    case MOUSE_GETMODE:		/* get protocol/mode */
+    {
+	mousemode_t *mode = (mousemode_t *)data;
+
+	if (tp != sc_get_mouse_tty())
+	    return ENOTTY;
+	mode->level = mouse_level;
+	switch (mode->level) {
+	case 0:
+	    /* at this level, sysmouse emulates MouseSystems protocol */
+	    mode->protocol = MOUSE_PROTO_MSC;
+	    mode->rate = -1;		/* unknown */
+	    mode->resolution = -1;	/* unknown */
+	    mode->accelfactor = 0;	/* disabled */
+	    mode->packetsize = MOUSE_MSC_PACKETSIZE;
+	    mode->syncmask[0] = MOUSE_MSC_SYNCMASK;
+	    mode->syncmask[1] = MOUSE_MSC_SYNC;
+	    break;
+
+	case 1:
+	    /* at this level, sysmouse uses its own protocol */
+	    mode->protocol = MOUSE_PROTO_SYSMOUSE;
+	    mode->rate = -1;
+	    mode->resolution = -1;
+	    mode->accelfactor = 0;
+	    mode->packetsize = MOUSE_SYS_PACKETSIZE;
+	    mode->syncmask[0] = MOUSE_SYS_SYNCMASK;
+	    mode->syncmask[1] = MOUSE_SYS_SYNC;
+	    break;
+	}
+	return 0;
+    }
+
+    case MOUSE_SETMODE:		/* set protocol/mode */
+    {
+	mousemode_t *mode = (mousemode_t *)data;
+
+	if (tp != sc_get_mouse_tty())
+	    return ENOTTY;
+	if ((mode->level < 0) || (mode->level > 1))
+	    return EINVAL;
+	sc_mouse_set_level(mode->level);
+	return 0;
+    }
+
+    case MOUSE_GETLEVEL:	/* get operation level */
+	if (tp != sc_get_mouse_tty())
+	    return ENOTTY;
+	*(int *)data = mouse_level;
+	return 0;
+
+    case MOUSE_SETLEVEL:	/* set operation level */
+	if (tp != sc_get_mouse_tty())
+	    return ENOTTY;
+	if ((*(int *)data  < 0) || (*(int *)data > 1))
+	    return EINVAL;
+	sc_mouse_set_level(*(int *)data);
+	return 0;
+
+    case MOUSE_GETSTATUS:	/* get accumulated mouse events */
+	if (tp != sc_get_mouse_tty())
+	    return ENOTTY;
+	s = spltty();
+	*(mousestatus_t *)data = mouse_status;
+	mouse_status.flags = 0;
+	mouse_status.obutton = mouse_status.button;
+	mouse_status.dx = 0;
+	mouse_status.dy = 0;
+	mouse_status.dz = 0;
+	splx(s);
+	return 0;
+
+#if notyet
+    case MOUSE_GETVARS:		/* get internal mouse variables */
+    case MOUSE_SETVARS:		/* set internal mouse variables */
+	if (tp != sc_get_mouse_tty())
+	    return ENOTTY;
+	return ENODEV;
+#endif
+
+    case MOUSE_READSTATE:	/* read status from the device */
+    case MOUSE_READDATA:	/* read data from the device */
+	if (tp != sc_get_mouse_tty())
+	    return ENOTTY;
+	return ENODEV;
+    }
+
+    return ENOIOCTL;
+}
+
+#endif /* SC_NO_SYSMOUSE */
+
+#endif /* NSC */
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index b71f071082e9..114c5ecbf053 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvesactl.c,v 1.9 1999/01/11 03:18:26 yokota Exp $
+ * $Id: scvesactl.c,v 1.10 1999/06/01 18:17:31 jlemon Exp $
  */
 
 #include "sc.h"
@@ -44,7 +44,6 @@
 #include <sys/tty.h>
 #include <sys/kernel.h>
 
-#include <machine/apm_bios.h>
 #include <machine/console.h>
 #include <machine/pc/vesa.h>
 
@@ -71,7 +70,7 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	case SW_TEXT_132x25: case SW_TEXT_132x30:
 	case SW_TEXT_132x43: case SW_TEXT_132x50:
 	case SW_TEXT_132x60:
-		if (!(scp->adp->va_flags & V_ADP_MODECHANGE))
+		if (!(scp->sc->adp->va_flags & V_ADP_MODECHANGE))
 			return ENODEV;
 		return sc_set_text_mode(scp, tp, cmd & 0xff, 0, 0, 0);
 
@@ -81,7 +80,7 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	case SW_VESA_C132x43:
 	case SW_VESA_C132x50:
 	case SW_VESA_C132x60:
-		if (!(scp->adp->va_flags & V_ADP_MODECHANGE))
+		if (!(scp->sc->adp->va_flags & V_ADP_MODECHANGE))
 			return ENODEV;
 		mode = (cmd & 0xff) + M_VESA_BASE;
 		return sc_set_text_mode(scp, tp, mode, 0, 0, 0);
@@ -107,7 +106,7 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	case SW_VESA_1280x1024:	case SW_VESA_CG1280x1024:
 	case SW_VESA_32K_1280:	case SW_VESA_64K_1280:
 	case SW_VESA_FULL_1280:
-		if (!(scp->adp->va_flags & V_ADP_MODECHANGE))
+		if (!(scp->sc->adp->va_flags & V_ADP_MODECHANGE))
 			return ENODEV;
 		mode = (cmd & 0xff) + M_VESA_BASE;
 		return sc_set_graphics_mode(scp, tp, mode);
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
new file mode 100644
index 000000000000..16c40e26e566
--- /dev/null
+++ b/sys/dev/syscons/scvgarndr.c
@@ -0,0 +1,829 @@
+/*-
+ * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id:$
+ */
+
+#include "sc.h"
+#include "vga.h"
+#include "opt_syscons.h"
+#include "opt_vga.h"
+
+#if NSC > 0 && NVGA > 0
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+
+#include <machine/console.h>
+#include <machine/md_var.h>
+
+#include <dev/fb/fbreg.h>
+#include <dev/fb/vgareg.h>
+#include <dev/syscons/syscons.h>
+
+#include <isa/isareg.h>
+
+#ifndef SC_MOUSE_CHAR
+#define SC_MOUSE_CHAR		(0xd0)
+#endif
+
+#ifndef SC_RENDER_DEBUG
+#define SC_RENDER_DEBUG		0
+#endif
+
+static vr_clear_t		vga_txtclear;
+static vr_draw_border_t		vga_txtborder;
+static vr_draw_t		vga_txtdraw;
+static vr_set_cursor_t		vga_txtcursor_shape;
+static vr_draw_cursor_t		vga_txtcursor;
+static vr_blink_cursor_t	vga_txtblink;
+#ifndef SC_NO_CUTPASTE
+static vr_draw_mouse_t		vga_txtmouse;
+#else
+#define vga_txtmouse		(vr_draw_mouse_t *)vga_nop
+#endif
+
+#ifdef SC_PIXEL_MODE
+static vr_clear_t		vga_pxlclear;
+static vr_draw_border_t		vga_pxlborder;
+static vr_draw_t		vga_egadraw;
+static vr_draw_t		vga_vgadraw;
+static vr_set_cursor_t		vga_pxlcursor_shape;
+static vr_draw_cursor_t		vga_pxlcursor;
+static vr_blink_cursor_t	vga_pxlblink;
+#ifndef SC_NO_CUTPASTE
+static vr_draw_mouse_t		vga_pxlmouse;
+#else
+#define vga_pxlmouse		(vr_draw_mouse_t *)vga_nop
+#endif
+#endif /* SC_PIXEL_MODE */
+
+#ifndef SC_NO_MODE_CHANGE
+static vr_draw_border_t		vga_grborder;
+#endif
+
+static void			vga_nop(scr_stat *scp, ...);
+
+static sc_rndr_sw_t txtrndrsw = {
+	vga_txtclear,
+	vga_txtborder,
+	vga_txtdraw,	
+	vga_txtcursor_shape,
+	vga_txtcursor,
+	vga_txtblink,
+	(vr_set_mouse_t *)vga_nop,
+	vga_txtmouse,
+};
+RENDERER(mda, 0, txtrndrsw);
+RENDERER(cga, 0, txtrndrsw);
+RENDERER(ega, 0, txtrndrsw);
+RENDERER(vga, 0, txtrndrsw);
+
+#ifdef SC_PIXEL_MODE
+static sc_rndr_sw_t egarndrsw = {
+	vga_pxlclear,
+	vga_pxlborder,
+	vga_egadraw,
+	vga_pxlcursor_shape,
+	vga_pxlcursor,
+	vga_pxlblink,
+	(vr_set_mouse_t *)vga_nop,
+	vga_pxlmouse,
+};
+RENDERER(ega, PIXEL_MODE, egarndrsw);
+
+static sc_rndr_sw_t vgarndrsw = {
+	vga_pxlclear,
+	vga_pxlborder,
+	vga_vgadraw,
+	vga_pxlcursor_shape,
+	vga_pxlcursor,
+	vga_pxlblink,
+	(vr_set_mouse_t *)vga_nop,
+	vga_pxlmouse,
+};
+RENDERER(vga, PIXEL_MODE, vgarndrsw);
+#endif /* SC_PIXEL_MODE */
+
+#ifndef SC_NO_MODE_CHANGE
+static sc_rndr_sw_t grrndrsw = {
+	(vr_clear_t *)vga_nop,
+	vga_grborder,
+	(vr_draw_t *)vga_nop,
+	(vr_set_cursor_t *)vga_nop,
+	(vr_draw_cursor_t *)vga_nop,
+	(vr_blink_cursor_t *)vga_nop,
+	(vr_set_mouse_t *)vga_nop,
+	(vr_draw_mouse_t *)vga_nop,
+};
+RENDERER(cga, GRAPHICS_MODE, grrndrsw);
+RENDERER(ega, GRAPHICS_MODE, grrndrsw);
+RENDERER(vga, GRAPHICS_MODE, grrndrsw);
+#endif /* SC_NO_MODE_CHANGE */
+
+#ifndef SC_NO_CUTPASTE
+static u_short mouse_and_mask[16] = {
+	0xc000, 0xe000, 0xf000, 0xf800, 0xfc00, 0xfe00, 0xff00, 0xff80,
+	0xfe00, 0x1e00, 0x1f00, 0x0f00, 0x0f00, 0x0000, 0x0000, 0x0000
+};
+static u_short mouse_or_mask[16] = {
+	0x0000, 0x4000, 0x6000, 0x7000, 0x7800, 0x7c00, 0x7e00, 0x6800,
+	0x0c00, 0x0c00, 0x0600, 0x0600, 0x0000, 0x0000, 0x0000, 0x0000
+};
+#endif
+
+static void
+vga_nop(scr_stat *scp, ...)
+{
+}
+
+/* text mode renderer */
+
+static void
+vga_txtclear(scr_stat *scp, int c, int attr)
+{
+	sc_vtb_clear(&scp->scr, c, attr);
+}
+
+static void
+vga_txtborder(scr_stat *scp, int color)
+{
+	(*vidsw[scp->sc->adapter]->set_border)(scp->sc->adp, color);
+}
+
+static void
+vga_txtdraw(scr_stat *scp, int from, int count, int flip)
+{
+	vm_offset_t p;
+	int c;
+	int a;
+
+	if (from + count > scp->xsize*scp->ysize)
+		count = scp->xsize*scp->ysize - from;
+
+	if (flip) {
+		for (p = sc_vtb_pointer(&scp->scr, from); count-- > 0; ++from) {
+			c = sc_vtb_getc(&scp->vtb, from);
+			a = sc_vtb_geta(&scp->vtb, from);
+			a = (a & 0x8800) | ((a & 0x7000) >> 4) 
+				| ((a & 0x0700) << 4);
+			p = sc_vtb_putchar(&scp->scr, p, c, a);
+		}
+	} else {
+		sc_vtb_copy(&scp->vtb, from, &scp->scr, from, count);
+	}
+}
+
+static void 
+vga_txtcursor_shape(scr_stat *scp, int base, int height, int blink)
+{
+	if (base < 0 || base >= scp->font_size)
+		return;
+	/* the caller may set height <= 0 in order to disable the cursor */
+#if 0
+	scp->cursor_base = base;
+	scp->cursor_height = height;
+#endif
+	(*vidsw[scp->sc->adapter]->set_hw_cursor_shape)(scp->sc->adp,
+							base, height,
+							scp->font_size, blink);
+}
+
+static void
+vga_txtcursor(scr_stat *scp, int at, int blink, int on, int flip)
+{
+	video_adapter_t *adp;
+	int cursor_attr;
+
+	if (scp->cursor_height <= 0)	/* the text cursor is disabled */
+		return;
+
+	adp = scp->sc->adp;
+	if (blink) {
+		scp->status |= VR_CURSOR_BLINK;
+		if (on) {
+			scp->status |= VR_CURSOR_ON;
+			(*vidsw[adp->va_index]->set_hw_cursor)(adp,
+							       at%scp->xsize,
+							       at/scp->xsize); 
+		} else {
+			if (scp->status & VR_CURSOR_ON)
+				(*vidsw[adp->va_index]->set_hw_cursor)(adp,
+								       -1, -1);
+			scp->status &= ~VR_CURSOR_ON;
+		}
+	} else {
+		scp->status &= ~VR_CURSOR_BLINK;
+		if (on) {
+			scp->status |= VR_CURSOR_ON;
+			cursor_attr = sc_vtb_geta(&scp->vtb, at);
+			scp->cursor_saveunder_char = sc_vtb_getc(&scp->scr, at);
+			scp->cursor_saveunder_attr = cursor_attr;
+			if ((cursor_attr & 0x7000) == 0x7000) {
+				cursor_attr &= 0x8f00;
+				if ((cursor_attr & 0x0700) == 0)
+					cursor_attr |= 0x0700;
+			} else {
+				cursor_attr |= 0x7000;
+				if ((cursor_attr & 0x0700) == 0x0700)
+					cursor_attr &= 0xf000;
+			}
+			if (flip)
+				cursor_attr = (cursor_attr & 0x8800)
+					| ((cursor_attr & 0x7000) >> 4)
+					| ((cursor_attr & 0x0700) << 4);
+			sc_vtb_putc(&scp->scr, at,
+				    sc_vtb_getc(&scp->scr, at),
+				    cursor_attr);
+		} else {
+			cursor_attr = scp->cursor_saveunder_attr;
+			if (flip)
+				cursor_attr = (cursor_attr & 0x8800)
+					| ((cursor_attr & 0x7000) >> 4)
+					| ((cursor_attr & 0x0700) << 4);
+			if (scp->status & VR_CURSOR_ON)
+				sc_vtb_putc(&scp->scr, at,
+					    scp->cursor_saveunder_char,
+					    cursor_attr);
+			scp->status &= ~VR_CURSOR_ON;
+		}
+	}
+}
+
+static void
+vga_txtblink(scr_stat *scp, int at, int flip)
+{
+}
+
+#ifndef SC_NO_CUTPASTE
+
+static void
+draw_txtmouse(scr_stat *scp, int x, int y)
+{
+#ifndef SC_ALT_MOUSE_IMAGE
+	u_char font_buf[128];
+	u_short cursor[32];
+	int pos;
+	int xoffset, yoffset;
+	int crtc_addr;
+	int i;
+
+	/* prepare mousepointer char's bitmaps */
+	pos = (y/scp->font_size - scp->yoff)*scp->xsize + x/8 - scp->xoff;
+	bcopy(scp->font + sc_vtb_getc(&scp->vtb, pos)*scp->font_size,
+	      &font_buf[0], scp->font_size);
+	bcopy(scp->font + sc_vtb_getc(&scp->vtb, pos + 1)*scp->font_size,
+	      &font_buf[32], scp->font_size);
+	bcopy(scp->font 
+		 + sc_vtb_getc(&scp->vtb, pos + scp->xsize)*scp->font_size,
+	      &font_buf[64], scp->font_size);
+	bcopy(scp->font
+		 + sc_vtb_getc(&scp->vtb, pos + scp->xsize + 1)*scp->font_size,
+	      &font_buf[96], scp->font_size);
+	for (i = 0; i < scp->font_size; ++i) {
+		cursor[i] = font_buf[i]<<8 | font_buf[i+32];
+		cursor[i + scp->font_size] = font_buf[i+64]<<8 | font_buf[i+96];
+	}
+
+	/* now and-or in the mousepointer image */
+	xoffset = x%8;
+	yoffset = y%scp->font_size;
+	for (i = 0; i < 16; ++i) {
+		cursor[i + yoffset] =
+	    		(cursor[i + yoffset] & ~(mouse_and_mask[i] >> xoffset))
+	    		| (mouse_or_mask[i] >> xoffset);
+	}
+	for (i = 0; i < scp->font_size; ++i) {
+		font_buf[i] = (cursor[i] & 0xff00) >> 8;
+		font_buf[i + 32] = cursor[i] & 0xff;
+		font_buf[i + 64] = (cursor[i + scp->font_size] & 0xff00) >> 8;
+		font_buf[i + 96] = cursor[i + scp->font_size] & 0xff;
+	}
+
+#if 1
+	/* wait for vertical retrace to avoid jitter on some videocards */
+	crtc_addr = scp->sc->adp->va_crtc_addr;
+	while (!(inb(crtc_addr + 6) & 0x08)) /* idle */ ;
+#endif
+	(*vidsw[scp->sc->adapter]->load_font)(scp->sc->adp, 0, 32, font_buf,
+					      SC_MOUSE_CHAR, 4); 
+
+	sc_vtb_putc(&scp->scr, pos, SC_MOUSE_CHAR, sc_vtb_geta(&scp->scr, pos));
+	/* FIXME: may be out of range! */
+	sc_vtb_putc(&scp->scr, pos + scp->xsize, SC_MOUSE_CHAR + 2,
+		    sc_vtb_geta(&scp->scr, pos + scp->xsize));
+	if (x < (scp->xsize - 1)*8) {
+		sc_vtb_putc(&scp->scr, pos + 1, SC_MOUSE_CHAR + 1,
+			    sc_vtb_geta(&scp->scr, pos + 1));
+		sc_vtb_putc(&scp->scr, pos + scp->xsize + 1, SC_MOUSE_CHAR + 3,
+			    sc_vtb_geta(&scp->scr, pos + scp->xsize + 1));
+	}
+#else /* SC_ALT_MOUSE_IMAGE */
+	/* Red, magenta and brown are mapped to green to to keep it readable */
+	static const int col_conv[16] = {
+		6, 6, 6, 6, 2, 2, 2, 6, 14, 14, 14, 14, 10, 10, 10, 14
+	};
+	int pos;
+	int color;
+	int a;
+
+	pos = (y/scp->font_size - scp->yoff)*scp->xsize + x/8 - scp->xoff;
+	a = sc_vtb_geta(&scp->scr, pos);
+	if (scp->sc->adp->va_flags & V_ADP_COLOR)
+		color = (col_conv[(a & 0xf000) >> 12] << 12)
+			| ((a & 0x0f00) | 0x0800);
+	else
+		color = ((a & 0xf000) >> 4) | ((a & 0x0f00) << 4);
+	sc_vtb_putc(&scp->scr, pos, sc_vtb_getc(&scp->scr, pos), color);
+#endif /* SC_ALT_MOUSE_IMAGE */
+}
+
+static void
+remove_txtmouse(scr_stat *scp, int x, int y)
+{
+}
+
+static void 
+vga_txtmouse(scr_stat *scp, int x, int y, int on)
+{
+	if (on)
+		draw_txtmouse(scp, x, y);
+	else
+		remove_txtmouse(scp, x, y);
+}
+
+#endif /* SC_NO_CUTPASTE */
+
+#ifdef SC_PIXEL_MODE
+
+/* pixel (raster text) mode renderer */
+
+static void
+vga_pxlclear(scr_stat *scp, int c, int attr)
+{
+	vm_offset_t p;
+	int line_width;
+	int lines;
+	int i;
+
+	/* XXX: we are just filling the screen with the background color... */
+	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+	outw(GDCIDX, 0x0003);		/* data rotate/function select */
+	outw(GDCIDX, 0x0f01);		/* set/reset enable */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+	outw(GDCIDX, ((attr & 0xf000) >> 4) | 0x00); /* set/reset */
+	line_width = scp->sc->adp->va_line_width;
+	lines = scp->ysize*scp->font_size; 
+	p = scp->sc->adp->va_window + line_width*scp->yoff*scp->font_size
+		+ scp->xoff;
+	for (i = 0; i < lines; ++i) {
+		bzero_io((void *)p, scp->xsize);
+		p += line_width;
+	}
+	outw(GDCIDX, 0x0000);		/* set/reset */
+	outw(GDCIDX, 0x0001);		/* set/reset enable */
+}
+
+static void
+vga_pxlborder(scr_stat *scp, int color)
+{
+	vm_offset_t p;
+	int line_width;
+	int i;
+
+	(*vidsw[scp->sc->adapter]->set_border)(scp->sc->adp, color);
+
+	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+	outw(GDCIDX, 0x0003);		/* data rotate/function select */
+	outw(GDCIDX, 0x0f01);		/* set/reset enable */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+	outw(GDCIDX, (color << 8) | 0x00);	/* set/reset */
+	line_width = scp->sc->adp->va_line_width;
+	p = scp->sc->adp->va_window;
+	if (scp->yoff > 0) {
+		bzero_io((void *)p, line_width*scp->yoff*scp->font_size);
+		bzero_io((void *)(p + line_width*(scp->yoff + scp->ysize)
+					  *scp->font_size),
+			 line_width*(scp->ypixel
+				     - (scp->yoff + scp->ysize)*scp->font_size));
+	}
+	if (scp->xoff > 0) {
+		for (i = 0; i < scp->ysize*scp->font_size; ++i) {
+			bzero_io((void *)(p + line_width
+					          *(scp->yoff*scp->font_size + i)),
+				 scp->xoff);
+			bzero_io((void *)(p + line_width
+						  *(scp->yoff*scp->font_size + i)
+				     + scp->xoff + scp->xsize), 
+				 scp->xpixel/8 - scp->xoff - scp->xsize);
+		}
+	}
+	outw(GDCIDX, 0x0000);		/* set/reset */
+	outw(GDCIDX, 0x0001);		/* set/reset enable */
+}
+
+static void 
+vga_egadraw(scr_stat *scp, int from, int count, int flip)
+{
+	vm_offset_t d;
+	vm_offset_t e;
+	u_char *f;
+	u_short bg;
+	u_short col1, col2;
+	int line_width;
+	int i, j;
+	int a;
+	u_char c;
+
+	line_width = scp->sc->adp->va_line_width;
+	d = scp->sc->adp->va_window
+		+ scp->xoff 
+		+ scp->yoff*scp->font_size*line_width 
+		+ (from%scp->xsize) 
+		+ scp->font_size*line_width*(from/scp->xsize);
+
+	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+	outw(GDCIDX, 0x0003);		/* data rotate/function select */
+	outw(GDCIDX, 0x0f01);		/* set/reset enable */
+	bg = -1;
+	if (from + count > scp->xsize*scp->ysize)
+		count = scp->xsize*scp->ysize - from;
+	for (i = from; count-- > 0; ++i) {
+		a = sc_vtb_geta(&scp->vtb, i);
+		if (flip) {
+			col1 = ((a & 0x7000) >> 4) | (a & 0x0800);
+			col2 = ((a & 0x8000) >> 4) | (a & 0x0700);
+		} else {
+			col1 = (a & 0x0f00);
+			col2 = (a & 0xf000) >> 4;
+		}
+		/* set background color in EGA/VGA latch */
+		if (bg != col2) {
+			bg = col2;
+			outw(GDCIDX, bg | 0x00);	/* set/reset */
+			outw(GDCIDX, 0xff08);		/* bit mask */
+			writeb(d, 0);
+			c = readb(d);	/* set bg color in the latch */
+		}
+		/* foreground color */
+		outw(GDCIDX, col1 | 0x00);		/* set/reset */
+		e = d;
+		f = &(scp->font[sc_vtb_getc(&scp->vtb, i)*scp->font_size]);
+		for (j = 0; j < scp->font_size; ++j, ++f) {
+			outw(GDCIDX, (*f << 8) | 0x08);	/* bit mask */
+	        	writeb(e, 0);
+			e += line_width;
+		}
+		++d;
+		if ((i % scp->xsize) == scp->xsize - 1)
+			d += scp->xoff*2 
+				 + (scp->font_size - 1)*line_width;
+	}
+	outw(GDCIDX, 0x0000);		/* set/reset */
+	outw(GDCIDX, 0x0001);		/* set/reset enable */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+}
+
+static void 
+vga_vgadraw(scr_stat *scp, int from, int count, int flip)
+{
+	vm_offset_t d;
+	vm_offset_t e;
+	u_char *f;
+	u_short bg;
+	u_short col1, col2;
+	int line_width;
+	int i, j;
+	int a;
+	u_char c;
+
+	line_width = scp->sc->adp->va_line_width;
+	d = scp->sc->adp->va_window
+		+ scp->xoff 
+		+ scp->yoff*scp->font_size*line_width 
+		+ (from%scp->xsize) 
+		+ scp->font_size*line_width*(from/scp->xsize);
+
+	outw(GDCIDX, 0x0305);		/* read mode 0, write mode 3 */
+	outw(GDCIDX, 0x0003);		/* data rotate/function select */
+	outw(GDCIDX, 0x0f01);		/* set/reset enable */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+	bg = -1;
+	if (from + count > scp->xsize*scp->ysize)
+		count = scp->xsize*scp->ysize - from;
+	for (i = from; count-- > 0; ++i) {
+		a = sc_vtb_geta(&scp->vtb, i);
+		if (flip) {
+			col1 = ((a & 0x7000) >> 4) | (a & 0x0800);
+			col2 = ((a & 0x8000) >> 4) | (a & 0x0700);
+		} else {
+			col1 = (a & 0x0f00);
+			col2 = (a & 0xf000) >> 4;
+		}
+		/* set background color in EGA/VGA latch */
+		if (bg != col2) {
+			bg = col2;
+			outw(GDCIDX, 0x0005);	/* read mode 0, write mode 0 */
+			outw(GDCIDX, bg | 0x00); /* set/reset */
+			writeb(d, 0);
+			c = readb(d);		/* set bg color in the latch */
+			outw(GDCIDX, 0x0305);	/* read mode 0, write mode 3 */
+		}
+		/* foreground color */
+		outw(GDCIDX, col1 | 0x00);	/* set/reset */
+		e = d;
+		f = &(scp->font[sc_vtb_getc(&scp->vtb, i)*scp->font_size]);
+		for (j = 0; j < scp->font_size; ++j, ++f) {
+	        	writeb(e, *f);
+			e += line_width;
+		}
+		++d;
+		if ((i % scp->xsize) == scp->xsize - 1)
+			d += scp->xoff*2 
+				 + (scp->font_size - 1)*line_width;
+	}
+	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+	outw(GDCIDX, 0x0000);		/* set/reset */
+	outw(GDCIDX, 0x0001);		/* set/reset enable */
+}
+
+static void 
+vga_pxlcursor_shape(scr_stat *scp, int base, int height, int blink)
+{
+	if (base < 0 || base >= scp->font_size)
+		return;
+	/* the caller may set height <= 0 in order to disable the cursor */
+#if 0
+	scp->cursor_base = base;
+	scp->cursor_height = height;
+#endif
+}
+
+static void 
+draw_pxlcursor(scr_stat *scp, int at, int on, int flip)
+{
+	vm_offset_t d;
+	u_char *f;
+	int line_width;
+	int height;
+	int col;
+	int a;
+	int i;
+	u_char c;
+
+	line_width = scp->sc->adp->va_line_width;
+	d = scp->sc->adp->va_window
+		+ scp->xoff 
+		+ scp->yoff*scp->font_size*line_width 
+		+ (at%scp->xsize) 
+		+ scp->font_size*line_width*(at/scp->xsize)
+		+ (scp->font_size - scp->cursor_base - 1)*line_width;
+
+	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+	outw(GDCIDX, 0x0003);		/* data rotate/function select */
+	outw(GDCIDX, 0x0f01);		/* set/reset enable */
+	/* set background color in EGA/VGA latch */
+	a = sc_vtb_geta(&scp->vtb, at);
+	if (flip)
+		col = (on) ? ((a & 0xf000) >> 4) : (a & 0x0f00);
+	else
+		col = (on) ? (a & 0x0f00) : ((a & 0xf000) >> 4);
+	outw(GDCIDX, col | 0x00);	/* set/reset */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+	writeb(d, 0);
+	c = readb(d);			/* set bg color in the latch */
+	/* foreground color */
+	if (flip)
+		col = (on) ? (a & 0x0f00) : ((a & 0xf000) >> 4);
+	else
+		col = (on) ? ((a & 0xf000) >> 4) : (a & 0x0f00);
+	outw(GDCIDX, col | 0x00);	/* set/reset */
+	f = &(scp->font[sc_vtb_getc(&scp->vtb, at)*scp->font_size
+		+ scp->font_size - scp->cursor_base - 1]);
+	height = imin(scp->cursor_height, scp->font_size);
+	for (i = 0; i < height; ++i, --f) {
+		outw(GDCIDX, (*f << 8) | 0x08);	/* bit mask */
+	       	writeb(d, 0);
+		d -= line_width;
+	}
+	outw(GDCIDX, 0x0000);		/* set/reset */
+	outw(GDCIDX, 0x0001);		/* set/reset enable */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+}
+
+static void 
+vga_pxlcursor(scr_stat *scp, int at, int blink, int on, int flip)
+{
+	if (scp->cursor_height <= 0)	/* the text cursor is disabled */
+		return;
+
+	if (on) {
+		scp->status |= VR_CURSOR_ON;
+		draw_pxlcursor(scp, at, on, flip);
+	} else {
+		if (scp->status & VR_CURSOR_ON)
+			draw_pxlcursor(scp, at, on, flip);
+		scp->status &= ~VR_CURSOR_ON;
+	}
+	if (blink)
+		scp->status |= VR_CURSOR_BLINK;
+	else
+		scp->status &= ~VR_CURSOR_BLINK;
+}
+
+static void
+vga_pxlblink(scr_stat *scp, int at, int flip)
+{
+	static int blinkrate = 0;
+
+	if (!(scp->status & VR_CURSOR_BLINK))
+		return;
+	if (!(++blinkrate & 4))
+		return;
+	blinkrate = 0;
+	scp->status ^= VR_CURSOR_ON;
+	draw_pxlcursor(scp, at, scp->status & VR_CURSOR_ON, flip);
+}
+
+#ifndef SC_NO_CUTPASTE
+
+static void
+draw_pxlmouse(scr_stat *scp, int x, int y)
+{
+	vm_offset_t p;
+	int line_width;
+	int xoff, yoff;
+	int ymax;
+	u_short m;
+	int i, j;
+
+	line_width = scp->sc->adp->va_line_width;
+	xoff = (x - scp->xoff*8)%8;
+	yoff = y - (y/line_width)*line_width;
+	ymax = imin(y + 16, scp->ypixel);
+
+	outw(GDCIDX, 0x0805);		/* read mode 1, write mode 0 */
+	outw(GDCIDX, 0x0001);		/* set/reset enable */
+	outw(GDCIDX, 0x0002);		/* color compare */
+	outw(GDCIDX, 0x0007);		/* color don't care */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+	outw(GDCIDX, 0x0803);		/* data rotate/function select (and) */
+	p = scp->sc->adp->va_window + line_width*y + x/8;
+	if (x < scp->xpixel - 16) {
+		for (i = y, j = 0; i < ymax; ++i, ++j) {
+			m = ~(mouse_and_mask[j] >> xoff);
+#ifdef __i386__
+			*(u_char *)p &= m >> 8;
+			*(u_char *)(p + 1) &= m;
+#elif defined(__alpha__)
+			writeb(p, readb(p) & (m >> 8));
+			writeb(p + 1, readb(p + 1) & (m >> 8));
+#endif
+			p += line_width;
+		}
+	} else {
+		xoff += 8;
+		for (i = y, j = 0; i < ymax; ++i, ++j) {
+			m = ~(mouse_and_mask[j] >> xoff);
+#ifdef __i386__
+			*(u_char *)p &= m;
+#elif defined(__alpha__)
+			writeb(p, readb(p) & (m >> 8));
+#endif
+			p += line_width;
+		}
+	}
+	outw(GDCIDX, 0x1003);		/* data rotate/function select (or) */
+	p = scp->sc->adp->va_window + line_width*y + x/8;
+	if (x < scp->xpixel - 16) {
+		for (i = y, j = 0; i < ymax; ++i, ++j) {
+			m = mouse_or_mask[j] >> xoff;
+#ifdef __i386__
+			*(u_char *)p &= m >> 8;
+			*(u_char *)(p + 1) &= m;
+#elif defined(__alpha__)
+			writeb(p, readb(p) & (m >> 8));
+			writeb(p + 1, readb(p + 1) & (m >> 8));
+#endif
+			p += line_width;
+		}
+	} else {
+		for (i = y, j = 0; i < ymax; ++i, ++j) {
+			m = mouse_or_mask[j] >> xoff;
+#ifdef __i386__
+			*(u_char *)p &= m;
+#elif defined(__alpha__)
+			writeb(p, readb(p) & (m >> 8));
+#endif
+			p += line_width;
+		}
+	}
+	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+	outw(GDCIDX, 0x0003);		/* data rotate/function select */
+}
+
+static void
+remove_pxlmouse(scr_stat *scp, int x, int y)
+{
+	vm_offset_t p;
+	int col, row;
+	int pos;
+	int line_width;
+	int ymax;
+	int i;
+
+	/* erase the mouse cursor image */
+	col = x/8 - scp->xoff;
+	row = y/scp->font_size - scp->yoff;
+	pos = row*scp->xsize + col;
+	i = (col < scp->xsize - 1) ? 2 : 1;
+	(*scp->rndr->draw)(scp, pos, i, FALSE);
+	if (row < scp->ysize - 1)
+		(*scp->rndr->draw)(scp, pos + scp->xsize, i, FALSE);
+
+	/* paint border if necessary */
+	line_width = scp->sc->adp->va_line_width;
+	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
+	outw(GDCIDX, 0x0003);		/* data rotate/function select */
+	outw(GDCIDX, 0x0f01);		/* set/reset enable */
+	outw(GDCIDX, 0xff08);		/* bit mask */
+	outw(GDCIDX, (scp->border << 8) | 0x00);	/* set/reset */
+	if (row == scp->ysize - 1) {
+		i = (scp->ysize + scp->yoff)*scp->font_size;
+		ymax = imin(i + scp->font_size, scp->ypixel);
+		p = scp->sc->adp->va_window + i*line_width + scp->xoff + col;
+		if (col < scp->xsize - 1) {
+			for (; i < ymax; ++i) {
+				writeb(p, 0);
+				writeb(p + 1, 0);
+				p += line_width;
+			}
+		} else {
+			for (; i < ymax; ++i) {
+				writeb(p, 0);
+				p += line_width;
+			}
+		}
+	}
+	if ((col == scp->xsize - 1) && (scp->xoff > 0)) {
+		i = (row + scp->yoff)*scp->font_size;
+		ymax = imin(i + scp->font_size*2, scp->ypixel);
+		p = scp->sc->adp->va_window + i*line_width
+			+ scp->xoff + scp->xsize;
+		for (; i < ymax; ++i) {
+			writeb(p, 0);
+			p += line_width;
+		}
+	}
+	outw(GDCIDX, 0x0000);		/* set/reset */
+	outw(GDCIDX, 0x0001);		/* set/reset enable */
+}
+
+static void 
+vga_pxlmouse(scr_stat *scp, int x, int y, int on)
+{
+	if (on)
+		draw_pxlmouse(scp, x, y);
+	else
+		remove_pxlmouse(scp, x, y);
+}
+
+#endif /* SC_NO_CUTPASTE */
+#endif /* SC_PIXEL_MODE */
+
+#ifndef SC_NO_MODE_CHANGE
+
+/* graphics mode renderer */
+
+static void
+vga_grborder(scr_stat *scp, int color)
+{
+	(*vidsw[scp->sc->adapter]->set_border)(scp->sc->adp, color);
+}
+
+#endif
+
+#endif /* NSC > 0 && NVGA > 0 */
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 732f386c05bc..f84b14dff8ad 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvidctl.c,v 1.7 1999/01/19 11:31:16 yokota Exp $
+ * $Id: $
  */
 
 #include "sc.h"
@@ -37,19 +37,21 @@
 #include <sys/tty.h>
 #include <sys/kernel.h>
 
-#ifdef __i386__
-#include <machine/apm_bios.h>
-#endif
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
 #include <machine/console.h>
 
 #include <dev/fb/fbreg.h>
 #include <dev/syscons/syscons.h>
 
 /* for compatibility with previous versions */
+/* 3.0-RELEASE used the following structure */
 typedef struct old_video_adapter {
     int			va_index;
     int			va_type;
     int			va_flags;
+/* flag bits are the same as the -CURRENT
 #define V_ADP_COLOR	(1<<0)
 #define V_ADP_MODECHANGE (1<<1)
 #define V_ADP_STATESAVE	(1<<2)
@@ -58,6 +60,7 @@ typedef struct old_video_adapter {
 #define V_ADP_PALETTE	(1<<5)
 #define V_ADP_BORDER	(1<<6)
 #define V_ADP_VESA	(1<<7)
+*/
     int			va_crtc_addr;
     u_int		va_window;	/* virtual address */
     size_t		va_window_size;
@@ -71,39 +74,100 @@ typedef struct old_video_adapter {
 
 #define OLD_CONS_ADPINFO _IOWR('c', 101, old_video_adapter_t)
 
-/* variables */
-extern scr_stat *cur_console;
-extern int fonts_loaded;
-extern int sc_history_size;
-extern u_char palette[];
+/* 3.1-RELEASE used the following structure */
+typedef struct old_video_adapter_info {
+    int			va_index;
+    int			va_type;
+    char		va_name[16];
+    int			va_unit;
+    int			va_flags;
+    int			va_io_base;
+    int			va_io_size;
+    int			va_crtc_addr;
+    int			va_mem_base;
+    int			va_mem_size;
+    u_int		va_window;	/* virtual address */
+    size_t		va_window_size;
+    size_t		va_window_gran;
+    u_int		va_buffer;;
+    size_t		va_buffer_size;
+    int			va_initial_mode;
+    int			va_initial_bios_mode;
+    int			va_mode;
+    int			va_line_width;
+} old_video_adapter_info_t;
+
+#define OLD_CONS_ADPINFO2 _IOWR('c', 101, old_video_adapter_info_t)
+
+/* 3.0-RELEASE and 3.1-RELEASE used the following structure */
+typedef struct old_video_info {
+    int			vi_mode;
+    int			vi_flags;
+/* flag bits are the same as the -CURRENT
+#define V_INFO_COLOR	(1<<0)
+#define V_INFO_GRAPHICS	(1<<1)
+#define V_INFO_LINEAR	(1<<2)
+#define V_INFO_VESA	(1<<3)
+*/
+    int			vi_width;
+    int			vi_height;
+    int			vi_cwidth;
+    int			vi_cheight;
+    int			vi_depth;
+    int			vi_planes;
+    u_int		vi_window;	/* physical address */
+    size_t		vi_window_size;
+    size_t		vi_window_gran;
+    u_int		vi_buffer;	/* physical address */
+    size_t		vi_buffer_size;
+} old_video_info_t;
+
+#define OLD_CONS_MODEINFO _IOWR('c', 102, old_video_info_t)
+#define OLD_CONS_FINDMODE _IOWR('c', 103, old_video_info_t)
 
 int
 sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
 		 int fontsize)
 {
     video_info_t info;
+    sc_rndr_sw_t *rndr;
+    u_char *font;
     int error;
     int s;
-    int i;
 
-    if ((*vidsw[scp->ad]->get_info)(scp->adp, mode, &info))
+    if ((*vidsw[scp->sc->adapter]->get_info)(scp->sc->adp, mode, &info))
 	return ENODEV;
- 
+
     /* adjust argument values */
     if (fontsize <= 0)
 	fontsize = info.vi_cheight;
     if (fontsize < 14) {
 	fontsize = 8;
-	if (!(fonts_loaded & FONT_8))
+#ifndef SC_NO_FONT_LOADING
+	if (!(scp->sc->fonts_loaded & FONT_8))
 	    return EINVAL;
+	font = scp->sc->font_8;
+#else
+	font = NULL;
+#endif
     } else if (fontsize >= 16) {
 	fontsize = 16;
-	if (!(fonts_loaded & FONT_16))
+#ifndef SC_NO_FONT_LOADING
+	if (!(scp->sc->fonts_loaded & FONT_16))
 	    return EINVAL;
+	font = scp->sc->font_16;
+#else
+	font = NULL;
+#endif
     } else {
 	fontsize = 14;
-	if (!(fonts_loaded & FONT_14))
+#ifndef SC_NO_FONT_LOADING
+	if (!(scp->sc->fonts_loaded & FONT_14))
 	    return EINVAL;
+	font = scp->sc->font_14;
+#else
+	font = NULL;
+#endif
     }
     if ((xsize <= 0) || (xsize > info.vi_width))
 	xsize = info.vi_width;
@@ -117,12 +181,13 @@ sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
 	return error;
     }
 
+    rndr = sc_render_match(scp, scp->sc->adp, 0);
+    if (rndr == NULL) {
+	splx(s);
+	return ENODEV;
+    }
+
     /* set up scp */
-    if (scp->history != NULL)
-	i = imax(scp->history_size / scp->xsize 
-		 - imax(sc_history_size, scp->ysize), 0);
-    else
-	i = 0;
     /*
      * This is a kludge to fend off scrn_update() while we
      * muck around with scp. XXX
@@ -130,22 +195,27 @@ sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
     scp->status |= UNKNOWN_MODE;
     scp->status &= ~(GRAPHICS_MODE | PIXEL_MODE);
     scp->mode = mode;
-    scp->font_size = fontsize;
     scp->xsize = xsize;
     scp->ysize = ysize;
     scp->xoff = 0;
     scp->yoff = 0;
     scp->xpixel = scp->xsize*8;
     scp->ypixel = scp->ysize*fontsize;
+    scp->font = font;
+    scp->font_size = fontsize;
 
     /* allocate buffers */
     sc_alloc_scr_buffer(scp, TRUE, TRUE);
-    if (ISMOUSEAVAIL(scp->adp->va_flags))
-	sc_alloc_cut_buffer(scp, FALSE);
-    sc_alloc_history_buffer(scp, sc_history_size, i, FALSE);
+#ifndef SC_NO_CUTPASTE
+    sc_alloc_cut_buffer(scp, FALSE);
+#endif
+#ifndef SC_NO_HISTORY
+    sc_alloc_history_buffer(scp, 0, FALSE);
+#endif
+    scp->rndr = rndr;
     splx(s);
 
-    if (scp == cur_console)
+    if (scp == scp->sc->cur_scp)
 	set_mode(scp);
     scp->status &= ~UNKNOWN_MODE;
 
@@ -164,11 +234,15 @@ sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
 int
 sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode)
 {
+#ifdef SC_NO_MODE_CHANGE
+    return ENODEV;
+#else
     video_info_t info;
+    sc_rndr_sw_t *rndr;
     int error;
     int s;
 
-    if ((*vidsw[scp->ad]->get_info)(scp->adp, mode, &info))
+    if ((*vidsw[scp->sc->adapter]->get_info)(scp->sc->adp, mode, &info))
 	return ENODEV;
 
     /* stop screen saver, etc */
@@ -178,22 +252,32 @@ sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode)
 	return error;
     }
 
+    rndr = sc_render_match(scp, scp->sc->adp, GRAPHICS_MODE);
+    if (rndr == NULL) {
+	splx(s);
+	return ENODEV;
+    }
+
     /* set up scp */
     scp->status |= (UNKNOWN_MODE | GRAPHICS_MODE);
     scp->status &= ~PIXEL_MODE;
     scp->mode = mode;
+    scp->xsize = info.vi_width/8;
+    scp->ysize = info.vi_height/info.vi_cheight;
     scp->xoff = 0;
     scp->yoff = 0;
     scp->xpixel = info.vi_width;
     scp->ypixel = info.vi_height;
-    scp->xsize = info.vi_width/8;
-    scp->ysize = info.vi_height/info.vi_cheight;
+    scp->font = NULL;
     scp->font_size = FONT_NONE;
+#ifndef SC_NO_SYSMOUSE
     /* move the mouse cursor at the center of the screen */
-    sc_move_mouse(scp, scp->xpixel / 2, scp->ypixel / 2);
+    sc_mouse_move(scp, scp->xpixel / 2, scp->ypixel / 2);
+#endif
+    scp->rndr = rndr;
     splx(s);
 
-    if (scp == cur_console)
+    if (scp == scp->sc->cur_scp)
 	set_mode(scp);
     /* clear_graphics();*/
     scp->status &= ~UNKNOWN_MODE;
@@ -208,18 +292,23 @@ sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode)
     }
 
     return 0;
+#endif /* SC_NO_MODE_CHANGE */
 }
 
 int
 sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize, 
 		  int fontsize)
 {
+#ifndef SC_PIXEL_MODE
+    return ENODEV;
+#else
     video_info_t info;
+    sc_rndr_sw_t *rndr;
+    u_char *font;
     int error;
     int s;
-    int i;
 
-    if ((*vidsw[scp->ad]->get_info)(scp->adp, scp->mode, &info))
+    if ((*vidsw[scp->sc->adapter]->get_info)(scp->sc->adp, scp->mode, &info))
 	return ENODEV;		/* this shouldn't happen */
 
 #ifdef SC_VIDEO_DEBUG
@@ -234,16 +323,31 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize,
 	fontsize = info.vi_cheight;
     if (fontsize < 14) {
 	fontsize = 8;
-	if (!(fonts_loaded & FONT_8))
+#ifndef SC_NO_FONT_LOADING
+	if (!(scp->sc->fonts_loaded & FONT_8))
 	    return EINVAL;
+	font = scp->sc->font_8;
+#else
+	font = NULL;
+#endif
     } else if (fontsize >= 16) {
 	fontsize = 16;
-	if (!(fonts_loaded & FONT_16))
+#ifndef SC_NO_FONT_LOADING
+	if (!(scp->sc->fonts_loaded & FONT_16))
 	    return EINVAL;
+	font = scp->sc->font_16;
+#else
+	font = NULL;
+#endif
     } else {
 	fontsize = 14;
-	if (!(fonts_loaded & FONT_14))
+#ifndef SC_NO_FONT_LOADING
+	if (!(scp->sc->fonts_loaded & FONT_14))
 	    return EINVAL;
+	font = scp->sc->font_14;
+#else
+	font = NULL;
+#endif
     }
     if (xsize <= 0)
 	xsize = info.vi_width/8;
@@ -254,8 +358,8 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize,
     if (scp->scr_buf != NULL) {
 	printf("set_pixel_mode(): mode:%x, col:%d, row:%d, font:%d\n",
 	       scp->mode, xsize, ysize, fontsize);
-	printf("set_pixel_mode(): window:%x, %dx%d, xoff:%d, yoff:%d\n",
-	       scp->adp->va_window, info.vi_width, info.vi_height, 
+	printf("set_pixel_mode(): window:%p, %dx%d, xoff:%d, yoff:%d\n",
+	       (void *)scp->sc->adp->va_window, info.vi_width, info.vi_height, 
 	       (info.vi_width/8 - xsize)/2,
 	       (info.vi_height/fontsize - ysize)/2);
     }
@@ -283,29 +387,37 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize,
 	return error;
     }
 
+    rndr = sc_render_match(scp, scp->sc->adp, PIXEL_MODE);
+    if (rndr == NULL) {
+	splx(s);
+	return ENODEV;
+    }
+
     /* set up scp */
-    if (scp->history != NULL)
-	i = imax(scp->history_size / scp->xsize 
-		 - imax(sc_history_size, scp->ysize), 0);
-    else
-	i = 0;
     scp->status |= (UNKNOWN_MODE | PIXEL_MODE);
-    scp->status &= ~(GRAPHICS_MODE | MOUSE_ENABLED);
+    scp->status &= ~GRAPHICS_MODE;
     scp->xsize = xsize;
     scp->ysize = ysize;
-    scp->font_size = fontsize;
     scp->xoff = (scp->xpixel/8 - xsize)/2;
     scp->yoff = (scp->ypixel/fontsize - ysize)/2;
+    scp->font = font;
+    scp->font_size = fontsize;
 
     /* allocate buffers */
     sc_alloc_scr_buffer(scp, TRUE, TRUE);
-    if (ISMOUSEAVAIL(scp->adp->va_flags))
-	sc_alloc_cut_buffer(scp, FALSE);
-    sc_alloc_history_buffer(scp, sc_history_size, i, FALSE);
+#ifndef SC_NO_CUTPASTE
+    sc_alloc_cut_buffer(scp, FALSE);
+#endif
+#ifndef SC_NO_HISTORY
+    sc_alloc_history_buffer(scp, 0, FALSE);
+#endif
+    scp->rndr = rndr;
     splx(s);
 
-    if (scp == cur_console)
+    if (scp == scp->sc->cur_scp) {
 	set_border(scp, scp->border);
+	sc_set_cursor_image(scp);
+    }
 
     scp->status &= ~UNKNOWN_MODE;
 
@@ -323,99 +435,182 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize,
     }
 
     return 0;
+#endif /* SC_PIXEL_MODE */
+}
+
+sc_rndr_sw_t
+*sc_render_match(scr_stat *scp, video_adapter_t *adp, int mode)
+{
+    const sc_renderer_t **list;
+    const sc_renderer_t *p;
+
+    list = (const sc_renderer_t **)scrndr_set.ls_items;
+    while ((p = *list++) != NULL) {
+	if ((strcmp(p->name, adp->va_name) == 0)
+	    && (mode == p->mode)) {
+	    scp->status &= ~(VR_CURSOR_ON | VR_CURSOR_BLINK);
+	    return p->rndrsw;
+	}
+    }
+
+    return NULL;
 }
 
+#define fb_ioctl(a, c, d)		\
+	(((a) == NULL) ? ENODEV : 	\
+			 (*vidsw[(a)->va_index]->ioctl)((a), (c), (caddr_t)(d)))
+
 int
 sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
     scr_stat *scp;
+    video_adapter_t *adp;
+    video_info_t info;
+    video_adapter_info_t adp_info;
     int error;
     int s;
 
     scp = sc_get_scr_stat(tp->t_dev);
+    if (scp == NULL)		/* tp == SC_MOUSE */
+	return ENOIOCTL;
+    adp = scp->sc->adp;
+    if (adp == NULL)		/* shouldn't happen??? */
+	return ENODEV;
 
     switch (cmd) {
 
-    case CONS_CURRENT:  	/* get current adapter type */
-	if (scp->adp == NULL)
-	    return ENODEV;
-	*(int *)data = scp->adp->va_type;
-	return 0;
-
     case CONS_CURRENTADP:	/* get current adapter index */
-	*(int *)data = scp->ad;
-	return 0;
+    case FBIO_ADAPTER:
+	return fb_ioctl(adp, FBIO_ADAPTER, data);
 
-    case OLD_CONS_ADPINFO:	/* adapter information */
-	if (scp->adp == NULL)
-	    return ENODEV;
-	((old_video_adapter_t *)data)->va_index = scp->adp->va_index;
-	((old_video_adapter_t *)data)->va_type = scp->adp->va_type;
-	((old_video_adapter_t *)data)->va_flags = scp->adp->va_flags;
-	((old_video_adapter_t *)data)->va_crtc_addr = scp->adp->va_crtc_addr;
-	((old_video_adapter_t *)data)->va_window = scp->adp->va_window;
-	((old_video_adapter_t *)data)->va_window_size
-	    = scp->adp->va_window_size;
-	((old_video_adapter_t *)data)->va_window_gran
-	    = scp->adp->va_window_gran;
-	((old_video_adapter_t *)data)->va_buffer = scp->adp->va_buffer;
-	((old_video_adapter_t *)data)->va_buffer_size
-	    = scp->adp->va_buffer_size;
-	((old_video_adapter_t *)data)->va_mode = scp->adp->va_mode;
-	((old_video_adapter_t *)data)->va_initial_mode
-	    = scp->adp->va_initial_mode;
+    case CONS_CURRENT:  	/* get current adapter type */
+    case FBIO_ADPTYPE:
+	return fb_ioctl(adp, FBIO_ADPTYPE, data);
+
+    case OLD_CONS_ADPINFO:	/* adapter information (old interface) */
+	if (((old_video_adapter_t *)data)->va_index >= 0) {
+	    adp = vid_get_adapter(((old_video_adapter_t *)data)->va_index);
+	    if (adp == NULL)
+		return ENODEV;
+	}
+	((old_video_adapter_t *)data)->va_index = adp->va_index;
+	((old_video_adapter_t *)data)->va_type = adp->va_type;
+	((old_video_adapter_t *)data)->va_flags = adp->va_flags;
+	((old_video_adapter_t *)data)->va_crtc_addr = adp->va_crtc_addr;
+	((old_video_adapter_t *)data)->va_window = adp->va_window;
+	((old_video_adapter_t *)data)->va_window_size = adp->va_window_size;
+	((old_video_adapter_t *)data)->va_window_gran = adp->va_window_gran;
+	((old_video_adapter_t *)data)->va_buffer = adp->va_buffer;
+	((old_video_adapter_t *)data)->va_buffer_size = adp->va_buffer_size;
+	((old_video_adapter_t *)data)->va_mode = adp->va_mode;
+	((old_video_adapter_t *)data)->va_initial_mode = adp->va_initial_mode;
 	((old_video_adapter_t *)data)->va_initial_bios_mode
-	    = scp->adp->va_initial_bios_mode;
+	    = adp->va_initial_bios_mode;
 	return 0;
 
+    case OLD_CONS_ADPINFO2:	/* adapter information (yet another old I/F) */
+	adp_info.va_index = ((old_video_adapter_info_t *)data)->va_index;
+	if (adp_info.va_index >= 0) {
+	    adp = vid_get_adapter(adp_info.va_index);
+	    if (adp == NULL)
+		return ENODEV;
+	}
+	error = fb_ioctl(adp, FBIO_ADPINFO, &adp_info);
+	if (error == 0)
+	    bcopy(&adp_info, data, sizeof(old_video_adapter_info_t));
+	return error;
+
     case CONS_ADPINFO:		/* adapter information */
-	if (scp->adp == NULL)
-	    return ENODEV;
-	((video_adapter_info_t *)data)->va_index = scp->adp->va_index;
-	((video_adapter_info_t *)data)->va_type = scp->adp->va_type;
-	bcopy(scp->adp->va_name, ((video_adapter_info_t *)data)->va_name,
-	      imin(strlen(scp->adp->va_name) + 1,
-		   sizeof(((video_adapter_info_t *)data)->va_name))); 
-	((video_adapter_info_t *)data)->va_unit = scp->adp->va_unit;
-	((video_adapter_info_t *)data)->va_flags = scp->adp->va_flags;
-	((video_adapter_info_t *)data)->va_io_base = scp->adp->va_io_base;
-	((video_adapter_info_t *)data)->va_io_size = scp->adp->va_io_size;
-	((video_adapter_info_t *)data)->va_crtc_addr = scp->adp->va_crtc_addr;
-	((video_adapter_info_t *)data)->va_mem_base = scp->adp->va_mem_base;
-	((video_adapter_info_t *)data)->va_mem_size = scp->adp->va_mem_size;
-	((video_adapter_info_t *)data)->va_window = scp->adp->va_window;
-	((video_adapter_info_t *)data)->va_window_size
-	    = scp->adp->va_window_size;
-	((video_adapter_info_t *)data)->va_window_gran
-	    = scp->adp->va_window_gran;
-	((video_adapter_info_t *)data)->va_buffer = scp->adp->va_buffer;
-	((video_adapter_info_t *)data)->va_buffer_size
-	    = scp->adp->va_buffer_size;
-	((video_adapter_info_t *)data)->va_mode = scp->adp->va_mode;
-	((video_adapter_info_t *)data)->va_initial_mode
-	    = scp->adp->va_initial_mode;
-	((video_adapter_info_t *)data)->va_initial_bios_mode
-	    = scp->adp->va_initial_bios_mode;
-	((video_adapter_info_t *)data)->va_line_width = scp->adp->va_line_width;
-	return 0;
+    case FBIO_ADPINFO:
+	if (((video_adapter_info_t *)data)->va_index >= 0) {
+	    adp = vid_get_adapter(((video_adapter_info_t *)data)->va_index);
+	    if (adp == NULL)
+		return ENODEV;
+	}
+	return fb_ioctl(adp, FBIO_ADPINFO, data);
 
     case CONS_GET:      	/* get current video mode */
+    case FBIO_GETMODE:
 	*(int *)data = scp->mode;
 	return 0;
 
+#ifndef SC_NO_MODE_CHANGE
+    case FBIO_SETMODE:		/* set video mode */
+	if (!(adp->va_flags & V_ADP_MODECHANGE))
+ 	    return ENODEV;
+	info.vi_mode = *(int *)data;
+	error = fb_ioctl(adp, FBIO_MODEINFO, &info);
+	if (error)
+	    return error;
+	if (info.vi_flags & V_INFO_GRAPHICS)
+	    return sc_set_graphics_mode(scp, tp, *(int *)data);
+	else
+	    return sc_set_text_mode(scp, tp, *(int *)data, 0, 0, 0);
+#endif /* SC_NO_MODE_CHANGE */
+
+    case OLD_CONS_MODEINFO:	/* get mode information (old infterface) */
+	info.vi_mode = ((old_video_info_t *)data)->vi_mode;
+	error = fb_ioctl(adp, FBIO_MODEINFO, &info);
+	if (error == 0)
+	    bcopy(&info, (old_video_info_t *)data, sizeof(old_video_info_t));
+	return error;
+
     case CONS_MODEINFO:		/* get mode information */
-	return ((*vidsw[scp->ad]->get_info)(scp->adp, 
-		    ((video_info_t *)data)->vi_mode, (video_info_t *)data) 
-		? ENODEV : 0);
+    case FBIO_MODEINFO:
+	return fb_ioctl(adp, FBIO_MODEINFO, data);
+
+    case OLD_CONS_FINDMODE:	/* find a matching video mode (old interface) */
+	bzero(&info, sizeof(info));
+	bcopy((old_video_info_t *)data, &info, sizeof(old_video_info_t));
+	error = fb_ioctl(adp, FBIO_FINDMODE, &info);
+	if (error == 0)
+	    bcopy(&info, (old_video_info_t *)data, sizeof(old_video_info_t));
+	return error;
 
     case CONS_FINDMODE:		/* find a matching video mode */
-	return ((*vidsw[scp->ad]->query_mode)(scp->adp, (video_info_t *)data) 
-		? ENODEV : 0);
-
-    case CONS_SETWINORG:
-	return ((*vidsw[scp->ad]->set_win_org)(scp->adp, *(u_int *)data) 
-		   ? ENODEV : 0);
+    case FBIO_FINDMODE:
+	return fb_ioctl(adp, FBIO_FINDMODE, data);
+
+    case CONS_SETWINORG:	/* set frame buffer window origin */
+    case FBIO_SETWINORG:
+	if (scp != scp->sc->cur_scp)
+	    return ENODEV;	/* XXX */
+	return fb_ioctl(adp, FBIO_SETWINORG, data);
+
+    case FBIO_GETWINORG:	/* get frame buffer window origin */
+	if (scp != scp->sc->cur_scp)
+	    return ENODEV;	/* XXX */
+	return fb_ioctl(adp, FBIO_GETWINORG, data);
+
+    case FBIO_GETDISPSTART:
+    case FBIO_SETDISPSTART:
+    case FBIO_GETLINEWIDTH:
+    case FBIO_SETLINEWIDTH:
+	if (scp != scp->sc->cur_scp)
+	    return ENODEV;	/* XXX */
+	return fb_ioctl(adp, cmd, data);
+
+    /* XXX */
+    case FBIO_GETPALETTE:
+    case FBIO_SETPALETTE:
+    case FBIOPUTCMAP:
+    case FBIOGETCMAP:
+	return ENODEV;
 
+    case FBIOGTYPE:
+    case FBIOGATTR:
+    case FBIOSVIDEO:
+    case FBIOGVIDEO:
+    case FBIOSCURSOR:
+    case FBIOGCURSOR:
+    case FBIOSCURPOS:
+    case FBIOGCURPOS:
+    case FBIOGCURMAX:
+	if (scp != scp->sc->cur_scp)
+	    return ENODEV;	/* XXX */
+	return fb_ioctl(adp, cmd, data);
+
+#ifndef SC_NO_MODE_CHANGE
     /* generic text modes */
     case SW_TEXT_80x25:	case SW_TEXT_80x30:
     case SW_TEXT_80x43: case SW_TEXT_80x50:
@@ -428,6 +623,11 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
     case SW_VGA_C80x30: case SW_VGA_M80x30:
     case SW_VGA_C80x50: case SW_VGA_M80x50:
     case SW_VGA_C80x60: case SW_VGA_M80x60:
+    case SW_VGA_C90x25: case SW_VGA_M90x25:
+    case SW_VGA_C90x30: case SW_VGA_M90x30:
+    case SW_VGA_C90x43: case SW_VGA_M90x43:
+    case SW_VGA_C90x50: case SW_VGA_M90x50:
+    case SW_VGA_C90x60: case SW_VGA_M90x60:
     case SW_B40x25:     case SW_C40x25:
     case SW_B80x25:     case SW_C80x25:
     case SW_ENH_B40x25: case SW_ENH_C40x25:
@@ -440,7 +640,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
     case SW_PC98_80x25:
     case SW_PC98_80x30:
 #endif
-	if (!(scp->adp->va_flags & V_ADP_MODECHANGE))
+	if (!(adp->va_flags & V_ADP_MODECHANGE))
  	    return ENODEV;
 	return sc_set_text_mode(scp, tp, cmd & 0xff, 0, 0, 0);
 
@@ -450,9 +650,10 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
     case SW_CG640x350: case SW_ENH_CG640:
     case SW_BG640x480: case SW_CG640x480: case SW_VGA_CG320:
     case SW_VGA_MODEX:
-	if (!(scp->adp->va_flags & V_ADP_MODECHANGE))
+	if (!(adp->va_flags & V_ADP_MODECHANGE))
 	    return ENODEV;
 	return sc_set_graphics_mode(scp, tp, cmd & 0xff);
+#endif /* SC_NO_MODE_CHANGE */
 
     case KDSETMODE:     	/* set current mode of this (virtual) console */
 	switch (*(int *)data) {
@@ -465,24 +666,31 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 		return EINVAL;
 	    /* restore fonts & palette ! */
 #if 0
-	    if (ISFONTAVAIL(scp->adp->va_flags) 
+#ifndef SC_NO_FONT_LOADING
+	    if (ISFONTAVAIL(adp->va_flags) 
 		&& !(scp->status & (GRAPHICS_MODE | PIXEL_MODE)))
 		/*
 		 * FONT KLUDGE
 		 * Don't load fonts for now... XXX
 		 */
-		if (fonts_loaded & FONT_8)
-		    copy_font(scp, LOAD, 8, font_8);
-		if (fonts_loaded & FONT_14)
-		    copy_font(scp, LOAD, 14, font_14);
-		if (fonts_loaded & FONT_16)
-		    copy_font(scp, LOAD, 16, font_16);
+		if (scp->sc->fonts_loaded & FONT_8)
+		    copy_font(scp, LOAD, 8, scp->sc->font_8);
+		if (scp->sc->fonts_loaded & FONT_14)
+		    copy_font(scp, LOAD, 14, scp->sc->font_14);
+		if (scp->sc->fonts_loaded & FONT_16)
+		    copy_font(scp, LOAD, 16, scp->sc->font_16);
 	    }
+#endif /* SC_NO_FONT_LOADING */
 #endif
-	    load_palette(scp->adp, palette);
 
+#ifndef SC_NO_PALETTE_LOADING
+	    load_palette(adp, scp->sc->palette);
+#endif
+
+#ifndef PC98
 	    /* move hardware cursor out of the way */
-	    (*vidsw[scp->ad]->set_hw_cursor)(scp->adp, -1, -1);
+	    (*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
+#endif
 
 	    /* FALL THROUGH */
 
@@ -502,20 +710,21 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    scp->status |= UNKNOWN_MODE;
 	    splx(s);
 	    /* no restore fonts & palette */
-	    if (scp == cur_console)
+	    if (scp == scp->sc->cur_scp)
 		set_mode(scp);
 	    sc_clear_screen(scp);
 	    scp->status &= ~UNKNOWN_MODE;
 #else /* PC98 */
 	    scp->status &= ~UNKNOWN_MODE;
 	    /* no restore fonts & palette */
-	    if (scp == cur_console)
+	    if (scp == scp->sc->cur_scp)
 		set_mode(scp);
 	    sc_clear_screen(scp);
 	    splx(s);
 #endif /* PC98 */
 	    return 0;
 
+#ifdef SC_PIXEL_MODE
 	case KD_PIXEL:		/* pixel (raster) display */
 	    if (!(scp->status & (GRAPHICS_MODE | PIXEL_MODE)))
 		return EINVAL;
@@ -529,13 +738,16 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    }
 	    scp->status |= (UNKNOWN_MODE | PIXEL_MODE);
 	    splx(s);
-	    if (scp == cur_console) {
+	    if (scp == scp->sc->cur_scp) {
 		set_mode(scp);
-		load_palette(scp->adp, palette);
+#ifndef SC_NO_PALETTE_LOADING
+		load_palette(adp, scp->sc->palette);
+#endif
 	    }
 	    sc_clear_screen(scp);
 	    scp->status &= ~UNKNOWN_MODE;
 	    return 0;
+#endif /* SC_PIXEL_MODE */
 
 	case KD_GRAPHICS:	/* switch to GRAPHICS (unknown) mode */
 	    s = spltty();
@@ -546,7 +758,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    scp->status |= UNKNOWN_MODE;
 	    splx(s);
 #ifdef PC98
-	    if (scp == cur_console)
+	    if (scp == scp->sc->cur_scp)
 		set_mode(scp);
 #endif
 	    return 0;
@@ -556,11 +768,13 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 	}
 	/* NOT REACHED */
 
+#ifdef SC_PIXEL_MODE
     case KDRASTER:		/* set pixel (raster) display mode */
 	if (ISUNKNOWNSC(scp) || ISTEXTSC(scp))
 	    return ENODEV;
 	return sc_set_pixel_mode(scp, tp, ((int *)data)[0], ((int *)data)[1], 
 				 ((int *)data)[2]);
+#endif /* SC_PIXEL_MODE */
 
     case KDGETMODE:     	/* get current mode of this (virtual) console */
 	/* 
@@ -572,7 +786,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 
     case KDSBORDER:     	/* set border color of this (virtual) console */
 	scp->border = *data;
-	if (scp == cur_console)
+	if (scp == scp->sc->cur_scp)
 	    set_border(scp, scp->border);
 	return 0;
     }
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
new file mode 100644
index 000000000000..a7d1a71efed8
--- /dev/null
+++ b/sys/dev/syscons/scvtb.c
@@ -0,0 +1,283 @@
+/*-
+ * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id:$
+ */
+
+#include "sc.h"
+#include "opt_syscons.h"
+
+#if NSC > 0
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+
+#include <machine/console.h>
+#include <machine/md_var.h>
+
+#include <dev/fb/fbreg.h>
+#include <dev/syscons/syscons.h>
+
+#define vtb_wrap(vtb, at, offset)				\
+    (((at) + (offset) + (vtb)->vtb_size)%(vtb)->vtb_size)
+
+void
+sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait)
+{
+	vtb->vtb_flags = 0;
+	vtb->vtb_type = type;
+	vtb->vtb_cols = cols;
+	vtb->vtb_rows = rows;
+	vtb->vtb_size = cols*rows;
+	vtb->vtb_buffer = NULL;
+	vtb->vtb_tail = 0;
+
+	switch (type) {
+	case VTB_MEMORY:
+	case VTB_RINGBUFFER:
+		if ((buf == NULL) && (cols*rows != 0)) {
+			vtb->vtb_buffer =
+				(vm_offset_t)malloc(cols*rows*sizeof(u_int16_t),
+						    M_DEVBUF, 
+						    (wait) ? M_WAITOK : M_NOWAIT);
+			if (vtb->vtb_buffer != NULL)
+				bzero((void *)sc_vtb_pointer(vtb, 0),
+				      cols*rows*sizeof(u_int16_t));
+		} else {
+			vtb->vtb_buffer = (vm_offset_t)buf;
+		}
+		vtb->vtb_flags |= VTB_VALID;
+		break;
+	case VTB_FRAMEBUFFER:
+		vtb->vtb_buffer = (vm_offset_t)buf;
+		vtb->vtb_flags |= VTB_VALID;
+		break;
+	default:
+		break;
+	}
+}
+
+void
+sc_vtb_destroy(sc_vtb_t *vtb)
+{
+	vm_offset_t p;
+
+	vtb->vtb_flags = 0;
+	vtb->vtb_cols = 0;
+	vtb->vtb_rows = 0;
+	vtb->vtb_size = 0;
+	vtb->vtb_tail = 0;
+
+	p = vtb->vtb_buffer;
+	vtb->vtb_buffer = NULL;
+	switch (vtb->vtb_type) {
+	case VTB_MEMORY:
+	case VTB_RINGBUFFER:
+		if (p != NULL)
+			free((void *)p, M_DEVBUF);
+		break;
+	default:
+		break;
+	}
+	vtb->vtb_type = VTB_INVALID;
+}
+
+size_t
+sc_vtb_size(int cols, int rows)
+{
+	return (size_t)(cols*rows*sizeof(u_int16_t));
+}
+
+int
+sc_vtb_getc(sc_vtb_t *vtb, int at)
+{
+	if (vtb->vtb_type == VTB_FRAMEBUFFER)
+		return (readw(sc_vtb_pointer(vtb, at)) & 0x00ff);
+	else
+		return (*(u_int16_t *)sc_vtb_pointer(vtb, at) & 0x00ff);
+}
+
+int
+sc_vtb_geta(sc_vtb_t *vtb, int at)
+{
+	if (vtb->vtb_type == VTB_FRAMEBUFFER)
+		return (readw(sc_vtb_pointer(vtb, at)) & 0xff00);
+	else
+		return (*(u_int16_t *)sc_vtb_pointer(vtb, at) & 0xff00);
+}
+
+void
+sc_vtb_putc(sc_vtb_t *vtb, int at, int c, int a)
+{
+	if (vtb->vtb_type == VTB_FRAMEBUFFER)
+		writew(sc_vtb_pointer(vtb, at), a | c);
+	else
+		*(u_int16_t *)sc_vtb_pointer(vtb, at) = a | c;
+}
+
+vm_offset_t
+sc_vtb_putchar(sc_vtb_t *vtb, vm_offset_t p, int c, int a)
+{
+	if (vtb->vtb_type == VTB_FRAMEBUFFER)
+		writew(p, a | c);
+	else
+		*(u_int16_t *)p = a | c;
+	return (p + sizeof(u_int16_t));
+}
+
+vm_offset_t
+sc_vtb_pointer(sc_vtb_t *vtb, int at)
+{
+	return (vtb->vtb_buffer + sizeof(u_int16_t)*(at));
+}
+
+int
+sc_vtb_pos(sc_vtb_t *vtb, int pos, int offset)
+{
+	return ((pos + offset + vtb->vtb_size)%vtb->vtb_size);
+}
+
+void
+sc_vtb_clear(sc_vtb_t *vtb, int c, int attr)
+{
+	if (vtb->vtb_type == VTB_FRAMEBUFFER)
+		fillw_io(attr | c, sc_vtb_pointer(vtb, 0), vtb->vtb_size);
+	else
+		fillw(attr | c, (void *)sc_vtb_pointer(vtb, 0), vtb->vtb_size);
+}
+
+void
+sc_vtb_copy(sc_vtb_t *vtb1, int from, sc_vtb_t *vtb2, int to, int count)
+{
+	/* XXX if both are VTB_VRAMEBUFFER... */
+	if (vtb2->vtb_type == VTB_FRAMEBUFFER) {
+		bcopy_toio(sc_vtb_pointer(vtb1, from),
+			   sc_vtb_pointer(vtb2, to),
+			   count*sizeof(u_int16_t));
+	} else if (vtb1->vtb_type == VTB_FRAMEBUFFER) {
+		bcopy_fromio(sc_vtb_pointer(vtb1, from),
+			     sc_vtb_pointer(vtb2, to),
+			     count*sizeof(u_int16_t));
+	} else {
+		bcopy((void *)sc_vtb_pointer(vtb1, from),
+		      (void *)sc_vtb_pointer(vtb2, to),
+		      count*sizeof(u_int16_t));
+	}
+}
+
+void
+sc_vtb_append(sc_vtb_t *vtb1, int from, sc_vtb_t *vtb2, int count)
+{
+	int len;
+
+	if (vtb2->vtb_type != VTB_RINGBUFFER)
+		return;
+
+	while (count > 0) {
+		len = imin(count, vtb2->vtb_size - vtb2->vtb_tail);
+		if (vtb1->vtb_type == VTB_FRAMEBUFFER) {
+			bcopy_fromio(sc_vtb_pointer(vtb1, from),
+				     sc_vtb_pointer(vtb2, vtb2->vtb_tail),
+				     len*sizeof(u_int16_t));
+		} else {
+			bcopy((void *)sc_vtb_pointer(vtb1, from),
+			      (void *)sc_vtb_pointer(vtb2, vtb2->vtb_tail),
+			      len*sizeof(u_int16_t));
+		}
+		from += len;
+		count -= len;
+		vtb2->vtb_tail = vtb_wrap(vtb2, vtb2->vtb_tail, len);
+	}
+}
+
+void
+sc_vtb_seek(sc_vtb_t *vtb, int pos)
+{
+	vtb->vtb_tail = pos%vtb->vtb_size;
+}
+
+void
+sc_vtb_erase(sc_vtb_t *vtb, int at, int count, int c, int attr)
+{
+	if (at + count > vtb->vtb_size)
+		count = vtb->vtb_size - at;
+	if (vtb->vtb_type == VTB_FRAMEBUFFER)
+		fillw_io(attr | c, sc_vtb_pointer(vtb, at), count);
+	else
+		fillw(attr | c, (void *)sc_vtb_pointer(vtb, at), count);
+}
+
+void
+sc_vtb_delete(sc_vtb_t *vtb, int at, int count, int c, int attr)
+{
+	int len;
+
+	if (at + count > vtb->vtb_size)
+		count = vtb->vtb_size - at;
+	len = vtb->vtb_size - at - count;
+	if (len > 0) {
+		if (vtb->vtb_type == VTB_FRAMEBUFFER) {
+			bcopy_io(sc_vtb_pointer(vtb, at + count),
+				 sc_vtb_pointer(vtb, at),
+				 len*sizeof(u_int16_t)); 
+		} else {
+			bcopy((void *)sc_vtb_pointer(vtb, at + count),
+			      (void *)sc_vtb_pointer(vtb, at),
+			      len*sizeof(u_int16_t)); 
+		}
+	}
+	if (vtb->vtb_type == VTB_FRAMEBUFFER)
+		fillw_io(attr | c, sc_vtb_pointer(vtb, at + len),
+			 vtb->vtb_size - at - len);
+	else
+		fillw(attr | c, (void *)sc_vtb_pointer(vtb, at + len),
+		      vtb->vtb_size - at - len);
+}
+
+void
+sc_vtb_ins(sc_vtb_t *vtb, int at, int count, int c, int attr)
+{
+	if (at + count > vtb->vtb_size) {
+		count = vtb->vtb_size - at;
+	} else {
+		if (vtb->vtb_type == VTB_FRAMEBUFFER) {
+			bcopy_io(sc_vtb_pointer(vtb, at),
+				 sc_vtb_pointer(vtb, at + count),
+				 (vtb->vtb_size - at - count)*sizeof(u_int16_t)); 
+		} else {
+			bcopy((void *)sc_vtb_pointer(vtb, at),
+			      (void *)sc_vtb_pointer(vtb, at + count),
+			      (vtb->vtb_size - at - count)*sizeof(u_int16_t)); 
+		}
+	}
+	if (vtb->vtb_type == VTB_FRAMEBUFFER)
+		fillw_io(attr | c, sc_vtb_pointer(vtb, at), count);
+	else
+		fillw(attr | c, (void *)sc_vtb_pointer(vtb, at), count);
+}
+
+#endif /* NSC */
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index ef64741942ea..51e1746f5f9d 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.22 1999/01/17 14:25:19 yokota Exp $
+ *	$Id: snake_saver.c,v 1.23 1999/02/05 12:40:15 des Exp $
  */
 
 #include <sys/param.h>
@@ -34,16 +34,18 @@
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <machine/md_var.h>
 #include <machine/pc/display.h>
 
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 static char	*message;
-static u_char	**messagep;
+static int	*messagep;
 static int	messagelen;
-static u_short	*window;
 static int	blanked;
 
 static int
@@ -51,36 +53,50 @@ snake_saver(video_adapter_t *adp, int blank)
 {
 	static int	dirx, diry;
 	int		f;
-	scr_stat	*scp = cur_console;
+	sc_softc_t	*sc;
+	scr_stat	*scp;
 
 /* XXX hack for minimal changes. */
 #define	save	message
 #define	savs	messagep
 
+	sc = sc_find_softc(adp, NULL);
+	if (sc == NULL)
+		return EAGAIN;
+	scp = sc->cur_scp;
+
 	if (blank) {
 		if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
 			return EAGAIN;
 		if (blanked <= 0) {
-			window = (u_short *)adp->va_window;
-			fillw(((FG_LIGHTGREY|BG_BLACK)<<8) | scr_map[0x20],
-			      window, scp->xsize * scp->ysize);
+#ifdef PC98
+			if (epson_machine_id == 0x20) {
+				outb(0x43f, 0x42);
+				outb(0x0c17, inb(0xc17) & ~0x08);
+				outb(0x43f, 0x40);
+			}
+#endif /* PC98 */
+			sc_vtb_clear(&scp->scr, sc->scr_map[0x20],
+				     (FG_LIGHTGREY | BG_BLACK) << 8);
+			(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
 			set_border(scp, 0);
 			dirx = (scp->xpos ? 1 : -1);
 			diry = (scp->ypos ?
 				scp->xsize : -scp->xsize);
 			for (f=0; f< messagelen; f++)
-				savs[f] = (u_char *)window + 2 *
-					  (scp->xpos+scp->ypos*scp->xsize);
-			*(savs[0]) = scr_map[*save];
+				savs[f] = scp->xpos + scp->ypos*scp->xsize;
+			sc_vtb_putc(&scp->scr, savs[0], sc->scr_map[*save],
+				    (FG_LIGHTGREY | BG_BLACK) << 8);
 			blanked = 1;
 		}
 		if (blanked++ < 4)
 			return 0;
 		blanked = 1;
-		*(savs[messagelen-1]) = scr_map[0x20];
+		sc_vtb_putc(&scp->scr, savs[messagelen - 1], sc->scr_map[0x20],
+			    (FG_LIGHTGREY | BG_BLACK) << 8);
 		for (f=messagelen-1; f > 0; f--)
 			savs[f] = savs[f-1];
-		f = (savs[0] - (u_char *)window) / 2;
+		f = savs[0];
 		if ((f % scp->xsize) == 0 ||
 		    (f % scp->xsize) == scp->xsize - 1 ||
 		    (random() % 50) == 0)
@@ -89,11 +105,19 @@ snake_saver(video_adapter_t *adp, int blank)
 		    (f / scp->xsize) == scp->ysize - 1 ||
 		    (random() % 20) == 0)
 			diry = -diry;
-		savs[0] += 2*dirx + 2*diry;
+		savs[0] += dirx + diry;
 		for (f=messagelen-1; f>=0; f--)
-			*(savs[f]) = scr_map[save[f]];
+			sc_vtb_putc(&scp->scr, savs[f], sc->scr_map[save[f]],
+				    (FG_LIGHTGREY | BG_BLACK) << 8);
 	}
 	else {
+#ifdef PC98
+		if (epson_machine_id == 0x20) {
+			outb(0x43f, 0x42);
+			outb(0x0c17, inb(0xc17) | 0x08);
+			outb(0x43f, 0x40);
+		}
+#endif /* PC98 */
 		blanked = 0;
 	}
 	return 0;
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index aaa23fbde073..56408dc78cee 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -25,22 +25,24 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.19 1999/01/17 14:25:19 yokota Exp $
+ *	$Id: star_saver.c,v 1.20 1999/02/05 12:40:16 des Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <machine/md_var.h>
 #include <machine/pc/display.h>
 
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 #define NUM_STARS	50
 
-static u_short *window;
 static int blanked;
 
 /*
@@ -50,21 +52,39 @@ static int blanked;
 static int
 star_saver(video_adapter_t *adp, int blank)
 {
-	scr_stat	*scp = cur_console;
+	sc_softc_t	*sc;
+	scr_stat	*scp;
 	int		cell, i;
 	char 		pattern[] = {"...........++++***   "};
+#ifndef PC98
 	char		colors[] = {FG_DARKGREY, FG_LIGHTGREY,
 				    FG_WHITE, FG_LIGHTCYAN};
+#else
+	char		colors[] = {FG_BLUE, FG_LIGHTGREY,
+				    FG_LIGHTGREY, FG_CYAN};
+#endif /* PC98 */
 	static u_short 	stars[NUM_STARS][2];
 
+	sc = sc_find_softc(adp, NULL);
+	if (sc == NULL)
+		return EAGAIN;
+	scp = sc->cur_scp;
+
 	if (blank) {
 		if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
 			return EAGAIN;
 		if (!blanked) {
-			window = (u_short *)adp->va_window;
+#ifdef PC98
+			if (epson_machine_id == 0x20) {
+				outb(0x43f, 0x42);
+				outb(0x0c17, inb(0xc17) & ~0x08);
+				outb(0x43f, 0x40);
+			}
+#endif /* PC98 */
 			/* clear the screen and set the border color */
-			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
-			      window, scp->xsize * scp->ysize);
+			sc_vtb_clear(&scp->scr, sc->scr_map[0x20],
+				     (FG_LIGHTGREY | BG_BLACK) << 8);
+			(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
 			set_border(scp, 0);
 			blanked = TRUE;
 			for(i=0; i<NUM_STARS; i++) {
@@ -74,15 +94,22 @@ star_saver(video_adapter_t *adp, int blank)
 			}
 		}
 		cell = random() % NUM_STARS;
-		*((u_short*)(window + stars[cell][0])) =
-			scr_map[pattern[stars[cell][1]]] |
-				colors[random()%sizeof(colors)] << 8;
+		sc_vtb_putc(&scp->scr, stars[cell][0], 
+			    sc->scr_map[pattern[stars[cell][1]]],
+			    colors[random()%sizeof(colors)] << 8);
 		if ((stars[cell][1]+=(random()%4)) >= sizeof(pattern)-1) {
 			stars[cell][0] = random() % (scp->xsize*scp->ysize);
 			stars[cell][1] = 0;
 		}
 	}
 	else {
+#ifdef PC98
+		if (epson_machine_id == 0x20) {
+			outb(0x43f, 0x42);
+			outb(0x0c17, inb(0xc17) | 0x08);
+			outb(0x43f, 0x40);
+		}
+#endif /* PC98 */
 		blanked = FALSE;
 	}
 	return 0;
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index df527fcf7f8d..937dcbc279f6 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -30,15 +30,12 @@
 
 #include "sc.h"
 #include "splash.h"
-#ifdef __i386__
-#include "apm.h"
-#endif
+#include "opt_syscons.h"
 #include "opt_ddb.h"
 #include "opt_devfs.h"
 #ifdef __i386__
-#include "opt_vesa.h"
+#include "apm.h"
 #endif
-#include "opt_syscons.h"
 
 #if NSC > 0
 #include <sys/param.h>
@@ -54,308 +51,158 @@
 #include <sys/devfsext.h>
 #endif
 
-#include <machine/bootinfo.h>
 #include <machine/clock.h>
 #include <machine/cons.h>
 #include <machine/console.h>
-#include <machine/mouse.h>
-#include <machine/md_var.h>
 #include <machine/psl.h>
-#include <machine/frame.h>
 #include <machine/pc/display.h>
 #ifdef __i386__
-#include <machine/pc/vesa.h>
 #include <machine/apm_bios.h>
+#include <machine/frame.h>
 #include <machine/random.h>
 #endif
 
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-
 #include <dev/kbd/kbdreg.h>
 #include <dev/fb/fbreg.h>
-#include <dev/fb/vgareg.h>
 #include <dev/fb/splashreg.h>
 #include <dev/syscons/syscons.h>
 
-#ifndef __i386__
-#include <isa/isareg.h>
-#else
-#include <i386/isa/isa.h>
-#include <i386/isa/isa_device.h>
-#include <i386/isa/timerreg.h>
-#endif
-
-#if !defined(MAXCONS)
-#define MAXCONS 16
-#endif
-
-#if !defined(SC_MAX_HISTORY_SIZE)
-#define SC_MAX_HISTORY_SIZE	(1000 * MAXCONS)
-#endif
-
-#if !defined(SC_HISTORY_SIZE)
-#define SC_HISTORY_SIZE		(ROW * 4)
-#endif
-
-#if (SC_HISTORY_SIZE * MAXCONS) > SC_MAX_HISTORY_SIZE
-#undef SC_MAX_HISTORY_SIZE
-#define SC_MAX_HISTORY_SIZE	(SC_HISTORY_SIZE * MAXCONS)
-#endif
-
-#if !defined(SC_MOUSE_CHAR)
-#define SC_MOUSE_CHAR		(0xd0)
-#endif
-
 #define COLD 0
 #define WARM 1
 
 #define DEFAULT_BLANKTIME	(5*60)		/* 5 minutes */
 #define MAX_BLANKTIME		(7*24*60*60)	/* 7 days!? */
 
-/* for backward compatibility */
-#define OLD_CONS_MOUSECTL	_IOWR('c', 10, old_mouse_info_t)
-
-typedef struct old_mouse_data {
-    int x;
-    int y;
-    int buttons;
-} old_mouse_data_t;
-
-typedef struct old_mouse_info {
-    int operation;
-    union {
-	struct old_mouse_data data;
-	struct mouse_mode mode;
-    } u;
-} old_mouse_info_t;
+#define KEYCODE_BS		0x0e		/* "<-- Backspace" key, XXX */
 
 static default_attr user_default = {
-    (FG_LIGHTGREY | BG_BLACK) << 8,
-    (FG_BLACK | BG_LIGHTGREY) << 8
+    SC_NORM_ATTR << 8,
+    SC_NORM_REV_ATTR << 8,
 };
 
 static default_attr kernel_default = {
-    (FG_WHITE | BG_BLACK) << 8,
-    (FG_BLACK | BG_LIGHTGREY) << 8
+    SC_KERNEL_CONS_ATTR << 8,
+    SC_KERNEL_CONS_REV_ATTR << 8,
 };
 
-static  scr_stat    	main_console;
-static  scr_stat    	*console[MAXCONS];
+static	int		sc_console_unit = -1;
+static  scr_stat    	*sc_console;
 #ifdef DEVFS
-static	void		*sc_devfs_token[MAXCONS];
 static	void		*sc_mouse_devfs_token;
 static	void		*sc_console_devfs_token;
 #endif
-	scr_stat    	*cur_console;
-static  scr_stat    	*new_scp, *old_scp;
 static  term_stat   	kernel_console;
 static  default_attr    *current_default;
-static  int		sc_flags;
+
 static  char        	init_done = COLD;
-static  u_short		sc_buffer[ROW*COL];
 static  char		shutdown_in_progress = FALSE;
-static  char        	font_loading_in_progress = FALSE;
-static  char        	switch_in_progress = FALSE;
-static  char        	write_in_progress = FALSE;
-static  char        	blink_in_progress = FALSE;
-static  int        	blinkrate = 0;
-static	int		adapter = -1;
-static	int		keyboard = -1;
-static	keyboard_t	*kbd;
-static  int     	delayed_next_scr = FALSE;
-static  long        	scrn_blank_time = 0;    /* screen saver timeout value */
-static	int     	scrn_blanked = FALSE;	/* screen saver active flag */
-static  long		scrn_time_stamp;
+static	char		sc_malloc = FALSE;
+
 static	int		saver_mode = CONS_LKM_SAVER; /* LKM/user saver */
 static	int		run_scrn_saver = FALSE;	/* should run the saver? */
-static	int		scrn_idle = FALSE;	/* about to run the saver */
-#if NSPLASH > 0
-static	int		scrn_saver_failed;
-#endif
-	u_char      	scr_map[256];
-	u_char      	scr_rmap[256];
-static	int		initial_video_mode;	/* initial video mode # */
-	int     	fonts_loaded = 0
-#ifdef STD8X16FONT
-	| FONT_16
-#endif
-	;
+static	long        	scrn_blank_time = 0;    /* screen saver timeout value */
+static	int     	scrn_blanked;		/* # of blanked screen */
+static	int		sticky_splash = FALSE;
+
+static	void		none_saver(sc_softc_t *sc, int blank) { }
+static	void		(*current_saver)(sc_softc_t *, int) = none_saver;
 
-	u_char		font_8[256*8];
-	u_char		font_14[256*14];
-#ifdef STD8X16FONT
-extern
+#if !defined(SC_NO_FONT_LOADING) && defined(SC_DFLT_FONT)
+#include "font.h"
 #endif
-	u_char		font_16[256*16];
-	u_char        	palette[256*3];
-static	u_char 		*cut_buffer;
-static	int		cut_buffer_size;
-static	int		mouse_level;		/* sysmouse protocol level */
-static	mousestatus_t	mouse_status = { 0, 0, 0, 0, 0, 0 };
-static  u_short 	mouse_and_mask[16] = {
-				0xc000, 0xe000, 0xf000, 0xf800,
-				0xfc00, 0xfe00, 0xff00, 0xff80,
-				0xfe00, 0x1e00, 0x1f00, 0x0f00,
-				0x0f00, 0x0000, 0x0000, 0x0000
-			};
-static  u_short 	mouse_or_mask[16] = {
-				0x0000, 0x4000, 0x6000, 0x7000,
-				0x7800, 0x7c00, 0x7e00, 0x6800,
-				0x0c00, 0x0c00, 0x0600, 0x0600,
-				0x0000, 0x0000, 0x0000, 0x0000
-			};
-
-	int		sc_history_size = SC_HISTORY_SIZE;
-static	int		extra_history_size = 
-			    SC_MAX_HISTORY_SIZE - SC_HISTORY_SIZE * MAXCONS;
-
-static void    		none_saver(int blank) { }
-static void    		(*current_saver)(int blank) = none_saver;
+
 	d_ioctl_t	*sc_user_ioctl;
 
-static int		sticky_splash = FALSE;
-static struct 		{
-			    u_int8_t	cursor_start;
-			    u_int8_t	cursor_end;
-			    u_int8_t	shift_state;
-			} bios_value;
-
-/* OS specific stuff */
-#ifdef not_yet_done
-#define VIRTUAL_TTY(x)  (sccons[x] = ttymalloc(sccons[x]))
-struct  CONSOLE_TTY 	(sccons[MAXCONS] = ttymalloc(sccons[MAXCONS]))
-struct  MOUSE_TTY 	(sccons[MAXCONS+1] = ttymalloc(sccons[MAXCONS+1]))
-struct  tty         	*sccons[MAXCONS+2];
-#else
-#define VIRTUAL_TTY(x)  &sccons[x]
-#define CONSOLE_TTY 	&sccons[MAXCONS]
-#define MOUSE_TTY 	&sccons[MAXCONS+1]
-static struct tty     	sccons[MAXCONS+2];
-#endif
+static	bios_values_t	bios_value;
+
+static struct tty     	sccons[2];
 #define SC_MOUSE 	128
-#define SC_CONSOLE	255
-static const int	nsccons = MAXCONS+2;
-
-#define WRAPHIST(scp, pointer, offset) \
-    ((scp)->history + ((((pointer) - (scp)->history) + (scp)->history_size \
-    + (offset)) % (scp)->history_size))
-#define ISSIGVALID(sig)	((sig) > 0 && (sig) < NSIG)
-
-/* some useful macros */
-#define kbd_read_char(kbd, wait)					\
-		(*kbdsw[(kbd)->kb_index]->read_char)((kbd), (wait))
-#define kbd_check_char(kbd)						\
-		(*kbdsw[(kbd)->kb_index]->check_char)((kbd))
-#define kbd_enable(kbd)							\
-		(*kbdsw[(kbd)->kb_index]->enable)((kbd))
-#define kbd_disable(kbd)						\
-		(*kbdsw[(kbd)->kb_index]->disable)((kbd))
-#define kbd_lock(kbd, lockf)						\
-		(*kbdsw[(kbd)->kb_index]->lock)((kbd), (lockf))
-#define kbd_ioctl(kbd, cmd, arg)					\
-	    (((kbd) == NULL) ?						\
-		ENODEV : (*kbdsw[(kbd)->kb_index]->ioctl)((kbd), (cmd), (arg)))
-#define kbd_clear_state(kbd)						\
-		(*kbdsw[(kbd)->kb_index]->clear_state)((kbd))
-#define kbd_get_fkeystr(kbd, fkey, len)					\
-		(*kbdsw[(kbd)->kb_index]->get_fkeystr)((kbd), (fkey), (len))
-#define kbd_poll(kbd, on)						\
-		(*kbdsw[(kbd)->kb_index]->poll)((kbd), (on))
+#define SC_CONSOLECTL	255
+
+#define VIRTUAL_TTY(sc, x) (&((sc)->tty[(x) - (sc)->first_vty]))
+#define CONSOLE_TTY	(&sccons[0])
+#define MOUSE_TTY	(&sccons[1])
+
+#define debugger	FALSE
+
+#ifdef __i386__
+#ifdef DDB
+extern int		in_Debugger;
+#undef debugger
+#define debugger	in_Debugger
+#endif /* DDB */
+#endif /* __i386__ */
 
 /* prototypes */
-static kbd_callback_func_t sckbdevent;
-static int scparam(struct tty *tp, struct termios *t);
 static int scvidprobe(int unit, int flags, int cons);
 static int sckbdprobe(int unit, int flags, int cons);
+static void scmeminit(void *arg);
+static int scdevtounit(dev_t dev);
+static kbd_callback_func_t sckbdevent;
+static int scparam(struct tty *tp, struct termios *t);
 static void scstart(struct tty *tp);
 static void scmousestart(struct tty *tp);
-static void scinit(void);
+static void scinit(int unit, int flags);
+static void scterm(int unit, int flags);
 static void scshutdown(int howto, void *arg);
-static u_int scgetc(keyboard_t *kbd, u_int flags);
+static u_int scgetc(sc_softc_t *sc, u_int flags);
 #define SCGETC_CN	1
 #define SCGETC_NONBLOCK	2
 static int sccngetch(int flags);
 static void sccnupdate(scr_stat *scp);
-static scr_stat *alloc_scp(void);
-static void init_scp(scr_stat *scp);
-static void get_bios_values(void);
-static void sc_bcopy(scr_stat *scp, u_short *p, int from, int to, int mark);
-static int get_scr_num(void);
+static scr_stat *alloc_scp(sc_softc_t *sc, int vty);
+static void init_scp(sc_softc_t *sc, int vty, scr_stat *scp);
 static timeout_t scrn_timer;
+static int and_region(int *s1, int *e1, int s2, int e2);
 static void scrn_update(scr_stat *scp, int show_cursor);
+
 #if NSPLASH > 0
-static int scsplash_callback(int);
-static void scsplash_saver(int show);
-static int add_scrn_saver(void (*this_saver)(int));
-static int remove_scrn_saver(void (*this_saver)(int));
+static int scsplash_callback(int event, void *arg);
+static void scsplash_saver(sc_softc_t *sc, int show);
+static int add_scrn_saver(void (*this_saver)(sc_softc_t *, int));
+static int remove_scrn_saver(void (*this_saver)(sc_softc_t *, int));
 static int set_scrn_saver_mode(scr_stat *scp, int mode, u_char *pal, int border);
 static int restore_scrn_saver_mode(scr_stat *scp, int changemode);
-static void stop_scrn_saver(void (*saver)(int));
-static int wait_scrn_saver_stop(void);
+static void stop_scrn_saver(sc_softc_t *sc, void (*saver)(sc_softc_t *, int));
+static int wait_scrn_saver_stop(sc_softc_t *sc);
 #define scsplash_stick(stick)		(sticky_splash = (stick))
 #else /* !NSPLASH */
-#define stop_scrn_saver(saver)
-#define wait_scrn_saver_stop()		0
 #define scsplash_stick(stick)
 #endif /* NSPLASH */
-static int switch_scr(scr_stat *scp, u_int next_scr);
-static void exchange_scr(void);
+
+static int switch_scr(sc_softc_t *sc, u_int next_scr);
+static int do_switch_scr(sc_softc_t *sc, int s);
+static int vt_proc_alive(scr_stat *scp);
+static int signal_vt_rel(scr_stat *scp);
+static int signal_vt_acq(scr_stat *scp);
+static void exchange_scr(sc_softc_t *sc);
 static void scan_esc(scr_stat *scp, u_char c);
 static void ansi_put(scr_stat *scp, u_char *buf, int len);
-static void draw_cursor_image(scr_stat *scp); 
-static void remove_cursor_image(scr_stat *scp); 
+static void draw_cursor_image(scr_stat *scp);
+static void remove_cursor_image(scr_stat *scp);
+static void update_cursor_image(scr_stat *scp);
 static void move_crsr(scr_stat *scp, int x, int y);
-static void history_to_screen(scr_stat *scp);
-static int history_up_line(scr_stat *scp);
-static int history_down_line(scr_stat *scp);
 static int mask2attr(struct term_stat *term);
 static int save_kbd_state(scr_stat *scp);
-static int update_kbd_state(int state, int mask);
-static int update_kbd_leds(int which);
-static void set_destructive_cursor(scr_stat *scp);
-static void set_mouse_pos(scr_stat *scp);
-static int skip_spc_right(scr_stat *scp, u_short *p);
-static int skip_spc_left(scr_stat *scp, u_short *p);
-static void mouse_cut(scr_stat *scp);
-static void mouse_cut_start(scr_stat *scp);
-static void mouse_cut_end(scr_stat *scp);
-static void mouse_cut_word(scr_stat *scp);
-static void mouse_cut_line(scr_stat *scp);
-static void mouse_cut_extend(scr_stat *scp);
-static void mouse_paste(scr_stat *scp);
-static void draw_mouse_image(scr_stat *scp); 
-static void remove_mouse_image(scr_stat *scp); 
-static void draw_cutmarking(scr_stat *scp); 
-static void remove_cutmarking(scr_stat *scp); 
+static int update_kbd_state(scr_stat *scp, int state, int mask);
+static int update_kbd_leds(scr_stat *scp, int which);
 static void do_bell(scr_stat *scp, int pitch, int duration);
 static timeout_t blink_screen;
 
 #define	CDEV_MAJOR	12
 
-#ifdef __i386__
-
 static cn_probe_t	sccnprobe;
 static cn_init_t	sccninit;
 static cn_getc_t	sccngetc;
 static cn_checkc_t	sccncheckc;
 static cn_putc_t	sccnputc;
+static cn_term_t	sccnterm;
 
-CONS_DRIVER(sc, sccnprobe, sccninit, sccngetc, sccncheckc, sccnputc);
-
-#else /* !__i386__ */
-
-static cn_getc_t	sccngetc;
-static cn_checkc_t	sccncheckc;
-static cn_putc_t	sccnputc;
-
-struct consdev sc_cons = {
-    NULL, NULL, sccngetc, sccncheckc, sccnputc,
-    NULL, 0, CN_NORMAL,
-};
+#if __alpha__
+void sccnattach(void);
+#endif
 
-#endif /* __i386__ */
+CONS_DRIVER(sc, sccnprobe, sccninit, sccnterm, sccngetc, sccncheckc, sccnputc);
 
 static	d_open_t	scopen;
 static	d_close_t	scclose;
@@ -386,118 +233,6 @@ static struct cdevsw sc_cdevsw = {
 	/* bmaj */	-1
 };
 
-#ifdef __i386__
-
-#define fillw_io(p, b, c)	fillw((p), (void *)(b), (c))
-
-#endif
-
-#ifdef __alpha__
-
-static void
-fillw(int pat, void *base, size_t cnt)
-{
-    u_short *sp = base;
-    while (cnt--)
-	*sp++ = pat;
-}
-
-static void
-fillw_io(int pat, u_int32_t base, size_t cnt)
-{
-    while (cnt--) {
-	writew(base, pat);
-	base += 2;
-    }
-}
-
-#endif
-
-static void
-draw_cursor_image(scr_stat *scp)
-{
-    u_short cursor_image;
-    vm_offset_t ptr;
-    u_short prev_image;
-
-    if (ISPIXELSC(scp)) {
-	sc_bcopy(scp, scp->scr_buf, scp->cursor_pos - scp->scr_buf, 
-	  scp->cursor_pos - scp->scr_buf, 1);
-	return;
-    }
-
-    ptr = scp->adp->va_window + 2*(scp->cursor_pos - scp->scr_buf);
-
-    /* do we have a destructive cursor ? */
-    if (sc_flags & CHAR_CURSOR) {
-	prev_image = scp->cursor_saveunder;
-	cursor_image = readw(ptr) & 0x00ff;
-	if (cursor_image == DEAD_CHAR) 
-	    cursor_image = prev_image & 0x00ff;
-	cursor_image |= *(scp->cursor_pos) & 0xff00;
-	scp->cursor_saveunder = cursor_image;
-	/* update the cursor bitmap if the char under the cursor has changed */
-	if (prev_image != cursor_image) 
-	    set_destructive_cursor(scp);
-	/* modify cursor_image */
-	if (!(sc_flags & BLINK_CURSOR)||((sc_flags & BLINK_CURSOR)&&(blinkrate & 4))){
-	    /* 
-	     * When the mouse pointer is at the same position as the cursor,
-	     * the cursor bitmap needs to be updated even if the char under 
-	     * the cursor hasn't changed, because the mouse pionter may 
-	     * have moved by a few dots within the cursor cel.
-	     */
-	    if ((prev_image == cursor_image) 
-		    && (cursor_image != *(scp->cursor_pos)))
-	        set_destructive_cursor(scp);
-	    cursor_image &= 0xff00;
-	    cursor_image |= DEAD_CHAR;
-	}
-    } else {
-	cursor_image = (readw(ptr) & 0x00ff) | (*(scp->cursor_pos) & 0xff00);
-	scp->cursor_saveunder = cursor_image;
-	if (!(sc_flags & BLINK_CURSOR)||((sc_flags & BLINK_CURSOR)&&(blinkrate & 4))){
-	    if ((cursor_image & 0x7000) == 0x7000) {
-		cursor_image &= 0x8fff;
-		if(!(cursor_image & 0x0700))
-		    cursor_image |= 0x0700;
-	    } else {
-		cursor_image |= 0x7000;
-		if ((cursor_image & 0x0700) == 0x0700)
-		    cursor_image &= 0xf0ff;
-	    }
-	}
-    }
-    writew(ptr, cursor_image);
-}
-
-static void
-remove_cursor_image(scr_stat *scp)
-{
-    if (ISPIXELSC(scp))
-	sc_bcopy(scp, scp->scr_buf, scp->cursor_oldpos - scp->scr_buf, 
-		 scp->cursor_oldpos - scp->scr_buf, 0);
-    else
-	writew(scp->adp->va_window + 2*(scp->cursor_oldpos - scp->scr_buf),
-	       scp->cursor_saveunder);
-}
-
-static void
-move_crsr(scr_stat *scp, int x, int y)
-{
-    if (x < 0)
-	x = 0;
-    if (y < 0)
-	y = 0;
-    if (x >= scp->xsize)
-	x = scp->xsize-1;
-    if (y >= scp->ysize)
-	y = scp->ysize-1;
-    scp->xpos = x;
-    scp->ypos = y;
-    scp->cursor_pos = scp->scr_buf + scp->ypos * scp->xsize + scp->xpos;
-}
-
 int
 sc_probe_unit(int unit, int flags)
 {
@@ -514,8 +249,6 @@ sc_probe_unit(int unit, int flags)
 static int
 scvidprobe(int unit, int flags, int cons)
 {
-    video_adapter_t *adp;
-
     /*
      * Access the video adapter driver through the back door!
      * Video adapter drivers need to be configured before syscons.
@@ -525,17 +258,7 @@ scvidprobe(int unit, int flags, int cons)
      */
     vid_configure(cons ? VIO_PROBE_ONLY : 0);
 
-    /* allocate a frame buffer */
-    if (adapter < 0) {
-	adapter = vid_allocate("*", -1, (void *)&adapter);
-	if (adapter < 0)
-	    return FALSE;
-    }
-    adp = vid_get_adapter(adapter);	/* shouldn't fail */
-
-    initial_video_mode = adp->va_initial_mode;
-
-    return TRUE;
+    return (vid_find_adapter("*", unit) >= 0);
 }
 
 /* probe the keyboard, return TRUE if found */
@@ -545,169 +268,241 @@ sckbdprobe(int unit, int flags, int cons)
     /* access the keyboard driver through the backdoor! */
     kbd_configure(cons ? KB_CONF_PROBE_ONLY : 0);
 
-    /* allocate a keyboard and register the keyboard event handler */
-    if (keyboard < 0) {
-	keyboard = kbd_allocate("*", -1, (void *)&keyboard, sckbdevent, NULL);
-	if (keyboard < 0)
-	    return FALSE;
-    }
-    kbd = kbd_get_keyboard(keyboard);	/* shouldn't fail */
-
-    return TRUE;
-}
+    return (kbd_find_keyboard("*", unit) >= 0);
+}
+
+static char
+*adapter_name(video_adapter_t *adp)
+{
+    static struct {
+	int type;
+	char *name[2];
+    } names[] = {
+	{ KD_MONO,	{ "MDA",	"MDA" } },
+	{ KD_HERCULES,	{ "Hercules",	"Hercules" } },
+	{ KD_CGA,	{ "CGA",	"CGA" } },
+	{ KD_EGA,	{ "EGA",	"EGA (mono)" } },
+	{ KD_VGA,	{ "VGA",	"VGA (mono)" } },
+	{ KD_PC98,	{ "PC-98x1",	"PC-98x1" } },
+	{ KD_TGA,	{ "TGA",	"TGA" } },
+	{ -1,		{ "Unknown",	"Unknown" } },
+    };
+    int i;
 
-#if NAPM > 0
-static int
-scresume(void *dummy)
-{
-    if (kbd != NULL)
-	kbd_clear_state(kbd);
-    return 0;
+    for (i = 0; names[i].type != -1; ++i)
+	if (names[i].type == adp->va_type)
+	    break;
+    return names[i].name[(adp->va_flags & V_ADP_COLOR) ? 0 : 1];
 }
-#endif
 
 int
 sc_attach_unit(int unit, int flags)
 {
+    sc_softc_t *sc;
     scr_stat *scp;
-#if defined(VESA)
+#ifdef SC_PIXEL_MODE
     video_info_t info;
 #endif
 #ifdef DEVFS
     int vc;
 #endif
 
-    scinit();
-    scp = console[0];
-    sc_flags = flags;
-    if (!ISFONTAVAIL(scp->adp->va_flags))
-	sc_flags &= ~CHAR_CURSOR;
-
-    /* copy temporary buffer to final buffer */
-    scp->scr_buf = NULL;
-    sc_alloc_scr_buffer(scp, FALSE, FALSE);
-    bcopy(sc_buffer, scp->scr_buf, scp->xsize*scp->ysize*sizeof(u_short));
-
-    /* cut buffer is available only when the mouse pointer is used */
-    if (ISMOUSEAVAIL(scp->adp->va_flags))
-	sc_alloc_cut_buffer(scp, FALSE);
-
-    /* initialize history buffer & pointers */
-    sc_alloc_history_buffer(scp, sc_history_size, 0, FALSE);
-
-#if defined(VESA)
-    if ((sc_flags & VESA800X600)
-	&& ((*vidsw[scp->ad]->get_info)(scp->adp, M_VESA_800x600, &info) == 0)) {
+    scmeminit(NULL);		/* XXX */
+
+    flags &= ~SC_KERNEL_CONSOLE;
+    if (sc_console_unit == unit)
+	flags |= SC_KERNEL_CONSOLE;
+    scinit(unit, flags);
+    sc = sc_get_softc(unit, flags & SC_KERNEL_CONSOLE);
+    sc->config = flags;
+    scp = sc->console[0];
+    if (sc_console == NULL)	/* sc_console_unit < 0 */
+	sc_console = scp;
+
+#ifdef SC_PIXEL_MODE
+    if ((sc->config & SC_VESA800X600)
+	&& ((*vidsw[sc->adapter]->get_info)(sc->adp, M_VESA_800x600, &info) == 0)) {
 #if NSPLASH > 0
-	splash_term(scp->adp);
+	if (sc->flags & SC_SPLASH_SCRN)
+	    splash_term(sc->adp);
 #endif
 	sc_set_graphics_mode(scp, NULL, M_VESA_800x600);
 	sc_set_pixel_mode(scp, NULL, COL, ROW, 16);
-	initial_video_mode = M_VESA_800x600;
+	sc->initial_mode = M_VESA_800x600;
 #if NSPLASH > 0
 	/* put up the splash again! */
-    	splash_init(scp->adp, scsplash_callback);
+	if (sc->flags & SC_SPLASH_SCRN)
+    	    splash_init(sc->adp, scsplash_callback, sc);
 #endif
     }
-#endif /* VESA */
+#endif /* SC_PIXEL_MODE */
 
-    /* initialize cursor stuff */
+    /* initialize cursor */
     if (!ISGRAPHSC(scp))
-    	draw_cursor_image(scp);
+    	update_cursor_image(scp);
 
     /* get screen update going */
-    scrn_timer((void *)TRUE);
+    scrn_timer(sc);
 
     /* set up the keyboard */
-    kbd_ioctl(kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode);
-    update_kbd_state(scp->status, LOCK_MASK);
+    kbd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode);
+    update_kbd_state(scp, scp->status, LOCK_MASK);
 
+    printf("sc%d: %s <%d virtual consoles, flags=0x%x>\n",
+	   unit, adapter_name(sc->adp), sc->vtys, sc->config);
     if (bootverbose) {
 	printf("sc%d:", unit);
-    	if (adapter >= 0)
-	    printf(" fb%d", adapter);
-	if (keyboard >= 0)
-	    printf(" kbd%d", keyboard);
+    	if (sc->adapter >= 0)
+	    printf(" fb%d", sc->adapter);
+	if (sc->keyboard >= 0)
+	    printf(" kbd%d", sc->keyboard);
 	printf("\n");
     }
-    printf("sc%d: ", unit);
-    switch(scp->adp->va_type) {
-    case KD_VGA:
-	printf("VGA %s", (scp->adp->va_flags & V_ADP_COLOR) ? "color" : "mono");
-	break;
-    case KD_EGA:
-	printf("EGA %s", (scp->adp->va_flags & V_ADP_COLOR) ? "color" : "mono");
-	break;
-    case KD_CGA:
-	printf("CGA");
-	break;
-    case KD_MONO:
-    case KD_HERCULES:
-    default:
-	printf("MDA/Hercules");
-	break;
-    }
-    printf(" <%d virtual consoles, flags=0x%x>\n", MAXCONS, sc_flags);
-
-#if NAPM > 0
-    scp->r_hook.ah_fun = scresume;
-    scp->r_hook.ah_arg = NULL;
-    scp->r_hook.ah_name = "system keyboard";
-    scp->r_hook.ah_order = APM_MID_ORDER;
-    apm_hook_establish(APM_HOOK_RESUME , &scp->r_hook);
-#endif
 
-    at_shutdown(scshutdown, NULL, SHUTDOWN_PRE_SYNC);
+    /* register a shutdown callback for the kernel console */
+    if (sc_console_unit == unit)
+	at_shutdown(scshutdown, (void *)unit, SHUTDOWN_PRE_SYNC);
 
-    cdevsw_add(&sc_cdevsw);
+    /*
+     * syscons's cdevsw must be registered from here. As syscons and
+     * pcvt share the same major number, their cdevsw cannot be
+     * registered at module loading/initialization time or by SYSINIT.
+     */
+    cdevsw_add(&sc_cdevsw);	/* XXX do this just once... */
 
 #ifdef DEVFS
-    for (vc = 0; vc < MAXCONS; vc++)
-        sc_devfs_token[vc] = devfs_add_devswf(&sc_cdevsw, vc, DV_CHR,
-				UID_ROOT, GID_WHEEL, 0600, "ttyv%r", vc);
-    sc_mouse_devfs_token = devfs_add_devswf(&sc_cdevsw, SC_MOUSE, DV_CHR,
-				UID_ROOT, GID_WHEEL, 0600, "sysmouse");
-    sc_console_devfs_token = devfs_add_devswf(&sc_cdevsw, SC_CONSOLE, DV_CHR,
-				UID_ROOT, GID_WHEEL, 0600, "consolectl");
+    for (vc = sc->first_vty; vc < sc->first_vty + sc->vtys; vc++)
+        sc->devfs_token[vc] = devfs_add_devswf(&sc_cdevsw, vc,
+					       DV_CHR, UID_ROOT, GID_WHEEL,
+					       0600, "ttyv%r", vc);
+    if (scp == sc_console) {
+#ifndef SC_NO_SYSMOUSE
+	sc_mouse_devfs_token = devfs_add_devswf(&sc_cdevsw, SC_MOUSE,
+						DV_CHR, UID_ROOT, GID_WHEEL,
+						0600, "sysmouse");
+#endif /* SC_NO_SYSMOUSE */
+	sc_console_devfs_token = devfs_add_devswf(&sc_cdevsw, SC_CONSOLECTL,
+						  DV_CHR, UID_ROOT, GID_WHEEL,
+						  0600, "consolectl");
+    }
+#endif /* DEVFS */
+
+    return 0;
+}
+
+static void
+scmeminit(void *arg)
+{
+    if (sc_malloc)
+	return;
+    sc_malloc = TRUE;
+
+    /*
+     * As soon as malloc() becomes functional, we had better allocate
+     * various buffers for the kernel console.
+     */
+
+    if (sc_console_unit < 0)
+	return;
+
+    /* copy the temporary buffer to the final buffer */
+    sc_alloc_scr_buffer(sc_console, FALSE, FALSE);
+
+#ifndef SC_NO_CUTPASTE
+    /* cut buffer is available only when the mouse pointer is used */
+    if (ISMOUSEAVAIL(sc_console->sc->adp->va_flags))
+	sc_alloc_cut_buffer(sc_console, FALSE);
+#endif
+
+#ifndef SC_NO_HISTORY
+    /* initialize history buffer & pointers */
+    sc_alloc_history_buffer(sc_console, 0, FALSE);
 #endif
+}
+
+/* XXX */
+SYSINIT(sc_mem, SI_SUB_KMEM, SI_ORDER_ANY, scmeminit, NULL);
+
+int
+sc_resume_unit(int unit)
+{
+    /* XXX should be moved to the keyboard driver? */
+    sc_softc_t *sc;
+
+    sc = sc_get_softc(unit, (sc_console_unit == unit) ? SC_KERNEL_CONSOLE : 0);
+    if (sc->kbd != NULL)
+	kbd_clear_state(sc->kbd);
     return 0;
 }
 
 struct tty
 *scdevtotty(dev_t dev)
 {
-    int unit = minor(dev);
+    sc_softc_t *sc;
+    int vty = SC_VTY(dev);
+    int unit;
 
     if (init_done == COLD)
-	return(NULL);
-    if (unit == SC_CONSOLE)
+	return NULL;
+
+    if (vty == SC_CONSOLECTL)
 	return CONSOLE_TTY;
-    if (unit == SC_MOUSE)
+#ifndef SC_NO_SYSMOUSE
+    if (vty == SC_MOUSE)
 	return MOUSE_TTY;
-    if (unit >= MAXCONS || unit < 0)
-	return(NULL);
-    return VIRTUAL_TTY(unit);
+#endif
+
+    unit = scdevtounit(dev);
+    sc = sc_get_softc(unit, (sc_console_unit == unit) ? SC_KERNEL_CONSOLE : 0);
+    if (sc == NULL)
+	return NULL;
+    return VIRTUAL_TTY(sc, vty);
+}
+
+static int
+scdevtounit(dev_t dev)
+{
+    int vty = SC_VTY(dev);
+
+    if (vty == SC_CONSOLECTL)
+	return ((sc_console != NULL) ? sc_console->sc->unit : -1);
+    else if (vty == SC_MOUSE)
+	return -1;
+    else if ((vty < 0) || (vty >= MAXCONS*sc_max_unit()))
+	return -1;
+    else
+	return vty/MAXCONS;
 }
 
 int
 scopen(dev_t dev, int flag, int mode, struct proc *p)
 {
     struct tty *tp = scdevtotty(dev);
+    int unit = scdevtounit(dev);
+    sc_softc_t *sc;
     keyarg_t key;
 
     if (!tp)
 	return(ENXIO);
 
-    tp->t_oproc = (minor(dev) == SC_MOUSE) ? scmousestart : scstart;
+    DPRINTF(5, ("scopen: dev:%d, unit:%d, vty:%d\n",
+		dev, unit, SC_VTY(dev)));
+
+    /* sc == NULL, if SC_VTY(dev) == SC_MOUSE */
+    sc = sc_get_softc(unit, (sc_console_unit == unit) ? SC_KERNEL_CONSOLE : 0);
+
+    tp->t_oproc = (SC_VTY(dev) == SC_MOUSE) ? scmousestart : scstart;
     tp->t_param = scparam;
     tp->t_dev = dev;
     if (!(tp->t_state & TS_ISOPEN)) {
 	ttychars(tp);
         /* Use the current setting of the <-- key as default VERASE. */  
         /* If the Delete key is preferable, an stty is necessary     */
-	key.keynum = 0x0e;	/* how do we know this magic number... XXX */
-	kbd_ioctl(kbd, GIO_KEYMAPENT, (caddr_t)&key);
-        tp->t_cc[VERASE] = key.key.map[0];
+	if (sc != NULL) {
+	    key.keynum = KEYCODE_BS;
+	    kbd_ioctl(sc->kbd, GIO_KEYMAPENT, (caddr_t)&key);
+            tp->t_cc[VERASE] = key.key.map[0];
+	}
 	tp->t_iflag = TTYDEF_IFLAG;
 	tp->t_oflag = TTYDEF_OFLAG;
 	tp->t_cflag = TTYDEF_CFLAG;
@@ -715,20 +510,29 @@ scopen(dev_t dev, int flag, int mode, struct proc *p)
 	tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED;
 	scparam(tp, &tp->t_termios);
 	(*linesw[tp->t_line].l_modem)(tp, 1);
-    	if (minor(dev) == SC_MOUSE)
-	    mouse_level = 0;		/* XXX */
+#ifndef SC_NO_SYSMOUSE
+    	if (SC_VTY(dev) == SC_MOUSE)
+	    sc_mouse_set_level(0);	/* XXX */
+#endif
     }
     else
 	if (tp->t_state & TS_XCLUDE && suser(p))
 	    return(EBUSY);
-    if (minor(dev) < MAXCONS && !console[minor(dev)]) {
-	console[minor(dev)] = alloc_scp();
-	if (ISGRAPHSC(console[minor(dev)]))
-	    sc_set_pixel_mode(console[minor(dev)], NULL, COL, ROW, 16);
-    }
-    if (minor(dev)<MAXCONS && !tp->t_winsize.ws_col && !tp->t_winsize.ws_row) {
-	tp->t_winsize.ws_col = console[minor(dev)]->xsize;
-	tp->t_winsize.ws_row = console[minor(dev)]->ysize;
+    if ((SC_VTY(dev) != SC_CONSOLECTL) && (SC_VTY(dev) != SC_MOUSE)) {
+	/* assert(sc != NULL) */
+	if (sc->console[SC_VTY(dev) - sc->first_vty] == NULL) {
+	    sc->console[SC_VTY(dev) - sc->first_vty]
+		= alloc_scp(sc, SC_VTY(dev));
+	    if (ISGRAPHSC(sc->console[SC_VTY(dev) - sc->first_vty]))
+		sc_set_pixel_mode(sc->console[SC_VTY(dev) - sc->first_vty],
+				  NULL, COL, ROW, 16);
+	}
+	if (!tp->t_winsize.ws_col && !tp->t_winsize.ws_row) {
+	    tp->t_winsize.ws_col
+		= sc->console[SC_VTY(dev) - sc->first_vty]->xsize;
+	    tp->t_winsize.ws_row
+		= sc->console[SC_VTY(dev) - sc->first_vty]->ysize;
+	}
     }
     return ((*linesw[tp->t_line].l_open)(dev, tp));
 }
@@ -738,13 +542,29 @@ scclose(dev_t dev, int flag, int mode, struct proc *p)
 {
     struct tty *tp = scdevtotty(dev);
     struct scr_stat *scp;
+    int s;
 
     if (!tp)
 	return(ENXIO);
-    if (minor(dev) < MAXCONS) {
+    if ((SC_VTY(dev) != SC_CONSOLECTL) && (SC_VTY(dev) != SC_MOUSE)) {
 	scp = sc_get_scr_stat(tp->t_dev);
-	if (scp->status & SWITCH_WAIT_ACQ)
-	    wakeup((caddr_t)&scp->smode);
+	/* were we in the middle of the VT switching process? */
+	DPRINTF(5, ("sc%d: scclose(), ", scp->sc->unit));
+	s = spltty();
+	if ((scp == scp->sc->cur_scp) && (scp->sc->unit == sc_console_unit))
+	    cons_unavail = FALSE;
+	if (scp->status & SWITCH_WAIT_REL) {
+	    /* assert(scp == scp->sc->cur_scp) */
+	    DPRINTF(5, ("reset WAIT_REL, "));
+	    scp->status &= ~SWITCH_WAIT_REL;
+	    do_switch_scr(scp->sc, s);
+	}
+	if (scp->status & SWITCH_WAIT_ACQ) {
+	    /* assert(scp == scp->sc->cur_scp) */
+	    DPRINTF(5, ("reset WAIT_ACQ, "));
+	    scp->status &= ~SWITCH_WAIT_ACQ;
+	    scp->sc->switch_in_progress = 0;
+	}
 #if not_yet_done
 	if (scp == &main_console) {
 	    scp->pid = 0;
@@ -752,22 +572,25 @@ scclose(dev_t dev, int flag, int mode, struct proc *p)
 	    scp->smode.mode = VT_AUTO;
 	}
 	else {
-	    free(scp->scr_buf, M_DEVBUF);
+	    sc_vtb_destroy(&scp->vtb);
+	    sc_vtb_destroy(&scp->scr);
 	    if (scp->history != NULL) {
+		/* XXX not quite correct */
+		sc_vtb_destroy(scp->history);
 		free(scp->history, M_DEVBUF);
-		if (scp->history_size / scp->xsize
-			> imax(sc_history_size, scp->ysize))
-		    extra_history_size += scp->history_size / scp->xsize 
-			- imax(sc_history_size, scp->ysize);
 	    }
 	    free(scp, M_DEVBUF);
-	    console[minor(dev)] = NULL;
+	    sc->console[SC_VTY(dev) - sc->first_vty] = NULL;
 	}
 #else
 	scp->pid = 0;
 	scp->proc = NULL;
 	scp->smode.mode = VT_AUTO;
 #endif
+	scp->kbd_mode = K_XLATE;
+	if (scp == scp->sc->cur_scp)
+	    kbd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode);
+	DPRINTF(5, ("done.\n"));
     }
     spltty();
     (*linesw[tp->t_line].l_close)(tp, flag);
@@ -800,19 +623,21 @@ scwrite(dev_t dev, struct uio *uio, int flag)
 static int
 sckbdevent(keyboard_t *thiskbd, int event, void *arg)
 {
-    static struct tty *cur_tty;
+    sc_softc_t *sc;
+    struct tty *cur_tty;
     int c; 
     size_t len;
     u_char *cp;
 
-    /* assert(thiskbd == kbd) */
+    sc = (sc_softc_t *)arg;
+    /* assert(thiskbd == sc->kbd) */
 
     switch (event) {
     case KBDIO_KEYINPUT:
 	break;
     case KBDIO_UNLOADING:
-	kbd = NULL;
-	kbd_release(thiskbd, (void *)&keyboard);
+	sc->kbd = NULL;
+	kbd_release(thiskbd, (void *)&sc->keyboard);
 	return 0;
     default:
 	return EINVAL;
@@ -823,9 +648,10 @@ sckbdevent(keyboard_t *thiskbd, int event, void *arg)
      * I don't think this is nessesary, and it doesn't fix
      * the Xaccel-2.1 keyboard hang, but it can't hurt.		XXX
      */
-    while ((c = scgetc(thiskbd, SCGETC_NONBLOCK)) != NOKEY) {
+    while ((c = scgetc(sc, SCGETC_NONBLOCK)) != NOKEY) {
 
-	cur_tty = VIRTUAL_TTY(get_scr_num());
+	cur_tty = VIRTUAL_TTY(sc, sc->cur_scp->index);
+	/* XXX */
 	if (!(cur_tty->t_state & TS_ISOPEN))
 	    if (!((cur_tty = CONSOLE_TTY)->t_state & TS_ISOPEN))
 		continue;
@@ -853,10 +679,12 @@ sckbdevent(keyboard_t *thiskbd, int event, void *arg)
 	}
     }
 
-    if (cur_console->status & MOUSE_VISIBLE) {
-	remove_mouse_image(cur_console);
-	cur_console->status &= ~MOUSE_VISIBLE;
+#ifndef SC_NO_CUTPASTE
+    if (sc->cur_scp->status & MOUSE_VISIBLE) {
+	sc_remove_mouse_image(sc->cur_scp);
+	sc->cur_scp->status &= ~MOUSE_VISIBLE;
     }
+#endif /* SC_NO_CUTPASTE */
 
     return 0;
 }
@@ -873,17 +701,16 @@ scparam(struct tty *tp, struct termios *t)
 int
 scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
-    u_int delta_ehs;
     int error;
     int i;
     struct tty *tp;
+    sc_softc_t *sc;
     scr_stat *scp;
     int s;
 
     tp = scdevtotty(dev);
     if (!tp)
 	return ENXIO;
-    scp = sc_get_scr_stat(tp->t_dev);
 
     /* If there is a user_ioctl function call that first */
     if (sc_user_ioctl) {
@@ -896,6 +723,32 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
     if (error != ENOIOCTL)
 	return error;
 
+#ifndef SC_NO_HISTORY
+    error = sc_hist_ioctl(tp, cmd, data, flag, p);
+    if (error != ENOIOCTL)
+	return error;
+#endif
+
+#ifndef SC_NO_SYSMOUSE
+    error = sc_mouse_ioctl(tp, cmd, data, flag, p);
+    if (error != ENOIOCTL)
+	return error;
+    if (SC_VTY(dev) == SC_MOUSE) {
+	error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p);
+	if (error != ENOIOCTL)
+	    return error;
+	error = ttioctl(tp, cmd, data, flag);
+	if (error != ENOIOCTL)
+	    return error;
+	return ENOTTY;
+    }
+#endif
+
+    scp = sc_get_scr_stat(tp->t_dev);
+    /* assert(scp != NULL) */
+    /* scp is sc_console, if SC_VTY(dev) == SC_CONSOLECTL. */
+    sc = scp->sc;
+
     switch (cmd) {  		/* process console hardware related ioctl's */
 
     case GIO_ATTR:      	/* get current attributes */
@@ -903,7 +756,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case GIO_COLOR:     	/* is this a color console ? */
-	*(int *)data = (scp->adp->va_flags & V_ADP_COLOR) ? 1 : 0;
+	*(int *)data = (sc->adp->va_flags & V_ADP_COLOR) ? 1 : 0;
 	return 0;
 
     case CONS_BLANKTIME:    	/* set screen saver timeout (0 = no saver) */
@@ -916,483 +769,66 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case CONS_CURSORTYPE:   	/* set cursor type blink/noblink */
+	if (!ISGRAPHSC(sc->cur_scp))
+	    remove_cursor_image(sc->cur_scp);
 	if ((*(int*)data) & 0x01)
-	    sc_flags |= BLINK_CURSOR;
+	    sc->flags |= SC_BLINK_CURSOR;
 	else
-	    sc_flags &= ~BLINK_CURSOR;
+	    sc->flags &= ~SC_BLINK_CURSOR;
 	if ((*(int*)data) & 0x02) {
-	    if (!ISFONTAVAIL(scp->adp->va_flags))
-		return ENXIO;
-	    sc_flags |= CHAR_CURSOR;
+	    sc->flags |= SC_CHAR_CURSOR;
 	} else
-	    sc_flags &= ~CHAR_CURSOR;
+	    sc->flags &= ~SC_CHAR_CURSOR;
 	/* 
 	 * The cursor shape is global property; all virtual consoles
 	 * are affected. Update the cursor in the current console...
 	 */
-	if (!ISGRAPHSC(cur_console)) {
+	if (!ISGRAPHSC(sc->cur_scp)) {
 	    s = spltty();
-            remove_cursor_image(cur_console);
-	    if (sc_flags & CHAR_CURSOR)
-	        set_destructive_cursor(cur_console);
-	    draw_cursor_image(cur_console);
+	    sc_set_cursor_image(sc->cur_scp);
+	    draw_cursor_image(sc->cur_scp);
 	    splx(s);
 	}
 	return 0;
 
     case CONS_BELLTYPE: 	/* set bell type sound/visual */
 	if ((*(int *)data) & 0x01)
-	    sc_flags |= VISUAL_BELL;
+	    sc->flags |= SC_VISUAL_BELL;
 	else
-	    sc_flags &= ~VISUAL_BELL;
+	    sc->flags &= ~SC_VISUAL_BELL;
 	if ((*(int *)data) & 0x02)
-	    sc_flags |= QUIET_BELL;
+	    sc->flags |= SC_QUIET_BELL;
 	else
-	    sc_flags &= ~QUIET_BELL;
+	    sc->flags &= ~SC_QUIET_BELL;
 	return 0;
 
-    case CONS_HISTORY:  	/* set history size */
-	if (*(int *)data > 0) {
-	    int lines;	/* buffer size to allocate */
-	    int lines0;	/* current buffer size */
-
-	    lines = imax(*(int *)data, scp->ysize);
-	    lines0 = (scp->history != NULL) ? 
-		      scp->history_size / scp->xsize : scp->ysize;
-	    if (lines0 > imax(sc_history_size, scp->ysize))
-		delta_ehs = lines0 - imax(sc_history_size, scp->ysize);
-	    else
-		delta_ehs = 0;
-	    /*
-	     * syscons unconditionally allocates buffers upto SC_HISTORY_SIZE
-	     * lines or scp->ysize lines, whichever is larger. A value 
-	     * greater than that is allowed, subject to extra_history_size.
-	     */
-	    if (lines > imax(sc_history_size, scp->ysize))
-		if (lines - imax(sc_history_size, scp->ysize) >
-		    extra_history_size + delta_ehs)
-		    return EINVAL;
-            if (cur_console->status & BUFFER_SAVED)
-                return EBUSY;
-	    sc_alloc_history_buffer(scp, lines, delta_ehs, TRUE);
-	    return 0;
-	}
-	else
-	    return EINVAL;
-
-    case CONS_MOUSECTL:		/* control mouse arrow */
-    case OLD_CONS_MOUSECTL:
+    case CONS_GETINFO:  	/* get current (virtual) console info */
     {
-	/* MOUSE_BUTTON?DOWN -> MOUSE_MSC_BUTTON?UP */
-	static int butmap[8] = {
-            MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON2UP | MOUSE_MSC_BUTTON3UP,
-            MOUSE_MSC_BUTTON2UP | MOUSE_MSC_BUTTON3UP,
-            MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON3UP,
-            MOUSE_MSC_BUTTON3UP,
-            MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON2UP,
-            MOUSE_MSC_BUTTON2UP,
-            MOUSE_MSC_BUTTON1UP,
-            0,
-	};
-	mouse_info_t *mouse = (mouse_info_t*)data;
-	mouse_info_t buf;
-
-	/* FIXME: */
-	if (!ISMOUSEAVAIL(scp->adp->va_flags))
-	    return ENODEV;
-	
-	if (cmd == OLD_CONS_MOUSECTL) {
-	    static u_char swapb[] = { 0, 4, 2, 6, 1, 5, 3, 7 };
-	    old_mouse_info_t *old_mouse = (old_mouse_info_t *)data;
-
-	    mouse = &buf;
-	    mouse->operation = old_mouse->operation;
-	    switch (mouse->operation) {
-	    case MOUSE_MODE:
-		mouse->u.mode = old_mouse->u.mode;
-		break;
-	    case MOUSE_SHOW:
-	    case MOUSE_HIDE:
-		break;
-	    case MOUSE_MOVEABS:
-	    case MOUSE_MOVEREL:
-	    case MOUSE_ACTION:
-		mouse->u.data.x = old_mouse->u.data.x;
-		mouse->u.data.y = old_mouse->u.data.y;
-		mouse->u.data.z = 0;
-		mouse->u.data.buttons = swapb[old_mouse->u.data.buttons & 0x7];
-		break;
-	    case MOUSE_GETINFO:
-		old_mouse->u.data.x = scp->mouse_xpos;
-		old_mouse->u.data.y = scp->mouse_ypos;
-		old_mouse->u.data.buttons = swapb[scp->mouse_buttons & 0x7];
-		break;
-	    default:
-		return EINVAL;
-	    }
+	vid_info_t *ptr = (vid_info_t*)data;
+	if (ptr->size == sizeof(struct vid_info)) {
+	    ptr->m_num = sc->cur_scp->index;
+	    ptr->mv_col = scp->xpos;
+	    ptr->mv_row = scp->ypos;
+	    ptr->mv_csz = scp->xsize;
+	    ptr->mv_rsz = scp->ysize;
+	    ptr->mv_norm.fore = (scp->term.std_color & 0x0f00)>>8;
+	    ptr->mv_norm.back = (scp->term.std_color & 0xf000)>>12;
+	    ptr->mv_rev.fore = (scp->term.rev_color & 0x0f00)>>8;
+	    ptr->mv_rev.back = (scp->term.rev_color & 0xf000)>>12;
+	    ptr->mv_grfc.fore = 0;      /* not supported */
+	    ptr->mv_grfc.back = 0;      /* not supported */
+	    ptr->mv_ovscan = scp->border;
+	    if (scp == sc->cur_scp)
+		save_kbd_state(scp);
+	    ptr->mk_keylock = scp->status & LOCK_MASK;
+	    return 0;
 	}
+	return EINVAL;
+    }
 
-	switch (mouse->operation) {
-	case MOUSE_MODE:
-	    if (ISSIGVALID(mouse->u.mode.signal)) {
-		scp->mouse_signal = mouse->u.mode.signal;
-		scp->mouse_proc = p;
-		scp->mouse_pid = p->p_pid;
-	    }
-	    else {
-		scp->mouse_signal = 0;
-		scp->mouse_proc = NULL;
-		scp->mouse_pid = 0;
-	    }
-	    return 0;
-
-	case MOUSE_SHOW:
-	    if (ISTEXTSC(scp) && !(scp->status & MOUSE_ENABLED)) {
-		scp->status |= (MOUSE_ENABLED | MOUSE_VISIBLE);
-		scp->mouse_oldpos = scp->mouse_pos;
-		mark_all(scp);
-		return 0;
-	    }
-	    else
-		return EINVAL;
-	    break;
-
-	case MOUSE_HIDE:
-	    if (ISTEXTSC(scp) && (scp->status & MOUSE_ENABLED)) {
-		scp->status &= ~(MOUSE_ENABLED | MOUSE_VISIBLE);
-		mark_all(scp);
-		return 0;
-	    }
-	    else
-		return EINVAL;
-	    break;
-
-	case MOUSE_MOVEABS:
-	    scp->mouse_xpos = mouse->u.data.x;
-	    scp->mouse_ypos = mouse->u.data.y;
-	    set_mouse_pos(scp);
-	    break;
-
-	case MOUSE_MOVEREL:
-	    scp->mouse_xpos += mouse->u.data.x;
-	    scp->mouse_ypos += mouse->u.data.y;
-	    set_mouse_pos(scp);
-	    break;
-
-	case MOUSE_GETINFO:
-	    mouse->u.data.x = scp->mouse_xpos;
-	    mouse->u.data.y = scp->mouse_ypos;
-	    mouse->u.data.z = 0;
-	    mouse->u.data.buttons = scp->mouse_buttons;
-	    return 0;
-
-	case MOUSE_ACTION:
-	case MOUSE_MOTION_EVENT:
-	    /* this should maybe only be settable from /dev/consolectl SOS */
-	    /* send out mouse event on /dev/sysmouse */
-
-	    mouse_status.dx += mouse->u.data.x;
-	    mouse_status.dy += mouse->u.data.y;
-	    mouse_status.dz += mouse->u.data.z;
-	    if (mouse->operation == MOUSE_ACTION)
-	        mouse_status.button = mouse->u.data.buttons;
-	    mouse_status.flags |= 
-		((mouse->u.data.x || mouse->u.data.y || mouse->u.data.z) ? 
-		    MOUSE_POSCHANGED : 0)
-		| (mouse_status.obutton ^ mouse_status.button);
-	    if (mouse_status.flags == 0)
-		return 0;
-
-	    if (ISTEXTSC(cur_console) && (cur_console->status & MOUSE_ENABLED))
-	    	cur_console->status |= MOUSE_VISIBLE;
-
-	    if ((MOUSE_TTY)->t_state & TS_ISOPEN) {
-		u_char buf[MOUSE_SYS_PACKETSIZE];
-		int j;
-
-		/* the first five bytes are compatible with MouseSystems' */
-		buf[0] = MOUSE_MSC_SYNC
-		    | butmap[mouse_status.button & MOUSE_STDBUTTONS];
-		j = imax(imin(mouse->u.data.x, 255), -256);
-		buf[1] = j >> 1;
-		buf[3] = j - buf[1];
-		j = -imax(imin(mouse->u.data.y, 255), -256);
-		buf[2] = j >> 1;
-		buf[4] = j - buf[2];
-		for (j = 0; j < MOUSE_MSC_PACKETSIZE; j++)
-	    		(*linesw[(MOUSE_TTY)->t_line].l_rint)(buf[j],MOUSE_TTY);
-		if (mouse_level >= 1) { 	/* extended part */
-		    j = imax(imin(mouse->u.data.z, 127), -128);
-		    buf[5] = (j >> 1) & 0x7f;
-		    buf[6] = (j - (j >> 1)) & 0x7f;
-		    /* buttons 4-10 */
-		    buf[7] = (~mouse_status.button >> 3) & 0x7f;
-		    for (j = MOUSE_MSC_PACKETSIZE; 
-			 j < MOUSE_SYS_PACKETSIZE; j++)
-	    		(*linesw[(MOUSE_TTY)->t_line].l_rint)(buf[j],MOUSE_TTY);
-		}
-	    }
-
-	    if (cur_console->mouse_signal) {
-		cur_console->mouse_buttons = mouse->u.data.buttons;
-    		/* has controlling process died? */
-		if (cur_console->mouse_proc && 
-		    (cur_console->mouse_proc != pfind(cur_console->mouse_pid))){
-		    	cur_console->mouse_signal = 0;
-			cur_console->mouse_proc = NULL;
-			cur_console->mouse_pid = 0;
-		}
-		else
-		    psignal(cur_console->mouse_proc, cur_console->mouse_signal);
-	    }
-	    else if (mouse->operation == MOUSE_ACTION && cut_buffer != NULL) {
-		/* process button presses */
-		if ((cur_console->mouse_buttons ^ mouse->u.data.buttons) && 
-		    ISTEXTSC(cur_console)) {
-		    cur_console->mouse_buttons = mouse->u.data.buttons;
-		    if (cur_console->mouse_buttons & MOUSE_BUTTON1DOWN)
-			mouse_cut_start(cur_console);
-		    else
-			mouse_cut_end(cur_console);
-		    if (cur_console->mouse_buttons & MOUSE_BUTTON2DOWN ||
-			cur_console->mouse_buttons & MOUSE_BUTTON3DOWN)
-			mouse_paste(cur_console);
-		}
-	    }
-
-	    if (mouse->u.data.x != 0 || mouse->u.data.y != 0) {
-		cur_console->mouse_xpos += mouse->u.data.x;
-		cur_console->mouse_ypos += mouse->u.data.y;
-		set_mouse_pos(cur_console);
-	    }
-
-	    break;
-
-	case MOUSE_BUTTON_EVENT:
-	    if ((mouse->u.event.id & MOUSE_BUTTONS) == 0)
-		return EINVAL;
-	    if (mouse->u.event.value < 0)
-		return EINVAL;
-
-	    if (mouse->u.event.value > 0) {
-	        cur_console->mouse_buttons |= mouse->u.event.id;
-	        mouse_status.button |= mouse->u.event.id;
-	    } else {
-	        cur_console->mouse_buttons &= ~mouse->u.event.id;
-	        mouse_status.button &= ~mouse->u.event.id;
-	    }
-	    mouse_status.flags |= mouse_status.obutton ^ mouse_status.button;
-	    if (mouse_status.flags == 0)
-		return 0;
-
-	    if (ISTEXTSC(cur_console) && (cur_console->status & MOUSE_ENABLED))
-	    	cur_console->status |= MOUSE_VISIBLE;
-
-	    if ((MOUSE_TTY)->t_state & TS_ISOPEN) {
-		u_char buf[8];
-		int i;
-
-		buf[0] = MOUSE_MSC_SYNC 
-			 | butmap[mouse_status.button & MOUSE_STDBUTTONS];
-		buf[7] = (~mouse_status.button >> 3) & 0x7f;
-		buf[1] = buf[2] = buf[3] = buf[4] = buf[5] = buf[6] = 0;
-		for (i = 0; 
-		     i < ((mouse_level >= 1) ? MOUSE_SYS_PACKETSIZE 
-					     : MOUSE_MSC_PACKETSIZE); i++)
-	    	    (*linesw[(MOUSE_TTY)->t_line].l_rint)(buf[i],MOUSE_TTY);
-	    }
-
-	    if (cur_console->mouse_signal) {
-		if (cur_console->mouse_proc && 
-		    (cur_console->mouse_proc != pfind(cur_console->mouse_pid))){
-		    	cur_console->mouse_signal = 0;
-			cur_console->mouse_proc = NULL;
-			cur_console->mouse_pid = 0;
-		}
-		else
-		    psignal(cur_console->mouse_proc, cur_console->mouse_signal);
-		break;
-	    }
-
-	    if (!ISTEXTSC(cur_console) || (cut_buffer == NULL))
-		break;
-
-	    switch (mouse->u.event.id) {
-	    case MOUSE_BUTTON1DOWN:
-	        switch (mouse->u.event.value % 4) {
-		case 0:	/* up */
-		    mouse_cut_end(cur_console);
-		    break;
-		case 1:
-		    mouse_cut_start(cur_console);
-		    break;
-		case 2:
-		    mouse_cut_word(cur_console);
-		    break;
-		case 3:
-		    mouse_cut_line(cur_console);
-		    break;
-		}
-		break;
-	    case MOUSE_BUTTON2DOWN:
-	        switch (mouse->u.event.value) {
-		case 0:	/* up */
-		    break;
-		default:
-		    mouse_paste(cur_console);
-		    break;
-		}
-		break;
-	    case MOUSE_BUTTON3DOWN:
-	        switch (mouse->u.event.value) {
-		case 0:	/* up */
-		    if (!(cur_console->mouse_buttons & MOUSE_BUTTON1DOWN))
-		        mouse_cut_end(cur_console);
-		    break;
-		default:
-		    mouse_cut_extend(cur_console);
-		    break;
-		}
-		break;
-	    }
-	    break;
-
-	default:
-	    return EINVAL;
-	}
-	/* make screensaver happy */
-	sc_touch_scrn_saver();
-	return 0;
-    }
-
-    /* MOUSE_XXX: /dev/sysmouse ioctls */
-    case MOUSE_GETHWINFO:	/* get device information */
-    {
-	mousehw_t *hw = (mousehw_t *)data;
-
-	if (tp != MOUSE_TTY)
-	    return ENOTTY;
-	hw->buttons = 10;		/* XXX unknown */
-	hw->iftype = MOUSE_IF_SYSMOUSE;
-	hw->type = MOUSE_MOUSE;
-	hw->model = MOUSE_MODEL_GENERIC;
-	hw->hwid = 0;
-	return 0;
-    }
-
-    case MOUSE_GETMODE:		/* get protocol/mode */
-    {
-	mousemode_t *mode = (mousemode_t *)data;
-
-	if (tp != MOUSE_TTY)
-	    return ENOTTY;
-	mode->level = mouse_level;
-	switch (mode->level) {
-	case 0:
-	    /* at this level, sysmouse emulates MouseSystems protocol */
-	    mode->protocol = MOUSE_PROTO_MSC;
-	    mode->rate = -1;		/* unknown */
-	    mode->resolution = -1;	/* unknown */
-	    mode->accelfactor = 0;	/* disabled */
-	    mode->packetsize = MOUSE_MSC_PACKETSIZE;
-	    mode->syncmask[0] = MOUSE_MSC_SYNCMASK;
-	    mode->syncmask[1] = MOUSE_MSC_SYNC;
-	    break;
-
-	case 1:
-	    /* at this level, sysmouse uses its own protocol */
-	    mode->protocol = MOUSE_PROTO_SYSMOUSE;
-	    mode->rate = -1;
-	    mode->resolution = -1;
-	    mode->accelfactor = 0;
-	    mode->packetsize = MOUSE_SYS_PACKETSIZE;
-	    mode->syncmask[0] = MOUSE_SYS_SYNCMASK;
-	    mode->syncmask[1] = MOUSE_SYS_SYNC;
-	    break;
-	}
-	return 0;
-    }
-
-    case MOUSE_SETMODE:		/* set protocol/mode */
-    {
-	mousemode_t *mode = (mousemode_t *)data;
-
-	if (tp != MOUSE_TTY)
-	    return ENOTTY;
-	if ((mode->level < 0) || (mode->level > 1))
-	    return EINVAL;
-	mouse_level = mode->level;
-	return 0;
-    }
-
-    case MOUSE_GETLEVEL:	/* get operation level */
-	if (tp != MOUSE_TTY)
-	    return ENOTTY;
-	*(int *)data = mouse_level;
-	return 0;
-
-    case MOUSE_SETLEVEL:	/* set operation level */
-	if (tp != MOUSE_TTY)
-	    return ENOTTY;
-	if ((*(int *)data  < 0) || (*(int *)data > 1))
-	    return EINVAL;
-	mouse_level = *(int *)data;
-	return 0;
-
-    case MOUSE_GETSTATUS:	/* get accumulated mouse events */
-	if (tp != MOUSE_TTY)
-	    return ENOTTY;
-	s = spltty();
-	*(mousestatus_t *)data = mouse_status;
-	mouse_status.flags = 0;
-	mouse_status.obutton = mouse_status.button;
-	mouse_status.dx = 0;
-	mouse_status.dy = 0;
-	mouse_status.dz = 0;
-	splx(s);
-	return 0;
-
-#if notyet
-    case MOUSE_GETVARS:		/* get internal mouse variables */
-    case MOUSE_SETVARS:		/* set internal mouse variables */
-	if (tp != MOUSE_TTY)
-	    return ENOTTY;
-	return ENODEV;
-#endif
-
-    case MOUSE_READSTATE:	/* read status from the device */
-    case MOUSE_READDATA:	/* read data from the device */
-	if (tp != MOUSE_TTY)
-	    return ENOTTY;
-	return ENODEV;
-
-    case CONS_GETINFO:  	/* get current (virtual) console info */
-    {
-	vid_info_t *ptr = (vid_info_t*)data;
-	if (ptr->size == sizeof(struct vid_info)) {
-	    ptr->m_num = get_scr_num();
-	    ptr->mv_col = scp->xpos;
-	    ptr->mv_row = scp->ypos;
-	    ptr->mv_csz = scp->xsize;
-	    ptr->mv_rsz = scp->ysize;
-	    ptr->mv_norm.fore = (scp->term.std_color & 0x0f00)>>8;
-	    ptr->mv_norm.back = (scp->term.std_color & 0xf000)>>12;
-	    ptr->mv_rev.fore = (scp->term.rev_color & 0x0f00)>>8;
-	    ptr->mv_rev.back = (scp->term.rev_color & 0xf000)>>12;
-	    ptr->mv_grfc.fore = 0;      /* not supported */
-	    ptr->mv_grfc.back = 0;      /* not supported */
-	    ptr->mv_ovscan = scp->border;
-	    if (scp == cur_console)
-		save_kbd_state(scp);
-	    ptr->mk_keylock = scp->status & LOCK_MASK;
-	    return 0;
-	}
-	return EINVAL;
-    }
-
-    case CONS_GETVERS:  	/* get version number */
-	*(int*)data = 0x200;    /* version 2.0 */
-	return 0;
+    case CONS_GETVERS:  	/* get version number */
+	*(int*)data = 0x200;    /* version 2.0 */
+	return 0;
 
     case CONS_IDLE:		/* see if the screen has been idle */
 	/*
@@ -1404,9 +840,9 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	 * graphics mode in the current screen, we should say that the
 	 * screen has been idle.
 	 */
-	*(int *)data = scrn_idle 
-		       && (!ISGRAPHSC(cur_console)
-			   || (cur_console->status & SAVER_RUNNING));
+	*(int *)data = (sc->flags & SC_SCRN_IDLE)
+		       && (!ISGRAPHSC(sc->cur_scp)
+			   || (sc->cur_scp->status & SAVER_RUNNING));
 	return 0;
 
     case CONS_SAVERMODE:	/* set saver mode */
@@ -1416,10 +852,13 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    scsplash_stick(FALSE);
 	    saver_mode = *(int *)data;
 	    s = spltty();
-	    if ((error = wait_scrn_saver_stop())) {
+#if NSPLASH > 0
+	    if ((error = wait_scrn_saver_stop(NULL))) {
 		splx(s);
 		return error;
 	    }
+#endif /* NSPLASH */
+	    run_scrn_saver = TRUE;
 	    scp->status |= SAVER_RUNNING;
 	    scsplash_stick(TRUE);
 	    splx(s);
@@ -1444,7 +883,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	s = spltty();
 	run_scrn_saver = (*(int *)data != 0);
 	if (run_scrn_saver)
-	    scrn_time_stamp -= scrn_blank_time;
+	    sc->scrn_time_stamp -= scrn_blank_time;
 	splx(s);
 	return 0;
 
@@ -1453,16 +892,51 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	struct vt_mode *mode;
 
 	mode = (struct vt_mode *)data;
-	if (ISSIGVALID(mode->relsig) && ISSIGVALID(mode->acqsig) &&
-	    ISSIGVALID(mode->frsig)) {
-	    bcopy(data, &scp->smode, sizeof(struct vt_mode));
-	    if (scp->smode.mode == VT_PROCESS) {
-		scp->proc = p;
-		scp->pid = scp->proc->p_pid;
+	DPRINTF(5, ("sc%d: VT_SETMODE ", sc->unit));
+	if (scp->smode.mode == VT_PROCESS) {
+    	    if (scp->proc == pfind(scp->pid) && scp->proc != p) {
+		DPRINTF(5, ("error EPERM\n"));
+		return EPERM;
 	    }
-	    return 0;
-	} else
-	    return EINVAL;
+	}
+	s = spltty();
+	if (mode->mode == VT_AUTO) {
+	    scp->smode.mode = VT_AUTO;
+	    scp->proc = NULL;
+	    scp->pid = 0;
+	    DPRINTF(5, ("VT_AUTO, "));
+	    if ((scp == sc->cur_scp) && (sc->unit == sc_console_unit))
+		cons_unavail = FALSE;
+	    /* were we in the middle of the vty switching process? */
+	    if (scp->status & SWITCH_WAIT_REL) {
+		/* assert(scp == scp->sc->cur_scp) */
+		DPRINTF(5, ("reset WAIT_REL, "));
+		scp->status &= ~SWITCH_WAIT_REL;
+		s = do_switch_scr(sc, s);
+	    }
+	    if (scp->status & SWITCH_WAIT_ACQ) {
+		/* assert(scp == scp->sc->cur_scp) */
+		DPRINTF(5, ("reset WAIT_ACQ, "));
+		scp->status &= ~SWITCH_WAIT_ACQ;
+		sc->switch_in_progress = 0;
+	    }
+	} else {
+	    if (!ISSIGVALID(mode->relsig) || !ISSIGVALID(mode->acqsig)
+		|| !ISSIGVALID(mode->frsig)) {
+		splx(s);
+		DPRINTF(5, ("error EINVAL\n"));
+		return EINVAL;
+	    }
+	    DPRINTF(5, ("VT_PROCESS %d, ", p->p_pid));
+	    bcopy(data, &scp->smode, sizeof(struct vt_mode));
+	    scp->proc = p;
+	    scp->pid = scp->proc->p_pid;
+	    if ((scp == sc->cur_scp) && (sc->unit == sc_console_unit))
+		cons_unavail = TRUE;
+	}
+	splx(s);
+	DPRINTF(5, ("\n"));
+	return 0;
     }
 
     case VT_GETMODE:    	/* get screen switcher mode */
@@ -1470,45 +944,58 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case VT_RELDISP:    	/* screen switcher ioctl */
+	s = spltty();
+	/*
+	 * This must be the current vty which is in the VT_PROCESS
+	 * switching mode...
+	 */
+	if ((scp != sc->cur_scp) || (scp->smode.mode != VT_PROCESS)) {
+	    splx(s);
+	    return EINVAL;
+	}
+	/* ...and this process is controlling it. */
+	if (scp->proc != p) {
+	    splx(s);
+	    return EPERM;
+	}
+	error = EINVAL;
 	switch(*(int *)data) {
 	case VT_FALSE:  	/* user refuses to release screen, abort */
-	    if (scp == old_scp && (scp->status & SWITCH_WAIT_REL)) {
-		old_scp->status &= ~SWITCH_WAIT_REL;
-		switch_in_progress = FALSE;
-		return 0;
+	    if ((scp == sc->old_scp) && (scp->status & SWITCH_WAIT_REL)) {
+		sc->old_scp->status &= ~SWITCH_WAIT_REL;
+		sc->switch_in_progress = 0;
+		DPRINTF(5, ("sc%d: VT_FALSE\n", sc->unit));
+		error = 0;
 	    }
-	    return EINVAL;
+	    break;
 
 	case VT_TRUE:   	/* user has released screen, go on */
-	    if (scp == old_scp && (scp->status & SWITCH_WAIT_REL)) {
+	    if ((scp == sc->old_scp) && (scp->status & SWITCH_WAIT_REL)) {
 		scp->status &= ~SWITCH_WAIT_REL;
-		exchange_scr();
-		if (new_scp->smode.mode == VT_PROCESS) {
-		    new_scp->status |= SWITCH_WAIT_ACQ;
-		    psignal(new_scp->proc, new_scp->smode.acqsig);
-		}
-		else
-		    switch_in_progress = FALSE;
-		return 0;
+		s = do_switch_scr(sc, s);
+		DPRINTF(5, ("sc%d: VT_TRUE\n", sc->unit));
+		error = 0;
 	    }
-	    return EINVAL;
+	    break;
 
 	case VT_ACKACQ: 	/* acquire acknowledged, switch completed */
-	    if (scp == new_scp && (scp->status & SWITCH_WAIT_ACQ)) {
+	    if ((scp == sc->new_scp) && (scp->status & SWITCH_WAIT_ACQ)) {
 		scp->status &= ~SWITCH_WAIT_ACQ;
-		switch_in_progress = FALSE;
-		return 0;
+		sc->switch_in_progress = 0;
+		DPRINTF(5, ("sc%d: VT_ACKACQ\n", sc->unit));
+		error = 0;
 	    }
-	    return EINVAL;
+	    break;
 
 	default:
-	    return EINVAL;
+	    break;
 	}
-	/* NOT REACHED */
+	splx(s);
+	return error;
 
     case VT_OPENQRY:    	/* return free virtual console */
-	for (i = 0; i < MAXCONS; i++) {
-	    tp = VIRTUAL_TTY(i);
+	for (i = sc->first_vty; i < sc->first_vty + sc->vtys; i++) {
+	    tp = VIRTUAL_TTY(sc, i);
 	    if (!(tp->t_state & TS_ISOPEN)) {
 		*(int *)data = i + 1;
 		return 0;
@@ -1518,32 +1005,33 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 
     case VT_ACTIVATE:   	/* switch to screen *data */
 	s = spltty();
-	sc_clean_up(cur_console);
+	sc_clean_up(sc->cur_scp);
 	splx(s);
-	return switch_scr(scp, *(int *)data - 1);
+	return switch_scr(sc, *(int *)data - 1);
 
     case VT_WAITACTIVE: 	/* wait for switch to occur */
-	if (*(int *)data > MAXCONS || *(int *)data < 0)
+	if ((*(int *)data >= sc->first_vty + sc->vtys)
+		|| (*(int *)data < sc->first_vty))
 	    return EINVAL;
 	s = spltty();
-	error = sc_clean_up(cur_console);
+	error = sc_clean_up(sc->cur_scp);
 	splx(s);
 	if (error)
 	    return error;
-	if (minor(dev) == *(int *)data - 1)
+	if (*(int *)data != 0)
+	    scp = sc->console[*(int *)data - 1 - sc->first_vty];
+	if (scp == scp->sc->cur_scp)
 	    return 0;
-	if (*(int *)data == 0) {
-	    if (scp == cur_console)
-		return 0;
-	}
-	else
-	    scp = console[*(int *)data - 1];
 	while ((error=tsleep((caddr_t)&scp->smode, PZERO|PCATCH,
 			     "waitvt", 0)) == ERESTART) ;
 	return error;
 
-    case VT_GETACTIVE:
-	*(int *)data = get_scr_num()+1;
+    case VT_GETACTIVE:		/* get active vty # */
+	*(int *)data = sc->cur_scp->index + 1;
+	return 0;
+
+    case VT_GETINDEX:		/* get this vty # */
+	*(int *)data = scp->index + 1;
 	return 0;
 
     case KDENABIO:      	/* allow io operations */
@@ -1568,18 +1056,18 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    return EINVAL;
 	scp->status &= ~LOCK_MASK;
 	scp->status |= *(int *)data;
-	if (scp == cur_console)
-	    update_kbd_state(scp->status, LOCK_MASK);
+	if (scp == sc->cur_scp)
+	    update_kbd_state(scp, scp->status, LOCK_MASK);
 	return 0;
 
     case KDGKBSTATE:    	/* get keyboard state (locks) */
-	if (scp == cur_console)
+	if (scp == sc->cur_scp)
 	    save_kbd_state(scp);
 	*(int *)data = scp->status & LOCK_MASK;
 	return 0;
 
     case KDSETREPEAT:      	/* set keyboard repeat & delay rates (new) */
-	error = kbd_ioctl(kbd, cmd, data);
+	error = kbd_ioctl(sc->kbd, cmd, data);
 	if (error == ENOIOCTL)
 	    error = ENODEV;
 	return error;
@@ -1587,7 +1075,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
     case KDSETRAD:      	/* set keyboard repeat & delay rates (old) */
 	if (*(int *)data & ~0x7f)
 	    return EINVAL;
-	error = kbd_ioctl(kbd, cmd, data);
+	error = kbd_ioctl(sc->kbd, cmd, data);
 	if (error == ENOIOCTL)
 	    error = ENODEV;
 	return error;
@@ -1598,8 +1086,8 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	case K_RAW: 		/* switch to RAW scancode mode */
 	case K_CODE: 		/* switch to CODE mode */
 	    scp->kbd_mode = *(int *)data;
-	    if (scp == cur_console)
-		kbd_ioctl(kbd, cmd, data);
+	    if (scp == sc->cur_scp)
+		kbd_ioctl(sc->kbd, cmd, data);
 	    return 0;
 	default:
 	    return EINVAL;
@@ -1611,7 +1099,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case KDGKBINFO:
-	error = kbd_ioctl(kbd, cmd, data);
+	error = kbd_ioctl(sc->kbd, cmd, data);
 	if (error == ENOIOCTL)
 	    error = ENODEV;
 	return error;
@@ -1625,33 +1113,16 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	return 0;
 
     case KIOCSOUND:     	/* make tone (*data) hz */
-#ifdef __i386__
-	if (scp == cur_console) {
-	    if (*(int*)data) {
-		int pitch = timer_freq / *(int*)data;
-
-		/* set command for counter 2, 2 byte write */
-		if (acquire_timer2(TIMER_16BIT|TIMER_SQWAVE))
-		    return EBUSY;
-
-		/* set pitch */
-		outb(TIMER_CNTR2, pitch);
-		outb(TIMER_CNTR2, (pitch>>8));
-
-		/* enable counter 2 output to speaker */
-		outb(IO_PPI, inb(IO_PPI) | 3);
-	    }
-	    else {
-		/* disable counter 2 output to speaker */
-		outb(IO_PPI, inb(IO_PPI) & 0xFC);
-		release_timer2();
-	    }
+	if (scp == sc->cur_scp) {
+	    if (*(int *)data)
+		return sc_tone(*(int *)data);
+	    else
+		return sc_tone(0);
 	}
-#endif /* __i386__ */
 	return 0;
 
     case KDGKBTYPE:     	/* get keyboard type */
-	error = kbd_ioctl(kbd, cmd, data);
+	error = kbd_ioctl(sc->kbd, cmd, data);
 	if (error == ENOIOCTL) {
 	    /* always return something? XXX */
 	    *(int *)data = 0;
@@ -1663,12 +1134,12 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    return EINVAL;
 	scp->status &= ~LED_MASK;
 	scp->status |= *(int *)data;
-	if (scp == cur_console)
-	    update_kbd_leds(scp->status);
+	if (scp == sc->cur_scp)
+	    update_kbd_leds(scp, scp->status);
 	return 0;
 
     case KDGETLED:      	/* get keyboard LED status */
-	if (scp == cur_console)
+	if (scp == sc->cur_scp)
 	    save_kbd_state(scp);
 	*(int *)data = scp->status & LED_MASK;
 	return 0;
@@ -1684,19 +1155,21 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 		return EINVAL;
 	    }
 	    error = 0;
-	    if (kbd != newkbd) {
+	    if (sc->kbd != newkbd) {
 		i = kbd_allocate(newkbd->kb_name, newkbd->kb_unit,
-				 (void *)&keyboard, sckbdevent, NULL);
+				 (void *)&sc->keyboard, sckbdevent, sc);
 		/* i == newkbd->kb_index */
 		if (i >= 0) {
-		    if (kbd != NULL) {
-			save_kbd_state(cur_console);
-			kbd_release(kbd, (void *)&keyboard);
+		    if (sc->kbd != NULL) {
+			save_kbd_state(sc->cur_scp);
+			kbd_release(sc->kbd, (void *)&sc->keyboard);
 		    }
-		    kbd = kbd_get_keyboard(i);	/* kbd == newkbd */
-		    keyboard = i;
-		    kbd_ioctl(kbd, KDSKBMODE, (caddr_t)&cur_console->kbd_mode);
-		    update_kbd_state(cur_console->status, LOCK_MASK);
+		    sc->kbd = kbd_get_keyboard(i); /* sc->kbd == newkbd */
+		    sc->keyboard = i;
+		    kbd_ioctl(sc->kbd, KDSKBMODE,
+			      (caddr_t)&sc->cur_scp->kbd_mode);
+		    update_kbd_state(sc->cur_scp, sc->cur_scp->status,
+				     LOCK_MASK);
 		} else {
 		    error = EPERM;	/* XXX */
 		}
@@ -1708,25 +1181,26 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
     case CONS_RELKBD: 		/* release the current keyboard */
 	s = spltty();
 	error = 0;
-	if (kbd != NULL) {
-	    save_kbd_state(cur_console);
-	    error = kbd_release(kbd, (void *)&keyboard);
+	if (sc->kbd != NULL) {
+	    save_kbd_state(sc->cur_scp);
+	    error = kbd_release(sc->kbd, (void *)&sc->keyboard);
 	    if (error == 0) {
-		kbd = NULL;
-		keyboard = -1;
+		sc->kbd = NULL;
+		sc->keyboard = -1;
 	    }
 	}
 	splx(s);
 	return error;
 
     case GIO_SCRNMAP:   	/* get output translation table */
-	bcopy(&scr_map, data, sizeof(scr_map));
+	bcopy(&sc->scr_map, data, sizeof(sc->scr_map));
 	return 0;
 
     case PIO_SCRNMAP:   	/* set output translation table */
-	bcopy(data, &scr_map, sizeof(scr_map));
-	for (i=0; i<sizeof(scr_map); i++)
-	    scr_rmap[scr_map[i]] = i;
+	bcopy(data, &sc->scr_map, sizeof(sc->scr_map));
+	for (i=0; i<sizeof(sc->scr_map); i++) {
+	    sc->scr_rmap[sc->scr_map[i]] = i;
+	}
 	return 0;
 
     case GIO_KEYMAP:		/* get keyboard translation table */
@@ -1735,83 +1209,89 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
     case PIO_DEADKEYMAP:	/* set accent key translation table */
     case GETFKEY:		/* get function key string */
     case SETFKEY:		/* set function key string */
-	error = kbd_ioctl(kbd, cmd, data);
+	error = kbd_ioctl(sc->kbd, cmd, data);
 	if (error == ENOIOCTL)
 	    error = ENODEV;
 	return error;
 
+#ifndef SC_NO_FONT_LOADING
+
     case PIO_FONT8x8:   	/* set 8x8 dot font */
-	if (!ISFONTAVAIL(scp->adp->va_flags))
+	if (!ISFONTAVAIL(sc->adp->va_flags))
 	    return ENXIO;
-	bcopy(data, font_8, 8*256);
-	fonts_loaded |= FONT_8;
+	bcopy(data, sc->font_8, 8*256);
+	sc->fonts_loaded |= FONT_8;
 	/*
 	 * FONT KLUDGE
 	 * Always use the font page #0. XXX
 	 * Don't load if the current font size is not 8x8.
 	 */
-	if (ISTEXTSC(cur_console) && (cur_console->font_size < 14))
-	    copy_font(cur_console, LOAD, 8, font_8);
+	if (ISTEXTSC(sc->cur_scp) && (sc->cur_scp->font_size < 14))
+	    copy_font(sc->cur_scp, LOAD, 8, sc->font_8);
 	return 0;
 
     case GIO_FONT8x8:   	/* get 8x8 dot font */
-	if (!ISFONTAVAIL(scp->adp->va_flags))
+	if (!ISFONTAVAIL(sc->adp->va_flags))
 	    return ENXIO;
-	if (fonts_loaded & FONT_8) {
-	    bcopy(font_8, data, 8*256);
+	if (sc->fonts_loaded & FONT_8) {
+	    bcopy(sc->font_8, data, 8*256);
 	    return 0;
 	}
 	else
 	    return ENXIO;
 
     case PIO_FONT8x14:  	/* set 8x14 dot font */
-	if (!ISFONTAVAIL(scp->adp->va_flags))
+	if (!ISFONTAVAIL(sc->adp->va_flags))
 	    return ENXIO;
-	bcopy(data, font_14, 14*256);
-	fonts_loaded |= FONT_14;
+	bcopy(data, sc->font_14, 14*256);
+	sc->fonts_loaded |= FONT_14;
 	/*
 	 * FONT KLUDGE
 	 * Always use the font page #0. XXX
 	 * Don't load if the current font size is not 8x14.
 	 */
-	if (ISTEXTSC(cur_console)
-	    && (cur_console->font_size >= 14) && (cur_console->font_size < 16))
-	    copy_font(cur_console, LOAD, 14, font_14);
+	if (ISTEXTSC(sc->cur_scp)
+	    && (sc->cur_scp->font_size >= 14)
+	    && (sc->cur_scp->font_size < 16))
+	    copy_font(sc->cur_scp, LOAD, 14, sc->font_14);
 	return 0;
 
     case GIO_FONT8x14:  	/* get 8x14 dot font */
-	if (!ISFONTAVAIL(scp->adp->va_flags))
+	if (!ISFONTAVAIL(sc->adp->va_flags))
 	    return ENXIO;
-	if (fonts_loaded & FONT_14) {
-	    bcopy(font_14, data, 14*256);
+	if (sc->fonts_loaded & FONT_14) {
+	    bcopy(sc->font_14, data, 14*256);
 	    return 0;
 	}
 	else
 	    return ENXIO;
 
     case PIO_FONT8x16:  	/* set 8x16 dot font */
-	if (!ISFONTAVAIL(scp->adp->va_flags))
+	if (!ISFONTAVAIL(sc->adp->va_flags))
 	    return ENXIO;
-	bcopy(data, font_16, 16*256);
-	fonts_loaded |= FONT_16;
+	bcopy(data, sc->font_16, 16*256);
+	sc->fonts_loaded |= FONT_16;
 	/*
 	 * FONT KLUDGE
 	 * Always use the font page #0. XXX
 	 * Don't load if the current font size is not 8x16.
 	 */
-	if (ISTEXTSC(cur_console) && (cur_console->font_size >= 16))
-	    copy_font(cur_console, LOAD, 16, font_16);
+	if (ISTEXTSC(sc->cur_scp) && (sc->cur_scp->font_size >= 16))
+	    copy_font(sc->cur_scp, LOAD, 16, sc->font_16);
 	return 0;
 
     case GIO_FONT8x16:  	/* get 8x16 dot font */
-	if (!ISFONTAVAIL(scp->adp->va_flags))
+	if (!ISFONTAVAIL(sc->adp->va_flags))
 	    return ENXIO;
-	if (fonts_loaded & FONT_16) {
-	    bcopy(font_16, data, 16*256);
+	if (sc->fonts_loaded & FONT_16) {
+	    bcopy(sc->font_16, data, 16*256);
 	    return 0;
 	}
 	else
 	    return ENXIO;
+
+#endif /* SC_NO_FONT_LOADING */
+
     default:
 	break;
     }
@@ -1833,8 +1313,8 @@ scstart(struct tty *tp)
     u_char buf[PCBURST];
     scr_stat *scp = sc_get_scr_stat(tp->t_dev);
 
-    if (scp->status & SLKED || blink_in_progress)
-	return; /* XXX who repeats the call when the above flags are cleared? */
+    if (scp->status & SLKED || scp->sc->blink_in_progress)
+	return;
     s = spltty();
     if (!(tp->t_state & (TS_TIMEOUT | TS_BUSY | TS_TTSTOP))) {
 	tp->t_state |= TS_BUSY;
@@ -1871,105 +1351,141 @@ scmousestart(struct tty *tp)
     splx(s);
 }
 
-#if __i386__
-
-/* XXX kludge! */
-extern struct isa_driver scdriver;
-
 static void
 sccnprobe(struct consdev *cp)
 {
-#if 0
-    struct isa_device *dvp;
+#if __i386__
+    int unit;
+    int flags;
 
-    /*
-     * Take control if we are the highest priority enabled display device.
-     */
-    dvp = find_display();
-    if (dvp == NULL || dvp->id_driver != &scdriver) {
-	cp->cn_pri = CN_DEAD;
-	return;
-    }
+    cp->cn_pri = sc_get_cons_priority(&unit, &flags);
 
-    if (!scvidprobe(dvp->id_unit, dvp->id_flags, TRUE)) {
-	cp->cn_pri = CN_DEAD;
-	return;
-    }
-    sckbdprobe(dvp->id_unit, dvp->id_flags, TRUE);
-#else
-    if (!scvidprobe(0, 0, TRUE)) {
+    /* a video card is always required */
+    if (!scvidprobe(unit, flags, TRUE))
 	cp->cn_pri = CN_DEAD;
+
+    /* syscons will become console even when there is no keyboard */
+    sckbdprobe(unit, flags, TRUE);
+
+    if (cp->cn_pri == CN_DEAD)
 	return;
-    }
-    sckbdprobe(0, 0, TRUE);
-#endif
 
     /* initialize required fields */
-    cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLE);
-    cp->cn_pri = CN_INTERNAL;
+    cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLECTL);
+#endif /* __i386__ */
+
+#if __alpha__
+    /*
+     * alpha use sccnattach() rather than cnprobe()/cninit()/cnterm()
+     * interface to install the console.  Always return CN_DEAD from
+     * here.
+     */
+    cp->cn_pri = CN_DEAD;
+#endif /* __alpha__ */
 }
 
 static void
 sccninit(struct consdev *cp)
 {
-    scinit();
+#if __i386__
+    int unit;
+    int flags;
+
+    sc_get_cons_priority(&unit, &flags);
+    scinit(unit, flags | SC_KERNEL_CONSOLE);
+    sc_console_unit = unit;
+    sc_console = sc_get_softc(unit, SC_KERNEL_CONSOLE)->console[0];
+#endif /* __i386__ */
+
+#if __alpha__
+    /* SHOULDN'T REACH HERE */
+#endif /* __alpha__ */
+}
+
+static void
+sccnterm(struct consdev *cp)
+{
+    /* we are not the kernel console any more, release everything */
+
+    if (sc_console_unit < 0)
+	return;			/* shouldn't happen */
+
+#if __i386__
+#if 0 /* XXX */
+    sc_clear_screen(sc_console);
+    sccnupdate(sc_console);
+#endif
+    scterm(sc_console_unit, SC_KERNEL_CONSOLE);
+    sc_console_unit = -1;
+    sc_console = NULL;
+#endif /* __i386__ */
+
+#if __alpha__
+    /* do nothing XXX */
+#endif /* __alpha__ */
 }
 
-#else /* !__i386__ */
+#ifdef __alpha__
 
 extern struct consdev *cn_tab;
 
 void
 sccnattach(void)
 {
-    if (!scvidprobe(0, 0, TRUE) || !sckbdprobe(0, 0, TRUE)) {
+    static struct consdev consdev;
+    int unit;
+    int flags;
+
+    bcopy(&sc_consdev, &consdev, sizeof(sc_consdev));
+    consdev.cn_pri = sc_get_cons_priority(&unit, &flags);
+
+    /* a video card is always required */
+    if (!scvidprobe(unit, flags, TRUE))
+	consdev.cn_pri = CN_DEAD;
+
+    /* alpha doesn't allow the console being without a keyboard... Why? */
+    if (!sckbdprobe(unit, flags, TRUE))
+	consdev.cn_pri = CN_DEAD;
+
+    if (consdev.cn_pri == CN_DEAD)
 	return;
-    }
 
-    scinit();
-    sc_cons.cn_dev = makedev(CDEV_MAJOR, 0);
-    cn_tab = &sc_cons;
+    scinit(unit, flags | SC_KERNEL_CONSOLE);
+    sc_console_unit = unit;
+    sc_console = sc_get_softc(unit, SC_KERNEL_CONSOLE)->console[0];
+    consdev.cn_dev = makedev(CDEV_MAJOR, 0);
+    cn_tab = &consdev;
 }
 
-#endif /* __i386__ */
+#endif /* __alpha__ */
 
 static void
 sccnputc(dev_t dev, int c)
 {
     u_char buf[1];
-    scr_stat *scp = console[0];
+    scr_stat *scp = sc_console;
     term_stat save = scp->term;
-    u_short *p;
     int s;
-    int i;
 
-    if (scp == cur_console && scp->status & SLKED) {
+    /* assert(sc_console != NULL) */
+
+#ifndef SC_NO_HISTORY
+    if (scp == scp->sc->cur_scp && scp->status & SLKED) {
 	scp->status &= ~SLKED;
-	update_kbd_state(scp->status, SLKED);
-	if (cur_console->status & BUFFER_SAVED) {
-	    p = cur_console->history_save;
-	    for (i = 0; i < cur_console->ysize; ++i) {
-		bcopy(p, cur_console->scr_buf + (cur_console->xsize*i),
-		      cur_console->xsize*sizeof(u_short));
-		p += cur_console->xsize;
-		if (p + cur_console->xsize
-		    > cur_console->history + cur_console->history_size)
-		    p = cur_console->history;
-	    }
-	    cur_console->status &= ~BUFFER_SAVED;
-	    cur_console->history_head = cur_console->history_save;
-	    cur_console->status |= CURSOR_ENABLED;
-	    mark_all(cur_console);
+	update_kbd_state(scp, scp->status, SLKED);
+	if (scp->status & BUFFER_SAVED) {
+	    if (!sc_hist_restore(scp))
+		sc_remove_cutmarking(scp);
+	    scp->status &= ~BUFFER_SAVED;
+	    scp->status |= CURSOR_ENABLED;
+	    draw_cursor_image(scp);
 	}
-#if 1 /* XXX */
-	scstart(VIRTUAL_TTY(get_scr_num()));
-#endif
+	scstart(VIRTUAL_TTY(scp->sc, scp->index));
     }
+#endif /* !SC_NO_HISTORY */
 
     scp->term = kernel_console;
     current_default = &kernel_default;
-    if (scp == cur_console && !ISGRAPHSC(scp))
-	remove_cursor_image(scp);
     buf[0] = c;
     ansi_put(scp, buf, 1);
     kernel_console = scp->term;
@@ -1996,18 +1512,30 @@ sccncheckc(dev_t dev)
 static int
 sccngetch(int flags)
 {
+    static struct fkeytab fkey;
+    static int fkeycp;
+    scr_stat *scp;
+    u_char *p;
     int cur_mode;
     int s = spltty();	/* block sckbdevent and scrn_timer while we poll */
     int c;
 
+    /* assert(sc_console != NULL) */
+
     /* 
      * Stop the screen saver and update the screen if necessary.
      * What if we have been running in the screen saver code... XXX
      */
     sc_touch_scrn_saver();
-    sccnupdate(cur_console);
+    scp = sc_console->sc->cur_scp;	/* XXX */
+    sccnupdate(scp);
+
+    if (fkeycp < fkey.len) {
+	splx(s);
+	return fkey.str[fkeycp++];
+    }
 
-    if (kbd == NULL) {
+    if (scp->sc->kbd == NULL) {
 	splx(s);
 	return -1;
     }
@@ -2016,26 +1544,33 @@ sccngetch(int flags)
      * Make sure the keyboard is accessible even when the kbd device
      * driver is disabled.
      */
-    kbd_enable(kbd);
+    kbd_enable(scp->sc->kbd);
 
     /* we shall always use the keyboard in the XLATE mode here */
-    cur_mode = cur_console->kbd_mode;
-    cur_console->kbd_mode = K_XLATE;
-    kbd_ioctl(kbd, KDSKBMODE, (caddr_t)&cur_console->kbd_mode);
+    cur_mode = scp->kbd_mode;
+    scp->kbd_mode = K_XLATE;
+    kbd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode);
 
-    kbd_poll(kbd, TRUE);
-    c = scgetc(kbd, SCGETC_CN | flags);
-    kbd_poll(kbd, FALSE);
+    kbd_poll(scp->sc->kbd, TRUE);
+    c = scgetc(scp->sc, SCGETC_CN | flags);
+    kbd_poll(scp->sc->kbd, FALSE);
 
-    cur_console->kbd_mode = cur_mode;
-    kbd_ioctl(kbd, KDSKBMODE, (caddr_t)&cur_console->kbd_mode);
-    kbd_disable(kbd);
+    scp->kbd_mode = cur_mode;
+    kbd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode);
+    kbd_disable(scp->sc->kbd);
     splx(s);
 
     switch (KEYFLAGS(c)) {
     case 0:	/* normal char */
 	return KEYCHAR(c);
     case FKEY:	/* function key */
+	p = kbd_get_fkeystr(scp->sc->kbd, KEYCHAR(c), (size_t *)&fkeycp);
+	fkey.len = fkeycp;
+	if ((p != NULL) && (fkey.len > 0)) {
+	    bcopy(p, fkey.str, fkey.len);
+	    fkeycp = 1;
+	    return fkey.str[0];
+	}
 	return c;	/* XXX */
     case NOKEY:
     case ERRKEY:
@@ -2050,23 +1585,30 @@ sccnupdate(scr_stat *scp)
 {
     /* this is a cut-down version of scrn_timer()... */
 
-    if (font_loading_in_progress)
+    if (scp->sc->font_loading_in_progress || scp->sc->videoio_in_progress)
 	return;
 
-    if (panicstr || shutdown_in_progress) {
+    if (debugger || panicstr || shutdown_in_progress) {
 	sc_touch_scrn_saver();
-    } else if (scp != cur_console) {
+    } else if (scp != scp->sc->cur_scp) {
 	return;
     }
 
     if (!run_scrn_saver)
-	scrn_idle = FALSE;
-    if ((saver_mode != CONS_LKM_SAVER) || !scrn_idle)
-	if (scrn_blanked)
-            stop_scrn_saver(current_saver);
+	scp->sc->flags &= ~SC_SCRN_IDLE;
+#if NSPLASH > 0
+    if ((saver_mode != CONS_LKM_SAVER) || !(scp->sc->flags & SC_SCRN_IDLE))
+	if (scp->sc->flags & SC_SCRN_BLANKED)
+            stop_scrn_saver(scp->sc, current_saver);
+#endif /* NSPLASH */
 
-    if (scp != cur_console || blink_in_progress || switch_in_progress)
+    if (scp != scp->sc->cur_scp || scp->sc->blink_in_progress
+	|| scp->sc->switch_in_progress)
 	return;
+    /*
+     * FIXME: unlike scrn_timer(), we call scrn_update() from here even
+     * when write_in_progress is non-zero.  XXX
+     */
 
     if (!ISGRAPHSC(scp) && !(scp->status & SAVER_RUNNING))
 	scrn_update(scp, TRUE);
@@ -2075,23 +1617,22 @@ sccnupdate(scr_stat *scp)
 scr_stat
 *sc_get_scr_stat(dev_t dev)
 {
-    int unit = minor(dev);
+    sc_softc_t *sc;
+    int vty = SC_VTY(dev);
+    int unit;
 
-    if (unit == SC_CONSOLE)
-	return console[0];
-    if (unit >= MAXCONS || unit < 0)
-	return(NULL);
-    return console[unit];
-}
-
-static int
-get_scr_num()
-{
-    int i = 0;
+    if (vty < 0)
+	return NULL;
+    if (vty == SC_CONSOLECTL)
+	return sc_console;
 
-    while ((i < MAXCONS) && (cur_console != console[i]))
-	i++;
-    return i < MAXCONS ? i : 0;
+    unit = scdevtounit(dev);
+    sc = sc_get_softc(unit, (sc_console_unit == unit) ? SC_KERNEL_CONSOLE : 0);
+    if (sc == NULL)
+	return NULL;
+    if ((sc->first_vty <= vty) && (vty < sc->first_vty + sc->vtys))
+	return sc->console[vty - sc->first_vty];
+    return NULL;
 }
 
 static void
@@ -2099,113 +1640,187 @@ scrn_timer(void *arg)
 {
     static int kbd_interval = 0;
     struct timeval tv;
+    sc_softc_t *sc;
     scr_stat *scp;
+    int again;
     int s;
 
-    /* don't do anything when we are touching font */
-    if (font_loading_in_progress) {
-	if (arg)
-	    timeout(scrn_timer, (void *)TRUE, hz / 10);
+    again = (arg != NULL);
+    if (arg != NULL)
+	sc = (sc_softc_t *)arg;
+    else if (sc_console != NULL)
+	sc = sc_console->sc;
+    else
+	return;
+
+    /* don't do anything when we are performing some I/O operations */
+    if (sc->font_loading_in_progress || sc->videoio_in_progress) {
+	if (again)
+	    timeout(scrn_timer, sc, hz / 10);
 	return;
     }
     s = spltty();
 
-    if ((kbd == NULL) && (sc_flags & AUTODETECT_KBD)) {
+    if ((sc->kbd == NULL) && (sc->config & SC_AUTODETECT_KBD)) {
 	/* try to allocate a keyboard automatically */
 	if (++kbd_interval >= 25) {
-	    keyboard = kbd_allocate("*", -1, (void *)&keyboard,
-				    sckbdevent, NULL);
-	    if (keyboard >= 0) {
-		kbd = kbd_get_keyboard(keyboard);
-		kbd_ioctl(kbd, KDSKBMODE, (caddr_t)&cur_console->kbd_mode);
-		update_kbd_state(cur_console->status, LOCK_MASK);
+	    sc->keyboard = kbd_allocate("*", -1, (void *)&sc->keyboard,
+					sckbdevent, sc);
+	    if (sc->keyboard >= 0) {
+		sc->kbd = kbd_get_keyboard(sc->keyboard);
+		kbd_ioctl(sc->kbd, KDSKBMODE,
+			  (caddr_t)&sc->cur_scp->kbd_mode);
+		update_kbd_state(sc->cur_scp, sc->cur_scp->status,
+				 LOCK_MASK);
 	    }
 	    kbd_interval = 0;
 	}
     }
 
+    /* find the vty to update */
+    scp = sc->cur_scp;
+
     /* should we stop the screen saver? */
     getmicrouptime(&tv);
-    if (panicstr || shutdown_in_progress)
+    if (debugger || panicstr || shutdown_in_progress)
 	sc_touch_scrn_saver();
     if (run_scrn_saver) {
-	scrn_idle = (tv.tv_sec > scrn_time_stamp + scrn_blank_time);
+	if (tv.tv_sec > sc->scrn_time_stamp + scrn_blank_time)
+	    sc->flags |= SC_SCRN_IDLE;
+	else
+	    sc->flags &= ~SC_SCRN_IDLE;
     } else {
-	scrn_time_stamp = tv.tv_sec;
-	scrn_idle = FALSE;
+	sc->scrn_time_stamp = tv.tv_sec;
+	sc->flags &= ~SC_SCRN_IDLE;
 	if (scrn_blank_time > 0)
 	    run_scrn_saver = TRUE;
     }
-    if ((saver_mode != CONS_LKM_SAVER) || !scrn_idle)
-	if (scrn_blanked)
-            stop_scrn_saver(current_saver);
+#if NSPLASH > 0
+    if ((saver_mode != CONS_LKM_SAVER) || !(sc->flags & SC_SCRN_IDLE))
+	if (sc->flags & SC_SCRN_BLANKED)
+            stop_scrn_saver(sc, current_saver);
+#endif /* NSPLASH */
 
     /* should we just return ? */
-    if (blink_in_progress || switch_in_progress) {
-	if (arg)
-	    timeout(scrn_timer, (void *)TRUE, hz / 10);
+    if (sc->blink_in_progress || sc->switch_in_progress
+	|| sc->write_in_progress) {
+	if (again)
+	    timeout(scrn_timer, sc, hz / 10);
 	splx(s);
 	return;
     }
 
     /* Update the screen */
-    scp = cur_console;
+    scp = sc->cur_scp;		/* cur_scp may have changed... */
     if (!ISGRAPHSC(scp) && !(scp->status & SAVER_RUNNING))
 	scrn_update(scp, TRUE);
 
+#if NSPLASH > 0
     /* should we activate the screen saver? */
-    if ((saver_mode == CONS_LKM_SAVER) && scrn_idle)
-	if (!ISGRAPHSC(scp) || scrn_blanked)
-	    (*current_saver)(TRUE);
+    if ((saver_mode == CONS_LKM_SAVER) && (sc->flags & SC_SCRN_IDLE))
+	if (!ISGRAPHSC(scp) || (sc->flags & SC_SCRN_BLANKED))
+	    (*current_saver)(sc, TRUE);
+#endif /* NSPLASH */
 
-    if (arg)
-	timeout(scrn_timer, (void *)TRUE, hz / 25);
+    if (again)
+	timeout(scrn_timer, sc, hz / 25);
     splx(s);
 }
 
+static int
+and_region(int *s1, int *e1, int s2, int e2)
+{
+    if (*e1 < s2 || e2 < *s1)
+	return FALSE;
+    *s1 = imax(*s1, s2);
+    *e1 = imin(*e1, e2);
+    return TRUE;
+}
+
 static void 
 scrn_update(scr_stat *scp, int show_cursor)
 {
+    int start;
+    int end;
+    int s;
+    int e;
+
+    /* assert(scp == scp->sc->cur_scp) */
+
+    ++scp->sc->videoio_in_progress;
+
+#ifndef SC_NO_CUTPASTE
+    /* remove the previous mouse pointer image if necessary */
+    if ((scp->status & (MOUSE_VISIBLE | MOUSE_MOVED))
+	== (MOUSE_VISIBLE | MOUSE_MOVED)) {
+	/* FIXME: I don't like this... XXX */
+	sc_remove_mouse_image(scp);
+        if (scp->end >= scp->xsize*scp->ysize)
+	    scp->end = scp->xsize*scp->ysize - 1;
+    }
+#endif /* !SC_NO_CUTPASTE */
+
+#if 1
+    /* debug: XXX */
+    if (scp->end >= scp->xsize*scp->ysize) {
+	printf("scrn_update(): scp->end %d > size_of_screen!!\n", scp->end);
+	scp->end = scp->xsize*scp->ysize - 1;
+    }
+    if (scp->start < 0) {
+	printf("scrn_update(): scp->start %d < 0\n", scp->start);
+	scp->start = 0;
+    }
+#endif
+
     /* update screen image */
-    if (scp->start <= scp->end) 
-        sc_bcopy(scp, scp->scr_buf, scp->start, scp->end, 0);
+    if (scp->start <= scp->end)  {
+	if (scp->mouse_cut_end >= 0) {
+	    /* there is a marked region for cut & paste */
+	    if (scp->mouse_cut_start <= scp->mouse_cut_end) {
+		start = scp->mouse_cut_start;
+		end = scp->mouse_cut_end;
+	    } else {
+		start = scp->mouse_cut_end;
+		end = scp->mouse_cut_start - 1;
+	    }
+	    s = start;
+	    e = end;
+	    /* does the cut-mark region overlap with the update region? */
+	    if (and_region(&s, &e, scp->start, scp->end)) {
+		(*scp->rndr->draw)(scp, s, e - s + 1, TRUE);
+		s = 0;
+		e = start - 1;
+		if (and_region(&s, &e, scp->start, scp->end))
+		    (*scp->rndr->draw)(scp, s, e - s + 1, FALSE);
+		s = end + 1;
+		e = scp->xsize*scp->ysize - 1;
+		if (and_region(&s, &e, scp->start, scp->end))
+		    (*scp->rndr->draw)(scp, s, e - s + 1, FALSE);
+	    } else {
+		(*scp->rndr->draw)(scp, scp->start,
+				   scp->end - scp->start + 1, FALSE);
+	    }
+	} else {
+	    (*scp->rndr->draw)(scp, scp->start,
+			       scp->end - scp->start + 1, FALSE);
+	}
+    }
 
     /* we are not to show the cursor and the mouse pointer... */
     if (!show_cursor) {
         scp->end = 0;
         scp->start = scp->xsize*scp->ysize - 1;
+	--scp->sc->videoio_in_progress;
 	return;
     }
 
-    /* update "pseudo" mouse pointer image */
-    if (scp->status & MOUSE_VISIBLE) {
-        /* did mouse move since last time ? */
-        if (scp->status & MOUSE_MOVED) {
-            /* do we need to remove old mouse pointer image ? */
-            if (scp->mouse_cut_start != NULL ||
-                (scp->mouse_pos-scp->scr_buf) <= scp->start ||
-                (scp->mouse_pos+scp->xsize + 1 - scp->scr_buf) >= scp->end) {
-                remove_mouse_image(scp);
-            }
-            scp->status &= ~MOUSE_MOVED;
-            draw_mouse_image(scp);
-        }
-        else {
-            /* mouse didn't move, has it been overwritten ? */
-            if ((scp->mouse_pos+scp->xsize + 1 - scp->scr_buf) >= scp->start &&
-                (scp->mouse_pos - scp->scr_buf) <= scp->end) {
-                draw_mouse_image(scp);
-            }
-        }
-    }
-	
     /* update cursor image */
     if (scp->status & CURSOR_ENABLED) {
         /* did cursor move since last time ? */
         if (scp->cursor_pos != scp->cursor_oldpos) {
             /* do we need to remove old cursor image ? */
-            if ((scp->cursor_oldpos - scp->scr_buf) < scp->start ||
-                ((scp->cursor_oldpos - scp->scr_buf) > scp->end)) {
+            if (scp->cursor_oldpos < scp->start ||
+                scp->cursor_oldpos > scp->end) {
                 remove_cursor_image(scp);
             }
             scp->cursor_oldpos = scp->cursor_pos;
@@ -2213,40 +1828,64 @@ scrn_update(scr_stat *scp, int show_cursor)
         }
         else {
             /* cursor didn't move, has it been overwritten ? */
-            if (scp->cursor_pos - scp->scr_buf >= scp->start &&
-                scp->cursor_pos - scp->scr_buf <= scp->end) {
+            if (scp->cursor_pos >= scp->start && scp->cursor_pos <= scp->end) {
                 draw_cursor_image(scp);
             } else {
                 /* if its a blinking cursor, we may have to update it */
-		if (sc_flags & BLINK_CURSOR)
-                    draw_cursor_image(scp);
+		if (scp->sc->flags & SC_BLINK_CURSOR)
+                    (*scp->rndr->blink_cursor)(scp, scp->cursor_pos,
+					       sc_inside_cutmark(scp,
+							scp->cursor_pos));
             }
         }
-        blinkrate++;
     }
 
-    if (scp->mouse_cut_start != NULL)
-        draw_cutmarking(scp);
+#ifndef SC_NO_CUTPASTE
+    /* update "pseudo" mouse pointer image */
+    if (scp->status & MOUSE_VISIBLE) {
+        /* did mouse move since last time ? */
+        if (scp->status & MOUSE_MOVED) {
+            /* the previous pointer image has been removed, see above */
+            scp->status &= ~MOUSE_MOVED;
+            sc_draw_mouse_image(scp);
+        } else {
+            /* mouse didn't move, has it been overwritten ? */
+            if (scp->mouse_pos + scp->xsize + 1 >= scp->start &&
+                scp->mouse_pos <= scp->end) {
+                sc_draw_mouse_image(scp);
+            } else if (scp->cursor_pos == scp->mouse_pos ||
+            	scp->cursor_pos == scp->mouse_pos + 1 ||
+            	scp->cursor_pos == scp->mouse_pos + scp->xsize ||
+            	scp->cursor_pos == scp->mouse_pos + scp->xsize + 1) {
+                sc_draw_mouse_image(scp);
+	    }
+        }
+    }
+#endif /* SC_NO_CUTPASTE */
 
     scp->end = 0;
     scp->start = scp->xsize*scp->ysize - 1;
+
+    --scp->sc->videoio_in_progress;
 }
 
 #if NSPLASH > 0
-
 static int
-scsplash_callback(int event)
+scsplash_callback(int event, void *arg)
 {
+    sc_softc_t *sc;
     int error;
 
+    sc = (sc_softc_t *)arg;
+
     switch (event) {
     case SPLASH_INIT:
-	scrn_saver_failed = FALSE;
 	if (add_scrn_saver(scsplash_saver) == 0) {
+	    sc->flags &= ~SC_SAVER_FAILED;
 	    run_scrn_saver = TRUE;
 	    if (cold && !(boothowto & (RB_VERBOSE | RB_CONFIG))) {
 		scsplash_stick(TRUE);
-		(*current_saver)(TRUE);
+		(*current_saver)(sc, TRUE);
 	    }
 	}
 	return 0;
@@ -2266,7 +1905,7 @@ scsplash_callback(int event)
 }
 
 static void
-scsplash_saver(int show)
+scsplash_saver(sc_softc_t *sc, int show)
 {
     static int busy = FALSE;
     scr_stat *scp;
@@ -2275,38 +1914,37 @@ scsplash_saver(int show)
 	return;
     busy = TRUE;
 
-    scp = cur_console;
+    scp = sc->cur_scp;
     if (show) {
-	if (!scrn_saver_failed) {
-	    if (!scrn_blanked)
+	if (!(sc->flags & SC_SAVER_FAILED)) {
+	    if (!(sc->flags & SC_SCRN_BLANKED))
 		set_scrn_saver_mode(scp, -1, NULL, 0);
-	    switch (splash(scp->adp, TRUE)) {
+	    switch (splash(sc->adp, TRUE)) {
 	    case 0:		/* succeeded */
-		scrn_blanked = TRUE;
 		break;
 	    case EAGAIN:	/* try later */
 		restore_scrn_saver_mode(scp, FALSE);
+		sc_touch_scrn_saver();		/* XXX */
 		break;
 	    default:
-		scrn_saver_failed = TRUE;
+		sc->flags |= SC_SAVER_FAILED;
 		scsplash_stick(FALSE);
-		printf("scsplash_saver(): failed to put up the image\n");
 		restore_scrn_saver_mode(scp, TRUE);
+		printf("scsplash_saver(): failed to put up the image\n");
 		break;
 	    }
 	}
     } else if (!sticky_splash) {
-	if (scrn_blanked && (splash(scp->adp, FALSE) == 0)) {
+	if ((sc->flags & SC_SCRN_BLANKED) && (splash(sc->adp, FALSE) == 0))
 	    restore_scrn_saver_mode(scp, TRUE);
-	    scrn_blanked = FALSE;
-	}
     }
     busy = FALSE;
 }
 
 static int
-add_scrn_saver(void (*this_saver)(int))
+add_scrn_saver(void (*this_saver)(sc_softc_t *, int))
 {
+#if 0
     int error;
 
     if (current_saver != none_saver) {
@@ -2314,6 +1952,9 @@ add_scrn_saver(void (*this_saver)(int))
 	if (error)
 	    return error;
     }
+#endif
+    if (current_saver != none_saver)
+	return EBUSY;
 
     run_scrn_saver = FALSE;
     saver_mode = CONS_LKM_SAVER;
@@ -2322,11 +1963,12 @@ add_scrn_saver(void (*this_saver)(int))
 }
 
 static int
-remove_scrn_saver(void (*this_saver)(int))
+remove_scrn_saver(void (*this_saver)(sc_softc_t *, int))
 {
     if (current_saver != this_saver)
 	return EINVAL;
 
+#if 0
     /*
      * In order to prevent `current_saver' from being called by
      * the timeout routine `scrn_timer()' while we manipulate 
@@ -2336,8 +1978,15 @@ remove_scrn_saver(void (*this_saver)(int))
     current_saver = none_saver;
     if (scrn_blanked)
         stop_scrn_saver(this_saver);
+#endif
+
+    /* unblank all blanked screens */
+    wait_scrn_saver_stop(NULL);
+    if (scrn_blanked)
+	return EBUSY;
 
-    return (scrn_blanked ? EBUSY : 0);
+    current_saver = none_saver;
+    return 0;
 }
 
 static int
@@ -2345,21 +1994,27 @@ set_scrn_saver_mode(scr_stat *scp, int mode, u_char *pal, int border)
 {
     int s;
 
-    /* assert(scp == cur_console) */
+    /* assert(scp == scp->sc->cur_scp) */
     s = spltty();
+    if (!ISGRAPHSC(scp))
+	remove_cursor_image(scp);
     scp->splash_save_mode = scp->mode;
     scp->splash_save_status = scp->status & (GRAPHICS_MODE | PIXEL_MODE);
     scp->status &= ~(GRAPHICS_MODE | PIXEL_MODE);
     scp->status |= (UNKNOWN_MODE | SAVER_RUNNING);
+    scp->sc->flags |= SC_SCRN_BLANKED;
+    ++scrn_blanked;
     splx(s);
     if (mode < 0)
 	return 0;
     scp->mode = mode;
     if (set_mode(scp) == 0) {
-	if (scp->adp->va_info.vi_flags & V_INFO_GRAPHICS)
+	if (scp->sc->adp->va_info.vi_flags & V_INFO_GRAPHICS)
 	    scp->status |= GRAPHICS_MODE;
+#ifndef SC_NO_PALETTE_LOADING
 	if (pal != NULL)
-	    load_palette(scp->adp, pal);
+	    load_palette(scp->sc->adp, pal);
+#endif
 	set_border(scp, border);
 	return 0;
     } else {
@@ -2379,19 +2034,26 @@ restore_scrn_saver_mode(scr_stat *scp, int changemode)
     int status;
     int s;
 
-    /* assert(scp == cur_console) */
+    /* assert(scp == scp->sc->cur_scp) */
     s = spltty();
     mode = scp->mode;
     status = scp->status;
     scp->mode = scp->splash_save_mode;
     scp->status &= ~(UNKNOWN_MODE | SAVER_RUNNING);
     scp->status |= scp->splash_save_status;
+    scp->sc->flags &= ~SC_SCRN_BLANKED;
     if (!changemode) {
+	if (!ISGRAPHSC(scp))
+	    draw_cursor_image(scp);
+	--scrn_blanked;
 	splx(s);
 	return 0;
     }
     if (set_mode(scp) == 0) {
-	load_palette(scp->adp, palette);
+#ifndef SC_NO_PALETTE_LOADING
+	load_palette(scp->sc->adp, scp->sc->palette);
+#endif
+	--scrn_blanked;
 	splx(s);
 	return 0;
     } else {
@@ -2403,35 +2065,38 @@ restore_scrn_saver_mode(scr_stat *scp, int changemode)
 }
 
 static void
-stop_scrn_saver(void (*saver)(int))
+stop_scrn_saver(sc_softc_t *sc, void (*saver)(sc_softc_t *, int))
 {
-    (*saver)(FALSE);
+    (*saver)(sc, FALSE);
     run_scrn_saver = FALSE;
     /* the screen saver may have chosen not to stop after all... */
-    if (scrn_blanked)
+    if (sc->flags & SC_SCRN_BLANKED)
 	return;
 
-    mark_all(cur_console);
-    if (delayed_next_scr)
-	switch_scr(cur_console, delayed_next_scr - 1);
+    mark_all(sc->cur_scp);
+    if (sc->delayed_next_scr)
+	switch_scr(sc, sc->delayed_next_scr - 1);
     wakeup((caddr_t)&scrn_blanked);
 }
 
 static int
-wait_scrn_saver_stop(void)
+wait_scrn_saver_stop(sc_softc_t *sc)
 {
     int error = 0;
 
-    while (scrn_blanked) {
+    while (scrn_blanked > 0) {
 	run_scrn_saver = FALSE;
+	if (sc && !(sc->flags & SC_SCRN_BLANKED)) {
+	    error = 0;
+	    break;
+	}
 	error = tsleep((caddr_t)&scrn_blanked, PZERO | PCATCH, "scrsav", 0);
-	run_scrn_saver = FALSE;
-	if (error != ERESTART)
+	if ((error != 0) && (error != ERESTART))
 	    break;
     }
+    run_scrn_saver = FALSE;
     return error;
 }
-
 #endif /* NSPLASH */
 
 void
@@ -2446,99 +2111,297 @@ sc_clear_screen(scr_stat *scp)
 {
     move_crsr(scp, 0, 0);
     scp->cursor_oldpos = scp->cursor_pos;
-    fillw(scp->term.cur_color | scr_map[0x20], scp->scr_buf,
-	  scp->xsize * scp->ysize);
+    sc_vtb_clear(&scp->vtb, scp->sc->scr_map[0x20], scp->term.cur_color);
     mark_all(scp);
-    remove_cutmarking(scp);
+    sc_remove_cutmarking(scp);
 }
 
 static int
-switch_scr(scr_stat *scp, u_int next_scr)
+switch_scr(sc_softc_t *sc, u_int next_scr)
 {
-    /* delay switch if actively updating screen */
-    if (scrn_blanked || write_in_progress || blink_in_progress) {
-	delayed_next_scr = next_scr+1;
+    struct tty *tp;
+    int s;
+
+    DPRINTF(5, ("sc0: switch_scr() %d ", next_scr + 1));
+
+    /* delay switch if the screen is blanked or being updated */
+    if ((sc->flags & SC_SCRN_BLANKED) || sc->write_in_progress
+	|| sc->blink_in_progress || sc->videoio_in_progress) {
+	sc->delayed_next_scr = next_scr + 1;
 	sc_touch_scrn_saver();
+	DPRINTF(5, ("switch delayed\n"));
 	return 0;
     }
 
-    if (switch_in_progress && (cur_console->proc != pfind(cur_console->pid)))
-	switch_in_progress = FALSE;
+    s = spltty();
+
+    /* we are in the middle of the vty switching process... */
+    if (sc->switch_in_progress
+	&& (sc->cur_scp->smode.mode == VT_PROCESS)
+	&& sc->cur_scp->proc) {
+	if (sc->cur_scp->proc != pfind(sc->cur_scp->pid)) {
+	    /* 
+	     * The controlling process has died!!.  Do some clean up.
+	     * NOTE:`cur_scp->proc' and `cur_scp->smode.mode' 
+	     * are not reset here yet; they will be cleared later.
+	     */
+	    DPRINTF(5, ("cur_scp controlling process %d died, ",
+	       sc->cur_scp->pid));
+	    if (sc->cur_scp->status & SWITCH_WAIT_REL) {
+		/*
+		 * Force the previous switch to finish, but return now 
+		 * with error.
+		 */
+		DPRINTF(5, ("reset WAIT_REL, "));
+		sc->cur_scp->status &= ~SWITCH_WAIT_REL; 
+		s = do_switch_scr(sc, s);
+		splx(s);
+		DPRINTF(5, ("finishing previous switch\n"));
+		return EINVAL;
+	    } else if (sc->cur_scp->status & SWITCH_WAIT_ACQ) {
+		/* let's assume screen switch has been completed. */
+		DPRINTF(5, ("reset WAIT_ACQ, "));
+		sc->cur_scp->status &= ~SWITCH_WAIT_ACQ;
+		sc->switch_in_progress = 0;
+	    } else {
+		/* 
+	 	 * We are in between screen release and acquisition, and
+		 * reached here via scgetc() or scrn_timer() which has 
+		 * interrupted exchange_scr(). Don't do anything stupid.
+		 */
+		DPRINTF(5, ("waiting nothing, "));
+	    }
+	} else {
+	    /*
+	     * The controlling process is alive, but not responding... 
+	     * It is either buggy or it may be just taking time.
+	     * The following code is a gross kludge to cope with this
+	     * problem for which there is no clean solution. XXX
+	     */
+	    if (sc->cur_scp->status & SWITCH_WAIT_REL) {
+		switch (sc->switch_in_progress++) {
+		case 1:
+		    break;
+		case 2:
+		    DPRINTF(5, ("sending relsig again, "));
+		    signal_vt_rel(sc->cur_scp);
+		    break;
+		case 3:
+		    break;
+		case 4:
+		default:
+		    /*
+		     * Clear the flag and force the previous switch to finish,
+		     * but return now with error.
+		     */
+		    DPRINTF(5, ("force reset WAIT_REL, "));
+		    sc->cur_scp->status &= ~SWITCH_WAIT_REL; 
+		    s = do_switch_scr(sc, s);
+		    splx(s);
+		    DPRINTF(5, ("force finishing previous switch\n"));
+		    return EINVAL;
+		}
+	    } else if (sc->cur_scp->status & SWITCH_WAIT_ACQ) {
+		switch (sc->switch_in_progress++) {
+		case 1:
+		    break;
+		case 2:
+		    DPRINTF(5, ("sending acqsig again, "));
+		    signal_vt_acq(sc->cur_scp);
+		    break;
+		case 3:
+		    break;
+		case 4:
+		default:
+		     /* clear the flag and finish the previous switch */
+		    DPRINTF(5, ("force reset WAIT_ACQ, "));
+		    sc->cur_scp->status &= ~SWITCH_WAIT_ACQ;
+		    sc->switch_in_progress = 0;
+		    break;
+		}
+	    }
+	}
+    }
+
+    /*
+     * Return error if an invalid argument is given, or vty switch
+     * is still in progress.
+     */
+    if ((next_scr < sc->first_vty) || (next_scr >= sc->first_vty + sc->vtys)
+	|| sc->switch_in_progress) {
+	splx(s);
+	do_bell(sc->cur_scp, bios_value.bell_pitch, BELL_DURATION);
+	DPRINTF(5, ("error 1\n"));
+	return EINVAL;
+    }
 
-    if (next_scr >= MAXCONS || switch_in_progress ||
-	(cur_console->smode.mode == VT_AUTO && ISGRAPHSC(cur_console))) {
-	do_bell(scp, BELL_PITCH, BELL_DURATION);
+    /*
+     * Don't allow switching away from the graphics mode vty
+     * if the switch mode is VT_AUTO, unless the next vty is the same 
+     * as the current or the current vty has been closed (but showing).
+     */
+    tp = VIRTUAL_TTY(sc, sc->cur_scp->index);
+    if ((sc->cur_scp->index != next_scr)
+	&& (tp->t_state & TS_ISOPEN)
+	&& (sc->cur_scp->smode.mode == VT_AUTO)
+	&& ISGRAPHSC(sc->cur_scp)) {
+	splx(s);
+	do_bell(sc->cur_scp, bios_value.bell_pitch, BELL_DURATION);
+	DPRINTF(5, ("error, graphics mode\n"));
 	return EINVAL;
     }
 
-    /* is the wanted virtual console open ? */
-    if (next_scr) {
-	struct tty *tp = VIRTUAL_TTY(next_scr);
+    /*
+     * Is the wanted vty open? Don't allow switching to a closed vty.
+     * Note that we always allow the user to switch to the kernel 
+     * console even if it is closed.
+     */
+    if ((sc_console == NULL) || (next_scr != sc_console->index)) {
+	tp = VIRTUAL_TTY(sc, next_scr);
 	if (!(tp->t_state & TS_ISOPEN)) {
-	    do_bell(scp, BELL_PITCH, BELL_DURATION);
+	    splx(s);
+	    do_bell(sc->cur_scp, bios_value.bell_pitch, BELL_DURATION);
+	    DPRINTF(5, ("error 2, requested vty isn't open!\n"));
 	    return EINVAL;
 	}
     }
 
-    switch_in_progress = TRUE;
-    old_scp = cur_console;
-    new_scp = console[next_scr];
-    wakeup((caddr_t)&new_scp->smode);
-    if (new_scp == old_scp) {
-	switch_in_progress = FALSE;
-	delayed_next_scr = FALSE;
+    /* this is the start of vty switching process... */
+    ++sc->switch_in_progress;
+    sc->delayed_next_scr = 0;
+    sc->old_scp = sc->cur_scp;
+    sc->new_scp = sc->console[next_scr - sc->first_vty];
+    if (sc->new_scp == sc->old_scp) {
+	sc->switch_in_progress = 0;
+	wakeup((caddr_t)&sc->new_scp->smode);
+	splx(s);
+	DPRINTF(5, ("switch done (new == old)\n"));
 	return 0;
     }
 
     /* has controlling process died? */
-    if (old_scp->proc && (old_scp->proc != pfind(old_scp->pid)))
-	old_scp->smode.mode = VT_AUTO;
-    if (new_scp->proc && (new_scp->proc != pfind(new_scp->pid)))
-	new_scp->smode.mode = VT_AUTO;
-
-    /* check the modes and switch appropriately */
-    if (old_scp->smode.mode == VT_PROCESS) {
-	old_scp->status |= SWITCH_WAIT_REL;
-	psignal(old_scp->proc, old_scp->smode.relsig);
+    vt_proc_alive(sc->old_scp);
+    vt_proc_alive(sc->new_scp);
+
+    /* wait for the controlling process to release the screen, if necessary */
+    if (signal_vt_rel(sc->old_scp)) {
+	splx(s);
+	return 0;
     }
-    else {
-	exchange_scr();
-	if (new_scp->smode.mode == VT_PROCESS) {
-	    new_scp->status |= SWITCH_WAIT_ACQ;
-	    psignal(new_scp->proc, new_scp->smode.acqsig);
-	}
-	else
-	    switch_in_progress = FALSE;
+
+    /* go set up the new vty screen */
+    splx(s);
+    exchange_scr(sc);
+    s = spltty();
+
+    /* wake up processes waiting for this vty */
+    wakeup((caddr_t)&sc->cur_scp->smode);
+
+    /* wait for the controlling process to acknowledge, if necessary */
+    if (signal_vt_acq(sc->cur_scp)) {
+	splx(s);
+	return 0;
     }
+
+    sc->switch_in_progress = 0;
+    if (sc->unit == sc_console_unit)
+	cons_unavail = FALSE;
+    splx(s);
+    DPRINTF(5, ("switch done\n"));
+
     return 0;
 }
 
+static int
+do_switch_scr(sc_softc_t *sc, int s)
+{
+    vt_proc_alive(sc->new_scp);
+
+    splx(s);
+    exchange_scr(sc);
+    s = spltty();
+    /* sc->cur_scp == sc->new_scp */
+    wakeup((caddr_t)&sc->cur_scp->smode);
+
+    /* wait for the controlling process to acknowledge, if necessary */
+    if (!signal_vt_acq(sc->cur_scp)) {
+	sc->switch_in_progress = 0;
+	if (sc->unit == sc_console_unit)
+	    cons_unavail = FALSE;
+    }
+
+    return s;
+}
+
+static int
+vt_proc_alive(scr_stat *scp)
+{
+    if (scp->proc) {
+	if (scp->proc == pfind(scp->pid))
+	    return TRUE;
+	scp->proc = NULL;
+	scp->smode.mode = VT_AUTO;
+	DPRINTF(5, ("vt controlling process %d died\n", scp->pid));
+    }
+    return FALSE;
+}
+
+static int
+signal_vt_rel(scr_stat *scp)
+{
+    if (scp->smode.mode != VT_PROCESS)
+	return FALSE;
+    scp->status |= SWITCH_WAIT_REL;
+    psignal(scp->proc, scp->smode.relsig);
+    DPRINTF(5, ("sending relsig to %d\n", scp->pid));
+    return TRUE;
+}
+
+static int
+signal_vt_acq(scr_stat *scp)
+{
+    if (scp->smode.mode != VT_PROCESS)
+	return FALSE;
+    if (scp->sc->unit == sc_console_unit)
+	cons_unavail = TRUE;
+    scp->status |= SWITCH_WAIT_ACQ;
+    psignal(scp->proc, scp->smode.acqsig);
+    DPRINTF(5, ("sending acqsig to %d\n", scp->pid));
+    return TRUE;
+}
+
 static void
-exchange_scr(void)
+exchange_scr(sc_softc_t *sc)
 {
+    scr_stat *scp;
+
     /* save the current state of video and keyboard */
-    move_crsr(old_scp, old_scp->xpos, old_scp->ypos);
-    if (old_scp->kbd_mode == K_XLATE)
-	save_kbd_state(old_scp);
+    move_crsr(sc->old_scp, sc->old_scp->xpos, sc->old_scp->ypos);
+    if (sc->old_scp->kbd_mode == K_XLATE)
+	save_kbd_state(sc->old_scp);
 
     /* set up the video for the new screen */
-    cur_console = new_scp;
-    if (old_scp->mode != new_scp->mode || ISUNKNOWNSC(old_scp))
-	set_mode(new_scp);
-    move_crsr(new_scp, new_scp->xpos, new_scp->ypos);
-    if (ISTEXTSC(new_scp) && (sc_flags & CHAR_CURSOR))
-	set_destructive_cursor(new_scp);
-    if (ISGRAPHSC(old_scp))
-	load_palette(new_scp->adp, palette);
-    set_border(new_scp, new_scp->border);
+    scp = sc->cur_scp = sc->new_scp;
+    if (sc->old_scp->mode != scp->mode || ISUNKNOWNSC(sc->old_scp))
+	set_mode(scp);
+    else
+	sc_vtb_init(&scp->scr, VTB_FRAMEBUFFER, scp->xsize, scp->ysize,
+		    (void *)sc->adp->va_window, FALSE);
+    move_crsr(scp, scp->xpos, scp->ypos);
+    if (!ISGRAPHSC(scp))
+	sc_set_cursor_image(scp);
+#ifndef SC_NO_PALETTE_LOADING
+    if (ISGRAPHSC(sc->old_scp))
+	load_palette(sc->adp, sc->palette);
+#endif
+    set_border(scp, scp->border);
 
     /* set up the keyboard for the new screen */
-    if (old_scp->kbd_mode != new_scp->kbd_mode)
-	kbd_ioctl(kbd, KDSKBMODE, (caddr_t)&new_scp->kbd_mode);
-    update_kbd_state(new_scp->status, LOCK_MASK);
+    if (sc->old_scp->kbd_mode != scp->kbd_mode)
+	kbd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode);
+    update_kbd_state(scp, scp->status, LOCK_MASK);
 
-    delayed_next_scr = FALSE;
-    mark_all(new_scp);
+    mark_all(scp);
 }
 
 static void
@@ -2546,9 +2409,11 @@ scan_esc(scr_stat *scp, u_char c)
 {
     static u_char ansi_col[16] =
 	{0, 4, 2, 6, 1, 5, 3, 7, 8, 12, 10, 14, 9, 13, 11, 15};
+    sc_softc_t *sc;
     int i, n;
-    u_short *src, *dst, count;
+    int count;
 
+    sc = scp->sc; 
     if (scp->term.esc == 1) {	/* seen ESC */
 	switch (c) {
 
@@ -2574,10 +2439,8 @@ scan_esc(scr_stat *scp, u_char c)
 	    if (scp->ypos > 0)
 		move_crsr(scp, scp->xpos, scp->ypos - 1);
 	    else {
-		bcopy(scp->scr_buf, scp->scr_buf + scp->xsize,
-		       (scp->ysize - 1) * scp->xsize * sizeof(u_short));
-		fillw(scp->term.cur_color | scr_map[0x20],
-		      scp->scr_buf, scp->xsize);
+		sc_vtb_ins(&scp->vtb, 0, scp->xsize,
+			   sc->scr_map[0x20], scp->term.cur_color);
     		mark_all(scp);
 	    }
 	    break;
@@ -2669,26 +2532,24 @@ scan_esc(scr_stat *scp, u_char c)
 		n = scp->term.param[0];
 	    switch (n) {
 	    case 0: /* clear form cursor to end of display */
-		fillw(scp->term.cur_color | scr_map[0x20],
-		      scp->cursor_pos,
-		      scp->scr_buf + scp->xsize * scp->ysize - scp->cursor_pos);
-    		mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
+		sc_vtb_erase(&scp->vtb, scp->cursor_pos,
+			     scp->xsize * scp->ysize - scp->cursor_pos,
+			     sc->scr_map[0x20], scp->term.cur_color);
+		mark_for_update(scp, scp->cursor_pos);
     		mark_for_update(scp, scp->xsize * scp->ysize - 1);
-		remove_cutmarking(scp);
+		sc_remove_cutmarking(scp);
 		break;
 	    case 1: /* clear from beginning of display to cursor */
-		fillw(scp->term.cur_color | scr_map[0x20],
-		      scp->scr_buf,
-		      scp->cursor_pos - scp->scr_buf);
-    		mark_for_update(scp, 0);
-    		mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
-		remove_cutmarking(scp);
+		sc_vtb_erase(&scp->vtb, 0, scp->cursor_pos,
+			     sc->scr_map[0x20], scp->term.cur_color);
+		mark_for_update(scp, 0);
+		mark_for_update(scp, scp->cursor_pos);
+		sc_remove_cutmarking(scp);
 		break;
 	    case 2: /* clear entire display */
-		fillw(scp->term.cur_color | scr_map[0x20], scp->scr_buf,
-		      scp->xsize * scp->ysize);
+		sc_vtb_clear(&scp->vtb, sc->scr_map[0x20], scp->term.cur_color);
 		mark_all(scp);
-		remove_cutmarking(scp);
+		sc_remove_cutmarking(scp);
 		break;
 	    }
 	    break;
@@ -2700,24 +2561,24 @@ scan_esc(scr_stat *scp, u_char c)
 		n = scp->term.param[0];
 	    switch (n) {
 	    case 0: /* clear form cursor to end of line */
-		fillw(scp->term.cur_color | scr_map[0x20],
-		      scp->cursor_pos,
-		      scp->xsize - scp->xpos);
-    		mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
-    		mark_for_update(scp, scp->cursor_pos - scp->scr_buf +
+		sc_vtb_erase(&scp->vtb, scp->cursor_pos,
+			     scp->xsize - scp->xpos,
+			     sc->scr_map[0x20], scp->term.cur_color);
+    		mark_for_update(scp, scp->cursor_pos);
+    		mark_for_update(scp, scp->cursor_pos +
 				scp->xsize - 1 - scp->xpos);
 		break;
 	    case 1: /* clear from beginning of line to cursor */
-		fillw(scp->term.cur_color | scr_map[0x20],
-		      scp->cursor_pos - scp->xpos,
-		      scp->xpos + 1);
+		sc_vtb_erase(&scp->vtb, scp->cursor_pos - scp->xpos,
+			     scp->xpos + 1,
+			     sc->scr_map[0x20], scp->term.cur_color);
     		mark_for_update(scp, scp->ypos * scp->xsize);
-    		mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
+    		mark_for_update(scp, scp->cursor_pos);
 		break;
 	    case 2: /* clear entire line */
-		fillw(scp->term.cur_color | scr_map[0x20],
-		      scp->cursor_pos - scp->xpos,
-		      scp->xsize);
+		sc_vtb_erase(&scp->vtb, scp->cursor_pos - scp->xpos,
+			     scp->xsize,
+			     sc->scr_map[0x20], scp->term.cur_color);
     		mark_for_update(scp, scp->ypos * scp->xsize);
     		mark_for_update(scp, (scp->ypos + 1) * scp->xsize - 1);
 		break;
@@ -2728,12 +2589,8 @@ scan_esc(scr_stat *scp, u_char c)
 	    n = scp->term.param[0]; if (n < 1) n = 1;
 	    if (n > scp->ysize - scp->ypos)
 		n = scp->ysize - scp->ypos;
-	    src = scp->scr_buf + scp->ypos * scp->xsize;
-	    dst = src + n * scp->xsize;
-	    count = scp->ysize - (scp->ypos + n);
-	    bcopy(src, dst, count * scp->xsize * sizeof(u_short));
-	    fillw(scp->term.cur_color | scr_map[0x20], src,
-		  n * scp->xsize);
+	    sc_vtb_ins(&scp->vtb, scp->ypos * scp->xsize, n * scp->xsize,
+		       sc->scr_map[0x20], scp->term.cur_color);
 	    mark_for_update(scp, scp->ypos * scp->xsize);
 	    mark_for_update(scp, scp->xsize * scp->ysize - 1);
 	    break;
@@ -2742,13 +2599,8 @@ scan_esc(scr_stat *scp, u_char c)
 	    n = scp->term.param[0]; if (n < 1) n = 1;
 	    if (n > scp->ysize - scp->ypos)
 		n = scp->ysize - scp->ypos;
-	    dst = scp->scr_buf + scp->ypos * scp->xsize;
-	    src = dst + n * scp->xsize;
-	    count = scp->ysize - (scp->ypos + n);
-	    bcopy(src, dst, count * scp->xsize * sizeof(u_short));
-	    src = dst + count * scp->xsize;
-	    fillw(scp->term.cur_color | scr_map[0x20], src,
-		  n * scp->xsize);
+	    sc_vtb_delete(&scp->vtb, scp->ypos * scp->xsize, n * scp->xsize,
+			  sc->scr_map[0x20], scp->term.cur_color);
 	    mark_for_update(scp, scp->ypos * scp->xsize);
 	    mark_for_update(scp, scp->xsize * scp->ysize - 1);
 	    break;
@@ -2757,39 +2609,30 @@ scan_esc(scr_stat *scp, u_char c)
 	    n = scp->term.param[0]; if (n < 1) n = 1;
 	    if (n > scp->xsize - scp->xpos)
 		n = scp->xsize - scp->xpos;
-	    dst = scp->cursor_pos;
-	    src = dst + n;
 	    count = scp->xsize - (scp->xpos + n);
-	    bcopy(src, dst, count * sizeof(u_short));
-	    src = dst + count;
-	    fillw(scp->term.cur_color | scr_map[0x20], src, n);
-	    mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
-	    mark_for_update(scp, scp->cursor_pos - scp->scr_buf + n + count - 1);
+	    sc_vtb_delete(&scp->vtb, scp->cursor_pos, n,
+			  sc->scr_map[0x20], scp->term.cur_color);
+	    mark_for_update(scp, scp->cursor_pos);
+	    mark_for_update(scp, scp->cursor_pos + n + count - 1);
 	    break;
 
 	case '@':   /* Insert n chars */
 	    n = scp->term.param[0]; if (n < 1) n = 1;
 	    if (n > scp->xsize - scp->xpos)
 		n = scp->xsize - scp->xpos;
-	    src = scp->cursor_pos;
-	    dst = src + n;
 	    count = scp->xsize - (scp->xpos + n);
-	    bcopy(src, dst, count * sizeof(u_short));
-	    fillw(scp->term.cur_color | scr_map[0x20], src, n);
-	    mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
-	    mark_for_update(scp, scp->cursor_pos - scp->scr_buf + n + count - 1);
+	    sc_vtb_ins(&scp->vtb, scp->cursor_pos, n,
+		       sc->scr_map[0x20], scp->term.cur_color);
+	    mark_for_update(scp, scp->cursor_pos);
+	    mark_for_update(scp, scp->cursor_pos + n + count - 1);
 	    break;
 
 	case 'S':   /* scroll up n lines */
 	    n = scp->term.param[0]; if (n < 1)  n = 1;
 	    if (n > scp->ysize)
 		n = scp->ysize;
-	    bcopy(scp->scr_buf + (scp->xsize * n),
-		   scp->scr_buf,
-		   scp->xsize * (scp->ysize - n) * sizeof(u_short));
-	    fillw(scp->term.cur_color | scr_map[0x20],
-		  scp->scr_buf + scp->xsize * (scp->ysize - n),
-		  scp->xsize * n);
+	    sc_vtb_delete(&scp->vtb, 0, n * scp->xsize,
+			  sc->scr_map[0x20], scp->term.cur_color);
     	    mark_all(scp);
 	    break;
 
@@ -2797,12 +2640,8 @@ scan_esc(scr_stat *scp, u_char c)
 	    n = scp->term.param[0]; if (n < 1)  n = 1;
 	    if (n > scp->ysize)
 		n = scp->ysize;
-	    bcopy(scp->scr_buf,
-		  scp->scr_buf + (scp->xsize * n),
-		  scp->xsize * (scp->ysize - n) *
-		  sizeof(u_short));
-	    fillw(scp->term.cur_color | scr_map[0x20],
-		  scp->scr_buf, scp->xsize * n);
+	    sc_vtb_ins(&scp->vtb, 0, n * scp->xsize,
+		       sc->scr_map[0x20], scp->term.cur_color);
     	    mark_all(scp);
 	    break;
 
@@ -2810,10 +2649,10 @@ scan_esc(scr_stat *scp, u_char c)
 	    n = scp->term.param[0]; if (n < 1)  n = 1;
 	    if (n > scp->xsize - scp->xpos)
 		n = scp->xsize - scp->xpos;
-	    fillw(scp->term.cur_color | scr_map[0x20],
-		  scp->cursor_pos, n);
-	    mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
-	    mark_for_update(scp, scp->cursor_pos - scp->scr_buf + n - 1);
+	    sc_vtb_erase(&scp->vtb, scp->cursor_pos, n,
+			 sc->scr_map[0x20], scp->term.cur_color);
+	    mark_for_update(scp, scp->cursor_pos);
+	    mark_for_update(scp, scp->cursor_pos + n - 1);
 	    break;
 
 	case 'Z':   /* move n tabs backwards */
@@ -2962,7 +2801,7 @@ scan_esc(scr_stat *scp, u_char c)
 
 	case 'z':   /* switch to (virtual) console n */
 	    if (scp->term.num_param == 1)
-		switch_scr(scp, scp->term.param[0]);
+		switch_scr(sc, scp->term.param[0]);
 	    break;
 	}
     }
@@ -2990,8 +2829,8 @@ scan_esc(scr_stat *scp, u_char c)
 	case 'A':   /* set display border color */
 	    if (scp->term.num_param == 1) {
 		scp->border=scp->term.param[0] & 0xff;
-		if (scp == cur_console)
-		    set_border(cur_console, scp->border);
+		if (scp == sc->cur_scp)
+		    set_border(scp, scp->border);
             }
 	    break;
 
@@ -3003,31 +2842,32 @@ scan_esc(scr_stat *scp, u_char c)
 	    break;
 
 	case 'C':   /* set cursor type & shape */
+	    if (!ISGRAPHSC(sc->cur_scp))
+		remove_cursor_image(sc->cur_scp);
 	    if (scp->term.num_param == 1) {
 		if (scp->term.param[0] & 0x01)
-		    sc_flags |= BLINK_CURSOR;
+		    sc->flags |= SC_BLINK_CURSOR;
 		else
-		    sc_flags &= ~BLINK_CURSOR;
-		if ((scp->term.param[0] & 0x02) 
-		    && ISFONTAVAIL(scp->adp->va_flags)) 
-		    sc_flags |= CHAR_CURSOR;
+		    sc->flags &= ~SC_BLINK_CURSOR;
+		if (scp->term.param[0] & 0x02) 
+		    sc->flags |= SC_CHAR_CURSOR;
 		else
-		    sc_flags &= ~CHAR_CURSOR;
+		    sc->flags &= ~SC_CHAR_CURSOR;
 	    }
 	    else if (scp->term.num_param == 2) {
-		scp->cursor_start = scp->term.param[0] & 0x1F;
-		scp->cursor_end = scp->term.param[1] & 0x1F;
+		sc->cursor_base = scp->font_size 
+					- (scp->term.param[1] & 0x1F) - 1;
+		sc->cursor_height = (scp->term.param[1] & 0x1F) 
+					- (scp->term.param[0] & 0x1F) + 1;
 	    }
 	    /* 
 	     * The cursor shape is global property; all virtual consoles
 	     * are affected. Update the cursor in the current console...
 	     */
-	    if (!ISGRAPHSC(cur_console)) {
+	    if (!ISGRAPHSC(sc->cur_scp)) {
 		i = spltty();
-		remove_cursor_image(cur_console);
-		if (sc_flags & CHAR_CURSOR)
-	            set_destructive_cursor(cur_console);
-		draw_cursor_image(cur_console);
+		sc_set_cursor_image(sc->cur_scp);
+		draw_cursor_image(sc->cur_scp);
 		splx(i);
 	    }
 	    break;
@@ -3094,19 +2934,28 @@ ansi_put(scr_stat *scp, u_char *buf, int len)
     u_char *ptr = buf;
 
     /* make screensaver happy */
-    if (!sticky_splash && scp == cur_console)
+    if (!sticky_splash && scp == scp->sc->cur_scp)
 	run_scrn_saver = FALSE;
 
-    write_in_progress++;
 outloop:
+    scp->sc->write_in_progress++;
     if (scp->term.esc) {
 	scan_esc(scp, *ptr++);
 	len--;
     }
     else if (PRINTABLE(*ptr)) {     /* Print only printables */
- 	int cnt = len <= (scp->xsize-scp->xpos) ? len : (scp->xsize-scp->xpos);
- 	u_short cur_attr = scp->term.cur_attr;
- 	u_short *cursor_pos = scp->cursor_pos;
+	vm_offset_t p;
+	u_char *map;
+ 	int cnt;
+	int attr;
+	int i;
+
+	p = sc_vtb_pointer(&scp->vtb, scp->cursor_pos);
+	map = scp->sc->scr_map;
+	attr = scp->term.cur_attr;
+
+	cnt = (len <= scp->xsize - scp->xpos) ? len : (scp->xsize - scp->xpos);
+	i = cnt;
 	do {
 	    /*
 	     * gcc-2.6.3 generates poor (un)sign extension code.  Casting the
@@ -3115,15 +2964,17 @@ outloop:
 	     * (+ cache misses) on i486's.
 	     */
 #define	UCVP(ucp)	((u_char volatile *)(ucp))
-	    *cursor_pos++ = UCVP(scr_map)[*UCVP(ptr)] | cur_attr;
-	    ptr++;
-	    cnt--;
-	} while (cnt && PRINTABLE(*ptr));
-	len -= (cursor_pos - scp->cursor_pos);
-	scp->xpos += (cursor_pos - scp->cursor_pos);
-	mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
-	mark_for_update(scp, cursor_pos - scp->scr_buf);
-	scp->cursor_pos = cursor_pos;
+	    p = sc_vtb_putchar(&scp->vtb, p, UCVP(map)[*UCVP(ptr)], attr);
+	    ++ptr;
+	    --i;
+	} while (i > 0 && PRINTABLE(*ptr));
+
+	len -= cnt - i;
+	mark_for_update(scp, scp->cursor_pos);
+	scp->cursor_pos += cnt - i;
+	mark_for_update(scp, scp->cursor_pos - 1);
+	scp->xpos += cnt - i;
+
 	if (scp->xpos >= scp->xsize) {
 	    scp->xpos = 0;
 	    scp->ypos++;
@@ -3136,10 +2987,10 @@ outloop:
 	    break;
 
 	case 0x08:      /* non-destructive backspace */
-	    if (scp->cursor_pos > scp->scr_buf) {
-	    	mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
+	    if (scp->cursor_pos > 0) {
+		mark_for_update(scp, scp->cursor_pos);
 		scp->cursor_pos--;
-	    	mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
+		mark_for_update(scp, scp->cursor_pos);
 		if (scp->xpos > 0)
 		    scp->xpos--;
 		else {
@@ -3150,9 +3001,9 @@ outloop:
 	    break;
 
 	case 0x09:  /* non-destructive tab */
-	    mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
+	    mark_for_update(scp, scp->cursor_pos);
 	    scp->cursor_pos += (8 - scp->xpos % 8u);
-	    mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
+	    mark_for_update(scp, scp->cursor_pos);
 	    if ((scp->xpos += (8 - scp->xpos % 8u)) >= scp->xsize) {
 	        scp->xpos = 0;
 	        scp->ypos++;
@@ -3160,9 +3011,9 @@ outloop:
 	    break;
 
 	case 0x0a:  /* newline, same pos */
-	    mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
+	    mark_for_update(scp, scp->cursor_pos);
 	    scp->cursor_pos += scp->xsize;
-	    mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
+	    mark_for_update(scp, scp->cursor_pos);
 	    scp->ypos++;
 	    break;
 
@@ -3171,9 +3022,9 @@ outloop:
 	    break;
 
 	case 0x0d:  /* return, return to pos 0 */
-	    mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
+	    mark_for_update(scp, scp->cursor_pos);
 	    scp->cursor_pos -= scp->xpos;
-	    mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
+	    mark_for_update(scp, scp->cursor_pos);
 	    scp->xpos = 0;
 	    break;
 
@@ -3185,228 +3036,465 @@ outloop:
 	ptr++; len--;
     }
     /* do we have to scroll ?? */
-    if (scp->cursor_pos >= scp->scr_buf + scp->ysize * scp->xsize) {
-	remove_cutmarking(scp);
-	if (scp->history != NULL) {
-	    bcopy(scp->scr_buf, scp->history_head,
-		   scp->xsize * sizeof(u_short));
-	    scp->history_head += scp->xsize;
-	    if (scp->history_head + scp->xsize >
-		scp->history + scp->history_size)
-		scp->history_head = scp->history;
-	}
-	bcopy(scp->scr_buf + scp->xsize, scp->scr_buf,
-	       scp->xsize * (scp->ysize - 1) * sizeof(u_short));
-	fillw(scp->term.cur_color | scr_map[0x20],
-	      scp->scr_buf + scp->xsize * (scp->ysize - 1),
-	      scp->xsize);
+    if (scp->cursor_pos >= scp->ysize * scp->xsize) {
+	sc_remove_cutmarking(scp);
+#ifndef SC_NO_HISTORY
+	if (scp->history != NULL)
+	    sc_hist_save_one_line(scp, 0);
+#endif
+	sc_vtb_delete(&scp->vtb, 0, scp->xsize,
+		      scp->sc->scr_map[0x20], scp->term.cur_color);
 	scp->cursor_pos -= scp->xsize;
 	scp->ypos--;
     	mark_all(scp);
     }
+    scp->sc->write_in_progress--;
     if (len)
 	goto outloop;
-    write_in_progress--;
-    if (delayed_next_scr)
-	switch_scr(scp, delayed_next_scr - 1);
+    if (scp->sc->delayed_next_scr)
+	switch_scr(scp->sc, scp->sc->delayed_next_scr - 1);
 }
 
 static void
-scinit(void)
+draw_cursor_image(scr_stat *scp)
 {
-    video_adapter_t *adp;
-    int col;
-    int row;
-    u_int i;
-
-    if (init_done != COLD)
-	return;
-    init_done = WARM;
-
-    get_bios_values();
-
-    /* extract the hardware cursor location and hide the cursor for now */
-    adp = vid_get_adapter(adapter);
-    (*vidsw[adapter]->read_hw_cursor)(adp, &col, &row);
-    (*vidsw[adapter]->set_hw_cursor)(adp, -1, -1);
-
-    /* set up the first console */
-    current_default = &user_default;
-    console[0] = &main_console;
-    init_scp(console[0]);
-    cur_console = console[0];
-
-    /* copy screen to temporary buffer */
-    if (ISTEXTSC(console[0]))
-	bcopy_fromio(console[0]->adp->va_window, sc_buffer,
-		     console[0]->xsize * console[0]->ysize * sizeof(u_short));
-
-    console[0]->scr_buf = console[0]->mouse_pos = console[0]->mouse_oldpos
-	= sc_buffer;
-    if (col >= console[0]->xsize)
-	col = 0;
-    if (row >= console[0]->ysize)
-	row = console[0]->ysize - 1;
-    console[0]->xpos = col;
-    console[0]->ypos = row;
-    console[0]->cursor_pos = console[0]->cursor_oldpos =
-	sc_buffer + row*console[0]->xsize + col;
-    console[0]->cursor_saveunder = *console[0]->cursor_pos;
-    for (i=1; i<MAXCONS; i++)
-	console[i] = NULL;
-    kernel_console.esc = 0;
-    kernel_console.attr_mask = NORMAL_ATTR;
-    kernel_console.cur_attr =
-	kernel_console.cur_color = kernel_console.std_color =
-	kernel_default.std_color;
-    kernel_console.rev_color = kernel_default.rev_color;
-
-    /* initialize mapscrn arrays to a one to one map */
-    for (i=0; i<sizeof(scr_map); i++) {
-	scr_map[i] = scr_rmap[i] = i;
-    }
-
-    /* Save font and palette */
-    if (ISFONTAVAIL(cur_console->adp->va_flags)) {
-	if (fonts_loaded & FONT_16) {
-	    copy_font(cur_console, LOAD, 16, font_16);
-	} else {
-	    copy_font(cur_console, SAVE, 16, font_16);
-	    fonts_loaded = FONT_16;
-	    set_destructive_cursor(cur_console);
-	}
-	/*
-	 * FONT KLUDGE
-	 * Always use the font page #0. XXX
-	 */
-	(*vidsw[cur_console->ad]->show_font)(cur_console->adp, 0);
-    }
-    save_palette(cur_console->adp, palette);
-
-#if NSPLASH > 0
-    /* we are ready to put up the splash image! */
-    splash_init(cur_console->adp, scsplash_callback);
-#endif
+    /* assert(scp == scp->sc->cur_scp); */
+    ++scp->sc->videoio_in_progress;
+    (*scp->rndr->draw_cursor)(scp, scp->cursor_pos,
+			      scp->sc->flags & SC_BLINK_CURSOR, TRUE,
+			      sc_inside_cutmark(scp, scp->cursor_pos));
+    --scp->sc->videoio_in_progress;
 }
 
 static void
-scshutdown(int howto, void *arg)
+remove_cursor_image(scr_stat *scp)
 {
-    sc_touch_scrn_saver();
-    if (!cold && cur_console->smode.mode == VT_AUTO 
-	&& console[0]->smode.mode == VT_AUTO)
-	switch_scr(cur_console, 0);
-    shutdown_in_progress = TRUE;
+    /* assert(scp == scp->sc->cur_scp); */
+    ++scp->sc->videoio_in_progress;
+    (*scp->rndr->draw_cursor)(scp, scp->cursor_oldpos,
+			      scp->sc->flags & SC_BLINK_CURSOR, FALSE,
+			      sc_inside_cutmark(scp, scp->cursor_oldpos));
+    --scp->sc->videoio_in_progress;
 }
 
-int
-sc_clean_up(scr_stat *scp)
+static void
+update_cursor_image(scr_stat *scp)
 {
-    int error;
+    int blink;
 
-    sc_touch_scrn_saver();
-    if ((error = wait_scrn_saver_stop()))
-	return error;
-    scp->status &= ~MOUSE_VISIBLE;
-    remove_cutmarking(scp);
-    return 0;
+    if (scp->sc->flags & SC_CHAR_CURSOR) {
+	scp->cursor_base = scp->sc->cursor_base;
+	scp->cursor_height = imin(scp->sc->cursor_height, scp->font_size);
+    } else {
+	scp->cursor_base = 0;
+	scp->cursor_height = scp->font_size;
+    }
+    blink = scp->sc->flags & SC_BLINK_CURSOR;
+
+    /* assert(scp == scp->sc->cur_scp); */
+    ++scp->sc->videoio_in_progress;
+    (*scp->rndr->draw_cursor)(scp, scp->cursor_oldpos, blink, FALSE, 
+			      sc_inside_cutmark(scp, scp->cursor_pos));
+    (*scp->rndr->set_cursor)(scp, scp->cursor_base, scp->cursor_height, blink);
+    (*scp->rndr->draw_cursor)(scp, scp->cursor_pos, blink, TRUE, 
+			      sc_inside_cutmark(scp, scp->cursor_pos));
+    --scp->sc->videoio_in_progress;
 }
 
 void
-sc_alloc_scr_buffer(scr_stat *scp, int wait, int clear)
+sc_set_cursor_image(scr_stat *scp)
 {
-    if (scp->scr_buf)
-	free(scp->scr_buf, M_DEVBUF);
-    scp->scr_buf = (u_short *)malloc(scp->xsize*scp->ysize*sizeof(u_short), 
-				     M_DEVBUF, (wait) ? M_WAITOK : M_NOWAIT);
-
-    if (clear) {
-        /* clear the screen and move the text cursor to the top-left position */
-	sc_clear_screen(scp);
+    if (scp->sc->flags & SC_CHAR_CURSOR) {
+	scp->cursor_base = scp->sc->cursor_base;
+	scp->cursor_height = imin(scp->sc->cursor_height, scp->font_size);
     } else {
-	/* retain the current cursor position, but adjust pointers */
-	move_crsr(scp, scp->xpos, scp->ypos);
-	scp->cursor_oldpos = scp->cursor_pos;
+	scp->cursor_base = 0;
+	scp->cursor_height = scp->font_size;
     }
 
-    /* move the mouse cursor at the center of the screen */
-    sc_move_mouse(scp, scp->xpixel / 2, scp->ypixel / 2);
+    /* assert(scp == scp->sc->cur_scp); */
+    ++scp->sc->videoio_in_progress;
+    (*scp->rndr->set_cursor)(scp, scp->cursor_base, scp->cursor_height,
+			     scp->sc->flags & SC_BLINK_CURSOR);
+    --scp->sc->videoio_in_progress;
 }
 
-void
-sc_alloc_cut_buffer(scr_stat *scp, int wait)
+static void
+move_crsr(scr_stat *scp, int x, int y)
 {
-    if ((cut_buffer == NULL)
-	|| (cut_buffer_size < scp->xsize * scp->ysize + 1)) {
-	if (cut_buffer != NULL)
-	    free(cut_buffer, M_DEVBUF);
-	cut_buffer_size = scp->xsize * scp->ysize + 1;
-	cut_buffer = (u_char *)malloc(cut_buffer_size, 
-				    M_DEVBUF, (wait) ? M_WAITOK : M_NOWAIT);
-	if (cut_buffer != NULL)
-	    cut_buffer[0] = '\0';
-    }
+    if (x < 0)
+	x = 0;
+    if (y < 0)
+	y = 0;
+    if (x >= scp->xsize)
+	x = scp->xsize-1;
+    if (y >= scp->ysize)
+	y = scp->ysize-1;
+    scp->xpos = x;
+    scp->ypos = y;
+    scp->cursor_pos = scp->ypos * scp->xsize + scp->xpos;
 }
 
-void
-sc_alloc_history_buffer(scr_stat *scp, int lines, int extra, int wait)
+static void
+scinit(int unit, int flags)
 {
-    u_short *usp;
-
-    if (lines < scp->ysize)
-	lines = scp->ysize;
+    /*
+     * When syscons is being initialized as the kernel console, malloc()
+     * is not yet functional, because various kernel structures has not been
+     * fully initialized yet.  Therefore, we need to declare the following
+     * static buffers for the console.  This is less than ideal, 
+     * but is necessry evil for the time being.  XXX
+     */
+    static scr_stat main_console;
+    static scr_stat *main_vtys[MAXCONS];
+    static struct tty main_tty[MAXCONS];
+    static u_short sc_buffer[ROW*COL];	/* XXX */
+#ifdef DEVFS
+    static void	*main_devfs_token[MAXCONS];
+#endif
+#ifndef SC_NO_FONT_LOADING
+    static u_char font_8[256*8];
+    static u_char font_14[256*14];
+    static u_char font_16[256*16];
+#endif
 
-    usp = scp->history;
-    scp->history = NULL;
-    if (usp != NULL) {
-	free(usp, M_DEVBUF);
-	if (extra > 0)
-	    extra_history_size += extra;
+    sc_softc_t *sc;
+    scr_stat *scp;
+    video_adapter_t *adp;
+    int col;
+    int row;
+    int i;
+
+    /* one time initialization */
+    if (init_done == COLD) {
+	sc_get_bios_values(&bios_value);
+	current_default = &user_default;
+	/* kernel console attributes */
+	kernel_console.esc = 0;
+	kernel_console.attr_mask = NORMAL_ATTR;
+	kernel_console.cur_attr =
+	    kernel_console.cur_color = kernel_console.std_color =
+	    kernel_default.std_color;
+	kernel_console.rev_color = kernel_default.rev_color;
     }
+    init_done = WARM;
+
+    /*
+     * Allocate resources.  Even if we are being called for the second
+     * time, we must allocate them again, because they might have 
+     * disappeared...
+     */
+    sc = sc_get_softc(unit, flags & SC_KERNEL_CONSOLE);
+    adp = NULL;
+    if (sc->adapter >= 0) {
+	vid_release(sc->adp, (void *)&sc->adapter);
+	adp = sc->adp;
+	sc->adp = NULL;
+    }
+    if (sc->keyboard >= 0) {
+	DPRINTF(5, ("sc%d: releasing kbd%d\n", unit, sc->keyboard));
+	i = kbd_release(sc->kbd, (void *)&sc->keyboard);
+	DPRINTF(5, ("sc%d: kbd_release returned %d\n", unit, i));
+	if (sc->kbd != NULL) {
+	    DPRINTF(5, ("sc%d: kbd != NULL!, index:%d, minor:%d, flags:0x%x\n",
+		unit, sc->kbd->kb_index, sc->kbd->kb_minor, sc->kbd->kb_flags));
+	}
+	sc->kbd = NULL;
+    }
+    sc->adapter = vid_allocate("*", unit, (void *)&sc->adapter);
+    sc->adp = vid_get_adapter(sc->adapter);
+    /* assert((sc->adapter >= 0) && (sc->adp != NULL)) */
+    sc->keyboard = kbd_allocate("*", unit, (void *)&sc->keyboard,
+				sckbdevent, sc);
+    DPRINTF(1, ("sc%d: keyboard %d\n", unit, sc->keyboard));
+    sc->kbd = kbd_get_keyboard(sc->keyboard);
+    if (sc->kbd != NULL) {
+	DPRINTF(1, ("sc%d: kbd index:%d, minor:%d, flags:0x%x\n",
+		unit, sc->kbd->kb_index, sc->kbd->kb_minor, sc->kbd->kb_flags));
+    }
+
+    if (!(sc->flags & SC_INIT_DONE) || (adp != sc->adp)) {
+
+	sc->initial_mode = sc->adp->va_initial_mode;
+
+#ifndef SC_NO_FONT_LOADING
+	if (flags & SC_KERNEL_CONSOLE) {
+	    sc->font_8 = font_8;
+	    sc->font_14 = font_14;
+	    sc->font_16 = font_16;
+	} else if (sc->font_8 == NULL) {
+	    /* assert(sc_malloc) */
+	    sc->font_8 = malloc(sizeof(font_8), M_DEVBUF, M_WAITOK);
+	    sc->font_14 = malloc(sizeof(font_14), M_DEVBUF, M_WAITOK);
+	    sc->font_16 = malloc(sizeof(font_16), M_DEVBUF, M_WAITOK);
+	}
+#endif
+
+	/* extract the hardware cursor location and hide the cursor for now */
+	(*vidsw[sc->adapter]->read_hw_cursor)(sc->adp, &col, &row);
+	(*vidsw[sc->adapter]->set_hw_cursor)(sc->adp, -1, -1);
+
+	/* set up the first console */
+	sc->first_vty = unit*MAXCONS;
+	if (flags & SC_KERNEL_CONSOLE) {
+	    sc->vtys = sizeof(main_vtys)/sizeof(main_vtys[0]);
+	    sc->tty = main_tty;
+#ifdef DEVFS
+	    sc->devfs_token = main_devfs_token;
+#endif
+	    sc->console = main_vtys;
+	    scp = main_vtys[0] = &main_console;
+	    init_scp(sc, sc->first_vty, scp);
+	    sc_vtb_init(&scp->vtb, VTB_MEMORY, scp->xsize, scp->ysize,
+			(void *)sc_buffer, FALSE);
+	} else {
+	    /* assert(sc_malloc) */
+	    sc->vtys = MAXCONS;
+	    sc->tty = malloc(sizeof(struct tty)*MAXCONS, M_DEVBUF, M_WAITOK);
+	    bzero(sc->tty, sizeof(struct tty)*MAXCONS);
+#ifdef DEVFS
+	    sc->devfs_token = malloc(sizeof(void *)*MAXCONS,
+				     M_DEVBUF, M_WAITOK);
+#endif
+	    sc->console = malloc(sizeof(struct scr_stat *)*MAXCONS,
+				 M_DEVBUF, M_WAITOK);
+	    scp = sc->console[0] = alloc_scp(sc, sc->first_vty);
+	}
+	sc->cur_scp = scp;
+
+	/* copy screen to temporary buffer */
+	sc_vtb_init(&scp->scr, VTB_FRAMEBUFFER, scp->xsize, scp->ysize,
+		    (void *)scp->sc->adp->va_window, FALSE);
+	if (ISTEXTSC(scp))
+	    sc_vtb_copy(&scp->scr, 0, &scp->vtb, 0, scp->xsize*scp->ysize);
+
+	/* move cursors to the initial positions */
+	scp->mouse_pos = scp->mouse_oldpos = 0;
+	if (col >= scp->xsize)
+	    col = 0;
+	if (row >= scp->ysize)
+	    row = scp->ysize - 1;
+	scp->xpos = col;
+	scp->ypos = row;
+	scp->cursor_pos = scp->cursor_oldpos = row*scp->xsize + col;
+	if (bios_value.cursor_end < scp->font_size)
+	    sc->cursor_base = scp->font_size - bios_value.cursor_end - 1;
+	else
+	    sc->cursor_base = 0;
+	i = bios_value.cursor_end - bios_value.cursor_start + 1;
+	sc->cursor_height = imin(i, scp->font_size);
+	if (!ISGRAPHSC(scp)) {
+    	    sc_set_cursor_image(scp);
+    	    draw_cursor_image(scp);
+	}
+
+	/* save font and palette */
+#ifndef SC_NO_FONT_LOADING
+	sc->fonts_loaded = 0;
+	if (ISFONTAVAIL(sc->adp->va_flags)) {
+#ifdef SC_DFLT_FONT
+	    bcopy(dflt_font_8, sc->font_8, sizeof(dflt_font_8));
+	    bcopy(dflt_font_14, sc->font_14, sizeof(dflt_font_14));
+	    bcopy(dflt_font_16, sc->font_16, sizeof(dflt_font_16));
+	    sc->fonts_loaded = FONT_16 | FONT_14 | FONT_8;
+	    if (scp->font_size < 14) {
+		copy_font(scp, LOAD, 8, sc->font_8);
+		sc->fonts_loaded = FONT_8;
+	    } else if (scp->font_size >= 16) {
+		copy_font(scp, LOAD, 16, sc->font_16);
+		sc->fonts_loaded = FONT_16;
+	    } else {
+		copy_font(scp, LOAD, 14, sc->font_14);
+		sc->fonts_loaded = FONT_14;
+	    }
+#else /* !SC_DFLT_FONT */
+	    if (scp->font_size < 14) {
+		copy_font(scp, SAVE, 8, sc->font_8);
+		sc->fonts_loaded = FONT_8;
+	    } else if (scp->font_size >= 16) {
+		copy_font(scp, SAVE, 16, sc->font_16);
+		sc->fonts_loaded = FONT_16;
+	    } else {
+		copy_font(scp, SAVE, 14, sc->font_14);
+		sc->fonts_loaded = FONT_14;
+	    }
+#endif /* SC_DFLT_FONT */
+	    /* FONT KLUDGE: always use the font page #0. XXX */
+	    (*vidsw[sc->adapter]->show_font)(sc->adp, 0);
+	}
+#endif /* !SC_NO_FONT_LOADING */
 
-    scp->history_size = lines * scp->xsize;
-    if (lines > imax(sc_history_size, scp->ysize))
-	extra_history_size -= lines - imax(sc_history_size, scp->ysize);
-    usp = (u_short *)malloc(scp->history_size * sizeof(u_short), 
-			    M_DEVBUF, (wait) ? M_WAITOK : M_NOWAIT);
-    if (usp != NULL)
-	bzero(usp, scp->history_size * sizeof(u_short));
-    scp->history_head = scp->history_pos = usp;
-    scp->history = usp;
+#ifndef SC_NO_PALETTE_LOADING
+	save_palette(sc->adp, sc->palette);
+#endif
+
+#if NSPLASH > 0
+	if (!(sc->flags & SC_SPLASH_SCRN) && (flags & SC_KERNEL_CONSOLE)) {
+	    /* we are ready to put up the splash image! */
+	    splash_init(sc->adp, scsplash_callback, sc);
+	    sc->flags |= SC_SPLASH_SCRN;
+	}
+#endif /* NSPLASH */
+    }
+
+    /* the rest is not necessary, if we have done it once */
+    if (sc->flags & SC_INIT_DONE)
+	return;
+
+    /* clear structures */
+    for (i = 1; i < sc->vtys; i++)
+	sc->console[i] = NULL;
+
+    /* initialize mapscrn arrays to a one to one map */
+    for (i = 0; i < sizeof(sc->scr_map); i++)
+	sc->scr_map[i] = sc->scr_rmap[i] = i;
+
+    sc->flags |= SC_INIT_DONE;
+}
+
+static void
+scterm(int unit, int flags)
+{
+    sc_softc_t *sc;
+
+    sc = sc_get_softc(unit, flags & SC_KERNEL_CONSOLE);
+    if (sc == NULL)
+	return;			/* shouldn't happen */
+
+#if NSPLASH > 0
+    /* this console is no longer available for the splash screen */
+    if (sc->flags & SC_SPLASH_SCRN) {
+	splash_term(sc->adp);
+	sc->flags &= ~SC_SPLASH_SCRN;
+    }
+#endif /* NSPLASH */
+
+#if 0 /* XXX */
+    /* move the hardware cursor to the upper-left corner */
+    (*vidsw[sc->adapter]->set_hw_cursor)(sc->adp, 0, 0);
+#endif
+
+    /* release the keyboard and the video card */
+    if (sc->keyboard >= 0)
+	kbd_release(sc->kbd, &sc->keyboard);
+    if (sc->adapter >= 0)
+	vid_release(sc->adp, &sc->adapter);
+
+    /* clear the structure */
+    if (!(flags & SC_KERNEL_CONSOLE)) {
+	free(sc->console, M_DEVBUF);
+	free(sc->tty, M_DEVBUF);
+#ifdef DEVFS
+	free(sc->devfs_token, M_DEVBUF);
+#endif
+#ifndef SC_NO_FONT_LOADING
+	free(sc->font_8, M_DEVBUF);
+	free(sc->font_14, M_DEVBUF);
+	free(sc->font_16, M_DEVBUF);
+#endif
+	/* XXX vtb, history */
+    }
+    bzero(sc, sizeof(*sc));
+    sc->keyboard = -1;
+    sc->adapter = -1;
+}
+
+static void
+scshutdown(int howto, void *arg)
+{
+    /* assert(sc_console != NULL) */
+
+    sc_touch_scrn_saver();
+    if (!cold && sc_console
+	&& sc_console->sc->cur_scp->smode.mode == VT_AUTO 
+	&& sc_console->smode.mode == VT_AUTO)
+	switch_scr(sc_console->sc, sc_console->index);
+    shutdown_in_progress = TRUE;
+}
+
+int
+sc_clean_up(scr_stat *scp)
+{
+    int error;
+
+    sc_touch_scrn_saver();
+#if NSPLASH > 0
+    if ((error = wait_scrn_saver_stop(scp->sc)))
+	return error;
+#endif /* NSPLASH */
+    scp->status &= ~MOUSE_VISIBLE;
+    sc_remove_cutmarking(scp);
+    return 0;
+}
+
+void
+sc_alloc_scr_buffer(scr_stat *scp, int wait, int discard)
+{
+    sc_vtb_t new;
+    sc_vtb_t old;
+    int s;
+
+    old = scp->vtb;
+    sc_vtb_init(&new, VTB_MEMORY, scp->xsize, scp->ysize, NULL, wait);
+    if (!discard && (old.vtb_flags & VTB_VALID)) {
+	/* retain the current cursor position and buffer contants */
+	scp->cursor_oldpos = scp->cursor_pos;
+	/* 
+	 * This works only if the old buffer has the same size as or larger 
+	 * than the new one. XXX
+	 */
+	sc_vtb_copy(&old, 0, &new, 0, scp->xsize*scp->ysize);
+	scp->vtb = new;
+    } else {
+        /* clear the screen and move the text cursor to the top-left position */
+	s = splhigh();
+	scp->vtb = new;
+	sc_clear_screen(scp);
+	splx(s);
+	sc_vtb_destroy(&old);
+    }
+
+#ifndef SC_NO_SYSMOUSE
+    /* move the mouse cursor at the center of the screen */
+    sc_mouse_move(scp, scp->xpixel / 2, scp->ypixel / 2);
+#endif
 }
 
 static scr_stat
-*alloc_scp()
+*alloc_scp(sc_softc_t *sc, int vty)
 {
     scr_stat *scp;
 
+    /* assert(sc_malloc) */
+
     scp = (scr_stat *)malloc(sizeof(scr_stat), M_DEVBUF, M_WAITOK);
-    init_scp(scp);
+    init_scp(sc, vty, scp);
+
     sc_alloc_scr_buffer(scp, TRUE, TRUE);
-    if (ISMOUSEAVAIL(scp->adp->va_flags))
+
+#ifndef SC_NO_SYSMOUSE
+    if (ISMOUSEAVAIL(sc->adp->va_flags))
 	sc_alloc_cut_buffer(scp, TRUE);
-    sc_alloc_history_buffer(scp, sc_history_size, 0, TRUE);
-/* SOS
-    if (scp->adp->va_flags & V_ADP_MODECHANGE)
-	set_mode(scp);
-*/
+#endif
+
+#ifndef SC_NO_HISTORY
+    sc_alloc_history_buffer(scp, 0, TRUE);
+#endif
+
     sc_clear_screen(scp);
-    scp->cursor_saveunder = *scp->cursor_pos;
     return scp;
 }
 
 static void
-init_scp(scr_stat *scp)
+init_scp(sc_softc_t *sc, int vty, scr_stat *scp)
 {
     video_info_t info;
 
-    scp->ad = adapter;
-    scp->adp = vid_get_adapter(scp->ad);
-    (*vidsw[scp->ad]->get_info)(scp->adp, initial_video_mode, &info);
-
+    scp->index = vty;
+    scp->sc = sc;
     scp->status = 0;
-    scp->mode = initial_video_mode;
-    scp->scr_buf = NULL;
+    scp->mode = sc->initial_mode;
+    (*vidsw[sc->adapter]->get_info)(sc->adp, scp->mode, &info);
     if (info.vi_flags & V_INFO_GRAPHICS) {
 	scp->status |= GRAPHICS_MODE;
 	scp->xpixel = info.vi_width;
@@ -3414,17 +3502,41 @@ init_scp(scr_stat *scp)
 	scp->xsize = info.vi_width/8;
 	scp->ysize = info.vi_height/info.vi_cheight;
 	scp->font_size = FONT_NONE;
+	scp->font = NULL;
     } else {
 	scp->xsize = info.vi_width;
 	scp->ysize = info.vi_height;
 	scp->xpixel = scp->xsize*8;
 	scp->ypixel = scp->ysize*info.vi_cheight;
-	scp->font_size = info.vi_cheight;
+	if (info.vi_cheight < 14) {
+	    scp->font_size = 8;
+#ifndef SC_NO_FONT_LOADING
+	    scp->font = sc->font_8;
+#else
+	    scp->font = NULL;
+#endif
+	} else if (info.vi_cheight >= 16) {
+	    scp->font_size = 16;
+#ifndef SC_NO_FONT_LOADING
+	    scp->font = sc->font_16;
+#else
+	    scp->font = NULL;
+#endif
+	} else {
+	    scp->font_size = 14;
+#ifndef SC_NO_FONT_LOADING
+	    scp->font = sc->font_14;
+#else
+	    scp->font = NULL;
+#endif
+	}
     }
+    sc_vtb_init(&scp->vtb, VTB_MEMORY, 0, 0, NULL, FALSE);
+    sc_vtb_init(&scp->scr, VTB_FRAMEBUFFER, 0, 0, NULL, FALSE);
     scp->xoff = scp->yoff = 0;
     scp->xpos = scp->ypos = 0;
     scp->saved_xpos = scp->saved_ypos = -1;
-    scp->start = scp->xsize * scp->ysize;
+    scp->start = scp->xsize * scp->ysize - 1;
     scp->end = 0;
     scp->term.esc = 0;
     scp->term.attr_mask = NORMAL_ATTR;
@@ -3433,70 +3545,30 @@ init_scp(scr_stat *scp)
 	current_default->std_color;
     scp->term.rev_color = current_default->rev_color;
     scp->border = BG_BLACK;
-    scp->cursor_start = bios_value.cursor_start;
-    scp->cursor_end = bios_value.cursor_end;
-    scp->mouse_xpos = scp->xsize*8/2;
-    scp->mouse_ypos = scp->ysize*scp->font_size/2;
-    scp->mouse_cut_start = scp->mouse_cut_end = NULL;
+    scp->cursor_base = sc->cursor_base;
+    scp->cursor_height = imin(sc->cursor_height, scp->font_size);
+    scp->mouse_xpos = scp->xoff*8 + scp->xsize*8/2;
+    scp->mouse_ypos = (scp->ysize + scp->yoff)*scp->font_size/2;
+    scp->mouse_cut_start = scp->xsize*scp->ysize;
+    scp->mouse_cut_end = -1;
     scp->mouse_signal = 0;
     scp->mouse_pid = 0;
     scp->mouse_proc = NULL;
     scp->kbd_mode = K_XLATE;
-    scp->bell_pitch = BELL_PITCH;
+    scp->bell_pitch = bios_value.bell_pitch;
     scp->bell_duration = BELL_DURATION;
-    scp->status |= (bios_value.shift_state & 0x20) ? NLKED : 0;
+    scp->status |= (bios_value.shift_state & NLKED);
     scp->status |= CURSOR_ENABLED;
     scp->pid = 0;
     scp->proc = NULL;
     scp->smode.mode = VT_AUTO;
-    scp->history_head = scp->history_pos = scp->history = NULL;
-    scp->history_size = imax(sc_history_size, scp->ysize) * scp->xsize;
-}
-
-static void
-get_bios_values(void)
-{
-    bios_value.cursor_start = *(u_int8_t *)pa_to_va(0x461);
-    bios_value.cursor_end = *(u_int8_t *)pa_to_va(0x460);
-    bios_value.shift_state = *(u_int8_t *)pa_to_va(0x417);
-}
-
-static void
-history_to_screen(scr_stat *scp)
-{
-    int i;
-
-    for (i=0; i<scp->ysize; i++)
-	bcopy(scp->history + (((scp->history_pos - scp->history) +
-	       scp->history_size-((i+1)*scp->xsize))%scp->history_size),
-	       scp->scr_buf + (scp->xsize * (scp->ysize-1 - i)),
-	       scp->xsize * sizeof(u_short));
-    mark_all(scp);
-}
-
-static int
-history_up_line(scr_stat *scp)
-{
-    if (WRAPHIST(scp, scp->history_pos, -(scp->xsize*scp->ysize)) !=
-	scp->history_head) {
-	scp->history_pos = WRAPHIST(scp, scp->history_pos, -scp->xsize);
-	history_to_screen(scp);
-	return 0;
-    }
-    else
-	return -1;
-}
+    scp->history = NULL;
+    scp->history_pos = 0;
+    scp->history_size = 0;
 
-static int
-history_down_line(scr_stat *scp)
-{
-    if (scp->history_pos != scp->history_head) {
-	scp->history_pos = WRAPHIST(scp, scp->history_pos, scp->xsize);
-	history_to_screen(scp);
-	return 0;
-    }
-    else
-	return -1;
+    /* what if the following call fails... XXX */
+    scp->rndr = sc_render_match(scp, scp->sc->adp,
+				scp->status & (GRAPHICS_MODE | PIXEL_MODE));
 }
 
 /*
@@ -3506,26 +3578,30 @@ history_down_line(scr_stat *scp)
  * return NOKEY if there is nothing there.
  */
 static u_int
-scgetc(keyboard_t *kbd, u_int flags)
+scgetc(sc_softc_t *sc, u_int flags)
 {
+    scr_stat *scp;
     u_int c;
     int this_scr;
     int f;
     int i;
 
-    if (kbd == NULL)
+    if (sc->kbd == NULL)
 	return NOKEY;
 
 next_code:
+#if 1
     /* I don't like this, but... XXX */
     if (flags & SCGETC_CN)
-	sccnupdate(cur_console);
+	sccnupdate(sc->cur_scp);
+#endif
+    scp = sc->cur_scp;
     /* first see if there is something in the keyboard port */
     for (;;) {
-	c = kbd_read_char(kbd, !(flags & SCGETC_NONBLOCK));
+	c = kbd_read_char(sc->kbd, !(flags & SCGETC_NONBLOCK));
 	if (c == ERRKEY) {
 	    if (!(flags & SCGETC_CN))
-		do_bell(cur_console, BELL_PITCH, BELL_DURATION);
+		do_bell(scp, bios_value.bell_pitch, BELL_DURATION);
 	} else if (c == NOKEY)
 	    return c;
 	else
@@ -3542,81 +3618,67 @@ next_code:
 	add_keyboard_randomness(c);
 #endif
 
-    if (cur_console->kbd_mode != K_XLATE)
+    if (scp->kbd_mode != K_XLATE)
 	return KEYCHAR(c);
 
     /* if scroll-lock pressed allow history browsing */
-    if (!ISGRAPHSC(cur_console) && cur_console->history 
-	&& cur_console->status & SLKED) {
-
-	cur_console->status &= ~CURSOR_ENABLED;
-	if (!(cur_console->status & BUFFER_SAVED)) {
-	    cur_console->status |= BUFFER_SAVED;
-	    cur_console->history_save = cur_console->history_head;
-
-	    /* copy screen into top of history buffer */
-	    for (i=0; i<cur_console->ysize; i++) {
-		bcopy(cur_console->scr_buf + (cur_console->xsize * i),
-		       cur_console->history_head,
-		       cur_console->xsize * sizeof(u_short));
-		cur_console->history_head += cur_console->xsize;
-		if (cur_console->history_head + cur_console->xsize >
-		    cur_console->history + cur_console->history_size)
-		    cur_console->history_head=cur_console->history;
-	    }
-	    cur_console->history_pos = cur_console->history_head;
-	    history_to_screen(cur_console);
+    if (!ISGRAPHSC(scp) && scp->history && scp->status & SLKED) {
+
+	scp->status &= ~CURSOR_ENABLED;
+	remove_cursor_image(scp);
+
+#ifndef SC_NO_HISTORY
+	if (!(scp->status & BUFFER_SAVED)) {
+	    scp->status |= BUFFER_SAVED;
+	    sc_hist_save(scp);
 	}
 	switch (c) {
 	/* FIXME: key codes */
 	case SPCLKEY | FKEY | F(49):  /* home key */
-	    remove_cutmarking(cur_console);
-	    cur_console->history_pos = cur_console->history_head;
-	    history_to_screen(cur_console);
+	    sc_remove_cutmarking(scp);
+	    sc_hist_home(scp);
 	    goto next_code;
 
 	case SPCLKEY | FKEY | F(57):  /* end key */
-	    remove_cutmarking(cur_console);
-	    cur_console->history_pos =
-		WRAPHIST(cur_console, cur_console->history_head,
-			 cur_console->xsize*cur_console->ysize);
-	    history_to_screen(cur_console);
+	    sc_remove_cutmarking(scp);
+	    sc_hist_end(scp);
 	    goto next_code;
 
 	case SPCLKEY | FKEY | F(50):  /* up arrow key */
-	    remove_cutmarking(cur_console);
-	    if (history_up_line(cur_console))
+	    sc_remove_cutmarking(scp);
+	    if (sc_hist_up_line(scp))
 		if (!(flags & SCGETC_CN))
-		    do_bell(cur_console, BELL_PITCH, BELL_DURATION);
+		    do_bell(scp, bios_value.bell_pitch, BELL_DURATION);
 	    goto next_code;
 
 	case SPCLKEY | FKEY | F(58):  /* down arrow key */
-	    remove_cutmarking(cur_console);
-	    if (history_down_line(cur_console))
+	    sc_remove_cutmarking(scp);
+	    if (sc_hist_down_line(scp))
 		if (!(flags & SCGETC_CN))
-		    do_bell(cur_console, BELL_PITCH, BELL_DURATION);
+		    do_bell(scp, bios_value.bell_pitch, BELL_DURATION);
 	    goto next_code;
 
 	case SPCLKEY | FKEY | F(51):  /* page up key */
-	    remove_cutmarking(cur_console);
-	    for (i=0; i<cur_console->ysize; i++)
-	    if (history_up_line(cur_console)) {
+	    sc_remove_cutmarking(scp);
+	    for (i=0; i<scp->ysize; i++)
+	    if (sc_hist_up_line(scp)) {
 		if (!(flags & SCGETC_CN))
-		    do_bell(cur_console, BELL_PITCH, BELL_DURATION);
+		    do_bell(scp, bios_value.bell_pitch, BELL_DURATION);
 		break;
 	    }
 	    goto next_code;
 
 	case SPCLKEY | FKEY | F(59):  /* page down key */
-	    remove_cutmarking(cur_console);
-	    for (i=0; i<cur_console->ysize; i++)
-	    if (history_down_line(cur_console)) {
+	    sc_remove_cutmarking(scp);
+	    for (i=0; i<scp->ysize; i++)
+	    if (sc_hist_down_line(scp)) {
 		if (!(flags & SCGETC_CN))
-		    do_bell(cur_console, BELL_PITCH, BELL_DURATION);
+		    do_bell(scp, bios_value.bell_pitch, BELL_DURATION);
 		break;
 	    }
 	    goto next_code;
 	}
+#endif /* SC_NO_HISTORY */
     }
 
     /* 
@@ -3635,33 +3697,22 @@ next_code:
 	    case NLK: case CLK: case ALK:
 		break;
 	    case SLK:
-		kbd_ioctl(kbd, KDGKBSTATE, (caddr_t)&f);
+		kbd_ioctl(sc->kbd, KDGKBSTATE, (caddr_t)&f);
 		if (f & SLKED) {
-		    cur_console->status |= SLKED;
+		    scp->status |= SLKED;
 		} else {
-		    if (cur_console->status & SLKED) {
-			cur_console->status &= ~SLKED;
-			if (cur_console->status & BUFFER_SAVED) {
-			    int i;
-			    u_short *ptr = cur_console->history_save;
-
-			    for (i=0; i<cur_console->ysize; i++) {
-				bcopy(ptr,
-				       cur_console->scr_buf +
-				       (cur_console->xsize*i),
-				       cur_console->xsize * sizeof(u_short));
-				ptr += cur_console->xsize;
-				if (ptr + cur_console->xsize >
-				    cur_console->history +
-				    cur_console->history_size)
-				    ptr = cur_console->history;
-			    }
-			    cur_console->status &= ~BUFFER_SAVED;
-			    cur_console->history_head=cur_console->history_save;
-			    cur_console->status |= CURSOR_ENABLED;
-			    mark_all(cur_console);
+		    if (scp->status & SLKED) {
+			scp->status &= ~SLKED;
+#ifndef SC_NO_HISTORY
+			if (scp->status & BUFFER_SAVED) {
+			    if (!sc_hist_restore(scp))
+				sc_remove_cutmarking(scp);
+			    scp->status &= ~BUFFER_SAVED;
+			    scp->status |= CURSOR_ENABLED;
+			    draw_cursor_image(scp);
 			}
-			scstart(VIRTUAL_TTY(get_scr_num()));
+#endif
+			scstart(VIRTUAL_TTY(sc, scp->index));
 		    }
 		}
 		break;
@@ -3673,27 +3724,29 @@ next_code:
 		break;
 
 	    case BTAB:
-		return c;
+		if (!(sc->flags & SC_SCRN_BLANKED))
+		    return c;
+		break;
 
 	    case SPSC:
+#if NSPLASH > 0
 		/* force activatation/deactivation of the screen saver */
-		if (!scrn_blanked) {
+		if (!(sc->flags & SC_SCRN_BLANKED)) {
 		    run_scrn_saver = TRUE;
-		    scrn_time_stamp -= scrn_blank_time;
+		    sc->scrn_time_stamp -= scrn_blank_time;
 		}
-#if NSPLASH > 0
 		if (cold) {
 		    /*
 		     * While devices are being probed, the screen saver need
 		     * to be invoked explictly. XXX
 		     */
-		    if (scrn_blanked) {
+		    if (sc->flags & SC_SCRN_BLANKED) {
 			scsplash_stick(FALSE);
-			stop_scrn_saver(current_saver);
+			stop_scrn_saver(sc, current_saver);
 		    } else {
-			if (!ISGRAPHSC(cur_console)) {
+			if (!ISGRAPHSC(scp)) {
 			    scsplash_stick(TRUE);
-			    (*current_saver)(TRUE);
+			    (*current_saver)(sc, TRUE);
 			}
 		    }
 		}
@@ -3720,28 +3773,53 @@ next_code:
 #endif
 
 	    case DBG:
-#ifdef DDB      /* try to switch to console 0 */
-		/*
-		 * TRY to make sure the screen saver is stopped, 
-		 * and the screen is updated before switching to 
-		 * the vty0.
-		 */
-		scrn_timer((void *)FALSE);
-		if (cur_console->smode.mode == VT_AUTO &&
-		    console[0]->smode.mode == VT_AUTO)
-		    switch_scr(cur_console, 0);
+#ifndef SC_DISABLE_DDBKEY
+#ifdef DDB
+		if (debugger)
+		    break;
+		/* try to switch to the kernel console screen */
+		if (sc_console) {
+		    /*
+		     * TRY to make sure the screen saver is stopped, 
+		     * and the screen is updated before switching to 
+		     * the vty0.
+		     */
+		    scrn_timer(NULL);
+		    if (!cold
+			&& sc_console->sc->cur_scp->smode.mode == VT_AUTO
+			&& sc_console->smode.mode == VT_AUTO)
+			switch_scr(sc_console->sc, sc_console->index);
+		}
 		Debugger("manual escape to debugger");
 #else
 		printf("No debugger in kernel\n");
 #endif
+#else /* SC_DISABLE_DDBKEY */
+		/* do nothing */
+#endif /* SC_DISABLE_DDBKEY */
 		break;
 
 	    case NEXT:
-    		this_scr = get_scr_num();
-		for (i = this_scr + 1; i != this_scr; i = (i + 1)%MAXCONS) {
-		    struct tty *tp = VIRTUAL_TTY(i);
+		this_scr = scp->index;
+		for (i = (this_scr - sc->first_vty + 1)%sc->vtys;
+			sc->first_vty + i != this_scr; 
+			i = (i + 1)%sc->vtys) {
+		    struct tty *tp = VIRTUAL_TTY(sc, sc->first_vty + i);
 		    if (tp->t_state & TS_ISOPEN) {
-			switch_scr(cur_console, i);
+			switch_scr(scp->sc, sc->first_vty + i);
+			break;
+		    }
+		}
+		break;
+
+	    case PREV:
+		this_scr = scp->index;
+		for (i = (this_scr - sc->first_vty + sc->vtys - 1)%sc->vtys;
+			sc->first_vty + i != this_scr;
+			i = (i + sc->vtys - 1)%sc->vtys) {
+		    struct tty *tp = VIRTUAL_TTY(sc, sc->first_vty + i);
+		    if (tp->t_state & TS_ISOPEN) {
+			switch_scr(scp->sc, sc->first_vty + i);
 			break;
 		    }
 		}
@@ -3749,16 +3827,19 @@ next_code:
 
 	    default:
 		if (KEYCHAR(c) >= F_SCR && KEYCHAR(c) <= L_SCR) {
-		    switch_scr(cur_console, KEYCHAR(c) - F_SCR);
+		    switch_scr(scp->sc, sc->first_vty + KEYCHAR(c) - F_SCR);
 		    break;
 		}
 		/* assert(c & FKEY) */
-		return c;
+		if (!(sc->flags & SC_SCRN_BLANKED))
+		    return c;
+		break;
 	    }
 	    /* goto next_code */
 	} else {
 	    /* regular keys (maybe MKEY is set) */
-	    return c;
+	    if (!(sc->flags & SC_SCRN_BLANKED))
+		return c;
 	}
     }
 
@@ -3775,7 +3856,7 @@ scmmap(dev_t dev, vm_offset_t offset, int nprot)
     if (!tp)
 	return ENXIO;
     scp = sc_get_scr_stat(tp->t_dev);
-    return (*vidsw[scp->ad]->mmap)(scp->adp, offset);
+    return (*vidsw[scp->sc->adapter]->mmap)(scp->sc->adp, offset, nprot);
 }
 
 /*
@@ -3813,7 +3894,7 @@ save_kbd_state(scr_stat *scp)
     int state;
     int error;
 
-    error = kbd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state);
+    error = kbd_ioctl(scp->sc->kbd, KDGKBSTATE, (caddr_t)&state);
     if (error == ENOIOCTL)
 	error = ENODEV;
     if (error == 0) {
@@ -3824,13 +3905,13 @@ save_kbd_state(scr_stat *scp)
 }
 
 static int
-update_kbd_state(int new_bits, int mask)
+update_kbd_state(scr_stat *scp, int new_bits, int mask)
 {
     int state;
     int error;
 
     if (mask != LOCK_MASK) {
-	error = kbd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state);
+	error = kbd_ioctl(scp->sc->kbd, KDGKBSTATE, (caddr_t)&state);
 	if (error == ENOIOCTL)
 	    error = ENODEV;
 	if (error)
@@ -3840,19 +3921,19 @@ update_kbd_state(int new_bits, int mask)
     } else {
 	state = new_bits & LOCK_MASK;
     }
-    error = kbd_ioctl(kbd, KDSKBSTATE, (caddr_t)&state);
+    error = kbd_ioctl(scp->sc->kbd, KDSKBSTATE, (caddr_t)&state);
     if (error == ENOIOCTL)
 	error = ENODEV;
     return error;
 }
 
 static int
-update_kbd_leds(int which)
+update_kbd_leds(scr_stat *scp, int which)
 {
     int error;
 
     which &= LOCK_MASK;
-    error = kbd_ioctl(kbd, KDSETLED, (caddr_t)&which);
+    error = kbd_ioctl(scp->sc->kbd, KDSETLED, (caddr_t)&which);
     if (error == ENOIOCTL)
 	error = ENODEV;
     return error;
@@ -3864,28 +3945,31 @@ set_mode(scr_stat *scp)
     video_info_t info;
 
     /* reject unsupported mode */
-    if ((*vidsw[scp->ad]->get_info)(scp->adp, scp->mode, &info))
+    if ((*vidsw[scp->sc->adapter]->get_info)(scp->sc->adp, scp->mode, &info))
 	return 1;
 
     /* if this vty is not currently showing, do nothing */
-    if (scp != cur_console)
+    if (scp != scp->sc->cur_scp)
 	return 0;
 
     /* setup video hardware for the given mode */
-    (*vidsw[scp->ad]->set_mode)(scp->adp, scp->mode);
+    (*vidsw[scp->sc->adapter]->set_mode)(scp->sc->adp, scp->mode);
+    sc_vtb_init(&scp->scr, VTB_FRAMEBUFFER, scp->xsize, scp->ysize,
+		(void *)scp->sc->adp->va_window, FALSE);
 
+#ifndef SC_NO_FONT_LOADING
+    /* load appropriate font */
     if (!(scp->status & GRAPHICS_MODE)) {
-	/* load appropriate font */
-	if (!(scp->status & PIXEL_MODE) && ISFONTAVAIL(scp->adp->va_flags)) {
+	if (!(scp->status & PIXEL_MODE) && ISFONTAVAIL(scp->sc->adp->va_flags)) {
 	    if (scp->font_size < 14) {
-		if (fonts_loaded & FONT_8)
-		    copy_font(scp, LOAD, 8, font_8);
+		if (scp->sc->fonts_loaded & FONT_8)
+		    copy_font(scp, LOAD, 8, scp->sc->font_8);
 	    } else if (scp->font_size >= 16) {
-		if (fonts_loaded & FONT_16)
-		    copy_font(scp, LOAD, 16, font_16);
+		if (scp->sc->fonts_loaded & FONT_16)
+		    copy_font(scp, LOAD, 16, scp->sc->font_16);
 	    } else {
-		if (fonts_loaded & FONT_14)
-		    copy_font(scp, LOAD, 14, font_14);
+		if (scp->sc->fonts_loaded & FONT_14)
+		    copy_font(scp, LOAD, 14, scp->sc->font_14);
 	    }
 	    /*
 	     * FONT KLUDGE:
@@ -3894,18 +3978,14 @@ set_mode(scr_stat *scp)
 	     * Somehow we cannot show the font in other font pages on
 	     * some video cards... XXX
 	     */ 
-	    (*vidsw[scp->ad]->show_font)(scp->adp, 0);
+	    (*vidsw[scp->sc->adapter]->show_font)(scp->sc->adp, 0);
 	}
 	mark_all(scp);
     }
-
-    if (scp->status & PIXEL_MODE)
-	bzero_io(scp->adp->va_window, scp->xpixel*scp->ypixel/8);
+#endif /* !SC_NO_FONT_LOADING */
 
     set_border(scp, scp->border);
-
-    /* move hardware cursor out of the way */
-    (*vidsw[scp->ad]->set_hw_cursor)(scp->adp, -1, -1);
+    sc_set_cursor_image(scp);
 
     return 0;
 }
@@ -3913,43 +3993,12 @@ set_mode(scr_stat *scp)
 void
 set_border(scr_stat *scp, int color)
 {
-    vm_offset_t p;
-    int xoff;
-    int yoff;
-    int xlen;
-    int ylen;
-    int i;
-
-    (*vidsw[scp->ad]->set_border)(scp->adp, color);
-
-    if (scp->status & PIXEL_MODE) {
-	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
-	outw(GDCIDX, 0x0003);		/* data rotate/function select */
-	outw(GDCIDX, 0x0f01);		/* set/reset enable */
-	outw(GDCIDX, 0xff08);		/* bit mask */
-	outw(GDCIDX, (color << 8) | 0x00);	/* set/reset */
-	p = scp->adp->va_window;
-	xoff = scp->xoff;
-	yoff = scp->yoff*scp->font_size;
-	xlen = scp->xpixel/8;
-	ylen = scp->ysize*scp->font_size;
-	if (yoff > 0) {
-	    bzero_io(p, xlen*yoff);
-	    bzero_io(p + xlen*(yoff + ylen),
-		     xlen*scp->ypixel - xlen*(yoff + ylen));
-	}
-	if (xoff > 0) {
-	    for (i = 0; i < ylen; ++i) {
-		bzero_io(p + xlen*(yoff + i), xoff);
-		bzero_io(p + xlen*(yoff + i) + xoff + scp->xsize, 
-			 xlen - xoff - scp->xsize);
-	    }
-	}
-	outw(GDCIDX, 0x0000);		/* set/reset */
-	outw(GDCIDX, 0x0001);		/* set/reset enable */
-    }
+    ++scp->sc->videoio_in_progress;
+    (*scp->rndr->draw_border)(scp, color);
+    --scp->sc->videoio_in_progress;
 }
 
+#ifndef SC_NO_FONT_LOADING
 void
 copy_font(scr_stat *scp, int operation, int font_size, u_char *buf)
 {
@@ -3960,450 +4009,41 @@ copy_font(scr_stat *scp, int operation, int font_size, u_char *buf)
      * Somehow we cannot show the font in other font pages on
      * some video cards... XXX
      */ 
-    font_loading_in_progress = TRUE;
+    scp->sc->font_loading_in_progress = TRUE;
     if (operation == LOAD) {
-	(*vidsw[scp->ad]->load_font)(scp->adp, 0, font_size, buf, 0, 256);
-	if (sc_flags & CHAR_CURSOR)
-	    set_destructive_cursor(scp);
+	(*vidsw[scp->sc->adapter]->load_font)(scp->sc->adp, 0, font_size,
+					      buf, 0, 256);
     } else if (operation == SAVE) {
-	(*vidsw[scp->ad]->save_font)(scp->adp, 0, font_size, buf, 0, 256);
+	(*vidsw[scp->sc->adapter]->save_font)(scp->sc->adp, 0, font_size,
+					      buf, 0, 256);
     }
-    font_loading_in_progress = FALSE;
+    scp->sc->font_loading_in_progress = FALSE;
 }
+#endif /* !SC_NO_FONT_LOADING */
 
-static void
-set_destructive_cursor(scr_stat *scp)
+#ifndef SC_NO_SYSMOUSE
+struct tty
+*sc_get_mouse_tty(void)
 {
-    u_char cursor[32];
-    u_char *font_buffer;
-    int font_size;
-    int crtc_addr;
-    int i;
-
-    if (!ISFONTAVAIL(scp->adp->va_flags)
-	|| (scp->status & (GRAPHICS_MODE | PIXEL_MODE)))
-	return;
-
-    if (scp->font_size < 14) {
-	font_buffer = font_8;
-	font_size = 8;
-    } else if (scp->font_size >= 16) {
-	font_buffer = font_16;
-	font_size = 16;
-    } else {
-	font_buffer = font_14;
-	font_size = 14;
-    }
-
-    if (scp->status & MOUSE_VISIBLE) {
-	if ((scp->cursor_saveunder & 0xff) == SC_MOUSE_CHAR)
-    	    bcopy(&scp->mouse_cursor[0], cursor, scp->font_size);
-	else if ((scp->cursor_saveunder & 0xff) == SC_MOUSE_CHAR + 1)
-    	    bcopy(&scp->mouse_cursor[32], cursor, scp->font_size);
-	else if ((scp->cursor_saveunder & 0xff) == SC_MOUSE_CHAR + 2)
-    	    bcopy(&scp->mouse_cursor[64], cursor, scp->font_size);
-	else if ((scp->cursor_saveunder & 0xff) == SC_MOUSE_CHAR + 3)
-    	    bcopy(&scp->mouse_cursor[96], cursor, scp->font_size);
-	else
-	    bcopy(font_buffer+((scp->cursor_saveunder & 0xff)*scp->font_size),
- 	       	   cursor, scp->font_size);
-    }
-    else
-    	bcopy(font_buffer + ((scp->cursor_saveunder & 0xff) * scp->font_size),
- 	       cursor, scp->font_size);
-    for (i=0; i<32; i++)
-	if ((i >= scp->cursor_start && i <= scp->cursor_end) ||
-	    (scp->cursor_start >= scp->font_size && i == scp->font_size - 1))
-	    cursor[i] |= 0xff;
-#if 1
-    crtc_addr = scp->adp->va_crtc_addr;
-    while (!(inb(crtc_addr+6) & 0x08)) /* wait for vertical retrace */ ;
-#endif
-    font_loading_in_progress = TRUE;
-    (*vidsw[scp->ad]->load_font)(scp->adp, 0, font_size, cursor, DEAD_CHAR, 1);
-    font_loading_in_progress = FALSE;
+    return MOUSE_TTY;
 }
+#endif /* !SC_NO_SYSMOUSE */
 
+#ifndef SC_NO_CUTPASTE
 void
-sc_move_mouse(scr_stat *scp, int x, int y)
-{
-    scp->mouse_xpos = x;
-    scp->mouse_ypos = y;
-    scp->mouse_pos = scp->mouse_oldpos = 
-	scp->scr_buf + (y / scp->font_size) * scp->xsize + x / 8;
-}
-
-static void
-set_mouse_pos(scr_stat *scp)
-{
-    static int last_xpos = -1, last_ypos = -1;
-
-    if (scp->mouse_xpos < 0)
-	scp->mouse_xpos = 0;
-    if (scp->mouse_ypos < 0)
-	scp->mouse_ypos = 0;
-    if (!ISTEXTSC(scp)) {
-        if (scp->mouse_xpos > scp->xpixel-1)
-	    scp->mouse_xpos = scp->xpixel-1;
-        if (scp->mouse_ypos > scp->ypixel-1)
-	    scp->mouse_ypos = scp->ypixel-1;
-	return;
-    }
-    if (scp->mouse_xpos > (scp->xsize*8)-1)
-	scp->mouse_xpos = (scp->xsize*8)-1;
-    if (scp->mouse_ypos > (scp->ysize*scp->font_size)-1)
-	scp->mouse_ypos = (scp->ysize*scp->font_size)-1;
-
-    if (scp->mouse_xpos != last_xpos || scp->mouse_ypos != last_ypos) {
-	scp->status |= MOUSE_MOVED;
-
-    	scp->mouse_pos = scp->scr_buf + 
-	    ((scp->mouse_ypos/scp->font_size)*scp->xsize + scp->mouse_xpos/8);
-
-	if ((scp->status & MOUSE_VISIBLE) && (scp->status & MOUSE_CUTTING))
-	    mouse_cut(scp);
-    }
-}
-
-#define isspace(c)	(((c) & 0xff) == ' ')
-
-static int
-skip_spc_right(scr_stat *scp, u_short *p)
-{
-    int i;
-
-    for (i = (p - scp->scr_buf) % scp->xsize; i < scp->xsize; ++i) {
-	if (!isspace(*p))
-	    break;
-	++p;
-    }
-    return i;
-}
-
-static int
-skip_spc_left(scr_stat *scp, u_short *p)
-{
-    int i;
-
-    for (i = (p-- - scp->scr_buf) % scp->xsize - 1; i >= 0; --i) {
-	if (!isspace(*p))
-	    break;
-	--p;
-    }
-    return i;
-}
-
-static void
-mouse_cut(scr_stat *scp)
-{
-    u_short *end;
-    u_short *p;
-    int i = 0;
-    int j = 0;
-
-    scp->mouse_cut_end = (scp->mouse_pos >= scp->mouse_cut_start) ?
-	scp->mouse_pos + 1 : scp->mouse_pos;
-    end = (scp->mouse_cut_start > scp->mouse_cut_end) ? 
-	scp->mouse_cut_start : scp->mouse_cut_end;
-    for (p = (scp->mouse_cut_start > scp->mouse_cut_end) ?
-	    scp->mouse_cut_end : scp->mouse_cut_start; p < end; ++p) {
-	cut_buffer[i] = *p & 0xff;
-	/* remember the position of the last non-space char */
-	if (!isspace(cut_buffer[i++]))
-	    j = i;
-	/* trim trailing blank when crossing lines */
-	if (((p - scp->scr_buf) % scp->xsize) == (scp->xsize - 1)) {
-	    cut_buffer[j++] = '\r';
-	    i = j;
-	}
-    }
-    cut_buffer[i] = '\0';
-
-    /* scan towards the end of the last line */
-    --p;
-    for (i = (p - scp->scr_buf) % scp->xsize; i < scp->xsize; ++i) {
-	if (!isspace(*p))
-	    break;
-	++p;
-    }
-    /* if there is nothing but blank chars, trim them, but mark towards eol */
-    if (i >= scp->xsize) {
-	if (scp->mouse_cut_start > scp->mouse_cut_end)
-	    scp->mouse_cut_start = p;
-	else
-	    scp->mouse_cut_end = p;
-	cut_buffer[j++] = '\r';
-	cut_buffer[j] = '\0';
-    }
-
-    mark_for_update(scp, scp->mouse_cut_start - scp->scr_buf);
-    mark_for_update(scp, scp->mouse_cut_end - scp->scr_buf);
-}
-
-static void
-mouse_cut_start(scr_stat *scp) 
-{
-    int i;
-
-    if (scp->status & MOUSE_VISIBLE) {
-	if (scp->mouse_pos == scp->mouse_cut_start &&
-	    scp->mouse_cut_start == scp->mouse_cut_end - 1) {
-	    cut_buffer[0] = '\0';
-	    remove_cutmarking(scp);
-	} else if (skip_spc_right(scp, scp->mouse_pos) >= scp->xsize) {
-	    /* if the pointer is on trailing blank chars, mark towards eol */
-	    i = skip_spc_left(scp, scp->mouse_pos) + 1;
-	    scp->mouse_cut_start = scp->scr_buf +
-	        ((scp->mouse_pos - scp->scr_buf) / scp->xsize) * scp->xsize + i;
-	    scp->mouse_cut_end = scp->scr_buf +
-	        ((scp->mouse_pos - scp->scr_buf) / scp->xsize + 1) * scp->xsize;
-	    cut_buffer[0] = '\r';
-	    cut_buffer[1] = '\0';
-	    scp->status |= MOUSE_CUTTING;
-	} else {
-	    scp->mouse_cut_start = scp->mouse_pos;
-	    scp->mouse_cut_end = scp->mouse_cut_start + 1;
-	    cut_buffer[0] = *scp->mouse_cut_start & 0xff;
-	    cut_buffer[1] = '\0';
-	    scp->status |= MOUSE_CUTTING;
-	}
-    	mark_all(scp);
-	/* delete all other screens cut markings */
-	for (i=0; i<MAXCONS; i++) {
-	    if (console[i] == NULL || console[i] == scp)
-		continue;
-	    remove_cutmarking(console[i]);
-	}
-    }
-}
-
-static void
-mouse_cut_end(scr_stat *scp) 
-{
-    if (scp->status & MOUSE_VISIBLE) {
-	scp->status &= ~MOUSE_CUTTING;
-    }
-}
-
-static void
-mouse_cut_word(scr_stat *scp)
-{
-    u_short *p;
-    u_short *sol;
-    u_short *eol;
-    int i;
-
-    /*
-     * Because we don't have locale information in the kernel,
-     * we only distinguish space char and non-space chars.  Punctuation
-     * chars, symbols and other regular chars are all treated alike.
-     */
-    if (scp->status & MOUSE_VISIBLE) {
-	sol = scp->scr_buf
-	    + ((scp->mouse_pos - scp->scr_buf) / scp->xsize) * scp->xsize;
-	eol = sol + scp->xsize;
-	if (isspace(*scp->mouse_pos)) {
-	    for (p = scp->mouse_pos; p >= sol; --p)
-	        if (!isspace(*p))
-		    break;
-	    scp->mouse_cut_start = ++p;
-	    for (p = scp->mouse_pos; p < eol; ++p)
-	        if (!isspace(*p))
-		    break;
-	    scp->mouse_cut_end = p;
-	} else {
-	    for (p = scp->mouse_pos; p >= sol; --p)
-	        if (isspace(*p))
-		    break;
-	    scp->mouse_cut_start = ++p;
-	    for (p = scp->mouse_pos; p < eol; ++p)
-	        if (isspace(*p))
-		    break;
-	    scp->mouse_cut_end = p;
-	}
-	for (i = 0, p = scp->mouse_cut_start; p < scp->mouse_cut_end; ++p)
-	    cut_buffer[i++] = *p & 0xff;
-	cut_buffer[i] = '\0';
-	scp->status |= MOUSE_CUTTING;
-    }
-}
-
-static void
-mouse_cut_line(scr_stat *scp)
+sc_paste(scr_stat *scp, u_char *p, int count) 
 {
-    u_short *p;
-    int i;
-
-    if (scp->status & MOUSE_VISIBLE) {
-	scp->mouse_cut_start = scp->scr_buf
-	    + ((scp->mouse_pos - scp->scr_buf) / scp->xsize) * scp->xsize;
-	scp->mouse_cut_end = scp->mouse_cut_start + scp->xsize;
-	for (i = 0, p = scp->mouse_cut_start; p < scp->mouse_cut_end; ++p)
-	    cut_buffer[i++] = *p & 0xff;
-	cut_buffer[i++] = '\r';
-	cut_buffer[i] = '\0';
-	scp->status |= MOUSE_CUTTING;
-    }
-}
-
-static void
-mouse_cut_extend(scr_stat *scp) 
-{
-    if ((scp->status & MOUSE_VISIBLE) && !(scp->status & MOUSE_CUTTING)
-	&& (scp->mouse_cut_start != NULL)) {
-	mouse_cut(scp);
-	scp->status |= MOUSE_CUTTING;
-    }
-}
+    struct tty *tp;
+    u_char *rmap;
 
-static void
-mouse_paste(scr_stat *scp) 
-{
     if (scp->status & MOUSE_VISIBLE) {
-	struct tty *tp;
-	u_char *ptr = cut_buffer;
-
-	tp = VIRTUAL_TTY(get_scr_num());
-	while (*ptr)
-	    (*linesw[tp->t_line].l_rint)(scr_rmap[*ptr++], tp);
-    }
-}
-
-static void
-draw_mouse_image(scr_stat *scp)
-{
-    u_short buffer[32];
-    u_short xoffset, yoffset;
-    vm_offset_t crt_pos = scp->adp->va_window + 2*(scp->mouse_pos - scp->scr_buf);
-    u_char *font_buffer;
-    int font_size;
-    int crtc_addr;
-    int i;
-
-    if (scp->font_size < 14) {
-	font_buffer = font_8;
-	font_size = 8;
-    } else if (scp->font_size >= 16) {
-	font_buffer = font_16;
-	font_size = 16;
-    } else {
-	font_buffer = font_14;
-	font_size = 14;
-    }
-
-    xoffset = scp->mouse_xpos % 8;
-    yoffset = scp->mouse_ypos % scp->font_size;
-
-    /* prepare mousepointer char's bitmaps */
-    bcopy(font_buffer + ((*(scp->mouse_pos) & 0xff) * font_size),
-	   &scp->mouse_cursor[0], font_size);
-    bcopy(font_buffer + ((*(scp->mouse_pos+1) & 0xff) * font_size),
-	   &scp->mouse_cursor[32], font_size);
-    bcopy(font_buffer + ((*(scp->mouse_pos+scp->xsize) & 0xff) * font_size),
-	   &scp->mouse_cursor[64], font_size);
-    bcopy(font_buffer + ((*(scp->mouse_pos+scp->xsize+1) & 0xff) * font_size),
-	   &scp->mouse_cursor[96], font_size);
-    for (i=0; i<font_size; i++) {
-	buffer[i] = scp->mouse_cursor[i]<<8 | scp->mouse_cursor[i+32];
-	buffer[i+font_size]=scp->mouse_cursor[i+64]<<8|scp->mouse_cursor[i+96];
-    }
-
-    /* now and-or in the mousepointer image */
-    for (i=0; i<16; i++) {
-	buffer[i+yoffset] =
-	    ( buffer[i+yoffset] & ~(mouse_and_mask[i] >> xoffset))
-	    | (mouse_or_mask[i] >> xoffset);
+	tp = VIRTUAL_TTY(scp->sc, scp->sc->cur_scp->index);
+	rmap = scp->sc->scr_rmap;
+	for (; count > 0; --count)
+	    (*linesw[tp->t_line].l_rint)(rmap[*p++], tp);
     }
-    for (i=0; i<font_size; i++) {
-	scp->mouse_cursor[i] = (buffer[i] & 0xff00) >> 8;
-	scp->mouse_cursor[i+32] = buffer[i] & 0xff;
-	scp->mouse_cursor[i+64] = (buffer[i+font_size] & 0xff00) >> 8;
-	scp->mouse_cursor[i+96] = buffer[i+font_size] & 0xff;
-    }
-
-    scp->mouse_oldpos = scp->mouse_pos;
-
-#if 1
-    /* wait for vertical retrace to avoid jitter on some videocards */
-    crtc_addr = scp->adp->va_crtc_addr;
-    while (!(inb(crtc_addr+6) & 0x08)) /* idle */ ;
-#endif
-    font_loading_in_progress = TRUE;
-    (*vidsw[scp->ad]->load_font)(scp->adp, 0, 32, scp->mouse_cursor, 
-			   SC_MOUSE_CHAR, 4); 
-    font_loading_in_progress = FALSE;
-
-    writew(crt_pos, (*(scp->mouse_pos) & 0xff00) | SC_MOUSE_CHAR);
-    writew(crt_pos+2*scp->xsize,
-	   (*(scp->mouse_pos + scp->xsize) & 0xff00) | (SC_MOUSE_CHAR + 2));
-    if (scp->mouse_xpos < (scp->xsize-1)*8) {
-    	writew(crt_pos + 2, (*(scp->mouse_pos + 1) & 0xff00) | (SC_MOUSE_CHAR + 1));
-    	writew(crt_pos+2*scp->xsize + 2,
-	       (*(scp->mouse_pos + scp->xsize + 1) & 0xff00) | (SC_MOUSE_CHAR + 3));
-    }
-    mark_for_update(scp, scp->mouse_pos - scp->scr_buf);
-    mark_for_update(scp, scp->mouse_pos + scp->xsize + 1 - scp->scr_buf);
-}
-
-static void
-remove_mouse_image(scr_stat *scp)
-{
-    vm_offset_t crt_pos;
-
-    if (!ISTEXTSC(scp))
-	return;
-
-    crt_pos = scp->adp->va_window + 2*(scp->mouse_oldpos - scp->scr_buf);
-    writew(crt_pos, *(scp->mouse_oldpos));
-    writew(crt_pos+2, *(scp->mouse_oldpos+1));
-    writew(crt_pos+2*scp->xsize, *(scp->mouse_oldpos+scp->xsize));
-    writew(crt_pos+2*scp->xsize+2, *(scp->mouse_oldpos+scp->xsize+1));
-    mark_for_update(scp, scp->mouse_oldpos - scp->scr_buf);
-    mark_for_update(scp, scp->mouse_oldpos + scp->xsize + 1 - scp->scr_buf);
-}
-
-static void
-draw_cutmarking(scr_stat *scp)
-{
-    vm_offset_t crt_pos;
-    u_short *ptr;
-    u_short och, nch;
-
-    crt_pos = scp->adp->va_window;
-    for (ptr=scp->scr_buf; ptr<=(scp->scr_buf+(scp->xsize*scp->ysize)); ptr++) {
-	nch = och = readw(crt_pos + 2*(ptr - scp->scr_buf));
-	/* are we outside the selected area ? */
-	if ( ptr < (scp->mouse_cut_start > scp->mouse_cut_end ? 
-	            scp->mouse_cut_end : scp->mouse_cut_start) ||
-	     ptr >= (scp->mouse_cut_start > scp->mouse_cut_end ?
-	            scp->mouse_cut_start : scp->mouse_cut_end)) {
-	    if (ptr != scp->cursor_pos)
-		nch = (och & 0xff) | (*ptr & 0xff00);
-	}
-	else {
-	    /* are we clear of the cursor image ? */
-	    if (ptr != scp->cursor_pos)
-		nch = (och & 0x88ff) | (*ptr & 0x7000)>>4 | (*ptr & 0x0700)<<4;
-	    else {
-		if (sc_flags & CHAR_CURSOR)
-		    nch = (och & 0x88ff)|(*ptr & 0x7000)>>4|(*ptr & 0x0700)<<4;
-		else 
-		    if (!(sc_flags & BLINK_CURSOR))
-		        nch = (och & 0xff) | (*ptr & 0xff00);
-	    }
-	}
-	if (nch != och)
-	    writew(crt_pos + 2*(ptr - scp->scr_buf), nch);
-    }
-}
-
-static void
-remove_cutmarking(scr_stat *scp)
-{
-    scp->mouse_cut_start = scp->mouse_cut_end = NULL;
-    scp->status &= ~MOUSE_CUTTING;
-    mark_all(scp);
 }
+#endif /* SC_NO_CUTPASTE */
 
 static void
 do_bell(scr_stat *scp, int pitch, int duration)
@@ -4411,18 +4051,18 @@ do_bell(scr_stat *scp, int pitch, int duration)
     if (cold || shutdown_in_progress)
 	return;
 
-    if (scp != cur_console && (sc_flags & QUIET_BELL))
+    if (scp != scp->sc->cur_scp && (scp->sc->flags & SC_QUIET_BELL))
 	return;
 
-    if (sc_flags & VISUAL_BELL) {
-	if (blink_in_progress)
+    if (scp->sc->flags & SC_VISUAL_BELL) {
+	if (scp->sc->blink_in_progress)
 	    return;
-	blink_in_progress = 4;
-	if (scp != cur_console)
-	    blink_in_progress += 2;
-	blink_screen(cur_console);
+	scp->sc->blink_in_progress = 3;
+	if (scp != scp->sc->cur_scp)
+	    scp->sc->blink_in_progress += 2;
+	blink_screen(scp->sc->cur_scp);
     } else {
-	if (scp != cur_console)
+	if (scp != scp->sc->cur_scp)
 	    pitch *= 2;
 	sysbeep(pitch, duration);
     }
@@ -4433,122 +4073,19 @@ blink_screen(void *arg)
 {
     scr_stat *scp = arg;
 
-    if (!ISTEXTSC(scp) || (blink_in_progress <= 1)) {
-	blink_in_progress = FALSE;
+    if (ISGRAPHSC(scp) || (scp->sc->blink_in_progress <= 1)) {
+	scp->sc->blink_in_progress = 0;
     	mark_all(scp);
-	if (delayed_next_scr)
-	    switch_scr(scp, delayed_next_scr - 1);
+	scstart(VIRTUAL_TTY(scp->sc, scp->index));
+	if (scp->sc->delayed_next_scr)
+	    switch_scr(scp->sc, scp->sc->delayed_next_scr - 1);
     }
     else {
-	if (blink_in_progress & 1)
-	    fillw_io(kernel_default.std_color | scr_map[0x20],
-		     scp->adp->va_window,
-		     scp->xsize * scp->ysize);
-	else
-	    fillw_io(kernel_default.rev_color | scr_map[0x20],
-		     scp->adp->va_window,
-		     scp->xsize * scp->ysize);
-	blink_in_progress--;
+	(*scp->rndr->draw)(scp, 0, scp->xsize*scp->ysize, 
+			   scp->sc->blink_in_progress & 1);
+	scp->sc->blink_in_progress--;
 	timeout(blink_screen, scp, hz / 10);
     }
 }
 
-void 
-sc_bcopy(scr_stat *scp, u_short *p, int from, int to, int mark)
-{
-    u_char *font;
-    vm_offset_t d;
-    vm_offset_t e;
-    u_char *f;
-    int font_size;
-    int line_length;
-    int xsize;
-    u_short bg;
-    int i, j;
-    u_char c;
-
-    if (ISTEXTSC(scp)) {
-	bcopy_toio(p + from, scp->adp->va_window + 2*from,
-		   (to - from + 1)*sizeof(u_short));
-    } else /* if ISPIXELSC(scp) */ {
-	if (mark)
-	    mark = 255;
-	font_size = scp->font_size;
-	if (font_size < 14)
-	    font = font_8;
-	else if (font_size >= 16)
-	    font = font_16;
-	else
-	    font = font_14;
-	line_length = scp->xpixel/8;
-	xsize = scp->xsize;
-	d = scp->adp->va_window
-	    + scp->xoff + scp->yoff*font_size*line_length 
-	    + (from%xsize) + font_size*line_length*(from/xsize);
-
-	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
-	outw(GDCIDX, 0x0003);		/* data rotate/function select */
-	outw(GDCIDX, 0x0f01);		/* set/reset enable */
-	bg = -1;
-	for (i = from ; i <= to ; i++) {
-	    /* set background color in EGA/VGA latch */
-	    if (bg != (p[i] & 0xf000)) {
-		bg = (p[i] & 0xf000);
-		outw(GDCIDX, (bg >> 4) | 0x00); /* set/reset */
-		outw(GDCIDX, 0xff08);		/* bit mask */
-		writeb(d, 0);
-		c = readb(d);	/* set the background color in the latch */
-	    }
-	    /* foreground color */
-	    outw(GDCIDX, (p[i] & 0x0f00) | 0x00); /* set/reset */
-	    e = d;
-	    f = &font[(p[i] & 0x00ff)*font_size];
-	    for (j = 0 ; j < font_size; j++, f++) {
-		outw(GDCIDX, ((*f^mark) << 8) | 0x08);	/* bit mask */
-	        writeb(e, 0);
-		e += line_length;
-	    }
-	    d++;
-	    if ((i % xsize) == xsize - 1)
-		d += scp->xoff*2 + (font_size - 1)*line_length;
-	}
-	outw(GDCIDX, 0x0000);		/* set/reset */
-	outw(GDCIDX, 0x0001);		/* set/reset enable */
-	outw(GDCIDX, 0xff08);		/* bit mask */
-
-#if 0	/* VGA only */
-	outw(GDCIDX, 0x0305);		/* read mode 0, write mode 3 */
-	outw(GDCIDX, 0x0003);		/* data rotate/function select */
-	outw(GDCIDX, 0x0f01);		/* set/reset enable */
-	outw(GDCIDX, 0xff08);		/* bit mask */
-	bg = -1;
-	for (i = from ; i <= to ; i++) {
-	    /* set background color in EGA/VGA latch */
-	    if (bg != (p[i] & 0xf000)) {
-		bg = (p[i] & 0xf000);
-		outw(GDCIDX, 0x0005);	/* read mode 0, write mode 0 */
-		outw(GDCIDX, (bg >> 4) | 0x00); /* set/reset */
-		*d = 0;
-		c = *d;		/* set the background color in the latch */
-		outw(GDCIDX, 0x0305);	/* read mode 0, write mode 3 */
-	    }
-	    /* foreground color */
-	    outw(GDCIDX, (p[i] & 0x0f00) | 0x00); /* set/reset */
-	    e = (u_char *)d;
-	    f = &font[(p[i] & 0x00ff)*font_size];
-	    for (j = 0 ; j < font_size; j++, f++) {
-	        *e = *f^mark;
-		e += line_length;
-	    }
-	    d++;
-	    if ((i % xsize) == xsize - 1)
-		d += scp->xoff*2 + (font_size - 1)*line_length;
-	}
-	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
-	outw(GDCIDX, 0x0000);		/* set/reset */
-	outw(GDCIDX, 0x0001);		/* set/reset enable */
-#endif /* 0 */
-    }
-}
-
 #endif /* NSC */
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index c8ba6cd060b7..da48c7ced63d 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -25,21 +25,51 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.h,v 1.46 1999/01/19 11:31:19 yokota Exp $
+ *	$Id: syscons.h,v 1.47 1999/04/12 13:34:56 des Exp $
  */
 
 #ifndef _DEV_SYSCONS_SYSCONS_H_
 #define	_DEV_SYSCONS_SYSCONS_H_
 
-/* vm things */
-#define	ISMAPPED(pa, width) \
-	(((pa) <= (u_long)0x1000 - (width)) \
-	 || ((pa) >= 0xa0000 && (pa) <= 0x100000 - (width)))
-#define	pa_to_va(pa)	(KERNBASE + (pa))	/* works if ISMAPPED(pa...) */
+/* machine-dependent part of the header */
+
+#ifdef PC98
+#include <pc98/pc98/sc_machdep.h>
+#elif defined(__i386__)
+/* nothing for the moment */
+#elif defined(__alpha__)
+/* nothing for the moment */
+#endif
+
+/* default values for configuration options */
+
+#ifndef MAXCONS
+#define MAXCONS		16
+#endif
+
+#ifdef SC_NO_SYSMOUSE
+#undef SC_NO_CUTPASTE
+#define SC_NO_CUTPASTE	1
+#endif
+
+#ifdef SC_NO_MODE_CHANGE
+#undef SC_PIXEL_MODE
+#endif
+
+#ifndef SC_DEBUG_LEVEL
+#define SC_DEBUG_LEVEL	0
+#endif
+
+#define DPRINTF(l, p)	if (SC_DEBUG_LEVEL >= (l)) printf p
+
+#define SC_DRIVER_NAME	"sc"
+#define SC_VTY(dev)	minor(dev)
 
 /* printable chars */
+#ifndef PRINTABLE
 #define PRINTABLE(ch)	((ch) > 0x1b || ((ch) > 0x0d && (ch) < 0x1b) \
 			 || (ch) < 0x07)
+#endif
 
 /* macros for "intelligent" screen update */
 #define mark_for_update(scp, x)	{\
@@ -51,33 +81,20 @@
 				    scp->end = scp->xsize * scp->ysize - 1;\
 				}
 
-/* status flags */
+/* vty status flags (scp->status) */
 #define UNKNOWN_MODE	0x00010
 #define SWITCH_WAIT_REL	0x00080
 #define SWITCH_WAIT_ACQ	0x00100
 #define BUFFER_SAVED	0x00200
 #define CURSOR_ENABLED 	0x00400
-#define MOUSE_ENABLED	0x00800
 #define MOUSE_MOVED	0x01000
 #define MOUSE_CUTTING	0x02000
 #define MOUSE_VISIBLE	0x04000
 #define GRAPHICS_MODE	0x08000
 #define PIXEL_MODE	0x10000
 #define SAVER_RUNNING	0x20000
-
-/* configuration flags */
-#define VISUAL_BELL	0x00001
-#define BLINK_CURSOR	0x00002
-#define CHAR_CURSOR	0x00004
-/* these options are now obsolete; use corresponding options for kbd driver */
-#if 0
-#define DETECT_KBD	0x00008
-#define XT_KEYBD	0x00010
-#define KBD_NORESET	0x00020
-#endif
-#define QUIET_BELL	0x00040
-#define VESA800X600	0x00080
-#define AUTODETECT_KBD	0x00100
+#define VR_CURSOR_BLINK	0x40000
+#define VR_CURSOR_ON	0x80000
 
 /* attribute flags */
 #define NORMAL_ATTR             0x00
@@ -96,8 +113,6 @@
 #define SAVE		0
 #define	COL		80
 #define	ROW		25
-#define BELL_DURATION	5
-#define BELL_PITCH	800
 #define CONSOLE_BUFSIZE 1024
 #define PCBURST		128
 #define FONT_NONE	1
@@ -105,6 +120,11 @@
 #define FONT_14		4
 #define FONT_16		8
 
+#ifndef BELL_DURATION
+#define BELL_DURATION	5
+#define BELL_PITCH	800
+#endif
+
 /* special characters */
 #define cntlc		0x03
 #define cntld		0x04
@@ -115,6 +135,23 @@
 
 #define DEAD_CHAR 	0x07			/* char used for cursor */
 
+/* virtual terminal buffer */
+typedef struct sc_vtb {
+	int		vtb_flags;
+#define VTB_VALID	(1 << 0)
+	int		vtb_type;
+#define VTB_INVALID	0
+#define VTB_MEMORY	1
+#define VTB_FRAMEBUFFER	2
+#define VTB_RINGBUFFER	3
+	int		vtb_cols;
+	int		vtb_rows;
+	int		vtb_size;
+	vm_offset_t	vtb_buffer;
+	int		vtb_tail;	/* valid for VTB_RINGBUFFER only */
+} sc_vtb_t;
+
+/* terminal status */
 typedef struct term_stat {
 	int 		esc;			/* processing escape sequence */
 	int 		num_param;		/* # of parameters to ESC */
@@ -127,10 +164,89 @@ typedef struct term_stat {
 	int             rev_color;              /* reverse hardware color */
 } term_stat;
 
+/* softc */
+
+struct keyboard;
+struct video_adapter;
+struct scr_stat;
+struct tty;
+
+typedef struct sc_softc {
+	int		unit;			/* unit # */
+	int		config;			/* configuration flags */
+#define SC_VESA800X600	(1 << 7)
+#define SC_AUTODETECT_KBD (1 << 8)
+#define SC_KERNEL_CONSOLE (1 << 9)
+
+	int		flags;			/* status flags */
+#define SC_VISUAL_BELL	(1 << 0)
+#define SC_QUIET_BELL	(1 << 1)
+#define SC_BLINK_CURSOR	(1 << 2)
+#define SC_CHAR_CURSOR	(1 << 3)
+#define SC_MOUSE_ENABLED (1 << 4)
+#define	SC_SCRN_IDLE	(1 << 5)
+#define	SC_SCRN_BLANKED	(1 << 6)
+#define	SC_SAVER_FAILED	(1 << 7)
+
+#define	SC_INIT_DONE	(1 << 16)
+#define	SC_SPLASH_SCRN	(1 << 17)
+
+	int		keyboard;		/* -1 if unavailable */
+	struct keyboard	*kbd;
+
+	int		adapter;
+	struct video_adapter *adp;
+	int		initial_mode;		/* initial video mode */
+
+	int		first_vty;
+	int		vtys;
+	struct tty	*tty;
+	struct scr_stat	**console;
+	struct scr_stat	*cur_scp;
+	struct scr_stat	*new_scp;
+	struct scr_stat	*old_scp;
+	int     	delayed_next_scr;
+
+	void		**devfs_token;
+
+	char        	font_loading_in_progress;
+	char        	switch_in_progress;
+	char        	videoio_in_progress;
+	char        	write_in_progress;
+	char        	blink_in_progress;
+
+	long		scrn_time_stamp;
+
+	char		cursor_base;
+	char		cursor_height;
+
+	u_char      	scr_map[256];
+	u_char      	scr_rmap[256];
+
+#ifdef _SC_MD_SOFTC_DECLARED_
+	sc_md_softc_t	md;			/* machine dependent vars */
+#endif
+
+#ifndef SC_NO_PALETTE_LOADING
+	u_char        	palette[256*3];
+#endif
+
+#ifndef SC_NO_FONT_LOADING
+	int     	fonts_loaded;
+	u_char		*font_8;
+	u_char		*font_14;
+	u_char		*font_16;
+#endif
+
+} sc_softc_t;
+
+/* virtual screen */
 typedef struct scr_stat {
-	int		ad;			/* video adapter index */
-	video_adapter_t	*adp;			/* video adapter structure */
-	u_short 	*scr_buf;		/* buffer when off screen */
+	int		index;			/* index of this vty */
+	struct sc_softc *sc;			/* pointer to softc */
+	struct sc_rndr_sw *rndr;		/* renderer */
+	sc_vtb_t	scr;
+	sc_vtb_t	vtb;
 	int 		xpos;			/* current X position */
 	int 		ypos;			/* current Y position */
 	int             saved_xpos;             /* saved X position */
@@ -141,25 +257,26 @@ typedef struct scr_stat {
 	int 		ypixel;			/* Y graphics size */
 	int		xoff;			/* X offset in pixel mode */
 	int		yoff;			/* Y offset in pixel mode */
+	u_char		*font;			/* current font */
 	int		font_size;		/* fontsize in Y direction */
 	int		start;			/* modified area start */
 	int		end;			/* modified area end */
 	term_stat 	term;			/* terminal emulation stuff */
 	int	 	status;			/* status (bitfield) */
 	int		kbd_mode;		/* keyboard I/O mode */
-	u_short 	*cursor_pos;		/* cursor buffer position */
-	u_short 	*cursor_oldpos;		/* cursor old buffer position */
-	u_short		cursor_saveunder;	/* saved chars under cursor */
-	char		cursor_start;		/* cursor start line # */
-	char		cursor_end;		/* cursor end line # */
-	u_short		*mouse_pos;		/* mouse buffer position */
-	u_short		*mouse_oldpos;		/* mouse old buffer position */
+	int		cursor_pos;		/* cursor buffer position */
+	int		cursor_oldpos;		/* cursor old buffer position */
+	u_short		cursor_saveunder_char;	/* saved char under cursor */
+	u_short		cursor_saveunder_attr;	/* saved attr under cursor */
+	char		cursor_base;		/* cursor base line # */
+	char		cursor_height;		/* cursor height */
+	int		mouse_pos;		/* mouse buffer position */
+	int		mouse_oldpos;		/* mouse old buffer position */
 	short		mouse_xpos;		/* mouse x coordinate */
 	short		mouse_ypos;		/* mouse y coordinate */
 	short		mouse_buttons;		/* mouse buttons */
-	u_char		mouse_cursor[128];	/* mouse cursor bitmap store */
-	u_short		*mouse_cut_start;	/* mouse cut start pos */
-	u_short		*mouse_cut_end;		/* mouse cut end pos */
+	int		mouse_cut_start;	/* mouse cut start pos */
+	int		mouse_cut_end;		/* mouse cut end pos */
 	struct proc 	*mouse_proc;		/* proc* of controlling proc */
 	pid_t 		mouse_pid;		/* pid of controlling proc */
 	int		mouse_signal;		/* signal # to report with */
@@ -170,16 +287,14 @@ typedef struct scr_stat {
 	pid_t 		pid;			/* pid of controlling proc */
 	struct proc 	*proc;			/* proc* of controlling proc */
 	struct vt_mode 	smode;			/* switch mode */
-	u_short		*history;		/* circular history buffer */
-	u_short		*history_head;		/* current head position */
-	u_short		*history_pos;		/* position shown on screen */
-	u_short		*history_save;		/* save area index */
+	sc_vtb_t	*history;		/* circular history buffer */
+	int		history_pos;		/* position shown on screen */
 	int		history_size;		/* size of history buffer */
-#ifdef __i386__
-	struct apmhook  r_hook;			/* reconfiguration support */
-#endif
 	int		splash_save_mode;	/* saved mode for splash screen */
 	int		splash_save_status;	/* saved status for splash screen */
+#ifdef _SCR_MD_STAT_DECLARED_
+	scr_md_stat_t	md;			/* machine dependent vars */
+#endif
 } scr_stat;
 
 typedef struct default_attr {
@@ -187,7 +302,63 @@ typedef struct default_attr {
 	int             rev_color;              /* reverse hardware color */
 } default_attr;
 
+#ifndef SC_NORM_ATTR
+#define SC_NORM_ATTR		(FG_LIGHTGREY | BG_BLACK)
+#endif
+#ifndef SC_NORM_REV_ATTR
+#define SC_NORM_REV_ATTR	(FG_BLACK | BG_LIGHTGREY)
+#endif
+#ifndef SC_KERNEL_CONS_ATTR
+#define SC_KERNEL_CONS_ATTR	(FG_WHITE | BG_BLACK)
+#endif
+#ifndef SC_KERNEL_CONS_REV_ATTR
+#define SC_KERNEL_CONS_REV_ATTR	(FG_BLACK | BG_LIGHTGREY)
+#endif
+
+/* renderer function table */
+typedef void	vr_clear_t(scr_stat *scp, int c, int attr);
+typedef void	vr_draw_border_t(scr_stat *scp, int color);
+typedef void	vr_draw_t(scr_stat *scp, int from, int count, int flip);
+typedef void	vr_set_cursor_t(scr_stat *scp, int base, int height, int blink);
+typedef void	vr_draw_cursor_t(scr_stat *scp, int at, int blink,
+				 int on, int flip);
+typedef void	vr_blink_cursor_t(scr_stat *scp, int at, int flip);
+typedef void	vr_set_mouse_t(scr_stat *scp);
+typedef void	vr_draw_mouse_t(scr_stat *scp, int x, int y, int on);
+
+typedef struct sc_rndr_sw {
+	vr_clear_t		*clear;
+	vr_draw_border_t	*draw_border;
+	vr_draw_t		*draw;
+	vr_set_cursor_t		*set_cursor;
+	vr_draw_cursor_t	*draw_cursor;
+	vr_blink_cursor_t	*blink_cursor;
+	vr_set_mouse_t		*set_mouse;
+	vr_draw_mouse_t		*draw_mouse;
+} sc_rndr_sw_t;
+
+typedef struct sc_renderer {
+	char		*name;
+	int		mode;
+	sc_rndr_sw_t	*rndrsw;
+} sc_renderer_t;
+
+#define RENDERER(name, mode, sw)				\
+	static struct sc_renderer name##_##mode##_renderer = {	\
+		#name, mode, &sw				\
+	};							\
+	DATA_SET(scrndr_set, name##_##mode##_renderer)
 
+extern struct linker_set scrndr_set;
+
+typedef struct {
+	int		cursor_start;
+	int		cursor_end;
+	int		shift_state;
+	int		bell_pitch;
+} bios_values_t;
+
+/* other macros */
 #define ISTEXTSC(scp)	(!((scp)->status 				\
 			  & (UNKNOWN_MODE | GRAPHICS_MODE | PIXEL_MODE)))
 #define ISGRAPHSC(scp)	(((scp)->status 				\
@@ -197,41 +368,143 @@ typedef struct default_attr {
 			  == PIXEL_MODE)
 #define ISUNKNOWNSC(scp) ((scp)->status & UNKNOWN_MODE)
 
-#define ISFONTAVAIL(af)	((af) & V_ADP_FONT)
+#ifndef ISMOUSEAVAIL
+#ifdef SC_ALT_MOUSE_IMAGE
+#define ISMOUSEAVAIL(af) (1)
+#else
 #define ISMOUSEAVAIL(af) ((af) & V_ADP_FONT)
+#endif /* SC_ALT_MOUSE_IMAGE */
+#define ISFONTAVAIL(af)	((af) & V_ADP_FONT)
 #define ISPALAVAIL(af)	((af) & V_ADP_PALETTE)
+#endif /* ISMOUSEAVAIL */
 
-/* misc prototypes used by different syscons related LKM's */
+#define ISSIGVALID(sig)	((sig) > 0 && (sig) < NSIG)
+
+#define kbd_read_char(kbd, wait)					\
+		(*kbdsw[(kbd)->kb_index]->read_char)((kbd), (wait))
+#define kbd_check_char(kbd)						\
+		(*kbdsw[(kbd)->kb_index]->check_char)((kbd))
+#define kbd_enable(kbd)							\
+		(*kbdsw[(kbd)->kb_index]->enable)((kbd))
+#define kbd_disable(kbd)						\
+		(*kbdsw[(kbd)->kb_index]->disable)((kbd))
+#define kbd_lock(kbd, lockf)						\
+		(*kbdsw[(kbd)->kb_index]->lock)((kbd), (lockf))
+#define kbd_ioctl(kbd, cmd, arg)					\
+	    (((kbd) == NULL) ?						\
+		ENODEV : (*kbdsw[(kbd)->kb_index]->ioctl)((kbd), (cmd), (arg)))
+#define kbd_clear_state(kbd)						\
+		(*kbdsw[(kbd)->kb_index]->clear_state)((kbd))
+#define kbd_get_fkeystr(kbd, fkey, len)					\
+		(*kbdsw[(kbd)->kb_index]->get_fkeystr)((kbd), (fkey), (len))
+#define kbd_poll(kbd, on)						\
+		(*kbdsw[(kbd)->kb_index]->poll)((kbd), (on))
 
 /* syscons.c */
-int sc_probe_unit(int unit, int flags);
-int sc_attach_unit(int unit, int flags);
+extern int 	(*sc_user_ioctl)(dev_t dev, u_long cmd, caddr_t data,
+				 int flag, struct proc *p);
+
+int		sc_probe_unit(int unit, int flags);
+int		sc_attach_unit(int unit, int flags);
+int		sc_resume_unit(int unit);
 
-extern int (*sc_user_ioctl)(dev_t dev, u_long cmd, caddr_t data, int flag, 
-			    struct proc *p);
+int		set_mode(scr_stat *scp);
+scr_stat	*sc_get_scr_stat(dev_t dev);
 
-int set_mode(scr_stat *scp);
-scr_stat *sc_get_scr_stat(dev_t dev);
+void		copy_font(scr_stat *scp, int operation, int font_size,
+			  u_char *font_image);
+void		set_border(scr_stat *scp, int color);
 
-void copy_font(scr_stat *scp, int operation, int font_size, u_char *font_image);
-void set_border(scr_stat *scp, int color);
+void		sc_touch_scrn_saver(void);
+void		sc_clear_screen(scr_stat *scp);
+void		sc_set_cursor_image(scr_stat *scp);
+int		sc_clean_up(scr_stat *scp);
+void		sc_alloc_scr_buffer(scr_stat *scp, int wait, int discard);
+struct tty	*scdevtotty(dev_t dev);
+#ifndef SC_NO_SYSMOUSE
+struct tty	*sc_get_mouse_tty(void);
+#endif /* SC_NO_SYSMOUSE */
+#ifndef SC_NO_CUTPASTE
+void		sc_paste(scr_stat *scp, u_char *p, int count);
+#endif /* SC_NO_CUTPASTE */
 
-void sc_touch_scrn_saver(void);
-void sc_clear_screen(scr_stat *scp);
-void sc_move_mouse(scr_stat *scp, int x, int y);
-int sc_clean_up(scr_stat *scp);
-void sc_alloc_scr_buffer(scr_stat *scp, int wait, int clear);
-void sc_alloc_cut_buffer(scr_stat *scp, int wait);
-void sc_alloc_history_buffer(scr_stat *scp, int lines, int extra, int wait);
-struct tty *scdevtotty(dev_t dev);
+/* schistory.c */
+#ifndef SC_NO_HISTORY
+int		sc_alloc_history_buffer(scr_stat *scp, int lines, int wait);
+void		sc_hist_save(scr_stat *scp);
+#define		sc_hist_save_one_line(scp, from)	\
+		sc_vtb_append(&(scp)->vtb, (from), (scp)->history, (scp)->xsize)
+int		sc_hist_restore(scr_stat *scp);
+void		sc_hist_home(scr_stat *scp);
+void		sc_hist_end(scr_stat *scp);
+int		sc_hist_up_line(scr_stat *scp);
+int		sc_hist_down_line(scr_stat *scp);
+int		sc_hist_ioctl(struct tty *tp, u_long cmd, caddr_t data,
+			      int flag, struct proc *p);
+#endif /* SC_NO_HISTORY */
+
+/* scmouse.c */
+#ifndef SC_NO_CUTPASTE
+void		sc_alloc_cut_buffer(scr_stat *scp, int wait);
+void		sc_draw_mouse_image(scr_stat *scp); 
+void		sc_remove_mouse_image(scr_stat *scp); 
+int		sc_inside_cutmark(scr_stat *scp, int pos);
+void		sc_remove_cutmarking(scr_stat *scp);
+void		sc_remove_all_cutmarkings(sc_softc_t *scp);
+void		sc_remove_all_mouse(sc_softc_t *scp);
+#else
+#define		sc_inside_cutmark(scp, pos)	FALSE
+#define		sc_remove_cutmarking(scp)
+#endif /* SC_NO_CUTPASTE */
+#ifndef SC_NO_SYSMOUSE
+void		sc_mouse_set_level(int level);
+void		sc_mouse_move(scr_stat *scp, int x, int y);
+int		sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data,
+			       int flag, struct proc *p);
+#endif /* SC_NO_SYSMOUSE */
 
 /* scvidctl.c */
-int sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode,
-		     int xsize, int ysize, int fontsize);
-int sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode);
-int sc_set_pixel_mode(scr_stat *scp, struct tty *tp,
-		      int xsize, int ysize, int fontsize);
-int sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, 
-		 struct proc *p);
+int		sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode,
+				 int xsize, int ysize, int fontsize);
+int		sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode);
+int		sc_set_pixel_mode(scr_stat *scp, struct tty *tp,
+				  int xsize, int ysize, int fontsize);
+sc_rndr_sw_t	*sc_render_match(scr_stat *scp, video_adapter_t *adp, int mode);
+int		sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
+			     struct proc *p);
+
+/* scvtb.c */
+void		sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, 
+			    void *buffer, int wait);
+void		sc_vtb_destroy(sc_vtb_t *vtb);
+size_t		sc_vtb_size(int cols, int rows);
+void		sc_vtb_clear(sc_vtb_t *vtb, int c, int attr);
+
+int		sc_vtb_getc(sc_vtb_t *vtb, int at);
+int		sc_vtb_geta(sc_vtb_t *vtb, int at);
+void		sc_vtb_putc(sc_vtb_t *vtb, int at, int c, int a);
+vm_offset_t	sc_vtb_putchar(sc_vtb_t *vtb, vm_offset_t p, int c, int a);
+vm_offset_t	sc_vtb_pointer(sc_vtb_t *vtb, int at);
+int		sc_vtb_pos(sc_vtb_t *vtb, int pos, int offset);
+
+#define		sc_vtb_tail(vtb)	((vtb)->vtb_tail)
+#define		sc_vtb_rows(vtb)	((vtb)->vtb_rows)
+
+void		sc_vtb_copy(sc_vtb_t *vtb1, int from, sc_vtb_t *vtb2, int to,
+			    int count);
+void		sc_vtb_append(sc_vtb_t *vtb1, int from, sc_vtb_t *vtb2,
+			      int count);
+void		sc_vtb_seek(sc_vtb_t *vtb, int pos);
+void		sc_vtb_erase(sc_vtb_t *vtb, int at, int count, int c, int attr);
+void		sc_vtb_delete(sc_vtb_t *vtb, int at, int count, int c, int attr);
+void		sc_vtb_ins(sc_vtb_t *vtb, int at, int count, int c, int attr);
+
+/* machine dependent functions */
+int		sc_max_unit(void);
+sc_softc_t	*sc_get_softc(int unit, int flags);
+sc_softc_t	*sc_find_softc(struct video_adapter *adp, struct keyboard *kbd);
+int		sc_get_cons_priority(int *unit, int *flags);
+void		sc_get_bios_values(bios_values_t *values);
+int		sc_tone(int herz);
 
 #endif /* !_DEV_SYSCONS_SYSCONS_H_ */
diff --git a/sys/dev/syscons/warp/warp_saver.c b/sys/dev/syscons/warp/warp_saver.c
index 3476c3644bd5..cd6f42b3358b 100644
--- a/sys/dev/syscons/warp/warp_saver.c
+++ b/sys/dev/syscons/warp/warp_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: warp_saver.c,v 1.4 1999/01/11 03:18:55 yokota Exp $
+ *	$Id: warp_saver.c,v 1.5 1999/04/12 13:34:58 des Exp $
  */
 
 #include <sys/param.h>
@@ -33,11 +33,14 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/syslog.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <machine/md_var.h>
 #include <machine/random.h>
 
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 static u_char *vid;
 static int blanked;
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 556314606276..cc51183e9e90 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.606 1999/06/15 13:14:40 des Exp $
+#	$Id: LINT,v 1.607 1999/06/19 20:20:52 rnordier Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -912,6 +912,9 @@ options		VGA_NO_MODE_CHANGE	# don't change video modes
 # Older video cards may require this option for proper operation.
 options		VGA_SLOW_IOACCESS	# do byte-wide i/o's to TS and GDC regs
 
+# The following option probably won't work with the LCD displays.
+options		VGA_WIDTH90		# support 90 column modes
+
 # To include support for VESA video modes
 options		VESA
 
@@ -939,18 +942,20 @@ options		PCVT_VT220KEYB
 # The syscons console driver (sco color console compatible).
 device		sc0	at isa?
 options		MAXCONS=16		# number of virtual consoles
-options		STD8X16FONT		# Compile font in
-makeoptions	STD8X16FONT=cp850
-options		SC_HISTORY_SIZE=200	# number of history buffer lines
+options		SC_ALT_MOUSE_IMAGE	# simplified mouse cursor in text mode
+options		SC_DFLT_FONT		# compile font in
+makeoptions	SC_DFLT_FONT="cp850"
+options		SC_DISABLE_DDBKEY	# disable `debug' key
 options		SC_DISABLE_REBOOT	# disable reboot key sequence
+options		SC_HISTORY_SIZE=200	# number of history buffer lines
+options		SC_MOUSE_CHAR=0x3	# char code for text mode mouse cursor
+options		SC_PIXEL_MODE		# add support for the raster text mode
 
-#
-# `flags' for sc0:
-#       0x01    Use a 'visual' bell
-#       0x02    Use a 'blink' cursor
-#       0x04    Use a 'underline' cursor
-#       0x06    Use a 'blinking underline' (destructive) cursor
-#	0x40	Make the bell quiet if it is rung in the background vty.
+# You can selectively disable features in syscons.
+options		SC_NO_CUTPASTE
+options		SC_NO_FONT_LOADING
+options		SC_NO_HISTORY
+options		SC_NO_SYSMOUSE
 
 #
 # The Numeric Processing eXtension driver.  This should be configured if
@@ -2155,6 +2160,10 @@ options		ULPT_DEBUG
 options		UMASS_DEBUG
 options		UMS_DEBUG
 
+# options for ukbd:
+options		UKBD_DFLT_KEYMAP	# specify the built-in keymap
+makeoptions	UKBD_DFLT_KEYMAP="it.iso"
+
 #
 # Embedded system options:
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 556314606276..cc51183e9e90 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.606 1999/06/15 13:14:40 des Exp $
+#	$Id: LINT,v 1.607 1999/06/19 20:20:52 rnordier Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -912,6 +912,9 @@ options		VGA_NO_MODE_CHANGE	# don't change video modes
 # Older video cards may require this option for proper operation.
 options		VGA_SLOW_IOACCESS	# do byte-wide i/o's to TS and GDC regs
 
+# The following option probably won't work with the LCD displays.
+options		VGA_WIDTH90		# support 90 column modes
+
 # To include support for VESA video modes
 options		VESA
 
@@ -939,18 +942,20 @@ options		PCVT_VT220KEYB
 # The syscons console driver (sco color console compatible).
 device		sc0	at isa?
 options		MAXCONS=16		# number of virtual consoles
-options		STD8X16FONT		# Compile font in
-makeoptions	STD8X16FONT=cp850
-options		SC_HISTORY_SIZE=200	# number of history buffer lines
+options		SC_ALT_MOUSE_IMAGE	# simplified mouse cursor in text mode
+options		SC_DFLT_FONT		# compile font in
+makeoptions	SC_DFLT_FONT="cp850"
+options		SC_DISABLE_DDBKEY	# disable `debug' key
 options		SC_DISABLE_REBOOT	# disable reboot key sequence
+options		SC_HISTORY_SIZE=200	# number of history buffer lines
+options		SC_MOUSE_CHAR=0x3	# char code for text mode mouse cursor
+options		SC_PIXEL_MODE		# add support for the raster text mode
 
-#
-# `flags' for sc0:
-#       0x01    Use a 'visual' bell
-#       0x02    Use a 'blink' cursor
-#       0x04    Use a 'underline' cursor
-#       0x06    Use a 'blinking underline' (destructive) cursor
-#	0x40	Make the bell quiet if it is rung in the background vty.
+# You can selectively disable features in syscons.
+options		SC_NO_CUTPASTE
+options		SC_NO_FONT_LOADING
+options		SC_NO_HISTORY
+options		SC_NO_SYSMOUSE
 
 #
 # The Numeric Processing eXtension driver.  This should be configured if
@@ -2155,6 +2160,10 @@ options		ULPT_DEBUG
 options		UMASS_DEBUG
 options		UMS_DEBUG
 
+# options for ukbd:
+options		UKBD_DFLT_KEYMAP	# specify the built-in keymap
+makeoptions	UKBD_DFLT_KEYMAP="it.iso"
+
 #
 # Embedded system options:
 #
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 44c115c9c270..ae19e96a059b 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.246 1999/06/01 18:18:38 jlemon Exp $
+#	$Id: files.i386,v 1.247 1999/06/18 19:55:50 green Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -19,10 +19,10 @@ linux_assym.h			optional	compat_linux		   \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"linux_assym.h"
 #
-font8x16.o			optional	std8x16font		\
-	compile-with	"uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c" \
-	no-implicit-rule before-depend \
-	clean		"${STD8X16FONT}-8x16 font8x16.c" 
+font.h				optional	sc_dflt_font		\
+	compile-with	"uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \
+	no-obj no-implicit-rule before-depend				\
+	clean		"font.h"
 #
 atkbdmap.h			optional	atkbd_dflt_keymap	\
 	compile-with	"kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"				\
@@ -44,14 +44,19 @@ dev/ata/atapi-tape.c		optional	atapist	device-driver
 dev/fb/fb.c			optional	fb	device-driver
 dev/fb/fb.c			optional	vga	device-driver
 dev/fb/splash.c			optional	splash
+dev/fb/vga.c			optional	vga	device-driver
 dev/kbd/atkbd.c			optional	atkbd	device-driver
 dev/kbd/atkbdc.c		optional	atkbdc	device-driver
 dev/kbd/kbd.c			optional	atkbd	device-driver
 dev/kbd/kbd.c			optional	kbd	device-driver
 dev/kbd/kbd.c			optional	ukbd	device-driver
 dev/syscons/syscons.c		optional	sc	device-driver
+dev/syscons/schistory.c		optional	sc	device-driver
+dev/syscons/scmouse.c		optional	sc	device-driver
 dev/syscons/scvidctl.c		optional	sc	device-driver
 dev/syscons/scvesactl.c		optional	sc	device-driver
+dev/syscons/scvgarndr.c		optional	sc	device-driver
+dev/syscons/scvtb.c		optional	sc	device-driver
 i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
 i386/eisa/dpt_eisa.c		optional	eisa dpt device-driver
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index c3aa0d98743d..d7cc7b4c824a 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.116 1999/06/06 22:45:04 steve Exp $
+#	$Id: options.i386,v 1.117 1999/06/15 13:14:43 des Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -65,17 +65,30 @@ I586_CPU		opt_global.h
 I686_CPU		opt_global.h
 
 MAXCONS			opt_syscons.h
-STD8X16FONT		opt_syscons.h
-SC_HISTORY_SIZE		opt_syscons.h
+SC_ALT_MOUSE_IMAGE	opt_syscons.h
+SC_DEBUG_LEVEL		opt_syscons.h
+SC_DFLT_FONT		opt_syscons.h
+SC_DISABLE_DDBKEY	opt_syscons.h
 SC_DISABLE_REBOOT	opt_syscons.h
+SC_HISTORY_SIZE		opt_syscons.h
 SC_MOUSE_CHAR		opt_syscons.h
-
+SC_NO_CUTPASTE		opt_syscons.h
+SC_NO_FONT_LOADING	opt_syscons.h
+SC_NO_HISTORY		opt_syscons.h
+SC_NO_SYSMOUSE		opt_syscons.h
+SC_PIXEL_MODE		opt_syscons.h
+SC_RENDER_DEBUG		opt_syscons.h
+SC_VIDEO_DEBUG		opt_syscons.h
+
+FB_DEBUG		opt_fb.h
 FB_INSTALL_CDEV		opt_fb.h
 
 VGA_ALT_SEQACCESS	opt_vga.h
+VGA_DEBUG		opt_vga.h
 VGA_NO_FONT_LOADING	opt_vga.h
 VGA_NO_MODE_CHANGE	opt_vga.h
 VGA_SLOW_IOACCESS	opt_vga.h
+VGA_WIDTH90		opt_vga.h
 
 VESA			opt_vesa.h
 VESA_DEBUG		opt_vesa.h
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index acc850351714..cee656476020 100644
--- a/sys/i386/i386/cons.c
+++ b/sys/i386/i386/cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.66 1999/05/30 16:52:03 phk Exp $
+ *	$Id: cons.c,v 1.67 1999/05/31 11:25:41 phk Exp $
  */
 
 #include "opt_devfs.h"
@@ -109,19 +109,19 @@ static struct tty *cn_tp;		/* physical console tty struct */
 static void *cn_devfs_token;		/* represents the devfs entry */
 #endif /* DEVFS */
 
-CONS_DRIVER(cons, NULL, NULL, NULL, NULL, NULL);
+CONS_DRIVER(cons, NULL, NULL, NULL, NULL, NULL, NULL);
 
 void
 cninit()
 {
 	struct consdev *best_cp, *cp;
-	struct consdev **list;
+	const struct consdev **list;
 
 	/*
 	 * Find the first console with the highest priority.
 	 */
 	best_cp = NULL;
-	list = (struct consdev **)cons_set.ls_items;
+	list = (const struct consdev **)cons_set.ls_items;
 	while ((cp = *list++) != NULL) {
 		if (cp->cn_probe == NULL)
 			continue;
@@ -147,6 +147,8 @@ cninit()
 	 * If no console, give up.
 	 */
 	if (best_cp == NULL) {
+		if (cn_tab != NULL && cn_tab->cn_term != NULL)
+			(*cn_tab->cn_term)(cn_tab);
 		cn_tab = best_cp;
 		return;
 	}
@@ -154,10 +156,13 @@ cninit()
 	/*
 	 * Initialize console, then attach to it.  This ordering allows
 	 * debugging using the previous console, if any.
-	 * XXX if there was a previous console, then its driver should
-	 * be informed when we forget about it.
 	 */
 	(*best_cp->cn_init)(best_cp);
+	if (cn_tab != NULL && cn_tab != best_cp) {
+		/* Turn off the previous console.  */
+		if (cn_tab->cn_term != NULL)
+			(*cn_tab->cn_term)(cn_tab);
+	}
 	cn_tab = best_cp;
 }
 
diff --git a/sys/i386/i386/cons.h b/sys/i386/i386/cons.h
index 1656b1261d47..ea84d7ea367a 100644
--- a/sys/i386/i386/cons.h
+++ b/sys/i386/i386/cons.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
- *	$Id: cons.h,v 1.18 1999/01/07 14:14:11 yokota Exp $
+ *	$Id: cons.h,v 1.19 1999/01/09 14:07:37 bde Exp $
  */
 
 #ifndef _MACHINE_CONS_H_
@@ -45,6 +45,7 @@
 struct consdev;
 typedef	void	cn_probe_t __P((struct consdev *));
 typedef	void	cn_init_t __P((struct consdev *));
+typedef	void	cn_term_t __P((struct consdev *));
 typedef	int	cn_getc_t __P((dev_t));
 typedef	int	cn_checkc_t __P((dev_t));
 typedef	void	cn_putc_t __P((dev_t, int));
@@ -54,6 +55,8 @@ struct consdev {
 				/* probe hardware and fill in consdev info */
 	cn_init_t	*cn_init;
 				/* turn on as console */
+	cn_term_t	*cn_term;
+				/* turn off as console */
 	cn_getc_t	*cn_getc;
 				/* kernel getchar interface */
 	cn_checkc_t	*cn_checkc;
@@ -75,10 +78,10 @@ struct consdev {
 extern	struct linker_set cons_set;
 extern	int cons_unavail;
 
-#define CONS_DRIVER(name, probe, init, getc, checkc, putc)	\
-	static struct consdev name##_consdev = {		\
-		probe, init, getc, checkc, putc			\
-	};							\
+#define CONS_DRIVER(name, probe, init, term, getc, checkc, putc)	\
+	static struct consdev name##_consdev = {			\
+		probe, init, term, getc, checkc, putc			\
+	};								\
 	DATA_SET(cons_set, name##_consdev)
 
 /* Other kernel entry points. */
diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h
index 54409d087284..79a6b576528c 100644
--- a/sys/i386/include/console.h
+++ b/sys/i386/include/console.h
@@ -1,635 +1,8 @@
-/*-
- * Copyright (c) 1991-1996 Søren Schmidt
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: console.h,v 1.44 1999/02/05 11:52:09 yokota Exp $
- */
+#ifndef _MACHINE_CONSOLE_H_
+#define _MACHINE_CONSOLE_H_
 
-#ifndef	_MACHINE_CONSOLE_H_
-#define	_MACHINE_CONSOLE_H_
-
-#ifndef KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-#define KDGKBMODE 	_IOR('K', 6, int)
-#define KDSKBMODE 	_IO('K', 7 /*, int */)
-#define KDMKTONE	_IO('K', 8 /*, int */)
-#define KDGETMODE	_IOR('K', 9, int)
-#define KDSETMODE	_IO('K', 10 /*, int */)
-#define KDSBORDER	_IO('K', 13 /*, int */)
-#define KDGKBSTATE	_IOR('K', 19, int)
-#define KDSKBSTATE	_IO('K', 20 /*, int */)
-#define KDENABIO	_IO('K', 60)
-#define KDDISABIO	_IO('K', 61)
-#define KIOCSOUND	_IO('K', 63 /*, int */)
-#define KDGKBTYPE	_IOR('K', 64, int)
-#define KDGETLED	_IOR('K', 65, int)
-#define KDSETLED	_IO('K', 66 /*, int */)
-#define KDSETRAD	_IO('K', 67 /*, int */)		/* obsolete */
-#define KDRASTER	_IOW('K', 100, scr_size_t)
-#define KDGKBINFO	_IOR('K', 101, keyboard_info_t)
-#define KDSETREPEAT	_IOW('K', 102, keyboard_delay_t)
-
-#define GETFKEY		_IOWR('k', 0, fkeyarg_t)
-#define SETFKEY		_IOWR('k', 1, fkeyarg_t)
-#define GIO_SCRNMAP	_IOR('k', 2, scrmap_t)
-#define PIO_SCRNMAP	_IOW('k', 3, scrmap_t)
-#define GIO_KEYMAP 	_IOR('k', 6, keymap_t)
-#define PIO_KEYMAP 	_IOW('k', 7, keymap_t)
-#define GIO_DEADKEYMAP 	_IOR('k', 8, accentmap_t)
-#define PIO_DEADKEYMAP 	_IOW('k', 9, accentmap_t)
-#define GIO_KEYMAPENT 	_IOWR('k', 10, keyarg_t)
-#define PIO_KEYMAPENT 	_IOW('k', 11, keyarg_t)
-
-#define GIO_ATTR	_IOR('a', 0, int)
-#define GIO_COLOR	_IOR('c', 0, int)
-#define CONS_CURRENT	_IOR('c', 1, int)
-#define CONS_GET	_IOR('c', 2, int)
-#define CONS_IO		_IO('c', 3)
-#define CONS_BLANKTIME	_IOW('c', 4, int)
-#define CONS_SSAVER	_IOW('c', 5, ssaver_t)
-#define CONS_GSAVER	_IOWR('c', 6, ssaver_t)
-#define CONS_CURSORTYPE	_IOW('c', 7, int)
-#define CONS_BELLTYPE	_IOW('c', 8, int)
-#define CONS_HISTORY	_IOW('c', 9, int)
-#define CONS_MOUSECTL	_IOWR('c', 10, mouse_info_t)
-#define CONS_IDLE	_IOR('c', 11, int)
-#define CONS_SAVERMODE	_IOW('c', 12, int)
-#define CONS_SAVERSTART	_IOW('c', 13, int)
-#define PIO_FONT8x8	_IOW('c', 64, fnt8_t)
-#define GIO_FONT8x8	_IOR('c', 65, fnt8_t)
-#define PIO_FONT8x14	_IOW('c', 66, fnt14_t)
-#define GIO_FONT8x14	_IOR('c', 67, fnt14_t)
-#define PIO_FONT8x16	_IOW('c', 68, fnt16_t)
-#define GIO_FONT8x16	_IOR('c', 69, fnt16_t)
-#define CONS_GETINFO    _IOWR('c', 73, vid_info_t)
-#define CONS_GETVERS	_IOR('c', 74, int)
-#define CONS_CURRENTADP	_IOR('c', 100, int)
-#define CONS_ADPINFO	_IOWR('c', 101, video_adapter_info_t)
-#define CONS_MODEINFO	_IOWR('c', 102, video_info_t)
-#define CONS_FINDMODE	_IOWR('c', 103, video_info_t)
-#define CONS_SETWINORG	_IO('c', 104 /* u_int */) 
-
-#define CONS_SETKBD	_IO('c', 110 /* int */)
-#define CONS_RELKBD	_IO('c', 111)
-
-/* CONS_SAVERMODE */
-#define CONS_LKM_SAVER	0
-#define CONS_USR_SAVER	1
-
-#ifdef PC98
-#define ADJUST_CLOCK		_IO('t',100)		/* for 98note resume */
-#endif
-
-#define VT_OPENQRY	_IOR('v', 1, int)
-#define VT_SETMODE	_IOW('v', 2, vtmode_t)
-#define VT_GETMODE	_IOR('v', 3, vtmode_t)
-#define VT_RELDISP	_IO('v', 4 /*, int */)
-#define VT_ACTIVATE	_IO('v', 5 /*, int */)
-#define VT_WAITACTIVE	_IO('v', 6 /*, int */)
-#define VT_GETACTIVE	_IOR('v', 7, int)
-
-#define VT_FALSE	0
-#define VT_TRUE		1
-#define VT_ACKACQ	2
-
-#define VT_AUTO		0		/* switching is automatic 	*/
-#define VT_PROCESS	1		/* switching controlled by prog */
-#define VT_KERNEL	255		/* switching controlled in kernel */
-
-#ifndef _VT_MODE_DECLARED
-#define	_VT_MODE_DECLARED
-struct vt_mode {
-	char	mode;
-	char	waitv;			/* not implemented yet 	SOS	*/
-	short	relsig;
-	short	acqsig;
-	short	frsig;			/* not implemented yet	SOS	*/
-};
-
-typedef struct vt_mode vtmode_t;
-#endif /* !_VT_MODE_DECLARED */
-
-struct mouse_data {
-	int	x;
-	int 	y;
-	int 	z;
-	int 	buttons;
-};
-
-struct mouse_mode {
-	int	mode;
-	int	signal;
-};
-
-struct mouse_event {
-	int	id;			/* one based */
-	int	value;
-};
-
-#define MOUSE_SHOW		0x01
-#define MOUSE_HIDE		0x02
-#define MOUSE_MOVEABS		0x03
-#define MOUSE_MOVEREL		0x04
-#define MOUSE_GETINFO		0x05
-#define MOUSE_MODE		0x06
-#define MOUSE_ACTION		0x07
-#define MOUSE_MOTION_EVENT	0x08
-#define MOUSE_BUTTON_EVENT	0x09
-
-struct mouse_info {
-	int	operation;
-	union {
-		struct mouse_data data;
-		struct mouse_mode mode;
-		struct mouse_event event;
-	}u;
-};
-
-#define KD_MONO		1		/* monochrome adapter        	*/
-#define KD_HERCULES	2		/* hercules adapter          	*/
-#define KD_CGA		3		/* color graphics adapter    	*/
-#define KD_EGA		4		/* enhanced graphics adapter 	*/
-#define KD_VGA		5		/* video graphics adapter    	*/
-#define KD_PC98		6		/* PC-98 display            	*/
-
-#define KD_TEXT		0		/* set text mode restore fonts  */
-#define KD_TEXT0	0		/* ditto			*/
-#define KD_TEXT1	2		/* set text mode !restore fonts */
-#define KD_GRAPHICS	1		/* set graphics mode 		*/
-#define KD_PIXEL	3		/* set pixel mode		*/
-
-#define K_RAW		0		/* keyboard returns scancodes	*/
-#define K_XLATE		1		/* keyboard returns ascii 	*/
-#define K_CODE		2		/* keyboard returns keycodes 	*/
-
-#define KB_84		1		/* 'old' 84 key AT-keyboard	*/
-#define KB_101		2		/* MF-101 or MF-102 keyboard	*/
-#define KB_OTHER	3		/* keyboard not known 		*/
-
-#define CLKED		1		/* Caps locked			*/
-#define NLKED		2		/* Num locked			*/
-#define SLKED		4		/* Scroll locked		*/
-#define ALKED		8		/* AltGr locked			*/
-#define LOCK_MASK	(CLKED | NLKED | SLKED | ALKED)
-#define LED_CAP		1		/* Caps lock LED 		*/
-#define LED_NUM		2		/* Num lock LED 		*/
-#define LED_SCR		4		/* Scroll lock LED 		*/
-#define LED_MASK	(LED_CAP | LED_NUM | LED_SCR)
-
-/* possible flag values */
-#define	FLAG_LOCK_O	0
-#define	FLAG_LOCK_C	1
-#define FLAG_LOCK_N	2
-
-#define NUM_KEYS	256		/* number of keys in table	*/
-#define NUM_STATES	8		/* states per key		*/
-#define ALTGR_OFFSET	128		/* offset for altlock keys	*/
-
-#ifndef _KEYMAP_DECLARED
-#define	_KEYMAP_DECLARED
-struct keyent_t {
-	u_char map[NUM_STATES];
-	u_char spcl;
-	u_char flgs;
-};
-
-struct keymap {
-	u_short	n_keys;
-	struct keyent_t key[NUM_KEYS];
-};
-
-typedef struct keymap keymap_t;
-
-struct keyarg {
-	u_short	keynum;
-	struct keyent_t key;
-};
-
-typedef struct keyarg keyarg_t;
-#endif /* !_KEYMAP_DECLARED */
-
-#define NUM_DEADKEYS	15		/* number of accent keys */
-#define NUM_ACCENTCHARS	52		/* max number of accent chars */
-
-struct acc_t {
-	u_char accchar;
-	u_char map[NUM_ACCENTCHARS][2];
-};
-
-struct accentmap {
-	u_short n_accs;
-	struct acc_t acc[NUM_DEADKEYS];
-};
-
-#define MAXFK		16
-#define NUM_FKEYS	96
-
-struct fkeytab {
-	u_char	str[MAXFK];
-	u_char	len;
-};
-
-struct fkeyarg {
-	u_short	keynum;
-	char	keydef[MAXFK];
-	char	flen;
-};
-
-struct colors	{
-	char	fore;
-	char	back;
-};
-
-struct vid_info {
-	short	size;
-	short	m_num;
-	u_short	mv_row, mv_col;
-	u_short	mv_rsz, mv_csz;
-	struct colors	mv_norm,
-			mv_rev,
-			mv_grfc;
-	u_char	mv_ovscan;
-	u_char	mk_keylock;
-};
-
-#define MAXSSAVER	16
-
-struct ssaver	{
-	char	name[MAXSSAVER];
-	int	num;
-	long	time;
-};
-
-/* video mode information block */
-struct video_info {
-    int			vi_mode;
-    int			vi_flags;
-#define V_INFO_COLOR	(1<<0)
-#define V_INFO_GRAPHICS	(1<<1)
-#define V_INFO_LINEAR	(1<<2)
-#define V_INFO_VESA	(1<<3)
-    int			vi_width;
-    int			vi_height;
-    int			vi_cwidth;
-    int			vi_cheight;
-    int			vi_depth;
-    int			vi_planes;
-    u_int		vi_window;	/* physical address */
-    size_t		vi_window_size;
-    size_t		vi_window_gran;
-    u_int		vi_buffer;	/* physical address */
-    size_t		vi_buffer_size;
-    /* XXX pixel format, memory model,... */
-};
-
-/* adapter infromation block */
-struct video_adapter {
-    int			va_index;
-    int			va_type;
-    char		*va_name;
-    int			va_unit;
-    int			va_minor;
-    int			va_flags;
-#define V_ADP_COLOR	(1<<0)
-#define V_ADP_MODECHANGE (1<<1)
-#define V_ADP_STATESAVE	(1<<2)
-#define V_ADP_STATELOAD	(1<<3)
-#define V_ADP_FONT	(1<<4)
-#define V_ADP_PALETTE	(1<<5)
-#define V_ADP_BORDER	(1<<6)
-#define V_ADP_VESA	(1<<7)
-#define V_ADP_PROBED	(1<<16)
-#define V_ADP_INITIALIZED (1<<17)
-#define V_ADP_REGISTERED (1<<18)
-    int			va_io_base;
-    int			va_io_size;
-    int			va_crtc_addr;
-    int			va_mem_base;
-    int			va_mem_size;
-    u_int		va_window;	/* virtual address */
-    size_t		va_window_size;
-    size_t		va_window_gran;
-    u_int		va_buffer;	/* virtual address */
-    size_t		va_buffer_size;
-    int			va_initial_mode;
-    int			va_initial_bios_mode;
-    int			va_mode;
-    struct video_info	va_info;
-    int			va_line_width;
-    void		*va_token;
-};
-
-struct video_adapter_info {
-    int			va_index;
-    int			va_type;
-    char		va_name[16];
-    int			va_unit;
-    int			va_flags;
-    int			va_io_base;
-    int			va_io_size;
-    int			va_crtc_addr;
-    int			va_mem_base;
-    int			va_mem_size;
-    u_int		va_window;	/* virtual address */
-    size_t		va_window_size;
-    size_t		va_window_gran;
-    u_int		va_buffer;	/* virtual address */
-    size_t		va_buffer_size;
-    int			va_initial_mode;
-    int			va_initial_bios_mode;
-    int			va_mode;
-    int			va_line_width;
-};
-
-#define V_ADP_PRIMARY		0
-#define V_ADP_SECONDARY		1
-
-struct keyboard_info {
-    int			kb_index;	/* kbdio index# */
-    char		kb_name[16];	/* driver name */
-    int			kb_unit;	/* unit# */
-    int			kb_type;	/* KB_84, KB_101, KB_OTHER,... */
-    int			kb_config;	/* device configuration flags */
-    int			kb_flags;	/* internal flags */
-};
-
-typedef struct accentmap accentmap_t;
-typedef struct fkeytab fkeytab_t;
-typedef struct fkeyarg fkeyarg_t;
-typedef struct vid_info vid_info_t;
-typedef struct mouse_info mouse_info_t;
-typedef struct {char scrmap[256];} scrmap_t;
-typedef struct {char fnt8x8[8*256];} fnt8_t;
-typedef struct {char fnt8x14[14*256];} fnt14_t;
-typedef struct {char fnt8x16[16*256];} fnt16_t;
-typedef struct ssaver ssaver_t;
-typedef struct video_adapter video_adapter_t;
-typedef struct video_adapter_info video_adapter_info_t;
-typedef struct video_info video_info_t;
-typedef struct keyboard_info keyboard_info_t;
-typedef struct {int scr_size[3];} scr_size_t;
-typedef struct {int kbd_delay[2];} keyboard_delay_t;
-
-/* defines for "special" keys (spcl bit set in keymap) */
-#define NOP		0x00		/* nothing (dead key)		*/
-#define LSH		0x02		/* left shift key		*/
-#define RSH		0x03		/* right shift key		*/
-#define CLK		0x04		/* caps lock key		*/
-#define NLK		0x05		/* num lock key			*/
-#define SLK		0x06		/* scroll lock key		*/
-#define LALT		0x07		/* left alt key			*/
-#define BTAB		0x08		/* backwards tab		*/
-#define LCTR		0x09		/* left control key		*/
-#define NEXT		0x0a		/* switch to next screen 	*/
-#define F_SCR		0x0b		/* switch to first screen 	*/
-#define L_SCR		0x1a		/* switch to last screen 	*/
-#define F_FN		0x1b		/* first function key 		*/
-#define L_FN		0x7a		/* last function key 		*/
-/*			0x7b-0x7f	   reserved do not use !	*/
-#define RCTR		0x80		/* right control key		*/
-#define RALT		0x81		/* right alt (altgr) key	*/
-#define ALK		0x82		/* alt lock key			*/
-#define ASH		0x83		/* alt shift key		*/
-#define META		0x84		/* meta key			*/
-#define RBT		0x85		/* boot machine			*/
-#define DBG		0x86		/* call debugger		*/
-#define SUSP		0x87		/* suspend power (APM)		*/
-#define SPSC		0x88		/* toggle splash/text screen	*/
-
-#define F_ACC		DGRA		/* first accent key		*/
-#define DGRA		0x89		/* grave			*/
-#define DACU		0x8a		/* acute			*/
-#define DCIR		0x8b		/* circumflex			*/
-#define DTIL		0x8c		/* tilde			*/
-#define DMAC		0x8d		/* macron			*/
-#define DBRE		0x8e		/* breve			*/
-#define DDOT		0x8f		/* dot				*/
-#define DUML		0x90		/* umlaut/diaresis		*/
-#define DDIA		0x90		/* diaresis			*/
-#define DSLA		0x91		/* slash			*/
-#define DRIN		0x92		/* ring				*/
-#define DCED		0x93		/* cedilla			*/
-#define DAPO		0x94		/* apostrophe			*/
-#define DDAC		0x95		/* double acute			*/
-#define DOGO		0x96		/* ogonek			*/
-#define DCAR		0x97		/* caron			*/
-#define L_ACC		DCAR		/* last accent key		*/
-
-#define STBY		0x98		/* Go into standby mode (apm)   */
-
-#define F(x)		((x)+F_FN-1)
-#define	S(x)		((x)+F_SCR-1)
-#define ACC(x)		((x)+F_ACC)
-#define NOKEY		0x100		/* no key pressed marker 	*/
-#define FKEY		0x200		/* function key marker 		*/
-#define MKEY		0x400		/* meta key marker (prepend ESC)*/
-#define BKEY		0x800		/* backtab (ESC [ Z)		*/
-
-#define SPCLKEY		0x8000		/* special key */
-#define RELKEY		0x4000		/* key released */
-#define ERRKEY		0x2000		/* error */
-
-#define KEYCHAR(c)	((c) & 0x00ff)
-#define KEYFLAGS(c)	((c) & ~0x00ff)
-
-/* video mode definitions */
-#define M_B40x25	0	/* black & white 40 columns */
-#define M_C40x25	1	/* color 40 columns */
-#define M_B80x25	2	/* black & white 80 columns */
-#define M_C80x25	3	/* color 80 columns */
-#define M_BG320		4	/* black & white graphics 320x200 */
-#define M_CG320		5	/* color graphics 320x200 */
-#define M_BG640		6	/* black & white graphics 640x200 hi-res */
-#define M_EGAMONO80x25  7       /* ega-mono 80x25 */
-#define M_CG320_D	13	/* ega mode D */
-#define M_CG640_E	14	/* ega mode E */
-#define M_EGAMONOAPA	15	/* ega mode F */
-#define M_CG640x350	16	/* ega mode 10 */
-#define M_ENHMONOAPA2	17	/* ega mode F with extended memory */
-#define M_ENH_CG640	18	/* ega mode 10* */
-#define M_ENH_B40x25    19      /* ega enhanced black & white 40 columns */
-#define M_ENH_C40x25    20      /* ega enhanced color 40 columns */
-#define M_ENH_B80x25    21      /* ega enhanced black & white 80 columns */
-#define M_ENH_C80x25    22      /* ega enhanced color 80 columns */
-#define M_VGA_C40x25	23	/* vga 8x16 font on color */
-#define M_VGA_C80x25	24	/* vga 8x16 font on color */
-#define M_VGA_M80x25	25	/* vga 8x16 font on mono */
-
-#define M_VGA11		26	/* vga 640x480 2 colors */
-#define M_BG640x480	26
-#define M_VGA12		27	/* vga 640x480 16 colors */
-#define M_CG640x480	27
-#define M_VGA13		28	/* vga 640x200 256 colors */
-#define M_VGA_CG320	28
-
-#define M_VGA_C80x50	30	/* vga 8x8 font on color */
-#define M_VGA_M80x50	31	/* vga 8x8 font on color */
-#define M_VGA_C80x30	32	/* vga 8x16 font on color */
-#define M_VGA_M80x30	33	/* vga 8x16 font on color */
-#define M_VGA_C80x60	34	/* vga 8x8 font on color */
-#define M_VGA_M80x60	35	/* vga 8x8 font on color */
-#define M_VGA_CG640	36	/* vga 640x400 256 color */
-#define M_VGA_MODEX	37	/* vga 320x240 256 color */
-
-#define M_ENH_B80x43	0x70	/* ega black & white 80x43 */
-#define M_ENH_C80x43	0x71	/* ega color 80x43 */
-
-#define M_PC98_80x25	98	/* PC98 80x25 */
-#define M_PC98_80x30	99	/* PC98 80x30 */
-
-#define M_HGC_P0	0xe0	/* hercules graphics - page 0 @ B0000 */
-#define M_HGC_P1	0xe1	/* hercules graphics - page 1 @ B8000 */
-#define M_MCA_MODE	0xff	/* monochrome adapter mode */
-
-#define M_TEXT_80x25	200	/* generic text modes */
-#define M_TEXT_80x30	201
-#define M_TEXT_80x43	202
-#define M_TEXT_80x50	203
-#define M_TEXT_80x60	204
-#define M_TEXT_132x25	205
-#define M_TEXT_132x30	206
-#define M_TEXT_132x43	207
-#define M_TEXT_132x50	208
-#define M_TEXT_132x60	209
-
-#define SW_PC98_80x25	_IO('S', M_PC98_80x25)
-#define SW_PC98_80x30	_IO('S', M_PC98_80x30)
-#define SW_B40x25 	_IO('S', M_B40x25)
-#define SW_C40x25  	_IO('S', M_C40x25)
-#define SW_B80x25  	_IO('S', M_B80x25)
-#define SW_C80x25  	_IO('S', M_C80x25)
-#define SW_BG320   	_IO('S', M_BG320)
-#define SW_CG320   	_IO('S', M_CG320)
-#define SW_BG640   	_IO('S', M_BG640)
-#define SW_EGAMONO80x25 _IO('S', M_EGAMONO80x25)
-#define SW_CG320_D    	_IO('S', M_CG320_D)
-#define SW_CG640_E    	_IO('S', M_CG640_E)
-#define SW_EGAMONOAPA 	_IO('S', M_EGAMONOAPA)
-#define SW_CG640x350  	_IO('S', M_CG640x350)
-#define SW_ENH_MONOAPA2 _IO('S', M_ENHMONOAPA2)
-#define SW_ENH_CG640  	_IO('S', M_ENH_CG640)
-#define SW_ENH_B40x25  	_IO('S', M_ENH_B40x25)
-#define SW_ENH_C40x25  	_IO('S', M_ENH_C40x25)
-#define SW_ENH_B80x25  	_IO('S', M_ENH_B80x25)
-#define SW_ENH_C80x25  	_IO('S', M_ENH_C80x25)
-#define SW_ENH_B80x43  	_IO('S', M_ENH_B80x43)
-#define SW_ENH_C80x43  	_IO('S', M_ENH_C80x43)
-#define SW_MCAMODE    	_IO('S', M_MCA_MODE)
-#define SW_VGA_C40x25	_IO('S', M_VGA_C40x25)
-#define SW_VGA_C80x25	_IO('S', M_VGA_C80x25)
-#define SW_VGA_C80x30	_IO('S', M_VGA_C80x30)
-#define SW_VGA_C80x50	_IO('S', M_VGA_C80x50)
-#define SW_VGA_C80x60	_IO('S', M_VGA_C80x60)
-#define SW_VGA_M80x25	_IO('S', M_VGA_M80x25)
-#define SW_VGA_M80x30	_IO('S', M_VGA_M80x30)
-#define SW_VGA_M80x50	_IO('S', M_VGA_M80x50)
-#define SW_VGA_M80x60	_IO('S', M_VGA_M80x60)
-#define SW_VGA11	_IO('S', M_VGA11)
-#define SW_BG640x480	_IO('S', M_VGA11)
-#define SW_VGA12	_IO('S', M_VGA12)
-#define SW_CG640x480	_IO('S', M_VGA12)
-#define SW_VGA13	_IO('S', M_VGA13)
-#define SW_VGA_CG320	_IO('S', M_VGA13)
-#define SW_VGA_CG640	_IO('S', M_VGA_CG640)
-#define SW_VGA_MODEX	_IO('S', M_VGA_MODEX)
-
-#define SW_TEXT_80x25	_IO('S', M_TEXT_80x25)
-#define SW_TEXT_80x30	_IO('S', M_TEXT_80x30)
-#define SW_TEXT_80x43	_IO('S', M_TEXT_80x43)
-#define SW_TEXT_80x50	_IO('S', M_TEXT_80x50)
-#define SW_TEXT_80x60	_IO('S', M_TEXT_80x60)
-#define SW_TEXT_132x25	_IO('S', M_TEXT_132x25)
-#define SW_TEXT_132x30	_IO('S', M_TEXT_132x30)
-#define SW_TEXT_132x43	_IO('S', M_TEXT_132x43)
-#define SW_TEXT_132x50	_IO('S', M_TEXT_132x50)
-#define SW_TEXT_132x60	_IO('S', M_TEXT_132x60)
-
-#define M_VESA_BASE		0x100	/* VESA mode number base */
-
-#define M_VESA_CG640x400	0x100	/* 640x400, 256 color */
-#define M_VESA_CG640x480	0x101	/* 640x480, 256 color */
-#define M_VESA_800x600		0x102	/* 800x600, 16 color */
-#define M_VESA_CG800x600	0x103	/* 800x600, 256 color */
-#define M_VESA_1024x768		0x104	/* 1024x768, 16 color */
-#define M_VESA_CG1024x768	0x105	/* 1024x768, 256 color */
-#define M_VESA_1280x1024	0x106	/* 1280x1024, 16 color */
-#define M_VESA_CG1280x1024	0x107	/* 1280x1024, 256 color */
-#define M_VESA_C80x60		0x108	/* 8x8 font */
-#define M_VESA_C132x25		0x109	/* 8x16 font */
-#define M_VESA_C132x43		0x10a	/* 8x14 font */
-#define M_VESA_C132x50		0x10b	/* 8x8 font */
-#define M_VESA_C132x60		0x10c	/* 8x8 font */
-#define M_VESA_32K_320		0x10d	/* 320x200, 5:5:5 */
-#define M_VESA_64K_320		0x10e	/* 320x200, 5:6:5 */
-#define M_VESA_FULL_320		0x10f	/* 320x200, 8:8:8 */
-#define M_VESA_32K_640		0x110	/* 640x480, 5:5:5 */
-#define M_VESA_64K_640		0x111	/* 640x480, 5:6:5 */
-#define M_VESA_FULL_640		0x112	/* 640x480, 8:8:8 */
-#define M_VESA_32K_800		0x113	/* 800x600, 5:5:5 */
-#define M_VESA_64K_800		0x114	/* 800x600, 5:6:5 */
-#define M_VESA_FULL_800		0x115	/* 800x600, 8:8:8 */
-#define M_VESA_32K_1024		0x116	/* 1024x768, 5:5:5 */
-#define M_VESA_64K_1024		0x117	/* 1024x768, 5:6:5 */
-#define M_VESA_FULL_1024	0x118	/* 1024x768, 8:8:8 */
-#define M_VESA_32K_1280		0x119	/* 1280x1024, 5:5:5 */
-#define M_VESA_64K_1280		0x11a	/* 1280x1024, 5:6:5 */
-#define M_VESA_FULL_1280	0x11b	/* 1280x1024, 8:8:8 */
-#define M_VESA_MODE_MAX		0x1ff
-
-#define SW_VESA_CG640x400	_IO('V', M_VESA_CG640x400 - M_VESA_BASE)
-#define SW_VESA_CG640x480	_IO('V', M_VESA_CG640x480 - M_VESA_BASE)
-#define SW_VESA_800x600		_IO('V', M_VESA_800x600 - M_VESA_BASE)
-#define SW_VESA_CG800x600	_IO('V', M_VESA_CG800x600 - M_VESA_BASE)
-#define SW_VESA_1024x768	_IO('V', M_VESA_1024x768 - M_VESA_BASE)
-#define SW_VESA_CG1024x768	_IO('V', M_VESA_CG1024x768 - M_VESA_BASE)
-#define SW_VESA_1280x1024	_IO('V', M_VESA_1280x1024 - M_VESA_BASE)
-#define SW_VESA_CG1280x1024	_IO('V', M_VESA_CG1280x1024 - M_VESA_BASE)
-#define SW_VESA_C80x60		_IO('V', M_VESA_C80x60 - M_VESA_BASE)
-#define SW_VESA_C132x25		_IO('V', M_VESA_C132x25 - M_VESA_BASE)
-#define SW_VESA_C132x43		_IO('V', M_VESA_C132x43 - M_VESA_BASE)
-#define SW_VESA_C132x50		_IO('V', M_VESA_C132x50 - M_VESA_BASE)
-#define SW_VESA_C132x60		_IO('V', M_VESA_C132x60 - M_VESA_BASE)
-#define SW_VESA_32K_320		_IO('V', M_VESA_32K_320 - M_VESA_BASE)
-#define SW_VESA_64K_320		_IO('V', M_VESA_64K_320 - M_VESA_BASE)
-#define SW_VESA_FULL_320	_IO('V', M_VESA_FULL_320 - M_VESA_BASE)
-#define SW_VESA_32K_640		_IO('V', M_VESA_32K_640 - M_VESA_BASE)
-#define SW_VESA_64K_640		_IO('V', M_VESA_64K_640 - M_VESA_BASE)
-#define SW_VESA_FULL_640	_IO('V', M_VESA_FULL_640 - M_VESA_BASE)
-#define SW_VESA_32K_800		_IO('V', M_VESA_32K_800 - M_VESA_BASE)
-#define SW_VESA_64K_800		_IO('V', M_VESA_64K_800 - M_VESA_BASE)
-#define SW_VESA_FULL_800	_IO('V', M_VESA_FULL_800 - M_VESA_BASE)
-#define SW_VESA_32K_1024	_IO('V', M_VESA_32K_1024 - M_VESA_BASE)
-#define SW_VESA_64K_1024	_IO('V', M_VESA_64K_1024 - M_VESA_BASE)
-#define SW_VESA_FULL_1024	_IO('V', M_VESA_FULL_1024 - M_VESA_BASE)
-#define SW_VESA_32K_1280	_IO('V', M_VESA_32K_1280 - M_VESA_BASE)
-#define SW_VESA_64K_1280	_IO('V', M_VESA_64K_1280 - M_VESA_BASE)
-#define SW_VESA_FULL_1280	_IO('V', M_VESA_FULL_1280 - M_VESA_BASE)
+#include <sys/fbio.h>
+#include <sys/kbio.h>
+#include <sys/consio.h>
 
 #endif /* !_MACHINE_CONSOLE_H_ */
-
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index a0dd214c74e8..c988fef42cd7 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -93,6 +93,7 @@ static void *pcvt_devfs_token[MAXCONS];
 #endif /*DEVFS*/
 
 #if PCVT_FREEBSD >= 200
+#include <sys/bus.h>
 #include <machine/stdarg.h>
 #else
 #include "machine/stdarg.h"
@@ -121,7 +122,7 @@ static cn_getc_t	pccngetc;
 static cn_checkc_t	pccncheckc;
 static cn_putc_t	pccnputc;
 
-CONS_DRIVER(pc, pccnprobe, pccninit, pccngetc, pccncheckc, pccnputc);
+CONS_DRIVER(pc, pccnprobe, pccninit, NULL, pccngetc, pccncheckc, pccnputc);
 
 static	d_open_t	pcopen;
 static	d_close_t	pcclose;
@@ -1178,6 +1179,12 @@ pccnprobe(struct consdev *cp)
 	static int uarg = 0;
 	int i;
 
+	/* See if this driver is disabled in probe hint. */ 
+	if (resource_int_value("vt", 0, "disabled", &i) == 0 && i) {
+		cp->cn_pri = CN_DEAD;
+		return;
+	}
+
 #ifdef _DEV_KBD_KBDREG_H_
 	/*
 	 * Don't reset the keyboard via `kbdio' just yet.
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index d734c642995d..075688066504 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vesa.c,v 1.23 1999/05/09 15:57:52 peter Exp $
+ * $Id: vesa.c,v 1.24 1999/06/01 18:20:18 jlemon Exp $
  */
 
 #include "vga.h"
@@ -42,10 +42,13 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/malloc.h>
+#include <sys/fbio.h>
+
 #include <vm/vm.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_kern.h>
 #include <vm/pmap.h>
 
-#include <machine/console.h>
 #include <machine/md_var.h>
 #include <machine/vm86.h>
 #include <machine/pc/bios.h>
@@ -75,12 +78,10 @@ typedef struct adp_state adp_state_t;
 /* VESA video adapter */
 static video_adapter_t *vesa_adp = NULL;
 static int vesa_state_buf_size = 0;
-#if 0
-static void *vesa_state_buf = NULL;
-#endif
 
 /* VESA functions */
 static int			vesa_nop(void);
+static int			vesa_error(void);
 static vi_probe_t		vesa_probe;
 static vi_init_t		vesa_init;
 static vi_get_info_t		vesa_get_info;
@@ -98,8 +99,14 @@ static vi_set_win_org_t		vesa_set_origin;
 static vi_read_hw_cursor_t	vesa_read_hw_cursor;
 static vi_set_hw_cursor_t	vesa_set_hw_cursor;
 static vi_set_hw_cursor_shape_t	vesa_set_hw_cursor_shape;
+static vi_blank_display_t	vesa_blank_display;
 static vi_mmap_t		vesa_mmap;
+static vi_ioctl_t		vesa_ioctl;
+static vi_clear_t		vesa_clear;
+static vi_fill_rect_t		vesa_fill_rect;
+static vi_bitblt_t		vesa_bitblt;
 static vi_diag_t		vesa_diag;
+static int			vesa_bios_info(int level);
 static struct vm86context	vesa_vmcontext;
 
 static video_switch_t vesavidsw = {
@@ -120,8 +127,14 @@ static video_switch_t vesavidsw = {
 	vesa_read_hw_cursor,
 	vesa_set_hw_cursor,
 	vesa_set_hw_cursor_shape,
-	(vi_blank_display_t *)vesa_nop,
+	vesa_blank_display,
 	vesa_mmap,
+	vesa_ioctl,
+	vesa_clear,
+	vesa_fill_rect,
+	vesa_bitblt,
+	vesa_error,
+	vesa_error,
 	vesa_diag,
 };
 
@@ -132,9 +145,11 @@ static video_switch_t *prevvidsw;
 #define EOT		(-1)
 #define NA		(-2)
 
-static video_info_t vesa_vmode[VESA_MAXMODES + 1] = {
-	{ EOT, },
-};
+#define MODE_TABLE_DELTA 8
+
+static int vesa_vmode_max = 0;
+static video_info_t vesa_vmode_empty = { EOT };
+static video_info_t *vesa_vmode = &vesa_vmode_empty;
 
 static int vesa_init_done = FALSE;
 static int has_vesa_bios = FALSE;
@@ -155,8 +170,12 @@ static int vesa_bios_get_dac(void);
 static int vesa_bios_set_dac(int bits);
 static int vesa_bios_save_palette(int start, int colors, u_char *palette,
 				  int bits);
+static int vesa_bios_save_palette2(int start, int colors, u_char *r, u_char *g,
+				   u_char *b, int bits);
 static int vesa_bios_load_palette(int start, int colors, u_char *palette,
 				  int bits);
+static int vesa_bios_load_palette2(int start, int colors, u_char *r, u_char *g,
+				   u_char *b, int bits);
 #define STATE_SIZE	0
 #define STATE_SAVE	1
 #define STATE_LOAD	2
@@ -169,12 +188,20 @@ static int vesa_bios_load_palette(int start, int colors, u_char *palette,
 static int vesa_bios_state_buf_size(void);
 static int vesa_bios_save_restore(int code, void *p, size_t size);
 static int vesa_bios_get_line_length(void);
+static int vesa_bios_set_line_length(int pixel);
+static int vesa_bios_get_start(int *x, int *y);
+static int vesa_bios_set_start(int x, int y);
 static int vesa_map_gen_mode_num(int type, int color, int mode);
 static int vesa_translate_flags(u_int16_t vflags);
+static int vesa_translate_mmodel(u_int8_t vmodel);
 static void *vesa_fix_ptr(u_int32_t p, u_int16_t seg, u_int16_t off, 
 			  u_char *buf);
 static int vesa_bios_init(void);
 static void vesa_clear_modes(video_info_t *info, int color);
+static vm_offset_t vesa_map_buffer(u_int paddr, size_t size);
+static void vesa_unmap_buffer(vm_offset_t vaddr, size_t size);
+
+static int vesa_get_origin(video_adapter_t *adp, off_t *offset);
 
 static void
 dump_buffer(u_char *buf, size_t len)
@@ -293,6 +320,36 @@ vesa_bios_save_palette(int start, int colors, u_char *palette, int bits)
 	return 0;
 }
 
+static int
+vesa_bios_save_palette2(int start, int colors, u_char *r, u_char *g, u_char *b,
+			int bits)
+{
+	struct vm86frame vmf;
+	u_char *p;
+	int err;
+	int i;
+
+	bzero(&vmf, sizeof(vmf));
+	vmf.vmf_eax = 0x4f09;
+	vmf.vmf_ebx = 1;	/* get primary palette data */
+	vmf.vmf_ecx = colors;
+	vmf.vmf_edx = start;
+	p = (u_char *)vm86_getpage(&vesa_vmcontext, 1);
+	vm86_getptr(&vesa_vmcontext, (vm_offset_t)p, &vmf.vmf_es, &vmf.vmf_di);
+
+	err = vm86_datacall(0x10, &vmf, &vesa_vmcontext);
+	if ((err != 0) || (vmf.vmf_eax != 0x4f))
+		return 1;
+
+	bits = 8 - bits;
+	for (i = 0; i < colors; ++i) {
+		r[i] = p[i*4 + 2] << bits;
+		g[i] = p[i*4 + 1] << bits;
+		b[i] = p[i*4] << bits;
+	}
+	return 0;
+}
+
 static int
 vesa_bios_load_palette(int start, int colors, u_char *palette, int bits)
 {
@@ -321,6 +378,35 @@ vesa_bios_load_palette(int start, int colors, u_char *palette, int bits)
 	return ((err != 0) || (vmf.vmf_eax != 0x4f));
 }
 
+static int
+vesa_bios_load_palette2(int start, int colors, u_char *r, u_char *g, u_char *b,
+			int bits)
+{
+	struct vm86frame vmf;
+	u_char *p;
+	int err;
+	int i;
+
+	p = (u_char *)vm86_getpage(&vesa_vmcontext, 1);
+	bits = 8 - bits;
+	for (i = 0; i < colors; ++i) {
+		p[i*4]	   = b[i] >> bits;
+		p[i*4 + 1] = g[i] >> bits;
+		p[i*4 + 2] = r[i] >> bits;
+		p[i*4 + 3] = 0;
+	}
+
+	bzero(&vmf, sizeof(vmf));
+	vmf.vmf_eax = 0x4f09;
+	vmf.vmf_ebx = 0;	/* set primary palette data */
+	vmf.vmf_ecx = colors;
+	vmf.vmf_edx = start;
+	vm86_getptr(&vesa_vmcontext, (vm_offset_t)p, &vmf.vmf_es, &vmf.vmf_di);
+
+	err = vm86_datacall(0x10, &vmf, &vesa_vmcontext);
+	return ((err != 0) || (vmf.vmf_eax != 0x4f));
+}
+
 static int
 vesa_bios_state_buf_size(void)
 {
@@ -371,6 +457,55 @@ vesa_bios_get_line_length(void)
 	return vmf.vmf_bx;	/* line length in bytes */
 }
 
+static int
+vesa_bios_set_line_length(int pixel)
+{
+	struct vm86frame vmf;
+	int err;
+
+	bzero(&vmf, sizeof(vmf));
+	vmf.vmf_eax = 0x4f06; 
+	vmf.vmf_ebx = 0;	/* set scan line length in pixel */
+	vmf.vmf_ecx = pixel;
+	err = vm86_intcall(0x10, &vmf);
+#if VESA_DEBUG > 1
+	printf("bx:%d, cx:%d, dx:%d\n", vmf.vmf_bx, vmf.vmf_cx, vmf.vmf_dx); 
+#endif
+	return ((err != 0) || (vmf.vmf_eax != 0x4f));
+}
+
+static int
+vesa_bios_get_start(int *x, int *y)
+{
+	struct vm86frame vmf;
+	int err;
+
+	bzero(&vmf, sizeof(vmf));
+	vmf.vmf_eax = 0x4f07; 
+	vmf.vmf_ebx = 1;	/* get display start */
+	err = vm86_intcall(0x10, &vmf);
+	if ((err != 0) || (vmf.vmf_eax != 0x4f))
+		return 1;
+	*x = vmf.vmf_cx;
+	*y = vmf.vmf_dx;
+	return 0;
+}
+
+static int
+vesa_bios_set_start(int x, int y)
+{
+	struct vm86frame vmf;
+	int err;
+
+	bzero(&vmf, sizeof(vmf));
+	vmf.vmf_eax = 0x4f07; 
+	vmf.vmf_ebx = 0x80;	/* set display start */
+	vmf.vmf_edx = y;
+	vmf.vmf_ecx = x;
+	err = vm86_intcall(0x10, &vmf);
+	return ((err != 0) || (vmf.vmf_eax != 0x4f));
+}
+
 /* map a generic video mode to a known mode */
 static int
 vesa_map_gen_mode_num(int type, int color, int mode)
@@ -415,6 +550,29 @@ vesa_translate_flags(u_int16_t vflags)
 	return flags;
 }
 
+static int
+vesa_translate_mmodel(u_int8_t vmodel)
+{
+	static struct {
+		u_int8_t vmodel;
+		int mmodel;
+	} mtable[] = {
+		{ V_MMTEXT,	V_INFO_MM_TEXT },
+		{ V_MMCGA,	V_INFO_MM_CGA },
+		{ V_MMHGC,	V_INFO_MM_HGC },
+		{ V_MMEGA,	V_INFO_MM_PLANAR },
+		{ V_MMPACKED,	V_INFO_MM_PACKED },
+		{ V_MMDIRCOLOR,	V_INFO_MM_DIRECT },
+	};
+	int i;
+
+	for (i = 0; mtable[i].mmodel >= 0; ++i) {
+		if (mtable[i].vmodel == vmodel)
+			return mtable[i].mmodel;
+	}
+	return V_INFO_MM_OTHER;
+}
+
 static void
 *vesa_fix_ptr(u_int32_t p, u_int16_t seg, u_int16_t off, u_char *buf)
 {
@@ -434,6 +592,7 @@ vesa_bios_init(void)
 	static u_char buf[512];
 	struct vm86frame vmf;
 	struct vesa_mode vmode;
+	video_info_t *p;
 	u_char *vmbuf;
 	int modes;
 	int err;
@@ -444,6 +603,7 @@ vesa_bios_init(void)
 
 	has_vesa_bios = FALSE;
 	vesa_adp_info = NULL;
+	vesa_vmode_max = 0;
 	vesa_vmode[0].vi_mode = EOT;
 
 	vmbuf = (u_char *)vm86_addpage(&vesa_vmcontext, 1, 0);
@@ -463,6 +623,15 @@ vesa_bios_init(void)
 	}
 	if (vesa_adp_info->v_flags & V_NONVGA)
 		return 1;
+	if (vesa_adp_info->v_version < 0x0102) {
+		printf("VESA: VBE version %d.%d is not supported; "
+		       "version 1.2 or later is required.\n",
+		       ((vesa_adp_info->v_version & 0xf000) >> 12) * 10 
+			   + ((vesa_adp_info->v_version & 0x0f00) >> 8),
+		       ((vesa_adp_info->v_version & 0x00f0) >> 4) * 10 
+			   + (vesa_adp_info->v_version & 0x000f));
+		return 1;
+	}
 
 	/* fix string ptrs */
 	vesa_oemstr = (char *)vesa_fix_ptr(vesa_adp_info->v_oemstr,
@@ -480,7 +649,6 @@ vesa_bios_init(void)
 	}
 
 	/* obtain video mode information */
-	vesa_vmode[0].vi_mode = EOT;
 	vesa_vmodetab = (u_int16_t *)vesa_fix_ptr(vesa_adp_info->v_modetable,
 						  vmf.vmf_es, vmf.vmf_di, buf);
 	if (vesa_vmodetab == NULL)
@@ -488,8 +656,6 @@ vesa_bios_init(void)
 	for (i = 0, modes = 0; 
 		(i < (M_VESA_MODE_MAX - M_VESA_BASE + 1))
 		&& (vesa_vmodetab[i] != 0xffff); ++i) {
-		if (modes >= VESA_MAXMODES)
-			break;
 		if (vesa_bios_get_mode(vesa_vmodetab[i], &vmode))
 			continue;
 
@@ -505,6 +671,22 @@ vesa_bios_init(void)
 			continue;
 #endif
 
+		/* expand the array if necessary */
+		if (modes >= vesa_vmode_max) {
+			vesa_vmode_max += MODE_TABLE_DELTA;
+			p = malloc(sizeof(*vesa_vmode)*(vesa_vmode_max + 1),
+				   M_DEVBUF, M_WAITOK);
+#if VESA_DEBUG > 1
+			printf("vesa_bios_init(): modes:%d, vesa_mode_max:%d\n",
+			       modes, vesa_mode_max);
+#endif
+			if (modes > 0) {
+				bcopy(vesa_vmode, p, sizeof(*vesa_vmode)*modes);
+				free(vesa_vmode, M_DEVBUF);
+			}
+			vesa_vmode = p;
+		}
+
 		/* copy some fields */
 		bzero(&vesa_vmode[modes], sizeof(vesa_vmode[modes]));
 		vesa_vmode[modes].vi_mode = vesa_vmodetab[i];
@@ -518,15 +700,56 @@ vesa_bios_init(void)
 		/* XXX window B */
 		vesa_vmode[modes].vi_window_size = vmode.v_wsize*1024;
 		vesa_vmode[modes].vi_window_gran = vmode.v_wgran*1024;
-		vesa_vmode[modes].vi_buffer = vmode.v_lfb;
+		if (vmode.v_modeattr & V_MODELFB)
+			vesa_vmode[modes].vi_buffer = vmode.v_lfb;
+		else
+			vesa_vmode[modes].vi_buffer = 0;
 		/* XXX */
+		vesa_vmode[modes].vi_buffer_size
+			= vesa_adp_info->v_memsize*64*1024;
+#if 0
 		if (vmode.v_offscreen > vmode.v_lfb)
 			vesa_vmode[modes].vi_buffer_size
-				= vmode.v_offscreen - vmode.v_lfb;
+				= vmode.v_offscreen + vmode.v_offscreensize*1024
+				      - vmode.v_lfb;
 		else
-			vesa_vmode[modes].vi_buffer_size = vmode.v_offscreen;
-		/* pixel format, memory model... */
-
+			vesa_vmode[modes].vi_buffer_size
+				= vmode.v_offscreen + vmode.v_offscreensize*1024
+#endif
+		vesa_vmode[modes].vi_mem_model 
+			= vesa_translate_mmodel(vmode.v_memmodel);
+		vesa_vmode[modes].vi_pixel_fields[0] = 0;
+		vesa_vmode[modes].vi_pixel_fields[1] = 0;
+		vesa_vmode[modes].vi_pixel_fields[2] = 0;
+		vesa_vmode[modes].vi_pixel_fields[3] = 0;
+		vesa_vmode[modes].vi_pixel_fsizes[0] = 0;
+		vesa_vmode[modes].vi_pixel_fsizes[1] = 0;
+		vesa_vmode[modes].vi_pixel_fsizes[2] = 0;
+		vesa_vmode[modes].vi_pixel_fsizes[3] = 0;
+		if (vesa_vmode[modes].vi_mem_model == V_INFO_MM_PACKED) {
+			vesa_vmode[modes].vi_pixel_size = (vmode.v_bpp + 7)/8;
+		} else if (vesa_vmode[modes].vi_mem_model == V_INFO_MM_DIRECT) {
+			vesa_vmode[modes].vi_pixel_size = (vmode.v_bpp + 7)/8;
+			vesa_vmode[modes].vi_pixel_fields[0]
+			    = vmode.v_redfieldpos;
+			vesa_vmode[modes].vi_pixel_fields[1]
+			    = vmode.v_greenfieldpos;
+			vesa_vmode[modes].vi_pixel_fields[2]
+			    = vmode.v_bluefieldpos;
+			vesa_vmode[modes].vi_pixel_fields[3]
+			    = vmode.v_resfieldpos;
+			vesa_vmode[modes].vi_pixel_fsizes[0]
+			    = vmode.v_redmasksize;
+			vesa_vmode[modes].vi_pixel_fsizes[1]
+			    = vmode.v_greenmasksize;
+			vesa_vmode[modes].vi_pixel_fsizes[2]
+			    = vmode.v_bluemasksize;
+			vesa_vmode[modes].vi_pixel_fsizes[3]
+			    = vmode.v_resmasksize;
+		} else {
+			vesa_vmode[modes].vi_pixel_size = 0;
+		}
+		
 		vesa_vmode[modes].vi_flags 
 			= vesa_translate_flags(vmode.v_modeattr) | V_INFO_VESA;
 		++modes;
@@ -549,6 +772,30 @@ vesa_clear_modes(video_info_t *info, int color)
 	}
 }
 
+static vm_offset_t
+vesa_map_buffer(u_int paddr, size_t size)
+{
+	vm_offset_t vaddr;
+	u_int off;
+
+	off = paddr - trunc_page(paddr);
+	vaddr = (vm_offset_t)pmap_mapdev(paddr - off, size + off);
+#if VESA_DEBUG > 1
+	printf("vesa_map_buffer: paddr:%x vaddr:%x size:%x off:%x\n",
+	       paddr, vaddr, size, off);
+#endif
+	return (vaddr + off);
+}
+
+static void
+vesa_unmap_buffer(vm_offset_t vaddr, size_t size)
+{
+#if VESA_DEBUG > 1
+	printf("vesa_unmap_buffer: vaddr:%x size:%x\n", vaddr, size);
+#endif
+	kmem_free(kernel_map, vaddr, size);
+}
+
 /* entry points */
 
 static int
@@ -623,6 +870,12 @@ vesa_nop(void)
 	return 0;
 }
 
+static int
+vesa_error(void)
+{
+	return 1;
+}
+
 static int
 vesa_probe(int unit, video_adapter_t **adpp, void *arg, int flags)
 {
@@ -701,43 +954,36 @@ static int
 vesa_set_mode(video_adapter_t *adp, int mode)
 {
 	video_info_t info;
-	size_t len;
+	int len;
 
 	if (adp != vesa_adp)
 		return (*prevvidsw->set_mode)(adp, mode);
 
-	mode = vesa_map_gen_mode_num(vesa_adp->va_type, 
-				     vesa_adp->va_flags & V_ADP_COLOR, mode);
+	mode = vesa_map_gen_mode_num(adp->va_type, 
+				     adp->va_flags & V_ADP_COLOR, mode);
 #if VESA_DEBUG > 0
 	printf("VESA: set_mode(): %d(%x) -> %d(%x)\n",
-		vesa_adp->va_mode, vesa_adp->va_mode, mode, mode);
+		adp->va_mode, adp->va_mode, mode, mode);
 #endif
 	/* 
 	 * If the current mode is a VESA mode and the new mode is not,
-	 * restore the state of the adapter first, so that non-standard, 
-	 * extended SVGA registers are set to the state compatible with
-	 * the standard VGA modes. Otherwise (*prevvidsw->set_mode)() 
-	 * may not be able to set up the new mode correctly.
+	 * restore the state of the adapter first by setting one of the
+	 * standard VGA mode, so that non-standard, extended SVGA registers 
+	 * are set to the state compatible with the standard VGA modes. 
+	 * Otherwise (*prevvidsw->set_mode)() may not be able to set up 
+	 * the new mode correctly.
 	 */
-	if (VESA_MODE(vesa_adp->va_mode)) {
+	if (VESA_MODE(adp->va_mode)) {
 		if ((*prevvidsw->get_info)(adp, mode, &info) == 0) {
-			int10_set_mode(vesa_adp->va_initial_bios_mode);
-#if 0
-			/* assert(vesa_state_buf != NULL); */
-		    	if ((vesa_state_buf == NULL)
-			    || vesa_load_state(adp, vesa_state_buf))
-				return 1;
-			free(vesa_state_buf, M_DEVBUF);
-			vesa_state_buf = NULL;
-#if VESA_DEBUG > 0
-			printf("VESA: restored\n");
-#endif
-#endif /* 0 */
+			int10_set_mode(adp->va_initial_bios_mode);
+			if (adp->va_info.vi_flags & V_INFO_LINEAR)
+				vesa_unmap_buffer(adp->va_buffer,
+						  vesa_adp_info->v_memsize*64*1024);
+			/* 
+			 * Once (*prevvidsw->get_info)() succeeded, 
+			 * (*prevvidsw->set_mode)() below won't fail...
+			 */
 		}
-		/* 
-		 * once (*prevvidsw->get_info)() succeeded, 
-		 * (*prevvidsw->set_mode)() below won't fail...
-		 */
 	}
 
 	/* we may not need to handle this mode after all... */
@@ -752,33 +998,17 @@ vesa_set_mode(video_adapter_t *adp, int mode)
 #if VESA_DEBUG > 0
 	printf("VESA: about to set a VESA mode...\n");
 #endif
-	/* 
-	 * If the current mode is not a VESA mode, save the current state
-	 * so that the adapter state can be restored later when a non-VESA
-	 * mode is to be set up. See above.
-	 */
-#if 0
-	if (!VESA_MODE(vesa_adp->va_mode) && (vesa_state_buf == NULL)) {
-		len = vesa_save_state(adp, NULL, 0);
-		vesa_state_buf = malloc(len, M_DEVBUF, M_WAITOK);
-		if (vesa_save_state(adp, vesa_state_buf, len)) {
-#if VESA_DEBUG > 0
-			printf("VESA: state save failed! (len=%d)\n", len);
-#endif
-			free(vesa_state_buf, M_DEVBUF);
-			vesa_state_buf = NULL;
-			return 1;
-		}
-#if VESA_DEBUG > 0
-		printf("VESA: saved (len=%d)\n", len);
-		dump_buffer(vesa_state_buf, len);
-#endif
-	}
-#endif /* 0 */
+	/* don't use the linear frame buffer for text modes. XXX */
+	if (!(info.vi_flags & V_INFO_GRAPHICS))
+		info.vi_flags &= ~V_INFO_LINEAR;
 
-	if (vesa_bios_set_mode(mode))
+	if (vesa_bios_set_mode(mode | ((info.vi_flags & V_INFO_LINEAR) ? 0x4000 : 0)))
 		return 1;
 
+	if (adp->va_info.vi_flags & V_INFO_LINEAR)
+		vesa_unmap_buffer(adp->va_buffer,
+				  vesa_adp_info->v_memsize*64*1024);
+
 #if VESA_DEBUG > 0
 	printf("VESA: mode set!\n");
 #endif
@@ -788,16 +1018,25 @@ vesa_set_mode(video_adapter_t *adp, int mode)
 		(info.vi_flags & V_INFO_COLOR) ? V_ADP_COLOR : 0;
 	vesa_adp->va_crtc_addr =
 		(vesa_adp->va_flags & V_ADP_COLOR) ? COLOR_CRTC : MONO_CRTC;
-	vesa_adp->va_window = BIOS_PADDRTOVADDR(info.vi_window);
-	vesa_adp->va_window_size = info.vi_window_size;
-	vesa_adp->va_window_gran = info.vi_window_gran;
-	if (info.vi_buffer_size == 0) {
-		vesa_adp->va_buffer = 0;
-		vesa_adp->va_buffer_size = 0;
+	if (info.vi_flags & V_INFO_LINEAR) {
+#if VESA_DEBUG > 1
+		printf("VESA: setting up LFB\n");
+#endif
+		vesa_adp->va_buffer =
+			vesa_map_buffer(info.vi_buffer,
+					vesa_adp_info->v_memsize*64*1024);
+		vesa_adp->va_buffer_size = info.vi_buffer_size;
+		vesa_adp->va_window = vesa_adp->va_buffer;
+		vesa_adp->va_window_size = info.vi_buffer_size/info.vi_planes;
+		vesa_adp->va_window_gran = info.vi_buffer_size/info.vi_planes;
 	} else {
-		vesa_adp->va_buffer = BIOS_PADDRTOVADDR(info.vi_buffer);
+		vesa_adp->va_buffer = 0;
 		vesa_adp->va_buffer_size = info.vi_buffer_size;
+		vesa_adp->va_window = BIOS_PADDRTOVADDR(info.vi_window);
+		vesa_adp->va_window_size = info.vi_window_size;
+		vesa_adp->va_window_gran = info.vi_window_gran;
 	}
+	vesa_adp->va_window_orig = 0;
 	len = vesa_bios_get_line_length();
 	if (len > 0) {
 		vesa_adp->va_line_width = len;
@@ -820,6 +1059,8 @@ vesa_set_mode(video_adapter_t *adp, int mode)
 	} else {
 		vesa_adp->va_line_width = info.vi_width;
 	}
+	vesa_adp->va_disp_start.x = 0;
+	vesa_adp->va_disp_start.y = 0;
 #if VESA_DEBUG > 0
 	printf("vesa_set_mode(): vi_width:%d, len:%d, line_width:%d\n",
 	       info.vi_width, len, vesa_adp->va_line_width);
@@ -926,6 +1167,22 @@ vesa_load_state(video_adapter_t *adp, void *p)
 				      vesa_state_buf_size);
 }
 
+static int
+vesa_get_origin(video_adapter_t *adp, off_t *offset)
+{
+	struct vm86frame vmf;
+	int err;
+
+	bzero(&vmf, sizeof(vmf));
+	vmf.vmf_eax = 0x4f05; 
+	vmf.vmf_ebx = 0x10;		/* WINDOW_A, XXX */
+	err = vm86_intcall(0x10, &vmf); 
+	if ((err != 0) || (vmf.vmf_eax != 0x4f))
+		return 1;
+	*offset = vmf.vmf_dx*adp->va_window_gran;
+	return 0;
+}
+
 static int
 vesa_set_origin(video_adapter_t *adp, off_t offset)
 {
@@ -941,20 +1198,26 @@ vesa_set_origin(video_adapter_t *adp, off_t offset)
 	if (adp != vesa_adp) 
 		return (*prevvidsw->set_win_org)(adp, offset);
 
-	if (vesa_adp->va_window_gran == 0)
+	/* if this is a linear frame buffer, do nothing */
+	if (adp->va_info.vi_flags & V_INFO_LINEAR)
+		return 0;
+	/* XXX */
+	if (adp->va_window_gran == 0)
 		return 1;
+
 	bzero(&vmf, sizeof(vmf));
 	vmf.vmf_eax = 0x4f05; 
 	vmf.vmf_ebx = 0;		/* WINDOW_A, XXX */
-	vmf.vmf_edx = offset/vesa_adp->va_window_gran;
+	vmf.vmf_edx = offset/adp->va_window_gran;
 	err = vm86_intcall(0x10, &vmf); 
 	if ((err != 0) || (vmf.vmf_eax != 0x4f))
 		return 1;
 	bzero(&vmf, sizeof(vmf));
 	vmf.vmf_eax = 0x4f05; 
 	vmf.vmf_ebx = 1;		/* WINDOW_B, XXX */
-	vmf.vmf_edx = offset/vesa_adp->va_window_gran;
+	vmf.vmf_edx = offset/adp->va_window_gran;
 	err = vm86_intcall(0x10, &vmf); 
+	adp->va_window_orig = (offset/adp->va_window_gran)*adp->va_window_gran;
 	return 0;			/* XXX */
 }
 
@@ -979,25 +1242,222 @@ vesa_set_hw_cursor_shape(video_adapter_t *adp, int base, int height,
 }
 
 static int
-vesa_mmap(video_adapter_t *adp, vm_offset_t offset)
+vesa_blank_display(video_adapter_t *adp, int mode) 
 {
-	return (*prevvidsw->mmap)(adp, offset);
+	/* XXX: use VESA DPMS */
+	return (*prevvidsw->blank_display)(adp, mode);
 }
 
 static int
-vesa_diag(video_adapter_t *adp, int level)
+vesa_mmap(video_adapter_t *adp, vm_offset_t offset, int prot)
 {
-#if VESA_DEBUG > 1
-	struct vesa_mode vmode;
-	int i;
+#if VESA_DEBUG > 0
+	printf("vesa_mmap(): window:0x%x, buffer:0x%x, offset:0x%x\n", 
+	       adp->va_info.vi_window, adp->va_info.vi_buffer, offset);
 #endif
 
-	if (adp != vesa_adp)
+	if ((adp == vesa_adp) && (adp->va_info.vi_flags & V_INFO_LINEAR)) {
+		/* va_window_size == va_buffer_size/vi_planes */
+		/* XXX: is this correct? */
+		if (offset > adp->va_window_size - PAGE_SIZE)
+			return -1;
+#ifdef __i386__
+		return i386_btop(adp->va_info.vi_buffer + offset);
+#endif
+#ifdef __alpha__ /* XXX */
+		return alpha_btop(adp->va_info.vi_buffer + offset);
+#endif
+	} else {
+		return (*prevvidsw->mmap)(adp, offset, prot);
+	}
+}
+
+static int
+vesa_clear(video_adapter_t *adp)
+{
+	return (*prevvidsw->clear)(adp);
+}
+
+static int
+vesa_fill_rect(video_adapter_t *adp, int val, int x, int y, int cx, int cy)
+{
+	return (*prevvidsw->fill_rect)(adp, val, x, y, cx, cy);
+}
+
+static int
+vesa_bitblt(video_adapter_t *adp,...)
+{
+	/* FIXME */
+	return 1;
+}
+
+static int
+get_palette(video_adapter_t *adp, int base, int count,
+	    u_char *red, u_char *green, u_char *blue, u_char *trans)
+{
+	u_char *r;
+	u_char *g;
+	u_char *b;
+	int bits;
+	int error;
+
+	if ((base < 0) || (base >= 256) || (base + count > 256))
+		return 1;
+	if (!(vesa_adp_info->v_flags & V_DAC8) || !VESA_MODE(adp->va_mode))
 		return 1;
 
-#ifndef KLD_MODULE
+	bits = vesa_bios_get_dac();
+	if (bits <= 6)
+		return 1;
+
+	r = malloc(count*3, M_DEVBUF, M_WAITOK);
+	g = r + count;
+	b = g + count;
+	error = vesa_bios_save_palette2(base, count, r, g, b, bits);
+	if (error == 0) {
+		copyout(r, red, count);
+		copyout(g, green, count);
+		copyout(b, blue, count);
+		if (trans != NULL) {
+			bzero(r, count);
+			copyout(r, trans, count);
+		}
+	}
+	free(r, M_DEVBUF);
+
+	/* if error && bits != 6 at this point, we are in in trouble... XXX */
+	return error;
+}
+
+static int
+set_palette(video_adapter_t *adp, int base, int count,
+	    u_char *red, u_char *green, u_char *blue, u_char *trans)
+{
+	return 1;
+#if notyet
+	u_char *r;
+	u_char *g;
+	u_char *b;
+	int bits;
+	int error;
+
+	if ((base < 0) || (base >= 256) || (base + count > 256))
+		return 1;
+	if (!(vesa_adp_info->v_flags & V_DAC8) || !VESA_MODE(adp->va_mode)
+		|| ((bits = vesa_bios_set_dac(8)) <= 6))
+		return 1;
+
+	r = malloc(count*3, M_DEVBUF, M_WAITOK);
+	g = r + count;
+	b = g + count;
+	copyin(red, r, count);
+	copyin(green, g, count);
+	copyin(blue, b, count);
+
+	error = vesa_bios_load_palette2(base, count, r, g, b, bits);
+	free(r, M_DEVBUF);
+	if (error == 0)
+		return 0;
+
+	/* if the following call fails, we are in trouble... XXX */
+	vesa_bios_set_dac(6);
+	return 1;
+#endif /* notyet */
+}
+
+static int
+vesa_ioctl(video_adapter_t *adp, u_long cmd, caddr_t arg)
+{
+	if (adp != vesa_adp)
+		return (*prevvidsw->ioctl)(adp, cmd, arg);
+
+	switch (cmd) {
+	case FBIO_SETWINORG:	/* set frame buffer window origin */
+		return (vesa_set_origin(adp, *(off_t *)arg) ? ENODEV : 0);
+
+	case FBIO_SETDISPSTART:	/* set display start address */
+		if (vesa_bios_set_start(((video_display_start_t *)arg)->x,
+					((video_display_start_t *)arg)->y))
+			return ENODEV;
+		adp->va_disp_start.x = ((video_display_start_t *)arg)->x;
+		adp->va_disp_start.y = ((video_display_start_t *)arg)->y;
+		return 0;
+
+	case FBIO_SETLINEWIDTH:	/* set line length in pixel */
+		if (vesa_bios_set_line_length(*(u_int *)arg))
+			return ENODEV;
+		adp->va_line_width = (*(u_int *)arg + 7)/8;
+		return 0;
+
+	case FBIO_GETPALETTE:	/* get color palette */
+		if (get_palette(adp, ((video_color_palette_t *)arg)->index,
+				((video_color_palette_t *)arg)->count,
+				((video_color_palette_t *)arg)->red,
+				((video_color_palette_t *)arg)->green,
+				((video_color_palette_t *)arg)->blue,
+				((video_color_palette_t *)arg)->transparent))
+			return (*prevvidsw->ioctl)(adp, cmd, arg);
+		return 0;
+
+
+	case FBIO_SETPALETTE:	/* set color palette */
+		if (set_palette(adp, ((video_color_palette_t *)arg)->index,
+				((video_color_palette_t *)arg)->count,
+				((video_color_palette_t *)arg)->red,
+				((video_color_palette_t *)arg)->green,
+				((video_color_palette_t *)arg)->blue,
+				((video_color_palette_t *)arg)->transparent))
+			return (*prevvidsw->ioctl)(adp, cmd, arg);
+		return 0;
+
+	case FBIOGETCMAP:	/* get color palette */
+		if (get_palette(adp, ((struct fbcmap *)arg)->index,
+				((struct fbcmap *)arg)->count,
+				((struct fbcmap *)arg)->red,
+				((struct fbcmap *)arg)->green,
+				((struct fbcmap *)arg)->blue, NULL))
+			return (*prevvidsw->ioctl)(adp, cmd, arg);
+		return 0;
+
+	case FBIOPUTCMAP:	/* set color palette */
+		if (set_palette(adp, ((struct fbcmap *)arg)->index,
+				((struct fbcmap *)arg)->count,
+				((struct fbcmap *)arg)->red,
+				((struct fbcmap *)arg)->green,
+				((struct fbcmap *)arg)->blue, NULL))
+			return (*prevvidsw->ioctl)(adp, cmd, arg);
+		return 0;
+
+	default:
+		return (*prevvidsw->ioctl)(adp, cmd, arg);
+	}
+}
+
+static int
+vesa_diag(video_adapter_t *adp, int level)
+{
+	int error;
+
 	/* call the previous handler first */
-	(*prevvidsw->diag)(adp, level);
+	error = (*prevvidsw->diag)(adp, level);
+	if (error)
+		return error;
+
+	if (adp != vesa_adp)
+		return 1;
+
+	if (level <= 0)
+		return 0;
+
+	return 0;
+}
+
+static int
+vesa_bios_info(int level)
+{
+#if VESA_DEBUG > 1
+	struct vesa_mode vmode;
+	int i;
 #endif
 
 	/* general adapter information */
@@ -1016,15 +1476,11 @@ vesa_diag(video_adapter_t *adp, int level)
 		return 0;
 
 	if (vesa_adp_info->v_version >= 0x0200) {
-		/* vendor name */
-		if (vesa_venderstr != NULL)
-			printf("VESA: %s\n", vesa_venderstr);
-		/* product name */
-		if (vesa_prodstr != NULL)
-			printf("VESA: %s\n", vesa_prodstr);
-		/* product revision */
-		if (vesa_revstr != NULL)
-			printf("VESA: %s\n", vesa_revstr);
+		/* vender name, product name, product revision */
+		printf("VESA: %s %s %s\n",
+			(vesa_venderstr != NULL) ? vesa_venderstr : "unknown",
+			(vesa_prodstr != NULL) ? vesa_prodstr : "unknown",
+			(vesa_revstr != NULL) ? vesa_revstr : "?");
 	}
 
 #if VESA_DEBUG > 1
@@ -1047,13 +1503,15 @@ vesa_diag(video_adapter_t *adp, int level)
 				printf(", T %dx%d, ", 
 				       vmode.v_width, vmode.v_height);
 			}
-			printf("font:%dx%d", 
+			printf("font:%dx%d, ", 
 			       vmode.v_cwidth, vmode.v_cheight);
+			printf("pages:%d, mem:%d",
+			       vmode.v_ipages + 1, vmode.v_memmodel);
 		}
 		if (vmode.v_modeattr & V_MODELFB) {
-			printf(", mem:%d, LFB:0x%x, off:0x%x", 
-			       vmode.v_memmodel, vmode.v_lfb, 
-			       vmode.v_offscreen);
+			printf("\nVESA: LFB:0x%x, off:0x%x, off_size:0x%x", 
+			       vmode.v_lfb, vmode.v_offscreen,
+			       vmode.v_offscreensize*1024);
 		}
 		printf("\n");
 		printf("VESA: window A:0x%x (%x), window B:0x%x (%x), ",
@@ -1062,7 +1520,7 @@ vesa_diag(video_adapter_t *adp, int level)
 		printf("size:%dk, gran:%dk\n",
 		       vmode.v_wsize, vmode.v_wgran);
 	}
-#endif
+#endif /* VESA_DEBUG > 1 */
 
 	return 0;
 }
@@ -1084,14 +1542,14 @@ vesa_load(void)
 	error = vesa_configure(0);
 	splx(s);
 
-#ifdef KLD_MODULE
 	if (error == 0)
-		vesa_diag(vesa_adp, bootverbose);
-#endif
+		vesa_bios_info(bootverbose);
 
 	return error;
 }
 
+#ifdef KLD_MODULE
+
 static int
 vesa_unload(void)
 {
@@ -1130,6 +1588,8 @@ vesa_unload(void)
 	return error;
 }
 
+#endif /* KLD_MODULE */
+
 static int
 vesa_mod_event(module_t mod, int type, void *data)
 {
@@ -1137,7 +1597,11 @@ vesa_mod_event(module_t mod, int type, void *data)
 	case MOD_LOAD:
 		return vesa_load();
 	case MOD_UNLOAD:
+#ifdef KLD_MODULE
 		return vesa_unload();
+#else
+		return EBUSY;
+#endif
 	default:
 		break;
 	}
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index c3be3104d509..6c17bc152963 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.248 1999/06/19 08:14:56 grog Exp $
+ *	$Id: sio.c,v 1.249 1999/06/20 13:10:09 peter Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
@@ -2656,7 +2656,7 @@ static cn_checkc_t siocncheckc;
 static cn_getc_t siocngetc;
 static cn_putc_t siocnputc;
 
-CONS_DRIVER(sio, siocnprobe, siocninit, siocngetc, siocncheckc, siocnputc);
+CONS_DRIVER(sio, siocnprobe, siocninit, NULL, siocngetc, siocncheckc, siocnputc);
 
 /* To get the GDB related variables */
 #if DDB > 0
@@ -2855,7 +2855,6 @@ siocnprobe(cp)
 				cp->cn_pri = COM_FORCECONSOLE(flags)
 					     || boothowto & RB_SERIAL
 					     ? CN_REMOTE : CN_NORMAL;
-				printf("sio%d: system console\n", unit);
 				siocniobase = iobase;
 				siocnunit = unit;
 			}
@@ -2897,10 +2896,7 @@ siocnprobe(cp)
 
 #ifdef __alpha__
 
-struct consdev siocons = {
-	NULL, NULL, siocngetc, siocncheckc, siocnputc,
-	NULL, 0, CN_NORMAL,
-};
+CONS_DRIVER(sio, NULL, NULL, NULL, siocngetc, siocncheckc, siocnputc);
 
 extern struct consdev *cn_tab;
 
@@ -2915,6 +2911,8 @@ siocnattach(port, speed)
 
 	siocniobase = port;
 	comdefaultrate = speed;
+	sio_consdev.cn_pri = CN_NORMAL;
+	sio_consdev.cn_dev = makedev(CDEV_MAJOR, 0);
 
 	s = spltty();
 
@@ -2938,8 +2936,7 @@ siocnattach(port, speed)
 	siocnopen(&sp, siocniobase, comdefaultrate);
 	splx(s);
 
-	siocons.cn_dev = makedev(CDEV_MAJOR, 0);
-	cn_tab = &siocons;
+	cn_tab = &sio_consdev;
 	return 0;
 }
 
diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c
index 85e626ec47e0..fcb2b0655b35 100644
--- a/sys/isa/syscons_isa.c
+++ b/sys/isa/syscons_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: syscons_isa.c,v 1.3 1999/05/08 21:59:31 dfr Exp $
+ * $Id: syscons_isa.c,v 1.4 1999/05/30 11:12:29 dfr Exp $
  */
 
 #include "sc.h"
@@ -37,33 +37,53 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 
+#include <machine/cons.h>
 #include <machine/console.h>
+
 #ifdef __i386__
-#include <machine/apm_bios.h>
-#endif
+
+#include <machine/clock.h>
+#include <machine/md_var.h>
+#include <machine/pc/bios.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <i386/isa/timerreg.h>
+
+#define BIOS_CLKED	(1 << 6)
+#define BIOS_NLKED	(1 << 5)
+#define BIOS_SLKED	(1 << 4)
+#define BIOS_ALKED	0
+
+#endif /* __i386__ */
 
 #include <dev/syscons/syscons.h>
 
 #include <isa/isareg.h>
 #include <isa/isavar.h>
 
-devclass_t	sc_devclass;
+static devclass_t	sc_devclass;
 
 static int	scprobe(device_t dev);
 static int	scattach(device_t dev);
+static int	scresume(device_t dev);
 
 static device_method_t sc_methods[] = {
 	DEVMETHOD(device_probe,         scprobe),
 	DEVMETHOD(device_attach,        scattach),
+	DEVMETHOD(device_resume,        scresume),
 	{ 0, 0 }
 };
 
 static driver_t sc_driver = {
-	"sc",
+	SC_DRIVER_NAME,
 	sc_methods,
 	1,                          /* XXX */
 };
 
+static sc_softc_t main_softc = { 0, 0, 0, -1, NULL, -1, NULL, };
+
 static int
 scprobe(device_t dev)
 {
@@ -81,6 +101,146 @@ scattach(device_t dev)
 	return sc_attach_unit(device_get_unit(dev), isa_get_flags(dev));
 }
 
+static int
+scresume(device_t dev)
+{
+	return sc_resume_unit(device_get_unit(dev));
+}
+
+int
+sc_max_unit(void)
+{
+	return devclass_get_maxunit(sc_devclass);
+}
+
+sc_softc_t
+*sc_get_softc(int unit, int flags)
+{
+	sc_softc_t *sc;
+
+	if ((unit < 0) || (unit >= NSC))
+		return NULL;
+	if (flags & SC_KERNEL_CONSOLE) {
+		/* FIXME: clear if it is wired to another unit! */
+		main_softc.unit = unit;
+		return &main_softc;
+	} else {
+	        sc = (sc_softc_t *)devclass_get_softc(sc_devclass, unit);
+		if (!(sc->flags & SC_INIT_DONE)) {
+			sc->unit = unit;
+			sc->keyboard = -1;
+			sc->adapter = -1;
+		}
+		return sc;
+	}
+}
+
+sc_softc_t
+*sc_find_softc(struct video_adapter *adp, struct keyboard *kbd)
+{
+	sc_softc_t *sc;
+	int units;
+	int i;
+
+	sc = &main_softc;
+	if (((adp == NULL) || (adp == sc->adp))
+	    && ((kbd == NULL) || (kbd == sc->kbd)))
+		return sc;
+	units = devclass_get_maxunit(sc_devclass);
+	for (i = 0; i < units; ++i) {
+	        sc = (sc_softc_t *)devclass_get_softc(sc_devclass, i);
+		if (sc == NULL)
+			continue;
+		if (((adp == NULL) || (adp == sc->adp))
+		    && ((kbd == NULL) || (kbd == sc->kbd)))
+			return sc;
+	}
+	return NULL;
+}
+
+int
+sc_get_cons_priority(int *unit, int *flags)
+{
+	int disabled;
+	int u, f;
+	int i;
+
+	*unit = -1;
+	for (i = -1; (i = resource_locate(i, SC_DRIVER_NAME)) >= 0;) {
+		u = resource_query_unit(i);
+		if ((resource_int_value(SC_DRIVER_NAME, u, "disabled",
+					&disabled) == 0) && disabled)
+			continue;
+		if (resource_int_value(SC_DRIVER_NAME, u, "flags", &f) != 0)
+			f = 0;
+		if (f & SC_KERNEL_CONSOLE) {
+			/* the user designates this unit to be the console */
+			*unit = u;
+			*flags = f;
+			break;
+		}
+		if (*unit < 0) {
+			/* ...otherwise remember the first found unit */
+			*unit = u;
+			*flags = f;
+		}
+	}
+	if ((i < 0) && (*unit < 0))
+		return CN_DEAD;
+#if 0
+	return ((*flags & SC_KERNEL_CONSOLE) ? CN_INTERNAL : CN_NORMAL);
+#endif
+	return CN_INTERNAL;
+}
+
+void
+sc_get_bios_values(bios_values_t *values)
+{
+#ifdef __i386__
+	u_int8_t shift;
+
+	values->cursor_start = *(u_int8_t *)BIOS_PADDRTOVADDR(0x461);
+	values->cursor_end = *(u_int8_t *)BIOS_PADDRTOVADDR(0x460);
+	shift = *(u_int8_t *)BIOS_PADDRTOVADDR(0x417);
+	values->shift_state = ((shift & BIOS_CLKED) ? CLKED : 0)
+			       | ((shift & BIOS_NLKED) ? NLKED : 0)
+			       | ((shift & BIOS_SLKED) ? SLKED : 0)
+			       | ((shift & BIOS_ALKED) ? ALKED : 0);
+	values->bell_pitch = BELL_PITCH;
+#else /* !__i386__ */
+	values->cursor_start = 0;
+	values->cursor_end = 32;
+	values->shift_state = 0;
+	values->bell_pitch = BELL_PITCH;
+#endif /* __i386__ */
+}
+
+int
+sc_tone(int herz)
+{
+#ifdef __i386__
+	int pitch;
+
+	if (herz) {
+		/* set command for counter 2, 2 byte write */
+		if (acquire_timer2(TIMER_16BIT | TIMER_SQWAVE))
+			return EBUSY;
+		/* set pitch */
+		pitch = timer_freq/herz;
+		outb(TIMER_CNTR2, pitch);
+		outb(TIMER_CNTR2, pitch >> 8);
+		/* enable counter 2 output to speaker */
+		outb(IO_PPI, inb(IO_PPI) | 3);
+	} else {
+		/* disable counter 2 output to speaker */
+		outb(IO_PPI, inb(IO_PPI) & 0xFC);
+		release_timer2();
+	}
+#endif /* __i386__ */
+
+	return 0;
+}
+
 DRIVER_MODULE(sc, isa, sc_driver, sc_devclass, 0, 0);
 
 #endif /* NSC > 0 */
diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c
index 07bffa8f7431..813458e3531f 100644
--- a/sys/isa/vga_isa.c
+++ b/sys/isa/vga_isa.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
- * Copyright (c) 1992-1998 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,8 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -26,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vga_isa.c,v 1.9 1999/05/30 11:12:30 dfr Exp $
+ * $Id: vga_isa.c,v 1.10 1999/05/30 16:52:49 phk Exp $
  */
 
 #include "vga.h"
@@ -39,13 +36,18 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/conf.h>
 #include <sys/bus.h>
-#include <sys/malloc.h>
+#include <sys/fbio.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+
+#include <sys/rman.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/console.h>
 #include <machine/md_var.h>
 #include <machine/pc/bios.h>
 
@@ -55,21 +57,10 @@
 #include <isa/isareg.h>
 #include <isa/isavar.h>
 
-#define DRIVER_NAME		"vga"
-
-/* cdev driver declaration */
-
-#define ISAVGA_UNIT(dev)	minor(dev)
-#define ISAVGA_MKMINOR(unit)	(unit)
+#define VGA_SOFTC(unit)		\
+	((vga_softc_t *)devclass_get_softc(isavga_devclass, unit))
 
-typedef struct isavga_softc {
-	video_adapter_t	*adp;
-} isavga_softc_t;
-
-#define ISAVGA_SOFTC(unit)		\
-	((isavga_softc_t *)devclass_get_softc(isavga_devclass, unit))
-
-devclass_t		isavga_devclass;
+static devclass_t	isavga_devclass;
 
 static int		isavga_probe(device_t dev);
 static int		isavga_attach(device_t dev);
@@ -77,42 +68,41 @@ static int		isavga_attach(device_t dev);
 static device_method_t isavga_methods[] = {
 	DEVMETHOD(device_probe,		isavga_probe),
 	DEVMETHOD(device_attach,	isavga_attach),
+
+	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	{ 0, 0 }
 };
 
 static driver_t isavga_driver = {
-	DRIVER_NAME,
+	VGA_DRIVER_NAME,
 	isavga_methods,
-	sizeof(isavga_softc_t),
+	sizeof(vga_softc_t),
 };
 
 DRIVER_MODULE(vga, isa, isavga_driver, isavga_devclass, 0, 0);
 
-static int		isavga_probe_unit(int unit, isavga_softc_t *sc,
-					  int flags);
-static int		isavga_attach_unit(int unit, isavga_softc_t *sc,
-					   int flags);
-
 #ifdef FB_INSTALL_CDEV
 
-static d_open_t		isavgaopen;
-static d_close_t	isavgaclose;
-static d_read_t		isavgaread;
-static d_ioctl_t	isavgaioctl;
-
-static struct cdevsw vga_cdevsw = {
-	/* open */	isavgaopen,
-	/* close */	isavgaclose,
-	/* read */	noread,
-	/* write */	nowrite,
-	/* ioctl */	isavgaioctl,
+static d_open_t		isavga_open;
+static d_close_t	isavga_close;
+static d_read_t		isavga_read;
+static d_write_t	isavga_write;
+static d_ioctl_t	isavga_ioctl;
+static d_mmap_t		isavga_mmap;
+
+static struct cdevsw isavga_cdevsw = {
+	/* open */	isavga_open,
+	/* close */	isavga_close,
+	/* read */	isavga_read,
+	/* write */	isavga_write,
+	/* ioctl */	isavga_ioctl,
 	/* stop */	nostop,
 	/* reset */	noreset,
 	/* devtotty */	nodevtotty,
 	/* poll */	nopoll,
-	/* mmap */	nommap,
+	/* mmap */	isavga_mmap,
 	/* strategy */	nostrategy,
-	/* name */	DRIVER_NAME,
+	/* name */	VGA_DRIVER_NAME,
 	/* parms */	noparms,
 	/* maj */	-1,
 	/* dump */	nodump,
@@ -127,56 +117,59 @@ static struct cdevsw vga_cdevsw = {
 static int
 isavga_probe(device_t dev)
 {
-	isavga_softc_t *sc;
+	video_adapter_t adp;
+	device_t bus;
+	int error;
 
 	/* No pnp support */
 	if (isa_get_vendorid(dev))
 		return (ENXIO);
 
 	device_set_desc(dev, "Generic ISA VGA");
-	sc = device_get_softc(dev);
-	return isavga_probe_unit(device_get_unit(dev), sc, isa_get_flags(dev));
+	error = vga_probe_unit(device_get_unit(dev), &adp, isa_get_flags(dev));
+	if (error == 0) {
+		bus = device_get_parent(dev);
+		ISA_SET_RESOURCE(bus, dev, SYS_RES_IOPORT, 0,
+				 adp.va_io_base, adp.va_io_size);
+		ISA_SET_RESOURCE(bus, dev, SYS_RES_MEMORY, 0,
+				 adp.va_mem_base, adp.va_mem_size);
+#if 0
+		isa_set_port(dev, adp.va_io_base);
+		isa_set_portsize(dev, adp.va_io_size);
+		isa_set_maddr(dev, adp.va_mem_base);
+		isa_set_msize(dev, adp.va_mem_size);
+#endif
+	}
+	return error;
 }
 
 static int
 isavga_attach(device_t dev)
 {
-	isavga_softc_t *sc;
+	vga_softc_t *sc;
+	struct resource *port;
+	struct resource *mem;
+	int unit;
+	int rid;
+	int error;
 
+	unit = device_get_unit(dev);
 	sc = device_get_softc(dev);
-	return isavga_attach_unit(device_get_unit(dev), sc, isa_get_flags(dev));
-}
-
-static int
-isavga_probe_unit(int unit, isavga_softc_t *sc, int flags)
-{
-	video_switch_t *sw;
-
-	bzero(sc, sizeof(*sc));
-	sw = vid_get_switch(DRIVER_NAME);
-	if (sw == NULL)
-		return 0;
-	return (*sw->probe)(unit, &sc->adp, NULL, flags);
-}
-
-static int
-isavga_attach_unit(int unit, isavga_softc_t *sc, int flags)
-{
-	video_switch_t *sw;
-	int error;
 
-	sw = vid_get_switch(DRIVER_NAME);
-	if (sw == NULL)
-		return ENXIO;
+	rid = 0;
+	port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
+				  0, ~0, 0, RF_ACTIVE | RF_SHAREABLE);
+	rid = 0;
+	mem = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
+				 0, ~0, 0, RF_ACTIVE | RF_SHAREABLE);
 
-	error = (*sw->init)(unit, sc->adp, flags);
+	error = vga_attach_unit(unit, sc, isa_get_flags(dev));
 	if (error)
-		return ENXIO;
+		return error;
 
 #ifdef FB_INSTALL_CDEV
 	/* attach a virtual frame buffer device */
-	error = fb_attach(makedev(0, ISAVGA_MKMINOR(unit)), scp->adp,
-			  &vga_cdevsw);
+	error = fb_attach(makedev(0, VGA_MKMINOR(unit)), sc->adp, &isavga_cdevsw);
 	if (error)
 		return error;
 #endif /* FB_INSTALL_CDEV */
@@ -184,2010 +177,52 @@ isavga_attach_unit(int unit, isavga_softc_t *sc, int flags)
 	if (bootverbose)
 		(*vidsw[sc->adp->va_index]->diag)(sc->adp, bootverbose);
 
-	return 0;
-}
-
-/* LOW-LEVEL */
-
-#include <machine/clock.h>
-#include <machine/pc/vesa.h>
-
-#define probe_done(adp)		((adp)->va_flags & V_ADP_PROBED)
-#define init_done(adp)		((adp)->va_flags & V_ADP_INITIALIZED)
-#define config_done(adp)	((adp)->va_flags & V_ADP_REGISTERED)
-
-/* for compatibility with old kernel options */
-#ifdef SC_ALT_SEQACCESS
-#undef SC_ALT_SEQACCESS
-#undef VGA_ALT_SEQACCESS
-#define VGA_ALT_SEQACCESS	1
-#endif
-
-#ifdef SLOW_VGA
-#undef SLOW_VGA
-#undef VGA_SLOW_IOACCESS
-#define VGA_SLOW_IOACCESS	1
-#endif
-
-/* architecture dependent option */
-#ifdef __alpha__
-#define VGA_NO_BIOS		1
-#endif
-
-/* this should really be in `rtc.h' */
-#define RTC_EQUIPMENT           0x14
-
-/* various sizes */
-#define V_MODE_MAP_SIZE		(M_VGA_CG320 + 1)
-#define V_MODE_PARAM_SIZE	64
-
-/* video adapter state buffer */
-struct adp_state {
-    int			sig;
-#define V_STATE_SIG	0x736f6962
-    u_char		regs[V_MODE_PARAM_SIZE];
-};
-typedef struct adp_state adp_state_t;
-
-/* video adapter information */
-#define DCC_MONO	0
-#define DCC_CGA40	1
-#define DCC_CGA80	2
-#define DCC_EGAMONO	3
-#define DCC_EGA40	4
-#define DCC_EGA80	5
-
-/* 
- * NOTE: `va_window' should have a virtual address, but is initialized
- * with a physical address in the following table, as verify_adapter()
- * will perform address conversion at run-time.
- */
-static video_adapter_t adapter_init_value[] = {
-    /* DCC_MONO */
-    { 0, KD_MONO, "mda", 0, 0, 0, 	    IO_MDA, IO_MDASIZE, MONO_CRTC,
-      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 
-      0, 0, 0, 7, 0, },
-    /* DCC_CGA40 */
-    { 0, KD_CGA,  "cga", 0, 0, V_ADP_COLOR, IO_CGA, IO_CGASIZE, COLOR_CRTC,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 
-      0, 0, 0, 3, 0, },
-    /* DCC_CGA80 */
-    { 0, KD_CGA,  "cga", 0, 0, V_ADP_COLOR, IO_CGA, IO_CGASIZE, COLOR_CRTC,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 
-      0, 0, 0, 3, 0, },
-    /* DCC_EGAMONO */
-    { 0, KD_EGA,  "ega", 0, 0, 0,	    IO_MDA, 48,	  MONO_CRTC,
-      EGA_BUF_BASE, EGA_BUF_SIZE, MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 
-      0, 0, 0, 7, 0, },
-    /* DCC_EGA40 */
-    { 0, KD_EGA,  "ega", 0, 0, V_ADP_COLOR, IO_MDA, 48,	  COLOR_CRTC,
-      EGA_BUF_BASE, EGA_BUF_SIZE, CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 
-      0, 0, 0, 3, 0, },
-    /* DCC_EGA80 */
-    { 0, KD_EGA,  "ega", 0, 0, V_ADP_COLOR, IO_MDA, 48,	  COLOR_CRTC,
-      EGA_BUF_BASE, EGA_BUF_SIZE, CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 
-      0, 0, 0, 3, 0, },
-};
-
-static video_adapter_t	biosadapter[2];
-static int		biosadapters = 0;
-
-/* video driver declarations */
-static int			vga_configure(int flags);
-       int			(*vga_sub_configure)(int flags);
-static int			vga_nop(void);
-static vi_probe_t		vga_probe;
-static vi_init_t		vga_init;
-static vi_get_info_t		vga_get_info;
-static vi_query_mode_t		vga_query_mode;
-static vi_set_mode_t		vga_set_mode;
-static vi_save_font_t		vga_save_font;
-static vi_load_font_t		vga_load_font;
-static vi_show_font_t		vga_show_font;
-static vi_save_palette_t	vga_save_palette;
-static vi_load_palette_t	vga_load_palette;
-static vi_set_border_t		vga_set_border;
-static vi_save_state_t		vga_save_state;
-static vi_load_state_t		vga_load_state;
-static vi_set_win_org_t		vga_set_origin;
-static vi_read_hw_cursor_t	vga_read_hw_cursor;
-static vi_set_hw_cursor_t	vga_set_hw_cursor;
-static vi_set_hw_cursor_shape_t	vga_set_hw_cursor_shape;
-static vi_mmap_t		vga_mmap;
-static vi_diag_t		vga_diag;
-
-static video_switch_t vgavidsw = {
-	vga_probe,
-	vga_init,
-	vga_get_info,
-	vga_query_mode,	
-	vga_set_mode,
-	vga_save_font,
-	vga_load_font,
-	vga_show_font,
-	vga_save_palette,
-	vga_load_palette,
-	vga_set_border,
-	vga_save_state,
-	vga_load_state,
-	vga_set_origin,
-	vga_read_hw_cursor,
-	vga_set_hw_cursor,
-	vga_set_hw_cursor_shape,
-	(vi_blank_display_t *)vga_nop,
-	vga_mmap,
-	vga_diag,
-};
-
-VIDEO_DRIVER(mda, vgavidsw, NULL);
-VIDEO_DRIVER(cga, vgavidsw, NULL);
-VIDEO_DRIVER(ega, vgavidsw, NULL);
-VIDEO_DRIVER(vga, vgavidsw, vga_configure);
-
-/* VGA BIOS standard video modes */
-#define EOT		(-1)
-#define NA		(-2)
-
-static video_info_t bios_vmode[] = {
-    /* CGA */
-    { M_B40x25,     V_INFO_COLOR, 40, 25, 8,  8, 2, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    { M_C40x25,     V_INFO_COLOR, 40, 25, 8,  8, 4, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    { M_B80x25,     V_INFO_COLOR, 80, 25, 8,  8, 2, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    { M_C80x25,     V_INFO_COLOR, 80, 25, 8,  8, 4, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    /* EGA */
-    { M_ENH_B40x25, V_INFO_COLOR, 40, 25, 8, 14, 2, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    { M_ENH_C40x25, V_INFO_COLOR, 40, 25, 8, 14, 4, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    { M_ENH_B80x25, V_INFO_COLOR, 80, 25, 8, 14, 2, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    { M_ENH_C80x25, V_INFO_COLOR, 80, 25, 8, 14, 4, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    /* VGA */
-    { M_VGA_C40x25, V_INFO_COLOR, 40, 25, 8, 16, 4, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    { M_VGA_M80x25, 0,            80, 25, 8, 16, 2, 1,
-      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0 },
-    { M_VGA_C80x25, V_INFO_COLOR, 80, 25, 8, 16, 4, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    /* MDA */
-    { M_EGAMONO80x25, 0,          80, 25, 8, 14, 2, 1,
-      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0 },
-    /* EGA */
-    { M_ENH_B80x43, V_INFO_COLOR, 80, 43, 8,  8, 2, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    { M_ENH_C80x43, V_INFO_COLOR, 80, 43, 8,  8, 4, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    /* VGA */
-    { M_VGA_M80x30, 0,            80, 30, 8, 16, 2, 1,
-      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0 },
-    { M_VGA_C80x30, V_INFO_COLOR, 80, 30, 8, 16, 4, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    { M_VGA_M80x50, 0,            80, 50, 8,  8, 2, 1,
-      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0 },
-    { M_VGA_C80x50, V_INFO_COLOR, 80, 50, 8,  8, 4, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    { M_VGA_M80x60, 0,            80, 60, 8,  8, 2, 1,
-      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0 },
-    { M_VGA_C80x60, V_INFO_COLOR, 80, 60, 8,  8, 4, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-#ifndef VGA_NO_MODE_CHANGE
-    /* CGA */
-    { M_BG320,      V_INFO_COLOR | V_INFO_GRAPHICS, 320, 200, 8,  8, 2, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    { M_CG320,      V_INFO_COLOR | V_INFO_GRAPHICS, 320, 200, 8,  8, 2, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    { M_BG640,      V_INFO_COLOR | V_INFO_GRAPHICS, 640, 200, 8,  8, 1, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0 },
-    /* EGA */
-    { M_CG320_D,    V_INFO_COLOR | V_INFO_GRAPHICS, 320, 200, 8,  8, 4, 4,
-      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 },
-    { M_CG640_E,    V_INFO_COLOR | V_INFO_GRAPHICS, 640, 200, 8,  8, 4, 4,
-      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 },
-    { M_EGAMONOAPA, V_INFO_GRAPHICS,                640, 350, 8, 14, 4, 4,
-      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, 64*1024, 0, 0 },
-    { M_ENHMONOAPA2,V_INFO_GRAPHICS,                640, 350, 8, 14, 4, 4,
-      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 },
-    { M_CG640x350,  V_INFO_COLOR | V_INFO_GRAPHICS, 640, 350, 8, 14, 2, 2,
-      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 },
-    { M_ENH_CG640,  V_INFO_COLOR | V_INFO_GRAPHICS, 640, 350, 8, 14, 4, 4,
-      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 },
-    /* VGA */
-    { M_BG640x480,  V_INFO_COLOR | V_INFO_GRAPHICS, 640, 480, 8, 16, 4, 4,
-      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 },
-    { M_CG640x480,  V_INFO_COLOR | V_INFO_GRAPHICS, 640, 480, 8, 16, 4, 4,
-      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 },
-    { M_VGA_CG320,  V_INFO_COLOR | V_INFO_GRAPHICS, 320, 200, 8,  8, 8, 1,
-      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 },
-    { M_VGA_MODEX,  V_INFO_COLOR | V_INFO_GRAPHICS, 320, 240, 8,  8, 8, 1,
-      GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 },
-#endif /* VGA_NO_MODE_CHANGE */
-
-    { EOT },
-};
-
-static int		init_done = FALSE;
-#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
-static u_char		*video_mode_ptr = NULL;		/* EGA/VGA */
-static u_char		*video_mode_ptr2 = NULL;	/* CGA/MDA */
-#endif
-static u_char		*mode_map[V_MODE_MAP_SIZE];
-static adp_state_t	adpstate;
-static adp_state_t	adpstate2;
-static int		rows_offset = 1;
-
-/* local macros and functions */
-#define BIOS_SADDRTOLADDR(p) ((((p) & 0xffff0000) >> 12) + ((p) & 0x0000ffff))
-
-#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
-static void map_mode_table(u_char *map[], u_char *table, int max);
-#endif
-static void clear_mode_map(video_adapter_t *adp, u_char *map[], int max,
-			   int color);
-#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
-static int map_mode_num(int mode);
-#endif
-static int map_gen_mode_num(int type, int color, int mode);
-static int map_bios_mode_num(int type, int color, int bios_mode);
-static u_char *get_mode_param(int mode);
-#ifndef VGA_NO_BIOS
-static void fill_adapter_param(int code, video_adapter_t *adp);
-#endif
-static int verify_adapter(video_adapter_t *adp);
-static void update_adapter_info(video_adapter_t *adp, video_info_t *info);
-#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
-#define COMP_IDENTICAL	0
-#define COMP_SIMILAR	1
-#define COMP_DIFFERENT	2
-static int comp_adpregs(u_char *buf1, u_char *buf2);
-#endif
-static int probe_adapters(void);
-
-#ifndef VGA_NO_FONT_LOADING
-#define PARAM_BUFSIZE	6
-static void set_font_mode(video_adapter_t *adp, u_char *buf);
-static void set_normal_mode(video_adapter_t *adp, u_char *buf);
+#if experimental
+	device_add_child(dev, "fb", -1, NULL);
+	bus_generic_attach(dev);
 #endif
 
-static void dump_buffer(u_char *buf, size_t len);
-
-#define	ISMAPPED(pa, width)				\
-	(((pa) <= (u_long)0x1000 - (width)) 		\
-	 || ((pa) >= ISA_HOLE_START && (pa) <= 0x100000 - (width)))
-
-#define	prologue(adp, flag, err)			\
-	if (!init_done || !((adp)->va_flags & (flag)))	\
-	    return (err)
-
-/* a backdoor for the console driver */
-static int
-vga_configure(int flags)
-{
-    int i;
-
-    probe_adapters();
-    for (i = 0; i < biosadapters; ++i) {
-	if (!probe_done(&biosadapter[i]))
-	    continue;
-	biosadapter[i].va_flags |= V_ADP_INITIALIZED;
-	if (!config_done(&biosadapter[i])) {
-	    if (vid_register(&biosadapter[i]) < 0)
-		continue;
-	    biosadapter[i].va_flags |= V_ADP_REGISTERED;
-	}
-    }
-    if (vga_sub_configure != NULL)
-	(*vga_sub_configure)(flags);
-
-    return biosadapters;
-}
-
-/* local subroutines */
-
-#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
-/* construct the mode parameter map */
-static void
-map_mode_table(u_char *map[], u_char *table, int max)
-{
-    int i;
-
-    for(i = 0; i < max; ++i)
-	map[i] = table + i*V_MODE_PARAM_SIZE;
-    for(; i < V_MODE_MAP_SIZE; ++i)
-	map[i] = NULL;
-}
-#endif /* !VGA_NO_BIOS && !VGA_NO_MODE_CHANGE */
-
-static void
-clear_mode_map(video_adapter_t *adp, u_char *map[], int max, int color)
-{
-    video_info_t info;
-    int i;
-
-    /*
-     * NOTE: we don't touch `bios_vmode[]' because it is shared
-     * by all adapters.
-     */
-    for(i = 0; i < max; ++i) {
-	if (vga_get_info(adp, i, &info))
-	    continue;
-	if ((info.vi_flags & V_INFO_COLOR) != color)
-	    map[i] = NULL;
-    }
-}
-
-#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
-/* map the non-standard video mode to a known mode number */
-static int
-map_mode_num(int mode)
-{
-    static struct {
-        int from;
-        int to;
-    } mode_map[] = {
-        { M_ENH_B80x43, M_ENH_B80x25 },
-        { M_ENH_C80x43, M_ENH_C80x25 },
-        { M_VGA_M80x30, M_VGA_M80x25 },
-        { M_VGA_C80x30, M_VGA_C80x25 },
-        { M_VGA_M80x50, M_VGA_M80x25 },
-        { M_VGA_C80x50, M_VGA_C80x25 },
-        { M_VGA_M80x60, M_VGA_M80x25 },
-        { M_VGA_C80x60, M_VGA_C80x25 },
-        { M_VGA_MODEX,  M_VGA_CG320 },
-    };
-    int i;
-
-    for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) {
-        if (mode_map[i].from == mode)
-            return mode_map[i].to;
-    }
-    return mode;
-}
-#endif /* !VGA_NO_BIOS && !VGA_NO_MODE_CHANGE */
-
-/* map a generic video mode to a known mode number */
-static int
-map_gen_mode_num(int type, int color, int mode)
-{
-    static struct {
-	int from;
-	int to_color;
-	int to_mono;
-    } mode_map[] = {
-	{ M_TEXT_80x30,	M_VGA_C80x30, M_VGA_M80x30, },
-	{ M_TEXT_80x43,	M_ENH_C80x43, M_ENH_B80x43, },
-	{ M_TEXT_80x50,	M_VGA_C80x50, M_VGA_M80x50, },
-	{ M_TEXT_80x60,	M_VGA_C80x60, M_VGA_M80x60, },
-    };
-    int i;
-
-    if (mode == M_TEXT_80x25) {
-	switch (type) {
-
-	case KD_VGA:
-	    if (color)
-		return M_VGA_C80x25;
-	    else
-		return M_VGA_M80x25;
-	    break;
-
-	case KD_EGA:
-	    if (color)
-		return M_ENH_C80x25;
-	    else
-		return M_EGAMONO80x25;
-	    break;
-
-	case KD_CGA:
-	    return M_C80x25;
-
-	case KD_MONO:
-	case KD_HERCULES:
-	    return M_EGAMONO80x25;	/* XXX: this name is confusing */
-
- 	default:
-	    return -1;
-	}
-    }
-
-    for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) {
-        if (mode_map[i].from == mode)
-            return ((color) ? mode_map[i].to_color : mode_map[i].to_mono);
-    }
-    return mode;
-}
-
-/* turn the BIOS video number into our video mode number */
-static int
-map_bios_mode_num(int type, int color, int bios_mode)
-{
-    static int cga_modes[7] = {
-	M_B40x25, M_C40x25,		/* 0, 1 */
-	M_B80x25, M_C80x25,		/* 2, 3 */
-	M_BG320, M_CG320,
-	M_BG640,
-    };
-    static int ega_modes[17] = {
-	M_ENH_B40x25, M_ENH_C40x25,	/* 0, 1 */
-	M_ENH_B80x25, M_ENH_C80x25,	/* 2, 3 */
-	M_BG320, M_CG320,
-	M_BG640,
-	M_EGAMONO80x25,			/* 7 */
-	8, 9, 10, 11, 12,
-	M_CG320_D,
-	M_CG640_E,
-	M_ENHMONOAPA2,			/* XXX: video momery > 64K */
-	M_ENH_CG640,			/* XXX: video momery > 64K */
-    };
-    static int vga_modes[20] = {
-	M_VGA_C40x25, M_VGA_C40x25,	/* 0, 1 */
-	M_VGA_C80x25, M_VGA_C80x25,	/* 2, 3 */
-	M_BG320, M_CG320,
-	M_BG640,
-	M_VGA_M80x25,			/* 7 */
-	8, 9, 10, 11, 12,
-	M_CG320_D,
-	M_CG640_E,
-	M_ENHMONOAPA2,
-	M_ENH_CG640,
-	M_BG640x480, M_CG640x480, 
-	M_VGA_CG320,
-    };
-
-    switch (type) {
-
-    case KD_VGA:
-	if (bios_mode < sizeof(vga_modes)/sizeof(vga_modes[0]))
-	    return vga_modes[bios_mode];
-	else if (color)
-	    return M_VGA_C80x25;
-	else
-	    return M_VGA_M80x25;
-	break;
-
-    case KD_EGA:
-	if (bios_mode < sizeof(ega_modes)/sizeof(ega_modes[0]))
-	    return ega_modes[bios_mode];
-	else if (color)
-	    return M_ENH_C80x25;
-	else
-	    return M_EGAMONO80x25;
-	break;
-
-    case KD_CGA:
-	if (bios_mode < sizeof(cga_modes)/sizeof(cga_modes[0]))
-	    return cga_modes[bios_mode];
-	else
-	    return M_C80x25;
-	break;
-
-    case KD_MONO:
-    case KD_HERCULES:
-	return M_EGAMONO80x25;		/* XXX: this name is confusing */
-
-    default:
-	break;
-    }
-    return -1;
-}
-
-/* look up a parameter table entry */
-static u_char 
-*get_mode_param(int mode)
-{
-#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
-    if (mode >= V_MODE_MAP_SIZE)
-	mode = map_mode_num(mode);
-#endif
-    if ((mode >= 0) && (mode < V_MODE_MAP_SIZE))
-	return mode_map[mode];
-    else
-	return NULL;
-}
-
-#ifndef VGA_NO_BIOS
-static void
-fill_adapter_param(int code, video_adapter_t *adp)
-{
-    static struct {
-	int primary;
-	int secondary;
-    } dcc[] = {
-	{ DCC_MONO, 			DCC_EGA40 /* CGA monitor */ },
-	{ DCC_MONO, 			DCC_EGA80 /* CGA monitor */ },
-	{ DCC_MONO, 			DCC_EGA80 /* CGA emulation */ },	
-	{ DCC_MONO, 			DCC_EGA80 },
-	{ DCC_CGA40, 			DCC_EGAMONO },
-	{ DCC_CGA80, 			DCC_EGAMONO },
-	{ DCC_EGA40 /* CGA monitor */, 	DCC_MONO},
-	{ DCC_EGA80 /* CGA monitor */, 	DCC_MONO},
-	{ DCC_EGA80 /* CGA emulation */,DCC_MONO },	
-	{ DCC_EGA80, 			DCC_MONO },
-	{ DCC_EGAMONO, 			DCC_CGA40 },
-	{ DCC_EGAMONO, 			DCC_CGA40 },
-    };
-
-    if ((code < 0) || (code >= sizeof(dcc)/sizeof(dcc[0]))) {
-	adp[V_ADP_PRIMARY] = adapter_init_value[DCC_MONO];
-	adp[V_ADP_SECONDARY] = adapter_init_value[DCC_CGA80];
-    } else {
-	adp[V_ADP_PRIMARY] = adapter_init_value[dcc[code].primary];
-	adp[V_ADP_SECONDARY] = adapter_init_value[dcc[code].secondary];
-    }
-}
-#endif /* VGA_NO_BIOS */
-
-static int
-verify_adapter(video_adapter_t *adp)
-{
-    vm_offset_t buf;
-    u_int16_t v;
-#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
-    u_int32_t p;
-#endif
-
-    buf = BIOS_PADDRTOVADDR(adp->va_window);
-    v = readw(buf);
-    writew(buf, 0xA55A);
-    if (readw(buf) != 0xA55A)
-	return 1;
-    writew(buf, v);
-
-    switch (adp->va_type) {
-
-    case KD_EGA:
-	outb(adp->va_crtc_addr, 7);
-	if (inb(adp->va_crtc_addr) == 7) {
-	    adp->va_type = KD_VGA;
-	    adp->va_name = "vga";
-	    adp->va_flags |= V_ADP_STATESAVE | V_ADP_PALETTE;
-	}
-	adp->va_flags |= V_ADP_STATELOAD | V_ADP_BORDER;
-	/* the color adapter may be in the 40x25 mode... XXX */
-
-#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
-	/* get the BIOS video mode pointer */
-	p = *(u_int32_t *)BIOS_PADDRTOVADDR(0x4a8);
-	p = BIOS_SADDRTOLADDR(p);
-	if (ISMAPPED(p, sizeof(u_int32_t))) {
-	    p = *(u_int32_t *)BIOS_PADDRTOVADDR(p);
-	    p = BIOS_SADDRTOLADDR(p);
-	    if (ISMAPPED(p, V_MODE_PARAM_SIZE))
-		video_mode_ptr = (u_char *)BIOS_PADDRTOVADDR(p);
-	}
-#endif
-	break;
-
-    case KD_CGA:
-	adp->va_flags |= V_ADP_COLOR | V_ADP_BORDER;
-	/* may be in the 40x25 mode... XXX */
-#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
-	/* get the BIOS video mode pointer */
-	p = *(u_int32_t *)BIOS_PADDRTOVADDR(0x1d*4);
-	p = BIOS_SADDRTOLADDR(p);
-	video_mode_ptr2 = (u_char *)BIOS_PADDRTOVADDR(p);
-#endif
-	break;
-
-    case KD_MONO:
-#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
-	/* get the BIOS video mode pointer */
-	p = *(u_int32_t *)BIOS_PADDRTOVADDR(0x1d*4);
-	p = BIOS_SADDRTOLADDR(p);
-	video_mode_ptr2 = (u_char *)BIOS_PADDRTOVADDR(p);
-#endif
-	break;
-    }
-
-    return 0;
-}
-
-static void
-update_adapter_info(video_adapter_t *adp, video_info_t *info)
-{
-    adp->va_flags &= ~V_ADP_COLOR;
-    adp->va_flags |= 
-	(info->vi_flags & V_INFO_COLOR) ? V_ADP_COLOR : 0;
-    adp->va_crtc_addr =
-	(adp->va_flags & V_ADP_COLOR) ? COLOR_CRTC : MONO_CRTC;
-    adp->va_window = BIOS_PADDRTOVADDR(info->vi_window);
-    adp->va_window_size = info->vi_window_size;
-    adp->va_window_gran = info->vi_window_gran;
-    if (info->vi_buffer_size == 0) {
-    	adp->va_buffer = 0;
-    	adp->va_buffer_size = 0;
-    } else {
-    	adp->va_buffer = BIOS_PADDRTOVADDR(info->vi_buffer);
-    	adp->va_buffer_size = info->vi_buffer_size;
-    }
-    if (info->vi_flags & V_INFO_GRAPHICS) {
-	switch (info->vi_depth/info->vi_planes) {
-	case 1:
-	    adp->va_line_width = info->vi_width/8;
-	    break;
-	case 2:
-	    adp->va_line_width = info->vi_width/4;
-	    break;
-	case 4:
-	    adp->va_line_width = info->vi_width/2;
-	    break;
-	case 8:
-	default: /* shouldn't happen */
-	    adp->va_line_width = info->vi_width;
-	    break;
-	}
-    } else {
-	adp->va_line_width = info->vi_width;
-    }
-    bcopy(info, &adp->va_info, sizeof(adp->va_info));
-}
-
-#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
-/* compare two parameter table entries */
-static int 
-comp_adpregs(u_char *buf1, u_char *buf2)
-{
-    static struct {
-        u_char mask;
-    } params[V_MODE_PARAM_SIZE] = {
-	{0xff}, {0x00}, {0xff}, 		/* COLS, ROWS, POINTS */
-	{0x00}, {0x00}, 			/* page length */
-	{0xfe}, {0xff}, {0xff}, {0xff},		/* sequencer registers */
-	{0xf3},					/* misc register */
-	{0xff}, {0xff}, {0xff}, {0x7f}, {0xff},	/* CRTC */
-	{0xff}, {0xff}, {0xff}, {0x7f}, {0xff},
-	{0x00}, {0x00}, {0x00}, {0x00}, {0x00},
-	{0x00}, {0xff}, {0x7f}, {0xff}, {0xff},
-	{0x7f}, {0xff}, {0xff}, {0xef}, {0xff},
-	{0xff}, {0xff}, {0xff}, {0xff}, {0xff},	/* attribute controller regs */
-	{0xff}, {0xff}, {0xff}, {0xff}, {0xff},
-	{0xff}, {0xff}, {0xff}, {0xff}, {0xff},
-	{0xff}, {0xff}, {0xff}, {0xff}, {0xf0},
-	{0xff}, {0xff}, {0xff}, {0xff}, {0xff},	/* GDC register */
-	{0xff}, {0xff}, {0xff}, {0xff}, 
-    }; 
-    int identical = TRUE;
-    int i;
-
-    if ((buf1 == NULL) || (buf2 == NULL))
-	return COMP_DIFFERENT;
-
-    for (i = 0; i < sizeof(params)/sizeof(params[0]); ++i) {
-	if (params[i].mask == 0)	/* don't care */
-	    continue;
-	if ((buf1[i] & params[i].mask) != (buf2[i] & params[i].mask))
-	    return COMP_DIFFERENT;
-	if (buf1[i] != buf2[i])
-	    identical = FALSE;
-    }
-    return (identical) ? COMP_IDENTICAL : COMP_SIMILAR;
-}
-#endif /* !VGA_NO_BIOS && !VGA_NO_MODE_CHANGE */
-
-/* probe video adapters and return the number of detected adapters */
-static int
-probe_adapters(void)
-{
-    video_adapter_t *adp;
-    video_info_t info;
-    int i;
-
-    /* do this test only once */
-    if (init_done)
-	return biosadapters;
-    init_done = TRUE;
-
-    /* 
-     * Locate display adapters. 
-     * The AT architecture supports upto two adapters. `syscons' allows
-     * the following combinations of adapters: 
-     *     1) MDA + CGA
-     *     2) MDA + EGA/VGA color 
-     *     3) CGA + EGA/VGA mono
-     * Note that `syscons' doesn't bother with MCGA as it is only
-     * avaiable for low end PS/2 models which has 80286 or earlier CPUs,
-     * thus, they are not running FreeBSD!
-     * When there are two adapaters in the system, one becomes `primary'
-     * and the other `secondary'. The EGA adapter has a set of DIP 
-     * switches on board for this information and the EGA BIOS copies 
-     * it in the BIOS data area BIOSDATA_VIDEOSWITCH (40:88). 
-     * The VGA BIOS has more sophisticated mechanism and has this 
-     * information in BIOSDATA_DCCINDEX (40:8a), but it also maintains 
-     * compatibility with the EGA BIOS by updating BIOSDATA_VIDEOSWITCH.
-     */
-
-    /* 
-     * Check rtc and BIOS data area.
-     * XXX: we don't use BIOSDATA_EQUIPMENT, since it is not a dead
-     * copy of RTC_EQUIPMENT.  Bits 4 and 5 of ETC_EQUIPMENT are
-     * zeros for EGA and VGA.  However, the EGA/VGA BIOS sets
-     * these bits in BIOSDATA_EQUIPMENT according to the monitor
-     * type detected.
-     */
-#ifndef VGA_NO_BIOS
-    switch ((rtcin(RTC_EQUIPMENT) >> 4) & 3) {	/* bit 4 and 5 */
-    case 0:
-	/* EGA/VGA */
-	fill_adapter_param(readb(BIOS_PADDRTOVADDR(0x488)) & 0x0f, 
-			   biosadapter);
-	break;
-    case 1:
-	/* CGA 40x25 */
-	/* FIXME: switch to the 80x25 mode? XXX */
-	biosadapter[V_ADP_PRIMARY] = adapter_init_value[DCC_CGA40];
-	biosadapter[V_ADP_SECONDARY] = adapter_init_value[DCC_MONO];
-	break;
-    case 2:
-	/* CGA 80x25 */
-	biosadapter[V_ADP_PRIMARY] = adapter_init_value[DCC_CGA80];
-	biosadapter[V_ADP_SECONDARY] = adapter_init_value[DCC_MONO];
-	break;
-    case 3:
-	/* MDA */
-	biosadapter[V_ADP_PRIMARY] = adapter_init_value[DCC_MONO];
-	biosadapter[V_ADP_SECONDARY] = adapter_init_value[DCC_CGA80];
-	break;
-    }
-#else
-    /* assume EGA/VGA? XXX */
-    biosadapter[V_ADP_PRIMARY] = adapter_init_value[DCC_EGA80];
-    biosadapter[V_ADP_SECONDARY] = adapter_init_value[DCC_MONO];
-#endif /* VGA_NO_BIOS */
-
-    biosadapters = 0;
-    if (verify_adapter(&biosadapter[V_ADP_SECONDARY]) == 0) {
-	++biosadapters;
-	biosadapter[V_ADP_SECONDARY].va_flags |= V_ADP_PROBED;
-	biosadapter[V_ADP_SECONDARY].va_mode = 
-	    biosadapter[V_ADP_SECONDARY].va_initial_mode =
-	    map_bios_mode_num(biosadapter[V_ADP_SECONDARY].va_type, 
-			      biosadapter[V_ADP_SECONDARY].va_flags
-				  & V_ADP_COLOR,
-			      biosadapter[V_ADP_SECONDARY].va_initial_bios_mode);
-    } else {
-	biosadapter[V_ADP_SECONDARY].va_type = -1;
-    }
-    if (verify_adapter(&biosadapter[V_ADP_PRIMARY]) == 0) {
-	++biosadapters;
-	biosadapter[V_ADP_PRIMARY].va_flags |= V_ADP_PROBED;
-#ifndef VGA_NO_BIOS
-	biosadapter[V_ADP_PRIMARY].va_initial_bios_mode = 
-	    readb(BIOS_PADDRTOVADDR(0x449));
-#else
-	biosadapter[V_ADP_PRIMARY].va_initial_bios_mode = 3;	/* XXX */
-#endif
-	biosadapter[V_ADP_PRIMARY].va_mode = 
-	    biosadapter[V_ADP_PRIMARY].va_initial_mode =
-	    map_bios_mode_num(biosadapter[V_ADP_PRIMARY].va_type, 
-			      biosadapter[V_ADP_PRIMARY].va_flags & V_ADP_COLOR,
-			      biosadapter[V_ADP_PRIMARY].va_initial_bios_mode);
-    } else {
-	biosadapter[V_ADP_PRIMARY] = biosadapter[V_ADP_SECONDARY];
-	biosadapter[V_ADP_SECONDARY].va_type = -1;
-    }
-    if (biosadapters == 0)
-	return biosadapters;
-    biosadapter[V_ADP_PRIMARY].va_unit = V_ADP_PRIMARY;
-    biosadapter[V_ADP_SECONDARY].va_unit = V_ADP_SECONDARY;
-
-#if 0 /* we don't need these... */
-    fb_init_struct(&biosadapter[V_ADP_PRIMARY], ...);
-    fb_init_struct(&biosadapter[V_ADP_SECONDARY], ...);
-#endif
-
-#if 0
-    /*
-     * We cannot have two video adapter of the same type; there must be
-     * only one of color or mono adapter, or one each of them.
-     */
-    if (biosadapters > 1) {
-	if (!((biosadapter[0].va_flags ^ biosadapter[1].va_flags)
-	      & V_ADP_COLOR))
-	    /* we have two mono or color adapters!! */
-	    return (biosadapters = 0);
-    }
-#endif
-
-    /*
-     * Ensure a zero start address.  This is mainly to recover after
-     * switching from pcvt using userconfig().  The registers are w/o
-     * for old hardware so it's too hard to relocate the active screen
-     * memory.
-     * This must be done before vga_save_state() for VGA.
-     */
-    outb(biosadapter[V_ADP_PRIMARY].va_crtc_addr, 12);
-    outb(biosadapter[V_ADP_PRIMARY].va_crtc_addr + 1, 0);
-    outb(biosadapter[V_ADP_PRIMARY].va_crtc_addr, 13);
-    outb(biosadapter[V_ADP_PRIMARY].va_crtc_addr + 1, 0);
-
-    /* the video mode parameter table in EGA/VGA BIOS */
-    /* NOTE: there can be only one EGA/VGA, wheather color or mono,
-     * recognized by the video BIOS.
-     */
-    if ((biosadapter[V_ADP_PRIMARY].va_type == KD_EGA) ||
-	(biosadapter[V_ADP_PRIMARY].va_type == KD_VGA)) {
-	adp = &biosadapter[V_ADP_PRIMARY];
-    } else if ((biosadapter[V_ADP_SECONDARY].va_type == KD_EGA) ||
-	       (biosadapter[V_ADP_SECONDARY].va_type == KD_VGA)) {
-	adp = &biosadapter[V_ADP_SECONDARY];
-    } else {
-	adp = NULL;
-    }
-    bzero(mode_map, sizeof(mode_map));
-    if (adp != NULL) {
-	if (adp->va_type == KD_VGA) {
-	    vga_save_state(adp, &adpstate, sizeof(adpstate));
-#if defined(VGA_NO_BIOS) || defined(VGA_NO_MODE_CHANGE)
-	    mode_map[adp->va_initial_mode] = adpstate.regs;
-	    rows_offset = 1;
-#else /* VGA_NO_BIOS || VGA_NO_MODE_CHANGE */
-	    if (video_mode_ptr == NULL) {
-		mode_map[adp->va_initial_mode] = adpstate.regs;
-		rows_offset = 1;
-	    } else {
-		/* discard the table if we are not familiar with it... */
-		u_char *mp;
-		map_mode_table(mode_map, video_mode_ptr, M_VGA_CG320 + 1);
-		mp = get_mode_param(adp->va_initial_mode);
-		if (mp != NULL)
-		    bcopy(mp, adpstate2.regs, sizeof(adpstate2.regs));
-		switch (comp_adpregs(adpstate.regs, mp)) {
-		case COMP_IDENTICAL:
-		    /*
-		     * OK, this parameter table looks reasonably familiar
-		     * to us...
-		     */
-		    /* 
-		     * This is a kludge for Toshiba DynaBook SS433 
-		     * whose BIOS video mode table entry has the actual # 
-		     * of rows at the offset 1; BIOSes from other 
-		     * manufacturers store the # of rows - 1 there. XXX
-		     */
-		    rows_offset = adpstate.regs[1] + 1 - mp[1];
-		    break;
-
-		case COMP_SIMILAR:
-		    /*
-		     * Not exactly the same, but similar enough to be
-		     * trusted. However, use the saved register values
-		     * for the initial mode and other modes which are
-		     * based on the initial mode.
-		     */
-		    mode_map[adp->va_initial_mode] = adpstate.regs;
-		    rows_offset = adpstate.regs[1] + 1 - mp[1];
-		    adpstate.regs[1] -= rows_offset - 1;
-		    break;
-
-		case COMP_DIFFERENT:
-		default:
-		    /*
-		     * Don't use the paramter table in BIOS. It doesn't
-		     * look familiar to us. Video mode switching is allowed
-		     * only if the new mode is the same as or based on
-		     * the initial mode. 
-		     */
-		    video_mode_ptr = NULL;
-		    bzero(mode_map, sizeof(mode_map));
-		    mode_map[adp->va_initial_mode] = adpstate.regs;
-		    rows_offset = 1;
-		    break;
-		}
-	    }
-#endif /* VGA_NO_BIOS || VGA_NO_MODE_CHANGE */
-
-#ifndef VGA_NO_MODE_CHANGE
-	    adp->va_flags |= V_ADP_MODECHANGE;
-#endif
-#ifndef VGA_NO_FONT_LOADING
-	    adp->va_flags |= V_ADP_FONT;
-#endif
-	} else if (adp->va_type == KD_EGA) {
-#if defined(VGA_NO_BIOS) || defined(VGA_NO_MODE_CHANGE)
-	    rows_offset = 1;
-#else /* VGA_NO_BIOS || VGA_NO_MODE_CHANGE */
-	    if (video_mode_ptr == NULL) {
-		rows_offset = 1;
-	    } else {
-		u_char *mp;
-		map_mode_table(mode_map, video_mode_ptr, M_ENH_C80x25 + 1);
-		/* XXX how can one validate the EGA table... */
-		mp = get_mode_param(adp->va_initial_mode);
-		if (mp != NULL) {
-		    adp->va_flags |= V_ADP_MODECHANGE;
-#ifndef VGA_NO_FONT_LOADING
-		    adp->va_flags |= V_ADP_FONT;
-#endif
-		    rows_offset = 1;
-		} else {
-		    /*
-		     * This is serious. We will not be able to switch video
-		     * modes at all...
-		     */
-		    video_mode_ptr = NULL;
-		    bzero(mode_map, sizeof(mode_map));
-		    rows_offset = 1;
-                }
-	    }
-#endif /* VGA_NO_BIOS || VGA_NO_MODE_CHANGE */
-	}
-    }
-
-    /* remove conflicting modes if we have more than one adapter */
-    if (biosadapters > 1) {
-	for (i = 0; i < biosadapters; ++i) {
-	    if (!(biosadapter[i].va_flags & V_ADP_MODECHANGE))
-		continue;
-	    clear_mode_map(&biosadapter[i], mode_map, M_VGA_CG320 + 1,
-			   (biosadapter[i].va_flags & V_ADP_COLOR) ? 
-			       V_INFO_COLOR : 0);
-	    if ((biosadapter[i].va_type == KD_VGA)
-		|| (biosadapter[i].va_type == KD_EGA)) {
-		biosadapter[i].va_io_base =
-		    (biosadapter[i].va_flags & V_ADP_COLOR) ?
-			IO_VGA : IO_MDA;
-		biosadapter[i].va_io_size = 32;
-	    }
-	}
-    }
-
-    /* buffer address */
-    vga_get_info(&biosadapter[V_ADP_PRIMARY],
-		 biosadapter[V_ADP_PRIMARY].va_initial_mode, &info);
-    update_adapter_info(&biosadapter[V_ADP_PRIMARY], &info);
-
-    if (biosadapters > 1) {
-	vga_get_info(&biosadapter[V_ADP_SECONDARY],
-		     biosadapter[V_ADP_SECONDARY].va_initial_mode, &info);
-	update_adapter_info(&biosadapter[V_ADP_SECONDARY], &info);
-    }
-
-    /*
-     * XXX: we should verify the following values for the primary adapter...
-     * crtc I/O port address: *(u_int16_t *)BIOS_PADDRTOVADDR(0x463);
-     * color/mono display: (*(u_int8_t *)BIOS_PADDRTOVADDR(0x487) & 0x02) 
-     *                     ? 0 : V_ADP_COLOR;
-     * columns: *(u_int8_t *)BIOS_PADDRTOVADDR(0x44a);
-     * rows: *(u_int8_t *)BIOS_PADDRTOVADDR(0x484);
-     * font size: *(u_int8_t *)BIOS_PADDRTOVADDR(0x485);
-     * buffer size: *(u_int16_t *)BIOS_PADDRTOVADDR(0x44c);
-     */
-
-    return biosadapters;
-}
-
-/* entry points */
-
-static int
-vga_nop(void)
-{
-    return 0;
-}
-
-static int
-vga_probe(int unit, video_adapter_t **adpp, void *arg, int flags)
-{
-    probe_adapters();
-    if (unit >= biosadapters)
-	return ENXIO;
-
-    *adpp = &biosadapter[unit];
-
-    return 0;
-}
-
-static int
-vga_init(int unit, video_adapter_t *adp, int flags)
-{
-    if ((unit >= biosadapters) || (adp == NULL) || !probe_done(adp))
-	return ENXIO;
-
-    if (!init_done(adp)) {
-	/* nothing to do really... */
-	adp->va_flags |= V_ADP_INITIALIZED;
-    }
-
-    if (!config_done(adp)) {
-	if (vid_register(adp) < 0)
-		return ENXIO;
-	adp->va_flags |= V_ADP_REGISTERED;
-    }
-    if (vga_sub_configure != NULL)
-	(*vga_sub_configure)(0);
-
-    return 0;
-}
-
-/*
- * get_info():
- * Return the video_info structure of the requested video mode.
- *
- * all adapters
- */
-static int
-vga_get_info(video_adapter_t *adp, int mode, video_info_t *info)
-{
-    int i;
-
-    if (!init_done)
-	return 1;
-
-    mode = map_gen_mode_num(adp->va_type, adp->va_flags & V_ADP_COLOR, mode);
-#ifndef VGA_NO_MODE_CHANGE
-    if (adp->va_flags & V_ADP_MODECHANGE) {
-	/*
-	 * If the parameter table entry for this mode is not found, 
-	 * the mode is not supported...
-	 */
-	if (get_mode_param(mode) == NULL)
-	    return 1;
-    } else
-#endif /* VGA_NO_MODE_CHANGE */
-    {
-	/* 
-	 * Even if we don't support video mode switching on this adapter,
-	 * the information on the initial (thus current) video mode 
-	 * should be made available.
-	 */
-	if (mode != adp->va_initial_mode)
-	    return 1;
-    }
-
-    for (i = 0; bios_vmode[i].vi_mode != EOT; ++i) {
-	if (bios_vmode[i].vi_mode == NA)
-	    continue;
-	if (mode == bios_vmode[i].vi_mode) {
-	    *info = bios_vmode[i];
-	    return 0;
-	}
-    }
-    return 1;
-}
-
-/*
- * query_mode():
- * Find a video mode matching the requested parameters.
- * Fields filled with 0 are considered "don't care" fields and
- * match any modes.
- *
- * all adapters
- */
-static int
-vga_query_mode(video_adapter_t *adp, video_info_t *info)
-{
-    video_info_t buf;
-    int i;
-
-    if (!init_done)
-	return -1;
-
-    for (i = 0; bios_vmode[i].vi_mode != EOT; ++i) {
-	if (bios_vmode[i].vi_mode == NA)
-	    continue;
-
-	if ((info->vi_width != 0)
-	    && (info->vi_width != bios_vmode[i].vi_width))
-		continue;
-	if ((info->vi_height != 0)
-	    && (info->vi_height != bios_vmode[i].vi_height))
-		continue;
-	if ((info->vi_cwidth != 0)
-	    && (info->vi_cwidth != bios_vmode[i].vi_cwidth))
-		continue;
-	if ((info->vi_cheight != 0)
-	    && (info->vi_cheight != bios_vmode[i].vi_cheight))
-		continue;
-	if ((info->vi_depth != 0)
-	    && (info->vi_depth != bios_vmode[i].vi_depth))
-		continue;
-	if ((info->vi_planes != 0)
-	    && (info->vi_planes != bios_vmode[i].vi_planes))
-		continue;
-	/* XXX: should check pixel format, memory model */
-	if ((info->vi_flags != 0)
-	    && (info->vi_flags != bios_vmode[i].vi_flags))
-		continue;
-
-	/* verify if this mode is supported on this adapter */
-	if (vga_get_info(adp, bios_vmode[i].vi_mode, &buf))
-		continue;
-	return bios_vmode[i].vi_mode;
-    }
-    return -1;
-}
-
-/*
- * set_mode():
- * Change the video mode.
- *
- * EGA/VGA
- */
-static int
-vga_set_mode(video_adapter_t *adp, int mode)
-{
-#ifndef VGA_NO_MODE_CHANGE
-    video_info_t info;
-    adp_state_t params;
-
-    prologue(adp, V_ADP_MODECHANGE, 1);
-
-    mode = map_gen_mode_num(adp->va_type, 
-			    adp->va_flags & V_ADP_COLOR, mode);
-    if (vga_get_info(adp, mode, &info))
-	return 1;
-    params.sig = V_STATE_SIG;
-    bcopy(get_mode_param(mode), params.regs, sizeof(params.regs));
-
-    switch (mode) {
-    case M_VGA_C80x60: case M_VGA_M80x60:
-	params.regs[2]  = 0x08;
-	params.regs[19] = 0x47;
-	goto special_480l;
-
-    case M_VGA_C80x30: case M_VGA_M80x30:
-	params.regs[19] = 0x4f;
-special_480l:
-	params.regs[9] |= 0xc0;
-	params.regs[16] = 0x08;
-	params.regs[17] = 0x3e;
-	params.regs[26] = 0xea;
-	params.regs[28] = 0xdf;
-	params.regs[31] = 0xe7;
-	params.regs[32] = 0x04;
-	goto setup_mode;
-
-    case M_ENH_C80x43: case M_ENH_B80x43:
-	params.regs[28] = 87;
-	goto special_80x50;
-
-    case M_VGA_C80x50: case M_VGA_M80x50:
-special_80x50:
-	params.regs[2] = 8;
-	params.regs[19] = 7;
-	goto setup_mode;
-
-    case M_VGA_C40x25: case M_VGA_C80x25:
-    case M_VGA_M80x25:
-    case M_B40x25:     case M_C40x25:
-    case M_B80x25:     case M_C80x25:
-    case M_ENH_B40x25: case M_ENH_C40x25:
-    case M_ENH_B80x25: case M_ENH_C80x25:
-    case M_EGAMONO80x25:
-
-setup_mode:
-	vga_load_state(adp, &params);
-	break;
-
-    case M_VGA_MODEX:
-	/* "unchain" the VGA mode */
-	params.regs[5-1+0x04] &= 0xf7;
-	params.regs[5-1+0x04] |= 0x04;
-	/* turn off doubleword mode */
-	params.regs[10+0x14] &= 0xbf;
-	/* turn off word adressing */
-	params.regs[10+0x17] |= 0x40;
-	/* set logical screen width */
-	params.regs[10+0x13] = 80;
-	/* set 240 lines */
-	params.regs[10+0x11] = 0x2c;
-	params.regs[10+0x06] = 0x0d;
-	params.regs[10+0x07] = 0x3e;
-	params.regs[10+0x10] = 0xea;
-	params.regs[10+0x11] = 0xac;
-	params.regs[10+0x12] = 0xdf;
-	params.regs[10+0x15] = 0xe7;
-	params.regs[10+0x16] = 0x06;
-	/* set vertical sync polarity to reflect aspect ratio */
-	params.regs[9] = 0xe3;
-	goto setup_grmode;
-
-    case M_BG320:     case M_CG320:     case M_BG640:
-    case M_CG320_D:   case M_CG640_E:
-    case M_CG640x350: case M_ENH_CG640:
-    case M_BG640x480: case M_CG640x480: case M_VGA_CG320:
-
-setup_grmode:
-	vga_load_state(adp, &params);
-	break;
-
-    default:
-	return 1;
-    }
-
-    adp->va_mode = mode;
-    update_adapter_info(adp, &info);
-
-    /* move hardware cursor out of the way */
-    (*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
-
-    return 0;
-#else /* VGA_NO_MODE_CHANGE */
-    return 1;
-#endif /* VGA_NO_MODE_CHANGE */
-}
-
-#ifndef VGA_NO_FONT_LOADING
-
-static void
-set_font_mode(video_adapter_t *adp, u_char *buf)
-{
-    u_char *mp;
-    int s;
-
-    s = splhigh();
-
-    /* save register values */
-    if (adp->va_type == KD_VGA) {
-	outb(TSIDX, 0x02); buf[0] = inb(TSREG);
-	outb(TSIDX, 0x04); buf[1] = inb(TSREG);
-	outb(GDCIDX, 0x04); buf[2] = inb(GDCREG);
-	outb(GDCIDX, 0x05); buf[3] = inb(GDCREG);
-	outb(GDCIDX, 0x06); buf[4] = inb(GDCREG);
-	inb(adp->va_crtc_addr + 6);
-	outb(ATC, 0x10); buf[5] = inb(ATC + 1);
-    } else /* if (adp->va_type == KD_EGA) */ {
-	/* 
-	 * EGA cannot be read; copy parameters from the mode parameter 
-	 * table. 
-	 */
-	mp = get_mode_param(adp->va_mode);
-	buf[0] = mp[5 + 0x02 - 1];
-	buf[1] = mp[5 + 0x04 - 1];
-	buf[2] = mp[55 + 0x04];
-	buf[3] = mp[55 + 0x05];
-	buf[4] = mp[55 + 0x06];
-	buf[5] = mp[35 + 0x10];
-    }
-
-    /* setup vga for loading fonts */
-    inb(adp->va_crtc_addr + 6);			/* reset flip-flop */
-    outb(ATC, 0x10); outb(ATC, buf[5] & ~0x01);
-    inb(adp->va_crtc_addr + 6);			/* reset flip-flop */
-    outb(ATC, 0x20);				/* enable palette */
-
-#if VGA_SLOW_IOACCESS
-#ifdef VGA_ALT_SEQACCESS
-    outb(TSIDX, 0x00); outb(TSREG, 0x01);
-#endif
-    outb(TSIDX, 0x02); outb(TSREG, 0x04);
-    outb(TSIDX, 0x04); outb(TSREG, 0x07);
-#ifdef VGA_ALT_SEQACCESS
-    outb(TSIDX, 0x00); outb(TSREG, 0x03);
-#endif
-    outb(GDCIDX, 0x04); outb(GDCREG, 0x02);
-    outb(GDCIDX, 0x05); outb(GDCREG, 0x00);
-    outb(GDCIDX, 0x06); outb(GDCREG, 0x04);
-#else /* VGA_SLOW_IOACCESS */
-#ifdef VGA_ALT_SEQACCESS
-    outw(TSIDX, 0x0100);
-#endif
-    outw(TSIDX, 0x0402);
-    outw(TSIDX, 0x0704);
-#ifdef VGA_ALT_SEQACCESS
-    outw(TSIDX, 0x0300);
-#endif
-    outw(GDCIDX, 0x0204);
-    outw(GDCIDX, 0x0005);
-    outw(GDCIDX, 0x0406);               /* addr = a0000, 64kb */
-#endif /* VGA_SLOW_IOACCESS */
-
-    splx(s);
-}
-
-static void
-set_normal_mode(video_adapter_t *adp, u_char *buf)
-{
-    int s;
-
-    s = splhigh();
-
-    /* setup vga for normal operation mode again */
-    inb(adp->va_crtc_addr + 6);			/* reset flip-flop */
-    outb(ATC, 0x10); outb(ATC, buf[5]);
-    inb(adp->va_crtc_addr + 6);			/* reset flip-flop */
-    outb(ATC, 0x20);				/* enable palette */
-
-#if VGA_SLOW_IOACCESS
-#ifdef VGA_ALT_SEQACCESS
-    outb(TSIDX, 0x00); outb(TSREG, 0x01);
-#endif
-    outb(TSIDX, 0x02); outb(TSREG, buf[0]);
-    outb(TSIDX, 0x04); outb(TSREG, buf[1]);
-#ifdef VGA_ALT_SEQACCESS
-    outb(TSIDX, 0x00); outb(TSREG, 0x03);
-#endif
-    outb(GDCIDX, 0x04); outb(GDCREG, buf[2]);
-    outb(GDCIDX, 0x05); outb(GDCREG, buf[3]);
-    if (adp->va_crtc_addr == MONO_CRTC) {
-	outb(GDCIDX, 0x06); outb(GDCREG,(buf[4] & 0x03) | 0x08);
-    } else {
-	outb(GDCIDX, 0x06); outb(GDCREG,(buf[4] & 0x03) | 0x0c);
-    }
-#else /* VGA_SLOW_IOACCESS */
-#ifdef VGA_ALT_SEQACCESS
-    outw(TSIDX, 0x0100);
-#endif
-    outw(TSIDX, 0x0002 | (buf[0] << 8));
-    outw(TSIDX, 0x0004 | (buf[1] << 8));
-#ifdef VGA_ALT_SEQACCESS
-    outw(TSIDX, 0x0300);
-#endif
-    outw(GDCIDX, 0x0004 | (buf[2] << 8));
-    outw(GDCIDX, 0x0005 | (buf[3] << 8));
-    if (adp->va_crtc_addr == MONO_CRTC)
-        outw(GDCIDX, 0x0006 | (((buf[4] & 0x03) | 0x08)<<8));
-    else
-        outw(GDCIDX, 0x0006 | (((buf[4] & 0x03) | 0x0c)<<8));
-#endif /* VGA_SLOW_IOACCESS */
-
-    splx(s);
-}
-
-#endif /* VGA_NO_FONT_LOADING */
-
-/*
- * save_font():
- * Read the font data in the requested font page from the video adapter.
- *
- * EGA/VGA
- */
-static int
-vga_save_font(video_adapter_t *adp, int page, int fontsize, u_char *data,
-	      int ch, int count)
-{
-#ifndef VGA_NO_FONT_LOADING
-    u_char buf[PARAM_BUFSIZE];
-    u_int32_t segment;
-    int c;
-#ifdef VGA_ALT_SEQACCESS
-    int s;
-    u_char val = 0;
-#endif
-
-    prologue(adp, V_ADP_FONT, 1);
-
-    if (fontsize < 14) {
-	/* FONT_8 */
-	fontsize = 8;
-    } else if (fontsize >= 32) {
-	fontsize = 32;
-    } else if (fontsize >= 16) {
-	/* FONT_16 */
-	fontsize = 16;
-    } else {
-	/* FONT_14 */
-	fontsize = 14;
-    }
-
-    if (page < 0 || page >= 8)
-	return 1;
-    segment = FONT_BUF + 0x4000*page;
-    if (page > 3)
-	segment -= 0xe000;
-
-#ifdef VGA_ALT_SEQACCESS
-    if (adp->va_type == KD_VGA) {	/* what about EGA? XXX */
-	s = splhigh();
-	outb(TSIDX, 0x00); outb(TSREG, 0x01);
-	outb(TSIDX, 0x01); val = inb(TSREG);	/* disable screen */
-	outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
-	outb(TSIDX, 0x00); outb(TSREG, 0x03);
-	splx(s);
-    }
-#endif
-
-    set_font_mode(adp, buf);
-    if (fontsize == 32) {
-	bcopy_fromio(segment + ch*32, data, fontsize*count);
-    } else {
-	for (c = ch; count > 0; ++c, --count) {
-	    bcopy_fromio(segment + c*32, data, fontsize);
-	    data += fontsize;
-	}
-    }
-    set_normal_mode(adp, buf);
-
-#ifdef VGA_ALT_SEQACCESS
-    if (adp->va_type == KD_VGA) {
-	s = splhigh();
-	outb(TSIDX, 0x00); outb(TSREG, 0x01);
-	outb(TSIDX, 0x01); outb(TSREG, val & 0xdf);	/* enable screen */
-	outb(TSIDX, 0x00); outb(TSREG, 0x03);
-	splx(s);
-    }
-#endif
-
-    return 0;
-#else /* VGA_NO_FONT_LOADING */
-    return 1;
-#endif /* VGA_NO_FONT_LOADING */
-}
-
-/*
- * load_font():
- * Set the font data in the requested font page.
- * NOTE: it appears that some recent video adapters do not support
- * the font page other than 0... XXX
- *
- * EGA/VGA
- */
-static int
-vga_load_font(video_adapter_t *adp, int page, int fontsize, u_char *data,
-	      int ch, int count)
-{
-#ifndef VGA_NO_FONT_LOADING
-    u_char buf[PARAM_BUFSIZE];
-    u_int32_t segment;
-    int c;
-#ifdef VGA_ALT_SEQACCESS
-    int s;
-    u_char val = 0;
-#endif
-
-    prologue(adp, V_ADP_FONT, 1);
-
-    if (fontsize < 14) {
-	/* FONT_8 */
-	fontsize = 8;
-    } else if (fontsize >= 32) {
-	fontsize = 32;
-    } else if (fontsize >= 16) {
-	/* FONT_16 */
-	fontsize = 16;
-    } else {
-	/* FONT_14 */
-	fontsize = 14;
-    }
-
-    if (page < 0 || page >= 8)
-	return 1;
-    segment = FONT_BUF + 0x4000*page;
-    if (page > 3)
-	segment -= 0xe000;
-
-#ifdef VGA_ALT_SEQACCESS
-    if (adp->va_type == KD_VGA) {	/* what about EGA? XXX */
-	s = splhigh();
-	outb(TSIDX, 0x00); outb(TSREG, 0x01);
-	outb(TSIDX, 0x01); val = inb(TSREG);	/* disable screen */
-	outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
-	outb(TSIDX, 0x00); outb(TSREG, 0x03);
-	splx(s);
-    }
-#endif
-
-    set_font_mode(adp, buf);
-    if (fontsize == 32) {
-	bcopy_toio(data, segment + ch*32, fontsize*count);
-    } else {
-	for (c = ch; count > 0; ++c, --count) {
-	    bcopy_toio(data, segment + c*32, fontsize);
-	    data += fontsize;
-	}
-    }
-    set_normal_mode(adp, buf);
-
-#ifdef VGA_ALT_SEQACCESS
-    if (adp->va_type == KD_VGA) {
-	s = splhigh();
-	outb(TSIDX, 0x00); outb(TSREG, 0x01);
-	outb(TSIDX, 0x01); outb(TSREG, val & 0xdf);	/* enable screen */
-	outb(TSIDX, 0x00); outb(TSREG, 0x03);
-	splx(s);
-    }
-#endif
-
-    return 0;
-#else /* VGA_NO_FONT_LOADING */
-    return 1;
-#endif /* VGA_NO_FONT_LOADING */
-}
-
-/*
- * show_font():
- * Activate the requested font page.
- * NOTE: it appears that some recent video adapters do not support
- * the font page other than 0... XXX
- *
- * EGA/VGA
- */
-static int
-vga_show_font(video_adapter_t *adp, int page)
-{
-#ifndef VGA_NO_FONT_LOADING
-    static u_char cg[] = { 0x00, 0x05, 0x0a, 0x0f, 0x30, 0x35, 0x3a, 0x3f };
-    int s;
-
-    prologue(adp, V_ADP_FONT, 1);
-    if (page < 0 || page >= 8)
-	return 1;
-
-    s = splhigh();
-    outb(TSIDX, 0x03); outb(TSREG, cg[page]);
-    splx(s);
-
-    return 0;
-#else /* VGA_NO_FONT_LOADING */
-    return 1;
-#endif /* VGA_NO_FONT_LOADING */
-}
-
-/*
- * save_palette():
- * Read DAC values. The values have expressed in 8 bits.
- *
- * VGA
- */
-static int
-vga_save_palette(video_adapter_t *adp, u_char *palette)
-{
-    int i;
-
-    prologue(adp, V_ADP_PALETTE, 1);
-
-    /* 
-     * We store 8 bit values in the palette buffer, while the standard
-     * VGA has 6 bit DAC .
-     */
-    outb(PALRADR, 0x00);
-    for (i = 0; i < 256*3; ++i)
-	palette[i] = inb(PALDATA) << 2; 
-    inb(adp->va_crtc_addr + 6);	/* reset flip/flop */
-    return 0;
+	return 0;
 }
 
-/*
- * load_palette():
- * Set DAC values.
- *
- * VGA
- */
-static int
-vga_load_palette(video_adapter_t *adp, u_char *palette)
-{
-    int i;
-
-    prologue(adp, V_ADP_PALETTE, 1);
-
-    outb(PIXMASK, 0xff);		/* no pixelmask */
-    outb(PALWADR, 0x00);
-    for (i = 0; i < 256*3; ++i)
-	outb(PALDATA, palette[i] >> 2);
-    inb(adp->va_crtc_addr + 6);	/* reset flip/flop */
-    outb(ATC, 0x20);			/* enable palette */
-    return 0;
-}
+#ifdef FB_INSTALL_CDEV
 
-/*
- * set_border():
- * Change the border color.
- *
- * CGA/EGA/VGA
- */
 static int
-vga_set_border(video_adapter_t *adp, int color)
+isavga_open(dev_t dev, int flag, int mode, struct proc *p)
 {
-    prologue(adp, V_ADP_BORDER, 1);
-
-    switch (adp->va_type) {
-    case KD_EGA:
-    case KD_VGA:    
-	inb(adp->va_crtc_addr + 6);	/* reset flip-flop */
-	outb(ATC, 0x31); outb(ATC, color & 0xff); 
-	break;  
-    case KD_CGA:    
-	outb(adp->va_crtc_addr + 5, color & 0x0f); /* color select register */
-	break;  
-    case KD_MONO:   
-    case KD_HERCULES:
-    default:
-	break;  
-    }
-    return 0;
+	return vga_open(dev, VGA_SOFTC(VGA_UNIT(dev)), flag, mode, p);
 }
 
-/*
- * save_state():
- * Read video register values.
- * NOTE: this function only reads the standard EGA/VGA registers.
- * any extra/extended registers of SVGA adapters are not saved.
- *
- * VGA
- */
 static int
-vga_save_state(video_adapter_t *adp, void *p, size_t size)
+isavga_close(dev_t dev, int flag, int mode, struct proc *p)
 {
-    video_info_t info;
-    u_char *buf;
-    int crtc_addr;
-    int i, j;
-    int s;
-
-    if (size == 0) {
-	/* return the required buffer size */
-	prologue(adp, V_ADP_STATESAVE, 0);
-	return sizeof(adp_state_t);
-    } else {
-	prologue(adp, V_ADP_STATESAVE, 1);
-	if (size < sizeof(adp_state_t))
-	    return 1;
-    }
-
-    ((adp_state_t *)p)->sig = V_STATE_SIG;
-    buf = ((adp_state_t *)p)->regs;
-    bzero(buf, V_MODE_PARAM_SIZE);
-    crtc_addr = adp->va_crtc_addr;
-
-    s = splhigh();
-
-    outb(TSIDX, 0x00); outb(TSREG, 0x01);	/* stop sequencer */
-    for (i = 0, j = 5; i < 4; i++) {           
-	outb(TSIDX, i + 1);
-	buf[j++]  =  inb(TSREG);
-    }
-    buf[9]  =  inb(MISC + 10);			/* dot-clock */
-    outb(TSIDX, 0x00); outb(TSREG, 0x03);	/* start sequencer */
-
-    for (i = 0, j = 10; i < 25; i++) {		/* crtc */
-	outb(crtc_addr, i);
-	buf[j++]  =  inb(crtc_addr + 1);
-    }
-    for (i = 0, j = 35; i < 20; i++) {		/* attribute ctrl */
-        inb(crtc_addr + 6);			/* reset flip-flop */
-	outb(ATC, i);
-	buf[j++]  =  inb(ATC + 1);
-    }
-    for (i = 0, j = 55; i < 9; i++) {		/* graph data ctrl */
-	outb(GDCIDX, i);
-	buf[j++]  =  inb(GDCREG);
-    }
-    inb(crtc_addr + 6);				/* reset flip-flop */
-    outb(ATC, 0x20);				/* enable palette */
-
-    splx(s);
-
-#if 1
-    if (vga_get_info(adp, adp->va_mode, &info) == 0) {
-	if (info.vi_flags & V_INFO_GRAPHICS) {
-	    buf[0] = info.vi_width/info.vi_cwidth; /* COLS */
-	    buf[1] = info.vi_height/info.vi_cheight - 1; /* ROWS */
-	} else {
-	    buf[0] = info.vi_width;		/* COLS */
-	    buf[1] = info.vi_height - 1;	/* ROWS */
-	}
-	buf[2] = info.vi_cheight;		/* POINTS */
-    } else {
-	/* XXX: shouldn't be happening... */
-	printf("vga%d: %s: failed to obtain mode info. (vga_save_state())\n",
-	       adp->va_unit, adp->va_name);
-    }
-#else
-    buf[0] = readb(BIOS_PADDRTOVADDR(0x44a));	/* COLS */
-    buf[1] = readb(BIOS_PADDRTOVADDR(0x484));	/* ROWS */
-    buf[2] = readb(BIOS_PADDRTOVADDR(0x485));	/* POINTS */
-    buf[3] = readb(BIOS_PADDRTOVADDR(0x44c));
-    buf[4] = readb(BIOS_PADDRTOVADDR(0x44d));
-#endif
-
-    return 0;
+	return vga_close(dev, VGA_SOFTC(VGA_UNIT(dev)), flag, mode, p);
 }
 
-/*
- * load_state():
- * Set video registers at once.
- * NOTE: this function only updates the standard EGA/VGA registers.
- * any extra/extended registers of SVGA adapters are not changed.
- *
- * EGA/VGA
- */
 static int
-vga_load_state(video_adapter_t *adp, void *p)
+isavga_read(dev_t dev, struct uio *uio, int flag)
 {
-    u_char *buf;
-    int crtc_addr;
-    int s;
-    int i;
-
-    prologue(adp, V_ADP_STATELOAD, 1);
-    if (((adp_state_t *)p)->sig != V_STATE_SIG)
-	return 1;
-
-    buf = ((adp_state_t *)p)->regs;
-    crtc_addr = adp->va_crtc_addr;
-
-    s = splhigh();
-
-    outb(TSIDX, 0x00); outb(TSREG, 0x01);	/* stop sequencer */
-    for (i = 0; i < 4; ++i) {			/* program sequencer */
-	outb(TSIDX, i + 1);
-	outb(TSREG, buf[i + 5]);
-    }
-    outb(MISC, buf[9]);				/* set dot-clock */
-    outb(TSIDX, 0x00); outb(TSREG, 0x03);	/* start sequencer */
-    outb(crtc_addr, 0x11);
-    outb(crtc_addr + 1, inb(crtc_addr + 1) & 0x7F);
-    for (i = 0; i < 25; ++i) {			/* program crtc */
-	outb(crtc_addr, i);
-	outb(crtc_addr + 1, buf[i + 10]);
-    }
-    inb(crtc_addr+6);				/* reset flip-flop */
-    for (i = 0; i < 20; ++i) {			/* program attribute ctrl */
-	outb(ATC, i);
-	outb(ATC, buf[i + 35]);
-    }
-    for (i = 0; i < 9; ++i) {			/* program graph data ctrl */
-	outb(GDCIDX, i);
-	outb(GDCREG, buf[i + 55]);
-    }
-    inb(crtc_addr + 6);				/* reset flip-flop */
-    outb(ATC, 0x20);				/* enable palette */
-
-#if notyet /* a temporary workaround for kernel panic, XXX */
-#ifndef VGA_NO_BIOS
-    if (adp->va_unit == V_ADP_PRIMARY) {
-	writeb(BIOS_PADDRTOVADDR(0x44a), buf[0]);	/* COLS */
-	writeb(BIOS_PADDRTOVADDR(0x484), buf[1] + rows_offset - 1); /* ROWS */
-	writeb(BIOS_PADDRTOVADDR(0x485), buf[2]);	/* POINTS */
-#if 0
-	writeb(BIOS_PADDRTOVADDR(0x44c), buf[3]);
-	writeb(BIOS_PADDRTOVADDR(0x44d), buf[4]);
-#endif
-    }
-#endif /* VGA_NO_BIOS */
-#endif /* notyet */
-
-    splx(s);
-    return 0;
+	return vga_read(dev, VGA_SOFTC(VGA_UNIT(dev)), uio, flag);
 }
 
-/*
- * set_origin():
- * Change the origin (window mapping) of the banked frame buffer.
- */
 static int
-vga_set_origin(video_adapter_t *adp, off_t offset)
+isavga_write(dev_t dev, struct uio *uio, int flag)
 {
-    /* 
-     * The standard video modes do not require window mapping; 
-     * always return error.
-     */
-    return 1;
+	return vga_write(dev, VGA_SOFTC(VGA_UNIT(dev)), uio, flag);
 }
 
-/*
- * read_hw_cursor():
- * Read the position of the hardware text cursor.
- *
- * all adapters
- */
 static int
-vga_read_hw_cursor(video_adapter_t *adp, int *col, int *row)
+isavga_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *p)
 {
-    u_int16_t off;
-    int s;
-
-    if (!init_done)
-	return 1;
-
-    if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
-	return 1;
-
-    s = spltty();
-    outb(adp->va_crtc_addr, 14);
-    off = inb(adp->va_crtc_addr + 1);
-    outb(adp->va_crtc_addr, 15);
-    off = (off << 8) | inb(adp->va_crtc_addr + 1);
-    splx(s);
-
-    *row = off / adp->va_info.vi_width;
-    *col = off % adp->va_info.vi_width;
-
-    return 0;
+	return vga_ioctl(dev, VGA_SOFTC(VGA_UNIT(dev)), cmd, arg, flag, p);
 }
 
-/*
- * set_hw_cursor():
- * Move the hardware text cursor.  If col and row are both -1, 
- * the cursor won't be shown.
- *
- * all adapters
- */
 static int
-vga_set_hw_cursor(video_adapter_t *adp, int col, int row)
+isavga_mmap(dev_t dev, vm_offset_t offset, int prot)
 {
-    u_int16_t off;
-    int s;
-
-    if (!init_done)
-	return 1;
-
-    if ((col == -1) && (row == -1)) {
-	off = -1;
-    } else {
-	if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
-	    return 1;
-	off = row*adp->va_info.vi_width + col;
-    }
-
-    s = spltty();
-    outb(adp->va_crtc_addr, 14);
-    outb(adp->va_crtc_addr + 1, off >> 8);
-    outb(adp->va_crtc_addr, 15);
-    outb(adp->va_crtc_addr + 1, off & 0x00ff);
-    splx(s);
-
-    return 0;
+	return vga_mmap(dev, VGA_SOFTC(VGA_UNIT(dev)), offset, prot);
 }
 
-/*
- * set_hw_cursor_shape():
- * Change the shape of the hardware text cursor. If the height is
- * zero or negative, the cursor won't be shown.
- *
- * all adapters
- */
-static int
-vga_set_hw_cursor_shape(video_adapter_t *adp, int base, int height,
-			int celsize, int blink)
-{
-    int s;
-
-    if (!init_done)
-	return 1;
-
-    s = spltty();
-    switch (adp->va_type) {
-    case KD_VGA:
-    case KD_CGA:
-    case KD_MONO:
-    case KD_HERCULES:
-    default:
-	if (height <= 0) {
-	    /* make the cursor invisible */
-	    outb(adp->va_crtc_addr, 10);
-	    outb(adp->va_crtc_addr + 1, 32);
-	    outb(adp->va_crtc_addr, 11);
-	    outb(adp->va_crtc_addr + 1, 0);
-	} else {
-	    outb(adp->va_crtc_addr, 10);
-	    outb(adp->va_crtc_addr + 1, celsize - base - height);
-	    outb(adp->va_crtc_addr, 11);
-	    outb(adp->va_crtc_addr + 1, celsize - base - 1);
-	}
-	break;
-    case KD_EGA:
-	if (height <= 0) {
-	    /* make the cursor invisible */
-	    outb(adp->va_crtc_addr, 10);
-	    outb(adp->va_crtc_addr + 1, celsize);
-	    outb(adp->va_crtc_addr, 11);
-	    outb(adp->va_crtc_addr + 1, 0);
-	} else {
-	    outb(adp->va_crtc_addr, 10);
-	    outb(adp->va_crtc_addr + 1, celsize - base - height);
-	    outb(adp->va_crtc_addr, 11);
-	    outb(adp->va_crtc_addr + 1, celsize - base);
-	}
-	break;
-    }
-    splx(s);
-
-    return 0;
-}
-
-/*
- * mmap():
- * Mmap frame buffer.
- *
- * all adapters
- */
-static int
-vga_mmap(video_adapter_t *adp, vm_offset_t offset)
-{
-    if (offset > 0x20000 - PAGE_SIZE)
-	return -1;
-#ifdef __i386__
-    return i386_btop((VIDEO_BUF_BASE + offset));
-#endif
-#ifdef __alpha__
-    return alpha_btop((VIDEO_BUF_BASE + offset));
-#endif
-}
-
-static void
-dump_buffer(u_char *buf, size_t len)
-{
-    int i;
-
-    for(i = 0; i < len;) {
-	printf("%02x ", buf[i]);
-	if ((++i % 16) == 0)
-	    printf("\n");
-    }
-}
-
-/*
- * diag():
- * Print some information about the video adapter and video modes,
- * with requested level of details.
- *
- * all adapters
- */
-static int
-vga_diag(video_adapter_t *adp, int level)
-{
-#if FB_DEBUG > 1
-    video_info_t info;
-#endif
-    u_char *mp;
-
-    if (!init_done)
-	return 1;
-
-#if FB_DEBUG > 1
-#ifndef VGA_NO_BIOS
-    printf("vga: RTC equip. code:0x%02x, DCC code:0x%02x\n",
-	   rtcin(RTC_EQUIPMENT), readb(BIOS_PADDRTOVADDR(0x488)));
-    printf("vga: CRTC:0x%x, video option:0x%02x, ",
-	   readw(BIOS_PADDRTOVADDR(0x463)),
-	   readb(BIOS_PADDRTOVADDR(0x487)));
-    printf("rows:%d, cols:%d, font height:%d\n",
-	   readb(BIOS_PADDRTOVADDR(0x44a)),
-	   readb(BIOS_PADDRTOVADDR(0x484)) + 1,
-	   readb(BIOS_PADDRTOVADDR(0x485)));
-#endif /* VGA_NO_BIOS */
-#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
-    printf("vga: param table EGA/VGA:%p", video_mode_ptr);
-    printf(", CGA/MDA:%p\n", video_mode_ptr2);
-#endif
-    printf("vga: rows_offset:%d\n", rows_offset);
-#endif /* FB_DEBUG > 1 */
-
-    fb_dump_adp_info(DRIVER_NAME, adp, level);
-
-#if FB_DEBUG > 1
-    if (adp->va_flags & V_ADP_MODECHANGE) {
-	for (i = 0; bios_vmode[i].vi_mode != EOT; ++i) {
-	    if (bios_vmode[i].vi_mode == NA)
-		continue;
-	    if (get_mode_param(bios_vmode[i].vi_mode) == NULL)
-		continue;
-	    fb_dump_mode_info(DRIVER_NAME, adp, &bios_vmode[i], level);
-	}
-    } else {
-	vga_get_info(adp, adp->va_initial_mode, &info);	/* shouldn't fail */
-	fb_dump_mode_info(DRIVER_NAME, adp, &info, level);
-    }
-#endif /* FB_DEBUG > 1 */
-
-    if ((adp->va_type != KD_EGA) && (adp->va_type != KD_VGA))
-	return 0;
-#if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE)
-    if (video_mode_ptr == NULL)
-	printf("vga%d: %s: WARNING: video mode switching is not "
-	       "fully supported on this adapter\n",
-	       adp->va_unit, adp->va_name);
-#endif
-    if (level <= 0)
-	return 0;
-
-    if (adp->va_type == KD_VGA) {
-	printf("VGA parameters upon power-up\n");
-	dump_buffer(adpstate.regs, sizeof(adpstate.regs));
-	printf("VGA parameters in BIOS for mode %d\n", adp->va_initial_mode);
-	dump_buffer(adpstate2.regs, sizeof(adpstate2.regs));
-    }
-
-    mp = get_mode_param(adp->va_initial_mode);
-    if (mp == NULL)	/* this shouldn't be happening */
-	return 0;
-    printf("EGA/VGA parameters to be used for mode %d\n", adp->va_initial_mode);
-    dump_buffer(mp, V_MODE_PARAM_SIZE);
-
-    return 0;
-}
+#endif /* FB_INSTALL_CDEV */
 
 #endif /* NVGA > 0 */
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index acc850351714..cee656476020 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.66 1999/05/30 16:52:03 phk Exp $
+ *	$Id: cons.c,v 1.67 1999/05/31 11:25:41 phk Exp $
  */
 
 #include "opt_devfs.h"
@@ -109,19 +109,19 @@ static struct tty *cn_tp;		/* physical console tty struct */
 static void *cn_devfs_token;		/* represents the devfs entry */
 #endif /* DEVFS */
 
-CONS_DRIVER(cons, NULL, NULL, NULL, NULL, NULL);
+CONS_DRIVER(cons, NULL, NULL, NULL, NULL, NULL, NULL);
 
 void
 cninit()
 {
 	struct consdev *best_cp, *cp;
-	struct consdev **list;
+	const struct consdev **list;
 
 	/*
 	 * Find the first console with the highest priority.
 	 */
 	best_cp = NULL;
-	list = (struct consdev **)cons_set.ls_items;
+	list = (const struct consdev **)cons_set.ls_items;
 	while ((cp = *list++) != NULL) {
 		if (cp->cn_probe == NULL)
 			continue;
@@ -147,6 +147,8 @@ cninit()
 	 * If no console, give up.
 	 */
 	if (best_cp == NULL) {
+		if (cn_tab != NULL && cn_tab->cn_term != NULL)
+			(*cn_tab->cn_term)(cn_tab);
 		cn_tab = best_cp;
 		return;
 	}
@@ -154,10 +156,13 @@ cninit()
 	/*
 	 * Initialize console, then attach to it.  This ordering allows
 	 * debugging using the previous console, if any.
-	 * XXX if there was a previous console, then its driver should
-	 * be informed when we forget about it.
 	 */
 	(*best_cp->cn_init)(best_cp);
+	if (cn_tab != NULL && cn_tab != best_cp) {
+		/* Turn off the previous console.  */
+		if (cn_tab->cn_term != NULL)
+			(*cn_tab->cn_term)(cn_tab);
+	}
 	cn_tab = best_cp;
 }
 
diff --git a/sys/modules/splash/bmp/splash_bmp.c b/sys/modules/splash/bmp/splash_bmp.c
index 44ac914fd436..6de5a28274d2 100644
--- a/sys/modules/splash/bmp/splash_bmp.c
+++ b/sys/modules/splash/bmp/splash_bmp.c
@@ -24,15 +24,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: splash_bmp.c,v 1.7 1999/03/29 15:13:53 yokota Exp $
+ * $Id: splash_bmp.c,v 1.8 1999/06/16 14:04:45 yokota Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/linker.h>
-
-#include <machine/console.h>
+#include <sys/fbio.h>
 
 #include <dev/fb/fbreg.h>
 #include <dev/fb/splashreg.h>
diff --git a/sys/modules/splash/pcx/splash_pcx.c b/sys/modules/splash/pcx/splash_pcx.c
index 3066bb36654f..5423295f4e93 100644
--- a/sys/modules/splash/pcx/splash_pcx.c
+++ b/sys/modules/splash/pcx/splash_pcx.c
@@ -27,15 +27,14 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: splash_pcx.c,v 1.1 1999/04/12 13:39:11 des Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/linker.h>
-
-#include <machine/console.h>
+#include <sys/fbio.h>
 
 #include <dev/fb/fbreg.h>
 #include <dev/fb/splashreg.h>
diff --git a/sys/modules/syscons/blank/blank_saver.c b/sys/modules/syscons/blank/blank_saver.c
index 89dd199815f5..2979c0da9442 100644
--- a/sys/modules/syscons/blank/blank_saver.c
+++ b/sys/modules/syscons/blank/blank_saver.c
@@ -25,82 +25,35 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.14 1998/11/04 03:49:38 peter Exp $
+ *	$Id: blank_saver.c,v 1.15 1999/01/11 03:18:44 yokota Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <dev/fb/vgareg.h>
-
-#include <i386/isa/isa.h>
-
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 static int
 blank_saver(video_adapter_t *adp, int blank)
 {
-	u_char val;
-	if (blank) {
-		switch (adp->va_type) {
-		case KD_VGA:
-			outb(TSIDX, 0x01); val = inb(TSREG);
-			outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
-			break;
-		case KD_EGA:
-			/* not yet done XXX */
-			break;
-		case KD_CGA:
-			outb(adp->va_crtc_addr + 4, 0x25);
-			break;
-		case KD_MONO:
-		case KD_HERCULES:
-			outb(adp->va_crtc_addr + 4, 0x21);
-			break;
-		default:
-			break;
-		}
-	}
-	else {
-		switch (adp->va_type) {
-		case KD_VGA:
-			outb(TSIDX, 0x01); val = inb(TSREG);
-			outb(TSIDX, 0x01); outb(TSREG, val & 0xDF);
-			break;
-		case KD_EGA:
-			/* not yet done XXX */
-			break;
-		case KD_CGA:
-			outb(adp->va_crtc_addr + 4, 0x2d);
-			break;
-		case KD_MONO:
-		case KD_HERCULES:
-			outb(adp->va_crtc_addr + 4, 0x29);
-			break;
-		default:
-			break;
-		}
-	}
+	(*vidsw[adp->va_index]->blank_display)(adp,
+					       (blank) ? V_DISPLAY_BLANK
+						       : V_DISPLAY_ON);
 	return 0;
 }
 
 static int
 blank_init(video_adapter_t *adp)
 {
-	switch (adp->va_type) {
-	case KD_MONO:
-	case KD_HERCULES:
-	case KD_CGA:
-	case KD_VGA:
-		break;
-	case KD_EGA:
-		/* EGA is yet to be supported */
-	default:
-		return ENODEV;
-	}
-	return 0;
+	if ((*vidsw[adp->va_index]->blank_display)(adp, V_DISPLAY_ON) == 0)
+		return 0;
+	return ENODEV;
 }
 
 static int
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index 423e6c70451d..ebedfaa2e8c0 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.14 1999/01/17 14:25:08 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.15 1999/02/05 12:40:15 des Exp $
  */
 
 #include <sys/param.h>
@@ -34,21 +34,20 @@
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <machine/md_var.h>
 #include <machine/pc/display.h>
 
-#include <saver.h>
-
-#define CONSOLE_VECT(x, y) \
-	(window + (y)*cur_console->xsize + (x))
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
 static char *message;
 static int messagelen;
-static u_short *window;
 static int blanked;
 
 /* Who is the author of this ASCII pic? */
@@ -119,20 +118,23 @@ xflip_symbol(char symbol)
 }
 
 static void
-clear_daemon(int xpos, int ypos, int dxdir, int xoff, int yoff, 
+clear_daemon(sc_softc_t *sc, int xpos, int ypos, int dxdir, int xoff, int yoff, 
 	    int xlen, int ylen)
 {
 	int y;
 
 	if (xlen <= 0)
 		return;
-	for (y = yoff; y < ylen; y++)
-		fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20], 
-		      CONSOLE_VECT(xpos + xoff, ypos + y), xlen - xoff);
+	for (y = yoff; y < ylen; y++) {
+		sc_vtb_erase(&sc->cur_scp->scr,
+			     (ypos + y)*sc->cur_scp->xsize + xpos + xoff,
+			     xlen - xoff,
+			     sc->scr_map[0x20], (FG_LIGHTGREY | BG_BLACK) << 8);
+	}
 }
 
 static void
-draw_daemon(int xpos, int ypos, int dxdir, int xoff, int yoff, 
+draw_daemon(sc_softc_t *sc, int xpos, int ypos, int dxdir, int xoff, int yoff, 
 	    int xlen, int ylen)
 {
 	int x, y;
@@ -148,41 +150,60 @@ draw_daemon(int xpos, int ypos, int dxdir, int xoff, int yoff,
 			continue;
 		for (x = xoff; (x < xlen) && (daemon_pic[y][px] != '\0'); x++, px++) {
 			switch (daemon_attr[y][px]) {
+#ifndef PC98
 			case 'R': attr = (FG_LIGHTRED|BG_BLACK)<<8; break;
 			case 'Y': attr = (FG_YELLOW|BG_BLACK)<<8; break;
 			case 'B': attr = (FG_LIGHTBLUE|BG_BLACK)<<8; break;
 			case 'W': attr = (FG_LIGHTGREY|BG_BLACK)<<8; break;
 			case 'C': attr = (FG_CYAN|BG_BLACK)<<8; break;
 			default: attr = (FG_WHITE|BG_BLACK)<<8; break;
+#else /* PC98 */
+			case 'R': attr = (FG_RED|BG_BLACK)<<8; break;
+			case 'Y': attr = (FG_BROWN|BG_BLACK)<<8; break;
+			case 'B': attr = (FG_BLUE|BG_BLACK)<<8; break;
+			case 'W': attr = (FG_LIGHTGREY|BG_BLACK)<<8; break;
+			case 'C': attr = (FG_CYAN|BG_BLACK)<<8; break;
+			default: attr = (FG_LIGHTGREY|BG_BLACK)<<8; break;
+#endif /* PC98 */
 			}
 			if (dxdir < 0) {	/* Moving left */
-				*CONSOLE_VECT(xpos + x, ypos + y) =
-					scr_map[daemon_pic[y][px]]|attr;
+				sc_vtb_putc(&sc->cur_scp->scr,
+					    (ypos + y)*sc->cur_scp->xsize
+						 + xpos + x,
+					    sc->scr_map[daemon_pic[y][px]],
+					    attr);
 			} else {		/* Moving right */
-				*CONSOLE_VECT(xpos + DAEMON_MAX_WIDTH - px - 1, ypos + y) =
-					scr_map[xflip_symbol(daemon_pic[y][px])]|attr;
+				sc_vtb_putc(&sc->cur_scp->scr,
+					    (ypos + y)*sc->cur_scp->xsize
+						+ xpos + DAEMON_MAX_WIDTH 
+						- px - 1,
+					    sc->scr_map[xflip_symbol(daemon_pic[y][px])], 
+					    attr);
 			}
 		}
 	}
 }
 
 static void
-clear_string(int xpos, int ypos, int xoff, char *s, int len)
+clear_string(sc_softc_t *sc, int xpos, int ypos, int xoff, char *s, int len)
 {
 	if (len <= 0)
 		return;
-	fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20], 
-	      CONSOLE_VECT(xpos + xoff, ypos), len - xoff);
+	sc_vtb_erase(&sc->cur_scp->scr,
+		     ypos*sc->cur_scp->xsize + xpos + xoff, len - xoff,
+		     sc->scr_map[0x20], (FG_LIGHTGREY | BG_BLACK) << 8);
 }
 
 static void
-draw_string(int xpos, int ypos, int xoff, char *s, int len)
+draw_string(sc_softc_t *sc, int xpos, int ypos, int xoff, char *s, int len)
 {
 	int x;
 
-	for (x = xoff; x < len; x++)
-		*CONSOLE_VECT(xpos + x, ypos) =
-			scr_map[s[x]]|(FG_LIGHTGREEN|BG_BLACK)<<8;
+	for (x = xoff; x < len; x++) {
+		sc_vtb_putc(&sc->cur_scp->scr,
+			    ypos*sc->cur_scp->xsize + xpos + x,
+			    sc->scr_map[s[x]], (FG_LIGHTGREEN | BG_BLACK) << 8);
+	}
 }
 
 static int
@@ -195,17 +216,30 @@ daemon_saver(video_adapter_t *adp, int blank)
 	static int moved_daemon = 0;
 	static int xoff, yoff, toff;
 	static int xlen, ylen, tlen;
-	scr_stat *scp = cur_console;
+	sc_softc_t *sc;
+	scr_stat *scp;
 	int min, max;
 
+	sc = sc_find_softc(adp, NULL);
+	if (sc == NULL)
+		return EAGAIN;
+	scp = sc->cur_scp;
+
 	if (blank) {
 		if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
 			return EAGAIN;
 		if (blanked == 0) {
-			window = (u_short *)adp->va_window;
+#ifdef PC98
+			if (epson_machine_id == 0x20) {
+				outb(0x43f, 0x42);
+				outb(0x0c17, inb(0xc17) & ~0x08);
+				outb(0x43f, 0x40);
+			}
+#endif /* PC98 */
 			/* clear the screen and set the border color */
-			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
-			      window, scp->xsize * scp->ysize);
+			sc_vtb_clear(&scp->scr, sc->scr_map[0x20],
+				     (FG_LIGHTGREY | BG_BLACK) << 8);
+			(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
 			set_border(scp, 0);
 			xlen = ylen = tlen = 0;
 		}
@@ -213,8 +247,8 @@ daemon_saver(video_adapter_t *adp, int blank)
 			return 0;
 		blanked = 1;
 
- 		clear_daemon(dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
-		clear_string(txpos, typos, toff, (char *)message, tlen);
+ 		clear_daemon(sc, dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
+		clear_string(sc, txpos, typos, toff, (char *)message, tlen);
 
 		if (++moved_daemon) {
 			/*
@@ -319,9 +353,16 @@ daemon_saver(video_adapter_t *adp, int blank)
 		else if (txpos + tlen > scp->xsize)
 			tlen = scp->xsize - txpos;
 
- 		draw_daemon(dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
-		draw_string(txpos, typos, toff, (char *)message, tlen);
+ 		draw_daemon(sc, dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
+		draw_string(sc, txpos, typos, toff, (char *)message, tlen);
 	} else {
+#ifdef PC98
+		if (epson_machine_id == 0x20) {
+			outb(0x43f, 0x42);
+			outb(0x0c17, inb(0xc17) | 0x08);
+			outb(0x43f, 0x40);
+		}
+#endif /* PC98 */
 		blanked = 0;
 	}
 	return 0;
diff --git a/sys/modules/syscons/fade/fade_saver.c b/sys/modules/syscons/fade/fade_saver.c
index 70d36c9c1e0c..4a44c8519bcc 100644
--- a/sys/modules/syscons/fade/fade_saver.c
+++ b/sys/modules/syscons/fade/fade_saver.c
@@ -25,17 +25,19 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.15 1998/11/04 03:49:38 peter Exp $
+ *	$Id: fade_saver.c,v 1.16 1999/01/11 03:18:46 yokota Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <i386/isa/isa.h>
-
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 static u_char palette[256*3];
 static int blanked;
@@ -49,11 +51,10 @@ fade_saver(video_adapter_t *adp, int blank)
 
 	if (blank) {
 		blanked = TRUE;
-		switch (adp->va_type) {
-		case KD_VGA:
+		if (ISPALAVAIL(adp->va_flags)) {
 			if (count <= 0)
 				save_palette(adp, palette);
-			if (count < 64) {
+			if (count < 256) {
 				pal[0] = pal[1] = pal[2] = 0;
 				for (i = 3; i < 256*3; i++) {
 					if (palette[i] - count > 60)
@@ -64,39 +65,17 @@ fade_saver(video_adapter_t *adp, int blank)
 				load_palette(adp, pal);
 				count++;
 			}
-			break;
-		case KD_EGA:
-			/* not yet done XXX */
-			break;
-		case KD_CGA:
-			outb(adp->va_crtc_addr + 4, 0x25);
-			break;
-		case KD_MONO:
-		case KD_HERCULES:
-			outb(adp->va_crtc_addr + 4, 0x21);
-			break;
-		default:
-			break;
+		} else {
+	    		(*vidsw[adp->va_index]->blank_display)(adp,
+							       V_DISPLAY_BLANK);
 		}
-	}
-	else {
-		switch (adp->va_type) {
-		case KD_VGA:
+	} else {
+		if (ISPALAVAIL(adp->va_flags)) {
 			load_palette(adp, palette);
 			count = 0;
-			break;
-		case KD_EGA:
-			/* not yet done XXX */
-			break;
-		case KD_CGA:
-			outb(adp->va_crtc_addr + 4, 0x2d);
-			break;
-		case KD_MONO:
-		case KD_HERCULES:
-			outb(adp->va_crtc_addr + 4, 0x29);
-			break;
-		default:
-			break;
+		} else {
+	    		(*vidsw[adp->va_index]->blank_display)(adp,
+							       V_DISPLAY_ON);
 		}
 		blanked = FALSE;
 	}
@@ -106,21 +85,9 @@ fade_saver(video_adapter_t *adp, int blank)
 static int
 fade_init(video_adapter_t *adp)
 {
-	switch (adp->va_type) {
-	case KD_MONO:
-	case KD_HERCULES:
-	case KD_CGA:
-		/* 
-		 * `fade' saver is not fully implemented for MDA and CGA.
-		 * It simply blanks the display instead.
-		 */
-	case KD_VGA:
-		break;
-	case KD_EGA:
-		/* EGA is yet to be supported */
-	default:
+	if (!ISPALAVAIL(adp->va_flags)
+	    && (*vidsw[adp->va_index]->blank_display)(adp, V_DISPLAY_ON) != 0)
 		return ENODEV;
-	}
 	blanked = FALSE;
 	return 0;
 }
diff --git a/sys/modules/syscons/fire/fire_saver.c b/sys/modules/syscons/fire/fire_saver.c
index aea36a9bf49f..db4b80b1a7b0 100644
--- a/sys/modules/syscons/fire/fire_saver.c
+++ b/sys/modules/syscons/fire/fire_saver.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fire_saver.c,v 1.2.2.1 1999/05/10 15:20:30 des Exp $
+ *	$Id: fire_saver.c,v 1.4 1999/05/10 15:25:50 des Exp $
  */
 
 /*
@@ -38,11 +38,14 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/syslog.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <machine/md_var.h>
 #include <machine/random.h>
 
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 #define X_SIZE 320
 #define Y_SIZE 200
diff --git a/sys/modules/syscons/green/green_saver.c b/sys/modules/syscons/green/green_saver.c
index 9decd7282f9f..103154be7a8d 100644
--- a/sys/modules/syscons/green/green_saver.c
+++ b/sys/modules/syscons/green/green_saver.c
@@ -25,93 +25,35 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.14 1998/11/04 03:49:38 peter Exp $
+ *	$Id: green_saver.c,v 1.15 1999/01/11 03:18:48 yokota Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <dev/fb/vgareg.h>
-
-#include <i386/isa/isa.h>
-
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 static int
 green_saver(video_adapter_t *adp, int blank)
 {
-	int crtc_addr;
-	u_char val;
-
-	crtc_addr = adp->va_crtc_addr;
-	if (blank) {
-		switch (adp->va_type) {
-		case KD_VGA:
-			outb(TSIDX, 0x01); val = inb(TSREG);
-			outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
-			outb(crtc_addr, 0x17); val = inb(crtc_addr + 1);
-			outb(crtc_addr + 1, val & ~0x80);
-			break;
-		case KD_EGA:
-			/* not yet done XXX */
-			break;
-		case KD_CGA:
-			outb(crtc_addr + 4, 0x25);
-			break;
-		case KD_MONO:
-		case KD_HERCULES:
-			outb(crtc_addr + 4, 0x21);
-			break;
-		default:
-			break;
-		}
-	}
-	else {
-		switch (adp->va_type) {
-		case KD_VGA:
-			outb(TSIDX, 0x01); val = inb(TSREG);
-			outb(TSIDX, 0x01); outb(TSREG, val & 0xDF);
-			outb(crtc_addr, 0x17); val = inb(crtc_addr + 1);
-			outb(crtc_addr + 1, val | 0x80);
-			break;
-		case KD_EGA:
-			/* not yet done XXX */
-			break;
-		case KD_CGA:
-			outb(crtc_addr + 4, 0x2d);
-			break;
-		case KD_MONO:
-		case KD_HERCULES:
-			outb(crtc_addr + 4, 0x29);
-			break;
-		default:
-			break;
-		}
-	}
+	(*vidsw[adp->va_index]->blank_display)(adp,
+					       (blank) ? V_DISPLAY_STAND_BY
+						       : V_DISPLAY_ON);
 	return 0;
 }
 
 static int
 green_init(video_adapter_t *adp)
 {
-	switch (adp->va_type) {
-	case KD_MONO:
-	case KD_HERCULES:
-	case KD_CGA:
-		/* 
-		 * `green' saver is not fully implemented for MDA and CGA.
-		 * It simply blanks the display instead.
-		 */
-	case KD_VGA:
-		break;
-	case KD_EGA:
-		/* EGA is yet to be supported */
-	default:
-		return ENODEV;
-	}
-	return 0;
+	if ((*vidsw[adp->va_index]->blank_display)(adp, V_DISPLAY_ON) == 0)
+		return 0;
+	return ENODEV;
 }
 
 static int
diff --git a/sys/modules/syscons/logo/logo_saver.c b/sys/modules/syscons/logo/logo_saver.c
index b6a46acd312a..24da9644a17f 100644
--- a/sys/modules/syscons/logo/logo_saver.c
+++ b/sys/modules/syscons/logo/logo_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: logo_saver.c,v 1.5 1999/02/05 12:40:15 des Exp $
+ *	$Id: logo_saver.c,v 1.6 1999/04/12 13:34:57 des Exp $
  */
 
 #include <sys/param.h>
@@ -33,8 +33,12 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/syslog.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 static u_char *vid;
 static int banksize, scrmode, bpsl, scrw, scrh;
@@ -104,6 +108,7 @@ logo_saver(video_adapter_t *adp, int blank)
 #endif
 	    blanked++;
 	    vid = (u_char *)adp->va_window;
+	    banksize = adp->va_window_size;
 	    bpsl = adp->va_line_width;
 	    splx(pl);
 	    for (i = 0; i < bpsl*scrh; i += banksize) {
@@ -132,7 +137,6 @@ logo_init(video_adapter_t *adp)
 	return ENODEV;
     }
     
-    banksize = info.vi_window_size;
     scrw = info.vi_width;
     scrh = info.vi_height;
     blanked = 0;
diff --git a/sys/modules/syscons/rain/rain_saver.c b/sys/modules/syscons/rain/rain_saver.c
index 9aa7370074c1..200dc59931f0 100644
--- a/sys/modules/syscons/rain/rain_saver.c
+++ b/sys/modules/syscons/rain/rain_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: rain_saver.c,v 1.2 1999/01/11 03:18:50 yokota Exp $
+ *	$Id: rain_saver.c,v 1.3 1999/04/12 13:34:57 des Exp $
  */
 
 #include <sys/param.h>
@@ -33,10 +33,14 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/syslog.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
 #include <machine/random.h>
 
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 static u_char *vid;
 
diff --git a/sys/modules/syscons/saver.h b/sys/modules/syscons/saver.h
deleted file mode 100644
index 748dfddda100..000000000000
--- a/sys/modules/syscons/saver.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 1995-1998 Søren Schmidt
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer,
- *    without modification, immediately at the beginning of the file.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: saver.h,v 1.16 1999/01/16 10:20:13 des Exp $
- */
-#include <machine/apm_bios.h>
-#include <machine/console.h>
-
-#include <dev/fb/fbreg.h>
-#include <dev/fb/splashreg.h>
-
-#include <dev/syscons/syscons.h>
-
-extern scr_stat	*cur_console;
-extern char	scr_map[];
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index ef64741942ea..51e1746f5f9d 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.22 1999/01/17 14:25:19 yokota Exp $
+ *	$Id: snake_saver.c,v 1.23 1999/02/05 12:40:15 des Exp $
  */
 
 #include <sys/param.h>
@@ -34,16 +34,18 @@
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <machine/md_var.h>
 #include <machine/pc/display.h>
 
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 static char	*message;
-static u_char	**messagep;
+static int	*messagep;
 static int	messagelen;
-static u_short	*window;
 static int	blanked;
 
 static int
@@ -51,36 +53,50 @@ snake_saver(video_adapter_t *adp, int blank)
 {
 	static int	dirx, diry;
 	int		f;
-	scr_stat	*scp = cur_console;
+	sc_softc_t	*sc;
+	scr_stat	*scp;
 
 /* XXX hack for minimal changes. */
 #define	save	message
 #define	savs	messagep
 
+	sc = sc_find_softc(adp, NULL);
+	if (sc == NULL)
+		return EAGAIN;
+	scp = sc->cur_scp;
+
 	if (blank) {
 		if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
 			return EAGAIN;
 		if (blanked <= 0) {
-			window = (u_short *)adp->va_window;
-			fillw(((FG_LIGHTGREY|BG_BLACK)<<8) | scr_map[0x20],
-			      window, scp->xsize * scp->ysize);
+#ifdef PC98
+			if (epson_machine_id == 0x20) {
+				outb(0x43f, 0x42);
+				outb(0x0c17, inb(0xc17) & ~0x08);
+				outb(0x43f, 0x40);
+			}
+#endif /* PC98 */
+			sc_vtb_clear(&scp->scr, sc->scr_map[0x20],
+				     (FG_LIGHTGREY | BG_BLACK) << 8);
+			(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
 			set_border(scp, 0);
 			dirx = (scp->xpos ? 1 : -1);
 			diry = (scp->ypos ?
 				scp->xsize : -scp->xsize);
 			for (f=0; f< messagelen; f++)
-				savs[f] = (u_char *)window + 2 *
-					  (scp->xpos+scp->ypos*scp->xsize);
-			*(savs[0]) = scr_map[*save];
+				savs[f] = scp->xpos + scp->ypos*scp->xsize;
+			sc_vtb_putc(&scp->scr, savs[0], sc->scr_map[*save],
+				    (FG_LIGHTGREY | BG_BLACK) << 8);
 			blanked = 1;
 		}
 		if (blanked++ < 4)
 			return 0;
 		blanked = 1;
-		*(savs[messagelen-1]) = scr_map[0x20];
+		sc_vtb_putc(&scp->scr, savs[messagelen - 1], sc->scr_map[0x20],
+			    (FG_LIGHTGREY | BG_BLACK) << 8);
 		for (f=messagelen-1; f > 0; f--)
 			savs[f] = savs[f-1];
-		f = (savs[0] - (u_char *)window) / 2;
+		f = savs[0];
 		if ((f % scp->xsize) == 0 ||
 		    (f % scp->xsize) == scp->xsize - 1 ||
 		    (random() % 50) == 0)
@@ -89,11 +105,19 @@ snake_saver(video_adapter_t *adp, int blank)
 		    (f / scp->xsize) == scp->ysize - 1 ||
 		    (random() % 20) == 0)
 			diry = -diry;
-		savs[0] += 2*dirx + 2*diry;
+		savs[0] += dirx + diry;
 		for (f=messagelen-1; f>=0; f--)
-			*(savs[f]) = scr_map[save[f]];
+			sc_vtb_putc(&scp->scr, savs[f], sc->scr_map[save[f]],
+				    (FG_LIGHTGREY | BG_BLACK) << 8);
 	}
 	else {
+#ifdef PC98
+		if (epson_machine_id == 0x20) {
+			outb(0x43f, 0x42);
+			outb(0x0c17, inb(0xc17) | 0x08);
+			outb(0x43f, 0x40);
+		}
+#endif /* PC98 */
 		blanked = 0;
 	}
 	return 0;
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index aaa23fbde073..56408dc78cee 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -25,22 +25,24 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.19 1999/01/17 14:25:19 yokota Exp $
+ *	$Id: star_saver.c,v 1.20 1999/02/05 12:40:16 des Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <machine/md_var.h>
 #include <machine/pc/display.h>
 
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 #define NUM_STARS	50
 
-static u_short *window;
 static int blanked;
 
 /*
@@ -50,21 +52,39 @@ static int blanked;
 static int
 star_saver(video_adapter_t *adp, int blank)
 {
-	scr_stat	*scp = cur_console;
+	sc_softc_t	*sc;
+	scr_stat	*scp;
 	int		cell, i;
 	char 		pattern[] = {"...........++++***   "};
+#ifndef PC98
 	char		colors[] = {FG_DARKGREY, FG_LIGHTGREY,
 				    FG_WHITE, FG_LIGHTCYAN};
+#else
+	char		colors[] = {FG_BLUE, FG_LIGHTGREY,
+				    FG_LIGHTGREY, FG_CYAN};
+#endif /* PC98 */
 	static u_short 	stars[NUM_STARS][2];
 
+	sc = sc_find_softc(adp, NULL);
+	if (sc == NULL)
+		return EAGAIN;
+	scp = sc->cur_scp;
+
 	if (blank) {
 		if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
 			return EAGAIN;
 		if (!blanked) {
-			window = (u_short *)adp->va_window;
+#ifdef PC98
+			if (epson_machine_id == 0x20) {
+				outb(0x43f, 0x42);
+				outb(0x0c17, inb(0xc17) & ~0x08);
+				outb(0x43f, 0x40);
+			}
+#endif /* PC98 */
 			/* clear the screen and set the border color */
-			fillw(((FG_LIGHTGREY|BG_BLACK) << 8) | scr_map[0x20],
-			      window, scp->xsize * scp->ysize);
+			sc_vtb_clear(&scp->scr, sc->scr_map[0x20],
+				     (FG_LIGHTGREY | BG_BLACK) << 8);
+			(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
 			set_border(scp, 0);
 			blanked = TRUE;
 			for(i=0; i<NUM_STARS; i++) {
@@ -74,15 +94,22 @@ star_saver(video_adapter_t *adp, int blank)
 			}
 		}
 		cell = random() % NUM_STARS;
-		*((u_short*)(window + stars[cell][0])) =
-			scr_map[pattern[stars[cell][1]]] |
-				colors[random()%sizeof(colors)] << 8;
+		sc_vtb_putc(&scp->scr, stars[cell][0], 
+			    sc->scr_map[pattern[stars[cell][1]]],
+			    colors[random()%sizeof(colors)] << 8);
 		if ((stars[cell][1]+=(random()%4)) >= sizeof(pattern)-1) {
 			stars[cell][0] = random() % (scp->xsize*scp->ysize);
 			stars[cell][1] = 0;
 		}
 	}
 	else {
+#ifdef PC98
+		if (epson_machine_id == 0x20) {
+			outb(0x43f, 0x42);
+			outb(0x0c17, inb(0xc17) | 0x08);
+			outb(0x43f, 0x40);
+		}
+#endif /* PC98 */
 		blanked = FALSE;
 	}
 	return 0;
diff --git a/sys/modules/syscons/warp/warp_saver.c b/sys/modules/syscons/warp/warp_saver.c
index 3476c3644bd5..cd6f42b3358b 100644
--- a/sys/modules/syscons/warp/warp_saver.c
+++ b/sys/modules/syscons/warp/warp_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: warp_saver.c,v 1.4 1999/01/11 03:18:55 yokota Exp $
+ *	$Id: warp_saver.c,v 1.5 1999/04/12 13:34:58 des Exp $
  */
 
 #include <sys/param.h>
@@ -33,11 +33,14 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/syslog.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <machine/md_var.h>
 #include <machine/random.h>
 
-#include <saver.h>
+#include <dev/fb/fbreg.h>
+#include <dev/fb/splashreg.h>
+#include <dev/syscons/syscons.h>
 
 static u_char *vid;
 static int blanked;
diff --git a/sys/sys/cons.h b/sys/sys/cons.h
index 1656b1261d47..ea84d7ea367a 100644
--- a/sys/sys/cons.h
+++ b/sys/sys/cons.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
- *	$Id: cons.h,v 1.18 1999/01/07 14:14:11 yokota Exp $
+ *	$Id: cons.h,v 1.19 1999/01/09 14:07:37 bde Exp $
  */
 
 #ifndef _MACHINE_CONS_H_
@@ -45,6 +45,7 @@
 struct consdev;
 typedef	void	cn_probe_t __P((struct consdev *));
 typedef	void	cn_init_t __P((struct consdev *));
+typedef	void	cn_term_t __P((struct consdev *));
 typedef	int	cn_getc_t __P((dev_t));
 typedef	int	cn_checkc_t __P((dev_t));
 typedef	void	cn_putc_t __P((dev_t, int));
@@ -54,6 +55,8 @@ struct consdev {
 				/* probe hardware and fill in consdev info */
 	cn_init_t	*cn_init;
 				/* turn on as console */
+	cn_term_t	*cn_term;
+				/* turn off as console */
 	cn_getc_t	*cn_getc;
 				/* kernel getchar interface */
 	cn_checkc_t	*cn_checkc;
@@ -75,10 +78,10 @@ struct consdev {
 extern	struct linker_set cons_set;
 extern	int cons_unavail;
 
-#define CONS_DRIVER(name, probe, init, getc, checkc, putc)	\
-	static struct consdev name##_consdev = {		\
-		probe, init, getc, checkc, putc			\
-	};							\
+#define CONS_DRIVER(name, probe, init, term, getc, checkc, putc)	\
+	static struct consdev name##_consdev = {			\
+		probe, init, term, getc, checkc, putc			\
+	};								\
 	DATA_SET(cons_set, name##_consdev)
 
 /* Other kernel entry points. */
diff --git a/sys/sys/consio.h b/sys/sys/consio.h
new file mode 100644
index 000000000000..abc9c1fca1e8
--- /dev/null
+++ b/sys/sys/consio.h
@@ -0,0 +1,385 @@
+/*-
+ * Copyright (c) 1991-1996 Søren Schmidt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *	$Id: console.h,v 1.45 1999/03/10 10:36:47 yokota Exp $
+ */
+
+#ifndef	_SYS_CONSIO_H_
+#define	_SYS_CONSIO_H_
+
+#ifndef KERNEL
+#include <sys/types.h>
+#endif
+#include <sys/ioccom.h>
+
+/*
+ * Console ioctl commands.  Some commands are named as KDXXXX, GIO_XXX, and
+ * PIO_XXX, rather than CONS_XXX, for historical and compatibility reasons.
+ * Some other CONS_XXX commands are works as wrapper around frame buffer 
+ * ioctl commands FBIO_XXX.  Do not try to change all these commands, 
+ * otherwise we shall have compatibility problems.
+ */
+
+/* get/set video mode */
+#define KD_TEXT		0		/* set text mode restore fonts  */
+#define KD_TEXT0	0		/* ditto			*/
+#define KD_GRAPHICS	1		/* set graphics mode 		*/
+#define KD_TEXT1	2		/* set text mode !restore fonts */
+#define KD_PIXEL	3		/* set pixel mode		*/
+#define KDGETMODE	_IOR('K', 9, int)
+#define KDSETMODE	_IO('K', 10 /*, int */)
+
+/* set border color */
+#define KDSBORDER	_IO('K', 13 /*, int */)
+
+/* set up raster(pixel) text mode */
+struct scr_size {
+	int		scr_size[3];
+};
+typedef struct scr_size	scr_size_t;
+
+#define KDRASTER	_IOW('K', 100, scr_size_t)
+
+/* get/set screen char map */
+struct scrmap {
+	char		scrmap[256];
+};
+typedef struct scrmap	scrmap_t;
+
+#define GIO_SCRNMAP	_IOR('k', 2, scrmap_t)
+#define PIO_SCRNMAP	_IOW('k', 3, scrmap_t)
+
+/* get the current text attribute */
+#define GIO_ATTR	_IOR('a', 0, int)
+
+/* get the current text color */
+#define GIO_COLOR	_IOR('c', 0, int)
+
+/* get the adapter type (equivalent to FBIO_ADPTYPE) */
+#define CONS_CURRENT	_IOR('c', 1, int)
+
+/* get the current video mode (equivalent to FBIO_GETMODE) */
+#define CONS_GET	_IOR('c', 2, int)
+
+/* not supported? */
+#define CONS_IO		_IO('c', 3)
+
+/* set blank time interval */
+#define CONS_BLANKTIME	_IOW('c', 4, int)
+
+/* set/get the screen saver (these ioctls are current noop) */
+struct ssaver	{
+#define MAXSSAVER	16
+	char		name[MAXSSAVER];
+	int		num;
+	long		time;
+};
+typedef struct ssaver	ssaver_t;
+
+#define CONS_SSAVER	_IOW('c', 5, ssaver_t)
+#define CONS_GSAVER	_IOWR('c', 6, ssaver_t)
+
+/* set the text cursor shape */
+#define CONS_BLINK_CURSOR (1 << 0)
+#define CONS_CHAR_CURSOR (1 << 1)
+#define CONS_CURSORTYPE	_IOW('c', 7, int)
+
+/* set the bell type to audible or visual */
+#define CONS_VISUAL_BELL (1 << 0)
+#define CONS_QUIET_BELL	(1 << 1)
+#define CONS_BELLTYPE	_IOW('c', 8, int)
+
+/* set the history (scroll back) buffer size (in lines) */
+#define CONS_HISTORY	_IOW('c', 9, int)
+
+/* mouse cursor ioctl */
+struct mouse_data {
+	int		x;
+	int 		y;
+	int 		z;
+	int 		buttons;
+};
+typedef struct mouse_data mouse_data_t;
+
+struct mouse_mode {
+	int		mode;
+	int		signal;
+};
+typedef struct mouse_mode mouse_mode_t;
+
+struct mouse_event {
+	int		id;			/* one based */
+	int		value;
+};
+typedef struct mouse_event mouse_event_t;
+
+struct mouse_info {
+	int		operation;
+#define MOUSE_SHOW	0x01
+#define MOUSE_HIDE	0x02
+#define MOUSE_MOVEABS	0x03
+#define MOUSE_MOVEREL	0x04
+#define MOUSE_GETINFO	0x05
+#define MOUSE_MODE	0x06
+#define MOUSE_ACTION	0x07
+#define MOUSE_MOTION_EVENT	0x08
+#define MOUSE_BUTTON_EVENT	0x09
+	union {
+		mouse_data_t	data;
+		mouse_mode_t	mode;
+		mouse_event_t	event;
+	}		u;
+};
+typedef struct mouse_info mouse_info_t;
+
+#define CONS_MOUSECTL	_IOWR('c', 10, mouse_info_t)
+
+/* see if the vty has been idle */
+#define CONS_IDLE	_IOR('c', 11, int)
+
+/* set the screen saver mode */
+#define CONS_LKM_SAVER	0
+#define CONS_USR_SAVER	1
+#define CONS_SAVERMODE	_IOW('c', 12, int)
+
+/* start the screen saver */
+#define CONS_SAVERSTART	_IOW('c', 13, int)
+
+/* set/get font data */
+struct fnt8 {
+	char		fnt8x8[8*256];
+};
+typedef struct fnt8	fnt8_t;
+
+struct fnt14 {
+	char		fnt8x14[14*256];
+};
+typedef struct fnt14	fnt14_t;
+
+struct fnt16 {
+	char		fnt8x16[16*256];
+};
+typedef struct fnt16	fnt16_t;
+
+#define PIO_FONT8x8	_IOW('c', 64, fnt8_t)
+#define GIO_FONT8x8	_IOR('c', 65, fnt8_t)
+#define PIO_FONT8x14	_IOW('c', 66, fnt14_t)
+#define GIO_FONT8x14	_IOR('c', 67, fnt14_t)
+#define PIO_FONT8x16	_IOW('c', 68, fnt16_t)
+#define GIO_FONT8x16	_IOR('c', 69, fnt16_t)
+
+/* get video mode information */
+struct colors	{
+	char		fore;
+	char		back;
+};
+
+struct vid_info {
+	short		size;
+	short		m_num;
+	u_short		mv_row, mv_col;
+	u_short		mv_rsz, mv_csz;
+	struct colors	mv_norm,
+			mv_rev,
+			mv_grfc;
+	u_char		mv_ovscan;
+	u_char		mk_keylock;
+};
+typedef struct vid_info vid_info_t;
+
+#define CONS_GETINFO    _IOWR('c', 73, vid_info_t)
+
+/* get version */
+#define CONS_GETVERS	_IOR('c', 74, int)
+
+/* get the video adapter index (equivalent to FBIO_ADAPTER) */
+#define CONS_CURRENTADP	_IOR('c', 100, int)
+
+/* get the video adapter information (equivalent to FBIO_ADPINFO) */
+#define CONS_ADPINFO	_IOWR('c', 101, video_adapter_info_t)
+
+/* get the video mode information (equivalent to FBIO_MODEINFO) */
+#define CONS_MODEINFO	_IOWR('c', 102, video_info_t)
+
+/* find a video mode (equivalent to FBIO_FINDMODE) */
+#define CONS_FINDMODE	_IOWR('c', 103, video_info_t)
+
+/* set the frame buffer window origin (equivalent to FBIO_SETWINORG) */
+#define CONS_SETWINORG	_IO('c', 104 /*, u_int */) 
+
+/* use the specified keyboard */
+#define CONS_SETKBD	_IO('c', 110 /*, int */)
+
+/* release the current keyboard */
+#define CONS_RELKBD	_IO('c', 111)
+
+#ifdef PC98
+#define ADJUST_CLOCK	_IO('t',100)		/* for 98note resume */
+#endif
+
+/*
+ * Vty switching ioctl commands.
+ */
+
+/* get the next available vty */
+#define VT_OPENQRY	_IOR('v', 1, int)
+
+/* set/get vty switching mode */
+#ifndef _VT_MODE_DECLARED
+#define	_VT_MODE_DECLARED
+struct vt_mode {
+	char		mode;
+#define VT_AUTO		0		/* switching is automatic 	*/
+#define VT_PROCESS	1		/* switching controlled by prog */
+#define VT_KERNEL	255		/* switching controlled in kernel */
+	char		waitv;		/* not implemented yet 	SOS	*/
+	short		relsig;
+	short		acqsig;
+	short		frsig;		/* not implemented yet	SOS	*/
+};
+typedef struct vt_mode vtmode_t;
+#endif /* !_VT_MODE_DECLARED */
+
+#define VT_SETMODE	_IOW('v', 2, vtmode_t)
+#define VT_GETMODE	_IOR('v', 3, vtmode_t)
+
+/* acknowledge release or acquisition of a vty */
+#define VT_FALSE	0
+#define VT_TRUE		1
+#define VT_ACKACQ	2
+#define VT_RELDISP	_IO('v', 4 /*, int */)
+
+/* activate the specified vty */
+#define VT_ACTIVATE	_IO('v', 5 /*, int */)
+
+/* wait until the specified vty is activate */
+#define VT_WAITACTIVE	_IO('v', 6 /*, int */)
+
+/* get the currently active vty */
+#define VT_GETACTIVE	_IOR('v', 7, int)
+
+/* get the index of the vty */
+#define VT_GETINDEX	_IOR('v', 8, int)
+
+/*
+ * Video mode switching ioctl.  See sys/fbio.h for mode numbers.
+ */
+
+#define SW_B40x25 	_IO('S', M_B40x25)
+#define SW_C40x25  	_IO('S', M_C40x25)
+#define SW_B80x25  	_IO('S', M_B80x25)
+#define SW_C80x25  	_IO('S', M_C80x25)
+#define SW_BG320   	_IO('S', M_BG320)
+#define SW_CG320   	_IO('S', M_CG320)
+#define SW_BG640   	_IO('S', M_BG640)
+#define SW_EGAMONO80x25 _IO('S', M_EGAMONO80x25)
+#define SW_CG320_D    	_IO('S', M_CG320_D)
+#define SW_CG640_E    	_IO('S', M_CG640_E)
+#define SW_EGAMONOAPA 	_IO('S', M_EGAMONOAPA)
+#define SW_CG640x350  	_IO('S', M_CG640x350)
+#define SW_ENH_MONOAPA2 _IO('S', M_ENHMONOAPA2)
+#define SW_ENH_CG640  	_IO('S', M_ENH_CG640)
+#define SW_ENH_B40x25  	_IO('S', M_ENH_B40x25)
+#define SW_ENH_C40x25  	_IO('S', M_ENH_C40x25)
+#define SW_ENH_B80x25  	_IO('S', M_ENH_B80x25)
+#define SW_ENH_C80x25  	_IO('S', M_ENH_C80x25)
+#define SW_ENH_B80x43  	_IO('S', M_ENH_B80x43)
+#define SW_ENH_C80x43  	_IO('S', M_ENH_C80x43)
+#define SW_MCAMODE    	_IO('S', M_MCA_MODE)
+#define SW_VGA_C40x25	_IO('S', M_VGA_C40x25)
+#define SW_VGA_C80x25	_IO('S', M_VGA_C80x25)
+#define SW_VGA_C80x30	_IO('S', M_VGA_C80x30)
+#define SW_VGA_C80x50	_IO('S', M_VGA_C80x50)
+#define SW_VGA_C80x60	_IO('S', M_VGA_C80x60)
+#define SW_VGA_M80x25	_IO('S', M_VGA_M80x25)
+#define SW_VGA_M80x30	_IO('S', M_VGA_M80x30)
+#define SW_VGA_M80x50	_IO('S', M_VGA_M80x50)
+#define SW_VGA_M80x60	_IO('S', M_VGA_M80x60)
+#define SW_VGA11	_IO('S', M_VGA11)
+#define SW_BG640x480	_IO('S', M_VGA11)
+#define SW_VGA12	_IO('S', M_VGA12)
+#define SW_CG640x480	_IO('S', M_VGA12)
+#define SW_VGA13	_IO('S', M_VGA13)
+#define SW_VGA_CG320	_IO('S', M_VGA13)
+#define SW_VGA_CG640	_IO('S', M_VGA_CG640)
+#define SW_VGA_MODEX	_IO('S', M_VGA_MODEX)
+
+#define SW_PC98_80x25	_IO('S', M_PC98_80x25)
+#define SW_PC98_80x30	_IO('S', M_PC98_80x30)
+
+#define SW_VGA_C90x25	_IO('S', M_VGA_C90x25)
+#define SW_VGA_M90x25	_IO('S', M_VGA_M90x25)
+#define SW_VGA_C90x30	_IO('S', M_VGA_C90x30)
+#define SW_VGA_M90x30	_IO('S', M_VGA_M90x30)
+#define SW_VGA_C90x43	_IO('S', M_VGA_C90x43)
+#define SW_VGA_M90x43	_IO('S', M_VGA_M90x43)
+#define SW_VGA_C90x50	_IO('S', M_VGA_C90x50)
+#define SW_VGA_M90x50	_IO('S', M_VGA_M90x50)
+#define SW_VGA_C90x60	_IO('S', M_VGA_C90x60)
+#define SW_VGA_M90x60	_IO('S', M_VGA_M90x60)
+
+#define SW_TEXT_80x25	_IO('S', M_TEXT_80x25)
+#define SW_TEXT_80x30	_IO('S', M_TEXT_80x30)
+#define SW_TEXT_80x43	_IO('S', M_TEXT_80x43)
+#define SW_TEXT_80x50	_IO('S', M_TEXT_80x50)
+#define SW_TEXT_80x60	_IO('S', M_TEXT_80x60)
+#define SW_TEXT_132x25	_IO('S', M_TEXT_132x25)
+#define SW_TEXT_132x30	_IO('S', M_TEXT_132x30)
+#define SW_TEXT_132x43	_IO('S', M_TEXT_132x43)
+#define SW_TEXT_132x50	_IO('S', M_TEXT_132x50)
+#define SW_TEXT_132x60	_IO('S', M_TEXT_132x60)
+
+#define SW_VESA_CG640x400	_IO('V', M_VESA_CG640x400 - M_VESA_BASE)
+#define SW_VESA_CG640x480	_IO('V', M_VESA_CG640x480 - M_VESA_BASE)
+#define SW_VESA_800x600		_IO('V', M_VESA_800x600 - M_VESA_BASE)
+#define SW_VESA_CG800x600	_IO('V', M_VESA_CG800x600 - M_VESA_BASE)
+#define SW_VESA_1024x768	_IO('V', M_VESA_1024x768 - M_VESA_BASE)
+#define SW_VESA_CG1024x768	_IO('V', M_VESA_CG1024x768 - M_VESA_BASE)
+#define SW_VESA_1280x1024	_IO('V', M_VESA_1280x1024 - M_VESA_BASE)
+#define SW_VESA_CG1280x1024	_IO('V', M_VESA_CG1280x1024 - M_VESA_BASE)
+#define SW_VESA_C80x60		_IO('V', M_VESA_C80x60 - M_VESA_BASE)
+#define SW_VESA_C132x25		_IO('V', M_VESA_C132x25 - M_VESA_BASE)
+#define SW_VESA_C132x43		_IO('V', M_VESA_C132x43 - M_VESA_BASE)
+#define SW_VESA_C132x50		_IO('V', M_VESA_C132x50 - M_VESA_BASE)
+#define SW_VESA_C132x60		_IO('V', M_VESA_C132x60 - M_VESA_BASE)
+#define SW_VESA_32K_320		_IO('V', M_VESA_32K_320 - M_VESA_BASE)
+#define SW_VESA_64K_320		_IO('V', M_VESA_64K_320 - M_VESA_BASE)
+#define SW_VESA_FULL_320	_IO('V', M_VESA_FULL_320 - M_VESA_BASE)
+#define SW_VESA_32K_640		_IO('V', M_VESA_32K_640 - M_VESA_BASE)
+#define SW_VESA_64K_640		_IO('V', M_VESA_64K_640 - M_VESA_BASE)
+#define SW_VESA_FULL_640	_IO('V', M_VESA_FULL_640 - M_VESA_BASE)
+#define SW_VESA_32K_800		_IO('V', M_VESA_32K_800 - M_VESA_BASE)
+#define SW_VESA_64K_800		_IO('V', M_VESA_64K_800 - M_VESA_BASE)
+#define SW_VESA_FULL_800	_IO('V', M_VESA_FULL_800 - M_VESA_BASE)
+#define SW_VESA_32K_1024	_IO('V', M_VESA_32K_1024 - M_VESA_BASE)
+#define SW_VESA_64K_1024	_IO('V', M_VESA_64K_1024 - M_VESA_BASE)
+#define SW_VESA_FULL_1024	_IO('V', M_VESA_FULL_1024 - M_VESA_BASE)
+#define SW_VESA_32K_1280	_IO('V', M_VESA_32K_1280 - M_VESA_BASE)
+#define SW_VESA_64K_1280	_IO('V', M_VESA_64K_1280 - M_VESA_BASE)
+#define SW_VESA_FULL_1280	_IO('V', M_VESA_FULL_1280 - M_VESA_BASE)
+
+#endif /* !_SYS_CONSIO_H_ */
diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h
index 5dca5992c1c1..c4b51537f0fa 100644
--- a/sys/sys/fbio.h
+++ b/sys/sys/fbio.h
@@ -36,12 +36,17 @@
  *
  *	@(#)fbio.h	8.2 (Berkeley) 10/30/93
  *
- * $Id$
+ * $Id: fbio.h,v 1.5 1997/02/22 09:45:12 peter Exp $
  */
 
 #ifndef _SYS_FBIO_H_
 #define _SYS_FBIO_H_
 
+#ifndef KERNEL
+#include <sys/types.h>
+#endif
+#include <sys/ioccom.h>
+
 /*
  * Frame buffer ioctls (from Sprite, trimmed to essentials for X11).
  */
@@ -72,7 +77,15 @@
 #define	FBTYPE_RESERVED2	18	/* reserved, do not use */
 #define	FBTYPE_RESERVED1	19	/* reserved, do not use */
 
-#define	FBTYPE_LASTPLUSONE	20	/* max number of fbs (change as add) */
+#define	FBTYPE_MDA		20
+#define	FBTYPE_HERCULES		21
+#define	FBTYPE_CGA		22
+#define	FBTYPE_EGA		23
+#define	FBTYPE_VGA		24
+#define	FBTYPE_PC98		25
+#define	FBTYPE_TGA		26
+
+#define	FBTYPE_LASTPLUSONE	27	/* max number of fbs (change as add) */
 
 /*
  * Frame buffer descriptor as returned by FBIOGTYPE.
@@ -188,4 +201,274 @@ struct fbcursor {
 /* get maximum cursor size */
 #define	FBIOGCURMAX	_IOR('F', 28, struct fbcurpos)
 
-#endif
+/* The new style frame buffer ioctls. */
+
+/* video mode information block */
+struct video_info {
+    int			vi_mode;	/* mode number, see below */
+    int			vi_flags;
+#define V_INFO_COLOR	(1 << 0)
+#define V_INFO_GRAPHICS	(1 << 1)
+#define V_INFO_LINEAR	(1 << 2)
+#define V_INFO_VESA	(1 << 3)
+    int			vi_width;
+    int			vi_height;
+    int			vi_cwidth;
+    int			vi_cheight;
+    int			vi_depth;
+    int			vi_planes;
+    u_int		vi_window;	/* physical address */
+    size_t		vi_window_size;
+    size_t		vi_window_gran;
+    u_int		vi_buffer;	/* physical address */
+    size_t		vi_buffer_size;
+    int			vi_mem_model;
+#define V_INFO_MM_OTHER  (-1)
+#define V_INFO_MM_TEXT	 0
+#define V_INFO_MM_PLANAR 1
+#define V_INFO_MM_PACKED 2
+#define V_INFO_MM_DIRECT 3
+#define V_INFO_MM_CGA	 100
+#define V_INFO_MM_HGC	 101
+    /* for MM_PACKED and MM_DIRECT only */
+    int			vi_pixel_size;	/* in bytes */
+    /* for MM_DIRECT only */
+    int			vi_pixel_fields[4];	/* RGB and reserved fields */
+    int			vi_pixel_fsizes[4];
+    /* reserved */
+    u_char		vi_reserved[64];
+};
+typedef struct video_info video_info_t;
+
+/* adapter infromation block */
+struct video_adapter {
+    int			va_index;
+    int			va_type;
+#define KD_OTHER	0		/* unknown */
+#define KD_MONO		1		/* monochrome adapter */
+#define KD_HERCULES	2		/* hercules adapter */
+#define KD_CGA		3		/* color graphics adapter */
+#define KD_EGA		4		/* enhanced graphics adapter */
+#define KD_VGA		5		/* video graphics adapter */
+#define KD_PC98		6		/* PC-98 display */
+#define KD_TGA		7		/* TGA */
+    char		*va_name;
+    int			va_unit;
+    int			va_minor;
+    int			va_flags;
+#define V_ADP_COLOR	(1 << 0)
+#define V_ADP_MODECHANGE (1 << 1)
+#define V_ADP_STATESAVE	(1 << 2)
+#define V_ADP_STATELOAD	(1 << 3)
+#define V_ADP_FONT	(1 << 4)
+#define V_ADP_PALETTE	(1 << 5)
+#define V_ADP_BORDER	(1 << 6)
+#define V_ADP_VESA	(1 << 7)
+#define V_ADP_PROBED	(1 << 16)
+#define V_ADP_INITIALIZED (1 << 17)
+#define V_ADP_REGISTERED (1 << 18)
+    int			va_io_base;
+    int			va_io_size;
+    int			va_crtc_addr;
+    int			va_mem_base;
+    int			va_mem_size;
+    vm_offset_t		va_window;	/* virtual address */
+    size_t		va_window_size;
+    size_t		va_window_gran;
+    u_int		va_window_orig;
+    vm_offset_t		va_buffer;	/* virtual address */
+    size_t		va_buffer_size;
+    int			va_initial_mode;
+    int			va_initial_bios_mode;
+    int			va_mode;
+    struct video_info	va_info;
+    int			va_line_width;
+    struct {
+	int		x;
+	int		y;
+    } 			va_disp_start;
+    void		*va_token;
+};
+typedef struct video_adapter video_adapter_t;
+
+struct video_adapter_info {
+    int			va_index;
+    int			va_type;
+    char		va_name[16];
+    int			va_unit;
+    int			va_flags;
+    int			va_io_base;
+    int			va_io_size;
+    int			va_crtc_addr;
+    int			va_mem_base;
+    int			va_mem_size;
+    u_int		va_window;	/* virtual address */
+    size_t		va_window_size;
+    size_t		va_window_gran;
+    u_int		va_unused0;
+    size_t		va_buffer_size;
+    int			va_initial_mode;
+    int			va_initial_bios_mode;
+    int			va_mode;
+    int			va_line_width;
+    struct {
+	int		x;
+	int		y;
+    } 			va_disp_start;
+    u_int		va_window_orig;
+    /* reserved */
+    u_char		va_reserved[64];
+};
+typedef struct video_adapter_info video_adapter_info_t;
+
+/* some useful video adapter index */
+#define V_ADP_PRIMARY	0
+#define V_ADP_SECONDARY	1
+
+/* video mode numbers */
+
+#define M_B40x25	0	/* black & white 40 columns */
+#define M_C40x25	1	/* color 40 columns */
+#define M_B80x25	2	/* black & white 80 columns */
+#define M_C80x25	3	/* color 80 columns */
+#define M_BG320		4	/* black & white graphics 320x200 */
+#define M_CG320		5	/* color graphics 320x200 */
+#define M_BG640		6	/* black & white graphics 640x200 hi-res */
+#define M_EGAMONO80x25  7       /* ega-mono 80x25 */
+#define M_CG320_D	13	/* ega mode D */
+#define M_CG640_E	14	/* ega mode E */
+#define M_EGAMONOAPA	15	/* ega mode F */
+#define M_CG640x350	16	/* ega mode 10 */
+#define M_ENHMONOAPA2	17	/* ega mode F with extended memory */
+#define M_ENH_CG640	18	/* ega mode 10* */
+#define M_ENH_B40x25    19      /* ega enhanced black & white 40 columns */
+#define M_ENH_C40x25    20      /* ega enhanced color 40 columns */
+#define M_ENH_B80x25    21      /* ega enhanced black & white 80 columns */
+#define M_ENH_C80x25    22      /* ega enhanced color 80 columns */
+#define M_VGA_C40x25	23	/* vga 8x16 font on color */
+#define M_VGA_C80x25	24	/* vga 8x16 font on color */
+#define M_VGA_M80x25	25	/* vga 8x16 font on mono */
+
+#define M_VGA11		26	/* vga 640x480 2 colors */
+#define M_BG640x480	26
+#define M_VGA12		27	/* vga 640x480 16 colors */
+#define M_CG640x480	27
+#define M_VGA13		28	/* vga 320x200 256 colors */
+#define M_VGA_CG320	28
+
+#define M_VGA_C80x50	30	/* vga 8x8 font on color */
+#define M_VGA_M80x50	31	/* vga 8x8 font on color */
+#define M_VGA_C80x30	32	/* vga 8x16 font on color */
+#define M_VGA_M80x30	33	/* vga 8x16 font on color */
+#define M_VGA_C80x60	34	/* vga 8x8 font on color */
+#define M_VGA_M80x60	35	/* vga 8x8 font on color */
+#define M_VGA_CG640	36	/* vga 640x400 256 color */
+#define M_VGA_MODEX	37	/* vga 320x240 256 color */
+
+#define M_VGA_C90x25	40	/* vga 8x16 font on color */
+#define M_VGA_M90x25	41	/* vga 8x16 font on mono */
+#define M_VGA_C90x30	42	/* vga 8x16 font on color */
+#define M_VGA_M90x30	43	/* vga 8x16 font on mono */
+#define M_VGA_C90x43	44	/* vga 8x8 font on color */
+#define M_VGA_M90x43	45	/* vga 8x8 font on mono */
+#define M_VGA_C90x50	46	/* vga 8x8 font on color */
+#define M_VGA_M90x50	47	/* vga 8x8 font on mono */
+#define M_VGA_C90x60	48	/* vga 8x8 font on color */
+#define M_VGA_M90x60	49	/* vga 8x8 font on mono */
+
+#define M_ENH_B80x43	0x70	/* ega black & white 80x43 */
+#define M_ENH_C80x43	0x71	/* ega color 80x43 */
+
+#define M_PC98_80x25	98	/* PC98 80x25 */
+#define M_PC98_80x30	99	/* PC98 80x30 */
+
+#define M_HGC_P0	0xe0	/* hercules graphics - page 0 @ B0000 */
+#define M_HGC_P1	0xe1	/* hercules graphics - page 1 @ B8000 */
+#define M_MCA_MODE	0xff	/* monochrome adapter mode */
+
+#define M_TEXT_80x25	200	/* generic text modes */
+#define M_TEXT_80x30	201
+#define M_TEXT_80x43	202
+#define M_TEXT_80x50	203
+#define M_TEXT_80x60	204
+#define M_TEXT_132x25	205
+#define M_TEXT_132x30	206
+#define M_TEXT_132x43	207
+#define M_TEXT_132x50	208
+#define M_TEXT_132x60	209
+
+#define M_VESA_BASE		0x100	/* VESA mode number base */
+#define M_VESA_CG640x400	0x100	/* 640x400, 256 color */
+#define M_VESA_CG640x480	0x101	/* 640x480, 256 color */
+#define M_VESA_800x600		0x102	/* 800x600, 16 color */
+#define M_VESA_CG800x600	0x103	/* 800x600, 256 color */
+#define M_VESA_1024x768		0x104	/* 1024x768, 16 color */
+#define M_VESA_CG1024x768	0x105	/* 1024x768, 256 color */
+#define M_VESA_1280x1024	0x106	/* 1280x1024, 16 color */
+#define M_VESA_CG1280x1024	0x107	/* 1280x1024, 256 color */
+#define M_VESA_C80x60		0x108	/* 8x8 font */
+#define M_VESA_C132x25		0x109	/* 8x16 font */
+#define M_VESA_C132x43		0x10a	/* 8x14 font */
+#define M_VESA_C132x50		0x10b	/* 8x8 font */
+#define M_VESA_C132x60		0x10c	/* 8x8 font */
+#define M_VESA_32K_320		0x10d	/* 320x200, 5:5:5 */
+#define M_VESA_64K_320		0x10e	/* 320x200, 5:6:5 */
+#define M_VESA_FULL_320		0x10f	/* 320x200, 8:8:8 */
+#define M_VESA_32K_640		0x110	/* 640x480, 5:5:5 */
+#define M_VESA_64K_640		0x111	/* 640x480, 5:6:5 */
+#define M_VESA_FULL_640		0x112	/* 640x480, 8:8:8 */
+#define M_VESA_32K_800		0x113	/* 800x600, 5:5:5 */
+#define M_VESA_64K_800		0x114	/* 800x600, 5:6:5 */
+#define M_VESA_FULL_800		0x115	/* 800x600, 8:8:8 */
+#define M_VESA_32K_1024		0x116	/* 1024x768, 5:5:5 */
+#define M_VESA_64K_1024		0x117	/* 1024x768, 5:6:5 */
+#define M_VESA_FULL_1024	0x118	/* 1024x768, 8:8:8 */
+#define M_VESA_32K_1280		0x119	/* 1280x1024, 5:5:5 */
+#define M_VESA_64K_1280		0x11a	/* 1280x1024, 5:6:5 */
+#define M_VESA_FULL_1280	0x11b	/* 1280x1024, 8:8:8 */
+#define M_VESA_MODE_MAX		0x1ff
+
+struct video_display_start {
+	int		x;
+	int		y;
+};
+typedef struct video_display_start video_display_start_t;
+
+struct video_color_palette {
+	int		index;		/* first element (zero-based) */
+	int		count;		/* number of elements */
+	u_char		*red;		/* red */
+	u_char		*green;		/* green */
+	u_char		*blue;		/* blue */
+	u_char		*transparent;	/* may be NULL */
+};
+typedef struct video_color_palette video_color_palette_t;
+
+/* adapter info. */
+#define FBIO_ADAPTER	_IOR('F', 100, int)
+#define FBIO_ADPTYPE	_IOR('F', 101, int)
+#define FBIO_ADPINFO	_IOR('F', 102, struct video_adapter_info)
+
+/* video mode control */
+#define FBIO_MODEINFO	_IOWR('F', 103, struct video_info)
+#define FBIO_FINDMODE	_IOWR('F', 104, struct video_info)
+#define FBIO_GETMODE	_IOR('F', 105, int)
+#define FBIO_SETMODE	_IOW('F', 106, int)
+
+/* get/set frame buffer window origin */
+#define FBIO_GETWINORG	_IOR('F', 107, u_int)
+#define FBIO_SETWINORG	_IOW('F', 108, u_int)
+
+/* get/set display start address */
+#define FBIO_GETDISPSTART	_IOR('F', 109, video_display_start_t) 
+#define FBIO_SETDISPSTART	_IOW('F', 110, video_display_start_t)
+
+/* get/set scan line width */
+#define FBIO_GETLINEWIDTH	_IOR('F', 111, u_int) 
+#define FBIO_SETLINEWIDTH	_IOW('F', 112, u_int)
+
+/* color palette control */
+#define FBIO_GETPALETTE	_IOW('F', 113, video_color_palette_t)
+#define FBIO_SETPALETTE	_IOW('F', 114, video_color_palette_t)
+
+#endif /* !_SYS_FBIO_H_ */
diff --git a/sys/sys/kbio.h b/sys/sys/kbio.h
new file mode 100644
index 000000000000..c8e99471e67a
--- /dev/null
+++ b/sys/sys/kbio.h
@@ -0,0 +1,228 @@
+/*-
+ * $Id: $
+ */
+
+#ifndef	_SYS_KBIO_H_
+#define	_SYS_KBIO_H_
+
+#ifndef KERNEL
+#include <sys/types.h>
+#endif
+#include <sys/ioccom.h>
+
+/* get/set keyboard I/O mode */
+#define K_RAW		0		/* keyboard returns scancodes	*/
+#define K_XLATE		1		/* keyboard returns ascii 	*/
+#define K_CODE		2		/* keyboard returns keycodes 	*/
+#define KDGKBMODE 	_IOR('K', 6, int)
+#define KDSKBMODE 	_IO('K', 7 /*, int */)
+
+/* make tone */
+#define KDMKTONE	_IO('K', 8 /*, int */)
+
+/* see console.h for the definitions of the following ioctls */
+#if notdef
+#define KDGETMODE	_IOR('K', 9, int)
+#define KDSETMODE	_IO('K', 10 /*, int */)
+#define KDSBORDER	_IO('K', 13 /*, int */)
+#endif
+
+/* get/set keyboard lock state */
+#define CLKED		1		/* Caps locked			*/
+#define NLKED		2		/* Num locked			*/
+#define SLKED		4		/* Scroll locked		*/
+#define ALKED		8		/* AltGr locked			*/
+#define LOCK_MASK	(CLKED | NLKED | SLKED | ALKED)
+#define KDGKBSTATE	_IOR('K', 19, int)
+#define KDSKBSTATE	_IO('K', 20 /*, int */)
+
+/* enable/disable I/O access */
+#define KDENABIO	_IO('K', 60)
+#define KDDISABIO	_IO('K', 61)
+
+/* make sound */
+#define KIOCSOUND	_IO('K', 63 /*, int */)
+
+/* get keyboard model */
+#define KB_OTHER	0		/* keyboard not known 		*/
+#define KB_84		1		/* 'old' 84 key AT-keyboard	*/
+#define KB_101		2		/* MF-101 or MF-102 keyboard	*/
+#define KDGKBTYPE	_IOR('K', 64, int)
+
+/* get/set keyboard LED state */
+#define LED_CAP		1		/* Caps lock LED 		*/
+#define LED_NUM		2		/* Num lock LED 		*/
+#define LED_SCR		4		/* Scroll lock LED 		*/
+#define LED_MASK	(LED_CAP | LED_NUM | LED_SCR)
+#define KDGETLED	_IOR('K', 65, int)
+#define KDSETLED	_IO('K', 66 /*, int */)
+
+/* set keyboard repeat rate (obsolete, use KDSETREPEAT below) */
+#define KDSETRAD	_IO('K', 67 /*, int */)
+
+/* see console.h for the definition of the following ioctl */
+#if notdef
+#define KDRASTER	_IOW('K', 100, scr_size_t)
+#endif
+
+/* get keyboard information */
+struct keyboard_info {
+	int		kb_index;	/* kbdio index#			*/
+	char		kb_name[16];	/* driver name			*/
+	int		kb_unit;	/* unit#			*/
+	int		kb_type;	/* KB_84, KB_101, KB_OTHER,...	*/
+	int		kb_config;	/* device configuration flags	*/
+	int		kb_flags;	/* internal flags		*/
+};
+typedef struct keyboard_info keyboard_info_t;
+#define KDGKBINFO	_IOR('K', 101, keyboard_info_t)
+
+/* set keyboard repeat rate (new interface) */
+struct keyboard_repeat {
+	int		kb_repeat[2];
+};
+typedef struct keyboard_repeat keyboard_repeat_t;
+#define KDSETREPEAT	_IOW('K', 102, keyboard_repeat_t)
+
+/* get/set key map/accent map/function key strings */
+
+#define NUM_KEYS	256		/* number of keys in table	*/
+#define NUM_STATES	8		/* states per key		*/
+#define ALTGR_OFFSET	128		/* offset for altlock keys	*/
+
+#define NUM_DEADKEYS	15		/* number of accent keys	*/
+#define NUM_ACCENTCHARS	52		/* max number of accent chars	*/
+
+#define NUM_FKEYS	96		/* max number of function keys	*/
+#define MAXFK		16		/* max length of a function key str */
+
+#ifndef _KEYMAP_DECLARED
+#define	_KEYMAP_DECLARED
+
+struct keyent_t {
+	u_char		map[NUM_STATES];
+	u_char		spcl;
+	u_char		flgs;
+#define	FLAG_LOCK_O	0
+#define	FLAG_LOCK_C	1
+#define FLAG_LOCK_N	2
+};
+
+struct keymap {
+	u_short		n_keys;
+	struct keyent_t	key[NUM_KEYS];
+};
+typedef struct keymap keymap_t;
+
+#endif /* !_KEYMAP_DECLARED */
+
+/* defines for "special" keys (spcl bit set in keymap) */
+#define NOP		0x00		/* nothing (dead key)		*/
+#define LSH		0x02		/* left shift key		*/
+#define RSH		0x03		/* right shift key		*/
+#define CLK		0x04		/* caps lock key		*/
+#define NLK		0x05		/* num lock key			*/
+#define SLK		0x06		/* scroll lock key		*/
+#define LALT		0x07		/* left alt key			*/
+#define BTAB		0x08		/* backwards tab		*/
+#define LCTR		0x09		/* left control key		*/
+#define NEXT		0x0a		/* switch to next screen 	*/
+#define F_SCR		0x0b		/* switch to first screen 	*/
+#define L_SCR		0x1a		/* switch to last screen 	*/
+#define F_FN		0x1b		/* first function key 		*/
+#define L_FN		0x7a		/* last function key 		*/
+/*			0x7b-0x7f	   reserved do not use !	*/
+#define RCTR		0x80		/* right control key		*/
+#define RALT		0x81		/* right alt (altgr) key	*/
+#define ALK		0x82		/* alt lock key			*/
+#define ASH		0x83		/* alt shift key		*/
+#define META		0x84		/* meta key			*/
+#define RBT		0x85		/* boot machine			*/
+#define DBG		0x86		/* call debugger		*/
+#define SUSP		0x87		/* suspend power (APM)		*/
+#define SPSC		0x88		/* toggle splash/text screen	*/
+
+#define F_ACC		DGRA		/* first accent key		*/
+#define DGRA		0x89		/* grave			*/
+#define DACU		0x8a		/* acute			*/
+#define DCIR		0x8b		/* circumflex			*/
+#define DTIL		0x8c		/* tilde			*/
+#define DMAC		0x8d		/* macron			*/
+#define DBRE		0x8e		/* breve			*/
+#define DDOT		0x8f		/* dot				*/
+#define DUML		0x90		/* umlaut/diaresis		*/
+#define DDIA		0x90		/* diaresis			*/
+#define DSLA		0x91		/* slash			*/
+#define DRIN		0x92		/* ring				*/
+#define DCED		0x93		/* cedilla			*/
+#define DAPO		0x94		/* apostrophe			*/
+#define DDAC		0x95		/* double acute			*/
+#define DOGO		0x96		/* ogonek			*/
+#define DCAR		0x97		/* caron			*/
+#define L_ACC		DCAR		/* last accent key		*/
+
+#define STBY		0x98		/* Go into standby mode (apm)   */
+#define PREV		0x99		/* switch to previous screen 	*/
+
+#define F(x)		((x)+F_FN-1)
+#define	S(x)		((x)+F_SCR-1)
+#define ACC(x)		((x)+F_ACC)
+
+struct acc_t {
+	u_char		accchar;
+	u_char		map[NUM_ACCENTCHARS][2];
+};
+
+struct accentmap {
+	u_short		n_accs;
+	struct acc_t	acc[NUM_DEADKEYS];
+};
+typedef struct accentmap accentmap_t;
+
+struct keyarg {
+	u_short		keynum;
+	struct keyent_t	key;
+};
+typedef struct keyarg keyarg_t;
+
+struct fkeytab {
+	u_char		str[MAXFK];
+	u_char		len;
+};
+typedef struct fkeytab fkeytab_t;
+
+struct fkeyarg {
+	u_short		keynum;
+	char		keydef[MAXFK];
+	char		flen;
+};
+typedef struct fkeyarg	fkeyarg_t;
+
+#define GETFKEY		_IOWR('k', 0, fkeyarg_t)
+#define SETFKEY		_IOWR('k', 1, fkeyarg_t)
+#if notdef		/* see console.h */
+#define GIO_SCRNMAP	_IOR('k', 2, scrmap_t)
+#define PIO_SCRNMAP	_IOW('k', 3, scrmap_t)
+#endif
+#define GIO_KEYMAP 	_IOR('k', 6, keymap_t)
+#define PIO_KEYMAP 	_IOW('k', 7, keymap_t)
+#define GIO_DEADKEYMAP 	_IOR('k', 8, accentmap_t)
+#define PIO_DEADKEYMAP 	_IOW('k', 9, accentmap_t)
+#define GIO_KEYMAPENT 	_IOWR('k', 10, keyarg_t)
+#define PIO_KEYMAPENT 	_IOW('k', 11, keyarg_t)
+
+/* flags set to the return value in the KD_XLATE mode */
+
+#define NOKEY		0x100		/* no key pressed marker 	*/
+#define FKEY		0x200		/* function key marker 		*/
+#define MKEY		0x400		/* meta key marker (prepend ESC)*/
+#define BKEY		0x800		/* backtab (ESC [ Z)		*/
+
+#define SPCLKEY		0x8000		/* special key			*/
+#define RELKEY		0x4000		/* key released			*/
+#define ERRKEY		0x2000		/* error			*/
+
+#define KEYCHAR(c)	((c) & 0x00ff)
+#define KEYFLAGS(c)	((c) & ~0x00ff)
+
+#endif /* !_SYS_KBIO_H_ */
-- 
cgit v1.3


From c3aac50f284c6cca5b4f2eb46aaa13812cb8b630 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 28 Aug 1999 01:08:13 +0000
Subject: $Id$ -> $FreeBSD$

---
 bin/chflags/chflags.1                                             | 2 +-
 lib/libpam/modules/pam_login_access/login.access.5                | 2 +-
 share/colldef/Makefile                                            | 2 +-
 share/colldef/de_DE.DIS_8859-15.src                               | 2 +-
 share/colldef/de_DE.ISO8859-1.src                                 | 2 +-
 share/colldef/de_DE.ISO8859-15.src                                | 2 +-
 share/colldef/de_DE.ISO_8859-1.src                                | 2 +-
 share/colldef/de_DE.ISO_8859-15.src                               | 2 +-
 share/colldef/es_ES.DIS_8859-15.src                               | 2 +-
 share/colldef/es_ES.ISO8859-1.src                                 | 2 +-
 share/colldef/es_ES.ISO8859-15.src                                | 2 +-
 share/colldef/es_ES.ISO_8859-1.src                                | 2 +-
 share/colldef/es_ES.ISO_8859-15.src                               | 2 +-
 share/colldef/is_IS.DIS_8859-15.src                               | 2 +-
 share/colldef/is_IS.ISO8859-1.src                                 | 2 +-
 share/colldef/is_IS.ISO8859-15.src                                | 2 +-
 share/colldef/is_IS.ISO_8859-1.src                                | 2 +-
 share/colldef/is_IS.ISO_8859-15.src                               | 2 +-
 share/colldef/la_LN.ASCII.src                                     | 2 +-
 share/colldef/la_LN.DIS_8859-15.src                               | 2 +-
 share/colldef/la_LN.ISO8859-1.src                                 | 2 +-
 share/colldef/la_LN.ISO8859-15.src                                | 2 +-
 share/colldef/la_LN.ISO8859-2.src                                 | 2 +-
 share/colldef/la_LN.ISO_8859-1.src                                | 2 +-
 share/colldef/la_LN.ISO_8859-15.src                               | 2 +-
 share/colldef/la_LN.ISO_8859-2.src                                | 2 +-
 share/colldef/la_LN.US-ASCII.src                                  | 2 +-
 share/colldef/lt_LN.ASCII.src                                     | 2 +-
 share/colldef/lt_LN.DIS_8859-15.src                               | 2 +-
 share/colldef/lt_LN.ISO_8859-1.src                                | 2 +-
 share/colldef/lt_LN.ISO_8859-2.src                                | 2 +-
 share/colldef/ru_RU.CP866.src                                     | 2 +-
 share/colldef/ru_RU.KOI8-R.src                                    | 2 +-
 share/colldef/ru_SU.CP866.src                                     | 2 +-
 share/colldef/ru_SU.KOI8-R.src                                    | 2 +-
 share/mklocale/Makefile                                           | 2 +-
 share/mklocale/la_LN.ISO8859-2.src                                | 2 +-
 share/mklocale/la_LN.ISO_8859-2.src                               | 2 +-
 share/mklocale/lt_LN.ISO_8859-2.src                               | 2 +-
 share/mklocale/zh_CN.EUC.src                                      | 2 +-
 share/mklocale/zh_CN.eucCN.src                                    | 2 +-
 sys/Makefile                                                      | 2 +-
 sys/alpha/alpha/atomic.s                                          | 2 +-
 sys/alpha/alpha/autoconf.c                                        | 2 +-
 sys/alpha/alpha/busdma_machdep.c                                  | 2 +-
 sys/alpha/alpha/clock.c                                           | 2 +-
 sys/alpha/alpha/clock_if.m                                        | 2 +-
 sys/alpha/alpha/cpuconf.c                                         | 2 +-
 sys/alpha/alpha/dec_axppci_33.c                                   | 2 +-
 sys/alpha/alpha/dec_eb164.c                                       | 2 +-
 sys/alpha/alpha/dec_eb64plus.c                                    | 2 +-
 sys/alpha/alpha/dec_kn8ae.c                                       | 2 +-
 sys/alpha/alpha/diskslice_machdep.c                               | 2 +-
 sys/alpha/alpha/elf_machdep.c                                     | 2 +-
 sys/alpha/alpha/exception.s                                       | 2 +-
 sys/alpha/alpha/fp_emulate.c                                      | 2 +-
 sys/alpha/alpha/genassym.c                                        | 2 +-
 sys/alpha/alpha/gensetdefs.c                                      | 2 +-
 sys/alpha/alpha/ieee_float.c                                      | 2 +-
 sys/alpha/alpha/ieee_float.h                                      | 2 +-
 sys/alpha/alpha/in_cksum.c                                        | 2 +-
 sys/alpha/alpha/interrupt.c                                       | 2 +-
 sys/alpha/alpha/ipl_funcs.c                                       | 2 +-
 sys/alpha/alpha/locore.s                                          | 2 +-
 sys/alpha/alpha/machdep.c                                         | 2 +-
 sys/alpha/alpha/mem.c                                             | 2 +-
 sys/alpha/alpha/pmap.c                                            | 2 +-
 sys/alpha/alpha/procfs_machdep.c                                  | 2 +-
 sys/alpha/alpha/promcons.c                                        | 2 +-
 sys/alpha/alpha/setdef0.c                                         | 2 +-
 sys/alpha/alpha/setdef1.c                                         | 2 +-
 sys/alpha/alpha/sgmap.c                                           | 2 +-
 sys/alpha/alpha/support.s                                         | 2 +-
 sys/alpha/alpha/swtch.s                                           | 2 +-
 sys/alpha/alpha/sys_machdep.c                                     | 2 +-
 sys/alpha/alpha/timerreg.h                                        | 2 +-
 sys/alpha/alpha/trap.c                                            | 2 +-
 sys/alpha/alpha/vm_machdep.c                                      | 2 +-
 sys/alpha/conf/GENERIC                                            | 2 +-
 sys/alpha/conf/Makefile.alpha                                     | 2 +-
 sys/alpha/conf/NOTES                                              | 2 +-
 sys/alpha/conf/SIMOS                                              | 2 +-
 sys/alpha/conf/devices.alpha                                      | 2 +-
 sys/alpha/conf/files.alpha                                        | 2 +-
 sys/alpha/conf/majors.alpha                                       | 2 +-
 sys/alpha/conf/options.alpha                                      | 2 +-
 sys/alpha/include/_limits.h                                       | 2 +-
 sys/alpha/include/alpha_cpu.h                                     | 2 +-
 sys/alpha/include/ansi.h                                          | 2 +-
 sys/alpha/include/asm.h                                           | 2 +-
 sys/alpha/include/atomic.h                                        | 2 +-
 sys/alpha/include/bootinfo.h                                      | 2 +-
 sys/alpha/include/bus.h                                           | 2 +-
 sys/alpha/include/bus_memio.h                                     | 2 +-
 sys/alpha/include/bus_pio.h                                       | 2 +-
 sys/alpha/include/bwx.h                                           | 2 +-
 sys/alpha/include/chipset.h                                       | 2 +-
 sys/alpha/include/clock.h                                         | 2 +-
 sys/alpha/include/cpu.h                                           | 2 +-
 sys/alpha/include/cpufunc.h                                       | 2 +-
 sys/alpha/include/elf.h                                           | 2 +-
 sys/alpha/include/elf_machdep.h                                   | 2 +-
 sys/alpha/include/endian.h                                        | 2 +-
 sys/alpha/include/float.h                                         | 2 +-
 sys/alpha/include/fpu.h                                           | 2 +-
 sys/alpha/include/frame.h                                         | 2 +-
 sys/alpha/include/ieee.h                                          | 2 +-
 sys/alpha/include/ieeefp.h                                        | 2 +-
 sys/alpha/include/in_cksum.h                                      | 2 +-
 sys/alpha/include/inst.h                                          | 2 +-
 sys/alpha/include/intr.h                                          | 2 +-
 sys/alpha/include/intrcnt.h                                       | 2 +-
 sys/alpha/include/ioctl_fd.h                                      | 2 +-
 sys/alpha/include/ipl.h                                           | 2 +-
 sys/alpha/include/limits.h                                        | 2 +-
 sys/alpha/include/lock.h                                          | 2 +-
 sys/alpha/include/md_var.h                                        | 2 +-
 sys/alpha/include/mouse.h                                         | 2 +-
 sys/alpha/include/pal.h                                           | 2 +-
 sys/alpha/include/param.h                                         | 2 +-
 sys/alpha/include/pc/bios.h                                       | 2 +-
 sys/alpha/include/pc/display.h                                    | 2 +-
 sys/alpha/include/pc/msdos.h                                      | 2 +-
 sys/alpha/include/pc/vesa.h                                       | 2 +-
 sys/alpha/include/pcb.h                                           | 2 +-
 sys/alpha/include/pmap.h                                          | 2 +-
 sys/alpha/include/proc.h                                          | 2 +-
 sys/alpha/include/profile.h                                       | 2 +-
 sys/alpha/include/psl.h                                           | 2 +-
 sys/alpha/include/pte.h                                           | 2 +-
 sys/alpha/include/ptrace.h                                        | 2 +-
 sys/alpha/include/reg.h                                           | 2 +-
 sys/alpha/include/resource.h                                      | 2 +-
 sys/alpha/include/setjmp.h                                        | 2 +-
 sys/alpha/include/sgmap.h                                         | 2 +-
 sys/alpha/include/signal.h                                        | 2 +-
 sys/alpha/include/stdarg.h                                        | 2 +-
 sys/alpha/include/swiz.h                                          | 2 +-
 sys/alpha/include/sysarch.h                                       | 2 +-
 sys/alpha/include/types.h                                         | 2 +-
 sys/alpha/include/varargs.h                                       | 2 +-
 sys/alpha/include/vmparam.h                                       | 2 +-
 sys/alpha/isa/isa.c                                               | 2 +-
 sys/alpha/isa/isa_dma.c                                           | 2 +-
 sys/alpha/isa/isavar.h                                            | 2 +-
 sys/alpha/isa/mcclock_isa.c                                       | 2 +-
 sys/alpha/linux/Makefile                                          | 2 +-
 sys/alpha/linux/linux.h                                           | 2 +-
 sys/alpha/linux/linux_dummy.c                                     | 2 +-
 sys/alpha/linux/linux_genassym.c                                  | 2 +-
 sys/alpha/linux/linux_sysvec.c                                    | 2 +-
 sys/alpha/linux/syscalls.conf                                     | 2 +-
 sys/alpha/linux/syscalls.master                                   | 2 +-
 sys/alpha/pci/apecs.c                                             | 2 +-
 sys/alpha/pci/apecs_pci.c                                         | 2 +-
 sys/alpha/pci/apecsvar.h                                          | 2 +-
 sys/alpha/pci/cia.c                                               | 2 +-
 sys/alpha/pci/cia_pci.c                                           | 2 +-
 sys/alpha/pci/ciareg.h                                            | 2 +-
 sys/alpha/pci/ciavar.h                                            | 2 +-
 sys/alpha/pci/lca.c                                               | 2 +-
 sys/alpha/pci/lca_pci.c                                           | 2 +-
 sys/alpha/pci/lcavar.h                                            | 2 +-
 sys/alpha/pci/pcibus.c                                            | 2 +-
 sys/alpha/pci/pcibus.h                                            | 2 +-
 sys/alpha/pci/tsunami_pci.c                                       | 2 +-
 sys/alpha/pci/tsunamireg.h                                        | 2 +-
 sys/alpha/pci/tsunamivar.h                                        | 2 +-
 sys/alpha/tc/am7990.c                                             | 2 +-
 sys/alpha/tc/am7990reg.h                                          | 2 +-
 sys/alpha/tc/am7990var.h                                          | 2 +-
 sys/alpha/tc/ascvar.h                                             | 2 +-
 sys/alpha/tc/esp.c                                                | 2 +-
 sys/alpha/tc/espreg.h                                             | 2 +-
 sys/alpha/tc/espvar.h                                             | 2 +-
 sys/alpha/tc/if_le_dec.c                                          | 2 +-
 sys/alpha/tc/if_le_ioasic.c                                       | 2 +-
 sys/alpha/tc/if_levar.h                                           | 2 +-
 sys/alpha/tc/ioasic.c                                             | 2 +-
 sys/alpha/tc/ioasicreg.h                                          | 2 +-
 sys/alpha/tc/ioasicvar.h                                          | 2 +-
 sys/alpha/tc/mcclock_ioasic.c                                     | 2 +-
 sys/alpha/tc/sticreg.h                                            | 2 +-
 sys/alpha/tc/sticvar.h                                            | 2 +-
 sys/alpha/tc/tc.c                                                 | 2 +-
 sys/alpha/tc/tcasic.c                                             | 2 +-
 sys/alpha/tc/tcdevs.h                                             | 2 +-
 sys/alpha/tc/tcdevs_data.h                                        | 2 +-
 sys/alpha/tc/tcds.c                                               | 2 +-
 sys/alpha/tc/tcds_dma.c                                           | 2 +-
 sys/alpha/tc/tcdsreg.h                                            | 2 +-
 sys/alpha/tc/tcdsvar.h                                            | 2 +-
 sys/alpha/tc/tcreg.h                                              | 2 +-
 sys/alpha/tc/tcvar.h                                              | 2 +-
 sys/alpha/tlsb/dwlpx.c                                            | 2 +-
 sys/alpha/tlsb/dwlpxreg.h                                         | 2 +-
 sys/alpha/tlsb/gbusvar.h                                          | 2 +-
 sys/alpha/tlsb/kftxx.c                                            | 2 +-
 sys/alpha/tlsb/kftxxreg.h                                         | 2 +-
 sys/alpha/tlsb/kftxxvar.h                                         | 2 +-
 sys/alpha/tlsb/mcclock_tlsb.c                                     | 2 +-
 sys/alpha/tlsb/tlsbvar.h                                          | 2 +-
 sys/alpha/tlsb/zs_tlsb.c                                          | 2 +-
 sys/alpha/tlsb/zsreg.h                                            | 2 +-
 sys/alpha/tlsb/zsvar.h                                            | 2 +-
 sys/amd64/Makefile                                                | 2 +-
 sys/amd64/amd64/amd64_mem.c                                       | 2 +-
 sys/amd64/amd64/apic_vector.S                                     | 2 +-
 sys/amd64/amd64/atomic.c                                          | 2 +-
 sys/amd64/amd64/autoconf.c                                        | 2 +-
 sys/amd64/amd64/bios.c                                            | 2 +-
 sys/amd64/amd64/busdma_machdep.c                                  | 2 +-
 sys/amd64/amd64/cpu_switch.S                                      | 2 +-
 sys/amd64/amd64/db_disasm.c                                       | 2 +-
 sys/amd64/amd64/db_interface.c                                    | 2 +-
 sys/amd64/amd64/db_trace.c                                        | 2 +-
 sys/amd64/amd64/elf_machdep.c                                     | 2 +-
 sys/amd64/amd64/exception.S                                       | 2 +-
 sys/amd64/amd64/exception.s                                       | 2 +-
 sys/amd64/amd64/fpu.c                                             | 2 +-
 sys/amd64/amd64/genassym.c                                        | 2 +-
 sys/amd64/amd64/identcpu.c                                        | 2 +-
 sys/amd64/amd64/initcpu.c                                         | 2 +-
 sys/amd64/amd64/legacy.c                                          | 2 +-
 sys/amd64/amd64/locore.S                                          | 2 +-
 sys/amd64/amd64/locore.s                                          | 2 +-
 sys/amd64/amd64/machdep.c                                         | 2 +-
 sys/amd64/amd64/mem.c                                             | 2 +-
 sys/amd64/amd64/mp_machdep.c                                      | 2 +-
 sys/amd64/amd64/mpboot.S                                          | 2 +-
 sys/amd64/amd64/mptable.c                                         | 2 +-
 sys/amd64/amd64/nexus.c                                           | 2 +-
 sys/amd64/amd64/pmap.c                                            | 2 +-
 sys/amd64/amd64/prof_machdep.c                                    | 2 +-
 sys/amd64/amd64/support.S                                         | 2 +-
 sys/amd64/amd64/support.s                                         | 2 +-
 sys/amd64/amd64/swtch.s                                           | 2 +-
 sys/amd64/amd64/sys_machdep.c                                     | 2 +-
 sys/amd64/amd64/trap.c                                            | 2 +-
 sys/amd64/amd64/tsc.c                                             | 2 +-
 sys/amd64/amd64/vm_machdep.c                                      | 2 +-
 sys/amd64/conf/GENERIC                                            | 2 +-
 sys/amd64/include/apicreg.h                                       | 2 +-
 sys/amd64/include/asm.h                                           | 2 +-
 sys/amd64/include/asmacros.h                                      | 2 +-
 sys/amd64/include/atomic.h                                        | 2 +-
 sys/amd64/include/bus.h                                           | 2 +-
 sys/amd64/include/bus_amd64.h                                     | 2 +-
 sys/amd64/include/bus_at386.h                                     | 2 +-
 sys/amd64/include/bus_dma.h                                       | 2 +-
 sys/amd64/include/bus_memio.h                                     | 2 +-
 sys/amd64/include/bus_pio.h                                       | 2 +-
 sys/amd64/include/clock.h                                         | 2 +-
 sys/amd64/include/cpu.h                                           | 2 +-
 sys/amd64/include/cpufunc.h                                       | 2 +-
 sys/amd64/include/cputypes.h                                      | 2 +-
 sys/amd64/include/db_machdep.h                                    | 2 +-
 sys/amd64/include/elf.h                                           | 2 +-
 sys/amd64/include/exec.h                                          | 2 +-
 sys/amd64/include/float.h                                         | 2 +-
 sys/amd64/include/floatingpoint.h                                 | 2 +-
 sys/amd64/include/fpu.h                                           | 2 +-
 sys/amd64/include/frame.h                                         | 2 +-
 sys/amd64/include/ieeefp.h                                        | 2 +-
 sys/amd64/include/md_var.h                                        | 2 +-
 sys/amd64/include/mptable.h                                       | 2 +-
 sys/amd64/include/npx.h                                           | 2 +-
 sys/amd64/include/pc/bios.h                                       | 2 +-
 sys/amd64/include/pc/display.h                                    | 2 +-
 sys/amd64/include/pcb.h                                           | 2 +-
 sys/amd64/include/pcb_ext.h                                       | 2 +-
 sys/amd64/include/pci_cfgreg.h                                    | 2 +-
 sys/amd64/include/pcpu.h                                          | 2 +-
 sys/amd64/include/pmap.h                                          | 2 +-
 sys/amd64/include/proc.h                                          | 2 +-
 sys/amd64/include/profile.h                                       | 2 +-
 sys/amd64/include/psl.h                                           | 2 +-
 sys/amd64/include/ptrace.h                                        | 2 +-
 sys/amd64/include/reg.h                                           | 2 +-
 sys/amd64/include/reloc.h                                         | 2 +-
 sys/amd64/include/segments.h                                      | 2 +-
 sys/amd64/include/setjmp.h                                        | 2 +-
 sys/amd64/include/signal.h                                        | 2 +-
 sys/amd64/include/smp.h                                           | 2 +-
 sys/amd64/include/specialreg.h                                    | 2 +-
 sys/amd64/include/sysarch.h                                       | 2 +-
 sys/amd64/include/trap.h                                          | 2 +-
 sys/amd64/include/tss.h                                           | 2 +-
 sys/amd64/include/varargs.h                                       | 2 +-
 sys/amd64/include/vmparam.h                                       | 2 +-
 sys/amd64/isa/atpic_vector.S                                      | 2 +-
 sys/amd64/isa/clock.c                                             | 2 +-
 sys/amd64/isa/icu.h                                               | 2 +-
 sys/amd64/isa/icu_ipl.S                                           | 2 +-
 sys/amd64/isa/icu_ipl.s                                           | 2 +-
 sys/amd64/isa/icu_vector.S                                        | 2 +-
 sys/amd64/isa/icu_vector.s                                        | 2 +-
 sys/amd64/isa/intr_machdep.c                                      | 4 ++--
 sys/amd64/isa/intr_machdep.h                                      | 2 +-
 sys/amd64/isa/isa.c                                               | 2 +-
 sys/amd64/isa/isa.h                                               | 2 +-
 sys/amd64/isa/isa_dma.c                                           | 2 +-
 sys/amd64/isa/isa_dma.h                                           | 2 +-
 sys/amd64/isa/nmi.c                                               | 4 ++--
 sys/amd64/isa/npx.c                                               | 2 +-
 sys/amd64/isa/timerreg.h                                          | 2 +-
 sys/amd64/isa/vector.S                                            | 2 +-
 sys/amd64/isa/vector.s                                            | 2 +-
 sys/amd64/pci/pci_bus.c                                           | 2 +-
 sys/amd64/pci/pci_cfgreg.c                                        | 2 +-
 sys/boot/alpha/Makefile                                           | 2 +-
 sys/boot/alpha/boot1/boot1.c                                      | 2 +-
 sys/boot/alpha/boot1/sys.c                                        | 2 +-
 sys/boot/alpha/boot2/conf.c                                       | 2 +-
 sys/boot/alpha/boot2/version                                      | 2 +-
 sys/boot/alpha/common/main.c                                      | 2 +-
 sys/boot/alpha/common/setdef0.c                                   | 2 +-
 sys/boot/alpha/common/setdef1.c                                   | 2 +-
 sys/boot/alpha/libalpha/Makefile                                  | 2 +-
 sys/boot/alpha/libalpha/OSFpal.c                                  | 2 +-
 sys/boot/alpha/libalpha/alpha_copy.c                              | 2 +-
 sys/boot/alpha/libalpha/alpha_module.c                            | 2 +-
 sys/boot/alpha/libalpha/bbinfo.h                                  | 2 +-
 sys/boot/alpha/libalpha/bootinfo.c                                | 2 +-
 sys/boot/alpha/libalpha/common.h                                  | 2 +-
 sys/boot/alpha/libalpha/delay.c                                   | 2 +-
 sys/boot/alpha/libalpha/devicename.c                              | 2 +-
 sys/boot/alpha/libalpha/elf_freebsd.c                             | 2 +-
 sys/boot/alpha/libalpha/getsecs.c                                 | 2 +-
 sys/boot/alpha/libalpha/libalpha.h                                | 2 +-
 sys/boot/alpha/libalpha/pal.S                                     | 2 +-
 sys/boot/alpha/libalpha/prom.c                                    | 2 +-
 sys/boot/alpha/libalpha/prom_disp.S                               | 2 +-
 sys/boot/alpha/libalpha/prom_swpal.S                              | 2 +-
 sys/boot/alpha/libalpha/reboot.c                                  | 2 +-
 sys/boot/alpha/libalpha/srmdisk.c                                 | 2 +-
 sys/boot/alpha/libalpha/srmnet.c                                  | 2 +-
 sys/boot/alpha/libalpha/start.S                                   | 2 +-
 sys/boot/alpha/libalpha/time.c                                    | 2 +-
 sys/boot/alpha/netboot/conf.c                                     | 2 +-
 sys/boot/alpha/netboot/version                                    | 2 +-
 sys/boot/arc/Makefile                                             | 2 +-
 sys/boot/arc/include/arcfuncs.h                                   | 2 +-
 sys/boot/arc/include/arctypes.h                                   | 2 +-
 sys/boot/arc/include/libarc.h                                     | 2 +-
 sys/boot/arc/lib/Makefile                                         | 2 +-
 sys/boot/arc/lib/abort.c                                          | 2 +-
 sys/boot/arc/lib/arcconsole.c                                     | 2 +-
 sys/boot/arc/lib/arcdisk.c                                        | 2 +-
 sys/boot/arc/lib/arch/alpha/copy.c                                | 2 +-
 sys/boot/arc/lib/arch/alpha/rpb.c                                 | 2 +-
 sys/boot/arc/lib/arch/alpha/setjmp.S                              | 2 +-
 sys/boot/arc/lib/arch/alpha/start.S                               | 2 +-
 sys/boot/arc/lib/bootinfo.c                                       | 2 +-
 sys/boot/arc/lib/delay.c                                          | 2 +-
 sys/boot/arc/lib/devicename.c                                     | 2 +-
 sys/boot/arc/lib/elf_freebsd.c                                    | 2 +-
 sys/boot/arc/lib/module.c                                         | 2 +-
 sys/boot/arc/lib/prom.c                                           | 2 +-
 sys/boot/arc/lib/setjmperr.c                                      | 2 +-
 sys/boot/arc/lib/time.c                                           | 2 +-
 sys/boot/arc/loader/conf.c                                        | 2 +-
 sys/boot/arc/loader/main.c                                        | 2 +-
 sys/boot/arc/loader/setdef0.c                                     | 2 +-
 sys/boot/arc/loader/setdef1.c                                     | 2 +-
 sys/boot/arc/loader/version                                       | 2 +-
 sys/boot/common/Makefile.inc                                      | 2 +-
 sys/boot/common/bcache.c                                          | 2 +-
 sys/boot/common/boot.c                                            | 2 +-
 sys/boot/common/bootstrap.h                                       | 2 +-
 sys/boot/common/commands.c                                        | 2 +-
 sys/boot/common/console.c                                         | 2 +-
 sys/boot/common/dev_net.c                                         | 2 +-
 sys/boot/common/dev_net.h                                         | 2 +-
 sys/boot/common/devopen.c                                         | 2 +-
 sys/boot/common/gensetdefs.c                                      | 2 +-
 sys/boot/common/interp.c                                          | 2 +-
 sys/boot/common/interp_backslash.c                                | 2 +-
 sys/boot/common/interp_forth.c                                    | 2 +-
 sys/boot/common/interp_parse.c                                    | 2 +-
 sys/boot/common/isapnp.c                                          | 2 +-
 sys/boot/common/isapnp.h                                          | 2 +-
 sys/boot/common/load.c                                            | 2 +-
 sys/boot/common/load_aout.c                                       | 2 +-
 sys/boot/common/load_elf.c                                        | 2 +-
 sys/boot/common/loader.8                                          | 2 +-
 sys/boot/common/ls.c                                              | 2 +-
 sys/boot/common/merge_help.awk                                    | 2 +-
 sys/boot/common/misc.c                                            | 2 +-
 sys/boot/common/module.c                                          | 2 +-
 sys/boot/common/panic.c                                           | 2 +-
 sys/boot/common/pnpdata                                           | 2 +-
 sys/boot/ficl/Makefile                                            | 2 +-
 sys/boot/ficl/softwords/freebsd.fr                                | 2 +-
 sys/boot/forth/loader.4th                                         | 2 +-
 sys/boot/forth/loader.4th.8                                       | 2 +-
 sys/boot/forth/loader.conf                                        | 2 +-
 sys/boot/forth/loader.conf.5                                      | 2 +-
 sys/boot/forth/support.4th                                        | 2 +-
 sys/boot/i386/Makefile                                            | 2 +-
 sys/boot/i386/boot0/Makefile                                      | 2 +-
 sys/boot/i386/boot0/boot0.m4                                      | 2 +-
 sys/boot/i386/boot0/boot0.s                                       | 2 +-
 sys/boot/i386/boot2/Makefile                                      | 2 +-
 sys/boot/i386/boot2/boot1.S                                       | 2 +-
 sys/boot/i386/boot2/boot1.m4                                      | 2 +-
 sys/boot/i386/boot2/boot1.s                                       | 2 +-
 sys/boot/i386/boot2/boot2.c                                       | 2 +-
 sys/boot/i386/boot2/lib.h                                         | 2 +-
 sys/boot/i386/boot2/sio.S                                         | 2 +-
 sys/boot/i386/boot2/sio.s                                         | 2 +-
 sys/boot/i386/btx/Makefile                                        | 2 +-
 sys/boot/i386/btx/btx/Makefile                                    | 2 +-
 sys/boot/i386/btx/btx/btx.S                                       | 2 +-
 sys/boot/i386/btx/btx/btx.m4                                      | 2 +-
 sys/boot/i386/btx/btx/btx.s                                       | 2 +-
 sys/boot/i386/btx/btxldr/Makefile                                 | 2 +-
 sys/boot/i386/btx/btxldr/btxldr.S                                 | 2 +-
 sys/boot/i386/btx/btxldr/btxldr.s                                 | 2 +-
 sys/boot/i386/btx/lib/Makefile                                    | 2 +-
 sys/boot/i386/btx/lib/btxcsu.s                                    | 2 +-
 sys/boot/i386/btx/lib/btxsys.s                                    | 2 +-
 sys/boot/i386/btx/lib/btxv86.h                                    | 2 +-
 sys/boot/i386/btx/lib/btxv86.s                                    | 2 +-
 sys/boot/i386/gptboot/Makefile                                    | 2 +-
 sys/boot/i386/gptboot/gptboot.c                                   | 2 +-
 sys/boot/i386/kgzldr/Makefile                                     | 2 +-
 sys/boot/i386/kgzldr/boot.c                                       | 2 +-
 sys/boot/i386/kgzldr/crt.s                                        | 2 +-
 sys/boot/i386/kgzldr/kgzldr.h                                     | 2 +-
 sys/boot/i386/kgzldr/lib.c                                        | 2 +-
 sys/boot/i386/kgzldr/sio.s                                        | 2 +-
 sys/boot/i386/kgzldr/start.s                                      | 2 +-
 sys/boot/i386/libi386/Makefile                                    | 2 +-
 sys/boot/i386/libi386/aout_freebsd.c                              | 2 +-
 sys/boot/i386/libi386/biosdisk.c                                  | 2 +-
 sys/boot/i386/libi386/biospci.c                                   | 2 +-
 sys/boot/i386/libi386/biospnp.c                                   | 2 +-
 sys/boot/i386/libi386/bootinfo.c                                  | 2 +-
 sys/boot/i386/libi386/bootinfo32.c                                | 2 +-
 sys/boot/i386/libi386/bootinfo64.c                                | 2 +-
 sys/boot/i386/libi386/comconsole.c                                | 2 +-
 sys/boot/i386/libi386/devicename.c                                | 2 +-
 sys/boot/i386/libi386/elf32_freebsd.c                             | 2 +-
 sys/boot/i386/libi386/elf64_freebsd.c                             | 2 +-
 sys/boot/i386/libi386/elf_freebsd.c                               | 2 +-
 sys/boot/i386/libi386/gatea20.c                                   | 2 +-
 sys/boot/i386/libi386/i386_module.c                               | 2 +-
 sys/boot/i386/libi386/libi386.h                                   | 2 +-
 sys/boot/i386/libi386/pread.c                                     | 2 +-
 sys/boot/i386/libi386/vidconsole.c                                | 2 +-
 sys/boot/i386/loader/Makefile                                     | 2 +-
 sys/boot/i386/loader/conf.c                                       | 2 +-
 sys/boot/i386/loader/loader.8                                     | 2 +-
 sys/boot/i386/loader/main.c                                       | 2 +-
 sys/boot/i386/loader/version                                      | 2 +-
 sys/boot/i386/mbr/Makefile                                        | 2 +-
 sys/boot/i386/mbr/mbr.m4                                          | 2 +-
 sys/boot/i386/mbr/mbr.s                                           | 2 +-
 sys/boot/ofw/libofw/devicename.c                                  | 2 +-
 sys/boot/ofw/libofw/ofw_console.c                                 | 2 +-
 sys/boot/ofw/libofw/ofw_copy.c                                    | 2 +-
 sys/boot/ofw/libofw/ofw_module.c                                  | 2 +-
 sys/boot/pc98/Makefile                                            | 2 +-
 sys/boot/pc98/boot2/Makefile                                      | 2 +-
 sys/boot/pc98/boot2/asm.S                                         | 2 +-
 sys/boot/pc98/boot2/asm.h                                         | 2 +-
 sys/boot/pc98/boot2/bios.S                                        | 2 +-
 sys/boot/pc98/boot2/boot.c                                        | 2 +-
 sys/boot/pc98/boot2/boot.h                                        | 2 +-
 sys/boot/pc98/boot2/disk.c                                        | 2 +-
 sys/boot/pc98/boot2/io.c                                          | 2 +-
 sys/boot/pc98/boot2/serial.S                                      | 2 +-
 sys/boot/pc98/boot2/start.S                                       | 2 +-
 sys/boot/pc98/boot2/sys.c                                         | 2 +-
 sys/boot/pc98/boot2/table.c                                       | 2 +-
 sys/boot/pc98/btx/Makefile                                        | 2 +-
 sys/boot/pc98/btx/btx/Makefile                                    | 2 +-
 sys/boot/pc98/btx/btx/btx.S                                       | 2 +-
 sys/boot/pc98/btx/btx/btx.m4                                      | 2 +-
 sys/boot/pc98/btx/btx/btx.s                                       | 2 +-
 sys/boot/pc98/btx/btxldr/Makefile                                 | 2 +-
 sys/boot/pc98/btx/btxldr/btxldr.S                                 | 2 +-
 sys/boot/pc98/btx/btxldr/btxldr.s                                 | 2 +-
 sys/boot/pc98/btx/lib/Makefile                                    | 2 +-
 sys/boot/pc98/btx/lib/btxcsu.s                                    | 2 +-
 sys/boot/pc98/btx/lib/btxsys.s                                    | 2 +-
 sys/boot/pc98/btx/lib/btxv86.h                                    | 2 +-
 sys/boot/pc98/btx/lib/btxv86.s                                    | 2 +-
 sys/boot/pc98/libpc98/Makefile                                    | 2 +-
 sys/boot/pc98/libpc98/biosdisk.c                                  | 2 +-
 sys/boot/pc98/libpc98/bootinfo.c                                  | 2 +-
 sys/boot/pc98/libpc98/comconsole.c                                | 2 +-
 sys/boot/pc98/libpc98/gatea20.c                                   | 2 +-
 sys/boot/pc98/libpc98/vidconsole.c                                | 2 +-
 sys/boot/pc98/loader/Makefile                                     | 2 +-
 sys/boot/pc98/loader/main.c                                       | 2 +-
 sys/cam/cam.c                                                     | 2 +-
 sys/cam/cam.h                                                     | 2 +-
 sys/cam/cam_ccb.h                                                 | 2 +-
 sys/cam/cam_conf.h                                                | 2 +-
 sys/cam/cam_debug.h                                               | 2 +-
 sys/cam/cam_extend.c                                              | 2 +-
 sys/cam/cam_extend.h                                              | 2 +-
 sys/cam/cam_periph.c                                              | 2 +-
 sys/cam/cam_periph.h                                              | 2 +-
 sys/cam/cam_queue.c                                               | 2 +-
 sys/cam/cam_queue.h                                               | 2 +-
 sys/cam/cam_sim.c                                                 | 2 +-
 sys/cam/cam_sim.h                                                 | 2 +-
 sys/cam/cam_xpt.c                                                 | 2 +-
 sys/cam/cam_xpt.h                                                 | 2 +-
 sys/cam/cam_xpt_periph.h                                          | 2 +-
 sys/cam/cam_xpt_sim.h                                             | 2 +-
 sys/cam/scsi/scsi_all.c                                           | 2 +-
 sys/cam/scsi/scsi_all.h                                           | 2 +-
 sys/cam/scsi/scsi_cd.c                                            | 2 +-
 sys/cam/scsi/scsi_ch.c                                            | 2 +-
 sys/cam/scsi/scsi_da.c                                            | 2 +-
 sys/cam/scsi/scsi_da.h                                            | 2 +-
 sys/cam/scsi/scsi_pass.c                                          | 2 +-
 sys/cam/scsi/scsi_pass.h                                          | 2 +-
 sys/cam/scsi/scsi_pt.c                                            | 2 +-
 sys/cam/scsi/scsi_pt.h                                            | 2 +-
 sys/cam/scsi/scsi_sa.c                                            | 2 +-
 sys/cam/scsi/scsi_sa.h                                            | 2 +-
 sys/cam/scsi/scsi_targ_bh.c                                       | 2 +-
 sys/cam/scsi/scsi_target.c                                        | 2 +-
 sys/cam/scsi/scsi_targetio.h                                      | 2 +-
 sys/coda/cnode.h                                                  | 2 +-
 sys/coda/coda.h                                                   | 2 +-
 sys/coda/coda_fbsd.c                                              | 2 +-
 sys/coda/coda_io.h                                                | 2 +-
 sys/coda/coda_kernel.h                                            | 2 +-
 sys/coda/coda_namecache.c                                         | 2 +-
 sys/coda/coda_namecache.h                                         | 2 +-
 sys/coda/coda_opstats.h                                           | 2 +-
 sys/coda/coda_pioctl.h                                            | 2 +-
 sys/coda/coda_psdev.c                                             | 2 +-
 sys/coda/coda_psdev.h                                             | 2 +-
 sys/coda/coda_subr.c                                              | 2 +-
 sys/coda/coda_subr.h                                              | 2 +-
 sys/coda/coda_venus.c                                             | 2 +-
 sys/coda/coda_venus.h                                             | 2 +-
 sys/coda/coda_vfsops.c                                            | 2 +-
 sys/coda/coda_vfsops.h                                            | 2 +-
 sys/coda/coda_vnops.c                                             | 2 +-
 sys/coda/coda_vnops.h                                             | 2 +-
 sys/compat/linux/linux_file.c                                     | 2 +-
 sys/compat/linux/linux_ioctl.c                                    | 2 +-
 sys/compat/linux/linux_ipc.c                                      | 2 +-
 sys/compat/linux/linux_misc.c                                     | 2 +-
 sys/compat/linux/linux_signal.c                                   | 2 +-
 sys/compat/linux/linux_socket.c                                   | 2 +-
 sys/compat/linux/linux_stats.c                                    | 2 +-
 sys/compat/linux/linux_util.c                                     | 2 +-
 sys/compat/linux/linux_util.h                                     | 2 +-
 sys/compat/svr4/Makefile                                          | 2 +-
 sys/compat/svr4/imgact_svr4.c                                     | 2 +-
 sys/compat/svr4/svr4.h                                            | 2 +-
 sys/compat/svr4/svr4_acl.h                                        | 2 +-
 sys/compat/svr4/svr4_dirent.h                                     | 2 +-
 sys/compat/svr4/svr4_errno.h                                      | 2 +-
 sys/compat/svr4/svr4_exec.h                                       | 2 +-
 sys/compat/svr4/svr4_fcntl.c                                      | 2 +-
 sys/compat/svr4/svr4_fcntl.h                                      | 2 +-
 sys/compat/svr4/svr4_filio.c                                      | 2 +-
 sys/compat/svr4/svr4_filio.h                                      | 2 +-
 sys/compat/svr4/svr4_fuser.h                                      | 2 +-
 sys/compat/svr4/svr4_hrt.h                                        | 2 +-
 sys/compat/svr4/svr4_ioctl.c                                      | 2 +-
 sys/compat/svr4/svr4_ioctl.h                                      | 2 +-
 sys/compat/svr4/svr4_ipc.c                                        | 2 +-
 sys/compat/svr4/svr4_ipc.h                                        | 2 +-
 sys/compat/svr4/svr4_misc.c                                       | 2 +-
 sys/compat/svr4/svr4_mman.h                                       | 2 +-
 sys/compat/svr4/svr4_resource.c                                   | 2 +-
 sys/compat/svr4/svr4_resource.h                                   | 2 +-
 sys/compat/svr4/svr4_siginfo.h                                    | 2 +-
 sys/compat/svr4/svr4_signal.c                                     | 2 +-
 sys/compat/svr4/svr4_signal.h                                     | 2 +-
 sys/compat/svr4/svr4_socket.c                                     | 2 +-
 sys/compat/svr4/svr4_socket.h                                     | 2 +-
 sys/compat/svr4/svr4_sockio.c                                     | 2 +-
 sys/compat/svr4/svr4_sockio.h                                     | 2 +-
 sys/compat/svr4/svr4_sockmod.h                                    | 2 +-
 sys/compat/svr4/svr4_stat.c                                       | 2 +-
 sys/compat/svr4/svr4_stat.h                                       | 2 +-
 sys/compat/svr4/svr4_statvfs.h                                    | 2 +-
 sys/compat/svr4/svr4_stream.c                                     | 2 +-
 sys/compat/svr4/svr4_stropts.h                                    | 2 +-
 sys/compat/svr4/svr4_sysconfig.h                                  | 2 +-
 sys/compat/svr4/svr4_systeminfo.h                                 | 2 +-
 sys/compat/svr4/svr4_sysvec.c                                     | 2 +-
 sys/compat/svr4/svr4_termios.c                                    | 2 +-
 sys/compat/svr4/svr4_termios.h                                    | 2 +-
 sys/compat/svr4/svr4_time.h                                       | 2 +-
 sys/compat/svr4/svr4_timod.h                                      | 2 +-
 sys/compat/svr4/svr4_ttold.c                                      | 2 +-
 sys/compat/svr4/svr4_ttold.h                                      | 2 +-
 sys/compat/svr4/svr4_types.h                                      | 2 +-
 sys/compat/svr4/svr4_ucontext.h                                   | 2 +-
 sys/compat/svr4/svr4_ulimit.h                                     | 2 +-
 sys/compat/svr4/svr4_ustat.h                                      | 2 +-
 sys/compat/svr4/svr4_util.h                                       | 2 +-
 sys/compat/svr4/svr4_utsname.h                                    | 2 +-
 sys/compat/svr4/svr4_wait.h                                       | 2 +-
 sys/compat/svr4/syscalls.conf                                     | 2 +-
 sys/compat/svr4/syscalls.master                                   | 2 +-
 sys/conf/Makefile.alpha                                           | 2 +-
 sys/conf/Makefile.i386                                            | 2 +-
 sys/conf/Makefile.pc98                                            | 2 +-
 sys/conf/Makefile.powerpc                                         | 2 +-
 sys/conf/NOTES                                                    | 2 +-
 sys/conf/files.alpha                                              | 2 +-
 sys/conf/files.i386                                               | 2 +-
 sys/conf/files.pc98                                               | 2 +-
 sys/conf/majors                                                   | 2 +-
 sys/conf/newvers.sh                                               | 2 +-
 sys/conf/nfsswapkernel.c                                          | 2 +-
 sys/conf/options                                                  | 2 +-
 sys/conf/options.alpha                                            | 2 +-
 sys/conf/options.i386                                             | 2 +-
 sys/conf/options.pc98                                             | 2 +-
 sys/conf/param.c                                                  | 2 +-
 sys/conf/systags.sh                                               | 2 +-
 sys/ddb/db_access.c                                               | 2 +-
 sys/ddb/db_access.h                                               | 2 +-
 sys/ddb/db_aout.c                                                 | 2 +-
 sys/ddb/db_break.c                                                | 2 +-
 sys/ddb/db_break.h                                                | 2 +-
 sys/ddb/db_command.c                                              | 2 +-
 sys/ddb/db_command.h                                              | 2 +-
 sys/ddb/db_elf.c                                                  | 2 +-
 sys/ddb/db_examine.c                                              | 2 +-
 sys/ddb/db_expr.c                                                 | 2 +-
 sys/ddb/db_input.c                                                | 2 +-
 sys/ddb/db_kld.c                                                  | 2 +-
 sys/ddb/db_lex.c                                                  | 2 +-
 sys/ddb/db_lex.h                                                  | 2 +-
 sys/ddb/db_output.c                                               | 2 +-
 sys/ddb/db_output.h                                               | 2 +-
 sys/ddb/db_print.c                                                | 2 +-
 sys/ddb/db_ps.c                                                   | 2 +-
 sys/ddb/db_run.c                                                  | 2 +-
 sys/ddb/db_sym.c                                                  | 2 +-
 sys/ddb/db_sym.h                                                  | 2 +-
 sys/ddb/db_trap.c                                                 | 2 +-
 sys/ddb/db_variables.c                                            | 2 +-
 sys/ddb/db_variables.h                                            | 2 +-
 sys/ddb/db_watch.c                                                | 2 +-
 sys/ddb/db_watch.h                                                | 2 +-
 sys/ddb/db_write_cmd.c                                            | 2 +-
 sys/ddb/ddb.h                                                     | 2 +-
 sys/dev/advansys/adv_eisa.c                                       | 2 +-
 sys/dev/advansys/adv_isa.c                                        | 2 +-
 sys/dev/advansys/adv_pci.c                                        | 2 +-
 sys/dev/advansys/advansys.c                                       | 2 +-
 sys/dev/advansys/advansys.h                                       | 2 +-
 sys/dev/advansys/advlib.c                                         | 2 +-
 sys/dev/advansys/advlib.h                                         | 2 +-
 sys/dev/advansys/advmcode.c                                       | 2 +-
 sys/dev/advansys/advmcode.h                                       | 2 +-
 sys/dev/advansys/adw_pci.c                                        | 2 +-
 sys/dev/advansys/adwcam.c                                         | 2 +-
 sys/dev/advansys/adwlib.c                                         | 2 +-
 sys/dev/advansys/adwlib.h                                         | 2 +-
 sys/dev/advansys/adwmcode.c                                       | 2 +-
 sys/dev/advansys/adwmcode.h                                       | 2 +-
 sys/dev/advansys/adwvar.h                                         | 2 +-
 sys/dev/aha/aha.c                                                 | 2 +-
 sys/dev/aha/aha_isa.c                                             | 2 +-
 sys/dev/aha/ahareg.h                                              | 2 +-
 sys/dev/ahb/ahb.c                                                 | 2 +-
 sys/dev/ahb/ahbreg.h                                              | 2 +-
 sys/dev/aic7xxx/93cx6.c                                           | 2 +-
 sys/dev/aic7xxx/93cx6.h                                           | 2 +-
 sys/dev/aic7xxx/Makefile                                          | 2 +-
 sys/dev/aic7xxx/ahc_eisa.c                                        | 2 +-
 sys/dev/aic7xxx/ahc_pci.c                                         | 2 +-
 sys/dev/aic7xxx/aic7xxx.c                                         | 2 +-
 sys/dev/aic7xxx/aic7xxx.h                                         | 2 +-
 sys/dev/aic7xxx/aic7xxx.reg                                       | 2 +-
 sys/dev/aic7xxx/aic7xxx.seq                                       | 2 +-
 sys/dev/aic7xxx/aic7xxx_93cx6.c                                   | 2 +-
 sys/dev/aic7xxx/aic7xxx_93cx6.h                                   | 2 +-
 sys/dev/aic7xxx/aicasm.c                                          | 2 +-
 sys/dev/aic7xxx/aicasm.h                                          | 2 +-
 sys/dev/aic7xxx/aicasm/Makefile                                   | 2 +-
 sys/dev/aic7xxx/aicasm/aicasm.c                                   | 2 +-
 sys/dev/aic7xxx/aicasm/aicasm.h                                   | 2 +-
 sys/dev/aic7xxx/aicasm/aicasm_gram.y                              | 2 +-
 sys/dev/aic7xxx/aicasm/aicasm_scan.l                              | 2 +-
 sys/dev/aic7xxx/aicasm/aicasm_symbol.c                            | 2 +-
 sys/dev/aic7xxx/aicasm/aicasm_symbol.h                            | 2 +-
 sys/dev/aic7xxx/aicasm_gram.y                                     | 2 +-
 sys/dev/aic7xxx/aicasm_scan.l                                     | 2 +-
 sys/dev/aic7xxx/aicasm_symbol.c                                   | 2 +-
 sys/dev/aic7xxx/aicasm_symbol.h                                   | 2 +-
 sys/dev/aic7xxx/sequencer.h                                       | 2 +-
 sys/dev/ar/if_ar.c                                                | 2 +-
 sys/dev/ar/if_ar_isa.c                                            | 2 +-
 sys/dev/ar/if_arregs.h                                            | 2 +-
 sys/dev/ata/ata-all.c                                             | 2 +-
 sys/dev/ata/ata-all.h                                             | 2 +-
 sys/dev/ata/ata-disk.c                                            | 2 +-
 sys/dev/ata/ata-disk.h                                            | 2 +-
 sys/dev/ata/ata-dma.c                                             | 2 +-
 sys/dev/ata/atapi-all.c                                           | 2 +-
 sys/dev/ata/atapi-all.h                                           | 2 +-
 sys/dev/ata/atapi-cd.c                                            | 2 +-
 sys/dev/ata/atapi-cd.h                                            | 2 +-
 sys/dev/ata/atapi-fd.c                                            | 2 +-
 sys/dev/ata/atapi-fd.h                                            | 2 +-
 sys/dev/ata/atapi-tape.c                                          | 2 +-
 sys/dev/ata/atapi-tape.h                                          | 2 +-
 sys/dev/atkbdc/atkbd.c                                            | 2 +-
 sys/dev/atkbdc/atkbd_atkbdc.c                                     | 2 +-
 sys/dev/atkbdc/atkbd_isa.c                                        | 2 +-
 sys/dev/atkbdc/atkbdc.c                                           | 2 +-
 sys/dev/atkbdc/atkbdc_isa.c                                       | 2 +-
 sys/dev/atkbdc/atkbdc_subr.c                                      | 2 +-
 sys/dev/atkbdc/atkbdcreg.h                                        | 2 +-
 sys/dev/atkbdc/atkbdreg.h                                         | 2 +-
 sys/dev/atkbdc/psm.c                                              | 2 +-
 sys/dev/bktr/bktr_core.c                                          | 2 +-
 sys/dev/bktr/bktr_i2c.c                                           | 2 +-
 sys/dev/bktr/bktr_i2c.h                                           | 2 +-
 sys/dev/bktr/bktr_reg.h                                           | 2 +-
 sys/dev/bktr/ioctl_bt848.h                                        | 2 +-
 sys/dev/buslogic/bt.c                                             | 2 +-
 sys/dev/buslogic/bt_eisa.c                                        | 2 +-
 sys/dev/buslogic/bt_isa.c                                         | 2 +-
 sys/dev/buslogic/bt_pci.c                                         | 2 +-
 sys/dev/buslogic/btreg.h                                          | 2 +-
 sys/dev/ccd/ccd.c                                                 | 2 +-
 sys/dev/cs/if_cs.c                                                | 2 +-
 sys/dev/cs/if_csreg.h                                             | 2 +-
 sys/dev/cy/cy.c                                                   | 2 +-
 sys/dev/cy/cy_isa.c                                               | 2 +-
 sys/dev/cy/cy_pci.c                                               | 2 +-
 sys/dev/cy/cyreg.h                                                | 2 +-
 sys/dev/dec/mcclock.c                                             | 2 +-
 sys/dev/dec/mcclock_if.m                                          | 2 +-
 sys/dev/dgb/dgb.c                                                 | 2 +-
 sys/dev/dgb/dgm.c                                                 | 2 +-
 sys/dev/dgb/dgmbios.h                                             | 2 +-
 sys/dev/dgb/dgmfep.h                                              | 2 +-
 sys/dev/dgb/dgmreg.h                                              | 2 +-
 sys/dev/dgb/dgreg.h                                               | 2 +-
 sys/dev/dpt/dpt.h                                                 | 2 +-
 sys/dev/dpt/dpt_control.c                                         | 2 +-
 sys/dev/dpt/dpt_eisa.c                                            | 2 +-
 sys/dev/dpt/dpt_eisa.h                                            | 2 +-
 sys/dev/dpt/dpt_pci.c                                             | 2 +-
 sys/dev/dpt/dpt_pci.h                                             | 2 +-
 sys/dev/dpt/dpt_scsi.c                                            | 2 +-
 sys/dev/ed/if_ed.c                                                | 2 +-
 sys/dev/ed/if_ed_pci.c                                            | 2 +-
 sys/dev/ed/if_edreg.h                                             | 2 +-
 sys/dev/eisa/eisaconf.c                                           | 2 +-
 sys/dev/eisa/eisaconf.h                                           | 2 +-
 sys/dev/ep/if_ep.c                                                | 2 +-
 sys/dev/ep/if_ep_eisa.c                                           | 2 +-
 sys/dev/ep/if_epreg.h                                             | 2 +-
 sys/dev/ex/if_ex.c                                                | 2 +-
 sys/dev/fb/fb.c                                                   | 2 +-
 sys/dev/fb/fbreg.h                                                | 2 +-
 sys/dev/fb/splash.c                                               | 2 +-
 sys/dev/fb/splash_bmp.c                                           | 2 +-
 sys/dev/fb/splash_pcx.c                                           | 2 +-
 sys/dev/fb/splashreg.h                                            | 2 +-
 sys/dev/fb/vga.c                                                  | 2 +-
 sys/dev/fb/vgareg.h                                               | 2 +-
 sys/dev/fdc/fdc.c                                                 | 2 +-
 sys/dev/fdc/fdcreg.h                                              | 2 +-
 sys/dev/fe/if_fe.c                                                | 2 +-
 sys/dev/fe/if_fereg.h                                             | 2 +-
 sys/dev/fxp/if_fxp.c                                              | 2 +-
 sys/dev/fxp/if_fxpreg.h                                           | 2 +-
 sys/dev/fxp/if_fxpvar.h                                           | 2 +-
 sys/dev/hea/eni.c                                                 | 4 ++--
 sys/dev/hea/eni.h                                                 | 2 +-
 sys/dev/hea/eni_buffer.c                                          | 4 ++--
 sys/dev/hea/eni_globals.c                                         | 4 ++--
 sys/dev/hea/eni_if.c                                              | 4 ++--
 sys/dev/hea/eni_init.c                                            | 4 ++--
 sys/dev/hea/eni_intr.c                                            | 4 ++--
 sys/dev/hea/eni_receive.c                                         | 4 ++--
 sys/dev/hea/eni_stats.h                                           | 2 +-
 sys/dev/hea/eni_suni.h                                            | 2 +-
 sys/dev/hea/eni_transmit.c                                        | 4 ++--
 sys/dev/hea/eni_var.h                                             | 2 +-
 sys/dev/hea/eni_vcm.c                                             | 4 ++--
 sys/dev/hfa/fore.h                                                | 2 +-
 sys/dev/hfa/fore_aali.h                                           | 2 +-
 sys/dev/hfa/fore_buffer.c                                         | 4 ++--
 sys/dev/hfa/fore_command.c                                        | 4 ++--
 sys/dev/hfa/fore_globals.c                                        | 4 ++--
 sys/dev/hfa/fore_if.c                                             | 4 ++--
 sys/dev/hfa/fore_include.h                                        | 2 +-
 sys/dev/hfa/fore_init.c                                           | 4 ++--
 sys/dev/hfa/fore_intr.c                                           | 4 ++--
 sys/dev/hfa/fore_load.c                                           | 4 ++--
 sys/dev/hfa/fore_output.c                                         | 4 ++--
 sys/dev/hfa/fore_receive.c                                        | 4 ++--
 sys/dev/hfa/fore_slave.h                                          | 2 +-
 sys/dev/hfa/fore_stats.c                                          | 4 ++--
 sys/dev/hfa/fore_stats.h                                          | 2 +-
 sys/dev/hfa/fore_timer.c                                          | 4 ++--
 sys/dev/hfa/fore_transmit.c                                       | 4 ++--
 sys/dev/hfa/fore_var.h                                            | 2 +-
 sys/dev/hfa/fore_vcm.c                                            | 4 ++--
 sys/dev/ic/cd1400.h                                               | 2 +-
 sys/dev/ic/esp.h                                                  | 2 +-
 sys/dev/ic/hd64570.h                                              | 2 +-
 sys/dev/ic/i8237.h                                                | 2 +-
 sys/dev/ic/i82586.h                                               | 2 +-
 sys/dev/ic/nec765.h                                               | 2 +-
 sys/dev/ic/ns16550.h                                              | 2 +-
 sys/dev/ida/ida.c                                                 | 2 +-
 sys/dev/ida/ida_disk.c                                            | 2 +-
 sys/dev/ida/ida_pci.c                                             | 2 +-
 sys/dev/ida/idareg.h                                              | 2 +-
 sys/dev/ida/idavar.h                                              | 2 +-
 sys/dev/ie/if_ie.c                                                | 2 +-
 sys/dev/ie/if_ie507.h                                             | 2 +-
 sys/dev/ie/if_iereg.h                                             | 2 +-
 sys/dev/iicbus/if_ic.c                                            | 2 +-
 sys/dev/iicbus/iic.c                                              | 2 +-
 sys/dev/iicbus/iic.h                                              | 2 +-
 sys/dev/iicbus/iicbb.c                                            | 2 +-
 sys/dev/iicbus/iicbb_if.m                                         | 2 +-
 sys/dev/iicbus/iicbus.c                                           | 2 +-
 sys/dev/iicbus/iicbus.h                                           | 2 +-
 sys/dev/iicbus/iicbus_if.m                                        | 2 +-
 sys/dev/iicbus/iiconf.c                                           | 2 +-
 sys/dev/iicbus/iiconf.h                                           | 2 +-
 sys/dev/iicbus/iicsmb.c                                           | 2 +-
 sys/dev/isp/asm_pci.h                                             | 2 +-
 sys/dev/isp/asm_sbus.h                                            | 2 +-
 sys/dev/isp/isp.c                                                 | 2 +-
 sys/dev/isp/isp_freebsd.c                                         | 2 +-
 sys/dev/isp/isp_freebsd.h                                         | 2 +-
 sys/dev/isp/isp_pci.c                                             | 2 +-
 sys/dev/isp/ispmbox.h                                             | 2 +-
 sys/dev/isp/ispreg.h                                              | 2 +-
 sys/dev/isp/ispvar.h                                              | 2 +-
 sys/dev/kbd/atkbd.c                                               | 2 +-
 sys/dev/kbd/atkbdc.c                                              | 2 +-
 sys/dev/kbd/atkbdcreg.h                                           | 2 +-
 sys/dev/kbd/atkbdreg.h                                            | 2 +-
 sys/dev/kbd/kbd.c                                                 | 2 +-
 sys/dev/kbd/kbdreg.h                                              | 2 +-
 sys/dev/kbd/kbdtables.h                                           | 2 +-
 sys/dev/lnc/if_lnc.c                                              | 2 +-
 sys/dev/lnc/if_lnc_pci.c                                          | 2 +-
 sys/dev/lnc/if_lncvar.h                                           | 2 +-
 sys/dev/mcd/mcd.c                                                 | 2 +-
 sys/dev/mcd/mcdreg.h                                              | 2 +-
 sys/dev/mii/Makefile.miidevs                                      | 2 +-
 sys/dev/mii/devlist2h.awk                                         | 2 +-
 sys/dev/mii/exphy.c                                               | 2 +-
 sys/dev/mii/mii.c                                                 | 2 +-
 sys/dev/mii/mii.h                                                 | 2 +-
 sys/dev/mii/mii_physubr.c                                         | 2 +-
 sys/dev/mii/miibus_if.m                                           | 2 +-
 sys/dev/mii/miidevs                                               | 2 +-
 sys/dev/mii/miidevs.h                                             | 2 +-
 sys/dev/mii/miivar.h                                              | 2 +-
 sys/dev/mii/nsphy.c                                               | 2 +-
 sys/dev/mii/nsphyreg.h                                            | 2 +-
 sys/dev/mii/ukphy.c                                               | 2 +-
 sys/dev/mii/ukphy_subr.c                                          | 2 +-
 sys/dev/mse/mse.c                                                 | 2 +-
 sys/dev/pccard/if_xe.c                                            | 4 ++--
 sys/dev/pccard/if_xereg.h                                         | 4 ++--
 sys/dev/pcf/pcf.c                                                 | 2 +-
 sys/dev/pci/pci.c                                                 | 2 +-
 sys/dev/pci/pci_if.m                                              | 2 +-
 sys/dev/pci/pcireg.h                                              | 2 +-
 sys/dev/pci/pcivar.h                                              | 2 +-
 sys/dev/pdq/if_fea.c                                              | 2 +-
 sys/dev/pdq/if_fpa.c                                              | 2 +-
 sys/dev/pdq/pdq.c                                                 | 2 +-
 sys/dev/pdq/pdq_ifsubr.c                                          | 2 +-
 sys/dev/pdq/pdqreg.h                                              | 2 +-
 sys/dev/pdq/pdqvar.h                                              | 2 +-
 sys/dev/ppbus/if_plip.c                                           | 2 +-
 sys/dev/ppbus/immio.c                                             | 2 +-
 sys/dev/ppbus/lpbb.c                                              | 2 +-
 sys/dev/ppbus/lpt.c                                               | 2 +-
 sys/dev/ppbus/lpt.h                                               | 2 +-
 sys/dev/ppbus/lptio.h                                             | 2 +-
 sys/dev/ppbus/ppb_1284.c                                          | 2 +-
 sys/dev/ppbus/ppb_1284.h                                          | 2 +-
 sys/dev/ppbus/ppb_base.c                                          | 2 +-
 sys/dev/ppbus/ppb_msq.c                                           | 2 +-
 sys/dev/ppbus/ppb_msq.h                                           | 2 +-
 sys/dev/ppbus/ppbconf.c                                           | 2 +-
 sys/dev/ppbus/ppbconf.h                                           | 2 +-
 sys/dev/ppbus/ppi.c                                               | 2 +-
 sys/dev/ppbus/ppi.h                                               | 2 +-
 sys/dev/ppbus/pps.c                                               | 2 +-
 sys/dev/ppbus/vpo.c                                               | 2 +-
 sys/dev/ppbus/vpoio.c                                             | 2 +-
 sys/dev/ppbus/vpoio.h                                             | 2 +-
 sys/dev/ppc/ppc.c                                                 | 2 +-
 sys/dev/ppc/ppcreg.h                                              | 2 +-
 sys/dev/rp/rp.c                                                   | 2 +-
 sys/dev/scd/scd.c                                                 | 2 +-
 sys/dev/scd/scdreg.h                                              | 2 +-
 sys/dev/sf/if_sf.c                                                | 4 ++--
 sys/dev/sf/if_sfreg.h                                             | 2 +-
 sys/dev/si/si.c                                                   | 2 +-
 sys/dev/si/si.h                                                   | 2 +-
 sys/dev/si/sireg.h                                                | 2 +-
 sys/dev/sio/sio.c                                                 | 2 +-
 sys/dev/sio/sioreg.h                                              | 2 +-
 sys/dev/sk/if_sk.c                                                | 4 ++--
 sys/dev/sk/if_skreg.h                                             | 2 +-
 sys/dev/sk/xmaciireg.h                                            | 2 +-
 sys/dev/smbus/smb.c                                               | 2 +-
 sys/dev/smbus/smb.h                                               | 2 +-
 sys/dev/smbus/smbconf.c                                           | 2 +-
 sys/dev/smbus/smbconf.h                                           | 2 +-
 sys/dev/smbus/smbus.c                                             | 2 +-
 sys/dev/smbus/smbus.h                                             | 2 +-
 sys/dev/smbus/smbus_if.m                                          | 2 +-
 sys/dev/snp/snp.c                                                 | 2 +-
 sys/dev/speaker/speaker.h                                         | 2 +-
 sys/dev/speaker/spkr.c                                            | 2 +-
 sys/dev/sr/if_sr.c                                                | 2 +-
 sys/dev/sr/if_sr_isa.c                                            | 2 +-
 sys/dev/sr/if_sr_pci.c                                            | 2 +-
 sys/dev/sr/if_srregs.h                                            | 2 +-
 sys/dev/streams/streams.c                                         | 2 +-
 sys/dev/syscons/blank/blank_saver.c                               | 2 +-
 sys/dev/syscons/daemon/daemon_saver.c                             | 2 +-
 sys/dev/syscons/fade/fade_saver.c                                 | 2 +-
 sys/dev/syscons/fire/fire_saver.c                                 | 2 +-
 sys/dev/syscons/green/green_saver.c                               | 2 +-
 sys/dev/syscons/logo/logo_saver.c                                 | 2 +-
 sys/dev/syscons/rain/rain_saver.c                                 | 2 +-
 sys/dev/syscons/scgfbrndr.c                                       | 2 +-
 sys/dev/syscons/schistory.c                                       | 2 +-
 sys/dev/syscons/scmouse.c                                         | 2 +-
 sys/dev/syscons/scvesactl.c                                       | 2 +-
 sys/dev/syscons/scvgarndr.c                                       | 2 +-
 sys/dev/syscons/scvidctl.c                                        | 2 +-
 sys/dev/syscons/scvtb.c                                           | 2 +-
 sys/dev/syscons/snake/snake_saver.c                               | 2 +-
 sys/dev/syscons/star/star_saver.c                                 | 2 +-
 sys/dev/syscons/syscons.c                                         | 2 +-
 sys/dev/syscons/syscons.h                                         | 2 +-
 sys/dev/syscons/warp/warp_saver.c                                 | 2 +-
 sys/dev/ti/if_ti.c                                                | 4 ++--
 sys/dev/ti/if_tireg.h                                             | 2 +-
 sys/dev/ti/ti_fw.h                                                | 2 +-
 sys/dev/ti/ti_fw2.h                                               | 2 +-
 sys/dev/tx/if_tx.c                                                | 2 +-
 sys/dev/tx/if_txreg.h                                             | 2 +-
 sys/dev/tx/if_txvar.h                                             | 2 +-
 sys/dev/vinum/COPYRIGHT                                           | 2 +-
 sys/dev/vinum/makestatetext                                       | 2 +-
 sys/dev/vinum/request.h                                           | 2 +-
 sys/dev/vinum/vinum.c                                             | 2 +-
 sys/dev/vinum/vinumconfig.c                                       | 2 +-
 sys/dev/vinum/vinumdaemon.c                                       | 2 +-
 sys/dev/vinum/vinumext.h                                          | 2 +-
 sys/dev/vinum/vinumhdr.h                                          | 2 +-
 sys/dev/vinum/vinuminterrupt.c                                    | 2 +-
 sys/dev/vinum/vinumio.c                                           | 2 +-
 sys/dev/vinum/vinumio.h                                           | 2 +-
 sys/dev/vinum/vinumioctl.c                                        | 2 +-
 sys/dev/vinum/vinumkw.h                                           | 2 +-
 sys/dev/vinum/vinumlock.c                                         | 2 +-
 sys/dev/vinum/vinummemory.c                                       | 2 +-
 sys/dev/vinum/vinumparser.c                                       | 2 +-
 sys/dev/vinum/vinumraid5.c                                        | 2 +-
 sys/dev/vinum/vinumrequest.c                                      | 2 +-
 sys/dev/vinum/vinumrevive.c                                       | 2 +-
 sys/dev/vinum/vinumstate.c                                        | 2 +-
 sys/dev/vinum/vinumstate.h                                        | 2 +-
 sys/dev/vinum/vinumutil.c                                         | 2 +-
 sys/dev/vinum/vinumvar.h                                          | 2 +-
 sys/dev/vn/vn.c                                                   | 2 +-
 sys/dev/vr/if_vr.c                                                | 4 ++--
 sys/dev/vr/if_vrreg.h                                             | 2 +-
 sys/dev/vx/if_vx.c                                                | 2 +-
 sys/dev/wi/if_wavelan_ieee.h                                      | 2 +-
 sys/dev/wi/if_wi.c                                                | 4 ++--
 sys/dev/wi/if_wireg.h                                             | 2 +-
 sys/dev/wl/if_wl.c                                                | 2 +-
 sys/dev/xe/if_xe.c                                                | 4 ++--
 sys/dev/xe/if_xereg.h                                             | 4 ++--
 sys/fs/cd9660/TODO                                                | 2 +-
 sys/fs/cd9660/cd9660_bmap.c                                       | 2 +-
 sys/fs/cd9660/cd9660_lookup.c                                     | 2 +-
 sys/fs/cd9660/cd9660_node.c                                       | 2 +-
 sys/fs/cd9660/cd9660_node.h                                       | 2 +-
 sys/fs/cd9660/cd9660_rrip.c                                       | 2 +-
 sys/fs/cd9660/cd9660_rrip.h                                       | 2 +-
 sys/fs/cd9660/cd9660_util.c                                       | 2 +-
 sys/fs/cd9660/cd9660_vfsops.c                                     | 2 +-
 sys/fs/cd9660/cd9660_vnops.c                                      | 2 +-
 sys/fs/cd9660/iso.h                                               | 2 +-
 sys/fs/cd9660/iso_rrip.h                                          | 2 +-
 sys/fs/coda/cnode.h                                               | 2 +-
 sys/fs/coda/coda.h                                                | 2 +-
 sys/fs/coda/coda_fbsd.c                                           | 2 +-
 sys/fs/coda/coda_io.h                                             | 2 +-
 sys/fs/coda/coda_kernel.h                                         | 2 +-
 sys/fs/coda/coda_namecache.c                                      | 2 +-
 sys/fs/coda/coda_namecache.h                                      | 2 +-
 sys/fs/coda/coda_opstats.h                                        | 2 +-
 sys/fs/coda/coda_pioctl.h                                         | 2 +-
 sys/fs/coda/coda_psdev.c                                          | 2 +-
 sys/fs/coda/coda_psdev.h                                          | 2 +-
 sys/fs/coda/coda_subr.c                                           | 2 +-
 sys/fs/coda/coda_subr.h                                           | 2 +-
 sys/fs/coda/coda_venus.c                                          | 2 +-
 sys/fs/coda/coda_venus.h                                          | 2 +-
 sys/fs/coda/coda_vfsops.c                                         | 2 +-
 sys/fs/coda/coda_vfsops.h                                         | 2 +-
 sys/fs/coda/coda_vnops.c                                          | 2 +-
 sys/fs/coda/coda_vnops.h                                          | 2 +-
 sys/fs/deadfs/dead_vnops.c                                        | 2 +-
 sys/fs/fdescfs/fdesc.h                                            | 2 +-
 sys/fs/fdescfs/fdesc_vfsops.c                                     | 2 +-
 sys/fs/fdescfs/fdesc_vnops.c                                      | 2 +-
 sys/fs/fifofs/fifo.h                                              | 2 +-
 sys/fs/fifofs/fifo_vnops.c                                        | 2 +-
 sys/fs/msdosfs/bootsect.h                                         | 2 +-
 sys/fs/msdosfs/bpb.h                                              | 2 +-
 sys/fs/msdosfs/denode.h                                           | 2 +-
 sys/fs/msdosfs/direntry.h                                         | 2 +-
 sys/fs/msdosfs/fat.h                                              | 2 +-
 sys/fs/msdosfs/msdosfs_conv.c                                     | 2 +-
 sys/fs/msdosfs/msdosfs_denode.c                                   | 2 +-
 sys/fs/msdosfs/msdosfs_fat.c                                      | 2 +-
 sys/fs/msdosfs/msdosfs_lookup.c                                   | 2 +-
 sys/fs/msdosfs/msdosfs_vfsops.c                                   | 2 +-
 sys/fs/msdosfs/msdosfs_vnops.c                                    | 2 +-
 sys/fs/msdosfs/msdosfsmount.h                                     | 2 +-
 sys/fs/ntfs/ntfs.h                                                | 2 +-
 sys/fs/ntfs/ntfs_compr.c                                          | 2 +-
 sys/fs/ntfs/ntfs_compr.h                                          | 2 +-
 sys/fs/ntfs/ntfs_ihash.c                                          | 2 +-
 sys/fs/ntfs/ntfs_ihash.h                                          | 2 +-
 sys/fs/ntfs/ntfs_inode.h                                          | 2 +-
 sys/fs/ntfs/ntfs_subr.c                                           | 2 +-
 sys/fs/ntfs/ntfs_subr.h                                           | 2 +-
 sys/fs/ntfs/ntfs_vfsops.c                                         | 2 +-
 sys/fs/ntfs/ntfs_vfsops.h                                         | 2 +-
 sys/fs/ntfs/ntfs_vnops.c                                          | 2 +-
 sys/fs/ntfs/ntfsmount.h                                           | 2 +-
 sys/fs/nullfs/null.h                                              | 2 +-
 sys/fs/nullfs/null_subr.c                                         | 2 +-
 sys/fs/nullfs/null_vfsops.c                                       | 2 +-
 sys/fs/nullfs/null_vnops.c                                        | 4 ++--
 sys/fs/portalfs/portal.h                                          | 2 +-
 sys/fs/portalfs/portal_vfsops.c                                   | 2 +-
 sys/fs/portalfs/portal_vnops.c                                    | 2 +-
 sys/fs/procfs/README                                              | 2 +-
 sys/fs/procfs/procfs.h                                            | 2 +-
 sys/fs/procfs/procfs_ctl.c                                        | 2 +-
 sys/fs/procfs/procfs_dbregs.c                                     | 2 +-
 sys/fs/procfs/procfs_fpregs.c                                     | 2 +-
 sys/fs/procfs/procfs_map.c                                        | 2 +-
 sys/fs/procfs/procfs_mem.c                                        | 2 +-
 sys/fs/procfs/procfs_note.c                                       | 2 +-
 sys/fs/procfs/procfs_regs.c                                       | 2 +-
 sys/fs/procfs/procfs_rlimit.c                                     | 2 +-
 sys/fs/procfs/procfs_status.c                                     | 2 +-
 sys/fs/procfs/procfs_subr.c                                       | 2 +-
 sys/fs/procfs/procfs_type.c                                       | 2 +-
 sys/fs/procfs/procfs_vfsops.c                                     | 2 +-
 sys/fs/procfs/procfs_vnops.c                                      | 2 +-
 sys/fs/specfs/spec_vnops.c                                        | 2 +-
 sys/fs/umapfs/umap.h                                              | 2 +-
 sys/fs/umapfs/umap_subr.c                                         | 2 +-
 sys/fs/umapfs/umap_vfsops.c                                       | 2 +-
 sys/fs/umapfs/umap_vnops.c                                        | 2 +-
 sys/fs/unionfs/union.h                                            | 2 +-
 sys/fs/unionfs/union_subr.c                                       | 2 +-
 sys/fs/unionfs/union_vfsops.c                                     | 2 +-
 sys/fs/unionfs/union_vnops.c                                      | 2 +-
 sys/geom/geom_ccd.c                                               | 2 +-
 sys/gnu/ext2fs/ext2_bmap.c                                        | 2 +-
 sys/gnu/ext2fs/ext2_ihash.c                                       | 2 +-
 sys/gnu/ext2fs/ext2_mount.h                                       | 2 +-
 sys/gnu/ext2fs/inode.h                                            | 2 +-
 sys/gnu/fs/ext2fs/ext2_bmap.c                                     | 2 +-
 sys/gnu/fs/ext2fs/ext2_mount.h                                    | 2 +-
 sys/gnu/fs/ext2fs/inode.h                                         | 2 +-
 sys/gnu/i386/fpemul/control_w.h                                   | 2 +-
 sys/gnu/i386/fpemul/div_small.s                                   | 2 +-
 sys/gnu/i386/fpemul/errors.c                                      | 2 +-
 sys/gnu/i386/fpemul/exception.h                                   | 2 +-
 sys/gnu/i386/fpemul/fpu_arith.c                                   | 2 +-
 sys/gnu/i386/fpemul/fpu_asm.h                                     | 2 +-
 sys/gnu/i386/fpemul/fpu_aux.c                                     | 2 +-
 sys/gnu/i386/fpemul/fpu_emu.h                                     | 2 +-
 sys/gnu/i386/fpemul/fpu_entry.c                                   | 2 +-
 sys/gnu/i386/fpemul/fpu_etc.c                                     | 2 +-
 sys/gnu/i386/fpemul/fpu_proto.h                                   | 2 +-
 sys/gnu/i386/fpemul/fpu_system.h                                  | 2 +-
 sys/gnu/i386/fpemul/fpu_trig.c                                    | 2 +-
 sys/gnu/i386/fpemul/get_address.c                                 | 2 +-
 sys/gnu/i386/fpemul/load_store.c                                  | 2 +-
 sys/gnu/i386/fpemul/math_emu.h                                    | 2 +-
 sys/gnu/i386/fpemul/poly_2xm1.c                                   | 2 +-
 sys/gnu/i386/fpemul/poly_atan.c                                   | 2 +-
 sys/gnu/i386/fpemul/poly_div.s                                    | 2 +-
 sys/gnu/i386/fpemul/poly_l2.c                                     | 2 +-
 sys/gnu/i386/fpemul/poly_mul64.s                                  | 2 +-
 sys/gnu/i386/fpemul/poly_sin.c                                    | 2 +-
 sys/gnu/i386/fpemul/poly_tan.c                                    | 2 +-
 sys/gnu/i386/fpemul/polynomial.s                                  | 2 +-
 sys/gnu/i386/fpemul/reg_add_sub.c                                 | 2 +-
 sys/gnu/i386/fpemul/reg_compare.c                                 | 2 +-
 sys/gnu/i386/fpemul/reg_constant.h                                | 2 +-
 sys/gnu/i386/fpemul/reg_div.s                                     | 2 +-
 sys/gnu/i386/fpemul/reg_ld_str.c                                  | 2 +-
 sys/gnu/i386/fpemul/reg_mul.c                                     | 2 +-
 sys/gnu/i386/fpemul/reg_norm.s                                    | 2 +-
 sys/gnu/i386/fpemul/reg_round.s                                   | 2 +-
 sys/gnu/i386/fpemul/reg_u_add.s                                   | 2 +-
 sys/gnu/i386/fpemul/reg_u_div.s                                   | 2 +-
 sys/gnu/i386/fpemul/reg_u_mul.s                                   | 2 +-
 sys/gnu/i386/fpemul/reg_u_sub.s                                   | 2 +-
 sys/gnu/i386/fpemul/status_w.h                                    | 2 +-
 sys/gnu/i386/fpemul/version.h                                     | 2 +-
 sys/gnu/i386/fpemul/wm_shrx.s                                     | 2 +-
 sys/gnu/i386/fpemul/wm_sqrt.s                                     | 2 +-
 sys/gnu/i386/isa/dgb.c                                            | 2 +-
 sys/gnu/i386/isa/dgm.c                                            | 2 +-
 sys/gnu/i386/isa/dgmbios.h                                        | 2 +-
 sys/gnu/i386/isa/dgmfep.h                                         | 2 +-
 sys/gnu/i386/isa/dgmreg.h                                         | 2 +-
 sys/gnu/i386/isa/dgreg.h                                          | 2 +-
 sys/i386/Makefile                                                 | 2 +-
 sys/i386/apm/apm.c                                                | 2 +-
 sys/i386/bios/apm.c                                               | 2 +-
 sys/i386/boot/Makefile                                            | 2 +-
 sys/i386/boot/Makefile.inc                                        | 2 +-
 sys/i386/boot/biosboot/Makefile                                   | 2 +-
 sys/i386/boot/biosboot/README.386BSD                              | 2 +-
 sys/i386/boot/biosboot/README.MACH                                | 2 +-
 sys/i386/boot/biosboot/README.serial                              | 2 +-
 sys/i386/boot/biosboot/asm.S                                      | 2 +-
 sys/i386/boot/biosboot/asm.h                                      | 2 +-
 sys/i386/boot/biosboot/bios.S                                     | 2 +-
 sys/i386/boot/biosboot/boot.c                                     | 2 +-
 sys/i386/boot/biosboot/boot.h                                     | 2 +-
 sys/i386/boot/biosboot/boot2.S                                    | 2 +-
 sys/i386/boot/biosboot/disk.c                                     | 2 +-
 sys/i386/boot/biosboot/io.c                                       | 2 +-
 sys/i386/boot/biosboot/probe_keyboard.c                           | 2 +-
 sys/i386/boot/biosboot/serial.S                                   | 2 +-
 sys/i386/boot/biosboot/start.S                                    | 2 +-
 sys/i386/boot/biosboot/sys.c                                      | 2 +-
 sys/i386/boot/biosboot/table.c                                    | 2 +-
 sys/i386/boot/cdboot/Makefile                                     | 2 +-
 sys/i386/boot/cdboot/asm.S                                        | 2 +-
 sys/i386/boot/cdboot/boot.c                                       | 2 +-
 sys/i386/boot/cdboot/boot.h                                       | 2 +-
 sys/i386/boot/cdboot/cdrom.c                                      | 2 +-
 sys/i386/boot/cdboot/malloc.c                                     | 2 +-
 sys/i386/boot/dosboot/Makefile                                    | 2 +-
 sys/i386/boot/dosboot/ansi.h                                      | 2 +-
 sys/i386/boot/dosboot/boot.c                                      | 2 +-
 sys/i386/boot/dosboot/boot.h                                      | 2 +-
 sys/i386/boot/dosboot/bootinfo.h                                  | 2 +-
 sys/i386/boot/dosboot/cdefs.h                                     | 2 +-
 sys/i386/boot/dosboot/dinode.h                                    | 2 +-
 sys/i386/boot/dosboot/dir.h                                       | 2 +-
 sys/i386/boot/dosboot/disk.c                                      | 2 +-
 sys/i386/boot/dosboot/disklabe.h                                  | 2 +-
 sys/i386/boot/dosboot/dkbad.h                                     | 2 +-
 sys/i386/boot/dosboot/endian.h                                    | 2 +-
 sys/i386/boot/dosboot/exec.h                                      | 2 +-
 sys/i386/boot/dosboot/fs.h                                        | 2 +-
 sys/i386/boot/dosboot/imgact.h                                    | 2 +-
 sys/i386/boot/dosboot/inode.h                                     | 2 +-
 sys/i386/boot/dosboot/mexec.h                                     | 2 +-
 sys/i386/boot/dosboot/param.h                                     | 2 +-
 sys/i386/boot/dosboot/quota.h                                     | 2 +-
 sys/i386/boot/dosboot/reboot.h                                    | 2 +-
 sys/i386/boot/dosboot/sys.c                                       | 2 +-
 sys/i386/boot/dosboot/syslimit.h                                  | 2 +-
 sys/i386/boot/dosboot/sysparam.h                                  | 2 +-
 sys/i386/boot/dosboot/types.h                                     | 2 +-
 sys/i386/boot/kzipboot/Makefile                                   | 2 +-
 sys/i386/boot/netboot/3c509.c                                     | 2 +-
 sys/i386/boot/netboot/Makefile                                    | 2 +-
 sys/i386/boot/netboot/netboot.8                                   | 2 +-
 sys/i386/boot/rawboot/Makefile                                    | 2 +-
 sys/i386/conf/GENERIC                                             | 2 +-
 sys/i386/conf/LINT                                                | 2 +-
 sys/i386/conf/Makefile.i386                                       | 2 +-
 sys/i386/conf/NOTES                                               | 2 +-
 sys/i386/conf/PCCARD                                              | 2 +-
 sys/i386/conf/devices.i386                                        | 2 +-
 sys/i386/conf/files.i386                                          | 2 +-
 sys/i386/conf/majors.i386                                         | 2 +-
 sys/i386/conf/options.i386                                        | 2 +-
 sys/i386/eisa/3c5x9.c                                             | 2 +-
 sys/i386/eisa/adv_eisa.c                                          | 2 +-
 sys/i386/eisa/ahb.c                                               | 2 +-
 sys/i386/eisa/ahbreg.h                                            | 2 +-
 sys/i386/eisa/ahc_eisa.c                                          | 2 +-
 sys/i386/eisa/bt_eisa.c                                           | 2 +-
 sys/i386/eisa/dpt_eisa.c                                          | 2 +-
 sys/i386/eisa/dpt_eisa.h                                          | 2 +-
 sys/i386/eisa/eisaconf.c                                          | 2 +-
 sys/i386/eisa/eisaconf.h                                          | 2 +-
 sys/i386/eisa/if_fea.c                                            | 2 +-
 sys/i386/i386/apic_vector.s                                       | 2 +-
 sys/i386/i386/atomic.c                                            | 2 +-
 sys/i386/i386/autoconf.c                                          | 2 +-
 sys/i386/i386/bios.c                                              | 2 +-
 sys/i386/i386/bioscall.s                                          | 2 +-
 sys/i386/i386/busdma_machdep.c                                    | 2 +-
 sys/i386/i386/db_disasm.c                                         | 2 +-
 sys/i386/i386/db_interface.c                                      | 2 +-
 sys/i386/i386/db_trace.c                                          | 2 +-
 sys/i386/i386/elf_machdep.c                                       | 2 +-
 sys/i386/i386/exception.s                                         | 2 +-
 sys/i386/i386/genassym.c                                          | 2 +-
 sys/i386/i386/globals.s                                           | 2 +-
 sys/i386/i386/i686_mem.c                                          | 2 +-
 sys/i386/i386/identcpu.c                                          | 2 +-
 sys/i386/i386/in_cksum.c                                          | 2 +-
 sys/i386/i386/initcpu.c                                           | 2 +-
 sys/i386/i386/k6_mem.c                                            | 2 +-
 sys/i386/i386/legacy.c                                            | 2 +-
 sys/i386/i386/locore.s                                            | 2 +-
 sys/i386/i386/machdep.c                                           | 2 +-
 sys/i386/i386/math_emu.h                                          | 2 +-
 sys/i386/i386/math_emulate.c                                      | 2 +-
 sys/i386/i386/mem.c                                               | 2 +-
 sys/i386/i386/mp_machdep.c                                        | 2 +-
 sys/i386/i386/mpapic.c                                            | 2 +-
 sys/i386/i386/mpboot.s                                            | 2 +-
 sys/i386/i386/mplock.s                                            | 2 +-
 sys/i386/i386/mptable.c                                           | 2 +-
 sys/i386/i386/nexus.c                                             | 2 +-
 sys/i386/i386/perfmon.c                                           | 2 +-
 sys/i386/i386/pmap.c                                              | 2 +-
 sys/i386/i386/procfs_machdep.c                                    | 2 +-
 sys/i386/i386/simplelock.s                                        | 2 +-
 sys/i386/i386/support.s                                           | 2 +-
 sys/i386/i386/swtch.s                                             | 2 +-
 sys/i386/i386/symbols.raw                                         | 2 +-
 sys/i386/i386/sys_machdep.c                                       | 2 +-
 sys/i386/i386/trap.c                                              | 2 +-
 sys/i386/i386/tsc.c                                               | 2 +-
 sys/i386/i386/userconfig.c                                        | 4 ++--
 sys/i386/i386/vm86.c                                              | 2 +-
 sys/i386/i386/vm86bios.s                                          | 2 +-
 sys/i386/i386/vm_machdep.c                                        | 2 +-
 sys/i386/ibcs2/Makefile                                           | 2 +-
 sys/i386/ibcs2/coff.h                                             | 2 +-
 sys/i386/ibcs2/ibcs2_fcntl.c                                      | 2 +-
 sys/i386/ibcs2/ibcs2_ipc.c                                        | 2 +-
 sys/i386/ibcs2/ibcs2_ipc.h                                        | 2 +-
 sys/i386/ibcs2/ibcs2_isc.c                                        | 2 +-
 sys/i386/ibcs2/ibcs2_misc.c                                       | 2 +-
 sys/i386/ibcs2/ibcs2_msg.c                                        | 2 +-
 sys/i386/ibcs2/ibcs2_other.c                                      | 2 +-
 sys/i386/ibcs2/ibcs2_poll.h                                       | 2 +-
 sys/i386/ibcs2/ibcs2_signal.c                                     | 2 +-
 sys/i386/ibcs2/ibcs2_sysvec.c                                     | 2 +-
 sys/i386/ibcs2/ibcs2_xenix.c                                      | 2 +-
 sys/i386/ibcs2/imgact_coff.c                                      | 2 +-
 sys/i386/ibcs2/syscalls.conf                                      | 2 +-
 sys/i386/ibcs2/syscalls.isc                                       | 2 +-
 sys/i386/ibcs2/syscalls.isc.conf                                  | 2 +-
 sys/i386/ibcs2/syscalls.master                                    | 2 +-
 sys/i386/ibcs2/syscalls.xenix                                     | 2 +-
 sys/i386/ibcs2/syscalls.xenix.conf                                | 2 +-
 sys/i386/include/_limits.h                                        | 2 +-
 sys/i386/include/ansi.h                                           | 2 +-
 sys/i386/include/apic.h                                           | 2 +-
 sys/i386/include/apicreg.h                                        | 2 +-
 sys/i386/include/apm_bios.h                                       | 2 +-
 sys/i386/include/apm_segments.h                                   | 2 +-
 sys/i386/include/asm.h                                            | 2 +-
 sys/i386/include/asmacros.h                                       | 2 +-
 sys/i386/include/asnames.h                                        | 2 +-
 sys/i386/include/atomic.h                                         | 2 +-
 sys/i386/include/bootinfo.h                                       | 2 +-
 sys/i386/include/bus.h                                            | 2 +-
 sys/i386/include/bus_at386.h                                      | 2 +-
 sys/i386/include/bus_dma.h                                        | 2 +-
 sys/i386/include/bus_memio.h                                      | 2 +-
 sys/i386/include/bus_pc98.h                                       | 2 +-
 sys/i386/include/bus_pio.h                                        | 2 +-
 sys/i386/include/cdk.h                                            | 2 +-
 sys/i386/include/clock.h                                          | 2 +-
 sys/i386/include/comstats.h                                       | 2 +-
 sys/i386/include/cpu.h                                            | 2 +-
 sys/i386/include/cpufunc.h                                        | 2 +-
 sys/i386/include/cputypes.h                                       | 2 +-
 sys/i386/include/db_machdep.h                                     | 2 +-
 sys/i386/include/elf.h                                            | 2 +-
 sys/i386/include/endian.h                                         | 2 +-
 sys/i386/include/exec.h                                           | 2 +-
 sys/i386/include/float.h                                          | 2 +-
 sys/i386/include/floatingpoint.h                                  | 2 +-
 sys/i386/include/frame.h                                          | 2 +-
 sys/i386/include/globaldata.h                                     | 2 +-
 sys/i386/include/globals.h                                        | 2 +-
 sys/i386/include/i4b_cause.h                                      | 2 +-
 sys/i386/include/i4b_debug.h                                      | 2 +-
 sys/i386/include/i4b_ioctl.h                                      | 2 +-
 sys/i386/include/i4b_rbch_ioctl.h                                 | 2 +-
 sys/i386/include/i4b_tel_ioctl.h                                  | 2 +-
 sys/i386/include/i4b_trace.h                                      | 2 +-
 sys/i386/include/ieeefp.h                                         | 2 +-
 sys/i386/include/if_wavelan_ieee.h                                | 2 +-
 sys/i386/include/if_wl_wavelan.h                                  | 2 +-
 sys/i386/include/iic.h                                            | 2 +-
 sys/i386/include/in_cksum.h                                       | 2 +-
 sys/i386/include/ioctl_bt848.h                                    | 2 +-
 sys/i386/include/ioctl_ctx.h                                      | 2 +-
 sys/i386/include/ioctl_fd.h                                       | 2 +-
 sys/i386/include/ipl.h                                            | 2 +-
 sys/i386/include/limits.h                                         | 2 +-
 sys/i386/include/lock.h                                           | 2 +-
 sys/i386/include/lpt.h                                            | 2 +-
 sys/i386/include/md_var.h                                         | 2 +-
 sys/i386/include/mouse.h                                          | 2 +-
 sys/i386/include/mpapic.h                                         | 2 +-
 sys/i386/include/mptable.h                                        | 2 +-
 sys/i386/include/mtpr.h                                           | 2 +-
 sys/i386/include/npx.h                                            | 2 +-
 sys/i386/include/param.h                                          | 2 +-
 sys/i386/include/pc/bios.h                                        | 2 +-
 sys/i386/include/pc/display.h                                     | 2 +-
 sys/i386/include/pc/msdos.h                                       | 2 +-
 sys/i386/include/pc/vesa.h                                        | 2 +-
 sys/i386/include/pcaudioio.h                                      | 2 +-
 sys/i386/include/pcb.h                                            | 2 +-
 sys/i386/include/pcb_ext.h                                        | 2 +-
 sys/i386/include/pci_cfgreg.h                                     | 2 +-
 sys/i386/include/pcpu.h                                           | 2 +-
 sys/i386/include/perfmon.h                                        | 2 +-
 sys/i386/include/pmap.h                                           | 2 +-
 sys/i386/include/proc.h                                           | 2 +-
 sys/i386/include/profile.h                                        | 2 +-
 sys/i386/include/psl.h                                            | 2 +-
 sys/i386/include/ptrace.h                                         | 2 +-
 sys/i386/include/random.h                                         | 2 +-
 sys/i386/include/reg.h                                            | 2 +-
 sys/i386/include/reloc.h                                          | 2 +-
 sys/i386/include/segments.h                                       | 2 +-
 sys/i386/include/setjmp.h                                         | 2 +-
 sys/i386/include/si.h                                             | 2 +-
 sys/i386/include/signal.h                                         | 2 +-
 sys/i386/include/smb.h                                            | 2 +-
 sys/i386/include/smp.h                                            | 2 +-
 sys/i386/include/smptests.h                                       | 2 +-
 sys/i386/include/speaker.h                                        | 2 +-
 sys/i386/include/specialreg.h                                     | 2 +-
 sys/i386/include/stdarg.h                                         | 2 +-
 sys/i386/include/sysarch.h                                        | 2 +-
 sys/i386/include/trap.h                                           | 2 +-
 sys/i386/include/tss.h                                            | 2 +-
 sys/i386/include/types.h                                          | 2 +-
 sys/i386/include/varargs.h                                        | 2 +-
 sys/i386/include/vm86.h                                           | 2 +-
 sys/i386/include/vmparam.h                                        | 2 +-
 sys/i386/include/wtio.h                                           | 2 +-
 sys/i386/isa/README.le                                            | 2 +-
 sys/i386/isa/adv_isa.c                                            | 2 +-
 sys/i386/isa/aha_isa.c                                            | 2 +-
 sys/i386/isa/aic6360.c                                            | 2 +-
 sys/i386/isa/apic_ipl.h                                           | 2 +-
 sys/i386/isa/apic_ipl.s                                           | 2 +-
 sys/i386/isa/apic_vector.s                                        | 2 +-
 sys/i386/isa/asc.c                                                | 2 +-
 sys/i386/isa/ascreg.h                                             | 2 +-
 sys/i386/isa/atapi-cd.c                                           | 2 +-
 sys/i386/isa/atapi-cd.h                                           | 2 +-
 sys/i386/isa/atpic_vector.s                                       | 2 +-
 sys/i386/isa/clock.c                                              | 2 +-
 sys/i386/isa/ctx.c                                                | 2 +-
 sys/i386/isa/ctxreg.h                                             | 2 +-
 sys/i386/isa/cy.c                                                 | 2 +-
 sys/i386/isa/cyreg.h                                              | 2 +-
 sys/i386/isa/diskslice_machdep.c                                  | 2 +-
 sys/i386/isa/elink.c                                              | 2 +-
 sys/i386/isa/elink.h                                              | 2 +-
 sys/i386/isa/ic/cd1400.h                                          | 2 +-
 sys/i386/isa/ic/esp.h                                             | 2 +-
 sys/i386/isa/ic/hd64570.h                                         | 2 +-
 sys/i386/isa/ic/i8042.h                                           | 2 +-
 sys/i386/isa/ic/i8237.h                                           | 2 +-
 sys/i386/isa/ic/i82586.h                                          | 2 +-
 sys/i386/isa/ic/lemac.h                                           | 2 +-
 sys/i386/isa/ic/ns16550.h                                         | 2 +-
 sys/i386/isa/ic/rsa.h                                             | 2 +-
 sys/i386/isa/ic/scd1400.h                                         | 2 +-
 sys/i386/isa/icu.h                                                | 2 +-
 sys/i386/isa/icu_ipl.h                                            | 2 +-
 sys/i386/isa/icu_ipl.s                                            | 2 +-
 sys/i386/isa/icu_vector.s                                         | 2 +-
 sys/i386/isa/if_ar.c                                              | 2 +-
 sys/i386/isa/if_arregs.h                                          | 2 +-
 sys/i386/isa/if_cs.c                                              | 2 +-
 sys/i386/isa/if_csreg.h                                           | 2 +-
 sys/i386/isa/if_ed.c                                              | 2 +-
 sys/i386/isa/if_edreg.h                                           | 2 +-
 sys/i386/isa/if_el.c                                              | 2 +-
 sys/i386/isa/if_elreg.h                                           | 2 +-
 sys/i386/isa/if_ep.c                                              | 2 +-
 sys/i386/isa/if_epreg.h                                           | 2 +-
 sys/i386/isa/if_ex.c                                              | 2 +-
 sys/i386/isa/if_fe.c                                              | 2 +-
 sys/i386/isa/if_fereg.h                                           | 2 +-
 sys/i386/isa/if_ie.c                                              | 2 +-
 sys/i386/isa/if_ie507.h                                           | 2 +-
 sys/i386/isa/if_iereg.h                                           | 2 +-
 sys/i386/isa/if_le.c                                              | 2 +-
 sys/i386/isa/if_lnc.c                                             | 2 +-
 sys/i386/isa/if_lnc.h                                             | 2 +-
 sys/i386/isa/if_rdp.c                                             | 2 +-
 sys/i386/isa/if_rdpreg.h                                          | 2 +-
 sys/i386/isa/if_sr.c                                              | 2 +-
 sys/i386/isa/if_srregs.h                                          | 2 +-
 sys/i386/isa/if_wi.c                                              | 4 ++--
 sys/i386/isa/if_wireg.h                                           | 2 +-
 sys/i386/isa/if_wl.c                                              | 2 +-
 sys/i386/isa/if_ze.c                                              | 2 +-
 sys/i386/isa/if_zp.c                                              | 2 +-
 sys/i386/isa/if_zpreg.h                                           | 2 +-
 sys/i386/isa/intr_machdep.c                                       | 4 ++--
 sys/i386/isa/intr_machdep.h                                       | 2 +-
 sys/i386/isa/ipl.s                                                | 2 +-
 sys/i386/isa/ipl_funcs.c                                          | 2 +-
 sys/i386/isa/isa.c                                                | 2 +-
 sys/i386/isa/isa.h                                                | 2 +-
 sys/i386/isa/isa_compat.c                                         | 2 +-
 sys/i386/isa/isa_compat.h                                         | 2 +-
 sys/i386/isa/isa_device.h                                         | 2 +-
 sys/i386/isa/isa_dma.c                                            | 2 +-
 sys/i386/isa/isa_dma.h                                            | 2 +-
 sys/i386/isa/istallion.c                                          | 2 +-
 sys/i386/isa/loran.c                                              | 2 +-
 sys/i386/isa/lptreg.h                                             | 2 +-
 sys/i386/isa/matcd/matcd.c                                        | 2 +-
 sys/i386/isa/mcd.c                                                | 2 +-
 sys/i386/isa/mcdreg.h                                             | 2 +-
 sys/i386/isa/mse.c                                                | 2 +-
 sys/i386/isa/nmi.c                                                | 4 ++--
 sys/i386/isa/npx.c                                                | 2 +-
 sys/i386/isa/pcaudio.c                                            | 2 +-
 sys/i386/isa/pcf.c                                                | 2 +-
 sys/i386/isa/pcibus.c                                             | 2 +-
 sys/i386/isa/pcibus.h                                             | 2 +-
 sys/i386/isa/pnp.c                                                | 2 +-
 sys/i386/isa/pnp.h                                                | 2 +-
 sys/i386/isa/ppc.c                                                | 2 +-
 sys/i386/isa/ppcreg.h                                             | 2 +-
 sys/i386/isa/prof_machdep.c                                       | 2 +-
 sys/i386/isa/random_machdep.c                                     | 2 +-
 sys/i386/isa/rp.c                                                 | 2 +-
 sys/i386/isa/scd.c                                                | 2 +-
 sys/i386/isa/scdreg.h                                             | 2 +-
 sys/i386/isa/si.c                                                 | 2 +-
 sys/i386/isa/sireg.h                                              | 2 +-
 sys/i386/isa/sound/mmap_test.c                                    | 2 +-
 sys/i386/isa/sound/pcm86.c                                        | 2 +-
 sys/i386/isa/sound/sound.doc                                      | 2 +-
 sys/i386/isa/spkr.c                                               | 2 +-
 sys/i386/isa/stallion.c                                           | 2 +-
 sys/i386/isa/timerreg.h                                           | 2 +-
 sys/i386/isa/vector.s                                             | 2 +-
 sys/i386/isa/vesa.c                                               | 2 +-
 sys/i386/isa/wd.c                                                 | 2 +-
 sys/i386/isa/wd_cd.c                                              | 2 +-
 sys/i386/isa/wd_cd.h                                              | 2 +-
 sys/i386/isa/wdreg.h                                              | 2 +-
 sys/i386/isa/wfd.c                                                | 2 +-
 sys/i386/isa/wst.c                                                | 2 +-
 sys/i386/isa/wt.c                                                 | 2 +-
 sys/i386/isa/wtreg.h                                              | 2 +-
 sys/i386/linux/Makefile                                           | 2 +-
 sys/i386/linux/imgact_linux.c                                     | 2 +-
 sys/i386/linux/linux.h                                            | 2 +-
 sys/i386/linux/linux_dummy.c                                      | 2 +-
 sys/i386/linux/linux_file.c                                       | 2 +-
 sys/i386/linux/linux_genassym.c                                   | 2 +-
 sys/i386/linux/linux_ioctl.c                                      | 2 +-
 sys/i386/linux/linux_ipc.c                                        | 2 +-
 sys/i386/linux/linux_misc.c                                       | 2 +-
 sys/i386/linux/linux_signal.c                                     | 2 +-
 sys/i386/linux/linux_socket.c                                     | 2 +-
 sys/i386/linux/linux_stats.c                                      | 2 +-
 sys/i386/linux/linux_sysvec.c                                     | 2 +-
 sys/i386/linux/linux_util.c                                       | 2 +-
 sys/i386/linux/linux_util.h                                       | 2 +-
 sys/i386/linux/syscalls.conf                                      | 2 +-
 sys/i386/linux/syscalls.master                                    | 2 +-
 sys/i386/pci/pci_bus.c                                            | 2 +-
 sys/i386/pci/pci_cfgreg.c                                         | 2 +-
 sys/i386/pci/pci_pir.c                                            | 2 +-
 sys/i386/svr4/svr4_genassym.c                                     | 2 +-
 sys/i386/svr4/svr4_locore.s                                       | 2 +-
 sys/i386/svr4/svr4_machdep.c                                      | 2 +-
 sys/i386/svr4/svr4_machdep.h                                      | 2 +-
 sys/i4b/driver/i4b_bsdi_ibc.c                                     | 2 +-
 sys/i4b/driver/i4b_ctl.c                                          | 2 +-
 sys/i4b/driver/i4b_ipr.c                                          | 2 +-
 sys/i4b/driver/i4b_isppp.c                                        | 2 +-
 sys/i4b/driver/i4b_rbch.c                                         | 2 +-
 sys/i4b/driver/i4b_tel.c                                          | 2 +-
 sys/i4b/driver/i4b_trace.c                                        | 2 +-
 sys/i4b/include/i4b_cause.h                                       | 2 +-
 sys/i4b/include/i4b_debug.h                                       | 2 +-
 sys/i4b/include/i4b_global.h                                      | 2 +-
 sys/i4b/include/i4b_ioctl.h                                       | 2 +-
 sys/i4b/include/i4b_isdnq931.h                                    | 2 +-
 sys/i4b/include/i4b_l1l2.h                                        | 2 +-
 sys/i4b/include/i4b_l2l3.h                                        | 2 +-
 sys/i4b/include/i4b_l3l4.h                                        | 2 +-
 sys/i4b/include/i4b_mbuf.h                                        | 2 +-
 sys/i4b/include/i4b_rbch_ioctl.h                                  | 2 +-
 sys/i4b/include/i4b_tel_ioctl.h                                   | 2 +-
 sys/i4b/include/i4b_trace.h                                       | 2 +-
 sys/i4b/layer1/i4b_asuscom_ipac.c                                 | 2 +-
 sys/i4b/layer1/i4b_avm_a1.c                                       | 2 +-
 sys/i4b/layer1/i4b_avm_fritz_pci.c                                | 2 +-
 sys/i4b/layer1/i4b_avm_fritz_pcmcia.c                             | 2 +-
 sys/i4b/layer1/i4b_avm_fritz_pnp.c                                | 2 +-
 sys/i4b/layer1/i4b_bchan.c                                        | 2 +-
 sys/i4b/layer1/i4b_ctx_s0P.c                                      | 2 +-
 sys/i4b/layer1/i4b_drn_ngo.c                                      | 2 +-
 sys/i4b/layer1/i4b_dynalink.c                                     | 2 +-
 sys/i4b/layer1/i4b_elsa_isdnmc.c                                  | 2 +-
 sys/i4b/layer1/i4b_elsa_mcall.c                                   | 2 +-
 sys/i4b/layer1/i4b_elsa_qs1i.c                                    | 2 +-
 sys/i4b/layer1/i4b_elsa_qs1p.c                                    | 2 +-
 sys/i4b/layer1/i4b_hscx.c                                         | 2 +-
 sys/i4b/layer1/i4b_hscx.h                                         | 2 +-
 sys/i4b/layer1/i4b_ipac.h                                         | 2 +-
 sys/i4b/layer1/i4b_isac.c                                         | 2 +-
 sys/i4b/layer1/i4b_isac.h                                         | 2 +-
 sys/i4b/layer1/i4b_isic.c                                         | 2 +-
 sys/i4b/layer1/i4b_isic_isa.c                                     | 2 +-
 sys/i4b/layer1/i4b_isic_pci.c                                     | 2 +-
 sys/i4b/layer1/i4b_isic_pcmcia.c                                  | 2 +-
 sys/i4b/layer1/i4b_isic_pnp.c                                     | 2 +-
 sys/i4b/layer1/i4b_itk_ix1.c                                      | 2 +-
 sys/i4b/layer1/i4b_l1.c                                           | 2 +-
 sys/i4b/layer1/i4b_l1.h                                           | 2 +-
 sys/i4b/layer1/i4b_l1fsm.c                                        | 2 +-
 sys/i4b/layer1/i4b_siemens_isurf.c                                | 2 +-
 sys/i4b/layer1/i4b_sws.c                                          | 2 +-
 sys/i4b/layer1/i4b_tel_s016.c                                     | 2 +-
 sys/i4b/layer1/i4b_tel_s0163.c                                    | 2 +-
 sys/i4b/layer1/i4b_tel_s08.c                                      | 2 +-
 sys/i4b/layer1/i4b_tel_s0P.c                                      | 2 +-
 sys/i4b/layer1/i4b_usr_sti.c                                      | 2 +-
 sys/i4b/layer1/isa_isic.c                                         | 2 +-
 sys/i4b/layer1/isapnp_isic.c                                      | 2 +-
 sys/i4b/layer1/isic_supio.c                                       | 2 +-
 sys/i4b/layer1/pci_isic.c                                         | 2 +-
 sys/i4b/layer1/pci_isic.h                                         | 2 +-
 sys/i4b/layer1/pcmcia_isic.c                                      | 2 +-
 sys/i4b/layer1/pcmcia_isic.h                                      | 2 +-
 sys/i4b/layer2/i4b_iframe.c                                       | 2 +-
 sys/i4b/layer2/i4b_l2.c                                           | 2 +-
 sys/i4b/layer2/i4b_l2.h                                           | 2 +-
 sys/i4b/layer2/i4b_l2fsm.c                                        | 2 +-
 sys/i4b/layer2/i4b_l2fsm.h                                        | 2 +-
 sys/i4b/layer2/i4b_l2timer.c                                      | 2 +-
 sys/i4b/layer2/i4b_lme.c                                          | 2 +-
 sys/i4b/layer2/i4b_mbuf.c                                         | 2 +-
 sys/i4b/layer2/i4b_sframe.c                                       | 2 +-
 sys/i4b/layer2/i4b_tei.c                                          | 2 +-
 sys/i4b/layer2/i4b_uframe.c                                       | 2 +-
 sys/i4b/layer2/i4b_util.c                                         | 2 +-
 sys/i4b/layer3/i4b_l2if.c                                         | 2 +-
 sys/i4b/layer3/i4b_l3.h                                           | 2 +-
 sys/i4b/layer3/i4b_l3fsm.c                                        | 2 +-
 sys/i4b/layer3/i4b_l3fsm.h                                        | 2 +-
 sys/i4b/layer3/i4b_l3timer.c                                      | 2 +-
 sys/i4b/layer3/i4b_l4if.c                                         | 2 +-
 sys/i4b/layer3/i4b_q931.c                                         | 2 +-
 sys/i4b/layer3/i4b_q931.h                                         | 2 +-
 sys/i4b/layer3/i4b_q932fac.c                                      | 2 +-
 sys/i4b/layer3/i4b_q932fac.h                                      | 2 +-
 sys/i4b/layer4/i4b_i4bdrv.c                                       | 2 +-
 sys/i4b/layer4/i4b_l4.c                                           | 2 +-
 sys/i4b/layer4/i4b_l4.h                                           | 2 +-
 sys/i4b/layer4/i4b_l4mgmt.c                                       | 2 +-
 sys/i4b/layer4/i4b_l4timer.c                                      | 2 +-
 sys/i4b/tina-dd/i4b_tina_dd.c                                     | 2 +-
 sys/i4b/tina-dd/i4b_tina_ioctl.h                                  | 2 +-
 sys/isa/atkbd_isa.c                                               | 2 +-
 sys/isa/atkbdc_isa.c                                              | 2 +-
 sys/isa/atrtc.c                                                   | 2 +-
 sys/isa/bt_isa.c                                                  | 2 +-
 sys/isa/fd.c                                                      | 2 +-
 sys/isa/fdc.h                                                     | 2 +-
 sys/isa/fdreg.h                                                   | 2 +-
 sys/isa/ic/esp.h                                                  | 2 +-
 sys/isa/ic/nec765.h                                               | 2 +-
 sys/isa/ic/ns16550.h                                              | 2 +-
 sys/isa/isa_common.c                                              | 2 +-
 sys/isa/isa_common.h                                              | 2 +-
 sys/isa/isa_if.m                                                  | 2 +-
 sys/isa/isahint.c                                                 | 2 +-
 sys/isa/isareg.h                                                  | 2 +-
 sys/isa/isavar.h                                                  | 2 +-
 sys/isa/pnp.h                                                     | 2 +-
 sys/isa/ppc.c                                                     | 2 +-
 sys/isa/ppcreg.h                                                  | 2 +-
 sys/isa/psm.c                                                     | 2 +-
 sys/isa/rtc.h                                                     | 2 +-
 sys/isa/sio.c                                                     | 2 +-
 sys/isa/sioreg.h                                                  | 2 +-
 sys/isa/syscons_isa.c                                             | 2 +-
 sys/isa/vga_isa.c                                                 | 2 +-
 sys/isofs/cd9660/TODO                                             | 2 +-
 sys/isofs/cd9660/cd9660_bmap.c                                    | 2 +-
 sys/isofs/cd9660/cd9660_lookup.c                                  | 2 +-
 sys/isofs/cd9660/cd9660_node.c                                    | 2 +-
 sys/isofs/cd9660/cd9660_node.h                                    | 2 +-
 sys/isofs/cd9660/cd9660_rrip.c                                    | 2 +-
 sys/isofs/cd9660/cd9660_rrip.h                                    | 2 +-
 sys/isofs/cd9660/cd9660_util.c                                    | 2 +-
 sys/isofs/cd9660/cd9660_vfsops.c                                  | 2 +-
 sys/isofs/cd9660/cd9660_vnops.c                                   | 2 +-
 sys/isofs/cd9660/iso.h                                            | 2 +-
 sys/isofs/cd9660/iso_rrip.h                                       | 2 +-
 sys/kern/bus_if.m                                                 | 2 +-
 sys/kern/device_if.m                                              | 2 +-
 sys/kern/imgact_aout.c                                            | 2 +-
 sys/kern/imgact_elf.c                                             | 2 +-
 sys/kern/imgact_gzip.c                                            | 2 +-
 sys/kern/imgact_shell.c                                           | 2 +-
 sys/kern/inflate.c                                                | 2 +-
 sys/kern/init_main.c                                              | 2 +-
 sys/kern/kern_acct.c                                              | 2 +-
 sys/kern/kern_clock.c                                             | 2 +-
 sys/kern/kern_conf.c                                              | 2 +-
 sys/kern/kern_descrip.c                                           | 2 +-
 sys/kern/kern_environment.c                                       | 2 +-
 sys/kern/kern_exec.c                                              | 2 +-
 sys/kern/kern_exit.c                                              | 2 +-
 sys/kern/kern_fork.c                                              | 2 +-
 sys/kern/kern_intr.c                                              | 2 +-
 sys/kern/kern_jail.c                                              | 2 +-
 sys/kern/kern_ktrace.c                                            | 2 +-
 sys/kern/kern_linker.c                                            | 2 +-
 sys/kern/kern_lock.c                                              | 2 +-
 sys/kern/kern_lockf.c                                             | 2 +-
 sys/kern/kern_malloc.c                                            | 2 +-
 sys/kern/kern_mib.c                                               | 2 +-
 sys/kern/kern_module.c                                            | 2 +-
 sys/kern/kern_physio.c                                            | 2 +-
 sys/kern/kern_proc.c                                              | 2 +-
 sys/kern/kern_prot.c                                              | 2 +-
 sys/kern/kern_random.c                                            | 2 +-
 sys/kern/kern_resource.c                                          | 2 +-
 sys/kern/kern_shutdown.c                                          | 2 +-
 sys/kern/kern_sig.c                                               | 2 +-
 sys/kern/kern_subr.c                                              | 2 +-
 sys/kern/kern_synch.c                                             | 2 +-
 sys/kern/kern_syscalls.c                                          | 2 +-
 sys/kern/kern_sysctl.c                                            | 2 +-
 sys/kern/kern_tc.c                                                | 2 +-
 sys/kern/kern_threads.c                                           | 2 +-
 sys/kern/kern_time.c                                              | 2 +-
 sys/kern/kern_timeout.c                                           | 2 +-
 sys/kern/kern_xxx.c                                               | 2 +-
 sys/kern/link_aout.c                                              | 2 +-
 sys/kern/link_elf.c                                               | 2 +-
 sys/kern/link_elf_obj.c                                           | 2 +-
 sys/kern/makedevops.pl                                            | 2 +-
 sys/kern/makesyscalls.sh                                          | 2 +-
 sys/kern/md5c.c                                                   | 2 +-
 sys/kern/subr_autoconf.c                                          | 2 +-
 sys/kern/subr_blist.c                                             | 2 +-
 sys/kern/subr_bus.c                                               | 2 +-
 sys/kern/subr_clist.c                                             | 2 +-
 sys/kern/subr_devstat.c                                           | 2 +-
 sys/kern/subr_disklabel.c                                         | 2 +-
 sys/kern/subr_diskmbr.c                                           | 2 +-
 sys/kern/subr_diskslice.c                                         | 2 +-
 sys/kern/subr_dkbad.c                                             | 2 +-
 sys/kern/subr_eventhandler.c                                      | 2 +-
 sys/kern/subr_log.c                                               | 2 +-
 sys/kern/subr_module.c                                            | 2 +-
 sys/kern/subr_param.c                                             | 2 +-
 sys/kern/subr_prf.c                                               | 2 +-
 sys/kern/subr_prof.c                                              | 2 +-
 sys/kern/subr_rman.c                                              | 2 +-
 sys/kern/subr_scanf.c                                             | 2 +-
 sys/kern/subr_smp.c                                               | 2 +-
 sys/kern/subr_trap.c                                              | 2 +-
 sys/kern/subr_xxx.c                                               | 2 +-
 sys/kern/sys_generic.c                                            | 2 +-
 sys/kern/sys_pipe.c                                               | 2 +-
 sys/kern/sys_process.c                                            | 2 +-
 sys/kern/sys_socket.c                                             | 2 +-
 sys/kern/syscalls.master                                          | 2 +-
 sys/kern/sysv_ipc.c                                               | 2 +-
 sys/kern/sysv_msg.c                                               | 2 +-
 sys/kern/sysv_sem.c                                               | 2 +-
 sys/kern/sysv_shm.c                                               | 2 +-
 sys/kern/tty.c                                                    | 2 +-
 sys/kern/tty_compat.c                                             | 2 +-
 sys/kern/tty_conf.c                                               | 2 +-
 sys/kern/tty_cons.c                                               | 2 +-
 sys/kern/tty_pty.c                                                | 2 +-
 sys/kern/tty_snoop.c                                              | 2 +-
 sys/kern/tty_subr.c                                               | 2 +-
 sys/kern/tty_tb.c                                                 | 2 +-
 sys/kern/tty_tty.c                                                | 2 +-
 sys/kern/uipc_domain.c                                            | 2 +-
 sys/kern/uipc_mbuf.c                                              | 2 +-
 sys/kern/uipc_proto.c                                             | 2 +-
 sys/kern/uipc_sockbuf.c                                           | 2 +-
 sys/kern/uipc_socket.c                                            | 2 +-
 sys/kern/uipc_socket2.c                                           | 2 +-
 sys/kern/uipc_syscalls.c                                          | 2 +-
 sys/kern/uipc_usrreq.c                                            | 2 +-
 sys/kern/vfs_aio.c                                                | 2 +-
 sys/kern/vfs_bio.c                                                | 2 +-
 sys/kern/vfs_cache.c                                              | 2 +-
 sys/kern/vfs_cluster.c                                            | 2 +-
 sys/kern/vfs_conf.c                                               | 2 +-
 sys/kern/vfs_default.c                                            | 2 +-
 sys/kern/vfs_export.c                                             | 2 +-
 sys/kern/vfs_extattr.c                                            | 2 +-
 sys/kern/vfs_init.c                                               | 2 +-
 sys/kern/vfs_lookup.c                                             | 2 +-
 sys/kern/vfs_mount.c                                              | 2 +-
 sys/kern/vfs_subr.c                                               | 2 +-
 sys/kern/vfs_syscalls.c                                           | 2 +-
 sys/kern/vfs_vnops.c                                              | 2 +-
 sys/kern/vnode_if.pl                                              | 2 +-
 sys/kern/vnode_if.sh                                              | 2 +-
 sys/kern/vnode_if.src                                             | 2 +-
 sys/libkern/adddi3.c                                              | 2 +-
 sys/libkern/anddi3.c                                              | 2 +-
 sys/libkern/ashldi3.c                                             | 2 +-
 sys/libkern/ashrdi3.c                                             | 2 +-
 sys/libkern/bcmp.c                                                | 2 +-
 sys/libkern/cmpdi2.c                                              | 2 +-
 sys/libkern/divdi3.c                                              | 2 +-
 sys/libkern/ffs.c                                                 | 2 +-
 sys/libkern/index.c                                               | 2 +-
 sys/libkern/iordi3.c                                              | 2 +-
 sys/libkern/locc.c                                                | 2 +-
 sys/libkern/lshldi3.c                                             | 2 +-
 sys/libkern/lshrdi3.c                                             | 2 +-
 sys/libkern/mcount.c                                              | 2 +-
 sys/libkern/moddi3.c                                              | 2 +-
 sys/libkern/muldi3.c                                              | 2 +-
 sys/libkern/negdi2.c                                              | 2 +-
 sys/libkern/notdi2.c                                              | 2 +-
 sys/libkern/qdivrem.c                                             | 2 +-
 sys/libkern/qsort.c                                               | 2 +-
 sys/libkern/quad.h                                                | 2 +-
 sys/libkern/random.c                                              | 2 +-
 sys/libkern/rindex.c                                              | 2 +-
 sys/libkern/scanc.c                                               | 2 +-
 sys/libkern/skpc.c                                                | 2 +-
 sys/libkern/strcat.c                                              | 2 +-
 sys/libkern/strcmp.c                                              | 2 +-
 sys/libkern/strcpy.c                                              | 2 +-
 sys/libkern/strlen.c                                              | 2 +-
 sys/libkern/strncmp.c                                             | 2 +-
 sys/libkern/strncpy.c                                             | 2 +-
 sys/libkern/subdi3.c                                              | 2 +-
 sys/libkern/ucmpdi2.c                                             | 2 +-
 sys/libkern/udivdi3.c                                             | 2 +-
 sys/libkern/umoddi3.c                                             | 2 +-
 sys/libkern/xordi3.c                                              | 2 +-
 sys/miscfs/deadfs/dead_vnops.c                                    | 2 +-
 sys/miscfs/devfs/devfs_tree.c                                     | 2 +-
 sys/miscfs/devfs/devfs_vfsops.c                                   | 2 +-
 sys/miscfs/devfs/devfs_vnops.c                                    | 2 +-
 sys/miscfs/devfs/devfsdefs.h                                      | 2 +-
 sys/miscfs/fdesc/fdesc.h                                          | 2 +-
 sys/miscfs/fdesc/fdesc_vfsops.c                                   | 2 +-
 sys/miscfs/fdesc/fdesc_vnops.c                                    | 2 +-
 sys/miscfs/fifofs/fifo.h                                          | 2 +-
 sys/miscfs/fifofs/fifo_vnops.c                                    | 2 +-
 sys/miscfs/kernfs/kernfs.h                                        | 2 +-
 sys/miscfs/kernfs/kernfs_vfsops.c                                 | 2 +-
 sys/miscfs/kernfs/kernfs_vnops.c                                  | 2 +-
 sys/miscfs/nullfs/null.h                                          | 2 +-
 sys/miscfs/nullfs/null_subr.c                                     | 2 +-
 sys/miscfs/nullfs/null_vfsops.c                                   | 2 +-
 sys/miscfs/nullfs/null_vnops.c                                    | 4 ++--
 sys/miscfs/portal/portal.h                                        | 2 +-
 sys/miscfs/portal/portal_vfsops.c                                 | 2 +-
 sys/miscfs/portal/portal_vnops.c                                  | 2 +-
 sys/miscfs/procfs/README                                          | 2 +-
 sys/miscfs/procfs/procfs.h                                        | 2 +-
 sys/miscfs/procfs/procfs_ctl.c                                    | 2 +-
 sys/miscfs/procfs/procfs_dbregs.c                                 | 2 +-
 sys/miscfs/procfs/procfs_fpregs.c                                 | 2 +-
 sys/miscfs/procfs/procfs_map.c                                    | 2 +-
 sys/miscfs/procfs/procfs_mem.c                                    | 2 +-
 sys/miscfs/procfs/procfs_note.c                                   | 2 +-
 sys/miscfs/procfs/procfs_regs.c                                   | 2 +-
 sys/miscfs/procfs/procfs_rlimit.c                                 | 2 +-
 sys/miscfs/procfs/procfs_status.c                                 | 2 +-
 sys/miscfs/procfs/procfs_subr.c                                   | 2 +-
 sys/miscfs/procfs/procfs_type.c                                   | 2 +-
 sys/miscfs/procfs/procfs_vfsops.c                                 | 2 +-
 sys/miscfs/procfs/procfs_vnops.c                                  | 2 +-
 sys/miscfs/specfs/spec_vnops.c                                    | 2 +-
 sys/miscfs/umapfs/umap.h                                          | 2 +-
 sys/miscfs/umapfs/umap_subr.c                                     | 2 +-
 sys/miscfs/umapfs/umap_vfsops.c                                   | 2 +-
 sys/miscfs/umapfs/umap_vnops.c                                    | 2 +-
 sys/miscfs/union/union.h                                          | 2 +-
 sys/miscfs/union/union_subr.c                                     | 2 +-
 sys/miscfs/union/union_vfsops.c                                   | 2 +-
 sys/miscfs/union/union_vnops.c                                    | 2 +-
 sys/modules/Makefile                                              | 2 +-
 sys/modules/Makefile.inc                                          | 2 +-
 sys/modules/atapi/Makefile                                        | 2 +-
 sys/modules/ax/Makefile                                           | 2 +-
 sys/modules/bktr/Makefile                                         | 2 +-
 sys/modules/ccd/Makefile                                          | 2 +-
 sys/modules/cd9660/Makefile                                       | 2 +-
 sys/modules/coda/Makefile                                         | 2 +-
 sys/modules/coff/Makefile                                         | 2 +-
 sys/modules/fdesc/Makefile                                        | 2 +-
 sys/modules/fdescfs/Makefile                                      | 2 +-
 sys/modules/fpu/Makefile                                          | 2 +-
 sys/modules/fxp/Makefile                                          | 2 +-
 sys/modules/gnufpu/Makefile                                       | 2 +-
 sys/modules/ibcs2/Makefile                                        | 2 +-
 sys/modules/ibcs2/ibcs2.8                                         | 2 +-
 sys/modules/ibcs2/ibcs2.sh                                        | 2 +-
 sys/modules/if_disc/Makefile                                      | 2 +-
 sys/modules/if_ppp/Makefile                                       | 2 +-
 sys/modules/if_sl/Makefile                                        | 2 +-
 sys/modules/if_tun/Makefile                                       | 2 +-
 sys/modules/ip_mroute_mod/Makefile                                | 2 +-
 sys/modules/ipfw/Makefile                                         | 2 +-
 sys/modules/joy/Makefile                                          | 2 +-
 sys/modules/joy/joy.8                                             | 2 +-
 sys/modules/joy/joy.sh                                            | 2 +-
 sys/modules/kernfs/Makefile                                       | 2 +-
 sys/modules/linux/Makefile                                        | 2 +-
 sys/modules/linux/linux.8                                         | 2 +-
 sys/modules/linux/linux.sh                                        | 2 +-
 sys/modules/mfs/Makefile                                          | 2 +-
 sys/modules/mii/Makefile                                          | 2 +-
 sys/modules/msdos/Makefile                                        | 2 +-
 sys/modules/msdosfs/Makefile                                      | 2 +-
 sys/modules/mx/Makefile                                           | 2 +-
 sys/modules/nfs/Makefile                                          | 2 +-
 sys/modules/nfsclient/Makefile                                    | 2 +-
 sys/modules/nfsserver/Makefile                                    | 2 +-
 sys/modules/ntfs/Makefile                                         | 2 +-
 sys/modules/nullfs/Makefile                                       | 2 +-
 sys/modules/pcic/Makefile                                         | 2 +-
 sys/modules/pn/Makefile                                           | 2 +-
 sys/modules/portal/Makefile                                       | 2 +-
 sys/modules/portalfs/Makefile                                     | 2 +-
 sys/modules/procfs/Makefile                                       | 2 +-
 sys/modules/sf/Makefile                                           | 2 +-
 sys/modules/sk/Makefile                                           | 2 +-
 sys/modules/splash/Makefile                                       | 2 +-
 sys/modules/splash/Makefile.inc                                   | 2 +-
 sys/modules/splash/bmp/Makefile                                   | 2 +-
 sys/modules/splash/bmp/splash_bmp.c                               | 2 +-
 sys/modules/splash/pcx/Makefile                                   | 2 +-
 sys/modules/splash/pcx/splash_pcx.c                               | 2 +-
 sys/modules/ste/Makefile                                          | 2 +-
 sys/modules/streams/Makefile                                      | 2 +-
 sys/modules/svr4/Makefile                                         | 2 +-
 sys/modules/svr4/README                                           | 2 +-
 sys/modules/svr4/TO-DO                                            | 2 +-
 sys/modules/svr4/svr4.sh                                          | 2 +-
 sys/modules/syscons/Makefile                                      | 2 +-
 sys/modules/syscons/Makefile.inc                                  | 2 +-
 sys/modules/syscons/blank/Makefile                                | 2 +-
 sys/modules/syscons/blank/blank_saver.c                           | 2 +-
 sys/modules/syscons/daemon/Makefile                               | 2 +-
 sys/modules/syscons/daemon/daemon_saver.c                         | 2 +-
 sys/modules/syscons/fade/Makefile                                 | 2 +-
 sys/modules/syscons/fade/fade_saver.c                             | 2 +-
 sys/modules/syscons/fire/fire_saver.c                             | 2 +-
 sys/modules/syscons/green/Makefile                                | 2 +-
 sys/modules/syscons/green/green_saver.c                           | 2 +-
 sys/modules/syscons/logo/Makefile                                 | 2 +-
 sys/modules/syscons/logo/logo_saver.c                             | 2 +-
 sys/modules/syscons/rain/Makefile                                 | 2 +-
 sys/modules/syscons/rain/rain_saver.c                             | 2 +-
 sys/modules/syscons/snake/Makefile                                | 2 +-
 sys/modules/syscons/snake/snake_saver.c                           | 2 +-
 sys/modules/syscons/star/Makefile                                 | 2 +-
 sys/modules/syscons/star/star_saver.c                             | 2 +-
 sys/modules/syscons/warp/Makefile                                 | 2 +-
 sys/modules/syscons/warp/warp_saver.c                             | 2 +-
 sys/modules/ti/Makefile                                           | 2 +-
 sys/modules/tl/Makefile                                           | 2 +-
 sys/modules/umapfs/Makefile                                       | 2 +-
 sys/modules/union/Makefile                                        | 2 +-
 sys/modules/unionfs/Makefile                                      | 2 +-
 sys/modules/vesa/Makefile                                         | 2 +-
 sys/modules/vinum/Makefile                                        | 2 +-
 sys/modules/vn/Makefile                                           | 2 +-
 sys/modules/vr/Makefile                                           | 2 +-
 sys/modules/wb/Makefile                                           | 2 +-
 sys/modules/xl/Makefile                                           | 2 +-
 sys/msdosfs/bootsect.h                                            | 2 +-
 sys/msdosfs/bpb.h                                                 | 2 +-
 sys/msdosfs/denode.h                                              | 2 +-
 sys/msdosfs/direntry.h                                            | 2 +-
 sys/msdosfs/fat.h                                                 | 2 +-
 sys/msdosfs/msdosfs_conv.c                                        | 2 +-
 sys/msdosfs/msdosfs_denode.c                                      | 2 +-
 sys/msdosfs/msdosfs_fat.c                                         | 2 +-
 sys/msdosfs/msdosfs_lookup.c                                      | 2 +-
 sys/msdosfs/msdosfs_vfsops.c                                      | 2 +-
 sys/msdosfs/msdosfs_vnops.c                                       | 2 +-
 sys/msdosfs/msdosfsmount.h                                        | 2 +-
 sys/net/bpf.c                                                     | 2 +-
 sys/net/bpf.h                                                     | 2 +-
 sys/net/bpf_compat.h                                              | 2 +-
 sys/net/bpf_filter.c                                              | 2 +-
 sys/net/bpfdesc.h                                                 | 2 +-
 sys/net/bsd_comp.c                                                | 2 +-
 sys/net/ethernet.h                                                | 2 +-
 sys/net/fddi.h                                                    | 2 +-
 sys/net/hostcache.c                                               | 2 +-
 sys/net/hostcache.h                                               | 2 +-
 sys/net/if.c                                                      | 2 +-
 sys/net/if.h                                                      | 2 +-
 sys/net/if_arp.h                                                  | 2 +-
 sys/net/if_disc.c                                                 | 2 +-
 sys/net/if_dl.h                                                   | 2 +-
 sys/net/if_ethersubr.c                                            | 2 +-
 sys/net/if_fddisubr.c                                             | 2 +-
 sys/net/if_iso88025subr.c                                         | 2 +-
 sys/net/if_llc.h                                                  | 2 +-
 sys/net/if_loop.c                                                 | 2 +-
 sys/net/if_media.c                                                | 2 +-
 sys/net/if_media.h                                                | 2 +-
 sys/net/if_mib.c                                                  | 2 +-
 sys/net/if_mib.h                                                  | 2 +-
 sys/net/if_ppp.c                                                  | 2 +-
 sys/net/if_ppp.h                                                  | 2 +-
 sys/net/if_pppvar.h                                               | 2 +-
 sys/net/if_sl.c                                                   | 2 +-
 sys/net/if_slvar.h                                                | 2 +-
 sys/net/if_sppp.h                                                 | 2 +-
 sys/net/if_spppsubr.c                                             | 2 +-
 sys/net/if_tun.h                                                  | 2 +-
 sys/net/if_tunvar.h                                               | 2 +-
 sys/net/if_types.h                                                | 2 +-
 sys/net/if_var.h                                                  | 2 +-
 sys/net/if_vlan.c                                                 | 2 +-
 sys/net/if_vlan_var.h                                             | 2 +-
 sys/net/iso88025.h                                                | 2 +-
 sys/net/netisr.h                                                  | 2 +-
 sys/net/ppp_comp.h                                                | 2 +-
 sys/net/ppp_deflate.c                                             | 2 +-
 sys/net/ppp_defs.h                                                | 2 +-
 sys/net/ppp_tty.c                                                 | 2 +-
 sys/net/radix.c                                                   | 2 +-
 sys/net/radix.h                                                   | 2 +-
 sys/net/raw_cb.c                                                  | 2 +-
 sys/net/raw_cb.h                                                  | 2 +-
 sys/net/raw_usrreq.c                                              | 2 +-
 sys/net/route.c                                                   | 2 +-
 sys/net/route.h                                                   | 2 +-
 sys/net/rtsock.c                                                  | 2 +-
 sys/net/slcompress.c                                              | 2 +-
 sys/net/slcompress.h                                              | 2 +-
 sys/net/slip.h                                                    | 2 +-
 sys/net/zlib.c                                                    | 2 +-
 sys/net/zlib.h                                                    | 2 +-
 sys/netatm/atm.h                                                  | 2 +-
 sys/netatm/atm_aal5.c                                             | 4 ++--
 sys/netatm/atm_cm.c                                               | 4 ++--
 sys/netatm/atm_cm.h                                               | 2 +-
 sys/netatm/atm_device.c                                           | 4 ++--
 sys/netatm/atm_if.c                                               | 4 ++--
 sys/netatm/atm_if.h                                               | 2 +-
 sys/netatm/atm_ioctl.h                                            | 2 +-
 sys/netatm/atm_pcb.h                                              | 2 +-
 sys/netatm/atm_proto.c                                            | 4 ++--
 sys/netatm/atm_sap.h                                              | 2 +-
 sys/netatm/atm_sigmgr.h                                           | 2 +-
 sys/netatm/atm_signal.c                                           | 4 ++--
 sys/netatm/atm_socket.c                                           | 4 ++--
 sys/netatm/atm_stack.h                                            | 2 +-
 sys/netatm/atm_subr.c                                             | 4 ++--
 sys/netatm/atm_sys.h                                              | 2 +-
 sys/netatm/atm_usrreq.c                                           | 4 ++--
 sys/netatm/atm_var.h                                              | 2 +-
 sys/netatm/atm_vc.h                                               | 2 +-
 sys/netatm/ipatm/ipatm.h                                          | 2 +-
 sys/netatm/ipatm/ipatm_event.c                                    | 4 ++--
 sys/netatm/ipatm/ipatm_if.c                                       | 4 ++--
 sys/netatm/ipatm/ipatm_input.c                                    | 4 ++--
 sys/netatm/ipatm/ipatm_load.c                                     | 4 ++--
 sys/netatm/ipatm/ipatm_output.c                                   | 4 ++--
 sys/netatm/ipatm/ipatm_serv.h                                     | 2 +-
 sys/netatm/ipatm/ipatm_usrreq.c                                   | 4 ++--
 sys/netatm/ipatm/ipatm_var.h                                      | 2 +-
 sys/netatm/ipatm/ipatm_vcm.c                                      | 4 ++--
 sys/netatm/kern_include.h                                         | 2 +-
 sys/netatm/port.h                                                 | 2 +-
 sys/netatm/queue.h                                                | 2 +-
 sys/netatm/sigpvc/sigpvc.h                                        | 2 +-
 sys/netatm/sigpvc/sigpvc_if.c                                     | 4 ++--
 sys/netatm/sigpvc/sigpvc_subr.c                                   | 4 ++--
 sys/netatm/sigpvc/sigpvc_var.h                                    | 2 +-
 sys/netatm/spans/spans_arp.c                                      | 4 ++--
 sys/netatm/spans/spans_cls.c                                      | 4 ++--
 sys/netatm/spans/spans_cls.h                                      | 2 +-
 sys/netatm/spans/spans_if.c                                       | 4 ++--
 sys/netatm/spans/spans_kxdr.c                                     | 4 ++--
 sys/netatm/spans/spans_msg.c                                      | 4 ++--
 sys/netatm/spans/spans_print.c                                    | 4 ++--
 sys/netatm/spans/spans_proto.c                                    | 4 ++--
 sys/netatm/spans/spans_subr.c                                     | 4 ++--
 sys/netatm/spans/spans_util.c                                     | 4 ++--
 sys/netatm/spans/spans_var.h                                      | 2 +-
 sys/netatm/spans/spans_xdr.x                                      | 4 ++--
 sys/netatm/uni/q2110_sigaa.c                                      | 4 ++--
 sys/netatm/uni/q2110_sigcpcs.c                                    | 4 ++--
 sys/netatm/uni/q2110_subr.c                                       | 4 ++--
 sys/netatm/uni/qsaal1_sigaa.c                                     | 4 ++--
 sys/netatm/uni/qsaal1_sigcpcs.c                                   | 4 ++--
 sys/netatm/uni/qsaal1_subr.c                                      | 4 ++--
 sys/netatm/uni/sscf_uni.c                                         | 4 ++--
 sys/netatm/uni/sscf_uni.h                                         | 2 +-
 sys/netatm/uni/sscf_uni_lower.c                                   | 4 ++--
 sys/netatm/uni/sscf_uni_upper.c                                   | 4 ++--
 sys/netatm/uni/sscf_uni_var.h                                     | 2 +-
 sys/netatm/uni/sscop.c                                            | 4 ++--
 sys/netatm/uni/sscop.h                                            | 2 +-
 sys/netatm/uni/sscop_lower.c                                      | 4 ++--
 sys/netatm/uni/sscop_misc.h                                       | 2 +-
 sys/netatm/uni/sscop_pdu.c                                        | 4 ++--
 sys/netatm/uni/sscop_pdu.h                                        | 2 +-
 sys/netatm/uni/sscop_sigaa.c                                      | 4 ++--
 sys/netatm/uni/sscop_sigcpcs.c                                    | 4 ++--
 sys/netatm/uni/sscop_subr.c                                       | 4 ++--
 sys/netatm/uni/sscop_timer.c                                      | 4 ++--
 sys/netatm/uni/sscop_upper.c                                      | 4 ++--
 sys/netatm/uni/sscop_var.h                                        | 2 +-
 sys/netatm/uni/uni.h                                              | 2 +-
 sys/netatm/uni/uni_load.c                                         | 4 ++--
 sys/netatm/uni/uniarp.c                                           | 4 ++--
 sys/netatm/uni/uniarp_cache.c                                     | 4 ++--
 sys/netatm/uni/uniarp_input.c                                     | 4 ++--
 sys/netatm/uni/uniarp_output.c                                    | 4 ++--
 sys/netatm/uni/uniarp_timer.c                                     | 4 ++--
 sys/netatm/uni/uniarp_vcm.c                                       | 4 ++--
 sys/netatm/uni/uniip.c                                            | 4 ++--
 sys/netatm/uni/uniip_var.h                                        | 2 +-
 sys/netatm/uni/unisig.h                                           | 2 +-
 sys/netatm/uni/unisig_decode.c                                    | 4 ++--
 sys/netatm/uni/unisig_decode.h                                    | 2 +-
 sys/netatm/uni/unisig_encode.c                                    | 4 ++--
 sys/netatm/uni/unisig_if.c                                        | 4 ++--
 sys/netatm/uni/unisig_mbuf.c                                      | 4 ++--
 sys/netatm/uni/unisig_mbuf.h                                      | 2 +-
 sys/netatm/uni/unisig_msg.c                                       | 4 ++--
 sys/netatm/uni/unisig_msg.h                                       | 2 +-
 sys/netatm/uni/unisig_print.c                                     | 4 ++--
 sys/netatm/uni/unisig_print.h                                     | 2 +-
 sys/netatm/uni/unisig_proto.c                                     | 4 ++--
 sys/netatm/uni/unisig_sigmgr_state.c                              | 4 ++--
 sys/netatm/uni/unisig_subr.c                                      | 4 ++--
 sys/netatm/uni/unisig_util.c                                      | 4 ++--
 sys/netatm/uni/unisig_var.h                                       | 2 +-
 sys/netatm/uni/unisig_vc_state.c                                  | 4 ++--
 sys/netinet/fil.c                                                 | 4 ++--
 sys/netinet/icmp_var.h                                            | 2 +-
 sys/netinet/if_ether.c                                            | 2 +-
 sys/netinet/if_ether.h                                            | 2 +-
 sys/netinet/if_fddi.h                                             | 2 +-
 sys/netinet/igmp.c                                                | 2 +-
 sys/netinet/igmp.h                                                | 2 +-
 sys/netinet/igmp_var.h                                            | 2 +-
 sys/netinet/in.c                                                  | 2 +-
 sys/netinet/in.h                                                  | 2 +-
 sys/netinet/in_cksum.c                                            | 2 +-
 sys/netinet/in_hostcache.c                                        | 2 +-
 sys/netinet/in_hostcache.h                                        | 2 +-
 sys/netinet/in_pcb.c                                              | 2 +-
 sys/netinet/in_pcb.h                                              | 2 +-
 sys/netinet/in_proto.c                                            | 2 +-
 sys/netinet/in_rmx.c                                              | 2 +-
 sys/netinet/in_systm.h                                            | 2 +-
 sys/netinet/in_var.h                                              | 2 +-
 sys/netinet/ip.h                                                  | 2 +-
 sys/netinet/ip_auth.c                                             | 2 +-
 sys/netinet/ip_auth.h                                             | 2 +-
 sys/netinet/ip_compat.h                                           | 2 +-
 sys/netinet/ip_divert.c                                           | 2 +-
 sys/netinet/ip_dummynet.c                                         | 2 +-
 sys/netinet/ip_dummynet.h                                         | 2 +-
 sys/netinet/ip_fil.c                                              | 2 +-
 sys/netinet/ip_fil.h                                              | 2 +-
 sys/netinet/ip_flow.c                                             | 2 +-
 sys/netinet/ip_flow.h                                             | 2 +-
 sys/netinet/ip_frag.c                                             | 2 +-
 sys/netinet/ip_frag.h                                             | 2 +-
 sys/netinet/ip_ftp_pxy.c                                          | 2 +-
 sys/netinet/ip_fw.c                                               | 2 +-
 sys/netinet/ip_fw.h                                               | 2 +-
 sys/netinet/ip_icmp.c                                             | 2 +-
 sys/netinet/ip_icmp.h                                             | 2 +-
 sys/netinet/ip_input.c                                            | 2 +-
 sys/netinet/ip_log.c                                              | 2 +-
 sys/netinet/ip_mroute.c                                           | 2 +-
 sys/netinet/ip_mroute.h                                           | 2 +-
 sys/netinet/ip_nat.c                                              | 2 +-
 sys/netinet/ip_nat.h                                              | 2 +-
 sys/netinet/ip_output.c                                           | 2 +-
 sys/netinet/ip_proxy.c                                            | 2 +-
 sys/netinet/ip_proxy.h                                            | 2 +-
 sys/netinet/ip_state.c                                            | 2 +-
 sys/netinet/ip_state.h                                            | 2 +-
 sys/netinet/ip_var.h                                              | 2 +-
 sys/netinet/ipl.h                                                 | 2 +-
 sys/netinet/mlf_ipl.c                                             | 2 +-
 sys/netinet/raw_ip.c                                              | 2 +-
 sys/netinet/tcp.h                                                 | 2 +-
 sys/netinet/tcp_debug.c                                           | 2 +-
 sys/netinet/tcp_debug.h                                           | 2 +-
 sys/netinet/tcp_fsm.h                                             | 2 +-
 sys/netinet/tcp_input.c                                           | 2 +-
 sys/netinet/tcp_output.c                                          | 2 +-
 sys/netinet/tcp_reass.c                                           | 2 +-
 sys/netinet/tcp_seq.h                                             | 2 +-
 sys/netinet/tcp_subr.c                                            | 2 +-
 sys/netinet/tcp_timer.c                                           | 2 +-
 sys/netinet/tcp_timer.h                                           | 2 +-
 sys/netinet/tcp_timewait.c                                        | 2 +-
 sys/netinet/tcp_usrreq.c                                          | 2 +-
 sys/netinet/tcp_var.h                                             | 2 +-
 sys/netinet/tcpip.h                                               | 2 +-
 sys/netinet/udp.h                                                 | 2 +-
 sys/netinet/udp_usrreq.c                                          | 2 +-
 sys/netinet/udp_var.h                                             | 2 +-
 sys/netipx/ipx.c                                                  | 2 +-
 sys/netipx/ipx.h                                                  | 2 +-
 sys/netipx/ipx_cksum.c                                            | 2 +-
 sys/netipx/ipx_if.h                                               | 2 +-
 sys/netipx/ipx_input.c                                            | 2 +-
 sys/netipx/ipx_ip.c                                               | 2 +-
 sys/netipx/ipx_ip.h                                               | 2 +-
 sys/netipx/ipx_outputfl.c                                         | 2 +-
 sys/netipx/ipx_pcb.c                                              | 2 +-
 sys/netipx/ipx_pcb.h                                              | 2 +-
 sys/netipx/ipx_proto.c                                            | 2 +-
 sys/netipx/ipx_tun.c                                              | 2 +-
 sys/netipx/ipx_usrreq.c                                           | 2 +-
 sys/netipx/ipx_var.h                                              | 2 +-
 sys/netipx/spx.h                                                  | 2 +-
 sys/netipx/spx_debug.c                                            | 2 +-
 sys/netipx/spx_debug.h                                            | 2 +-
 sys/netipx/spx_timer.h                                            | 2 +-
 sys/netipx/spx_usrreq.c                                           | 2 +-
 sys/netipx/spx_var.h                                              | 2 +-
 sys/netns/idp.h                                                   | 2 +-
 sys/netns/idp_usrreq.c                                            | 2 +-
 sys/netns/idp_var.h                                               | 2 +-
 sys/netns/ns.c                                                    | 2 +-
 sys/netns/ns.h                                                    | 2 +-
 sys/netns/ns_cksum.c                                              | 2 +-
 sys/netns/ns_error.c                                              | 2 +-
 sys/netns/ns_error.h                                              | 2 +-
 sys/netns/ns_if.h                                                 | 2 +-
 sys/netns/ns_input.c                                              | 2 +-
 sys/netns/ns_ip.c                                                 | 2 +-
 sys/netns/ns_output.c                                             | 2 +-
 sys/netns/ns_pcb.c                                                | 2 +-
 sys/netns/ns_pcb.h                                                | 2 +-
 sys/netns/ns_proto.c                                              | 2 +-
 sys/netns/sp.h                                                    | 2 +-
 sys/netns/spidp.h                                                 | 2 +-
 sys/netns/spp_debug.c                                             | 2 +-
 sys/netns/spp_debug.h                                             | 2 +-
 sys/netns/spp_timer.h                                             | 2 +-
 sys/netns/spp_usrreq.c                                            | 2 +-
 sys/netns/spp_var.h                                               | 2 +-
 sys/nfs/bootp_subr.c                                              | 2 +-
 sys/nfs/krpc.h                                                    | 2 +-
 sys/nfs/krpc_subr.c                                               | 2 +-
 sys/nfs/nfs.h                                                     | 2 +-
 sys/nfs/nfs_bio.c                                                 | 2 +-
 sys/nfs/nfs_common.c                                              | 2 +-
 sys/nfs/nfs_common.h                                              | 2 +-
 sys/nfs/nfs_node.c                                                | 2 +-
 sys/nfs/nfs_nqlease.c                                             | 2 +-
 sys/nfs/nfs_serv.c                                                | 2 +-
 sys/nfs/nfs_socket.c                                              | 2 +-
 sys/nfs/nfs_srvcache.c                                            | 2 +-
 sys/nfs/nfs_subs.c                                                | 2 +-
 sys/nfs/nfs_syscalls.c                                            | 2 +-
 sys/nfs/nfs_vfsops.c                                              | 2 +-
 sys/nfs/nfs_vnops.c                                               | 2 +-
 sys/nfs/nfsdiskless.h                                             | 2 +-
 sys/nfs/nfsm_subs.h                                               | 2 +-
 sys/nfs/nfsmount.h                                                | 2 +-
 sys/nfs/nfsnode.h                                                 | 2 +-
 sys/nfs/nfsproto.h                                                | 2 +-
 sys/nfs/nfsrtt.h                                                  | 2 +-
 sys/nfs/nfsrvcache.h                                              | 2 +-
 sys/nfs/nfsv2.h                                                   | 2 +-
 sys/nfs/nqnfs.h                                                   | 2 +-
 sys/nfs/rpcv2.h                                                   | 2 +-
 sys/nfs/xdr_subs.h                                                | 2 +-
 sys/nfsclient/bootp_subr.c                                        | 2 +-
 sys/nfsclient/krpc.h                                              | 2 +-
 sys/nfsclient/krpc_subr.c                                         | 2 +-
 sys/nfsclient/nfs.h                                               | 2 +-
 sys/nfsclient/nfs_bio.c                                           | 2 +-
 sys/nfsclient/nfs_nfsiod.c                                        | 2 +-
 sys/nfsclient/nfs_node.c                                          | 2 +-
 sys/nfsclient/nfs_socket.c                                        | 2 +-
 sys/nfsclient/nfs_subs.c                                          | 2 +-
 sys/nfsclient/nfs_vfsops.c                                        | 2 +-
 sys/nfsclient/nfs_vnops.c                                         | 2 +-
 sys/nfsclient/nfsargs.h                                           | 2 +-
 sys/nfsclient/nfsdiskless.h                                       | 2 +-
 sys/nfsclient/nfsm_subs.h                                         | 2 +-
 sys/nfsclient/nfsmount.h                                          | 2 +-
 sys/nfsclient/nfsnode.h                                           | 2 +-
 sys/nfsclient/nfsstats.h                                          | 2 +-
 sys/nfsserver/nfs.h                                               | 2 +-
 sys/nfsserver/nfs_serv.c                                          | 2 +-
 sys/nfsserver/nfs_srvcache.c                                      | 2 +-
 sys/nfsserver/nfs_srvsock.c                                       | 2 +-
 sys/nfsserver/nfs_srvsubs.c                                       | 2 +-
 sys/nfsserver/nfs_syscalls.c                                      | 2 +-
 sys/nfsserver/nfsm_subs.h                                         | 2 +-
 sys/nfsserver/nfsproto.h                                          | 2 +-
 sys/nfsserver/nfsrvcache.h                                        | 2 +-
 sys/nfsserver/nfsrvstats.h                                        | 2 +-
 sys/ntfs/ntfs.h                                                   | 2 +-
 sys/ntfs/ntfs_compr.c                                             | 2 +-
 sys/ntfs/ntfs_compr.h                                             | 2 +-
 sys/ntfs/ntfs_extern.h                                            | 2 +-
 sys/ntfs/ntfs_ihash.c                                             | 2 +-
 sys/ntfs/ntfs_ihash.h                                             | 2 +-
 sys/ntfs/ntfs_inode.h                                             | 2 +-
 sys/ntfs/ntfs_subr.c                                              | 2 +-
 sys/ntfs/ntfs_subr.h                                              | 2 +-
 sys/ntfs/ntfs_vfsops.c                                            | 2 +-
 sys/ntfs/ntfs_vfsops.h                                            | 2 +-
 sys/ntfs/ntfs_vnops.c                                             | 2 +-
 sys/ntfs/ntfsmount.h                                              | 2 +-
 sys/pc98/boot/Makefile                                            | 2 +-
 sys/pc98/boot/Makefile.inc                                        | 2 +-
 sys/pc98/boot/biosboot/Makefile                                   | 2 +-
 sys/pc98/boot/biosboot/README.386BSD                              | 2 +-
 sys/pc98/boot/biosboot/README.MACH                                | 2 +-
 sys/pc98/boot/biosboot/README.serial                              | 2 +-
 sys/pc98/boot/biosboot/asm.S                                      | 2 +-
 sys/pc98/boot/biosboot/asm.h                                      | 2 +-
 sys/pc98/boot/biosboot/bios.S                                     | 2 +-
 sys/pc98/boot/biosboot/boot.c                                     | 2 +-
 sys/pc98/boot/biosboot/boot.h                                     | 2 +-
 sys/pc98/boot/biosboot/disk.c                                     | 2 +-
 sys/pc98/boot/biosboot/io.c                                       | 2 +-
 sys/pc98/boot/biosboot/serial.S                                   | 2 +-
 sys/pc98/boot/biosboot/start.S                                    | 2 +-
 sys/pc98/boot/biosboot/sys.c                                      | 2 +-
 sys/pc98/boot/biosboot/table.c                                    | 2 +-
 sys/pc98/boot/kzipboot/Makefile                                   | 2 +-
 sys/pc98/boot/netboot/3c509.c                                     | 2 +-
 sys/pc98/boot/rawboot/Makefile                                    | 2 +-
 sys/pc98/cbus/cbus.h                                              | 2 +-
 sys/pc98/cbus/cbus_dma.c                                          | 2 +-
 sys/pc98/cbus/clock.c                                             | 2 +-
 sys/pc98/cbus/fdc.c                                               | 2 +-
 sys/pc98/cbus/fdcreg.h                                            | 2 +-
 sys/pc98/cbus/gdc.c                                               | 2 +-
 sys/pc98/cbus/olpt.c                                              | 2 +-
 sys/pc98/cbus/pckbd.c                                             | 2 +-
 sys/pc98/cbus/pcrtc.c                                             | 2 +-
 sys/pc98/cbus/ppc.c                                               | 2 +-
 sys/pc98/cbus/ppcreg.h                                            | 2 +-
 sys/pc98/cbus/sc_machdep.h                                        | 2 +-
 sys/pc98/cbus/scgdcrndr.c                                         | 2 +-
 sys/pc98/cbus/scvtb.c                                             | 2 +-
 sys/pc98/cbus/sio.c                                               | 2 +-
 sys/pc98/cbus/syscons_cbus.c                                      | 2 +-
 sys/pc98/conf/GENERIC                                             | 2 +-
 sys/pc98/conf/GENERIC98                                           | 2 +-
 sys/pc98/conf/Makefile.pc98                                       | 2 +-
 sys/pc98/conf/devices.pc98                                        | 2 +-
 sys/pc98/conf/files.pc98                                          | 2 +-
 sys/pc98/conf/majors.pc98                                         | 2 +-
 sys/pc98/conf/options.pc98                                        | 2 +-
 sys/pc98/i386/machdep.c                                           | 2 +-
 sys/pc98/i386/userconfig.c                                        | 4 ++--
 sys/pc98/pc98/atcompat_diskslice.c                                | 2 +-
 sys/pc98/pc98/clock.c                                             | 2 +-
 sys/pc98/pc98/diskslice_machdep.c                                 | 2 +-
 sys/pc98/pc98/fd.c                                                | 2 +-
 sys/pc98/pc98/fdreg.h                                             | 2 +-
 sys/pc98/pc98/if_ed.c                                             | 2 +-
 sys/pc98/pc98/if_ed98.h                                           | 2 +-
 sys/pc98/pc98/isa_dma.c                                           | 2 +-
 sys/pc98/pc98/machdep.c                                           | 2 +-
 sys/pc98/pc98/mse.c                                               | 2 +-
 sys/pc98/pc98/npx.c                                               | 2 +-
 sys/pc98/pc98/olpt.c                                              | 2 +-
 sys/pc98/pc98/pc98.c                                              | 2 +-
 sys/pc98/pc98/pc98.h                                              | 2 +-
 sys/pc98/pc98/pc98gdc.c                                           | 2 +-
 sys/pc98/pc98/pc98kbd.c                                           | 2 +-
 sys/pc98/pc98/pcaudio.c                                           | 2 +-
 sys/pc98/pc98/ppc.c                                               | 2 +-
 sys/pc98/pc98/ppcreg.h                                            | 2 +-
 sys/pc98/pc98/sc_machdep.h                                        | 2 +-
 sys/pc98/pc98/scgdcrndr.c                                         | 2 +-
 sys/pc98/pc98/scvtbpc98.c                                         | 2 +-
 sys/pc98/pc98/sio.c                                               | 2 +-
 sys/pc98/pc98/spkr.c                                              | 2 +-
 sys/pc98/pc98/syscons.c                                           | 2 +-
 sys/pc98/pc98/syscons_pc98.c                                      | 2 +-
 sys/pc98/pc98/wd.c                                                | 2 +-
 sys/pc98/pc98/wd_cd.c                                             | 2 +-
 sys/pc98/pc98/wfd.c                                               | 2 +-
 sys/pc98/pc98/wst.c                                               | 2 +-
 sys/pccard/pccard.c                                               | 2 +-
 sys/pccard/pcic.h                                                 | 2 +-
 sys/pccard/pcic_pci.c                                             | 2 +-
 sys/pccard/pcic_pci.h                                             | 2 +-
 sys/pci/adv_pci.c                                                 | 2 +-
 sys/pci/adw_pci.c                                                 | 2 +-
 sys/pci/ahc_pci.c                                                 | 2 +-
 sys/pci/alpm.c                                                    | 2 +-
 sys/pci/brktree_reg.h                                             | 2 +-
 sys/pci/brooktree848.c                                            | 2 +-
 sys/pci/bt848_i2c.c                                               | 2 +-
 sys/pci/bt848_i2c.h                                               | 2 +-
 sys/pci/bt_pci.c                                                  | 2 +-
 sys/pci/cy_pci.c                                                  | 2 +-
 sys/pci/cy_pcireg.h                                               | 2 +-
 sys/pci/dpt_pci.c                                                 | 2 +-
 sys/pci/dpt_pci.h                                                 | 2 +-
 sys/pci/es1370.c                                                  | 2 +-
 sys/pci/es1370_reg.h                                              | 2 +-
 sys/pci/ida_pci.c                                                 | 2 +-
 sys/pci/ide_pci.c                                                 | 2 +-
 sys/pci/ide_pcireg.h                                              | 2 +-
 sys/pci/if_al.c                                                   | 4 ++--
 sys/pci/if_alreg.h                                                | 2 +-
 sys/pci/if_ax.c                                                   | 4 ++--
 sys/pci/if_axreg.h                                                | 2 +-
 sys/pci/if_ed_p.c                                                 | 2 +-
 sys/pci/if_fpa.c                                                  | 2 +-
 sys/pci/if_fxp.c                                                  | 2 +-
 sys/pci/if_fxpreg.h                                               | 2 +-
 sys/pci/if_fxpvar.h                                               | 2 +-
 sys/pci/if_lnc_p.c                                                | 2 +-
 sys/pci/if_mx.c                                                   | 4 ++--
 sys/pci/if_mxreg.h                                                | 2 +-
 sys/pci/if_pn.c                                                   | 4 ++--
 sys/pci/if_pnreg.h                                                | 2 +-
 sys/pci/if_rl.c                                                   | 4 ++--
 sys/pci/if_rlreg.h                                                | 2 +-
 sys/pci/if_sf.c                                                   | 4 ++--
 sys/pci/if_sfreg.h                                                | 2 +-
 sys/pci/if_sk.c                                                   | 4 ++--
 sys/pci/if_skreg.h                                                | 2 +-
 sys/pci/if_sr_p.c                                                 | 2 +-
 sys/pci/if_ste.c                                                  | 4 ++--
 sys/pci/if_stereg.h                                               | 2 +-
 sys/pci/if_ti.c                                                   | 4 ++--
 sys/pci/if_tireg.h                                                | 2 +-
 sys/pci/if_tl.c                                                   | 4 ++--
 sys/pci/if_tlreg.h                                                | 2 +-
 sys/pci/if_tx.c                                                   | 2 +-
 sys/pci/if_txvar.h                                                | 2 +-
 sys/pci/if_vr.c                                                   | 4 ++--
 sys/pci/if_vrreg.h                                                | 2 +-
 sys/pci/if_wb.c                                                   | 4 ++--
 sys/pci/if_wbreg.h                                                | 2 +-
 sys/pci/if_xl.c                                                   | 4 ++--
 sys/pci/if_xlreg.h                                                | 2 +-
 sys/pci/intpm.c                                                   | 2 +-
 sys/pci/intpmreg.h                                                | 2 +-
 sys/pci/isp_pci.c                                                 | 2 +-
 sys/pci/ncr.c                                                     | 4 ++--
 sys/pci/ncrreg.h                                                  | 2 +-
 sys/pci/pci.c                                                     | 2 +-
 sys/pci/pci_compat.c                                              | 2 +-
 sys/pci/pci_if.m                                                  | 2 +-
 sys/pci/pcic_p.c                                                  | 2 +-
 sys/pci/pcic_p.h                                                  | 2 +-
 sys/pci/pcireg.h                                                  | 2 +-
 sys/pci/pcisupport.c                                              | 2 +-
 sys/pci/pcivar.h                                                  | 2 +-
 sys/pci/simos.c                                                   | 2 +-
 sys/pci/simos.h                                                   | 2 +-
 sys/pci/ti_fw.h                                                   | 2 +-
 sys/pci/ti_fw2.h                                                  | 2 +-
 sys/pci/xmaciireg.h                                               | 2 +-
 sys/pci/xrpu.c                                                    | 2 +-
 sys/posix4/aio.h                                                  | 2 +-
 sys/powerpc/aim/vm_machdep.c                                      | 2 +-
 sys/powerpc/include/_limits.h                                     | 2 +-
 sys/powerpc/include/bootinfo.h                                    | 2 +-
 sys/powerpc/include/clock.h                                       | 2 +-
 sys/powerpc/include/limits.h                                      | 2 +-
 sys/powerpc/include/md_var.h                                      | 2 +-
 sys/powerpc/include/ptrace.h                                      | 2 +-
 sys/powerpc/powerpc/elf_machdep.c                                 | 2 +-
 sys/powerpc/powerpc/genassym.c                                    | 2 +-
 sys/powerpc/powerpc/procfs_machdep.c                              | 2 +-
 sys/powerpc/powerpc/vm_machdep.c                                  | 2 +-
 sys/svr4/Makefile                                                 | 2 +-
 sys/svr4/imgact_svr4.c                                            | 2 +-
 sys/svr4/svr4.h                                                   | 2 +-
 sys/svr4/svr4_acl.h                                               | 2 +-
 sys/svr4/svr4_dirent.h                                            | 2 +-
 sys/svr4/svr4_errno.h                                             | 2 +-
 sys/svr4/svr4_exec.h                                              | 2 +-
 sys/svr4/svr4_fcntl.c                                             | 2 +-
 sys/svr4/svr4_fcntl.h                                             | 2 +-
 sys/svr4/svr4_filio.c                                             | 2 +-
 sys/svr4/svr4_filio.h                                             | 2 +-
 sys/svr4/svr4_fuser.h                                             | 2 +-
 sys/svr4/svr4_hrt.h                                               | 2 +-
 sys/svr4/svr4_ioctl.c                                             | 2 +-
 sys/svr4/svr4_ioctl.h                                             | 2 +-
 sys/svr4/svr4_ipc.c                                               | 2 +-
 sys/svr4/svr4_ipc.h                                               | 2 +-
 sys/svr4/svr4_misc.c                                              | 2 +-
 sys/svr4/svr4_mman.h                                              | 2 +-
 sys/svr4/svr4_resource.c                                          | 2 +-
 sys/svr4/svr4_resource.h                                          | 2 +-
 sys/svr4/svr4_siginfo.h                                           | 2 +-
 sys/svr4/svr4_signal.c                                            | 2 +-
 sys/svr4/svr4_signal.h                                            | 2 +-
 sys/svr4/svr4_socket.c                                            | 2 +-
 sys/svr4/svr4_socket.h                                            | 2 +-
 sys/svr4/svr4_sockio.c                                            | 2 +-
 sys/svr4/svr4_sockio.h                                            | 2 +-
 sys/svr4/svr4_sockmod.h                                           | 2 +-
 sys/svr4/svr4_stat.c                                              | 2 +-
 sys/svr4/svr4_stat.h                                              | 2 +-
 sys/svr4/svr4_statvfs.h                                           | 2 +-
 sys/svr4/svr4_stream.c                                            | 2 +-
 sys/svr4/svr4_stropts.h                                           | 2 +-
 sys/svr4/svr4_sysconfig.h                                         | 2 +-
 sys/svr4/svr4_systeminfo.h                                        | 2 +-
 sys/svr4/svr4_sysvec.c                                            | 2 +-
 sys/svr4/svr4_termios.c                                           | 2 +-
 sys/svr4/svr4_termios.h                                           | 2 +-
 sys/svr4/svr4_time.h                                              | 2 +-
 sys/svr4/svr4_timod.h                                             | 2 +-
 sys/svr4/svr4_ttold.c                                             | 2 +-
 sys/svr4/svr4_ttold.h                                             | 2 +-
 sys/svr4/svr4_types.h                                             | 2 +-
 sys/svr4/svr4_ucontext.h                                          | 2 +-
 sys/svr4/svr4_ulimit.h                                            | 2 +-
 sys/svr4/svr4_ustat.h                                             | 2 +-
 sys/svr4/svr4_util.h                                              | 2 +-
 sys/svr4/svr4_utsname.h                                           | 2 +-
 sys/svr4/svr4_wait.h                                              | 2 +-
 sys/svr4/syscalls.conf                                            | 2 +-
 sys/svr4/syscalls.master                                          | 2 +-
 sys/sys/_posix.h                                                  | 2 +-
 sys/sys/_sigset.h                                                 | 2 +-
 sys/sys/acct.h                                                    | 2 +-
 sys/sys/aio.h                                                     | 2 +-
 sys/sys/bio.h                                                     | 2 +-
 sys/sys/blist.h                                                   | 2 +-
 sys/sys/buf.h                                                     | 2 +-
 sys/sys/bus.h                                                     | 2 +-
 sys/sys/bus_dma.h                                                 | 2 +-
 sys/sys/bus_private.h                                             | 2 +-
 sys/sys/callout.h                                                 | 2 +-
 sys/sys/ccdvar.h                                                  | 2 +-
 sys/sys/cdefs.h                                                   | 2 +-
 sys/sys/cdio.h                                                    | 2 +-
 sys/sys/chio.h                                                    | 2 +-
 sys/sys/clist.h                                                   | 2 +-
 sys/sys/conf.h                                                    | 2 +-
 sys/sys/cons.h                                                    | 2 +-
 sys/sys/consio.h                                                  | 2 +-
 sys/sys/copyright.h                                               | 2 +-
 sys/sys/devfsext.h                                                | 2 +-
 sys/sys/device.h                                                  | 2 +-
 sys/sys/devicestat.h                                              | 2 +-
 sys/sys/dir.h                                                     | 2 +-
 sys/sys/dirent.h                                                  | 2 +-
 sys/sys/disklabel.h                                               | 2 +-
 sys/sys/diskmbr.h                                                 | 2 +-
 sys/sys/diskpc98.h                                                | 2 +-
 sys/sys/diskslice.h                                               | 2 +-
 sys/sys/dkbad.h                                                   | 2 +-
 sys/sys/dkstat.h                                                  | 2 +-
 sys/sys/dmap.h                                                    | 2 +-
 sys/sys/domain.h                                                  | 2 +-
 sys/sys/elf32.h                                                   | 2 +-
 sys/sys/elf64.h                                                   | 2 +-
 sys/sys/elf_common.h                                              | 2 +-
 sys/sys/elf_generic.h                                             | 2 +-
 sys/sys/errno.h                                                   | 2 +-
 sys/sys/eventhandler.h                                            | 2 +-
 sys/sys/exec.h                                                    | 2 +-
 sys/sys/fbio.h                                                    | 2 +-
 sys/sys/fcntl.h                                                   | 2 +-
 sys/sys/fdcio.h                                                   | 2 +-
 sys/sys/file.h                                                    | 2 +-
 sys/sys/filedesc.h                                                | 2 +-
 sys/sys/filio.h                                                   | 2 +-
 sys/sys/gmon.h                                                    | 2 +-
 sys/sys/imgact.h                                                  | 2 +-
 sys/sys/imgact_aout.h                                             | 2 +-
 sys/sys/imgact_elf.h                                              | 2 +-
 sys/sys/inflate.h                                                 | 2 +-
 sys/sys/interrupt.h                                               | 2 +-
 sys/sys/inttypes.h                                                | 2 +-
 sys/sys/ioccom.h                                                  | 2 +-
 sys/sys/ioctl.h                                                   | 2 +-
 sys/sys/ioctl_bt848.h                                             | 2 +-
 sys/sys/ioctl_compat.h                                            | 2 +-
 sys/sys/ipc.h                                                     | 2 +-
 sys/sys/jail.h                                                    | 2 +-
 sys/sys/kbio.h                                                    | 2 +-
 sys/sys/kernel.h                                                  | 2 +-
 sys/sys/ktrace.h                                                  | 2 +-
 sys/sys/libkern.h                                                 | 2 +-
 sys/sys/linedisc.h                                                | 2 +-
 sys/sys/linker.h                                                  | 2 +-
 sys/sys/linker_set.h                                              | 2 +-
 sys/sys/lock.h                                                    | 2 +-
 sys/sys/lockf.h                                                   | 2 +-
 sys/sys/lockmgr.h                                                 | 2 +-
 sys/sys/malloc.h                                                  | 2 +-
 sys/sys/mbuf.h                                                    | 2 +-
 sys/sys/md5.h                                                     | 2 +-
 sys/sys/mman.h                                                    | 2 +-
 sys/sys/module.h                                                  | 2 +-
 sys/sys/mount.h                                                   | 2 +-
 sys/sys/mouse.h                                                   | 2 +-
 sys/sys/msg.h                                                     | 2 +-
 sys/sys/msgbuf.h                                                  | 2 +-
 sys/sys/mtio.h                                                    | 2 +-
 sys/sys/namei.h                                                   | 2 +-
 sys/sys/param.h                                                   | 2 +-
 sys/sys/pioctl.h                                                  | 2 +-
 sys/sys/pipe.h                                                    | 2 +-
 sys/sys/poll.h                                                    | 2 +-
 sys/sys/proc.h                                                    | 2 +-
 sys/sys/procfs.h                                                  | 2 +-
 sys/sys/protosw.h                                                 | 2 +-
 sys/sys/ptio.h                                                    | 2 +-
 sys/sys/ptrace.h                                                  | 2 +-
 sys/sys/queue.h                                                   | 2 +-
 sys/sys/random.h                                                  | 2 +-
 sys/sys/reboot.h                                                  | 2 +-
 sys/sys/resource.h                                                | 2 +-
 sys/sys/resourcevar.h                                             | 2 +-
 sys/sys/rman.h                                                    | 2 +-
 sys/sys/rtprio.h                                                  | 2 +-
 sys/sys/scsiio.h                                                  | 2 +-
 sys/sys/select.h                                                  | 2 +-
 sys/sys/selinfo.h                                                 | 2 +-
 sys/sys/sem.h                                                     | 2 +-
 sys/sys/shm.h                                                     | 2 +-
 sys/sys/signal.h                                                  | 2 +-
 sys/sys/signalvar.h                                               | 2 +-
 sys/sys/sliceio.h                                                 | 2 +-
 sys/sys/smp.h                                                     | 2 +-
 sys/sys/socket.h                                                  | 2 +-
 sys/sys/socketvar.h                                               | 2 +-
 sys/sys/sockio.h                                                  | 2 +-
 sys/sys/stat.h                                                    | 2 +-
 sys/sys/sysctl.h                                                  | 2 +-
 sys/sys/sysent.h                                                  | 2 +-
 sys/sys/syslimits.h                                               | 2 +-
 sys/sys/syslog.h                                                  | 2 +-
 sys/sys/systm.h                                                   | 2 +-
 sys/sys/tablet.h                                                  | 2 +-
 sys/sys/termios.h                                                 | 2 +-
 sys/sys/time.h                                                    | 2 +-
 sys/sys/timeb.h                                                   | 2 +-
 sys/sys/timepps.h                                                 | 2 +-
 sys/sys/timers.h                                                  | 2 +-
 sys/sys/times.h                                                   | 2 +-
 sys/sys/timetc.h                                                  | 2 +-
 sys/sys/tprintf.h                                                 | 2 +-
 sys/sys/tty.h                                                     | 2 +-
 sys/sys/ttychars.h                                                | 2 +-
 sys/sys/ttycom.h                                                  | 2 +-
 sys/sys/ttydefaults.h                                             | 2 +-
 sys/sys/ttydev.h                                                  | 2 +-
 sys/sys/types.h                                                   | 2 +-
 sys/sys/ucred.h                                                   | 2 +-
 sys/sys/uio.h                                                     | 2 +-
 sys/sys/un.h                                                      | 2 +-
 sys/sys/unistd.h                                                  | 2 +-
 sys/sys/unpcb.h                                                   | 2 +-
 sys/sys/user.h                                                    | 2 +-
 sys/sys/utsname.h                                                 | 2 +-
 sys/sys/vadvise.h                                                 | 2 +-
 sys/sys/vcmd.h                                                    | 2 +-
 sys/sys/vlimit.h                                                  | 2 +-
 sys/sys/vmmeter.h                                                 | 2 +-
 sys/sys/vnode.h                                                   | 2 +-
 sys/sys/vsio.h                                                    | 2 +-
 sys/sys/wait.h                                                    | 2 +-
 sys/sys/xrpuio.h                                                  | 2 +-
 sys/tools/devlist2h.awk                                           | 2 +-
 sys/tools/miidevs2h.awk                                           | 2 +-
 sys/tools/vnode_if.awk                                            | 2 +-
 sys/ufs/ffs/ffs_alloc.c                                           | 2 +-
 sys/ufs/ffs/ffs_balloc.c                                          | 2 +-
 sys/ufs/ffs/ffs_extern.h                                          | 2 +-
 sys/ufs/ffs/ffs_inode.c                                           | 2 +-
 sys/ufs/ffs/ffs_softdep_stub.c                                    | 2 +-
 sys/ufs/ffs/ffs_subr.c                                            | 2 +-
 sys/ufs/ffs/ffs_tables.c                                          | 2 +-
 sys/ufs/ffs/ffs_vfsops.c                                          | 2 +-
 sys/ufs/ffs/ffs_vnops.c                                           | 2 +-
 sys/ufs/ffs/fs.h                                                  | 2 +-
 sys/ufs/mfs/mfs_extern.h                                          | 2 +-
 sys/ufs/mfs/mfs_vfsops.c                                          | 2 +-
 sys/ufs/mfs/mfs_vnops.c                                           | 2 +-
 sys/ufs/mfs/mfsnode.h                                             | 2 +-
 sys/ufs/ufs/dinode.h                                              | 2 +-
 sys/ufs/ufs/dir.h                                                 | 2 +-
 sys/ufs/ufs/inode.h                                               | 2 +-
 sys/ufs/ufs/quota.h                                               | 2 +-
 sys/ufs/ufs/ufs_bmap.c                                            | 2 +-
 sys/ufs/ufs/ufs_disksubr.c                                        | 2 +-
 sys/ufs/ufs/ufs_extern.h                                          | 2 +-
 sys/ufs/ufs/ufs_ihash.c                                           | 2 +-
 sys/ufs/ufs/ufs_inode.c                                           | 2 +-
 sys/ufs/ufs/ufs_lookup.c                                          | 2 +-
 sys/ufs/ufs/ufs_quota.c                                           | 2 +-
 sys/ufs/ufs/ufs_readwrite.c                                       | 2 +-
 sys/ufs/ufs/ufs_vfsops.c                                          | 2 +-
 sys/ufs/ufs/ufs_vnops.c                                           | 2 +-
 sys/ufs/ufs/ufsmount.h                                            | 2 +-
 sys/vm/default_pager.c                                            | 2 +-
 sys/vm/default_pager.h                                            | 2 +-
 sys/vm/device_pager.c                                             | 2 +-
 sys/vm/pmap.h                                                     | 2 +-
 sys/vm/swap_pager.c                                               | 2 +-
 sys/vm/swap_pager.h                                               | 2 +-
 sys/vm/vm.h                                                       | 2 +-
 sys/vm/vm_extern.h                                                | 2 +-
 sys/vm/vm_fault.c                                                 | 2 +-
 sys/vm/vm_glue.c                                                  | 2 +-
 sys/vm/vm_inherit.h                                               | 2 +-
 sys/vm/vm_init.c                                                  | 2 +-
 sys/vm/vm_kern.c                                                  | 2 +-
 sys/vm/vm_kern.h                                                  | 2 +-
 sys/vm/vm_map.c                                                   | 2 +-
 sys/vm/vm_map.h                                                   | 2 +-
 sys/vm/vm_meter.c                                                 | 2 +-
 sys/vm/vm_mmap.c                                                  | 2 +-
 sys/vm/vm_object.c                                                | 2 +-
 sys/vm/vm_object.h                                                | 2 +-
 sys/vm/vm_page.c                                                  | 2 +-
 sys/vm/vm_page.h                                                  | 2 +-
 sys/vm/vm_pageout.c                                               | 2 +-
 sys/vm/vm_pageout.h                                               | 2 +-
 sys/vm/vm_pager.c                                                 | 2 +-
 sys/vm/vm_pager.h                                                 | 2 +-
 sys/vm/vm_param.h                                                 | 2 +-
 sys/vm/vm_prot.h                                                  | 2 +-
 sys/vm/vm_swap.c                                                  | 2 +-
 sys/vm/vm_unix.c                                                  | 2 +-
 sys/vm/vm_zone.c                                                  | 2 +-
 sys/vm/vm_zone.h                                                  | 2 +-
 sys/vm/vnode_pager.c                                              | 2 +-
 sys/vm/vnode_pager.h                                              | 2 +-
 tools/3.0-upgrade/cvt-wtmp.c                                      | 2 +-
 tools/LibraryReport/LibraryReport.tcl                             | 2 +-
 tools/diag/ac/ac                                                  | 2 +-
 tools/diag/httpd-error/httpd-error                                | 2 +-
 tools/test/devrandom/hammer.random                                | 2 +-
 tools/test/devrandom/hammer.urandom                               | 2 +-
 tools/test/devrandom/stat.16bit                                   | 2 +-
 tools/test/devrandom/stat.8bit                                    | 2 +-
 tools/tools/README                                                | 2 +-
 tools/tools/diffburst/Makefile                                    | 2 +-
 tools/tools/epfe/epfe.pl                                          | 2 +-
 tools/tools/html-mv/html-mv                                       | 2 +-
 tools/tools/ifinfo/Makefile                                       | 2 +-
 tools/tools/ifinfo/ifinfo.c                                       | 2 +-
 tools/tools/ifinfo/ifinfo.h                                       | 2 +-
 tools/tools/kdrv/KernelDriver                                     | 2 +-
 tools/tools/kdrv/sample.drvinfo                                   | 2 +-
 tools/tools/kernxref/kernxref.sh                                  | 2 +-
 tools/tools/mid/mid-index                                         | 2 +-
 tools/tools/portsinfo/portsinfo.sh                                | 2 +-
 tools/tools/scsi-defects/scsi-defects.pl                          | 2 +-
 tools/tools/tcl_bmake/mkMakefile.sh                               | 4 ++--
 tools/tools/upgrade/getosreldate.sh                               | 2 +-
 tools/tools/upgrade/move_aout_libs.sh                             | 2 +-
 usr.bin/Makefile                                                  | 2 +-
 usr.bin/apply/apply.1                                             | 2 +-
 usr.bin/ar/Makefile                                               | 2 +-
 usr.bin/ar/ar.1                                                   | 2 +-
 usr.bin/ar/ar.1aout                                               | 2 +-
 usr.bin/ar/ar.5                                                   | 2 +-
 usr.bin/ar/ar.c                                                   | 2 +-
 usr.bin/at/Makefile                                               | 2 +-
 usr.bin/at/at.c                                                   | 2 +-
 usr.bin/at/at.man                                                 | 2 +-
 usr.bin/at/panic.c                                                | 2 +-
 usr.bin/at/parsetime.c                                            | 2 +-
 usr.bin/at/perm.c                                                 | 2 +-
 usr.bin/banner/banner.6                                           | 2 +-
 usr.bin/basename/basename.1                                       | 2 +-
 usr.bin/biff/biff.1                                               | 2 +-
 usr.bin/biff/biff.c                                               | 2 +-
 usr.bin/brandelf/brandelf.1                                       | 2 +-
 usr.bin/brandelf/brandelf.c                                       | 2 +-
 usr.bin/c89/c89.1                                                 | 2 +-
 usr.bin/c89/c89.sh                                                | 2 +-
 usr.bin/calendar/calendar.1                                       | 2 +-
 usr.bin/calendar/calendars/calendar.all                           | 2 +-
 usr.bin/calendar/calendars/calendar.birthday                      | 2 +-
 usr.bin/calendar/calendars/calendar.christian                     | 2 +-
 usr.bin/calendar/calendars/calendar.computer                      | 2 +-
 usr.bin/calendar/calendars/calendar.croatian                      | 2 +-
 usr.bin/calendar/calendars/calendar.german                        | 2 +-
 usr.bin/calendar/calendars/calendar.history                       | 2 +-
 usr.bin/calendar/calendars/calendar.holiday                       | 2 +-
 usr.bin/calendar/calendars/calendar.judaic                        | 2 +-
 usr.bin/calendar/calendars/calendar.music                         | 2 +-
 usr.bin/calendar/calendars/calendar.russian                       | 2 +-
 usr.bin/calendar/calendars/calendar.usholiday                     | 2 +-
 usr.bin/calendar/calendars/calendar.world                         | 2 +-
 usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all           | 2 +-
 usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag      | 2 +-
 usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte    | 2 +-
 usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche        | 2 +-
 usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur     | 2 +-
 usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik         | 2 +-
 usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft  | 2 +-
 usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all          | 2 +-
 usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag     | 2 +-
 usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte   | 2 +-
 usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche       | 2 +-
 usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur    | 2 +-
 usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik        | 2 +-
 usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft | 2 +-
 usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all           | 2 +-
 usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici      | 2 +-
 usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all          | 2 +-
 usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici     | 2 +-
 usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all              | 2 +-
 usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common           | 2 +-
 usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk              | 2 +-
 usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox         | 2 +-
 usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan            | 2 +-
 usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all              | 2 +-
 usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common           | 2 +-
 usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk              | 2 +-
 usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox         | 2 +-
 usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan            | 2 +-
 usr.bin/calendar/day.c                                            | 2 +-
 usr.bin/calendar/io.c                                             | 2 +-
 usr.bin/calendar/ostern.c                                         | 2 +-
 usr.bin/cap_mkdb/cap_mkdb.1                                       | 2 +-
 usr.bin/chat/Makefile                                             | 2 +-
 usr.bin/chat/chat.8                                               | 2 +-
 usr.bin/chat/chat.c                                               | 2 +-
 usr.bin/checknr/checknr.1                                         | 2 +-
 usr.bin/chflags/chflags.1                                         | 2 +-
 usr.bin/chkey/Makefile                                            | 2 +-
 usr.bin/chkey/chkey.1                                             | 2 +-
 usr.bin/chpass/chpass.1                                           | 2 +-
 usr.bin/chpass/chpass.c                                           | 2 +-
 usr.bin/chpass/edit.c                                             | 2 +-
 usr.bin/chpass/pw_yp.c                                            | 2 +-
 usr.bin/chpass/pw_yp.h                                            | 2 +-
 usr.bin/chpass/util.c                                             | 2 +-
 usr.bin/cksum/cksum.1                                             | 2 +-
 usr.bin/cksum/cksum.c                                             | 2 +-
 usr.bin/cmp/cmp.1                                                 | 2 +-
 usr.bin/col/col.1                                                 | 2 +-
 usr.bin/colcrt/colcrt.1                                           | 2 +-
 usr.bin/colldef/Makefile                                          | 2 +-
 usr.bin/colldef/colldef.1                                         | 2 +-
 usr.bin/colldef/data/Makefile                                     | 2 +-
 usr.bin/colldef/data/de_DE.DIS_8859-15.src                        | 2 +-
 usr.bin/colldef/data/de_DE.ISO_8859-1.src                         | 2 +-
 usr.bin/colldef/data/es_ES.DIS_8859-15.src                        | 2 +-
 usr.bin/colldef/data/es_ES.ISO_8859-1.src                         | 2 +-
 usr.bin/colldef/data/is_IS.DIS_8859-15.src                        | 2 +-
 usr.bin/colldef/data/is_IS.ISO_8859-1.src                         | 2 +-
 usr.bin/colldef/data/lt_LN.ASCII.src                              | 2 +-
 usr.bin/colldef/data/lt_LN.DIS_8859-15.src                        | 2 +-
 usr.bin/colldef/data/lt_LN.ISO_8859-1.src                         | 2 +-
 usr.bin/colldef/data/lt_LN.ISO_8859-2.src                         | 2 +-
 usr.bin/colldef/data/ru_SU.CP866.src                              | 2 +-
 usr.bin/colldef/data/ru_SU.KOI8-R.src                             | 2 +-
 usr.bin/colldef/parse.y                                           | 2 +-
 usr.bin/colldef/scan.l                                            | 2 +-
 usr.bin/colrm/colrm.1                                             | 2 +-
 usr.bin/colrm/colrm.c                                             | 2 +-
 usr.bin/column/column.1                                           | 2 +-
 usr.bin/comm/comm.1                                               | 2 +-
 usr.bin/comm/comm.c                                               | 2 +-
 usr.bin/compile_et/Makefile                                       | 2 +-
 usr.bin/compress/compress.1                                       | 2 +-
 usr.bin/compress/zopen.3                                          | 2 +-
 usr.bin/compress/zopen.h                                          | 2 +-
 usr.bin/cpp/cpp.sh                                                | 2 +-
 usr.bin/ctags/C.c                                                 | 2 +-
 usr.bin/ctags/ctags.1                                             | 2 +-
 usr.bin/cut/cut.1                                                 | 2 +-
 usr.bin/dig/Makefile                                              | 2 +-
 usr.bin/dnsquery/Makefile                                         | 2 +-
 usr.bin/doscmd/Makefile                                           | 2 +-
 usr.bin/doscmd/ParseBuffer.c                                      | 2 +-
 usr.bin/doscmd/bios.c                                             | 2 +-
 usr.bin/doscmd/callback.c                                         | 2 +-
 usr.bin/doscmd/callback.h                                         | 2 +-
 usr.bin/doscmd/cmos.c                                             | 2 +-
 usr.bin/doscmd/com.h                                              | 2 +-
 usr.bin/doscmd/config.c                                           | 2 +-
 usr.bin/doscmd/cpu.c                                              | 2 +-
 usr.bin/doscmd/crt0.c                                             | 2 +-
 usr.bin/doscmd/cwd.c                                              | 2 +-
 usr.bin/doscmd/cwd.h                                              | 2 +-
 usr.bin/doscmd/debug.c                                            | 2 +-
 usr.bin/doscmd/dispatch.h                                         | 2 +-
 usr.bin/doscmd/dos.c                                              | 2 +-
 usr.bin/doscmd/dos.h                                              | 2 +-
 usr.bin/doscmd/doscmd.1                                           | 2 +-
 usr.bin/doscmd/doscmd.c                                           | 2 +-
 usr.bin/doscmd/doscmd.h                                           | 2 +-
 usr.bin/doscmd/doscmd_loader.c                                    | 2 +-
 usr.bin/doscmd/ems.c                                              | 2 +-
 usr.bin/doscmd/ems.h                                              | 2 +-
 usr.bin/doscmd/emsdriv.S                                          | 2 +-
 usr.bin/doscmd/emuint.c                                           | 2 +-
 usr.bin/doscmd/emuint.h                                           | 2 +-
 usr.bin/doscmd/exe.c                                              | 2 +-
 usr.bin/doscmd/int.c                                              | 2 +-
 usr.bin/doscmd/int10.c                                            | 2 +-
 usr.bin/doscmd/int13.c                                            | 2 +-
 usr.bin/doscmd/int14.c                                            | 2 +-
 usr.bin/doscmd/int16.c                                            | 2 +-
 usr.bin/doscmd/int17.c                                            | 2 +-
 usr.bin/doscmd/int1a.c                                            | 2 +-
 usr.bin/doscmd/int2f.c                                            | 2 +-
 usr.bin/doscmd/intff.c                                            | 2 +-
 usr.bin/doscmd/mem.c                                              | 2 +-
 usr.bin/doscmd/mouse.c                                            | 2 +-
 usr.bin/doscmd/mouse.h                                            | 2 +-
 usr.bin/doscmd/net.c                                              | 2 +-
 usr.bin/doscmd/port.c                                             | 2 +-
 usr.bin/doscmd/redir.S                                            | 2 +-
 usr.bin/doscmd/register.h                                         | 2 +-
 usr.bin/doscmd/setver.c                                           | 2 +-
 usr.bin/doscmd/signal.c                                           | 2 +-
 usr.bin/doscmd/timer.c                                            | 2 +-
 usr.bin/doscmd/trace.c                                            | 2 +-
 usr.bin/doscmd/trap.c                                             | 2 +-
 usr.bin/doscmd/trap.h                                             | 2 +-
 usr.bin/doscmd/tty.c                                              | 2 +-
 usr.bin/doscmd/video.h                                            | 2 +-
 usr.bin/doscmd/xms.c                                              | 2 +-
 usr.bin/doscmd/xms.h                                              | 2 +-
 usr.bin/du/du.1                                                   | 2 +-
 usr.bin/ee/ee.1                                                   | 2 +-
 usr.bin/ee/ee.c                                                   | 4 ++--
 usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg                             | 2 +-
 usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg                            | 2 +-
 usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg                            | 2 +-
 usr.bin/ee/nls/en_US.US-ASCII/ee.msg                              | 2 +-
 usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg                             | 2 +-
 usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg                            | 2 +-
 usr.bin/enigma/enigma.1                                           | 2 +-
 usr.bin/error/error.1                                             | 2 +-
 usr.bin/error/filter.c                                            | 2 +-
 usr.bin/error/input.c                                             | 2 +-
 usr.bin/error/main.c                                              | 2 +-
 usr.bin/error/pi.c                                                | 2 +-
 usr.bin/error/subr.c                                              | 2 +-
 usr.bin/error/touch.c                                             | 2 +-
 usr.bin/expand/expand.1                                           | 2 +-
 usr.bin/expand/expand.c                                           | 2 +-
 usr.bin/false/false.1                                             | 2 +-
 usr.bin/fetch/fetch.1                                             | 2 +-
 usr.bin/fetch/fetch.h                                             | 2 +-
 usr.bin/fetch/file.c                                              | 2 +-
 usr.bin/fetch/ftp.c                                               | 2 +-
 usr.bin/fetch/http.c                                              | 2 +-
 usr.bin/fetch/main.c                                              | 2 +-
 usr.bin/fetch/uri.c                                               | 2 +-
 usr.bin/fetch/util.c                                              | 2 +-
 usr.bin/file/LEGAL.NOTICE                                         | 2 +-
 usr.bin/file/MAINT                                                | 2 +-
 usr.bin/file/Magdir/Localstuff                                    | 2 +-
 usr.bin/file/Magdir/softquad                                      | 2 +-
 usr.bin/file/Makefile                                             | 2 +-
 usr.bin/file/PORTING                                              | 2 +-
 usr.bin/file/README                                               | 2 +-
 usr.bin/file/apprentice.c                                         | 2 +-
 usr.bin/file/ascmagic.c                                           | 2 +-
 usr.bin/file/compress.c                                           | 2 +-
 usr.bin/file/cvsimport.sh                                         | 2 +-
 usr.bin/file/file.1                                               | 2 +-
 usr.bin/file/file.c                                               | 2 +-
 usr.bin/file/file.h                                               | 2 +-
 usr.bin/file/fsmagic.c                                            | 2 +-
 usr.bin/file/internat.c                                           | 2 +-
 usr.bin/file/is_tar.c                                             | 2 +-
 usr.bin/file/magic.5                                              | 2 +-
 usr.bin/file/names.h                                              | 2 +-
 usr.bin/file/patchlevel.h                                         | 2 +-
 usr.bin/file/print.c                                              | 2 +-
 usr.bin/file/readelf.c                                            | 2 +-
 usr.bin/file/readelf.h                                            | 2 +-
 usr.bin/file/softmagic.c                                          | 2 +-
 usr.bin/file/tar.h                                                | 2 +-
 usr.bin/file2c/Makefile                                           | 2 +-
 usr.bin/file2c/file2c.1                                           | 2 +-
 usr.bin/file2c/file2c.c                                           | 2 +-
 usr.bin/find/find.1                                               | 2 +-
 usr.bin/find/option.c                                             | 2 +-
 usr.bin/finger/finger.1                                           | 2 +-
 usr.bin/finger/finger.c                                           | 2 +-
 usr.bin/finger/finger.h                                           | 2 +-
 usr.bin/finger/lprint.c                                           | 2 +-
 usr.bin/finger/net.c                                              | 2 +-
 usr.bin/finger/sprint.c                                           | 2 +-
 usr.bin/finger/util.c                                             | 2 +-
 usr.bin/fmt/fmt.1                                                 | 2 +-
 usr.bin/fmt/fmt.c                                                 | 2 +-
 usr.bin/fold/fold.1                                               | 2 +-
 usr.bin/fold/fold.c                                               | 2 +-
 usr.bin/fpr/fpr.1                                                 | 2 +-
 usr.bin/from/from.1                                               | 2 +-
 usr.bin/from/from.c                                               | 2 +-
 usr.bin/fsplit/fsplit.1                                           | 2 +-
 usr.bin/fsplit/fsplit.c                                           | 2 +-
 usr.bin/fstat/Makefile                                            | 2 +-
 usr.bin/fstat/fstat.1                                             | 2 +-
 usr.bin/fstat/fstat.c                                             | 2 +-
 usr.bin/ftp/Makefile                                              | 2 +-
 usr.bin/ftp/cmds.c                                                | 4 ++--
 usr.bin/ftp/cmdtab.c                                              | 4 ++--
 usr.bin/ftp/complete.c                                            | 4 ++--
 usr.bin/ftp/domacro.c                                             | 4 ++--
 usr.bin/ftp/extern.h                                              | 2 +-
 usr.bin/ftp/fetch.c                                               | 2 +-
 usr.bin/ftp/ftp.1                                                 | 2 +-
 usr.bin/ftp/ftp.c                                                 | 4 ++--
 usr.bin/ftp/ftp_var.h                                             | 2 +-
 usr.bin/ftp/main.c                                                | 4 ++--
 usr.bin/ftp/pathnames.h                                           | 2 +-
 usr.bin/ftp/ruserpass.c                                           | 4 ++--
 usr.bin/ftp/util.c                                                | 4 ++--
 usr.bin/gcore/aoutcore.c                                          | 2 +-
 usr.bin/gcore/elfcore.c                                           | 2 +-
 usr.bin/gcore/gcore.1                                             | 2 +-
 usr.bin/gcore/gcore.c                                             | 2 +-
 usr.bin/gcore/md-nop.c                                            | 2 +-
 usr.bin/gencat/Makefile                                           | 2 +-
 usr.bin/gencat/gencat.1                                           | 2 +-
 usr.bin/gensetdefs/Makefile                                       | 2 +-
 usr.bin/gensetdefs/gensetdefs.8                                   | 2 +-
 usr.bin/gensetdefs/gensetdefs.c                                   | 2 +-
 usr.bin/global/Makefile                                           | 2 +-
 usr.bin/global/Makefile.inc                                       | 2 +-
 usr.bin/global/btreeop/Makefile                                   | 2 +-
 usr.bin/global/gctags/Makefile                                    | 2 +-
 usr.bin/global/global/Makefile                                    | 2 +-
 usr.bin/global/gtags/Makefile                                     | 2 +-
 usr.bin/global/htags/Makefile                                     | 2 +-
 usr.bin/global/lib/Makefile                                       | 2 +-
 usr.bin/global/systags/Makefile                                   | 2 +-
 usr.bin/gprof/arcs.c                                              | 2 +-
 usr.bin/gprof/gprof.1                                             | 2 +-
 usr.bin/gprof/gprof.c                                             | 2 +-
 usr.bin/gprof/printgprof.c                                        | 2 +-
 usr.bin/gprof/printlist.c                                         | 2 +-
 usr.bin/head/head.1                                               | 2 +-
 usr.bin/head/head.c                                               | 2 +-
 usr.bin/hexdump/display.c                                         | 2 +-
 usr.bin/hexdump/hexdump.1                                         | 2 +-
 usr.bin/hexdump/hexdump.c                                         | 2 +-
 usr.bin/hexdump/hexsyntax.c                                       | 2 +-
 usr.bin/hexdump/od.1                                              | 2 +-
 usr.bin/hexdump/odsyntax.c                                        | 2 +-
 usr.bin/hexdump/parse.c                                           | 2 +-
 usr.bin/host/Makefile                                             | 2 +-
 usr.bin/id/groups.1                                               | 2 +-
 usr.bin/id/groups.sh                                              | 2 +-
 usr.bin/id/id.1                                                   | 2 +-
 usr.bin/id/id.c                                                   | 2 +-
 usr.bin/id/whoami.1                                               | 2 +-
 usr.bin/id/whoami.sh                                              | 2 +-
 usr.bin/indent/args.c                                             | 2 +-
 usr.bin/indent/indent.1                                           | 2 +-
 usr.bin/indent/indent.c                                           | 2 +-
 usr.bin/indent/io.c                                               | 2 +-
 usr.bin/ipcrm/Makefile                                            | 2 +-
 usr.bin/ipcrm/ipcrm.1                                             | 2 +-
 usr.bin/ipcrm/ipcrm.c                                             | 2 +-
 usr.bin/ipcs/Makefile                                             | 2 +-
 usr.bin/ipcs/ipcs.1                                               | 2 +-
 usr.bin/ipcs/ipcs.c                                               | 2 +-
 usr.bin/join/join.1                                               | 2 +-
 usr.bin/join/join.c                                               | 2 +-
 usr.bin/jot/jot.1                                                 | 2 +-
 usr.bin/jot/jot.c                                                 | 2 +-
 usr.bin/kdump/kdump.1                                             | 2 +-
 usr.bin/kdump/kdump.c                                             | 2 +-
 usr.bin/key/key.1                                                 | 2 +-
 usr.bin/keyinfo/keyinfo.1                                         | 2 +-
 usr.bin/keyinfo/keyinfo.pl                                        | 2 +-
 usr.bin/keyinit/keyinit.1                                         | 2 +-
 usr.bin/keylogin/Makefile                                         | 2 +-
 usr.bin/keylogin/keylogin.1                                       | 2 +-
 usr.bin/keylogout/Makefile                                        | 2 +-
 usr.bin/keylogout/keylogout.1                                     | 2 +-
 usr.bin/keylogout/keylogout.c                                     | 2 +-
 usr.bin/killall/Makefile                                          | 2 +-
 usr.bin/killall/killall.1                                         | 2 +-
 usr.bin/killall/killall.pl                                        | 2 +-
 usr.bin/ktrace/Makefile                                           | 2 +-
 usr.bin/ktrace/ktrace.1                                           | 2 +-
 usr.bin/ktrace/ktrace.c                                           | 2 +-
 usr.bin/ktrace/subr.c                                             | 2 +-
 usr.bin/kzip/Makefile                                             | 2 +-
 usr.bin/kzip/kzip.8                                               | 2 +-
 usr.bin/kzip/kzip.c                                               | 2 +-
 usr.bin/lam/lam.1                                                 | 2 +-
 usr.bin/lam/lam.c                                                 | 2 +-
 usr.bin/last/last.1                                               | 2 +-
 usr.bin/lastcomm/lastcomm.1                                       | 2 +-
 usr.bin/lastcomm/lastcomm.c                                       | 2 +-
 usr.bin/ldd/Makefile                                              | 2 +-
 usr.bin/ldd/ldd.c                                                 | 2 +-
 usr.bin/ldd/sods.c                                                | 2 +-
 usr.bin/leave/Makefile                                            | 2 +-
 usr.bin/leave/leave.1                                             | 2 +-
 usr.bin/leave/leave.c                                             | 2 +-
 usr.bin/lex/Makefile                                              | 2 +-
 usr.bin/lex/lib/Makefile                                          | 2 +-
 usr.bin/limits/limits.1                                           | 2 +-
 usr.bin/limits/limits.c                                           | 2 +-
 usr.bin/locate/Makefile                                           | 2 +-
 usr.bin/locate/Makefile.inc                                       | 2 +-
 usr.bin/locate/bigram/Makefile                                    | 2 +-
 usr.bin/locate/bigram/locate.bigram.c                             | 2 +-
 usr.bin/locate/code/Makefile                                      | 2 +-
 usr.bin/locate/code/locate.code.c                                 | 2 +-
 usr.bin/locate/locate/Makefile                                    | 2 +-
 usr.bin/locate/locate/concatdb.sh                                 | 2 +-
 usr.bin/locate/locate/fastfind.c                                  | 2 +-
 usr.bin/locate/locate/locate.1                                    | 2 +-
 usr.bin/locate/locate/locate.c                                    | 2 +-
 usr.bin/locate/locate/locate.h                                    | 2 +-
 usr.bin/locate/locate/locate.rc                                   | 2 +-
 usr.bin/locate/locate/locate.updatedb.8                           | 2 +-
 usr.bin/locate/locate/mklocatedb.sh                               | 2 +-
 usr.bin/locate/locate/updatedb.sh                                 | 2 +-
 usr.bin/locate/locate/util.c                                      | 2 +-
 usr.bin/lock/lock.1                                               | 2 +-
 usr.bin/lock/lock.c                                               | 2 +-
 usr.bin/lockf/Makefile                                            | 2 +-
 usr.bin/lockf/lockf.1                                             | 2 +-
 usr.bin/lockf/lockf.c                                             | 2 +-
 usr.bin/logger/logger.1                                           | 2 +-
 usr.bin/logger/logger.c                                           | 2 +-
 usr.bin/login/Makefile                                            | 2 +-
 usr.bin/login/login.1                                             | 2 +-
 usr.bin/login/login.access.5                                      | 2 +-
 usr.bin/login/login.c                                             | 2 +-
 usr.bin/logname/logname.1                                         | 2 +-
 usr.bin/look/look.1                                               | 2 +-
 usr.bin/look/look.c                                               | 2 +-
 usr.bin/lorder/lorder.1                                           | 2 +-
 usr.bin/lsvfs/Makefile                                            | 2 +-
 usr.bin/lsvfs/lsvfs.1                                             | 2 +-
 usr.bin/lsvfs/lsvfs.c                                             | 2 +-
 usr.bin/m4/eval.c                                                 | 2 +-
 usr.bin/m4/m4.1                                                   | 2 +-
 usr.bin/m4/main.c                                                 | 2 +-
 usr.bin/m4/misc.c                                                 | 2 +-
 usr.bin/mail/mail.1                                               | 2 +-
 usr.bin/mail/temp.c                                               | 2 +-
 usr.bin/make/Makefile                                             | 2 +-
 usr.bin/make/PSD.doc/Makefile                                     | 2 +-
 usr.bin/make/PSD.doc/tutorial.ms                                  | 2 +-
 usr.bin/make/arch.c                                               | 2 +-
 usr.bin/make/buf.c                                                | 2 +-
 usr.bin/make/buf.h                                                | 2 +-
 usr.bin/make/compat.c                                             | 4 ++--
 usr.bin/make/cond.c                                               | 2 +-
 usr.bin/make/config.h                                             | 2 +-
 usr.bin/make/dir.c                                                | 2 +-
 usr.bin/make/dir.h                                                | 2 +-
 usr.bin/make/for.c                                                | 2 +-
 usr.bin/make/hash.c                                               | 2 +-
 usr.bin/make/hash.h                                               | 2 +-
 usr.bin/make/job.c                                                | 2 +-
 usr.bin/make/job.h                                                | 2 +-
 usr.bin/make/list.h                                               | 2 +-
 usr.bin/make/lst.h                                                | 2 +-
 usr.bin/make/lst.lib/lstAppend.c                                  | 2 +-
 usr.bin/make/lst.lib/lstAtEnd.c                                   | 2 +-
 usr.bin/make/lst.lib/lstAtFront.c                                 | 2 +-
 usr.bin/make/lst.lib/lstClose.c                                   | 2 +-
 usr.bin/make/lst.lib/lstConcat.c                                  | 2 +-
 usr.bin/make/lst.lib/lstDatum.c                                   | 2 +-
 usr.bin/make/lst.lib/lstDeQueue.c                                 | 2 +-
 usr.bin/make/lst.lib/lstDestroy.c                                 | 2 +-
 usr.bin/make/lst.lib/lstDupl.c                                    | 2 +-
 usr.bin/make/lst.lib/lstEnQueue.c                                 | 2 +-
 usr.bin/make/lst.lib/lstFind.c                                    | 2 +-
 usr.bin/make/lst.lib/lstFindFrom.c                                | 2 +-
 usr.bin/make/lst.lib/lstFirst.c                                   | 2 +-
 usr.bin/make/lst.lib/lstForEach.c                                 | 2 +-
 usr.bin/make/lst.lib/lstForEachFrom.c                             | 2 +-
 usr.bin/make/lst.lib/lstInit.c                                    | 2 +-
 usr.bin/make/lst.lib/lstInsert.c                                  | 2 +-
 usr.bin/make/lst.lib/lstInt.h                                     | 2 +-
 usr.bin/make/lst.lib/lstIsAtEnd.c                                 | 2 +-
 usr.bin/make/lst.lib/lstIsEmpty.c                                 | 2 +-
 usr.bin/make/lst.lib/lstLast.c                                    | 2 +-
 usr.bin/make/lst.lib/lstMember.c                                  | 2 +-
 usr.bin/make/lst.lib/lstNext.c                                    | 2 +-
 usr.bin/make/lst.lib/lstOpen.c                                    | 2 +-
 usr.bin/make/lst.lib/lstRemove.c                                  | 2 +-
 usr.bin/make/lst.lib/lstReplace.c                                 | 2 +-
 usr.bin/make/lst.lib/lstSucc.c                                    | 2 +-
 usr.bin/make/main.c                                               | 2 +-
 usr.bin/make/make.1                                               | 2 +-
 usr.bin/make/make.c                                               | 4 ++--
 usr.bin/make/make.h                                               | 2 +-
 usr.bin/make/nonints.h                                            | 2 +-
 usr.bin/make/parse.c                                              | 2 +-
 usr.bin/make/pathnames.h                                          | 2 +-
 usr.bin/make/sprite.h                                             | 2 +-
 usr.bin/make/str.c                                                | 4 ++--
 usr.bin/make/suff.c                                               | 2 +-
 usr.bin/make/targ.c                                               | 2 +-
 usr.bin/make/util.c                                               | 2 +-
 usr.bin/make/var.c                                                | 2 +-
 usr.bin/mesg/mesg.1                                               | 2 +-
 usr.bin/mesg/mesg.c                                               | 2 +-
 usr.bin/minigzip/Makefile                                         | 2 +-
 usr.bin/minigzip/minigzip.1                                       | 2 +-
 usr.bin/mk_cmds/Makefile                                          | 2 +-
 usr.bin/mkdep/mkdep.1                                             | 2 +-
 usr.bin/mkdep/mkdep.gcc.sh                                        | 2 +-
 usr.bin/mkfifo/mkfifo.1                                           | 2 +-
 usr.bin/mkfifo/mkfifo.c                                           | 2 +-
 usr.bin/mklocale/Makefile                                         | 2 +-
 usr.bin/mklocale/data/Makefile                                    | 2 +-
 usr.bin/mklocale/data/lt_LN.ISO_8859-2.src                        | 2 +-
 usr.bin/mklocale/data/zh_CN.EUC.src                               | 2 +-
 usr.bin/mklocale/mklocale.1                                       | 2 +-
 usr.bin/mkstr/mkstr.1                                             | 2 +-
 usr.bin/mkstr/mkstr.c                                             | 2 +-
 usr.bin/mktemp/mktemp.1                                           | 2 +-
 usr.bin/more/Makefile                                             | 2 +-
 usr.bin/more/command.c                                            | 2 +-
 usr.bin/more/decode.c                                             | 2 +-
 usr.bin/more/input.c                                              | 2 +-
 usr.bin/more/less.h                                               | 2 +-
 usr.bin/more/line.c                                               | 2 +-
 usr.bin/more/main.c                                               | 2 +-
 usr.bin/more/more.1                                               | 2 +-
 usr.bin/more/option.c                                             | 2 +-
 usr.bin/more/output.c                                             | 2 +-
 usr.bin/more/prim.c                                               | 2 +-
 usr.bin/more/tags.c                                               | 2 +-
 usr.bin/msgs/Makefile                                             | 2 +-
 usr.bin/msgs/msgs.1                                               | 2 +-
 usr.bin/msgs/msgs.c                                               | 2 +-
 usr.bin/mt/Makefile                                               | 2 +-
 usr.bin/mt/mt.1                                                   | 2 +-
 usr.bin/mt/mt.c                                                   | 2 +-
 usr.bin/ncal/Makefile                                             | 2 +-
 usr.bin/ncal/ncal.1                                               | 2 +-
 usr.bin/ncal/ncal.c                                               | 2 +-
 usr.bin/netstat/atalk.c                                           | 2 +-
 usr.bin/netstat/if.c                                              | 2 +-
 usr.bin/netstat/inet.c                                            | 2 +-
 usr.bin/netstat/ipx.c                                             | 2 +-
 usr.bin/netstat/main.c                                            | 2 +-
 usr.bin/netstat/mbuf.c                                            | 2 +-
 usr.bin/netstat/netstat.1                                         | 2 +-
 usr.bin/netstat/route.c                                           | 2 +-
 usr.bin/netstat/unix.c                                            | 2 +-
 usr.bin/newkey/Makefile                                           | 2 +-
 usr.bin/newkey/generic.c                                          | 2 +-
 usr.bin/newkey/newkey.8                                           | 2 +-
 usr.bin/newkey/newkey.c                                           | 2 +-
 usr.bin/newkey/update.c                                           | 2 +-
 usr.bin/nfsstat/nfsstat.1                                         | 2 +-
 usr.bin/nfsstat/nfsstat.c                                         | 2 +-
 usr.bin/nice/nice.1                                               | 2 +-
 usr.bin/nm/nm.1                                                   | 2 +-
 usr.bin/nm/nm.1aout                                               | 2 +-
 usr.bin/nm/nm.c                                                   | 2 +-
 usr.bin/nohup/nohup.1                                             | 2 +-
 usr.bin/nohup/nohup.c                                             | 2 +-
 usr.bin/objformat/objformat.1                                     | 2 +-
 usr.bin/opieinfo/Makefile                                         | 2 +-
 usr.bin/opiekey/Makefile                                          | 2 +-
 usr.bin/opiepasswd/Makefile                                       | 2 +-
 usr.bin/pagesize/pagesize.1                                       | 2 +-
 usr.bin/pagesize/pagesize.sh                                      | 2 +-
 usr.bin/passwd/Makefile                                           | 2 +-
 usr.bin/passwd/extern.h                                           | 2 +-
 usr.bin/passwd/local_passwd.c                                     | 2 +-
 usr.bin/passwd/passwd.1                                           | 2 +-
 usr.bin/passwd/passwd.c                                           | 2 +-
 usr.bin/paste/paste.1                                             | 2 +-
 usr.bin/paste/paste.c                                             | 2 +-
 usr.bin/pr/pr.1                                                   | 2 +-
 usr.bin/printenv/printenv.1                                       | 2 +-
 usr.bin/printf/printf.1                                           | 2 +-
 usr.bin/quota/quota.1                                             | 2 +-
 usr.bin/quota/quota.c                                             | 2 +-
 usr.bin/ranlib/Makefile                                           | 2 +-
 usr.bin/ranlib/build.c                                            | 2 +-
 usr.bin/ranlib/misc.c                                             | 2 +-
 usr.bin/ranlib/ranlib.1                                           | 2 +-
 usr.bin/ranlib/ranlib.1aout                                       | 2 +-
 usr.bin/ranlib/ranlib.5                                           | 2 +-
 usr.bin/ranlib/ranlib.c                                           | 2 +-
 usr.bin/ranlib/touch.c                                            | 2 +-
 usr.bin/rdist/Makefile                                            | 2 +-
 usr.bin/rdist/docmd.c                                             | 2 +-
 usr.bin/rdist/expand.c                                            | 2 +-
 usr.bin/rdist/gram.y                                              | 2 +-
 usr.bin/rdist/lookup.c                                            | 2 +-
 usr.bin/rdist/main.c                                              | 2 +-
 usr.bin/rdist/rdist.1                                             | 2 +-
 usr.bin/rdist/rshrcmd.c                                           | 2 +-
 usr.bin/rdist/server.c                                            | 2 +-
 usr.bin/renice/renice.8                                           | 2 +-
 usr.bin/renice/renice.c                                           | 2 +-
 usr.bin/rev/rev.1                                                 | 2 +-
 usr.bin/rlogin/Makefile                                           | 2 +-
 usr.bin/rlogin/rlogin.1                                           | 2 +-
 usr.bin/rlogin/rlogin.c                                           | 2 +-
 usr.bin/rpcgen/rpc_cout.c                                         | 2 +-
 usr.bin/rpcgen/rpc_main.c                                         | 2 +-
 usr.bin/rpcgen/rpc_tblout.c                                       | 2 +-
 usr.bin/rpcgen/rpc_util.c                                         | 2 +-
 usr.bin/rpcgen/rpcgen.1                                           | 2 +-
 usr.bin/rpcinfo/Makefile                                          | 2 +-
 usr.bin/rpcinfo/rpcinfo.8                                         | 2 +-
 usr.bin/rpcinfo/rpcinfo.c                                         | 2 +-
 usr.bin/rs/rs.1                                                   | 2 +-
 usr.bin/rs/rs.c                                                   | 2 +-
 usr.bin/rsh/Makefile                                              | 2 +-
 usr.bin/rsh/rsh.1                                                 | 2 +-
 usr.bin/rsh/rsh.c                                                 | 2 +-
 usr.bin/rup/Makefile                                              | 2 +-
 usr.bin/rup/rup.1                                                 | 2 +-
 usr.bin/rup/rup.c                                                 | 2 +-
 usr.bin/ruptime/ruptime.1                                         | 2 +-
 usr.bin/ruptime/ruptime.c                                         | 2 +-
 usr.bin/rusers/Makefile                                           | 2 +-
 usr.bin/rusers/rusers.1                                           | 2 +-
 usr.bin/rusers/rusers.c                                           | 2 +-
 usr.bin/rwall/Makefile                                            | 2 +-
 usr.bin/rwall/rwall.1                                             | 2 +-
 usr.bin/rwall/rwall.c                                             | 2 +-
 usr.bin/rwho/rwho.1                                               | 2 +-
 usr.bin/rwho/rwho.c                                               | 2 +-
 usr.bin/sasc/sasc.1                                               | 2 +-
 usr.bin/sasc/sasc.c                                               | 2 +-
 usr.bin/script/script.1                                           | 2 +-
 usr.bin/script/script.c                                           | 2 +-
 usr.bin/sed/compile.c                                             | 2 +-
 usr.bin/sed/main.c                                                | 2 +-
 usr.bin/sed/misc.c                                                | 2 +-
 usr.bin/sed/process.c                                             | 2 +-
 usr.bin/sed/sed.1                                                 | 2 +-
 usr.bin/shar/shar.1                                               | 2 +-
 usr.bin/showmount/showmount.8                                     | 2 +-
 usr.bin/showmount/showmount.c                                     | 2 +-
 usr.bin/size/size.1                                               | 2 +-
 usr.bin/size/size.c                                               | 2 +-
 usr.bin/sockstat/Makefile                                         | 2 +-
 usr.bin/sockstat/sockstat.1                                       | 2 +-
 usr.bin/sockstat/sockstat.pl                                      | 2 +-
 usr.bin/soelim/soelim.1                                           | 2 +-
 usr.bin/soelim/soelim.c                                           | 2 +-
 usr.bin/split/split.1                                             | 2 +-
 usr.bin/strings/strings.1                                         | 2 +-
 usr.bin/strings/strings.c                                         | 2 +-
 usr.bin/strip/strip.1                                             | 2 +-
 usr.bin/strip/strip.1aout                                         | 2 +-
 usr.bin/strip/strip.c                                             | 2 +-
 usr.bin/su/Makefile                                               | 2 +-
 usr.bin/su/su.1                                                   | 2 +-
 usr.bin/su/su.c                                                   | 2 +-
 usr.bin/symorder/symorder.1                                       | 2 +-
 usr.bin/symorder/symorder.c                                       | 2 +-
 usr.bin/systat/cmds.c                                             | 2 +-
 usr.bin/systat/cmdtab.c                                           | 2 +-
 usr.bin/systat/devs.c                                             | 2 +-
 usr.bin/systat/devs.h                                             | 2 +-
 usr.bin/systat/icmp.c                                             | 2 +-
 usr.bin/systat/iostat.c                                           | 2 +-
 usr.bin/systat/ip.c                                               | 2 +-
 usr.bin/systat/main.c                                             | 2 +-
 usr.bin/systat/mbufs.c                                            | 2 +-
 usr.bin/systat/mode.c                                             | 2 +-
 usr.bin/systat/mode.h                                             | 2 +-
 usr.bin/systat/netcmds.c                                          | 2 +-
 usr.bin/systat/netstat.c                                          | 2 +-
 usr.bin/systat/swap.c                                             | 2 +-
 usr.bin/systat/systat.1                                           | 2 +-
 usr.bin/systat/systat.h                                           | 2 +-
 usr.bin/systat/tcp.c                                              | 2 +-
 usr.bin/systat/vmstat.c                                           | 2 +-
 usr.bin/tail/reverse.c                                            | 2 +-
 usr.bin/tail/tail.1                                               | 2 +-
 usr.bin/talk/Makefile                                             | 2 +-
 usr.bin/talk/ctl.c                                                | 2 +-
 usr.bin/talk/ctl_transact.c                                       | 2 +-
 usr.bin/talk/display.c                                            | 2 +-
 usr.bin/talk/get_addrs.c                                          | 2 +-
 usr.bin/talk/get_iface.c                                          | 2 +-
 usr.bin/talk/get_names.c                                          | 2 +-
 usr.bin/talk/init_disp.c                                          | 2 +-
 usr.bin/talk/invite.c                                             | 2 +-
 usr.bin/talk/io.c                                                 | 2 +-
 usr.bin/talk/look_up.c                                            | 2 +-
 usr.bin/talk/msgs.c                                               | 2 +-
 usr.bin/talk/talk.1                                               | 2 +-
 usr.bin/talk/talk.c                                               | 2 +-
 usr.bin/tconv/Makefile                                            | 2 +-
 usr.bin/tconv/tconv.1                                             | 2 +-
 usr.bin/tconv/tconv.c                                             | 2 +-
 usr.bin/tcopy/tcopy.1                                             | 2 +-
 usr.bin/tcopy/tcopy.c                                             | 2 +-
 usr.bin/tee/tee.1                                                 | 2 +-
 usr.bin/tee/tee.c                                                 | 2 +-
 usr.bin/telnet/telnet.1                                           | 2 +-
 usr.bin/tftp/main.c                                               | 2 +-
 usr.bin/tftp/tftp.1                                               | 2 +-
 usr.bin/tftp/tftp.c                                               | 2 +-
 usr.bin/tftp/tftpsubs.c                                           | 2 +-
 usr.bin/time/time.1                                               | 2 +-
 usr.bin/time/time.c                                               | 2 +-
 usr.bin/tip/libacu/acucommon.c                                    | 2 +-
 usr.bin/tip/libacu/unidialer.c                                    | 2 +-
 usr.bin/tip/libacu/ventel.c                                       | 2 +-
 usr.bin/tip/tip/acu.c                                             | 2 +-
 usr.bin/tip/tip/acutab.c                                          | 2 +-
 usr.bin/tip/tip/cmds.c                                            | 2 +-
 usr.bin/tip/tip/cmdtab.c                                          | 2 +-
 usr.bin/tip/tip/cu.c                                              | 2 +-
 usr.bin/tip/tip/hunt.c                                            | 2 +-
 usr.bin/tip/tip/log.c                                             | 2 +-
 usr.bin/tip/tip/modems.5                                          | 2 +-
 usr.bin/tip/tip/partab.c                                          | 2 +-
 usr.bin/tip/tip/remote.c                                          | 2 +-
 usr.bin/tip/tip/tip.1                                             | 2 +-
 usr.bin/tip/tip/tip.c                                             | 2 +-
 usr.bin/tip/tip/tipout.c                                          | 2 +-
 usr.bin/tip/tip/value.c                                           | 2 +-
 usr.bin/tip/tip/vars.c                                            | 2 +-
 usr.bin/tn3270/api/api_bsd.c                                      | 2 +-
 usr.bin/tn3270/ascii/mset.c                                       | 2 +-
 usr.bin/tn3270/mset/map3270.5                                     | 2 +-
 usr.bin/tn3270/mset/mset.1                                        | 2 +-
 usr.bin/tn3270/tn3270/tn3270.1                                    | 2 +-
 usr.bin/top/machine.c                                             | 2 +-
 usr.bin/touch/touch.1                                             | 2 +-
 usr.bin/tput/tput.1                                               | 2 +-
 usr.bin/tr/str.c                                                  | 2 +-
 usr.bin/tr/tr.1                                                   | 2 +-
 usr.bin/tr/tr.c                                                   | 2 +-
 usr.bin/true/true.1                                               | 2 +-
 usr.bin/truss/alpha-fbsd.c                                        | 2 +-
 usr.bin/truss/amd64-fbsd32.c                                      | 2 +-
 usr.bin/truss/amd64-linux32.c                                     | 2 +-
 usr.bin/truss/i386-fbsd.c                                         | 2 +-
 usr.bin/truss/i386-linux.c                                        | 2 +-
 usr.bin/truss/main.c                                              | 2 +-
 usr.bin/truss/setup.c                                             | 2 +-
 usr.bin/truss/syscall.h                                           | 2 +-
 usr.bin/truss/syscalls.c                                          | 2 +-
 usr.bin/tset/map.c                                                | 2 +-
 usr.bin/tset/misc.c                                               | 2 +-
 usr.bin/tset/set.c                                                | 2 +-
 usr.bin/tset/term.c                                               | 2 +-
 usr.bin/tset/tset.1                                               | 2 +-
 usr.bin/tset/tset.c                                               | 2 +-
 usr.bin/tset/wrterm.c                                             | 2 +-
 usr.bin/tsort/tsort.1                                             | 2 +-
 usr.bin/tsort/tsort.c                                             | 2 +-
 usr.bin/tty/tty.1                                                 | 2 +-
 usr.bin/tty/tty.c                                                 | 2 +-
 usr.bin/ul/ul.1                                                   | 2 +-
 usr.bin/ul/ul.c                                                   | 2 +-
 usr.bin/uname/uname.1                                             | 2 +-
 usr.bin/unexpand/unexpand.c                                       | 2 +-
 usr.bin/unifdef/unifdef.1                                         | 2 +-
 usr.bin/unifdef/unifdef.c                                         | 2 +-
 usr.bin/uniq/uniq.1                                               | 2 +-
 usr.bin/uniq/uniq.c                                               | 2 +-
 usr.bin/units/Makefile                                            | 2 +-
 usr.bin/units/README                                              | 2 +-
 usr.bin/units/pathnames.h                                         | 2 +-
 usr.bin/units/units.1                                             | 2 +-
 usr.bin/units/units.c                                             | 2 +-
 usr.bin/units/units.lib                                           | 2 +-
 usr.bin/unvis/unvis.1                                             | 2 +-
 usr.bin/unvis/unvis.c                                             | 2 +-
 usr.bin/users/users.1                                             | 2 +-
 usr.bin/users/users.c                                             | 2 +-
 usr.bin/uudecode/uudecode.c                                       | 2 +-
 usr.bin/uuencode/uuencode.1                                       | 2 +-
 usr.bin/uuencode/uuencode.c                                       | 2 +-
 usr.bin/uuencode/uuencode.format.5                                | 2 +-
 usr.bin/vacation/Makefile                                         | 2 +-
 usr.bin/vacation/vacation.1                                       | 2 +-
 usr.bin/vacation/vacation.c                                       | 2 +-
 usr.bin/vgrind/vfontedpr.c                                        | 2 +-
 usr.bin/vgrind/vgrind.1                                           | 2 +-
 usr.bin/vgrind/vgrindefs.5                                        | 2 +-
 usr.bin/vi/Makefile                                               | 2 +-
 usr.bin/vis/foldit.c                                              | 2 +-
 usr.bin/vis/vis.1                                                 | 2 +-
 usr.bin/vis/vis.c                                                 | 2 +-
 usr.bin/vmstat/vmstat.8                                           | 2 +-
 usr.bin/vmstat/vmstat.c                                           | 2 +-
 usr.bin/w/pr_time.c                                               | 2 +-
 usr.bin/w/uptime.1                                                | 2 +-
 usr.bin/w/w.1                                                     | 2 +-
 usr.bin/w/w.c                                                     | 2 +-
 usr.bin/wall/ttymsg.c                                             | 2 +-
 usr.bin/wall/wall.1                                               | 2 +-
 usr.bin/wall/wall.c                                               | 2 +-
 usr.bin/wc/wc.1                                                   | 2 +-
 usr.bin/wc/wc.c                                                   | 2 +-
 usr.bin/what/what.1                                               | 2 +-
 usr.bin/what/what.c                                               | 2 +-
 usr.bin/whereis/whereis.1                                         | 2 +-
 usr.bin/whereis/whereis.pl                                        | 2 +-
 usr.bin/which/Makefile                                            | 2 +-
 usr.bin/which/which.1                                             | 2 +-
 usr.bin/which/which.pl                                            | 2 +-
 usr.bin/who/who.1                                                 | 2 +-
 usr.bin/who/who.c                                                 | 2 +-
 usr.bin/whois/whois.1                                             | 2 +-
 usr.bin/whois/whois.c                                             | 2 +-
 usr.bin/window/window.1                                           | 2 +-
 usr.bin/write/write.1                                             | 2 +-
 usr.bin/write/write.c                                             | 2 +-
 usr.bin/xargs/xargs.1                                             | 2 +-
 usr.bin/xargs/xargs.c                                             | 2 +-
 usr.bin/xinstall/install.1                                        | 2 +-
 usr.bin/xinstall/xinstall.c                                       | 2 +-
 usr.bin/xlint/lint1/Makefile                                      | 2 +-
 usr.bin/xlint/xlint/lint.1                                        | 2 +-
 usr.bin/xstr/xstr.1                                               | 2 +-
 usr.bin/xstr/xstr.c                                               | 2 +-
 usr.bin/yacc/Makefile                                             | 2 +-
 usr.bin/yacc/closure.c                                            | 2 +-
 usr.bin/yacc/defs.h                                               | 2 +-
 usr.bin/yacc/error.c                                              | 2 +-
 usr.bin/yacc/lalr.c                                               | 2 +-
 usr.bin/yacc/lr0.c                                                | 2 +-
 usr.bin/yacc/main.c                                               | 2 +-
 usr.bin/yacc/mkpar.c                                              | 2 +-
 usr.bin/yacc/output.c                                             | 2 +-
 usr.bin/yacc/reader.c                                             | 2 +-
 usr.bin/yacc/skeleton.c                                           | 2 +-
 usr.bin/yacc/symtab.c                                             | 2 +-
 usr.bin/yacc/verbose.c                                            | 2 +-
 usr.bin/yacc/warshall.c                                           | 2 +-
 usr.bin/yacc/yacc.1                                               | 2 +-
 usr.bin/yacc/yyfix.1                                              | 2 +-
 usr.bin/yes/yes.1                                                 | 2 +-
 usr.bin/ypcat/Makefile                                            | 2 +-
 usr.bin/ypcat/ypcat.1                                             | 2 +-
 usr.bin/ypcat/ypcat.c                                             | 2 +-
 usr.bin/ypmatch/Makefile                                          | 2 +-
 usr.bin/ypmatch/ypmatch.1                                         | 2 +-
 usr.bin/ypmatch/ypmatch.c                                         | 2 +-
 usr.bin/ypwhich/Makefile                                          | 2 +-
 usr.bin/ypwhich/ypwhich.1                                         | 2 +-
 usr.bin/ypwhich/ypwhich.c                                         | 2 +-
 3511 files changed, 3643 insertions(+), 3643 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/bin/chflags/chflags.1 b/bin/chflags/chflags.1
index 99424f8a437b..1af45709cbdc 100644
--- a/bin/chflags/chflags.1
+++ b/bin/chflags/chflags.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.2 (Berkeley) 3/31/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt CHFLAGS 1
diff --git a/lib/libpam/modules/pam_login_access/login.access.5 b/lib/libpam/modules/pam_login_access/login.access.5
index ff6d21cc14fe..10788ed38e6f 100644
--- a/lib/libpam/modules/pam_login_access/login.access.5
+++ b/lib/libpam/modules/pam_login_access/login.access.5
@@ -1,5 +1,5 @@
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .\" this is comment
 .Dd April 30, 1994
diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 8bffc4e625a4..b828085c3b5a 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 1999/06/05 03:03:57 julian Exp $
+# $FreeBSD$
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/share/colldef/de_DE.DIS_8859-15.src b/share/colldef/de_DE.DIS_8859-15.src
index e952d169902e..f5d609346cc7 100644
--- a/share/colldef/de_DE.DIS_8859-15.src
+++ b/share/colldef/de_DE.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.DIS_8859-15.src,v 1.2 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 substitute <ss> with "ss"
diff --git a/share/colldef/de_DE.ISO8859-1.src b/share/colldef/de_DE.ISO8859-1.src
index f366e97d2916..52d155d75a54 100644
--- a/share/colldef/de_DE.ISO8859-1.src
+++ b/share/colldef/de_DE.ISO8859-1.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.ISO_8859-1.src,v 1.5 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 substitute <ss> with "ss"
diff --git a/share/colldef/de_DE.ISO8859-15.src b/share/colldef/de_DE.ISO8859-15.src
index e952d169902e..f5d609346cc7 100644
--- a/share/colldef/de_DE.ISO8859-15.src
+++ b/share/colldef/de_DE.ISO8859-15.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.DIS_8859-15.src,v 1.2 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 substitute <ss> with "ss"
diff --git a/share/colldef/de_DE.ISO_8859-1.src b/share/colldef/de_DE.ISO_8859-1.src
index f366e97d2916..52d155d75a54 100644
--- a/share/colldef/de_DE.ISO_8859-1.src
+++ b/share/colldef/de_DE.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.ISO_8859-1.src,v 1.5 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 substitute <ss> with "ss"
diff --git a/share/colldef/de_DE.ISO_8859-15.src b/share/colldef/de_DE.ISO_8859-15.src
index e952d169902e..f5d609346cc7 100644
--- a/share/colldef/de_DE.ISO_8859-15.src
+++ b/share/colldef/de_DE.ISO_8859-15.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.DIS_8859-15.src,v 1.2 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 substitute <ss> with "ss"
diff --git a/share/colldef/es_ES.DIS_8859-15.src b/share/colldef/es_ES.DIS_8859-15.src
index d31a73bf0372..002b63503d5a 100644
--- a/share/colldef/es_ES.DIS_8859-15.src
+++ b/share/colldef/es_ES.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id: es_ES.DIS_8859-15.src,v 1.3 1997/02/22 19:54:35 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/es_ES.ISO8859-1.src b/share/colldef/es_ES.ISO8859-1.src
index e088e21b5c46..7c2b21fc5955 100644
--- a/share/colldef/es_ES.ISO8859-1.src
+++ b/share/colldef/es_ES.ISO8859-1.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/share/colldef/es_ES.ISO8859-15.src b/share/colldef/es_ES.ISO8859-15.src
index d31a73bf0372..002b63503d5a 100644
--- a/share/colldef/es_ES.ISO8859-15.src
+++ b/share/colldef/es_ES.ISO8859-15.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id: es_ES.DIS_8859-15.src,v 1.3 1997/02/22 19:54:35 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/es_ES.ISO_8859-1.src b/share/colldef/es_ES.ISO_8859-1.src
index e088e21b5c46..7c2b21fc5955 100644
--- a/share/colldef/es_ES.ISO_8859-1.src
+++ b/share/colldef/es_ES.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/share/colldef/es_ES.ISO_8859-15.src b/share/colldef/es_ES.ISO_8859-15.src
index d31a73bf0372..002b63503d5a 100644
--- a/share/colldef/es_ES.ISO_8859-15.src
+++ b/share/colldef/es_ES.ISO_8859-15.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id: es_ES.DIS_8859-15.src,v 1.3 1997/02/22 19:54:35 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/is_IS.DIS_8859-15.src b/share/colldef/is_IS.DIS_8859-15.src
index 605a8433ae1e..fe4dd9beae88 100644
--- a/share/colldef/is_IS.DIS_8859-15.src
+++ b/share/colldef/is_IS.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id: is_IS.DIS_8859-15.src,v 1.4 1997/02/22 19:54:38 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/is_IS.ISO8859-1.src b/share/colldef/is_IS.ISO8859-1.src
index 288459c0b3fd..50cd9a95ca8f 100644
--- a/share/colldef/is_IS.ISO8859-1.src
+++ b/share/colldef/is_IS.ISO8859-1.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/share/colldef/is_IS.ISO8859-15.src b/share/colldef/is_IS.ISO8859-15.src
index 605a8433ae1e..fe4dd9beae88 100644
--- a/share/colldef/is_IS.ISO8859-15.src
+++ b/share/colldef/is_IS.ISO8859-15.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id: is_IS.DIS_8859-15.src,v 1.4 1997/02/22 19:54:38 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/is_IS.ISO_8859-1.src b/share/colldef/is_IS.ISO_8859-1.src
index 288459c0b3fd..50cd9a95ca8f 100644
--- a/share/colldef/is_IS.ISO_8859-1.src
+++ b/share/colldef/is_IS.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/share/colldef/is_IS.ISO_8859-15.src b/share/colldef/is_IS.ISO_8859-15.src
index 605a8433ae1e..fe4dd9beae88 100644
--- a/share/colldef/is_IS.ISO_8859-15.src
+++ b/share/colldef/is_IS.ISO_8859-15.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id: is_IS.DIS_8859-15.src,v 1.4 1997/02/22 19:54:38 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/la_LN.ASCII.src b/share/colldef/la_LN.ASCII.src
index 525ebb979707..df3c34088764 100644
--- a/share/colldef/la_LN.ASCII.src
+++ b/share/colldef/la_LN.ASCII.src
@@ -1,6 +1,6 @@
 # ASCII
 #
-# $Id: lt_LN.ISO_8859-1.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 order \
 	\x00;...;\xff
diff --git a/share/colldef/la_LN.DIS_8859-15.src b/share/colldef/la_LN.DIS_8859-15.src
index 71de58338709..449ce85e6336 100644
--- a/share/colldef/la_LN.DIS_8859-15.src
+++ b/share/colldef/la_LN.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id: lt_LN.DIS_8859-15.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/la_LN.ISO8859-1.src b/share/colldef/la_LN.ISO8859-1.src
index 93a2da01484a..99b7d08ddb00 100644
--- a/share/colldef/la_LN.ISO8859-1.src
+++ b/share/colldef/la_LN.ISO8859-1.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/share/colldef/la_LN.ISO8859-15.src b/share/colldef/la_LN.ISO8859-15.src
index 71de58338709..449ce85e6336 100644
--- a/share/colldef/la_LN.ISO8859-15.src
+++ b/share/colldef/la_LN.ISO8859-15.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id: lt_LN.DIS_8859-15.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/la_LN.ISO8859-2.src b/share/colldef/la_LN.ISO8859-2.src
index 772fe3220385..aee3671f0966 100644
--- a/share/colldef/la_LN.ISO8859-2.src
+++ b/share/colldef/la_LN.ISO8859-2.src
@@ -1,6 +1,6 @@
 # latin2 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-2
 order \
diff --git a/share/colldef/la_LN.ISO_8859-1.src b/share/colldef/la_LN.ISO_8859-1.src
index 93a2da01484a..99b7d08ddb00 100644
--- a/share/colldef/la_LN.ISO_8859-1.src
+++ b/share/colldef/la_LN.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/share/colldef/la_LN.ISO_8859-15.src b/share/colldef/la_LN.ISO_8859-15.src
index 71de58338709..449ce85e6336 100644
--- a/share/colldef/la_LN.ISO_8859-15.src
+++ b/share/colldef/la_LN.ISO_8859-15.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id: lt_LN.DIS_8859-15.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/la_LN.ISO_8859-2.src b/share/colldef/la_LN.ISO_8859-2.src
index 772fe3220385..aee3671f0966 100644
--- a/share/colldef/la_LN.ISO_8859-2.src
+++ b/share/colldef/la_LN.ISO_8859-2.src
@@ -1,6 +1,6 @@
 # latin2 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-2
 order \
diff --git a/share/colldef/la_LN.US-ASCII.src b/share/colldef/la_LN.US-ASCII.src
index 525ebb979707..df3c34088764 100644
--- a/share/colldef/la_LN.US-ASCII.src
+++ b/share/colldef/la_LN.US-ASCII.src
@@ -1,6 +1,6 @@
 # ASCII
 #
-# $Id: lt_LN.ISO_8859-1.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 order \
 	\x00;...;\xff
diff --git a/share/colldef/lt_LN.ASCII.src b/share/colldef/lt_LN.ASCII.src
index 525ebb979707..df3c34088764 100644
--- a/share/colldef/lt_LN.ASCII.src
+++ b/share/colldef/lt_LN.ASCII.src
@@ -1,6 +1,6 @@
 # ASCII
 #
-# $Id: lt_LN.ISO_8859-1.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 order \
 	\x00;...;\xff
diff --git a/share/colldef/lt_LN.DIS_8859-15.src b/share/colldef/lt_LN.DIS_8859-15.src
index 71de58338709..449ce85e6336 100644
--- a/share/colldef/lt_LN.DIS_8859-15.src
+++ b/share/colldef/lt_LN.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id: lt_LN.DIS_8859-15.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/lt_LN.ISO_8859-1.src b/share/colldef/lt_LN.ISO_8859-1.src
index 93a2da01484a..99b7d08ddb00 100644
--- a/share/colldef/lt_LN.ISO_8859-1.src
+++ b/share/colldef/lt_LN.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/share/colldef/lt_LN.ISO_8859-2.src b/share/colldef/lt_LN.ISO_8859-2.src
index 772fe3220385..aee3671f0966 100644
--- a/share/colldef/lt_LN.ISO_8859-2.src
+++ b/share/colldef/lt_LN.ISO_8859-2.src
@@ -1,6 +1,6 @@
 # latin2 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-2
 order \
diff --git a/share/colldef/ru_RU.CP866.src b/share/colldef/ru_RU.CP866.src
index 88ca377082a7..2fc2d20835c3 100644
--- a/share/colldef/ru_RU.CP866.src
+++ b/share/colldef/ru_RU.CP866.src
@@ -1,6 +1,6 @@
 # CP866 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.CP866
 order \
diff --git a/share/colldef/ru_RU.KOI8-R.src b/share/colldef/ru_RU.KOI8-R.src
index f6b0a1877bef..3a67bc4e39fb 100644
--- a/share/colldef/ru_RU.KOI8-R.src
+++ b/share/colldef/ru_RU.KOI8-R.src
@@ -1,6 +1,6 @@
 # koi8-r (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.KOI8-R
 order \
diff --git a/share/colldef/ru_SU.CP866.src b/share/colldef/ru_SU.CP866.src
index 88ca377082a7..2fc2d20835c3 100644
--- a/share/colldef/ru_SU.CP866.src
+++ b/share/colldef/ru_SU.CP866.src
@@ -1,6 +1,6 @@
 # CP866 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.CP866
 order \
diff --git a/share/colldef/ru_SU.KOI8-R.src b/share/colldef/ru_SU.KOI8-R.src
index f6b0a1877bef..3a67bc4e39fb 100644
--- a/share/colldef/ru_SU.KOI8-R.src
+++ b/share/colldef/ru_SU.KOI8-R.src
@@ -1,6 +1,6 @@
 # koi8-r (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.KOI8-R
 order \
diff --git a/share/mklocale/Makefile b/share/mklocale/Makefile
index 2ef612c9f74d..1c446a9ca13b 100644
--- a/share/mklocale/Makefile
+++ b/share/mklocale/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.18 1999/06/05 03:04:00 julian Exp $
+# $FreeBSD$
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/share/mklocale/la_LN.ISO8859-2.src b/share/mklocale/la_LN.ISO8859-2.src
index 3f9ad913e06a..a9fa03fc89e5 100644
--- a/share/mklocale/la_LN.ISO8859-2.src
+++ b/share/mklocale/la_LN.ISO8859-2.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_2 Locale
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/la_LN.ISO_8859-2.src b/share/mklocale/la_LN.ISO_8859-2.src
index 3f9ad913e06a..a9fa03fc89e5 100644
--- a/share/mklocale/la_LN.ISO_8859-2.src
+++ b/share/mklocale/la_LN.ISO_8859-2.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_2 Locale
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/lt_LN.ISO_8859-2.src b/share/mklocale/lt_LN.ISO_8859-2.src
index 3f9ad913e06a..a9fa03fc89e5 100644
--- a/share/mklocale/lt_LN.ISO_8859-2.src
+++ b/share/mklocale/lt_LN.ISO_8859-2.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_2 Locale
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/zh_CN.EUC.src b/share/mklocale/zh_CN.EUC.src
index 1680f3cc1998..b298ef5de562 100644
--- a/share/mklocale/zh_CN.EUC.src
+++ b/share/mklocale/zh_CN.EUC.src
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zh_CN.EUC.src,v 1.1 1998/08/10 09:49:42 phk Exp $
+ * $FreeBSD$
  */
 
 ENCODING	"EUC"
diff --git a/share/mklocale/zh_CN.eucCN.src b/share/mklocale/zh_CN.eucCN.src
index 1680f3cc1998..b298ef5de562 100644
--- a/share/mklocale/zh_CN.eucCN.src
+++ b/share/mklocale/zh_CN.eucCN.src
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zh_CN.EUC.src,v 1.1 1998/08/10 09:49:42 phk Exp $
+ * $FreeBSD$
  */
 
 ENCODING	"EUC"
diff --git a/sys/Makefile b/sys/Makefile
index fd892f3e86b9..007745683a7b 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.17 1999/04/21 11:09:40 jkoshy Exp $
+# $FreeBSD$
 
 # This is the old aout only boot loader.
 .if	exists(${.CURDIR}/${MACHINE}/boot) && ${OBJFORMAT} == "aout"
diff --git a/sys/alpha/alpha/atomic.s b/sys/alpha/alpha/atomic.s
index 5eb23b2d47d2..19132522aebd 100644
--- a/sys/alpha/alpha/atomic.s
+++ b/sys/alpha/alpha/atomic.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <machine/asm.h>
diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c
index 74daa01caa8e..4eafc4f2ce7a 100644
--- a/sys/alpha/alpha/autoconf.c
+++ b/sys/alpha/alpha/autoconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: autoconf.c,v 1.30 1999/07/21 21:11:28 dfr Exp $
+ * $FreeBSD$
  */
 
 #include "opt_bootp.h"
diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c
index b2267af998ea..cfc811550215 100644
--- a/sys/alpha/alpha/busdma_machdep.c
+++ b/sys/alpha/alpha/busdma_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: busdma_machdep.c,v 1.4 1999/07/01 20:59:56 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/clock.c b/sys/alpha/alpha/clock.c
index 088488139550..bd51ddd0c436 100644
--- a/sys/alpha/alpha/clock.c
+++ b/sys/alpha/alpha/clock.c
@@ -1,4 +1,4 @@
-/* $Id: clock.c,v 1.8 1999/04/25 10:45:59 dt Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/clock_if.m b/sys/alpha/alpha/clock_if.m
index 95a2e093a552..80c6849c5ee3 100644
--- a/sys/alpha/alpha/clock_if.m
+++ b/sys/alpha/alpha/clock_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: clock_if.m,v 1.2 1998/11/08 18:35:51 nsouch Exp $
+# $FreeBSD$
 #
 
 #include <machine/clockvar.h>
diff --git a/sys/alpha/alpha/cpuconf.c b/sys/alpha/alpha/cpuconf.c
index cacc31cd1c45..b9b2b313fa36 100644
--- a/sys/alpha/alpha/cpuconf.c
+++ b/sys/alpha/alpha/cpuconf.c
@@ -1,4 +1,4 @@
-/* $Id: cpuconf.c,v 1.2 1998/08/10 07:53:58 dfr Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: cpuconf.c,v 1.10 1998/03/20 21:48:21 thorpej Exp $	*/
 
 /*
diff --git a/sys/alpha/alpha/dec_axppci_33.c b/sys/alpha/alpha/dec_axppci_33.c
index 4e3e4a53366b..98970b91fdcf 100644
--- a/sys/alpha/alpha/dec_axppci_33.c
+++ b/sys/alpha/alpha/dec_axppci_33.c
@@ -1,4 +1,4 @@
-/* $Id: dec_axppci_33.c,v 1.2 1999/04/23 19:53:37 dt Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: dec_axppci_33.c,v 1.38 1998/07/07 08:49:12 ross Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/dec_eb164.c b/sys/alpha/alpha/dec_eb164.c
index d2a78f491e49..20884072c0a7 100644
--- a/sys/alpha/alpha/dec_eb164.c
+++ b/sys/alpha/alpha/dec_eb164.c
@@ -1,4 +1,4 @@
-/* $Id: dec_eb164.c,v 1.5 1998/12/05 22:36:31 mjacob Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: dec_eb164.c,v 1.26 1998/04/17 02:45:19 mjacob Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/dec_eb64plus.c b/sys/alpha/alpha/dec_eb64plus.c
index 597415c90769..19a7bd5aa208 100644
--- a/sys/alpha/alpha/dec_eb64plus.c
+++ b/sys/alpha/alpha/dec_eb64plus.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
diff --git a/sys/alpha/alpha/dec_kn8ae.c b/sys/alpha/alpha/dec_kn8ae.c
index e255caca60d5..d205d38e0a39 100644
--- a/sys/alpha/alpha/dec_kn8ae.c
+++ b/sys/alpha/alpha/dec_kn8ae.c
@@ -1,4 +1,4 @@
-/* $Id: dec_kn8ae.c,v 1.2 1998/06/14 13:44:42 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: dec_kn8ae.c,v 1.15 1998/02/13 00:12:50 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/diskslice_machdep.c b/sys/alpha/alpha/diskslice_machdep.c
index 7116f7d28c54..bd72d02cc82a 100644
--- a/sys/alpha/alpha/diskslice_machdep.c
+++ b/sys/alpha/alpha/diskslice_machdep.c
@@ -36,7 +36,7 @@
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
  *	from: i386/isa Id: diskslice_machdep.c,v 1.31 1998/08/10 07:22:14 phk Exp
- *	$Id: diskslice_machdep.c,v 1.9 1999/06/26 02:47:12 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/elf_machdep.c b/sys/alpha/alpha/elf_machdep.c
index 646e3536573e..5582fcb1337d 100644
--- a/sys/alpha/alpha/elf_machdep.c
+++ b/sys/alpha/alpha/elf_machdep.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: elf_machdep.c,v 1.5 1999/07/16 09:16:11 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/exception.s b/sys/alpha/alpha/exception.s
index 43828ca0b9f7..417c5ddd9211 100644
--- a/sys/alpha/alpha/exception.s
+++ b/sys/alpha/alpha/exception.s
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/fp_emulate.c b/sys/alpha/alpha/fp_emulate.c
index a01642afc0ae..ad07a8ea597f 100644
--- a/sys/alpha/alpha/fp_emulate.c
+++ b/sys/alpha/alpha/fp_emulate.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: fp_emulate.c,v 1.4 1999/06/08 16:42:13 dt Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/genassym.c b/sys/alpha/alpha/genassym.c
index 945f537aaddf..dc838f71ace7 100644
--- a/sys/alpha/alpha/genassym.c
+++ b/sys/alpha/alpha/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.7 1999/06/28 09:15:35 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/gensetdefs.c b/sys/alpha/alpha/gensetdefs.c
index d2aaa8d48362..c58025e2b77e 100644
--- a/sys/alpha/alpha/gensetdefs.c
+++ b/sys/alpha/alpha/gensetdefs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: gensetdefs.c,v 1.1 1998/06/10 10:52:41 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/alpha/alpha/ieee_float.c b/sys/alpha/alpha/ieee_float.c
index fe660e249b02..d6fa59f89456 100644
--- a/sys/alpha/alpha/ieee_float.c
+++ b/sys/alpha/alpha/ieee_float.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ieee_float.c,v 1.4 1999/06/14 11:42:30 simokawa Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/alpha/ieee_float.h b/sys/alpha/alpha/ieee_float.h
index 1977e910a0e1..ae5b8701a944 100644
--- a/sys/alpha/alpha/ieee_float.h
+++ b/sys/alpha/alpha/ieee_float.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #define S_FORMAT	0	/* IEEE single */
diff --git a/sys/alpha/alpha/in_cksum.c b/sys/alpha/alpha/in_cksum.c
index cbebc65853a0..945021359587 100644
--- a/sys/alpha/alpha/in_cksum.c
+++ b/sys/alpha/alpha/in_cksum.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c
index 02266e090b8a..1e4d07d6950b 100644
--- a/sys/alpha/alpha/interrupt.c
+++ b/sys/alpha/alpha/interrupt.c
@@ -1,4 +1,4 @@
-/* $Id: interrupt.c,v 1.9 1999/01/10 12:35:38 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/ipl_funcs.c b/sys/alpha/alpha/ipl_funcs.c
index 33042be0f41c..fe761c69135a 100644
--- a/sys/alpha/alpha/ipl_funcs.c
+++ b/sys/alpha/alpha/ipl_funcs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ipl_funcs.c,v 1.9 1998/12/24 06:05:48 mjacob Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/alpha/alpha/locore.s b/sys/alpha/alpha/locore.s
index 51639ee3e035..510cc468b0fa 100644
--- a/sys/alpha/alpha/locore.s
+++ b/sys/alpha/alpha/locore.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: locore.s,v 1.7 1999/05/09 19:03:55 peter Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index 0378f765415f..5c877f120e7b 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: machdep.c,v 1.50 1999/08/22 18:50:43 msmith Exp $
+ * $FreeBSD$
  */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/alpha/alpha/mem.c b/sys/alpha/alpha/mem.c
index d2f5076cbe46..9a23ce4542b4 100644
--- a/sys/alpha/alpha/mem.c
+++ b/sys/alpha/alpha/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.11 1999/06/27 20:52:22 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index 62132f5b0e5e..411b4a4ee19a 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -43,7 +43,7 @@
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
  *	from:	i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp
  *		with some ideas from NetBSD's alpha pmap
- *	$Id: pmap.c,v 1.29 1999/07/31 23:02:52 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/alpha/procfs_machdep.c b/sys/alpha/alpha/procfs_machdep.c
index cfaa023fd01f..000eb02a0a7f 100644
--- a/sys/alpha/alpha/procfs_machdep.c
+++ b/sys/alpha/alpha/procfs_machdep.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_machdep.c	8.3 (Berkeley) 1/27/94
  *
  * From:
- *	$Id: procfs_machdep.c,v 1.2 1998/09/14 22:43:19 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c
index f3dbde81ad6f..7a2d0e46b8f9 100644
--- a/sys/alpha/alpha/promcons.c
+++ b/sys/alpha/alpha/promcons.c
@@ -1,4 +1,4 @@
-/* $Id: promcons.c,v 1.7 1999/05/09 08:57:47 phk Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: promcons.c,v 1.13 1998/03/21 22:52:59 mycroft Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/setdef0.c b/sys/alpha/alpha/setdef0.c
index e91857f9f815..49f662ae1d6c 100644
--- a/sys/alpha/alpha/setdef0.c
+++ b/sys/alpha/alpha/setdef0.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef0.c,v 1.2 1997/05/21 23:21:30 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/alpha/alpha/setdef1.c b/sys/alpha/alpha/setdef1.c
index 0b2bbaa7bb57..13668f08cefc 100644
--- a/sys/alpha/alpha/setdef1.c
+++ b/sys/alpha/alpha/setdef1.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef1.c,v 1.2 1997/05/21 23:21:30 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/alpha/alpha/sgmap.c b/sys/alpha/alpha/sgmap.c
index 493a2b15d4af..94517e799361 100644
--- a/sys/alpha/alpha/sgmap.c
+++ b/sys/alpha/alpha/sgmap.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/support.s b/sys/alpha/alpha/support.s
index 5b45b49b9501..e7b6873c58d1 100644
--- a/sys/alpha/alpha/support.s
+++ b/sys/alpha/alpha/support.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: support.s,v 1.2 1998/12/20 13:21:55 dfr Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/alpha/alpha/swtch.s b/sys/alpha/alpha/swtch.s
index 68727ebf91f6..4c263bdd68db 100644
--- a/sys/alpha/alpha/swtch.s
+++ b/sys/alpha/alpha/swtch.s
@@ -1,4 +1,4 @@
-/* $Id: swtch.s,v 1.9 1999/04/16 13:57:38 gallatin Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/sys_machdep.c b/sys/alpha/alpha/sys_machdep.c
index 0339d18d64cd..9a85e97bc6d4 100644
--- a/sys/alpha/alpha/sys_machdep.c
+++ b/sys/alpha/alpha/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id: sys_machdep.c,v 1.4 1999/04/23 19:53:38 dt Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/alpha/alpha/timerreg.h b/sys/alpha/alpha/timerreg.h
index 120716753229..0bfd7fc8cd63 100644
--- a/sys/alpha/alpha/timerreg.h
+++ b/sys/alpha/alpha/timerreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
- *	$Id: timerreg.h,v 1.5 1997/02/22 09:37:18 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c
index 943593739971..cbd42bc57b14 100644
--- a/sys/alpha/alpha/trap.c
+++ b/sys/alpha/alpha/trap.c
@@ -1,4 +1,4 @@
-/* $Id: trap.c,v 1.16 1999/06/10 20:40:58 dt Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c
index 4f92cf697bfd..2f0dabb94805 100644
--- a/sys/alpha/alpha/vm_machdep.c
+++ b/sys/alpha/alpha/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.19 1999/08/05 23:38:13 jdp Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 211a6ffb1c71..6a30b4f34915 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.37 1999/08/21 18:34:56 wpaul Exp $
+# $FreeBSD$
 
 machine		alpha
 cpu		EV4
diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha
index d6d3c1a063b7..dfd267a69063 100644
--- a/sys/alpha/conf/Makefile.alpha
+++ b/sys/alpha/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-#	$Id: Makefile.alpha,v 1.28 1999/07/02 04:16:57 mjacob Exp $
+# $FreeBSD$
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 211a6ffb1c71..6a30b4f34915 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.37 1999/08/21 18:34:56 wpaul Exp $
+# $FreeBSD$
 
 machine		alpha
 cpu		EV4
diff --git a/sys/alpha/conf/SIMOS b/sys/alpha/conf/SIMOS
index d20872d5245a..14073c4a7402 100644
--- a/sys/alpha/conf/SIMOS
+++ b/sys/alpha/conf/SIMOS
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: SIMOS,v 1.5 1999/08/08 19:28:56 phk Exp $
+# $FreeBSD$
 
 machine		"alpha"
 cpu		"EV5"
diff --git a/sys/alpha/conf/devices.alpha b/sys/alpha/conf/devices.alpha
index f686745666c2..a6de7cd2c0aa 100644
--- a/sys/alpha/conf/devices.alpha
+++ b/sys/alpha/conf/devices.alpha
@@ -1,6 +1,6 @@
 # This file tells what major numbers the various possible swap devices have.
 #
-#	$Id: devices.alpha,v 1.1 1998/06/10 10:54:04 dfr Exp $
+# $FreeBSD$
 #
 wd	0
 wfd	1
diff --git a/sys/alpha/conf/files.alpha b/sys/alpha/conf/files.alpha
index 52ef13c794ff..73d380047bc5 100644
--- a/sys/alpha/conf/files.alpha
+++ b/sys/alpha/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.alpha,v 1.23 1999/07/03 19:19:30 peter Exp $
+# $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/alpha/conf/majors.alpha b/sys/alpha/conf/majors.alpha
index 8c22063abca1..b1110c183864 100644
--- a/sys/alpha/conf/majors.alpha
+++ b/sys/alpha/conf/majors.alpha
@@ -1,4 +1,4 @@
-$Id: majors.alpha,v 1.7 1999/01/18 20:38:37 gallatin Exp $
+$FreeBSD$
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
diff --git a/sys/alpha/conf/options.alpha b/sys/alpha/conf/options.alpha
index d78c2205e96e..fdc5b7d75249 100644
--- a/sys/alpha/conf/options.alpha
+++ b/sys/alpha/conf/options.alpha
@@ -1,4 +1,4 @@
-#	$Id: options.alpha,v 1.11 1999/05/27 22:03:31 gallatin Exp $
+# $FreeBSD$
 
 EV5			opt_global.h
 EV4			opt_global.h
diff --git a/sys/alpha/include/_limits.h b/sys/alpha/include/_limits.h
index c8adc82fb0ae..99ca2d89843f 100644
--- a/sys/alpha/include/_limits.h
+++ b/sys/alpha/include/_limits.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/alpha_cpu.h b/sys/alpha/include/alpha_cpu.h
index 80eb3078a309..3e2bfb0fa3df 100644
--- a/sys/alpha/include/alpha_cpu.h
+++ b/sys/alpha/include/alpha_cpu.h
@@ -1,4 +1,4 @@
-/* $Id: alpha_cpu.h,v 1.4 1998/12/23 11:50:50 dfr Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: alpha_cpu.h,v 1.15 1997/09/20 19:02:34 mjacob Exp */
 
 /*
diff --git a/sys/alpha/include/ansi.h b/sys/alpha/include/ansi.h
index 09413e7d49f0..f9b1f424114b 100644
--- a/sys/alpha/include/ansi.h
+++ b/sys/alpha/include/ansi.h
@@ -1,4 +1,4 @@
-/* $Id: ansi.h,v 1.3 1998/10/12 23:57:58 alex Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp */
 
 /*-
diff --git a/sys/alpha/include/asm.h b/sys/alpha/include/asm.h
index 8be98c10e0c5..d003ca910104 100644
--- a/sys/alpha/include/asm.h
+++ b/sys/alpha/include/asm.h
@@ -1,4 +1,4 @@
-/* $Id: asm.h,v 1.2 1998/06/10 10:54:23 dfr Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: asm.h,v 1.18 1997/11/03 04:22:06 ross Exp */
 
 /* 
diff --git a/sys/alpha/include/atomic.h b/sys/alpha/include/atomic.h
index 25a27d57f00e..d8b0499fd4dd 100644
--- a/sys/alpha/include/atomic.h
+++ b/sys/alpha/include/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ATOMIC_H_
diff --git a/sys/alpha/include/bootinfo.h b/sys/alpha/include/bootinfo.h
index cd45e408d85f..86b7e7a729bb 100644
--- a/sys/alpha/include/bootinfo.h
+++ b/sys/alpha/include/bootinfo.h
@@ -1,4 +1,4 @@
-/* $Id: bootinfo.h,v 1.3 1998/10/14 09:53:24 peter Exp $ */
+/* $FreeBSD$ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/alpha/include/bus.h b/sys/alpha/include/bus.h
index 52a7c694f972..5fb1ccf7d4b9 100644
--- a/sys/alpha/include/bus.h
+++ b/sys/alpha/include/bus.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.3 1999/06/05 13:30:01 dfr Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _ALPHA_BUS_H_
 #define _ALPHA_BUS_H_
diff --git a/sys/alpha/include/bus_memio.h b/sys/alpha/include/bus_memio.h
index c7f50f78dbbf..f111ca9a7ba5 100644
--- a/sys/alpha/include/bus_memio.h
+++ b/sys/alpha/include/bus_memio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _ALPHA_BUS_MEMIO_H_
diff --git a/sys/alpha/include/bus_pio.h b/sys/alpha/include/bus_pio.h
index 286298e1968a..1e437c86a66e 100644
--- a/sys/alpha/include/bus_pio.h
+++ b/sys/alpha/include/bus_pio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _ALPHA_BUS_PIO_H_
diff --git a/sys/alpha/include/bwx.h b/sys/alpha/include/bwx.h
index 5489e3a4e667..bbc3142d8926 100644
--- a/sys/alpha/include/bwx.h
+++ b/sys/alpha/include/bwx.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bwx.h,v 1.1 1998/07/05 12:14:15 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_BWX_H_
diff --git a/sys/alpha/include/chipset.h b/sys/alpha/include/chipset.h
index e9dbe87bdf17..18792f1e5221 100644
--- a/sys/alpha/include/chipset.h
+++ b/sys/alpha/include/chipset.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: chipset.h,v 1.8 1999/05/20 15:33:16 gallatin Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CHIPSET_H_
diff --git a/sys/alpha/include/clock.h b/sys/alpha/include/clock.h
index e1915230a842..f243f8b20334 100644
--- a/sys/alpha/include/clock.h
+++ b/sys/alpha/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- *	$Id: clock.h,v 1.2 1998/07/22 08:26:23 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/alpha/include/cpu.h b/sys/alpha/include/cpu.h
index 928a05aa0fef..cddefe118ede 100644
--- a/sys/alpha/include/cpu.h
+++ b/sys/alpha/include/cpu.h
@@ -1,4 +1,4 @@
-/* $Id: cpu.h,v 1.6 1999/04/20 22:53:53 dt Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */
 
 /*
diff --git a/sys/alpha/include/cpufunc.h b/sys/alpha/include/cpufunc.h
index 8326970978c0..eb225261071c 100644
--- a/sys/alpha/include/cpufunc.h
+++ b/sys/alpha/include/cpufunc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cpufunc.h,v 1.3 1998/08/17 08:21:31 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/alpha/include/elf.h b/sys/alpha/include/elf.h
index 6257ed87453d..892d96d0337e 100644
--- a/sys/alpha/include/elf.h
+++ b/sys/alpha/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf.h,v 1.6 1999/02/07 23:49:51 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/alpha/include/elf_machdep.h b/sys/alpha/include/elf_machdep.h
index f14c0fa30a23..fe6bcc21114c 100644
--- a/sys/alpha/include/elf_machdep.h
+++ b/sys/alpha/include/elf_machdep.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $FreeBSD$
 /* From: NetBSD: elf_machdep.h,v 1.3 1997/04/06 08:47:24 cgd Exp */
 
 #define	ELF32_MACHDEP_ENDIANNESS	XXX	/* break compilation */
diff --git a/sys/alpha/include/endian.h b/sys/alpha/include/endian.h
index 5b1fd0063197..67e4540eb426 100644
--- a/sys/alpha/include/endian.h
+++ b/sys/alpha/include/endian.h
@@ -1,4 +1,4 @@
-/* $Id: endian.h,v 1.1 1998/01/10 10:13:14 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp */
 
 /*
diff --git a/sys/alpha/include/float.h b/sys/alpha/include/float.h
index de8d599c9d1a..1a3d871d7529 100644
--- a/sys/alpha/include/float.h
+++ b/sys/alpha/include/float.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */
 
 /*
diff --git a/sys/alpha/include/fpu.h b/sys/alpha/include/fpu.h
index c9efceed0293..66c557722429 100644
--- a/sys/alpha/include/fpu.h
+++ b/sys/alpha/include/fpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: fpu.h,v 1.1 1998/12/04 10:52:48 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_FPU_H_
diff --git a/sys/alpha/include/frame.h b/sys/alpha/include/frame.h
index 8af1d7162517..95c0a93c2a1f 100644
--- a/sys/alpha/include/frame.h
+++ b/sys/alpha/include/frame.h
@@ -1,4 +1,4 @@
-/* $Id: frame.h,v 1.1 1998/01/10 10:13:14 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: frame.h,v 1.4 1997/04/06 08:47:27 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/ieee.h b/sys/alpha/include/ieee.h
index 701f22c2b5bb..654d6ee86122 100644
--- a/sys/alpha/include/ieee.h
+++ b/sys/alpha/include/ieee.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* From: NetBSD: ieee.h,v 1.2 1997/04/06 08:47:27 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/ieeefp.h b/sys/alpha/include/ieeefp.h
index a838e9891955..b357101c0cea 100644
--- a/sys/alpha/include/ieeefp.h
+++ b/sys/alpha/include/ieeefp.h
@@ -1,4 +1,4 @@
-/* $Id: ieeefp.h,v 1.1.1.1 1998/03/09 05:43:16 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: ieeefp.h,v 1.2 1997/04/06 08:47:28 cgd Exp */
 
 /* 
diff --git a/sys/alpha/include/in_cksum.h b/sys/alpha/include/in_cksum.h
index 7e1c0f0dee49..7691d71efad9 100644
--- a/sys/alpha/include/in_cksum.h
+++ b/sys/alpha/include/in_cksum.h
@@ -33,7 +33,7 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- *	$Id: in_cksum.h,v 1.5 1997/08/16 19:14:55 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/alpha/include/inst.h b/sys/alpha/include/inst.h
index 27011848b175..b4088bc009c8 100644
--- a/sys/alpha/include/inst.h
+++ b/sys/alpha/include/inst.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_INST_H_
diff --git a/sys/alpha/include/intr.h b/sys/alpha/include/intr.h
index ea5408920b88..4f003886ec1f 100644
--- a/sys/alpha/include/intr.h
+++ b/sys/alpha/include/intr.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: intr.h,v 1.4 1998/11/15 18:25:16 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_INTR_H_
diff --git a/sys/alpha/include/intrcnt.h b/sys/alpha/include/intrcnt.h
index cd9e70173156..d32494281fb3 100644
--- a/sys/alpha/include/intrcnt.h
+++ b/sys/alpha/include/intrcnt.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: intrcnt.h,v 1.17 1998/11/19 01:48:04 ross Exp $ */
 
 /*
diff --git a/sys/alpha/include/ioctl_fd.h b/sys/alpha/include/ioctl_fd.h
index 970d24704104..46f57baa95c5 100644
--- a/sys/alpha/include/ioctl_fd.h
+++ b/sys/alpha/include/ioctl_fd.h
@@ -24,7 +24,7 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  * from: ioctl_fd.h,v 1.11
  */
 
diff --git a/sys/alpha/include/ipl.h b/sys/alpha/include/ipl.h
index 79e83f3d1016..956e141ca169 100644
--- a/sys/alpha/include/ipl.h
+++ b/sys/alpha/include/ipl.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ipl.h,v 1.6 1998/09/19 09:29:40 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_IPL_H_
diff --git a/sys/alpha/include/limits.h b/sys/alpha/include/limits.h
index c8adc82fb0ae..99ca2d89843f 100644
--- a/sys/alpha/include/limits.h
+++ b/sys/alpha/include/limits.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/lock.h b/sys/alpha/include/lock.h
index f10c60f4c5d5..c2ae0fab148f 100644
--- a/sys/alpha/include/lock.h
+++ b/sys/alpha/include/lock.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lock.h,v 1.3 1998/07/22 08:28:24 dfr Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/alpha/include/md_var.h b/sys/alpha/include/md_var.h
index 94e87ffd7d83..42d40f3f2dfa 100644
--- a/sys/alpha/include/md_var.h
+++ b/sys/alpha/include/md_var.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: md_var.h,v 1.6 1999/07/01 21:58:38 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/alpha/include/mouse.h b/sys/alpha/include/mouse.h
index a8ef501bc349..e2df622a0c02 100644
--- a/sys/alpha/include/mouse.h
+++ b/sys/alpha/include/mouse.h
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mouse.h,v 1.13 1999/07/12 15:16:13 yokota Exp $
+ * $FreeBSD$
  *	from: i386/include mouse.h,v 1.10
  */
 
diff --git a/sys/alpha/include/pal.h b/sys/alpha/include/pal.h
index c3d8b31a0fdf..b3393ce70c5a 100644
--- a/sys/alpha/include/pal.h
+++ b/sys/alpha/include/pal.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* From: NetBSD: pal.h,v 1.1 1997/09/06 01:23:53 thorpej Exp */
 
 /* 
diff --git a/sys/alpha/include/param.h b/sys/alpha/include/param.h
index 0fbbf9571769..873ea8504b4f 100644
--- a/sys/alpha/include/param.h
+++ b/sys/alpha/include/param.h
@@ -1,4 +1,4 @@
-/* $Id: param.h,v 1.10 1999/04/11 12:19:02 simokawa Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
 
 /*
diff --git a/sys/alpha/include/pc/bios.h b/sys/alpha/include/pc/bios.h
index 5da68ea44b89..d85f674478d7 100644
--- a/sys/alpha/include/pc/bios.h
+++ b/sys/alpha/include/pc/bios.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.h,v 1.3 1998/08/06 09:15:54 dfr Exp $
+ * $FreeBSD$
  *      from: i386/include/pc bios.h,v 1.2
  */
 
diff --git a/sys/alpha/include/pc/display.h b/sys/alpha/include/pc/display.h
index f13c374c26a1..fad568c0cb81 100644
--- a/sys/alpha/include/pc/display.h
+++ b/sys/alpha/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- *	$Id$
+ * $FreeBSD$
  *	from: i386/include/pc display.h,v 1.4
  */
 
diff --git a/sys/alpha/include/pc/msdos.h b/sys/alpha/include/pc/msdos.h
index 078238ec0d47..d1b777fc613e 100644
--- a/sys/alpha/include/pc/msdos.h
+++ b/sys/alpha/include/pc/msdos.h
@@ -3,7 +3,7 @@
  * [obtained from mtools -wfj]
  * how to decipher DOS disk structures in coexisting with DOS
  *
- *	$Id$
+ * $FreeBSD$
  *	from: i386/include/pc msdos.h,v 1.4
  */
 
diff --git a/sys/alpha/include/pc/vesa.h b/sys/alpha/include/pc/vesa.h
index d5d19e4603ff..5b214086311a 100644
--- a/sys/alpha/include/pc/vesa.h
+++ b/sys/alpha/include/pc/vesa.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  * from: i386/include/pc vesa.h,v 1.1
  */
 
diff --git a/sys/alpha/include/pcb.h b/sys/alpha/include/pcb.h
index a6d4a18bde20..3caa144f8e4f 100644
--- a/sys/alpha/include/pcb.h
+++ b/sys/alpha/include/pcb.h
@@ -1,4 +1,4 @@
-/* $Id: pcb.h,v 1.1.1.1 1998/03/09 05:43:16 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: pcb.h,v 1.6 1997/04/06 08:47:33 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/pmap.h b/sys/alpha/include/pmap.h
index 3b2f9c759cc2..321326ff40ad 100644
--- a/sys/alpha/include/pmap.h
+++ b/sys/alpha/include/pmap.h
@@ -43,7 +43,7 @@
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
  *	from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp
- * 	$Id: pmap.h,v 1.3 1998/08/23 16:05:55 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/alpha/include/proc.h b/sys/alpha/include/proc.h
index 68add90c7255..b2a28df6eb44 100644
--- a/sys/alpha/include/proc.h
+++ b/sys/alpha/include/proc.h
@@ -1,4 +1,4 @@
-/* $Id: proc.h,v 1.4 1998/11/15 18:25:16 dfr Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: proc.h,v 1.3 1997/04/06 08:47:36 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/profile.h b/sys/alpha/include/profile.h
index 065ae3f090ca..0eb8ef282098 100644
--- a/sys/alpha/include/profile.h
+++ b/sys/alpha/include/profile.h
@@ -1,4 +1,4 @@
-/* $Id: profile.h,v 1.1.1.1 1998/03/09 05:43:16 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/psl.h b/sys/alpha/include/psl.h
index b54c48edbc1b..9fcb97233262 100644
--- a/sys/alpha/include/psl.h
+++ b/sys/alpha/include/psl.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/include/pte.h b/sys/alpha/include/pte.h
index 4981272d48fe..8ceb6a5f377e 100644
--- a/sys/alpha/include/pte.h
+++ b/sys/alpha/include/pte.h
@@ -1,4 +1,4 @@
-/* $Id: pte.h,v 1.1.1.1 1998/03/09 05:43:16 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: pte.h,v 1.10 1997/09/02 19:07:22 thorpej Exp */
 
 /*
diff --git a/sys/alpha/include/ptrace.h b/sys/alpha/include/ptrace.h
index 27f3b2423082..d69c5474fb5b 100644
--- a/sys/alpha/include/ptrace.h
+++ b/sys/alpha/include/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $Id: ptrace.h,v 1.1 1998/06/10 10:55:24 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/alpha/include/reg.h b/sys/alpha/include/reg.h
index 40569a0089c6..341a39659178 100644
--- a/sys/alpha/include/reg.h
+++ b/sys/alpha/include/reg.h
@@ -1,4 +1,4 @@
-/* $Id: reg.h,v 1.3 1999/04/03 22:19:57 jdp Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: reg.h,v 1.3 1997/04/06 08:47:40 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/resource.h b/sys/alpha/include/resource.h
index 279c8db5d31d..c9253c9dc0db 100644
--- a/sys/alpha/include/resource.h
+++ b/sys/alpha/include/resource.h
@@ -1,4 +1,4 @@
-/* $Id: resource.h,v 1.1 1998/11/17 10:40:33 dfr Exp $ */
+/* $FreeBSD$ */
 /*
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/alpha/include/setjmp.h b/sys/alpha/include/setjmp.h
index bf9bac25c528..5fcfe2ab55fc 100644
--- a/sys/alpha/include/setjmp.h
+++ b/sys/alpha/include/setjmp.h
@@ -1,4 +1,4 @@
-/* $Id: setjmp.h,v 1.1 1998/01/10 23:00:06 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: setjmp.h,v 1.2 1997/04/06 08:47:41 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/sgmap.h b/sys/alpha/include/sgmap.h
index 65299c746a72..08ccbc7b7a47 100644
--- a/sys/alpha/include/sgmap.h
+++ b/sys/alpha/include/sgmap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SGMAP_H_
diff --git a/sys/alpha/include/signal.h b/sys/alpha/include/signal.h
index eb335c063981..07eaba12425a 100644
--- a/sys/alpha/include/signal.h
+++ b/sys/alpha/include/signal.h
@@ -1,4 +1,4 @@
-/* $Id: signal.h,v 1.1 1998/01/10 10:13:16 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: signal.h,v 1.3 1997/04/06 08:47:43 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/stdarg.h b/sys/alpha/include/stdarg.h
index 2fa81e60b872..2003b7bd4e1a 100644
--- a/sys/alpha/include/stdarg.h
+++ b/sys/alpha/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* From: NetBSD: stdarg.h,v 1.7 1997/04/06 08:47:44 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/swiz.h b/sys/alpha/include/swiz.h
index 5c84a49a7500..4b6397aeccec 100644
--- a/sys/alpha/include/swiz.h
+++ b/sys/alpha/include/swiz.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swiz.h,v 1.1 1998/07/27 09:40:35 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SWIZ_H_
diff --git a/sys/alpha/include/sysarch.h b/sys/alpha/include/sysarch.h
index e0e0a6b9b617..8eda490525ef 100644
--- a/sys/alpha/include/sysarch.h
+++ b/sys/alpha/include/sysarch.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sysarch.h,v 1.1 1998/11/17 10:40:07 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/include/types.h b/sys/alpha/include/types.h
index f293bc5268da..03e186996b34 100644
--- a/sys/alpha/include/types.h
+++ b/sys/alpha/include/types.h
@@ -1,4 +1,4 @@
-/* $Id: types.h,v 1.8 1998/07/14 05:09:42 bde Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: types.h,v 1.8 1997/04/06 08:47:45 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/varargs.h b/sys/alpha/include/varargs.h
index f7a11b985ef0..d355ec8ac931 100644
--- a/sys/alpha/include/varargs.h
+++ b/sys/alpha/include/varargs.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* From: NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/vmparam.h b/sys/alpha/include/vmparam.h
index 04c62a65a546..b055549c3ab8 100644
--- a/sys/alpha/include/vmparam.h
+++ b/sys/alpha/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $Id: vmparam.h,v 1.3 1998/06/14 13:45:15 dfr Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */
 #ifndef	_ALPHA_VMPARAM_H
 #define	_ALPHA_VMPARAM_H
diff --git a/sys/alpha/isa/isa.c b/sys/alpha/isa/isa.c
index 920751f10edf..19b8ca54e3eb 100644
--- a/sys/alpha/isa/isa.c
+++ b/sys/alpha/isa/isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa.c,v 1.16 1999/05/22 15:18:15 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/isa/isa_dma.c b/sys/alpha/isa/isa_dma.c
index 2cb3e2c70d59..4fcdc6b69130 100644
--- a/sys/alpha/isa/isa_dma.c
+++ b/sys/alpha/isa/isa_dma.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
  *	from: isa_dma.c,v 1.3 1999/05/09 23:56:00 peter Exp $
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/isa/isavar.h b/sys/alpha/isa/isavar.h
index 0eee66e687ca..a77cb35adc10 100644
--- a/sys/alpha/isa/isavar.h
+++ b/sys/alpha/isa/isavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isavar.h,v 1.1 1999/04/16 21:21:37 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/isa/mcclock_isa.c b/sys/alpha/isa/mcclock_isa.c
index da310f036297..4eee37acb4cf 100644
--- a/sys/alpha/isa/mcclock_isa.c
+++ b/sys/alpha/isa/mcclock_isa.c
@@ -1,4 +1,4 @@
-/* $Id: mcclock_isa.c,v 1.5 1999/05/18 21:24:11 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: mcclock_tlsb.c,v 1.8 1998/05/13 02:50:29 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/linux/Makefile b/sys/alpha/linux/Makefile
index d399ad080a37..c062c96ec177 100644
--- a/sys/alpha/linux/Makefile
+++ b/sys/alpha/linux/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $Id: Makefile,v 1.2 1997/03/29 10:48:49 peter Exp $
+# $FreeBSD$
 
 all:
 	@echo "make linux_sysent.c only"
diff --git a/sys/alpha/linux/linux.h b/sys/alpha/linux/linux.h
index 93fafa2a3712..4e5db53e99cf 100644
--- a/sys/alpha/linux/linux.h
+++ b/sys/alpha/linux/linux.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: linux.h,v 1.34 1999/08/15 17:28:39 marcel Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_LINUX_LINUX_H_
diff --git a/sys/alpha/linux/linux_dummy.c b/sys/alpha/linux/linux_dummy.c
index 5d5169d99689..c76402c31e68 100644
--- a/sys/alpha/linux/linux_dummy.c
+++ b/sys/alpha/linux/linux_dummy.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_dummy.c,v 1.11 1999/08/25 11:19:01 marcel Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/linux/linux_genassym.c b/sys/alpha/linux/linux_genassym.c
index 99a88a510f6f..5d962a6c04d4 100644
--- a/sys/alpha/linux/linux_genassym.c
+++ b/sys/alpha/linux/linux_genassym.c
@@ -1,4 +1,4 @@
-/* $Id: linux_genassym.c,v 1.8 1998/07/29 15:50:41 bde Exp $ */
+/* $FreeBSD$ */
 
 #include <sys/param.h>
 
diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index 6c626bca01d8..871ccfbed4c1 100644
--- a/sys/alpha/linux/linux_sysvec.c
+++ b/sys/alpha/linux/linux_sysvec.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_sysvec.c,v 1.47 1999/04/28 01:04:20 luoqi Exp $
+ * $FreeBSD$
  */
 
 /* XXX we use functions that might not exist. */
diff --git a/sys/alpha/linux/syscalls.conf b/sys/alpha/linux/syscalls.conf
index d1e1425ed5a2..01e258801231 100644
--- a/sys/alpha/linux/syscalls.conf
+++ b/sys/alpha/linux/syscalls.conf
@@ -1,4 +1,4 @@
-# $Id: syscalls.conf,v 1.3 1997/02/22 09:38:31 peter Exp $
+# $FreeBSD$
 sysnames="/dev/null"
 sysproto="linux_proto.h"
 sysproto_h=_LINUX_SYSPROTO_H_
diff --git a/sys/alpha/linux/syscalls.master b/sys/alpha/linux/syscalls.master
index 369ee6ffd3a9..5e6ce0719a2a 100644
--- a/sys/alpha/linux/syscalls.master
+++ b/sys/alpha/linux/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.22 1999/08/16 11:47:21 marcel Exp $
+ $FreeBSD$
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from LINUX).
diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c
index 9d95446f6ed1..2f8a23997146 100644
--- a/sys/alpha/pci/apecs.c
+++ b/sys/alpha/pci/apecs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apecs.c,v 1.8 1999/05/20 15:33:18 gallatin Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/alpha/pci/apecs_pci.c b/sys/alpha/pci/apecs_pci.c
index 918131783426..7a0573b2f369 100644
--- a/sys/alpha/pci/apecs_pci.c
+++ b/sys/alpha/pci/apecs_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apecs_pci.c,v 1.2 1999/05/08 21:58:41 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/pci/apecsvar.h b/sys/alpha/pci/apecsvar.h
index 0104b4fbb246..a5fa82e2511a 100644
--- a/sys/alpha/pci/apecsvar.h
+++ b/sys/alpha/pci/apecsvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ciavar.h,v 1.1 1998/07/05 12:16:15 dfr Exp $
+ * $FreeBSD$
  */
 
 extern void apecs_init(void);
diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c
index 43d6bc3184ed..4251e06be6fd 100644
--- a/sys/alpha/pci/cia.c
+++ b/sys/alpha/pci/cia.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cia.c,v 1.21 1999/07/29 16:44:22 gallatin Exp $
+ * $FreeBSD$
  */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/alpha/pci/cia_pci.c b/sys/alpha/pci/cia_pci.c
index fdf0016d65ce..73da41a852fc 100644
--- a/sys/alpha/pci/cia_pci.c
+++ b/sys/alpha/pci/cia_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cia_pci.c,v 1.2 1999/05/08 21:58:42 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/pci/ciareg.h b/sys/alpha/pci/ciareg.h
index edd79c72d881..8da36a401ed1 100644
--- a/sys/alpha/pci/ciareg.h
+++ b/sys/alpha/pci/ciareg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: ciareg.h,v 1.22 1998/06/06 20:40:14 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/pci/ciavar.h b/sys/alpha/pci/ciavar.h
index 6f60c1519ae6..1e50032dec90 100644
--- a/sys/alpha/pci/ciavar.h
+++ b/sys/alpha/pci/ciavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 extern void cia_init(void);
diff --git a/sys/alpha/pci/lca.c b/sys/alpha/pci/lca.c
index d60a6646ab63..a510004ada97 100644
--- a/sys/alpha/pci/lca.c
+++ b/sys/alpha/pci/lca.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lca.c,v 1.9 1999/05/20 15:33:23 gallatin Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/pci/lca_pci.c b/sys/alpha/pci/lca_pci.c
index f74840fa4a0c..10a5a2aad016 100644
--- a/sys/alpha/pci/lca_pci.c
+++ b/sys/alpha/pci/lca_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lca_pci.c,v 1.2 1999/05/08 21:58:43 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/pci/lcavar.h b/sys/alpha/pci/lcavar.h
index 53f036dea007..1619539b5a2c 100644
--- a/sys/alpha/pci/lcavar.h
+++ b/sys/alpha/pci/lcavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 extern void lca_init(void);
diff --git a/sys/alpha/pci/pcibus.c b/sys/alpha/pci/pcibus.c
index bcde9ecb9b39..d49a57c60d4b 100644
--- a/sys/alpha/pci/pcibus.c
+++ b/sys/alpha/pci/pcibus.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.16 1999/07/01 22:48:30 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/alpha/pci/pcibus.h b/sys/alpha/pci/pcibus.h
index 38b51b772e9c..27c5ffa00ef8 100644
--- a/sys/alpha/pci/pcibus.h
+++ b/sys/alpha/pci/pcibus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pcibus.h,v 1.1 1998/06/10 10:55:38 dfr Exp $
+ * $FreeBSD$
  */
 
 void pci_init_resources(void);
diff --git a/sys/alpha/pci/tsunami_pci.c b/sys/alpha/pci/tsunami_pci.c
index 1af09c1c8295..6f7af8820f1f 100644
--- a/sys/alpha/pci/tsunami_pci.c
+++ b/sys/alpha/pci/tsunami_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/pci/tsunamireg.h b/sys/alpha/pci/tsunamireg.h
index 64e4fcd2d6d5..60b19a3bc65e 100644
--- a/sys/alpha/pci/tsunamireg.h
+++ b/sys/alpha/pci/tsunamireg.h
@@ -1,4 +1,4 @@
-/* $Id: tsunamireg.h,v 1.1 1999/05/26 23:22:03 gallatin Exp $ */
+/* $FreeBSD$ */
 
 /*
  * 21271 Chipset registers and constants.
diff --git a/sys/alpha/pci/tsunamivar.h b/sys/alpha/pci/tsunamivar.h
index 0c3411562436..f82351f702f2 100644
--- a/sys/alpha/pci/tsunamivar.h
+++ b/sys/alpha/pci/tsunamivar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 extern void tsunami_init(void);
diff --git a/sys/alpha/tc/am7990.c b/sys/alpha/tc/am7990.c
index 41c17330b9ce..a27d712d7a67 100644
--- a/sys/alpha/tc/am7990.c
+++ b/sys/alpha/tc/am7990.c
@@ -1,4 +1,4 @@
-/* $Id: am7990.c,v 1.3 1999/05/10 15:48:01 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: am7990.c,v 1.43 1998/03/29 22:36:42 mycroft Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/am7990reg.h b/sys/alpha/tc/am7990reg.h
index 71d92d970a30..dc3f56a520b5 100644
--- a/sys/alpha/tc/am7990reg.h
+++ b/sys/alpha/tc/am7990reg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: am7990reg.h,v 1.4 1997/03/27 21:01:49 veego Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/am7990var.h b/sys/alpha/tc/am7990var.h
index cce6c252141c..a5968fa8fd03 100644
--- a/sys/alpha/tc/am7990var.h
+++ b/sys/alpha/tc/am7990var.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: am7990var.h,v 1.18 1998/01/12 09:23:16 thorpej Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/ascvar.h b/sys/alpha/tc/ascvar.h
index 713292521406..eafdeb3bd1ee 100644
--- a/sys/alpha/tc/ascvar.h
+++ b/sys/alpha/tc/ascvar.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: ascvar.h,v 1.4 1997/11/28 18:23:40 mhitch Exp $	*/
 
 
diff --git a/sys/alpha/tc/esp.c b/sys/alpha/tc/esp.c
index 336e0fb8c123..7bba66d2686f 100644
--- a/sys/alpha/tc/esp.c
+++ b/sys/alpha/tc/esp.c
@@ -1,4 +1,4 @@
-/* $Id: esp.c,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: esp.c,v 1.8.4.2 1996/09/10 17:28:16 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/espreg.h b/sys/alpha/tc/espreg.h
index 4f30d1cae082..5c6ddb474eac 100644
--- a/sys/alpha/tc/espreg.h
+++ b/sys/alpha/tc/espreg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: espreg.h,v 1.2.4.1 1996/09/10 17:28:17 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/espvar.h b/sys/alpha/tc/espvar.h
index b64b77402685..72e26411efc0 100644
--- a/sys/alpha/tc/espvar.h
+++ b/sys/alpha/tc/espvar.h
@@ -1,4 +1,4 @@
-/* $Id: espvar.h,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: espvar.h,v 1.3.4.1 1996/09/10 17:28:18 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/if_le_dec.c b/sys/alpha/tc/if_le_dec.c
index 4befcf474b2e..b607dd082cb8 100644
--- a/sys/alpha/tc/if_le_dec.c
+++ b/sys/alpha/tc/if_le_dec.c
@@ -1,4 +1,4 @@
-/* $Id: if_le_dec.c,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: if_le_dec.c,v 1.8 1997/07/22 04:32:21 jonathan Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/if_le_ioasic.c b/sys/alpha/tc/if_le_ioasic.c
index d672e77ee381..2988db2f6a86 100644
--- a/sys/alpha/tc/if_le_ioasic.c
+++ b/sys/alpha/tc/if_le_ioasic.c
@@ -1,4 +1,4 @@
-/* $Id: if_le_ioasic.c,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: if_le_ioasic.c,v 1.10 1998/01/19 02:49:48 thorpej Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/if_levar.h b/sys/alpha/tc/if_levar.h
index 53f3f80c28b3..9353ab219754 100644
--- a/sys/alpha/tc/if_levar.h
+++ b/sys/alpha/tc/if_levar.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: if_levar.h,v 1.4 1997/03/15 18:12:07 is Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/ioasic.c b/sys/alpha/tc/ioasic.c
index 5771d222a60a..d779e56315a9 100644
--- a/sys/alpha/tc/ioasic.c
+++ b/sys/alpha/tc/ioasic.c
@@ -1,4 +1,4 @@
-/* $Id: ioasic.c,v 1.4 1999/05/10 16:36:42 peter Exp $ */
+/* $FreeBSD$ */
 /* from $NetBSD: ioasic.c,v 1.19 1998/05/27 00:18:13 thorpej Exp $ */
 
 /*-
diff --git a/sys/alpha/tc/ioasicreg.h b/sys/alpha/tc/ioasicreg.h
index f7ca6d6dd2ee..d1f9db8a2c93 100644
--- a/sys/alpha/tc/ioasicreg.h
+++ b/sys/alpha/tc/ioasicreg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: ioasicreg.h,v 1.2 1997/04/06 22:30:28 cgd Exp $ */
 
 /* 
diff --git a/sys/alpha/tc/ioasicvar.h b/sys/alpha/tc/ioasicvar.h
index cb48da0ef57a..d7747a7546b6 100644
--- a/sys/alpha/tc/ioasicvar.h
+++ b/sys/alpha/tc/ioasicvar.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: ioasicvar.h,v 1.5 1998/01/19 02:50:19 thorpej Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/mcclock_ioasic.c b/sys/alpha/tc/mcclock_ioasic.c
index 813d60d33726..adbede9ecb8e 100644
--- a/sys/alpha/tc/mcclock_ioasic.c
+++ b/sys/alpha/tc/mcclock_ioasic.c
@@ -1,4 +1,4 @@
-/* $Id: mcclock_ioasic.c,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: mcclock_ioasic.c,v 1.8 1997/09/02 13:20:14 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tc/sticreg.h b/sys/alpha/tc/sticreg.h
index 31e30e5d3e8c..7101582da71b 100644
--- a/sys/alpha/tc/sticreg.h
+++ b/sys/alpha/tc/sticreg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: sticreg.h,v 1.1 1997/11/08 07:27:50 jonathan Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/sticvar.h b/sys/alpha/tc/sticvar.h
index fd9ed4617118..be394eadded2 100644
--- a/sys/alpha/tc/sticvar.h
+++ b/sys/alpha/tc/sticvar.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: sticvar.h,v 1.1 1997/11/08 07:27:51 jonathan Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tc.c b/sys/alpha/tc/tc.c
index b6b51db3e77b..16d155224893 100644
--- a/sys/alpha/tc/tc.c
+++ b/sys/alpha/tc/tc.c
@@ -1,4 +1,4 @@
-/* $Id: tc.c,v 1.5 1999/07/01 22:49:03 peter Exp $ */
+/* $FreeBSD$ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/alpha/tc/tcasic.c b/sys/alpha/tc/tcasic.c
index 683f3d368b93..493b5ac0c0fb 100644
--- a/sys/alpha/tc/tcasic.c
+++ b/sys/alpha/tc/tcasic.c
@@ -1,4 +1,4 @@
-/* $Id: tcasic.c,v 1.4 1999/05/10 15:54:58 peter Exp $ */
+/* $FreeBSD$ */
 /* from $NetBSD: tcasic.c,v 1.23 1998/05/14 00:01:31 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tc/tcdevs.h b/sys/alpha/tc/tcdevs.h
index cdbae33005e2..993fd3903572 100644
--- a/sys/alpha/tc/tcdevs.h
+++ b/sys/alpha/tc/tcdevs.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: tcdevs.h,v 1.12 1998/06/18 23:29:46 jonathan Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcdevs_data.h b/sys/alpha/tc/tcdevs_data.h
index 61c054c12fb8..214fcd0c8883 100644
--- a/sys/alpha/tc/tcdevs_data.h
+++ b/sys/alpha/tc/tcdevs_data.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: tcdevs_data.h,v 1.12 1998/06/18 23:29:46 jonathan Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcds.c b/sys/alpha/tc/tcds.c
index 6736fec74768..b45737d7322d 100644
--- a/sys/alpha/tc/tcds.c
+++ b/sys/alpha/tc/tcds.c
@@ -1,4 +1,4 @@
-/* $Id: tcds.c,v 1.2 1999/05/08 21:58:50 dfr Exp $ */
+/* $FreeBSD$ */
 /* from $NetBSD: tcds.c,v 1.25 1998/05/26 23:43:05 thorpej Exp $ */
 
 /*-
diff --git a/sys/alpha/tc/tcds_dma.c b/sys/alpha/tc/tcds_dma.c
index d07811e799e8..f69251506b83 100644
--- a/sys/alpha/tc/tcds_dma.c
+++ b/sys/alpha/tc/tcds_dma.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: tcds_dma.c,v 1.6.4.1 1996/09/10 17:28:19 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcdsreg.h b/sys/alpha/tc/tcdsreg.h
index 6c24281575cf..da48eb802f1d 100644
--- a/sys/alpha/tc/tcdsreg.h
+++ b/sys/alpha/tc/tcdsreg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: tcdsreg.h,v 1.1 1995/12/20 00:40:36 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcdsvar.h b/sys/alpha/tc/tcdsvar.h
index e1c15e8aaf76..72b631bfc387 100644
--- a/sys/alpha/tc/tcdsvar.h
+++ b/sys/alpha/tc/tcdsvar.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: tcdsvar.h,v 1.3.4.1 1996/09/10 17:28:20 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcreg.h b/sys/alpha/tc/tcreg.h
index 80751688c711..e64eaab955b0 100644
--- a/sys/alpha/tc/tcreg.h
+++ b/sys/alpha/tc/tcreg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: tcreg.h,v 1.1 1995/12/20 00:48:36 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcvar.h b/sys/alpha/tc/tcvar.h
index 17e72096826e..d23ad4a3e011 100644
--- a/sys/alpha/tc/tcvar.h
+++ b/sys/alpha/tc/tcvar.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: tcvar.h,v 1.13 1998/05/22 21:15:48 thorpej Exp $	*/
 
 /*
diff --git a/sys/alpha/tlsb/dwlpx.c b/sys/alpha/tlsb/dwlpx.c
index 1df3e65a7e6f..fbf21ec82074 100644
--- a/sys/alpha/tlsb/dwlpx.c
+++ b/sys/alpha/tlsb/dwlpx.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dwlpx.c,v 1.9 1999/05/08 21:58:51 dfr Exp $
+ * $FreeBSD$
  */
 
 #include "opt_simos.h"
diff --git a/sys/alpha/tlsb/dwlpxreg.h b/sys/alpha/tlsb/dwlpxreg.h
index 86a5686da346..1eb95e9bd43f 100644
--- a/sys/alpha/tlsb/dwlpxreg.h
+++ b/sys/alpha/tlsb/dwlpxreg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: dwlpxreg.h,v 1.9 1998/03/21 22:02:42 mjacob Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/gbusvar.h b/sys/alpha/tlsb/gbusvar.h
index 5ece6e0c8504..cc0bd8e47835 100644
--- a/sys/alpha/tlsb/gbusvar.h
+++ b/sys/alpha/tlsb/gbusvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: gbusvar.h,v 1.2 1998/06/10 20:40:59 dfr Exp $
+ * $FreeBSD$
  */
 /* $NetBSD: gbusvar.h,v 1.1 1998/05/13 02:50:29 thorpej Exp $ */
 
diff --git a/sys/alpha/tlsb/kftxx.c b/sys/alpha/tlsb/kftxx.c
index 889f97d575b5..0daf0aaae923 100644
--- a/sys/alpha/tlsb/kftxx.c
+++ b/sys/alpha/tlsb/kftxx.c
@@ -1,4 +1,4 @@
-/* $Id: kftxx.c,v 1.5 1999/05/08 21:58:53 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: kftxx.c,v 1.9 1998/05/14 00:01:32 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/kftxxreg.h b/sys/alpha/tlsb/kftxxreg.h
index dc2036b266e0..8ebeb3169732 100644
--- a/sys/alpha/tlsb/kftxxreg.h
+++ b/sys/alpha/tlsb/kftxxreg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: kftxxreg.h,v 1.4 1997/06/04 01:47:15 cgd Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/kftxxvar.h b/sys/alpha/tlsb/kftxxvar.h
index 56168e62e8e1..2bdb24882dd2 100644
--- a/sys/alpha/tlsb/kftxxvar.h
+++ b/sys/alpha/tlsb/kftxxvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kftxxvar.h,v 1.2 1998/06/10 20:48:03 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/tlsb/mcclock_tlsb.c b/sys/alpha/tlsb/mcclock_tlsb.c
index 535e3908711d..02759b9afb4e 100644
--- a/sys/alpha/tlsb/mcclock_tlsb.c
+++ b/sys/alpha/tlsb/mcclock_tlsb.c
@@ -1,4 +1,4 @@
-/* $Id: mcclock_tlsb.c,v 1.4 1999/05/08 21:58:53 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: mcclock_tlsb.c,v 1.8 1998/05/13 02:50:29 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/tlsbvar.h b/sys/alpha/tlsb/tlsbvar.h
index 6b72785216f6..f8690b4a40c9 100644
--- a/sys/alpha/tlsb/tlsbvar.h
+++ b/sys/alpha/tlsb/tlsbvar.h
@@ -1,4 +1,4 @@
-/* $Id: tlsbvar.h,v 1.1 1998/06/10 10:55:58 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: tlsbvar.h,v 1.5 1998/05/13 23:23:23 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 04ea7ee3d1c0..37a94676f676 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zs_tlsb.c,v 1.15 1999/07/29 01:02:45 mdodd Exp $
+ * $FreeBSD$
  */
 /*
  * This driver is a hopeless hack to get the SimOS console working.  A real
diff --git a/sys/alpha/tlsb/zsreg.h b/sys/alpha/tlsb/zsreg.h
index 36cda9348f34..f087a7ba55fe 100644
--- a/sys/alpha/tlsb/zsreg.h
+++ b/sys/alpha/tlsb/zsreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zsreg.h,v 1.1 1998/06/10 10:56:01 dfr Exp $
+ * $FreeBSD$
  */
 
 #define ZSC_CHANNELA	0x80
diff --git a/sys/alpha/tlsb/zsvar.h b/sys/alpha/tlsb/zsvar.h
index 7ff35062d59b..84701544274b 100644
--- a/sys/alpha/tlsb/zsvar.h
+++ b/sys/alpha/tlsb/zsvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 int zs_cnattach(vm_offset_t base, vm_offset_t offset);
diff --git a/sys/amd64/Makefile b/sys/amd64/Makefile
index 28362ba9dc77..c173c4fb1d71 100644
--- a/sys/amd64/Makefile
+++ b/sys/amd64/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1998/05/31 22:40:49 steve Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
 # Makefile for i386 links, tags file
diff --git a/sys/amd64/amd64/amd64_mem.c b/sys/amd64/amd64/amd64_mem.c
index d971aa95f02e..33342b92227c 100644
--- a/sys/amd64/amd64/amd64_mem.c
+++ b/sys/amd64/amd64/amd64_mem.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: i686_mem.c,v 1.4 1999/07/20 06:58:51 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S
index 6a7bcf059a12..f484971eab2b 100644
--- a/sys/amd64/amd64/apic_vector.S
+++ b/sys/amd64/amd64/apic_vector.S
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: apic_vector.s,v 1.43 1999/07/20 06:52:35 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/amd64/amd64/atomic.c b/sys/amd64/amd64/atomic.c
index d7a5c495d6df..c19ba9e027b2 100644
--- a/sys/amd64/amd64/atomic.c
+++ b/sys/amd64/amd64/atomic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* This file creates publically callable functions to perform various
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 4c5dbd34bb5b..f678609719d0 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.136 1999/08/22 23:49:00 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index baf20187da6c..5fc0a4296738 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.c,v 1.21 1999/08/25 06:56:36 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index bebec68ceca1..c16333ced110 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: busdma_machdep.c,v 1.13 1999/07/02 05:12:11 mjacob Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index fb6c1ff93688..ee277419c360 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.85 1999/07/10 15:27:55 bde Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c
index b3b30b13f3f5..16e8106d5e73 100644
--- a/sys/amd64/amd64/db_disasm.c
+++ b/sys/amd64/amd64/db_disasm.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_disasm.c,v 1.21 1998/07/08 10:53:56 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index 0ad6dfbfd56a..cb7f228d671a 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/sys/amd64/amd64/db_interface.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_interface.c,v 1.44 1999/04/28 01:03:17 luoqi Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index 6a361a0052f9..074b4e639bcb 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_trace.c,v 1.33 1999/01/28 01:59:50 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c
index 2814f066e0f0..51a2e77541f6 100644
--- a/sys/amd64/amd64/elf_machdep.c
+++ b/sys/amd64/amd64/elf_machdep.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: elf_machdep.c,v 1.4 1998/12/07 21:58:18 archie Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index dce98e87e5b6..f19622475bb8 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.62 1999/06/27 21:31:43 alc Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/amd64/amd64/exception.s b/sys/amd64/amd64/exception.s
index dce98e87e5b6..f19622475bb8 100644
--- a/sys/amd64/amd64/exception.s
+++ b/sys/amd64/amd64/exception.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.62 1999/06/27 21:31:43 alc Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index a99b5674ea4b..374c06617013 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.75 1999/07/26 05:47:31 cracauer Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index 9f17b0c7d616..2df518268216 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.75 1999/07/29 08:33:00 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_user_ldt.h"
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index ba53f4eab87b..0f1e86d67737 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- *	$Id: identcpu.c,v 1.71 1999/07/06 13:23:56 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_cpu.h"
diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c
index a58caadce1b4..a56bb36d91a5 100644
--- a/sys/amd64/amd64/initcpu.c
+++ b/sys/amd64/amd64/initcpu.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *		$Id: initcpu.c,v 1.17 1999/01/16 13:41:33 kato Exp $
+ * $FreeBSD$
  */
 
 #include "opt_cpu.h"
diff --git a/sys/amd64/amd64/legacy.c b/sys/amd64/amd64/legacy.c
index 0c28185a347b..22e98eda7106 100644
--- a/sys/amd64/amd64/legacy.c
+++ b/sys/amd64/amd64/legacy.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: nexus.c,v 1.15 1999/08/23 19:23:33 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 95b55613bf47..f2627266353c 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.124 1999/06/18 14:32:13 bde Exp $
+ * $FreeBSD$
  *
  *		originally from: locore.s, by William F. Jolitz
  *
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index 95b55613bf47..f2627266353c 100644
--- a/sys/amd64/amd64/locore.s
+++ b/sys/amd64/amd64/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.124 1999/06/18 14:32:13 bde Exp $
+ * $FreeBSD$
  *
  *		originally from: locore.s, by William F. Jolitz
  *
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index dfde63760a87..a3c33bfc293a 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.358 1999/08/09 10:34:43 phk Exp $
+ * $FreeBSD$
  */
 
 #include "apm.h"
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index c835a6ee2cce..ab31e7095ea3 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.64 1999/08/23 20:58:38 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 969cd0892495..283ed1701a3c 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/amd64/amd64/mpboot.S b/sys/amd64/amd64/mpboot.S
index 962bafcc7792..d21354e3c793 100644
--- a/sys/amd64/amd64/mpboot.S
+++ b/sys/amd64/amd64/mpboot.S
@@ -31,7 +31,7 @@
  * mpboot.s:	FreeBSD machine support for the Intel MP Spec
  *		multiprocessor systems.
  *
- *	$Id: mpboot.s,v 1.10 1999/04/28 01:03:22 luoqi Exp $
+ * $FreeBSD$
  */
 
 #include <machine/asmacros.h>		/* miscellaneous asm macros */
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 969cd0892495..283ed1701a3c 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/amd64/amd64/nexus.c b/sys/amd64/amd64/nexus.c
index 0c28185a347b..22e98eda7106 100644
--- a/sys/amd64/amd64/nexus.c
+++ b/sys/amd64/amd64/nexus.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: nexus.c,v 1.15 1999/08/23 19:23:33 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 791060a03f8c..6129ed86f48f 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.245 1999/08/10 04:10:57 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c
index 34479056ed73..d934ee56eee6 100644
--- a/sys/amd64/amd64/prof_machdep.c
+++ b/sys/amd64/amd64/prof_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: prof_machdep.c,v 1.12 1999/05/06 09:44:55 bde Exp $
+ * $FreeBSD$
  */
 
 #ifdef GUPROF
diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index 7093dbb86df4..ae99af947ab8 100644
--- a/sys/amd64/amd64/support.S
+++ b/sys/amd64/amd64/support.S
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: support.s,v 1.62 1999/03/30 09:00:40 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/amd64/amd64/support.s b/sys/amd64/amd64/support.s
index 7093dbb86df4..ae99af947ab8 100644
--- a/sys/amd64/amd64/support.s
+++ b/sys/amd64/amd64/support.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: support.s,v 1.62 1999/03/30 09:00:40 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index fb6c1ff93688..ee277419c360 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.85 1999/07/10 15:27:55 bde Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 76b45ff8c329..0f5930ca7a0a 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id: sys_machdep.c,v 1.41 1999/04/28 01:03:25 luoqi Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index e717563e7ed5..5e3ed49ee48a 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.139 1999/06/18 14:32:16 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index 188e20bc0f47..8a3e1c93030c 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 21bc706129ce..b907f27c034c 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.124 1999/07/22 06:04:01 alc Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index f889546e112f..2011cfea73e6 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -15,7 +15,7 @@
 # device lines is also present in the ./LINT configuration file. If you are
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.182 1999/08/15 09:54:56 phk Exp $
+# $FreeBSD$
 
 machine		i386
 cpu		I386_CPU
diff --git a/sys/amd64/include/apicreg.h b/sys/amd64/include/apicreg.h
index 55e44e0bec2f..38c70709e7c2 100644
--- a/sys/amd64/include/apicreg.h
+++ b/sys/amd64/include/apicreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apic.h,v 1.11 1997/08/04 17:31:24 fsmp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_APIC_H_
diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h
index f1023173b3d4..7ac124366024 100644
--- a/sys/amd64/include/asm.h
+++ b/sys/amd64/include/asm.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
- *	$Id: asm.h,v 1.3 1997/04/15 14:06:34 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/amd64/include/asmacros.h b/sys/amd64/include/asmacros.h
index 00bdf7affe40..92b9e1a5d700 100644
--- a/sys/amd64/include/asmacros.h
+++ b/sys/amd64/include/asmacros.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: asmacros.h,v 1.16 1997/04/22 06:55:32 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ASMACROS_H_
diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h
index e9f9403f6198..b3fd514cbc91 100644
--- a/sys/amd64/include/atomic.h
+++ b/sys/amd64/include/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: atomic.h,v 1.4 1999/07/23 23:45:19 alc Exp $
+ * $FreeBSD$
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define _MACHINE_ATOMIC_H_
diff --git a/sys/amd64/include/bus.h b/sys/amd64/include/bus.h
index 28e80ba2b89a..b6a9795a5ae5 100644
--- a/sys/amd64/include/bus.h
+++ b/sys/amd64/include/bus.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/amd64/include/bus_amd64.h b/sys/amd64/include/bus_amd64.h
index 28e80ba2b89a..b6a9795a5ae5 100644
--- a/sys/amd64/include/bus_amd64.h
+++ b/sys/amd64/include/bus_amd64.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/amd64/include/bus_at386.h b/sys/amd64/include/bus_at386.h
index 28e80ba2b89a..b6a9795a5ae5 100644
--- a/sys/amd64/include/bus_at386.h
+++ b/sys/amd64/include/bus_at386.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/amd64/include/bus_dma.h b/sys/amd64/include/bus_dma.h
index 28e80ba2b89a..b6a9795a5ae5 100644
--- a/sys/amd64/include/bus_dma.h
+++ b/sys/amd64/include/bus_dma.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/amd64/include/bus_memio.h b/sys/amd64/include/bus_memio.h
index ee58d5a24ef2..3533a671fe8d 100644
--- a/sys/amd64/include/bus_memio.h
+++ b/sys/amd64/include/bus_memio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_BUS_MEMIO_H_
diff --git a/sys/amd64/include/bus_pio.h b/sys/amd64/include/bus_pio.h
index 4eb051e18190..8742dd195e0b 100644
--- a/sys/amd64/include/bus_pio.h
+++ b/sys/amd64/include/bus_pio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_BUS_PIO_H_
diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h
index 03e2d79e20f6..f5c654a6a64f 100644
--- a/sys/amd64/include/clock.h
+++ b/sys/amd64/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- *	$Id: clock.h,v 1.34 1998/03/05 21:45:42 tegge Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h
index d3e4ad47b9f0..4a2fe79f41ad 100644
--- a/sys/amd64/include/cpu.h
+++ b/sys/amd64/include/cpu.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
- *	$Id: cpu.h,v 1.39 1999/04/23 20:22:44 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index 9c72d0db5327..9618b252019f 100644
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cpufunc.h,v 1.89 1999/08/19 00:32:48 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/include/cputypes.h b/sys/amd64/include/cputypes.h
index ece2509927ab..93e01e26287d 100644
--- a/sys/amd64/include/cputypes.h
+++ b/sys/amd64/include/cputypes.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cputypes.h,v 1.11 1998/05/22 00:03:23 des Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/amd64/include/db_machdep.h b/sys/amd64/include/db_machdep.h
index aaa32f66661f..d5022d81e92d 100644
--- a/sys/amd64/include/db_machdep.h
+++ b/sys/amd64/include/db_machdep.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
- *	$Id: db_machdep.h,v 1.12 1997/02/22 09:34:24 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/amd64/include/elf.h b/sys/amd64/include/elf.h
index ac0cce3ee0e9..756c08c02042 100644
--- a/sys/amd64/include/elf.h
+++ b/sys/amd64/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf.h,v 1.6 1999/02/07 23:49:55 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/amd64/include/exec.h b/sys/amd64/include/exec.h
index 7670fd1cee1a..c233b09655b2 100644
--- a/sys/amd64/include/exec.h
+++ b/sys/amd64/include/exec.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_EXEC_H_
diff --git a/sys/amd64/include/float.h b/sys/amd64/include/float.h
index a0296ecc8c05..5cdbc97f7d4b 100644
--- a/sys/amd64/include/float.h
+++ b/sys/amd64/include/float.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/amd64/include/floatingpoint.h b/sys/amd64/include/floatingpoint.h
index cd2561f8b9d1..c3e674f7f30c 100644
--- a/sys/amd64/include/floatingpoint.h
+++ b/sys/amd64/include/floatingpoint.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- *	$Id: floatingpoint.h,v 1.8 1997/02/22 09:34:37 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/amd64/include/fpu.h b/sys/amd64/include/fpu.h
index 10384c6ebf9b..2e7a31d25082 100644
--- a/sys/amd64/include/fpu.h
+++ b/sys/amd64/include/fpu.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- *	$Id: npx.h,v 1.14 1997/07/20 11:06:44 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/include/frame.h b/sys/amd64/include/frame.h
index f339f01c43c1..b212d6c7b77f 100644
--- a/sys/amd64/include/frame.h
+++ b/sys/amd64/include/frame.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- *	$Id: frame.h,v 1.17 1999/05/11 16:29:01 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_FRAME_H_
diff --git a/sys/amd64/include/ieeefp.h b/sys/amd64/include/ieeefp.h
index ab4d529ea94c..3c9c49ddda34 100644
--- a/sys/amd64/include/ieeefp.h
+++ b/sys/amd64/include/ieeefp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- *	$Id: ieeefp.h,v 1.5 1997/02/22 09:34:41 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h
index 491eb46b024a..755e1e72cce2 100644
--- a/sys/amd64/include/md_var.h
+++ b/sys/amd64/include/md_var.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: md_var.h,v 1.29 1999/04/28 01:04:02 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 969cd0892495..283ed1701a3c 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/amd64/include/npx.h b/sys/amd64/include/npx.h
index 10384c6ebf9b..2e7a31d25082 100644
--- a/sys/amd64/include/npx.h
+++ b/sys/amd64/include/npx.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- *	$Id: npx.h,v 1.14 1997/07/20 11:06:44 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/include/pc/bios.h b/sys/amd64/include/pc/bios.h
index 1ea2f9273191..3a317863812f 100644
--- a/sys/amd64/include/pc/bios.h
+++ b/sys/amd64/include/pc/bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.h,v 1.5 1999/08/18 02:20:04 msmith Exp $
+ * $FreeBSD$
  */
 
 /* 
diff --git a/sys/amd64/include/pc/display.h b/sys/amd64/include/pc/display.h
index 9e64a3f13307..cd2d5ff35b73 100644
--- a/sys/amd64/include/pc/display.h
+++ b/sys/amd64/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Color attributes for foreground text */
diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h
index 5cee924dd9ff..ed3044cc4d6a 100644
--- a/sys/amd64/include/pcb.h
+++ b/sys/amd64/include/pcb.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- *	$Id: pcb.h,v 1.28 1999/06/01 18:20:06 jlemon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_PCB_H_
diff --git a/sys/amd64/include/pcb_ext.h b/sys/amd64/include/pcb_ext.h
index 36d07e9e8cec..154cf949ba0b 100644
--- a/sys/amd64/include/pcb_ext.h
+++ b/sys/amd64/include/pcb_ext.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_PCB_EXT_H_
diff --git a/sys/amd64/include/pci_cfgreg.h b/sys/amd64/include/pci_cfgreg.h
index 44556e7731ad..34b3fc54aaa3 100644
--- a/sys/amd64/include/pci_cfgreg.h
+++ b/sys/amd64/include/pci_cfgreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h
index c02009b83432..28336d708534 100644
--- a/sys/amd64/include/pcpu.h
+++ b/sys/amd64/include/pcpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: globaldata.h,v 1.9 1999/05/12 21:39:00 luoqi Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index fd55bdcb2efa..b9f3f745a4e7 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 	$Id: pmap.h,v 1.60 1999/04/02 17:59:49 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index ae6cd6337bc3..bc2679e385c3 100644
--- a/sys/amd64/include/proc.h
+++ b/sys/amd64/include/proc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- *	$Id: proc.h,v 1.8 1997/05/07 19:55:13 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h
index e034e611e069..1d2b6009f52e 100644
--- a/sys/amd64/include/profile.h
+++ b/sys/amd64/include/profile.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $Id: profile.h,v 1.17 1998/07/14 05:09:43 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/amd64/include/psl.h b/sys/amd64/include/psl.h
index 5f1733587f8e..6a7e233a8408 100644
--- a/sys/amd64/include/psl.h
+++ b/sys/amd64/include/psl.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PSL_H_
diff --git a/sys/amd64/include/ptrace.h b/sys/amd64/include/ptrace.h
index 2c43a2eef8d4..55a26fd636ad 100644
--- a/sys/amd64/include/ptrace.h
+++ b/sys/amd64/include/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $Id: ptrace.h,v 1.6 1998/05/19 00:00:12 tegge Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/amd64/include/reg.h b/sys/amd64/include/reg.h
index 994bdfda0360..1f541c7b30d0 100644
--- a/sys/amd64/include/reg.h
+++ b/sys/amd64/include/reg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- *	$Id: reg.h,v 1.18 1999/04/28 01:04:06 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/amd64/include/reloc.h b/sys/amd64/include/reloc.h
index ead0334ee221..ef4b8dbc3e8c 100644
--- a/sys/amd64/include/reloc.h
+++ b/sys/amd64/include/reloc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_MACHINE_RELOC_H_
diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h
index 1a6e20d91af8..d043d8b5a113 100644
--- a/sys/amd64/include/segments.h
+++ b/sys/amd64/include/segments.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- *	$Id: segments.h,v 1.21 1999/07/29 01:49:19 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/amd64/include/setjmp.h b/sys/amd64/include/setjmp.h
index c0337c06ce6d..173ea2d92f8c 100644
--- a/sys/amd64/include/setjmp.h
+++ b/sys/amd64/include/setjmp.h
@@ -1,4 +1,4 @@
-/* $Id: setjmp.h,v 1.1 1998/01/10 23:04:51 jb Exp $ */
+/* $FreeBSD$ */
 /*
  * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
  * All rights reserved.
diff --git a/sys/amd64/include/signal.h b/sys/amd64/include/signal.h
index 51dc1960901e..deaa06ca7923 100644
--- a/sys/amd64/include/signal.h
+++ b/sys/amd64/include/signal.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $Id: signal.h,v 1.7 1997/02/22 09:35:12 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h
index c425db6f7d32..0524d76b6fbe 100644
--- a/sys/amd64/include/smp.h
+++ b/sys/amd64/include/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: smp.h,v 1.45 1999/04/28 01:04:07 luoqi Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h
index f6e04fa98cbc..d95f9331f623 100644
--- a/sys/amd64/include/specialreg.h
+++ b/sys/amd64/include/specialreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: specialreg.h,v 1.16 1998/10/06 13:16:26 kato Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
diff --git a/sys/amd64/include/sysarch.h b/sys/amd64/include/sysarch.h
index a9248389acd2..009c7810259a 100644
--- a/sys/amd64/include/sysarch.h
+++ b/sys/amd64/include/sysarch.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sysarch.h,v 1.9 1998/07/28 03:33:27 jlemon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/include/trap.h b/sys/amd64/include/trap.h
index 96928d189962..6cc059a1e584 100644
--- a/sys/amd64/include/trap.h
+++ b/sys/amd64/include/trap.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- *	$Id: trap.h,v 1.8 1999/07/25 13:16:08 cracauer Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_TRAP_H_
diff --git a/sys/amd64/include/tss.h b/sys/amd64/include/tss.h
index 636133a9a870..2003a66609b4 100644
--- a/sys/amd64/include/tss.h
+++ b/sys/amd64/include/tss.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- *	$Id: tss.h,v 1.8 1997/02/22 09:35:20 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_TSS_H_
diff --git a/sys/amd64/include/varargs.h b/sys/amd64/include/varargs.h
index 5661462e11f4..d1d4ed0c0906 100644
--- a/sys/amd64/include/varargs.h
+++ b/sys/amd64/include/varargs.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $Id: varargs.h,v 1.6 1997/02/28 07:12:34 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _VARARGS_H_
diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h
index 9ec54e2d34af..0a5847dd5ff6 100644
--- a/sys/amd64/include/vmparam.h
+++ b/sys/amd64/include/vmparam.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- *	$Id: vmparam.h,v 1.30 1998/06/12 09:10:22 dg Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/amd64/isa/atpic_vector.S b/sys/amd64/isa/atpic_vector.S
index cbb8b5ea49b9..24ce97b666b9 100644
--- a/sys/amd64/isa/atpic_vector.S
+++ b/sys/amd64/isa/atpic_vector.S
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: icu_vector.s,v 1.12 1999/05/28 14:08:59 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 188e20bc0f47..8a3e1c93030c 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/icu.h b/sys/amd64/isa/icu.h
index cfe4dceb0873..14e8d14aa9be 100644
--- a/sys/amd64/isa/icu.h
+++ b/sys/amd64/isa/icu.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)icu.h	5.6 (Berkeley) 5/9/91
- *	$Id: icu.h,v 1.15 1997/07/22 20:12:05 fsmp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/icu_ipl.S b/sys/amd64/isa/icu_ipl.S
index 0f3a3caeaa33..34753583a41e 100644
--- a/sys/amd64/isa/icu_ipl.S
+++ b/sys/amd64/isa/icu_ipl.S
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: icu_ipl.s,v 1.4 1998/08/11 15:08:12 bde Exp $
+ * $FreeBSD$
  */
 
 	.data
diff --git a/sys/amd64/isa/icu_ipl.s b/sys/amd64/isa/icu_ipl.s
index 0f3a3caeaa33..34753583a41e 100644
--- a/sys/amd64/isa/icu_ipl.s
+++ b/sys/amd64/isa/icu_ipl.s
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: icu_ipl.s,v 1.4 1998/08/11 15:08:12 bde Exp $
+ * $FreeBSD$
  */
 
 	.data
diff --git a/sys/amd64/isa/icu_vector.S b/sys/amd64/isa/icu_vector.S
index cbb8b5ea49b9..24ce97b666b9 100644
--- a/sys/amd64/isa/icu_vector.S
+++ b/sys/amd64/isa/icu_vector.S
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: icu_vector.s,v 1.12 1999/05/28 14:08:59 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/icu_vector.s b/sys/amd64/isa/icu_vector.s
index cbb8b5ea49b9..24ce97b666b9 100644
--- a/sys/amd64/isa/icu_vector.s
+++ b/sys/amd64/isa/icu_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: icu_vector.s,v 1.12 1999/05/28 14:08:59 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c
index 3a214a99522a..8bdb4b6d72d4 100644
--- a/sys/amd64/isa/intr_machdep.c
+++ b/sys/amd64/isa/intr_machdep.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  */
 /*
  * This file contains an aggregated module marked:
@@ -506,7 +506,7 @@ icu_unset(intr, handler)
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/amd64/isa/intr_machdep.h b/sys/amd64/isa/intr_machdep.h
index 06593cf359f4..adea3037caa1 100644
--- a/sys/amd64/isa/intr_machdep.h
+++ b/sys/amd64/isa/intr_machdep.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: intr_machdep.h,v 1.15 1999/06/03 20:41:00 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_INTR_MACHDEP_H_
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index 8e153a71c62b..f87d9816f071 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa.c,v 1.127 1999/05/22 15:18:12 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/isa.h b/sys/amd64/isa/isa.h
index ea25f20604ee..cc66da9be045 100644
--- a/sys/amd64/isa/isa.h
+++ b/sys/amd64/isa/isa.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: isa.h,v 1.21 1997/02/22 09:36:41 peter Exp $
+ * $FreeBSD$
  */
 
 #ifdef PC98
diff --git a/sys/amd64/isa/isa_dma.c b/sys/amd64/isa/isa_dma.c
index 7855aaa89fa1..698c67004a7e 100644
--- a/sys/amd64/isa/isa_dma.c
+++ b/sys/amd64/isa/isa_dma.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa_dma.c,v 1.2 1999/04/21 07:26:28 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/isa_dma.h b/sys/amd64/isa/isa_dma.h
index 3fe234c3422c..15f8b3d804da 100644
--- a/sys/amd64/isa/isa_dma.h
+++ b/sys/amd64/isa/isa_dma.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.57 1999/01/17 06:33:43 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_ISA_DMA_H_
diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c
index 3a214a99522a..8bdb4b6d72d4 100644
--- a/sys/amd64/isa/nmi.c
+++ b/sys/amd64/isa/nmi.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  */
 /*
  * This file contains an aggregated module marked:
@@ -506,7 +506,7 @@ icu_unset(intr, handler)
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index a99b5674ea4b..374c06617013 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.75 1999/07/26 05:47:31 cracauer Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/amd64/isa/timerreg.h b/sys/amd64/isa/timerreg.h
index ff27bacc24a4..0bfd7fc8cd63 100644
--- a/sys/amd64/isa/timerreg.h
+++ b/sys/amd64/isa/timerreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/vector.S b/sys/amd64/isa/vector.S
index 608f13586c3b..5447a90126a0 100644
--- a/sys/amd64/isa/vector.S
+++ b/sys/amd64/isa/vector.S
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: vector.s,v 1.30 1997/05/26 17:58:27 fsmp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/vector.s b/sys/amd64/isa/vector.s
index 608f13586c3b..5447a90126a0 100644
--- a/sys/amd64/isa/vector.s
+++ b/sys/amd64/isa/vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: vector.s,v 1.30 1997/05/26 17:58:27 fsmp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c
index 08cba7f52e06..741baa907f63 100644
--- a/sys/amd64/pci/pci_bus.c
+++ b/sys/amd64/pci/pci_bus.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.46 1999/08/10 09:22:21 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index 08cba7f52e06..741baa907f63 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.46 1999/08/10 09:22:21 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/boot/alpha/Makefile b/sys/boot/alpha/Makefile
index 81dec0372be7..a36f2cf53d61 100644
--- a/sys/boot/alpha/Makefile
+++ b/sys/boot/alpha/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 
 SUBDIR=		libalpha
 SUBDIR+=	boot1 boot2 netboot
diff --git a/sys/boot/alpha/boot1/boot1.c b/sys/boot/alpha/boot1/boot1.c
index 7346c5b8085a..e3f52a910abf 100644
--- a/sys/boot/alpha/boot1/boot1.c
+++ b/sys/boot/alpha/boot1/boot1.c
@@ -1,5 +1,5 @@
 /*
- * $Id: boot1.c,v 1.3 1998/10/18 19:05:07 dfr Exp $
+ * $FreeBSD$
  * From	$NetBSD: bootxx.c,v 1.4 1997/09/06 14:08:29 drochner Exp $ 
  */
 
diff --git a/sys/boot/alpha/boot1/sys.c b/sys/boot/alpha/boot1/sys.c
index 79f17025a959..4766c9a02c35 100644
--- a/sys/boot/alpha/boot1/sys.c
+++ b/sys/boot/alpha/boot1/sys.c
@@ -25,7 +25,7 @@
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
  *	fromL Id: sys.c,v 1.21 1997/06/09 05:10:56 bde Exp
- *	$Id: sys.c,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/alpha/boot2/conf.c b/sys/boot/alpha/boot2/conf.c
index e4f439b81900..a105c7f18144 100644
--- a/sys/boot/alpha/boot2/conf.c
+++ b/sys/boot/alpha/boot2/conf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: conf.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  * From	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
diff --git a/sys/boot/alpha/boot2/version b/sys/boot/alpha/boot2/version
index 6346f50d0a0f..bc9aa00ed9ab 100644
--- a/sys/boot/alpha/boot2/version
+++ b/sys/boot/alpha/boot2/version
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/alpha/common/main.c b/sys/boot/alpha/common/main.c
index 41400240b26e..b9c5ff736583 100644
--- a/sys/boot/alpha/common/main.c
+++ b/sys/boot/alpha/common/main.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.8 1998/10/31 17:12:32 dfr Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/alpha/common/setdef0.c b/sys/boot/alpha/common/setdef0.c
index b41276d76e72..49f662ae1d6c 100644
--- a/sys/boot/alpha/common/setdef0.c
+++ b/sys/boot/alpha/common/setdef0.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef0.c,v 1.1 1998/06/10 10:53:12 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/boot/alpha/common/setdef1.c b/sys/boot/alpha/common/setdef1.c
index 659618a83cc5..13668f08cefc 100644
--- a/sys/boot/alpha/common/setdef1.c
+++ b/sys/boot/alpha/common/setdef1.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef1.c,v 1.1 1998/06/10 10:53:13 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/boot/alpha/libalpha/Makefile b/sys/boot/alpha/libalpha/Makefile
index 4928647b7548..fe642eb1336f 100644
--- a/sys/boot/alpha/libalpha/Makefile
+++ b/sys/boot/alpha/libalpha/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1998/10/14 09:53:25 peter Exp $
+# $FreeBSD$
 
 LIB=		alpha
 NOPIC=		true
diff --git a/sys/boot/alpha/libalpha/OSFpal.c b/sys/boot/alpha/libalpha/OSFpal.c
index b77ee12e3ab5..870296b65479 100644
--- a/sys/boot/alpha/libalpha/OSFpal.c
+++ b/sys/boot/alpha/libalpha/OSFpal.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From	$NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/alpha_copy.c b/sys/boot/alpha/libalpha/alpha_copy.c
index 196915c1eb23..95b6cba677e4 100644
--- a/sys/boot/alpha/libalpha/alpha_copy.c
+++ b/sys/boot/alpha/libalpha/alpha_copy.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_copy.c,v 1.2 1998/09/03 02:10:07 msmith Exp $
+ * $FreeBSD$
  */
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/alpha/libalpha/alpha_module.c b/sys/boot/alpha/libalpha/alpha_module.c
index afa065f5bd04..4ac21d42242d 100644
--- a/sys/boot/alpha/libalpha/alpha_module.c
+++ b/sys/boot/alpha/libalpha/alpha_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_module.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/alpha/libalpha/bbinfo.h b/sys/boot/alpha/libalpha/bbinfo.h
index 5529035ff438..94aa4bbff07f 100644
--- a/sys/boot/alpha/libalpha/bbinfo.h
+++ b/sys/boot/alpha/libalpha/bbinfo.h
@@ -1,5 +1,5 @@
 /* 
- * $Id$
+ * $FreeBSD$
  * From $NetBSD: bbinfo.h,v 1.2 1997/04/06 08:40:57 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/bootinfo.c b/sys/boot/alpha/libalpha/bootinfo.c
index fa0842b59169..5513583bbb6b 100644
--- a/sys/boot/alpha/libalpha/bootinfo.c
+++ b/sys/boot/alpha/libalpha/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.6 1999/03/20 14:13:09 dcs Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/common.h b/sys/boot/alpha/libalpha/common.h
index 8acd3f93e47b..ff184763dd84 100644
--- a/sys/boot/alpha/libalpha/common.h
+++ b/sys/boot/alpha/libalpha/common.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: common.h,v 1.2 1998/01/05 07:02:48 perry Exp $	
  */
 
diff --git a/sys/boot/alpha/libalpha/delay.c b/sys/boot/alpha/libalpha/delay.c
index a7621b76bbb1..faaf9829c3db 100644
--- a/sys/boot/alpha/libalpha/delay.c
+++ b/sys/boot/alpha/libalpha/delay.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/devicename.c b/sys/boot/alpha/libalpha/devicename.c
index dcd07ede1fcb..d8ee1133299e 100644
--- a/sys/boot/alpha/libalpha/devicename.c
+++ b/sys/boot/alpha/libalpha/devicename.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devicename.c,v 1.2 1998/08/22 10:31:01 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/elf_freebsd.c b/sys/boot/alpha/libalpha/elf_freebsd.c
index 0958b956325c..4efd603e3d64 100644
--- a/sys/boot/alpha/libalpha/elf_freebsd.c
+++ b/sys/boot/alpha/libalpha/elf_freebsd.c
@@ -1,4 +1,4 @@
-/* $Id: elf_freebsd.c,v 1.6 1998/10/15 21:55:58 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */
 
 /*-
diff --git a/sys/boot/alpha/libalpha/getsecs.c b/sys/boot/alpha/libalpha/getsecs.c
index f234a37256ca..13f1e53e1bf3 100644
--- a/sys/boot/alpha/libalpha/getsecs.c
+++ b/sys/boot/alpha/libalpha/getsecs.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From:	$NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $	
  */
 
diff --git a/sys/boot/alpha/libalpha/libalpha.h b/sys/boot/alpha/libalpha/libalpha.h
index 79b231a5c4b1..8e1dd71e09f0 100644
--- a/sys/boot/alpha/libalpha/libalpha.h
+++ b/sys/boot/alpha/libalpha/libalpha.h
@@ -1,4 +1,4 @@
-/* $Id: libalpha.h,v 1.3 1998/09/20 21:46:19 dfr Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1996
diff --git a/sys/boot/alpha/libalpha/pal.S b/sys/boot/alpha/libalpha/pal.S
index c33f317d52be..d411318b54ae 100644
--- a/sys/boot/alpha/libalpha/pal.S
+++ b/sys/boot/alpha/libalpha/pal.S
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: pal.s,v 1.12 1998/02/27 03:44:53 thorpej Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/prom.c b/sys/boot/alpha/libalpha/prom.c
index 380326ccd0ec..e32d43d3b66f 100644
--- a/sys/boot/alpha/libalpha/prom.c
+++ b/sys/boot/alpha/libalpha/prom.c
@@ -1,4 +1,4 @@
-/* $Id: prom.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */
 
 /*  
diff --git a/sys/boot/alpha/libalpha/prom_disp.S b/sys/boot/alpha/libalpha/prom_disp.S
index 6d5e0874bdb5..184f1d3c9f00 100644
--- a/sys/boot/alpha/libalpha/prom_disp.S
+++ b/sys/boot/alpha/libalpha/prom_disp.S
@@ -1,5 +1,5 @@
 /* 
- * $Id$ 
+ * $FreeBSD$ 
  * From: $NetBSD: prom_disp.S,v 1.2 1997/04/06 08:41:00 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/prom_swpal.S b/sys/boot/alpha/libalpha/prom_swpal.S
index b4d3cac75707..be57632ddd9b 100644
--- a/sys/boot/alpha/libalpha/prom_swpal.S
+++ b/sys/boot/alpha/libalpha/prom_swpal.S
@@ -1,5 +1,5 @@
 /* 
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: prom_swpal.S,v 1.2 1997/04/06 08:41:01 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/reboot.c b/sys/boot/alpha/libalpha/reboot.c
index 35750ec0f2af..3361c6c90348 100644
--- a/sys/boot/alpha/libalpha/reboot.c
+++ b/sys/boot/alpha/libalpha/reboot.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/srmdisk.c b/sys/boot/alpha/libalpha/srmdisk.c
index 6b7d17b8e76d..6039a7289168 100644
--- a/sys/boot/alpha/libalpha/srmdisk.c
+++ b/sys/boot/alpha/libalpha/srmdisk.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: srmdisk.c,v 1.3 1998/11/02 23:28:10 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/alpha/libalpha/srmnet.c b/sys/boot/alpha/libalpha/srmnet.c
index d15fa5f151dd..d36e557bc1fb 100644
--- a/sys/boot/alpha/libalpha/srmnet.c
+++ b/sys/boot/alpha/libalpha/srmnet.c
@@ -1,5 +1,5 @@
 /* 
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/start.S b/sys/boot/alpha/libalpha/start.S
index f42b5da4c95c..fcc5406a0183 100644
--- a/sys/boot/alpha/libalpha/start.S
+++ b/sys/boot/alpha/libalpha/start.S
@@ -1,5 +1,5 @@
 /* 
- * $Id: start.S,v 1.2 1998/10/31 17:12:32 dfr Exp $ 
+ * $FreeBSD$ 
  * From: $NetBSD: start.S,v 1.4 1998/03/28 00:54:15 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/time.c b/sys/boot/alpha/libalpha/time.c
index 7b87d2fdcc69..18af172558c8 100644
--- a/sys/boot/alpha/libalpha/time.c
+++ b/sys/boot/alpha/libalpha/time.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/netboot/conf.c b/sys/boot/alpha/netboot/conf.c
index 8a0e10bad072..354f9cd1a90d 100644
--- a/sys/boot/alpha/netboot/conf.c
+++ b/sys/boot/alpha/netboot/conf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: conf.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  * From: $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $
  */
 
diff --git a/sys/boot/alpha/netboot/version b/sys/boot/alpha/netboot/version
index 6346f50d0a0f..bc9aa00ed9ab 100644
--- a/sys/boot/alpha/netboot/version
+++ b/sys/boot/alpha/netboot/version
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/arc/Makefile b/sys/boot/arc/Makefile
index 4b0436976de6..82043c438af8 100644
--- a/sys/boot/arc/Makefile
+++ b/sys/boot/arc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+# $FreeBSD$
 
 SUBDIR=		lib
 SUBDIR+=	loader
diff --git a/sys/boot/arc/include/arcfuncs.h b/sys/boot/arc/include/arcfuncs.h
index cc4e48d35a67..25c74465b3fa 100644
--- a/sys/boot/arc/include/arcfuncs.h
+++ b/sys/boot/arc/include/arcfuncs.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/boot/arc/include/arctypes.h b/sys/boot/arc/include/arctypes.h
index e9c73d308f6d..b823e49babad 100644
--- a/sys/boot/arc/include/arctypes.h
+++ b/sys/boot/arc/include/arctypes.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/boot/arc/include/libarc.h b/sys/boot/arc/include/libarc.h
index 716215950c70..085d6bbc8eed 100644
--- a/sys/boot/arc/include/libarc.h
+++ b/sys/boot/arc/include/libarc.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1996
diff --git a/sys/boot/arc/lib/Makefile b/sys/boot/arc/lib/Makefile
index ec5b6bc75def..023821cdae1f 100644
--- a/sys/boot/arc/lib/Makefile
+++ b/sys/boot/arc/lib/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.1 1999/07/28 20:28:45 se Exp $
+# $FreeBSD$
 
 LIB=		arc
 NOPIC=		true
diff --git a/sys/boot/arc/lib/abort.c b/sys/boot/arc/lib/abort.c
index 00480612635f..4e5951bb50bb 100644
--- a/sys/boot/arc/lib/abort.c
+++ b/sys/boot/arc/lib/abort.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <errno.h>
diff --git a/sys/boot/arc/lib/arcconsole.c b/sys/boot/arc/lib/arcconsole.c
index e8ecb227ab5f..9607b6b1c61c 100644
--- a/sys/boot/arc/lib/arcconsole.c
+++ b/sys/boot/arc/lib/arcconsole.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */
 
 /*  
diff --git a/sys/boot/arc/lib/arcdisk.c b/sys/boot/arc/lib/arcdisk.c
index 5a6be39b3147..2b548546416d 100644
--- a/sys/boot/arc/lib/arcdisk.c
+++ b/sys/boot/arc/lib/arcdisk.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/arc/lib/arch/alpha/copy.c b/sys/boot/arc/lib/arch/alpha/copy.c
index 2ca139766815..2847812fed05 100644
--- a/sys/boot/arc/lib/arch/alpha/copy.c
+++ b/sys/boot/arc/lib/arch/alpha/copy.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_copy.c,v 1.3 1998/09/20 21:46:19 dfr Exp $
+ * $FreeBSD$
  */
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/arc/lib/arch/alpha/rpb.c b/sys/boot/arc/lib/arch/alpha/rpb.c
index ac56c824c1b5..492346155751 100644
--- a/sys/boot/arc/lib/arch/alpha/rpb.c
+++ b/sys/boot/arc/lib/arch/alpha/rpb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/arc/lib/arch/alpha/setjmp.S b/sys/boot/arc/lib/arch/alpha/setjmp.S
index 24502a4f0432..8e153f7ddd77 100644
--- a/sys/boot/arc/lib/arch/alpha/setjmp.S
+++ b/sys/boot/arc/lib/arch/alpha/setjmp.S
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/boot/arc/lib/arch/alpha/start.S b/sys/boot/arc/lib/arch/alpha/start.S
index af038e9f0e0f..1b4fc598d6ae 100644
--- a/sys/boot/arc/lib/arch/alpha/start.S
+++ b/sys/boot/arc/lib/arch/alpha/start.S
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/boot/arc/lib/bootinfo.c b/sys/boot/arc/lib/bootinfo.c
index 949a93c674d5..8b74e0d2c06e 100644
--- a/sys/boot/arc/lib/bootinfo.c
+++ b/sys/boot/arc/lib/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.3 1998/10/15 21:55:58 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/arc/lib/delay.c b/sys/boot/arc/lib/delay.c
index 67b0bf61cb61..e897b4ec7497 100644
--- a/sys/boot/arc/lib/delay.c
+++ b/sys/boot/arc/lib/delay.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <errno.h>
diff --git a/sys/boot/arc/lib/devicename.c b/sys/boot/arc/lib/devicename.c
index 595c7d22ce20..56c8c43d510c 100644
--- a/sys/boot/arc/lib/devicename.c
+++ b/sys/boot/arc/lib/devicename.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devicename.c,v 1.3 1998/09/26 10:51:37 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/arc/lib/elf_freebsd.c b/sys/boot/arc/lib/elf_freebsd.c
index 84637592c67a..4e75820a88ca 100644
--- a/sys/boot/arc/lib/elf_freebsd.c
+++ b/sys/boot/arc/lib/elf_freebsd.c
@@ -1,4 +1,4 @@
-/* $Id: elf_freebsd.c,v 1.6 1998/10/15 21:55:58 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */
 
 /*-
diff --git a/sys/boot/arc/lib/module.c b/sys/boot/arc/lib/module.c
index 367bf0cb073b..a6a39978eab8 100644
--- a/sys/boot/arc/lib/module.c
+++ b/sys/boot/arc/lib/module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_module.c,v 1.2 1998/08/31 21:10:40 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/arc/lib/prom.c b/sys/boot/arc/lib/prom.c
index abf2d3991998..5f13801a8213 100644
--- a/sys/boot/arc/lib/prom.c
+++ b/sys/boot/arc/lib/prom.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/boot/arc/lib/setjmperr.c b/sys/boot/arc/lib/setjmperr.c
index c68ca02e498a..9c005e1e9b3f 100644
--- a/sys/boot/arc/lib/setjmperr.c
+++ b/sys/boot/arc/lib/setjmperr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <errno.h>
diff --git a/sys/boot/arc/lib/time.c b/sys/boot/arc/lib/time.c
index 815897025198..bf0ba1ab23b5 100644
--- a/sys/boot/arc/lib/time.c
+++ b/sys/boot/arc/lib/time.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <errno.h>
diff --git a/sys/boot/arc/loader/conf.c b/sys/boot/arc/loader/conf.c
index 1b5384c63f42..d40ea46fe06a 100644
--- a/sys/boot/arc/loader/conf.c
+++ b/sys/boot/arc/loader/conf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: conf.c,v 1.2 1998/08/31 21:10:36 msmith Exp $
+ * $FreeBSD$
  * From	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
diff --git a/sys/boot/arc/loader/main.c b/sys/boot/arc/loader/main.c
index d086a59d6fcf..ccee80fc4859 100644
--- a/sys/boot/arc/loader/main.c
+++ b/sys/boot/arc/loader/main.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.1.1.1 1999/07/28 20:28:47 se Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/arc/loader/setdef0.c b/sys/boot/arc/loader/setdef0.c
index 79874ea278dd..49f662ae1d6c 100644
--- a/sys/boot/arc/loader/setdef0.c
+++ b/sys/boot/arc/loader/setdef0.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef0.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/boot/arc/loader/setdef1.c b/sys/boot/arc/loader/setdef1.c
index 9fffaf7b1f7a..13668f08cefc 100644
--- a/sys/boot/arc/loader/setdef1.c
+++ b/sys/boot/arc/loader/setdef1.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef1.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/boot/arc/loader/version b/sys/boot/arc/loader/version
index 23262b91677b..bc9aa00ed9ab 100644
--- a/sys/boot/arc/loader/version
+++ b/sys/boot/arc/loader/version
@@ -1,4 +1,4 @@
-$Id: version,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+$FreeBSD$
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc
index c29494ba6aef..0d1dc1411c55 100644
--- a/sys/boot/common/Makefile.inc
+++ b/sys/boot/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $Id: Makefile.inc,v 1.7 1998/11/02 23:28:10 msmith Exp $
+# $FreeBSD$
 
 SRCS+=	bcache.c boot.c commands.c console.c devopen.c interp.c 
 SRCS+=	interp_backslash.c interp_parse.c load_aout.c load_elf.c ls.c misc.c 
diff --git a/sys/boot/common/bcache.c b/sys/boot/common/bcache.c
index d780038c07a3..c52854ece5ff 100644
--- a/sys/boot/common/bcache.c
+++ b/sys/boot/common/bcache.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bcache.c,v 1.4 1998/11/19 18:12:03 paul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/common/boot.c b/sys/boot/common/boot.c
index 70b467144636..f69d4302d16c 100644
--- a/sys/boot/common/boot.c
+++ b/sys/boot/common/boot.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: boot.c,v 1.13 1999/07/15 20:40:52 n_hibma Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/common/bootstrap.h b/sys/boot/common/bootstrap.h
index 1cabf7033457..9138b56e3265 100644
--- a/sys/boot/common/bootstrap.h
+++ b/sys/boot/common/bootstrap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootstrap.h,v 1.22 1999/06/26 12:26:54 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/common/commands.c b/sys/boot/common/commands.c
index cc75032e72c0..aa81abcf15b1 100644
--- a/sys/boot/common/commands.c
+++ b/sys/boot/common/commands.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: commands.c,v 1.10 1999/02/01 06:08:20 jkh Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/common/console.c b/sys/boot/common/console.c
index 8c4377f2bcd4..3f2a8790118a 100644
--- a/sys/boot/common/console.c
+++ b/sys/boot/common/console.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: console.c,v 1.3 1998/10/11 10:19:11 peter Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/common/dev_net.c b/sys/boot/common/dev_net.c
index a66523a08ac0..cf12680c3135 100644
--- a/sys/boot/common/dev_net.c
+++ b/sys/boot/common/dev_net.c
@@ -1,5 +1,5 @@
 /*	
- * $Id: dev_net.c,v 1.3 1998/09/20 21:46:19 dfr Exp $
+ * $FreeBSD$
  * From: $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $
  */
 
diff --git a/sys/boot/common/dev_net.h b/sys/boot/common/dev_net.h
index 7c256ffb2baa..3b3d10728a3d 100644
--- a/sys/boot/common/dev_net.h
+++ b/sys/boot/common/dev_net.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 extern struct devsw netdev;
diff --git a/sys/boot/common/devopen.c b/sys/boot/common/devopen.c
index 83489c6dd24f..77d6ffac9851 100644
--- a/sys/boot/common/devopen.c
+++ b/sys/boot/common/devopen.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devopen.c,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/common/gensetdefs.c b/sys/boot/common/gensetdefs.c
index 9927e8ae4579..a78e456de16e 100644
--- a/sys/boot/common/gensetdefs.c
+++ b/sys/boot/common/gensetdefs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: gensetdefs.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/common/interp.c b/sys/boot/common/interp.c
index 897f1175d833..4f321bd31c49 100644
--- a/sys/boot/common/interp.c
+++ b/sys/boot/common/interp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: interp.c,v 1.17 1999/03/08 10:32:38 dcs Exp $
+ * $FreeBSD$
  */
 /*
  * Simple commandline interpreter, toplevel and misc.
diff --git a/sys/boot/common/interp_backslash.c b/sys/boot/common/interp_backslash.c
index 6de118ec63fc..6325e4ef3489 100644
--- a/sys/boot/common/interp_backslash.c
+++ b/sys/boot/common/interp_backslash.c
@@ -11,7 +11,7 @@
  * Jordan K. Hubbard
  * 29 August 1998
  *
- *	$Id: interp_backslash.c,v 1.2 1998/09/03 06:14:41 jkh Exp $
+ * $FreeBSD$
  *
  * Routine for doing backslash elimination.
  */
diff --git a/sys/boot/common/interp_forth.c b/sys/boot/common/interp_forth.c
index 4f653275c78f..8b965ff86747 100644
--- a/sys/boot/common/interp_forth.c
+++ b/sys/boot/common/interp_forth.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: interp_forth.c,v 1.12 1999/02/04 17:06:46 dcs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>		/* to pick up __FreeBSD_version */
diff --git a/sys/boot/common/interp_parse.c b/sys/boot/common/interp_parse.c
index 6c387106ab83..0f83c430766c 100644
--- a/sys/boot/common/interp_parse.c
+++ b/sys/boot/common/interp_parse.c
@@ -11,7 +11,7 @@
  * Jordan K. Hubbard
  * 29 August 1998
  *
- *	$Id: interp_parse.c,v 1.6 1999/01/13 08:11:41 msmith Exp $
+ * $FreeBSD$
  * 
  * The meat of the simple parser.
  */
diff --git a/sys/boot/common/isapnp.c b/sys/boot/common/isapnp.c
index 865e8f683e15..19417068601a 100644
--- a/sys/boot/common/isapnp.c
+++ b/sys/boot/common/isapnp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: isapnp.c,v 1.3 1998/10/21 20:07:04 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/common/isapnp.h b/sys/boot/common/isapnp.h
index d1311b27aa0a..3ebd66a0d230 100644
--- a/sys/boot/common/isapnp.h
+++ b/sys/boot/common/isapnp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: isapnp.h,v 1.2 1998/10/21 20:07:04 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_PNP_H_
diff --git a/sys/boot/common/load.c b/sys/boot/common/load.c
index d59fdf398c4c..e91c5fb8b569 100644
--- a/sys/boot/common/load.c
+++ b/sys/boot/common/load.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/common/load_aout.c b/sys/boot/common/load_aout.c
index 3e6aeced5d7f..8947a7384174 100644
--- a/sys/boot/common/load_aout.c
+++ b/sys/boot/common/load_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: load_aout.c,v 1.13 1999/01/22 23:50:14 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c
index bc514b1bc3ac..024fece0718f 100644
--- a/sys/boot/common/load_elf.c
+++ b/sys/boot/common/load_elf.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: load_elf.c,v 1.10 1999/01/04 18:37:41 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index 27268bb59f7d..ef847c10e68f 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: loader.8,v 1.7 1999/06/23 09:06:18 ru Exp $
+.\" $FreeBSD$
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/sys/boot/common/ls.c b/sys/boot/common/ls.c
index 73f805700bf8..ef99d7067a9d 100644
--- a/sys/boot/common/ls.c
+++ b/sys/boot/common/ls.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ls.c,v 1.6 1998/10/11 10:28:51 peter Exp $
+ * $FreeBSD$
  * From: $NetBSD: ls.c,v 1.3 1997/06/13 13:48:47 drochner Exp $
  */
 
diff --git a/sys/boot/common/merge_help.awk b/sys/boot/common/merge_help.awk
index 1376c53aee3c..9741ed3663e4 100644
--- a/sys/boot/common/merge_help.awk
+++ b/sys/boot/common/merge_help.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $Id: mergehelp.awk,v 1.3 1999/01/13 20:06:52 jabley Exp $
+# $FreeBSD$
 #
 # Merge two boot loader help files for FreeBSD 3.0
 # Joe Abley <jabley@patho.gen.nz>
diff --git a/sys/boot/common/misc.c b/sys/boot/common/misc.c
index 36600e76485c..819d4a46594c 100644
--- a/sys/boot/common/misc.c
+++ b/sys/boot/common/misc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: misc.c,v 1.4 1998/09/26 10:51:38 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/boot/common/module.c b/sys/boot/common/module.c
index 01416596ce2b..d2adeab03e70 100644
--- a/sys/boot/common/module.c
+++ b/sys/boot/common/module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: module.c,v 1.8 1999/02/22 13:12:37 dcs Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/common/panic.c b/sys/boot/common/panic.c
index bee6a0327df4..bad1e45c5dc1 100644
--- a/sys/boot/common/panic.c
+++ b/sys/boot/common/panic.c
@@ -1,5 +1,5 @@
 /*
- * $Id: panic.c,v 1.3 1998/09/18 02:01:38 msmith Exp $
+ * $FreeBSD$
  * From: $NetBSD: panic.c,v 1.2 1997/03/22 01:48:36 thorpej Exp $
  */
 
diff --git a/sys/boot/common/pnpdata b/sys/boot/common/pnpdata
index 62d35a819386..f2e262070d96 100644
--- a/sys/boot/common/pnpdata
+++ b/sys/boot/common/pnpdata
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 # This file contains the system default Plug-and-Play data.  It is
 # derived from a number of sources, including:
diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index ab1071620704..5f724bbcaf36 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 1999/03/17 23:03:36 dcs Exp $
+# $FreeBSD$
 #
 LIB=			ficl
 NOPROFILE=		yes
diff --git a/sys/boot/ficl/softwords/freebsd.fr b/sys/boot/ficl/softwords/freebsd.fr
index 9ebeacba01cd..96205c0808dd 100644
--- a/sys/boot/ficl/softwords/freebsd.fr
+++ b/sys/boot/ficl/softwords/freebsd.fr
@@ -22,7 +22,7 @@
 \ ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ ** SUCH DAMAGE.
 \ **
-\ **      $Id: freebsd.fr,v 1.2 1999/02/28 02:10:14 dcs Exp $
+\ ** $FreeBSD$
 
 \ Words for use in scripts:
 \ % ignore errors here
diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th
index e219b56f2952..9f40cb2053c1 100644
--- a/sys/boot/forth/loader.4th
+++ b/sys/boot/forth/loader.4th
@@ -22,7 +22,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\	$Id: loader.4th,v 1.2 1999/04/24 17:25:25 dcs Exp $
+\ $FreeBSD$
 
 include /boot/support.4th
 
diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8
index 3a4213862093..3aedb666801a 100644
--- a/sys/boot/forth/loader.4th.8
+++ b/sys/boot/forth/loader.4th.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: loader.4th.8,v 1.2 1999/05/03 07:25:50 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index 8bc0ec5dff19..c860ae29c193 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -6,7 +6,7 @@
 #
 # All arguments must be in double quotes.
 #
-#	$Id: loader.conf,v 1.9 1999/08/10 17:15:20 wpaul Exp $
+# $FreeBSD$
 
 ##############################################################
 ###  Basic configuration options  ############################
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index c4114ff7f395..8a76f8247e06 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: loader.conf.5,v 1.3 1999/05/13 14:53:13 brian Exp $
+.\" $FreeBSD$
 .Dd April 18, 1999
 .Dt LOADER.CONF 5
 .Os
diff --git a/sys/boot/forth/support.4th b/sys/boot/forth/support.4th
index 20126ccfa0c3..5f594ef5612b 100644
--- a/sys/boot/forth/support.4th
+++ b/sys/boot/forth/support.4th
@@ -22,7 +22,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\	$Id$
+\ $FreeBSD$
 
 \ Loader.rc support functions:
 \
diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile
index 27b230656761..2ee6e63a5195 100644
--- a/sys/boot/i386/Makefile
+++ b/sys/boot/i386/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1999/05/24 22:44:32 rnordier Exp $
+# $FreeBSD$
 
 SUBDIR=		mbr boot0 kgzldr btx boot2 libi386 loader
 
diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile
index 7bbeb6573e1b..5ccddf250292 100644
--- a/sys/boot/i386/boot0/Makefile
+++ b/sys/boot/i386/boot0/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/10/19 19:13:52 rnordier Exp $
+# $FreeBSD$
 
 PROG=		boot0
 NOMAN=
diff --git a/sys/boot/i386/boot0/boot0.m4 b/sys/boot/i386/boot0/boot0.m4
index 72be7ed475a6..d318d2a07e87 100644
--- a/sys/boot/i386/boot0/boot0.m4
+++ b/sys/boot/i386/boot0/boot0.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot0.m4,v 1.3 1998/11/29 14:09:00 rnordier Exp $
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/boot0/boot0.s b/sys/boot/i386/boot0/boot0.s
index cc11f1929024..00c63914604a 100644
--- a/sys/boot/i386/boot0/boot0.s
+++ b/sys/boot/i386/boot0/boot0.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot0.s,v 1.10 1999/06/19 21:40:55 rnordier Exp $
+# $FreeBSD$
 
 # A 512-byte boot manager.
 
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
index 25ec504a0acc..578b452c6051 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.12 1999/04/05 07:24:51 rnordier Exp $
+# $FreeBSD$
 
 PROG=		boot2
 NOMAN=
diff --git a/sys/boot/i386/boot2/boot1.S b/sys/boot/i386/boot2/boot1.S
index d1707efff732..d78aaf29b4a6 100644
--- a/sys/boot/i386/boot2/boot1.S
+++ b/sys/boot/i386/boot2/boot1.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot1.s,v 1.8 1999/01/13 23:30:07 rnordier Exp $
+# $FreeBSD$
 
 		.set MEM_REL,0x700		# Relocation address
 		.set MEM_ARG,0x900		# Arguments
diff --git a/sys/boot/i386/boot2/boot1.m4 b/sys/boot/i386/boot2/boot1.m4
index 966d8c646c47..94dd13bd18b9 100644
--- a/sys/boot/i386/boot2/boot1.m4
+++ b/sys/boot/i386/boot2/boot1.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot1.m4,v 1.3 1998/11/08 15:36:35 rnordier Exp $
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/boot2/boot1.s b/sys/boot/i386/boot2/boot1.s
index d1707efff732..d78aaf29b4a6 100644
--- a/sys/boot/i386/boot2/boot1.s
+++ b/sys/boot/i386/boot2/boot1.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot1.s,v 1.8 1999/01/13 23:30:07 rnordier Exp $
+# $FreeBSD$
 
 		.set MEM_REL,0x700		# Relocation address
 		.set MEM_ARG,0x900		# Arguments
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index 67c5ec85289e..eefcf086c5f2 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/sys/boot/i386/boot2/boot2.c
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id: boot2.c,v 1.23 1999/04/05 07:36:30 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/boot2/lib.h b/sys/boot/i386/boot2/lib.h
index 493c4d8fda01..4bb93cfe9d3e 100644
--- a/sys/boot/i386/boot2/lib.h
+++ b/sys/boot/i386/boot2/lib.h
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id:$
+ * $FreeBSD$
  */
 
 void sio_init(void);
diff --git a/sys/boot/i386/boot2/sio.S b/sys/boot/i386/boot2/sio.S
index 92237b852b72..e29820586a3b 100644
--- a/sys/boot/i386/boot2/sio.S
+++ b/sys/boot/i386/boot2/sio.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: sio.s,v 1.2 1998/10/20 20:20:48 rnordier Exp $
+# $FreeBSD$
 
 		.set SIO_PRT,SIOPRT		# Base port
 		.set SIO_FMT,SIOFMT		# 8N1
diff --git a/sys/boot/i386/boot2/sio.s b/sys/boot/i386/boot2/sio.s
index 92237b852b72..e29820586a3b 100644
--- a/sys/boot/i386/boot2/sio.s
+++ b/sys/boot/i386/boot2/sio.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: sio.s,v 1.2 1998/10/20 20:20:48 rnordier Exp $
+# $FreeBSD$
 
 		.set SIO_PRT,SIOPRT		# Base port
 		.set SIO_FMT,SIOFMT		# 8N1
diff --git a/sys/boot/i386/btx/Makefile b/sys/boot/i386/btx/Makefile
index 75a170e53c7e..39f78ed639b9 100644
--- a/sys/boot/i386/btx/Makefile
+++ b/sys/boot/i386/btx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1998/09/17 23:52:03 msmith Exp $
+# $FreeBSD$
 
 SUBDIR=	btx btxldr lib
 
diff --git a/sys/boot/i386/btx/btx/Makefile b/sys/boot/i386/btx/btx/Makefile
index 6657f6e266cb..c29339d569eb 100644
--- a/sys/boot/i386/btx/btx/Makefile
+++ b/sys/boot/i386/btx/btx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1998/09/25 17:14:15 peter Exp $
+# $FreeBSD$
 
 M4?=	m4
 
diff --git a/sys/boot/i386/btx/btx/btx.S b/sys/boot/i386/btx/btx/btx.S
index 29b97950a709..b3f3150e84af 100644
--- a/sys/boot/i386/btx/btx/btx.S
+++ b/sys/boot/i386/btx/btx/btx.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.s,v 1.9 1999/01/22 13:07:17 rnordier Exp $
+# $FreeBSD$
 
 #
 # Memory layout.
diff --git a/sys/boot/i386/btx/btx/btx.m4 b/sys/boot/i386/btx/btx/btx.m4
index 598db02a2039..70649bbb6c91 100644
--- a/sys/boot/i386/btx/btx/btx.m4
+++ b/sys/boot/i386/btx/btx/btx.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id:$
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/btx/btx/btx.s b/sys/boot/i386/btx/btx/btx.s
index 29b97950a709..b3f3150e84af 100644
--- a/sys/boot/i386/btx/btx/btx.s
+++ b/sys/boot/i386/btx/btx/btx.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.s,v 1.9 1999/01/22 13:07:17 rnordier Exp $
+# $FreeBSD$
 
 #
 # Memory layout.
diff --git a/sys/boot/i386/btx/btxldr/Makefile b/sys/boot/i386/btx/btxldr/Makefile
index 32cb4adb0b8e..33e6275360b7 100644
--- a/sys/boot/i386/btx/btxldr/Makefile
+++ b/sys/boot/i386/btx/btxldr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1998/10/13 18:29:18 rnordier Exp $
+# $FreeBSD$
 
 ORG=0x100000
 AFLAGS+=	--assembler-with-cpp
diff --git a/sys/boot/i386/btx/btxldr/btxldr.S b/sys/boot/i386/btx/btxldr/btxldr.S
index 5d3b301e0f5d..92748f1abafa 100644
--- a/sys/boot/i386/btx/btxldr/btxldr.S
+++ b/sys/boot/i386/btx/btxldr/btxldr.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxldr.s,v 1.4 1998/10/30 00:11:35 msmith Exp $
+# $FreeBSD$
 
 #
 # Prototype BTX loader program, written in a couple of hours.  The
diff --git a/sys/boot/i386/btx/btxldr/btxldr.s b/sys/boot/i386/btx/btxldr/btxldr.s
index 5d3b301e0f5d..92748f1abafa 100644
--- a/sys/boot/i386/btx/btxldr/btxldr.s
+++ b/sys/boot/i386/btx/btxldr/btxldr.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxldr.s,v 1.4 1998/10/30 00:11:35 msmith Exp $
+# $FreeBSD$
 
 #
 # Prototype BTX loader program, written in a couple of hours.  The
diff --git a/sys/boot/i386/btx/lib/Makefile b/sys/boot/i386/btx/lib/Makefile
index e6fb75818894..40c65657ea7a 100644
--- a/sys/boot/i386/btx/lib/Makefile
+++ b/sys/boot/i386/btx/lib/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1998/09/14 10:37:00 rnordier Exp $
+# $FreeBSD$
 
 OBJS=		btxcsu.o btxsys.o btxv86.o
 AFLAGS+=	-elf
diff --git a/sys/boot/i386/btx/lib/btxcsu.s b/sys/boot/i386/btx/lib/btxcsu.s
index 9b3e4c24e19c..f08ae754f826 100644
--- a/sys/boot/i386/btx/lib/btxcsu.s
+++ b/sys/boot/i386/btx/lib/btxcsu.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxcsu.s,v 1.1 1998/09/14 10:37:00 rnordier Exp $
+# $FreeBSD$
 
 #
 # BTX C startup code (ELF).
diff --git a/sys/boot/i386/btx/lib/btxsys.s b/sys/boot/i386/btx/lib/btxsys.s
index 16e3228a50ec..9c77b4295e7c 100644
--- a/sys/boot/i386/btx/lib/btxsys.s
+++ b/sys/boot/i386/btx/lib/btxsys.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id:$
+# $FreeBSD$
 
 #
 # BTX system calls.
diff --git a/sys/boot/i386/btx/lib/btxv86.h b/sys/boot/i386/btx/lib/btxv86.h
index 1e7717f069c7..1152f8b1d963 100644
--- a/sys/boot/i386/btx/lib/btxv86.h
+++ b/sys/boot/i386/btx/lib/btxv86.h
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id: btxv86.h,v 1.3 1998/10/02 16:22:54 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _BTXV86_H_
diff --git a/sys/boot/i386/btx/lib/btxv86.s b/sys/boot/i386/btx/lib/btxv86.s
index 46709a39540c..0d7d1116322d 100644
--- a/sys/boot/i386/btx/lib/btxv86.s
+++ b/sys/boot/i386/btx/lib/btxv86.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxv86.s,v 1.1 1998/09/14 10:37:00 rnordier Exp $
+# $FreeBSD$
 
 #
 # BTX V86 interface.
diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
index 25ec504a0acc..578b452c6051 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/sys/boot/i386/gptboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.12 1999/04/05 07:24:51 rnordier Exp $
+# $FreeBSD$
 
 PROG=		boot2
 NOMAN=
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c
index 67c5ec85289e..eefcf086c5f2 100644
--- a/sys/boot/i386/gptboot/gptboot.c
+++ b/sys/boot/i386/gptboot/gptboot.c
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id: boot2.c,v 1.23 1999/04/05 07:36:30 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/kgzldr/Makefile b/sys/boot/i386/kgzldr/Makefile
index 2d1e840f5a49..bb97590301d5 100644
--- a/sys/boot/i386/kgzldr/Makefile
+++ b/sys/boot/i386/kgzldr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1999/07/19 18:07:44 rnordier Exp $
+# $FreeBSD$
 
 PROG=	kgzldr.o
 SRCS=	start.s boot.c inflate.c lib.c crt.s sio.s
diff --git a/sys/boot/i386/kgzldr/boot.c b/sys/boot/i386/kgzldr/boot.c
index 0313be7b34c1..cbcd498fadd2 100644
--- a/sys/boot/i386/kgzldr/boot.c
+++ b/sys/boot/i386/kgzldr/boot.c
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id:$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/i386/kgzldr/crt.s b/sys/boot/i386/kgzldr/crt.s
index 4c0474755d47..cfb479fd2d84 100644
--- a/sys/boot/i386/kgzldr/crt.s
+++ b/sys/boot/i386/kgzldr/crt.s
@@ -24,7 +24,7 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #	From: btx.s 1.10 1999/02/25 16:27:41 rnordier
-#	$Id:$
+# $FreeBSD$
 #
 
 # Screen defaults and assumptions.
diff --git a/sys/boot/i386/kgzldr/kgzldr.h b/sys/boot/i386/kgzldr/kgzldr.h
index 7f18c7e0b5d3..5cd5b44b6005 100644
--- a/sys/boot/i386/kgzldr/kgzldr.h
+++ b/sys/boot/i386/kgzldr/kgzldr.h
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id:$
+ * $FreeBSD$
  */
 
 #define KGZ_CRT	 0x1		/* Video console */
diff --git a/sys/boot/i386/kgzldr/lib.c b/sys/boot/i386/kgzldr/lib.c
index f763f3119274..ebec384a0b27 100644
--- a/sys/boot/i386/kgzldr/lib.c
+++ b/sys/boot/i386/kgzldr/lib.c
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id:$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/i386/kgzldr/sio.s b/sys/boot/i386/kgzldr/sio.s
index 78fd6ca31373..bb354e297dd0 100644
--- a/sys/boot/i386/kgzldr/sio.s
+++ b/sys/boot/i386/kgzldr/sio.s
@@ -24,7 +24,7 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #	From: sio.s 1.3 1999/01/10 14:48:03 rnordier
-#	$Id:$
+# $FreeBSD$
 #
 
 		.set SIO_PRT,SIOPRT		# Base port
diff --git a/sys/boot/i386/kgzldr/start.s b/sys/boot/i386/kgzldr/start.s
index d565cecfbf51..550fa526d946 100644
--- a/sys/boot/i386/kgzldr/start.s
+++ b/sys/boot/i386/kgzldr/start.s
@@ -23,7 +23,7 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id:$
+# $FreeBSD$
 #
 
 		.set entry,0x10			# kgz.entry
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index 2cfd2e345956..e28ac4acc04a 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.12 1998/12/22 11:51:25 abial Exp $
+# $FreeBSD$
 #
 LIB=			i386
 NOPIC=
diff --git a/sys/boot/i386/libi386/aout_freebsd.c b/sys/boot/i386/libi386/aout_freebsd.c
index 96d74d81d00f..b81e55155389 100644
--- a/sys/boot/i386/libi386/aout_freebsd.c
+++ b/sys/boot/i386/libi386/aout_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aout_freebsd.c,v 1.10 1998/10/09 07:11:19 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/biosdisk.c b/sys/boot/i386/libi386/biosdisk.c
index 00c38eeb4a6b..2b5ba095b086 100644
--- a/sys/boot/i386/libi386/biosdisk.c
+++ b/sys/boot/i386/libi386/biosdisk.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: biosdisk.c,v 1.23 1999/01/25 23:07:02 rnordier Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/libi386/biospci.c b/sys/boot/i386/libi386/biospci.c
index 92f4fd28c297..483384c2c157 100644
--- a/sys/boot/i386/libi386/biospci.c
+++ b/sys/boot/i386/libi386/biospci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/libi386/biospnp.c b/sys/boot/i386/libi386/biospnp.c
index a6064ba27462..616a22cdc458 100644
--- a/sys/boot/i386/libi386/biospnp.c
+++ b/sys/boot/i386/libi386/biospnp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: biospnp.c,v 1.2 1998/10/23 22:29:08 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c
index a07012e061b9..8363b9fd25a1 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/sys/boot/i386/libi386/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.20 1999/06/21 18:27:01 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/bootinfo32.c b/sys/boot/i386/libi386/bootinfo32.c
index a07012e061b9..8363b9fd25a1 100644
--- a/sys/boot/i386/libi386/bootinfo32.c
+++ b/sys/boot/i386/libi386/bootinfo32.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.20 1999/06/21 18:27:01 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c
index a07012e061b9..8363b9fd25a1 100644
--- a/sys/boot/i386/libi386/bootinfo64.c
+++ b/sys/boot/i386/libi386/bootinfo64.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.20 1999/06/21 18:27:01 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/comconsole.c b/sys/boot/i386/libi386/comconsole.c
index 7b35d1dce8c9..ee6fbc8f53a7 100644
--- a/sys/boot/i386/libi386/comconsole.c
+++ b/sys/boot/i386/libi386/comconsole.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: comconsole.c,v 1.5 1998/11/22 07:59:16 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/devicename.c b/sys/boot/i386/libi386/devicename.c
index 418163edeaee..dfa685eb1b87 100644
--- a/sys/boot/i386/libi386/devicename.c
+++ b/sys/boot/i386/libi386/devicename.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devicename.c,v 1.2 1998/09/26 01:30:20 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/elf32_freebsd.c b/sys/boot/i386/libi386/elf32_freebsd.c
index 130b0cab465b..a3d3ef9412d6 100644
--- a/sys/boot/i386/libi386/elf32_freebsd.c
+++ b/sys/boot/i386/libi386/elf32_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: elf_freebsd.c,v 1.5 1998/10/04 20:58:46 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/elf64_freebsd.c b/sys/boot/i386/libi386/elf64_freebsd.c
index 130b0cab465b..a3d3ef9412d6 100644
--- a/sys/boot/i386/libi386/elf64_freebsd.c
+++ b/sys/boot/i386/libi386/elf64_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: elf_freebsd.c,v 1.5 1998/10/04 20:58:46 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/elf_freebsd.c b/sys/boot/i386/libi386/elf_freebsd.c
index 130b0cab465b..a3d3ef9412d6 100644
--- a/sys/boot/i386/libi386/elf_freebsd.c
+++ b/sys/boot/i386/libi386/elf_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: elf_freebsd.c,v 1.5 1998/10/04 20:58:46 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/gatea20.c b/sys/boot/i386/libi386/gatea20.c
index bb109dbe7cf2..b85265489e7d 100644
--- a/sys/boot/i386/libi386/gatea20.c
+++ b/sys/boot/i386/libi386/gatea20.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: gatea20.c,v 1.2 1997/10/29 00:32:49 fvdl Exp $
  */
 
diff --git a/sys/boot/i386/libi386/i386_module.c b/sys/boot/i386/libi386/i386_module.c
index 3d75c760ed0a..7040e9fcd300 100644
--- a/sys/boot/i386/libi386/i386_module.c
+++ b/sys/boot/i386/libi386/i386_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: i386_module.c,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/libi386/libi386.h b/sys/boot/i386/libi386/libi386.h
index a7be85148303..1868faa9c2b6 100644
--- a/sys/boot/i386/libi386/libi386.h
+++ b/sys/boot/i386/libi386/libi386.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: libi386.h,v 1.8 1998/10/02 20:53:17 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/i386/libi386/pread.c b/sys/boot/i386/libi386/pread.c
index 36ffb014cdbf..fb73f042216f 100644
--- a/sys/boot/i386/libi386/pread.c
+++ b/sys/boot/i386/libi386/pread.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: pread.c,v 1.2 1997/03/22 01:48:38 thorpej Exp $
  */
 
diff --git a/sys/boot/i386/libi386/vidconsole.c b/sys/boot/i386/libi386/vidconsole.c
index 05e77110c2ef..a79bb05ce093 100644
--- a/sys/boot/i386/libi386/vidconsole.c
+++ b/sys/boot/i386/libi386/vidconsole.c
@@ -26,7 +26,7 @@
  *
  * 	From Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp
  *
- *	$Id: vidconsole.c,v 1.10 1998/12/31 13:44:04 abial Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 966d4369afe7..e74d16f974f2 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.34 1999/04/24 17:49:47 dcs Exp $
+# $FreeBSD$
 
 BASE=		loader
 PROG=		${BASE}
diff --git a/sys/boot/i386/loader/conf.c b/sys/boot/i386/loader/conf.c
index 9b4d554bc1a0..6ffa49f6a43b 100644
--- a/sys/boot/i386/loader/conf.c
+++ b/sys/boot/i386/loader/conf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: conf.c,v 1.9 1998/10/22 20:23:58 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/loader/loader.8 b/sys/boot/i386/loader/loader.8
index 27268bb59f7d..ef847c10e68f 100644
--- a/sys/boot/i386/loader/loader.8
+++ b/sys/boot/i386/loader/loader.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: loader.8,v 1.7 1999/06/23 09:06:18 ru Exp $
+.\" $FreeBSD$
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/sys/boot/i386/loader/main.c b/sys/boot/i386/loader/main.c
index dfd1bfffbb98..327773820633 100644
--- a/sys/boot/i386/loader/main.c
+++ b/sys/boot/i386/loader/main.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.13 1998/10/22 20:23:58 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/loader/version b/sys/boot/i386/loader/version
index ad310451c498..01f8500452c3 100644
--- a/sys/boot/i386/loader/version
+++ b/sys/boot/i386/loader/version
@@ -1,4 +1,4 @@
-$Id: version,v 1.3 1999/02/08 04:14:31 dcs Exp $
+$FreeBSD$
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/i386/mbr/Makefile b/sys/boot/i386/mbr/Makefile
index ef206e5374d4..1090ab02bb11 100644
--- a/sys/boot/i386/mbr/Makefile
+++ b/sys/boot/i386/mbr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: $
+# $FreeBSD$
 
 PROG=		mbr
 NOMAN=
diff --git a/sys/boot/i386/mbr/mbr.m4 b/sys/boot/i386/mbr/mbr.m4
index 768e26281771..c8783b92059e 100644
--- a/sys/boot/i386/mbr/mbr.m4
+++ b/sys/boot/i386/mbr/mbr.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: $
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/mbr/mbr.s b/sys/boot/i386/mbr/mbr.s
index f849fb2a0ab1..6c030de1c79b 100644
--- a/sys/boot/i386/mbr/mbr.s
+++ b/sys/boot/i386/mbr/mbr.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: mbr.s,v 1.1.1.1 1999/05/24 22:36:24 rnordier Exp $
+# $FreeBSD$
 
 # Master boot record
 
diff --git a/sys/boot/ofw/libofw/devicename.c b/sys/boot/ofw/libofw/devicename.c
index dcd07ede1fcb..d8ee1133299e 100644
--- a/sys/boot/ofw/libofw/devicename.c
+++ b/sys/boot/ofw/libofw/devicename.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devicename.c,v 1.2 1998/08/22 10:31:01 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/ofw/libofw/ofw_console.c b/sys/boot/ofw/libofw/ofw_console.c
index 380326ccd0ec..e32d43d3b66f 100644
--- a/sys/boot/ofw/libofw/ofw_console.c
+++ b/sys/boot/ofw/libofw/ofw_console.c
@@ -1,4 +1,4 @@
-/* $Id: prom.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */
 
 /*  
diff --git a/sys/boot/ofw/libofw/ofw_copy.c b/sys/boot/ofw/libofw/ofw_copy.c
index 196915c1eb23..95b6cba677e4 100644
--- a/sys/boot/ofw/libofw/ofw_copy.c
+++ b/sys/boot/ofw/libofw/ofw_copy.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_copy.c,v 1.2 1998/09/03 02:10:07 msmith Exp $
+ * $FreeBSD$
  */
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/ofw/libofw/ofw_module.c b/sys/boot/ofw/libofw/ofw_module.c
index afa065f5bd04..4ac21d42242d 100644
--- a/sys/boot/ofw/libofw/ofw_module.c
+++ b/sys/boot/ofw/libofw/ofw_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_module.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/Makefile b/sys/boot/pc98/Makefile
index 72ce2cebd711..5d013df2dce7 100644
--- a/sys/boot/pc98/Makefile
+++ b/sys/boot/pc98/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/10/14 20:40:56 rnordier Exp $
+# $FreeBSD$
 
 SUBDIR=		btx boot2 libpc98 loader
 
diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile
index c7434725ccc7..800306dde4db 100644
--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/02/03 08:39:08 kato Exp $
+# $FreeBSD$
 #
 
 PROG=	boot
diff --git a/sys/boot/pc98/boot2/asm.S b/sys/boot/pc98/boot2/asm.S
index 01d47f20f01b..f14c7f55104c 100644
--- a/sys/boot/pc98/boot2/asm.S
+++ b/sys/boot/pc98/boot2/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- *	$Id: asm.S,v 1.4 1997/09/01 10:38:24 kato Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/pc98/boot2/asm.h b/sys/boot/pc98/boot2/asm.h
index 2e0fcac85abe..6f4bcc39e52d 100644
--- a/sys/boot/pc98/boot2/asm.h
+++ b/sys/boot/pc98/boot2/asm.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- *	$Id: asm.h,v 1.3 1997/02/22 09:43:04 peter Exp $
+ * $FreeBSD$
  */
 
 #define S_ARG0	 4(%esp)
diff --git a/sys/boot/pc98/boot2/bios.S b/sys/boot/pc98/boot2/bios.S
index 4c667444ac37..88d9506c46b4 100644
--- a/sys/boot/pc98/boot2/bios.S
+++ b/sys/boot/pc98/boot2/bios.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: bios.S,v 1.9 1998/05/02 02:06:07 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/boot.c b/sys/boot/pc98/boot2/boot.c
index df9d7fcb18e1..df8e755062a3 100644
--- a/sys/boot/pc98/boot2/boot.c
+++ b/sys/boot/pc98/boot2/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.2 1999/03/04 10:45:06 kato Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/pc98/boot2/boot.h b/sys/boot/pc98/boot2/boot.h
index 2104071add6c..4e32192eebc6 100644
--- a/sys/boot/pc98/boot2/boot.h
+++ b/sys/boot/pc98/boot2/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id: boot.h,v 1.14 1998/10/11 15:08:50 kato Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/pc98/boot2/disk.c b/sys/boot/pc98/boot2/disk.c
index 7aa768c57208..ad9d3ff74d88 100644
--- a/sys/boot/pc98/boot2/disk.c
+++ b/sys/boot/pc98/boot2/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- *	$Id: disk.c,v 1.9 1997/05/28 09:22:59 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/io.c b/sys/boot/pc98/boot2/io.c
index 6047364469df..dc5fb00f94ce 100644
--- a/sys/boot/pc98/boot2/io.c
+++ b/sys/boot/pc98/boot2/io.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- *	$Id: io.c,v 1.13 1997/12/05 11:50:42 kato Exp $
+ * $FreeBSD$
  */
 
 #include "boot.h"
diff --git a/sys/boot/pc98/boot2/serial.S b/sys/boot/pc98/boot2/serial.S
index fed109ebdc5b..166881517b1b 100644
--- a/sys/boot/pc98/boot2/serial.S
+++ b/sys/boot/pc98/boot2/serial.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: serial.S,v 1.1 1999/02/03 08:39:08 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/start.S b/sys/boot/pc98/boot2/start.S
index 24459cdf6d04..a7e69355d621 100644
--- a/sys/boot/pc98/boot2/start.S
+++ b/sys/boot/pc98/boot2/start.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:29  rpd
- *	$Id: start.S,v 1.6 1998/07/30 02:27:41 alex Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/sys.c b/sys/boot/pc98/boot2/sys.c
index 591d43214d9c..1b138b36d479 100644
--- a/sys/boot/pc98/boot2/sys.c
+++ b/sys/boot/pc98/boot2/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- *	$Id: sys.c,v 1.15 1998/05/02 02:06:08 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/table.c b/sys/boot/pc98/boot2/table.c
index 059ace23d035..b6e113a014a8 100644
--- a/sys/boot/pc98/boot2/table.c
+++ b/sys/boot/pc98/boot2/table.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- *	$Id: table.c,v 1.1 1999/02/03 08:39:08 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/btx/Makefile b/sys/boot/pc98/btx/Makefile
index b4c19e54926e..39f78ed639b9 100644
--- a/sys/boot/pc98/btx/Makefile
+++ b/sys/boot/pc98/btx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/02/03 08:39:08 kato Exp $
+# $FreeBSD$
 
 SUBDIR=	btx btxldr lib
 
diff --git a/sys/boot/pc98/btx/btx/Makefile b/sys/boot/pc98/btx/btx/Makefile
index b74deeaf18f1..a856eda53040 100644
--- a/sys/boot/pc98/btx/btx/Makefile
+++ b/sys/boot/pc98/btx/btx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1998/10/13 18:29:18 rnordier Exp $
+# $FreeBSD$
 
 M4?=	m4
 
diff --git a/sys/boot/pc98/btx/btx/btx.S b/sys/boot/pc98/btx/btx/btx.S
index d4e8d894ec06..eb191316c094 100644
--- a/sys/boot/pc98/btx/btx/btx.S
+++ b/sys/boot/pc98/btx/btx/btx.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.s,v 1.1 1999/02/03 08:39:08 kato Exp $
+# $FreeBSD$
 
 #
 # Memory layout.
diff --git a/sys/boot/pc98/btx/btx/btx.m4 b/sys/boot/pc98/btx/btx/btx.m4
index 6526c6b29c6e..70649bbb6c91 100644
--- a/sys/boot/pc98/btx/btx/btx.m4
+++ b/sys/boot/pc98/btx/btx/btx.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.m4,v 1.1.1.1 1998/09/12 04:29:23 rnordier Exp $
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/pc98/btx/btx/btx.s b/sys/boot/pc98/btx/btx/btx.s
index d4e8d894ec06..eb191316c094 100644
--- a/sys/boot/pc98/btx/btx/btx.s
+++ b/sys/boot/pc98/btx/btx/btx.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.s,v 1.1 1999/02/03 08:39:08 kato Exp $
+# $FreeBSD$
 
 #
 # Memory layout.
diff --git a/sys/boot/pc98/btx/btxldr/Makefile b/sys/boot/pc98/btx/btxldr/Makefile
index 5bd155c83317..b6f40162d23a 100644
--- a/sys/boot/pc98/btx/btxldr/Makefile
+++ b/sys/boot/pc98/btx/btxldr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/10/30 00:11:35 msmith Exp $
+# $FreeBSD$
 
 ORG=0x100000
 #AFLAGS+=	-x assembler-with-cpp
diff --git a/sys/boot/pc98/btx/btxldr/btxldr.S b/sys/boot/pc98/btx/btxldr/btxldr.S
index 6217eb234e7d..cc8c6a1c06d3 100644
--- a/sys/boot/pc98/btx/btxldr/btxldr.S
+++ b/sys/boot/pc98/btx/btxldr/btxldr.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxldr.s,v 1.5 1999/01/22 13:07:17 rnordier Exp $
+# $FreeBSD$
 
 #
 # Prototype BTX loader program, written in a couple of hours.  The
diff --git a/sys/boot/pc98/btx/btxldr/btxldr.s b/sys/boot/pc98/btx/btxldr/btxldr.s
index 6217eb234e7d..cc8c6a1c06d3 100644
--- a/sys/boot/pc98/btx/btxldr/btxldr.s
+++ b/sys/boot/pc98/btx/btxldr/btxldr.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxldr.s,v 1.5 1999/01/22 13:07:17 rnordier Exp $
+# $FreeBSD$
 
 #
 # Prototype BTX loader program, written in a couple of hours.  The
diff --git a/sys/boot/pc98/btx/lib/Makefile b/sys/boot/pc98/btx/lib/Makefile
index e47e653872ec..40c65657ea7a 100644
--- a/sys/boot/pc98/btx/lib/Makefile
+++ b/sys/boot/pc98/btx/lib/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1998/10/11 11:27:48 rnordier Exp $
+# $FreeBSD$
 
 OBJS=		btxcsu.o btxsys.o btxv86.o
 AFLAGS+=	-elf
diff --git a/sys/boot/pc98/btx/lib/btxcsu.s b/sys/boot/pc98/btx/lib/btxcsu.s
index 28b878be2416..f08ae754f826 100644
--- a/sys/boot/pc98/btx/lib/btxcsu.s
+++ b/sys/boot/pc98/btx/lib/btxcsu.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxcsu.s,v 1.2 1998/10/04 21:15:45 rnordier Exp $
+# $FreeBSD$
 
 #
 # BTX C startup code (ELF).
diff --git a/sys/boot/pc98/btx/lib/btxsys.s b/sys/boot/pc98/btx/lib/btxsys.s
index 6273bfa45e7d..9c77b4295e7c 100644
--- a/sys/boot/pc98/btx/lib/btxsys.s
+++ b/sys/boot/pc98/btx/lib/btxsys.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxsys.s,v 1.1 1998/09/14 10:37:00 rnordier Exp $
+# $FreeBSD$
 
 #
 # BTX system calls.
diff --git a/sys/boot/pc98/btx/lib/btxv86.h b/sys/boot/pc98/btx/lib/btxv86.h
index 05708f2a3f21..1152f8b1d963 100644
--- a/sys/boot/pc98/btx/lib/btxv86.h
+++ b/sys/boot/pc98/btx/lib/btxv86.h
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id: btxv86.h,v 1.4 1998/10/02 20:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _BTXV86_H_
diff --git a/sys/boot/pc98/btx/lib/btxv86.s b/sys/boot/pc98/btx/lib/btxv86.s
index 14b77674f3a5..0d7d1116322d 100644
--- a/sys/boot/pc98/btx/lib/btxv86.s
+++ b/sys/boot/pc98/btx/lib/btxv86.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxv86.s,v 1.2 1998/10/22 20:22:07 msmith Exp $
+# $FreeBSD$
 
 #
 # BTX V86 interface.
diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile
index fad01497c9f3..cde163e3e382 100644
--- a/sys/boot/pc98/libpc98/Makefile
+++ b/sys/boot/pc98/libpc98/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 1999/01/10 14:48:04 rnordier Exp $
+# $FreeBSD$
 #
 LIB=			pc98
 NOPIC=
diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/sys/boot/pc98/libpc98/biosdisk.c
index 169452f8104f..a82ef4a2ec3f 100644
--- a/sys/boot/pc98/libpc98/biosdisk.c
+++ b/sys/boot/pc98/libpc98/biosdisk.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: biosdisk.c,v 1.4 1999/08/05 03:12:20 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/libpc98/bootinfo.c b/sys/boot/pc98/libpc98/bootinfo.c
index 92bb219b0bad..6b780f1767ec 100644
--- a/sys/boot/pc98/libpc98/bootinfo.c
+++ b/sys/boot/pc98/libpc98/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.4 1999/06/06 12:46:40 kato Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/pc98/libpc98/comconsole.c b/sys/boot/pc98/libpc98/comconsole.c
index 82e4642e7cc5..958b4e01942a 100644
--- a/sys/boot/pc98/libpc98/comconsole.c
+++ b/sys/boot/pc98/libpc98/comconsole.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: comconsole.c,v 1.6 1999/01/10 14:48:05 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/pc98/libpc98/gatea20.c b/sys/boot/pc98/libpc98/gatea20.c
index 45e441012b55..cad48c1badc3 100644
--- a/sys/boot/pc98/libpc98/gatea20.c
+++ b/sys/boot/pc98/libpc98/gatea20.c
@@ -1,5 +1,5 @@
 /*
- * $Id: gatea20.c,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+ * $FreeBSD$
  * From: $NetBSD: gatea20.c,v 1.2 1997/10/29 00:32:49 fvdl Exp $
  */
 
diff --git a/sys/boot/pc98/libpc98/vidconsole.c b/sys/boot/pc98/libpc98/vidconsole.c
index 7804b6666750..db62063a4328 100644
--- a/sys/boot/pc98/libpc98/vidconsole.c
+++ b/sys/boot/pc98/libpc98/vidconsole.c
@@ -26,7 +26,7 @@
  *
  * 	From Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp
  *
- *	$Id: vidconsole.c,v 1.1 1999/02/03 08:39:09 kato Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index e51a952db86c..6d0af3895cdc 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 1999/04/25 03:56:44 kato Exp $
+# $FreeBSD$
 
 BASE=		loader
 PROG=		${BASE}
diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c
index 4b7aa2f010fb..0fabadfe5b8e 100644
--- a/sys/boot/pc98/loader/main.c
+++ b/sys/boot/pc98/loader/main.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.2 1999/03/04 10:48:14 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/cam/cam.c b/sys/cam/cam.c
index 4e11061752cd..4c28e42954fc 100644
--- a/sys/cam/cam.c
+++ b/sys/cam/cam.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam.c,v 1.1 1998/09/15 06:33:23 gibbs Exp $
+ * $FreeBSD$
  */
 #include <sys/param.h>
 
diff --git a/sys/cam/cam.h b/sys/cam/cam.h
index c182fd628287..7f656032eddc 100644
--- a/sys/cam/cam.h
+++ b/sys/cam/cam.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam.h,v 1.1 1998/09/15 06:33:23 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_H
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index a44334568fb8..c58a0a1b277b 100644
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_ccb.h,v 1.8 1999/08/16 22:14:47 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_CCB_H
diff --git a/sys/cam/cam_conf.h b/sys/cam/cam_conf.h
index 080575c66c60..fc777c17d392 100644
--- a/sys/cam/cam_conf.h
+++ b/sys/cam/cam_conf.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_CONF_H
diff --git a/sys/cam/cam_debug.h b/sys/cam/cam_debug.h
index 6fa6d5282910..aa1a50dec9b6 100644
--- a/sys/cam/cam_debug.h
+++ b/sys/cam/cam_debug.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_debug.h,v 1.3 1998/12/05 23:55:48 mjacob Exp $
+ * $FreeBSD$
  */
 #ifndef	_CAM_CAM_DEBUG_H
 #define _CAM_CAM_DEBUG_H 1
diff --git a/sys/cam/cam_extend.c b/sys/cam/cam_extend.c
index 8570a35dd6c3..0802febac443 100644
--- a/sys/cam/cam_extend.c
+++ b/sys/cam/cam_extend.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: cam_extend.c,v 1.1 1998/09/15 06:33:23 gibbs Exp $
+ * $FreeBSD$
  */
 /*
  * XXX XXX XXX XXX  We should get DEVFS working so that we
diff --git a/sys/cam/cam_extend.h b/sys/cam/cam_extend.h
index 8aec51d391fe..21ade23b40ac 100644
--- a/sys/cam/cam_extend.h
+++ b/sys/cam/cam_extend.h
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_EXTEND_H
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index a73972cf05f6..6ed5ddf76ef0 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_periph.c,v 1.18 1999/06/26 02:47:06 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h
index 2efee41c4461..acb7bd643391 100644
--- a/sys/cam/cam_periph.h
+++ b/sys/cam/cam_periph.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_periph.h,v 1.3 1998/10/22 22:16:48 ken Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_PERIPH_H
diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c
index 3ec7ad2006f9..988a1a2f42e3 100644
--- a/sys/cam/cam_queue.c
+++ b/sys/cam/cam_queue.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_queue.c,v 1.3 1999/04/19 21:26:08 gibbs Exp $
+ * $FreeBSD$
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_queue.h b/sys/cam/cam_queue.h
index 36685259755a..d3459315a7c9 100644
--- a/sys/cam/cam_queue.h
+++ b/sys/cam/cam_queue.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_queue.h,v 1.3 1999/04/07 22:57:48 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_QUEUE_H
diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c
index feaf9ed69491..c8843e24c825 100644
--- a/sys/cam/cam_sim.c
+++ b/sys/cam/cam_sim.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_sim.c,v 1.1 1998/09/15 06:33:23 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h
index 53e7937b8570..532504911633 100644
--- a/sys/cam/cam_sim.h
+++ b/sys/cam/cam_sim.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_sim.h,v 1.1 1998/09/15 06:33:23 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_SIM_H
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 0f92c6e3fac6..d203aa1e94ca 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_xpt.c,v 1.67 1999/08/16 22:22:41 gibbs Exp $
+ * $FreeBSD$
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h
index 0ed413d9dfa6..6d41f6c52f78 100644
--- a/sys/cam/cam_xpt.h
+++ b/sys/cam/cam_xpt.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_XPT_H
diff --git a/sys/cam/cam_xpt_periph.h b/sys/cam/cam_xpt_periph.h
index ee64e213ae94..111402f04504 100644
--- a/sys/cam/cam_xpt_periph.h
+++ b/sys/cam/cam_xpt_periph.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_XPT_PERIPH_H
diff --git a/sys/cam/cam_xpt_sim.h b/sys/cam/cam_xpt_sim.h
index 267deeb7e4f0..698e638dddb6 100644
--- a/sys/cam/cam_xpt_sim.h
+++ b/sys/cam/cam_xpt_sim.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_xpt_sim.h,v 1.3 1999/03/05 23:18:56 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_XPT_SIM_H
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
index 1203699e78d5..a1ea40251e2a 100644
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: scsi_all.c,v 1.8 1998/12/06 00:05:47 mjacob Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h
index 9ced6c3c5fa6..d6d802bfceac 100644
--- a/sys/cam/scsi/scsi_all.h
+++ b/sys/cam/scsi/scsi_all.h
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsi_all.h,v 1.7 1999/05/09 01:25:22 ken Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index f57ef1a8e950..a6d4ac819af7 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_cd.c,v 1.23 1999/05/31 11:23:58 phk Exp $
+ * $FreeBSD$
  */
 /*
  * Portions of this driver taken from the original FreeBSD cd driver.
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index 537090037e8a..fd681a65f24c 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_ch.c,v 1.14 1999/05/31 11:24:00 phk Exp $
+ * $FreeBSD$
  */
 /*
  * Derived from the NetBSD SCSI changer driver.
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index ac0af545f637..bcd752dc8a32 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_da.c,v 1.34 1999/08/21 06:23:50 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_hw_wdog.h"
diff --git a/sys/cam/scsi/scsi_da.h b/sys/cam/scsi/scsi_da.h
index d9b95e319e13..88a0fcd81bb9 100644
--- a/sys/cam/scsi/scsi_da.h
+++ b/sys/cam/scsi/scsi_da.h
@@ -46,7 +46,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsi_da.h,v 1.1 1998/09/15 06:36:34 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SCSI_SCSI_DA_H
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index b900c3b02f55..958e1664de18 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_pass.c,v 1.12 1999/05/31 11:24:05 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/scsi/scsi_pass.h b/sys/cam/scsi/scsi_pass.h
index 12ad2e207c8f..39e92c35227e 100644
--- a/sys/cam/scsi/scsi_pass.h
+++ b/sys/cam/scsi/scsi_pass.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: scsi_pass.h,v 1.1 1998/09/15 06:36:34 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SCSI_PASS_H
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index 92ed7b9b1053..72350cb15c3e 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_pt.c,v 1.11 1999/08/17 20:25:47 billf Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/scsi/scsi_pt.h b/sys/cam/scsi/scsi_pt.h
index d965ee22b6e5..b5eea824fcf6 100644
--- a/sys/cam/scsi/scsi_pt.h
+++ b/sys/cam/scsi/scsi_pt.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SCSI_SCSI_PT_H
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index d393884ddada..d1d152755f52 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -1,5 +1,5 @@
 /*
- * $Id: scsi_sa.c,v 1.29 1999/06/24 15:21:10 mjacob Exp $
+ * $FreeBSD$
  *
  * Implementation of SCSI Sequential Access Peripheral driver for CAM.
  *
diff --git a/sys/cam/scsi/scsi_sa.h b/sys/cam/scsi/scsi_sa.h
index ab2d1bc15a26..be52eca28567 100644
--- a/sys/cam/scsi/scsi_sa.h
+++ b/sys/cam/scsi/scsi_sa.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_sa.h,v 1.4 1999/02/05 07:19:23 mjacob Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SCSI_SCSI_SA_H
diff --git a/sys/cam/scsi/scsi_targ_bh.c b/sys/cam/scsi/scsi_targ_bh.c
index 3775b4d62b41..c5a5ec5c22e0 100644
--- a/sys/cam/scsi/scsi_targ_bh.c
+++ b/sys/cam/scsi/scsi_targ_bh.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_targ_bh.c,v 1.1 1999/01/14 06:00:29 gibbs Exp $
+ * $FreeBSD$
  */
 #include <stddef.h>	/* For offsetof */
 
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index 5e7afc5610ba..70a50ea52afc 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_target.c,v 1.14 1999/05/31 11:24:11 phk Exp $
+ * $FreeBSD$
  */
 #include <stddef.h>	/* For offsetof */
 
diff --git a/sys/cam/scsi/scsi_targetio.h b/sys/cam/scsi/scsi_targetio.h
index 9c5c0595d184..d20c9b08fbc2 100644
--- a/sys/cam/scsi/scsi_targetio.h
+++ b/sys/cam/scsi/scsi_targetio.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_targetio.h,v 1.2 1999/03/05 23:25:11 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAM_SCSI_SCSI_TARGETIO_H_
diff --git a/sys/coda/cnode.h b/sys/coda/cnode.h
index ee4573d51020..75d29acc22ed 100644
--- a/sys/coda/cnode.h
+++ b/sys/coda/cnode.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: cnode.h,v 1.5 1998/11/11 20:32:20 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda.h b/sys/coda/coda.h
index db2ec539b003..5a25bc67f152 100644
--- a/sys/coda/coda.h
+++ b/sys/coda/coda.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda.h,v 1.6 1998/11/11 20:32:20 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c
index 22a5963acd29..ea16d154b4f7 100644
--- a/sys/coda/coda_fbsd.c
+++ b/sys/coda/coda_fbsd.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_fbsd.c,v 1.15 1999/05/31 11:24:16 phk Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_io.h b/sys/coda/coda_io.h
index e896ff0813b7..6620f4f0c32e 100644
--- a/sys/coda/coda_io.h
+++ b/sys/coda/coda_io.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_io.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_io.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_kernel.h b/sys/coda/coda_kernel.h
index 33b372f49b13..cc0fd957f81c 100644
--- a/sys/coda/coda_kernel.h
+++ b/sys/coda/coda_kernel.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_kernel.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_kernel.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_namecache.c b/sys/coda/coda_namecache.c
index 63ee9f9772f7..23425b5a13dd 100644
--- a/sys/coda/coda_namecache.c
+++ b/sys/coda/coda_namecache.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_namecache.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_namecache.c,v 1.8 1998/10/28 19:33:50 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_namecache.h b/sys/coda/coda_namecache.h
index e4739114c2c8..11f2e80b12b2 100644
--- a/sys/coda/coda_namecache.h
+++ b/sys/coda/coda_namecache.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_namecache.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_namecache.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_opstats.h b/sys/coda/coda_opstats.h
index e62c04d3db1f..8661a07ebfa0 100644
--- a/sys/coda/coda_opstats.h
+++ b/sys/coda/coda_opstats.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_opstats.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_opstats.h,v 1.3 1998/09/11 18:50:17 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_pioctl.h b/sys/coda/coda_pioctl.h
index 57bc67ed0021..2c2577ce57ee 100644
--- a/sys/coda/coda_pioctl.h
+++ b/sys/coda/coda_pioctl.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_pioctl.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_pioctl.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_psdev.c b/sys/coda/coda_psdev.c
index cde967f04c9b..520702ba48d2 100644
--- a/sys/coda/coda_psdev.c
+++ b/sys/coda/coda_psdev.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_psdev.c,v 1.10 1999/01/17 21:04:53 peter Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_psdev.h b/sys/coda/coda_psdev.h
index 11922adfe02c..c6276f3e710c 100644
--- a/sys/coda/coda_psdev.h
+++ b/sys/coda/coda_psdev.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_psdev.c,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_subr.c b/sys/coda/coda_subr.c
index f64123321f3b..aaf805c54ad6 100644
--- a/sys/coda/coda_subr.c
+++ b/sys/coda/coda_subr.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_subr.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_subr.c,v 1.9 1999/01/17 20:25:15 peter Exp $
+ * $FreeBSD$
  * 
   */
 
diff --git a/sys/coda/coda_subr.h b/sys/coda/coda_subr.h
index fe27bfda19ce..71c8a3de3812 100644
--- a/sys/coda/coda_subr.h
+++ b/sys/coda/coda_subr.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_subr.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_subr.h,v 1.5 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_venus.c b/sys/coda/coda_venus.c
index 9853c7e834bb..f27357498d45 100644
--- a/sys/coda/coda_venus.c
+++ b/sys/coda/coda_venus.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/cfs/coda_venus.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_venus.c,v 1.7 1999/05/11 19:53:51 phk Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_venus.h b/sys/coda/coda_venus.h
index 6fdd15c60fad..392a73f07114 100644
--- a/sys/coda/coda_venus.h
+++ b/sys/coda/coda_venus.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_venus.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_venus.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c
index fda83939beb5..35959df04239 100644
--- a/sys/coda/coda_vfsops.c
+++ b/sys/coda/coda_vfsops.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  *  	@(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vfsops.c,v 1.16 1999/07/21 12:51:36 phk Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_vfsops.h b/sys/coda/coda_vfsops.h
index ef23c3fd3828..13a006d1b1c7 100644
--- a/sys/coda/coda_vfsops.h
+++ b/sys/coda/coda_vfsops.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/cfs/coda_vfsops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_vfsops.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_vnops.c b/sys/coda/coda_vnops.c
index b0a9bedec0cb..6614b4b2c508 100644
--- a/sys/coda/coda_vnops.c
+++ b/sys/coda/coda_vnops.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  *  	@(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vnops.c,v 1.17 1999/08/08 13:22:05 bde Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_vnops.h b/sys/coda/coda_vnops.h
index d188eb6fe5ff..0fb598582d75 100644
--- a/sys/coda/coda_vnops.h
+++ b/sys/coda/coda_vnops.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vnops.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
   */
 
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index a5b051fd1be9..b0e8a367c83a 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_file.c,v 1.30 1999/08/14 18:20:44 marcel Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 53becd770429..56a0eda42066 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ioctl.c,v 1.40 1999/08/14 13:26:44 marcel Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index 7315fa9c2386..5efee536adb3 100644
--- a/sys/compat/linux/linux_ipc.c
+++ b/sys/compat/linux/linux_ipc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ipc.c,v 1.13 1997/11/06 19:28:57 phk Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 74fb7319be80..98348750170d 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_misc.c,v 1.67 1999/08/25 14:11:01 marcel Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
index 29b5c4c3ebf0..9f2200e526a6 100644
--- a/sys/compat/linux/linux_signal.c
+++ b/sys/compat/linux/linux_signal.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_signal.c,v 1.16 1999/07/06 06:54:00 cracauer Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index e757fc13c7f8..d29efb63d85d 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_socket.c,v 1.14 1998/12/30 21:20:00 sos Exp $
+ * $FreeBSD$
  */
 
 /* XXX we use functions that might not exist. */
diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c
index bfa11f642edb..b1fc1a4e5ee8 100644
--- a/sys/compat/linux/linux_stats.c
+++ b/sys/compat/linux/linux_stats.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_stats.c,v 1.12 1999/05/11 19:54:20 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c
index 11739158917a..7c87174089a9 100644
--- a/sys/compat/linux/linux_util.c
+++ b/sys/compat/linux/linux_util.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: svr4_util.c,v 1.5 1995/01/22 23:44:50 christos Exp
- *	$Id: linux_util.c,v 1.6 1997/03/24 11:24:31 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h
index 2905f00ca4ef..61a637171083 100644
--- a/sys/compat/linux/linux_util.h
+++ b/sys/compat/linux/linux_util.h
@@ -28,7 +28,7 @@
  *
  * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
  * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
- * $Id: linux_util.h,v 1.7 1998/12/16 16:28:57 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/compat/svr4/Makefile b/sys/compat/svr4/Makefile
index d8fd59b7fb3c..670fccb6a668 100644
--- a/sys/compat/svr4/Makefile
+++ b/sys/compat/svr4/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $Id: Makefile,v 1.3 1997/03/29 11:17:26 peter Exp $
+# $FreeBSD$
 
 all:
 	@echo "make svr4_sysent.c only"
diff --git a/sys/compat/svr4/imgact_svr4.c b/sys/compat/svr4/imgact_svr4.c
index 5fcfcb5bafca..707e7e4d3ac4 100644
--- a/sys/compat/svr4/imgact_svr4.c
+++ b/sys/compat/svr4/imgact_svr4.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4.h b/sys/compat/svr4/svr4.h
index a42d49d4f9d4..52910bf349c3 100644
--- a/sys/compat/svr4/svr4.h
+++ b/sys/compat/svr4/svr4.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #if !defined(_SVR4_H)
diff --git a/sys/compat/svr4/svr4_acl.h b/sys/compat/svr4/svr4_acl.h
index f1a405f2fd6a..6d9454f65ecd 100644
--- a/sys/compat/svr4/svr4_acl.h
+++ b/sys/compat/svr4/svr4_acl.h
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef	_SVR4_ACL_H_
 #define	_SVR4_ACL_H_
diff --git a/sys/compat/svr4/svr4_dirent.h b/sys/compat/svr4/svr4_dirent.h
index 26ee8164aeb0..244078227888 100644
--- a/sys/compat/svr4/svr4_dirent.h
+++ b/sys/compat/svr4/svr4_dirent.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_DIRENT_H_
diff --git a/sys/compat/svr4/svr4_errno.h b/sys/compat/svr4/svr4_errno.h
index 50dd46a43127..cc39929acfd5 100644
--- a/sys/compat/svr4/svr4_errno.h
+++ b/sys/compat/svr4/svr4_errno.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_ERRNO_H_
diff --git a/sys/compat/svr4/svr4_exec.h b/sys/compat/svr4/svr4_exec.h
index 301915940bd3..716dad18924a 100644
--- a/sys/compat/svr4/svr4_exec.h
+++ b/sys/compat/svr4/svr4_exec.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_EXEC_H_
diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c
index add04e382f73..60b975966a4b 100644
--- a/sys/compat/svr4/svr4_fcntl.c
+++ b/sys/compat/svr4/svr4_fcntl.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_fcntl.c,v 1.3 1999/07/30 12:45:15 newton Exp $
+ * $FreeBSD$
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/svr4/svr4_fcntl.h b/sys/compat/svr4/svr4_fcntl.h
index 6ee21fae8339..615e09c219fb 100644
--- a/sys/compat/svr4/svr4_fcntl.h
+++ b/sys/compat/svr4/svr4_fcntl.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_FCNTL_H_
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c
index 9dfeced92f6b..0be9f221c7bc 100644
--- a/sys/compat/svr4/svr4_filio.c
+++ b/sys/compat/svr4/svr4_filio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_filio.h b/sys/compat/svr4/svr4_filio.h
index 254e2da813c7..37184cb72610 100644
--- a/sys/compat/svr4/svr4_filio.h
+++ b/sys/compat/svr4/svr4_filio.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_FILIO_H_
diff --git a/sys/compat/svr4/svr4_fuser.h b/sys/compat/svr4/svr4_fuser.h
index bc726c12cefa..25cdcf13e0be 100644
--- a/sys/compat/svr4/svr4_fuser.h
+++ b/sys/compat/svr4/svr4_fuser.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *	Derived from:
  *	$NetBSD: svr4_fuser.h,v 1.4 1998/09/04 19:54:38 christos Exp $	 */
 
diff --git a/sys/compat/svr4/svr4_hrt.h b/sys/compat/svr4/svr4_hrt.h
index 8fc0231f4645..c160b8eeb6e9 100644
--- a/sys/compat/svr4/svr4_hrt.h
+++ b/sys/compat/svr4/svr4_hrt.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_HRT_H_
diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c
index 02c120217636..401c58b2a960 100644
--- a/sys/compat/svr4/svr4_ioctl.c
+++ b/sys/compat/svr4/svr4_ioctl.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_ioctl.h b/sys/compat/svr4/svr4_ioctl.h
index f95e5ee53453..a5c6a5324181 100644
--- a/sys/compat/svr4/svr4_ioctl.h
+++ b/sys/compat/svr4/svr4_ioctl.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_IOCTL_H_
diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c
index 1f9b7573cc72..f884fa16c4ed 100644
--- a/sys/compat/svr4/svr4_ipc.c
+++ b/sys/compat/svr4/svr4_ipc.c
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *	Derived from:
  *	$NetBSD: svr4_ipc.c,v 1.7 1998/10/19 22:43:00 tron Exp $	*/
 
diff --git a/sys/compat/svr4/svr4_ipc.h b/sys/compat/svr4/svr4_ipc.h
index 56d7f5572be7..6aadb7e050ec 100644
--- a/sys/compat/svr4/svr4_ipc.h
+++ b/sys/compat/svr4/svr4_ipc.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SVR4_IPC_H_
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 35aa8e603e6e..9535cba8972b 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_misc.c,v 1.4 1999/07/30 12:45:16 newton Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/compat/svr4/svr4_mman.h b/sys/compat/svr4/svr4_mman.h
index 77500fad8a3d..db7c3dacef5f 100644
--- a/sys/compat/svr4/svr4_mman.h
+++ b/sys/compat/svr4/svr4_mman.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SVR4_MMAN_H_
diff --git a/sys/compat/svr4/svr4_resource.c b/sys/compat/svr4/svr4_resource.c
index 32717998d72e..7c39f44b3a1e 100644
--- a/sys/compat/svr4/svr4_resource.c
+++ b/sys/compat/svr4/svr4_resource.c
@@ -39,7 +39,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/compat/svr4/svr4_resource.h b/sys/compat/svr4/svr4_resource.h
index caab421cd6c6..3512df387674 100644
--- a/sys/compat/svr4/svr4_resource.h
+++ b/sys/compat/svr4/svr4_resource.h
@@ -38,7 +38,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/compat/svr4/svr4_siginfo.h b/sys/compat/svr4/svr4_siginfo.h
index 0f4c3e28f7cc..be898374dc2b 100644
--- a/sys/compat/svr4/svr4_siginfo.h
+++ b/sys/compat/svr4/svr4_siginfo.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SIGINFO_H_
diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c
index 2e1e088f902f..b1239871942d 100644
--- a/sys/compat/svr4/svr4_signal.c
+++ b/sys/compat/svr4/svr4_signal.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_signal.h b/sys/compat/svr4/svr4_signal.h
index 0b02985068d4..8fb861d20147 100644
--- a/sys/compat/svr4/svr4_signal.h
+++ b/sys/compat/svr4/svr4_signal.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SIGNAL_H_
diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c
index f42690071599..e2eafa304e5d 100644
--- a/sys/compat/svr4/svr4_socket.c
+++ b/sys/compat/svr4/svr4_socket.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_socket.c,v 1.2 1999/07/30 12:45:17 newton Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/compat/svr4/svr4_socket.h b/sys/compat/svr4/svr4_socket.h
index e7ee86b9b5f8..96e3582738fb 100644
--- a/sys/compat/svr4/svr4_socket.h
+++ b/sys/compat/svr4/svr4_socket.h
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_socket.h,v 1.2 1999/07/30 12:45:18 newton Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SVR4_SOCKET_H_
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index c0c9767bc6d6..7d6184612762 100644
--- a/sys/compat/svr4/svr4_sockio.c
+++ b/sys/compat/svr4/svr4_sockio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_sockio.h b/sys/compat/svr4/svr4_sockio.h
index f363caaddcbb..dd4e220c9f48 100644
--- a/sys/compat/svr4/svr4_sockio.h
+++ b/sys/compat/svr4/svr4_sockio.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SOCKIO_H_
diff --git a/sys/compat/svr4/svr4_sockmod.h b/sys/compat/svr4/svr4_sockmod.h
index 36e0a8a24b60..927ba0d28367 100644
--- a/sys/compat/svr4/svr4_sockmod.h
+++ b/sys/compat/svr4/svr4_sockmod.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SOCKMOD_H_
diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c
index 2b6755127dd0..9ffcbc58d754 100644
--- a/sys/compat/svr4/svr4_stat.c
+++ b/sys/compat/svr4/svr4_stat.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_stat.h b/sys/compat/svr4/svr4_stat.h
index 082cb409f786..7eeff44f30ac 100644
--- a/sys/compat/svr4/svr4_stat.h
+++ b/sys/compat/svr4/svr4_stat.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_STAT_H_
diff --git a/sys/compat/svr4/svr4_statvfs.h b/sys/compat/svr4/svr4_statvfs.h
index cc904abb89e3..b3bf473a1b52 100644
--- a/sys/compat/svr4/svr4_statvfs.h
+++ b/sys/compat/svr4/svr4_statvfs.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_STATVFS_H_
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index 41709258bd8c..4ced1bc07f3a 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_stream.c,v 1.2 1999/07/30 12:45:18 newton Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/compat/svr4/svr4_stropts.h b/sys/compat/svr4/svr4_stropts.h
index 52badbb502ef..2fa14a1e988a 100644
--- a/sys/compat/svr4/svr4_stropts.h
+++ b/sys/compat/svr4/svr4_stropts.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_STROPTS_H_
diff --git a/sys/compat/svr4/svr4_sysconfig.h b/sys/compat/svr4/svr4_sysconfig.h
index 331fa7ebaa0f..874c5653e634 100644
--- a/sys/compat/svr4/svr4_sysconfig.h
+++ b/sys/compat/svr4/svr4_sysconfig.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SYSCONFIG_H_
diff --git a/sys/compat/svr4/svr4_systeminfo.h b/sys/compat/svr4/svr4_systeminfo.h
index 0e05a658d0b7..40bc2b85d757 100644
--- a/sys/compat/svr4/svr4_systeminfo.h
+++ b/sys/compat/svr4/svr4_systeminfo.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SYSTEMINFO_H_
diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c
index 95427ec67a94..099bb9c4dfa9 100644
--- a/sys/compat/svr4/svr4_sysvec.c
+++ b/sys/compat/svr4/svr4_sysvec.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_sysvec.c,v 1.4 1999/07/30 12:45:19 newton Exp $
+ * $FreeBSD$
  */
 
 /* XXX we use functions that might not exist. */
diff --git a/sys/compat/svr4/svr4_termios.c b/sys/compat/svr4/svr4_termios.c
index 45525a230607..450c0847a99e 100644
--- a/sys/compat/svr4/svr4_termios.c
+++ b/sys/compat/svr4/svr4_termios.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_termios.h b/sys/compat/svr4/svr4_termios.h
index f7eddd443667..8afa4f321bc3 100644
--- a/sys/compat/svr4/svr4_termios.h
+++ b/sys/compat/svr4/svr4_termios.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TERMIOS_H_
diff --git a/sys/compat/svr4/svr4_time.h b/sys/compat/svr4/svr4_time.h
index cc9d7a7a1865..3d61771fc904 100644
--- a/sys/compat/svr4/svr4_time.h
+++ b/sys/compat/svr4/svr4_time.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TIME_H_
diff --git a/sys/compat/svr4/svr4_timod.h b/sys/compat/svr4/svr4_timod.h
index 7d98e05d782c..f0c508f511b8 100644
--- a/sys/compat/svr4/svr4_timod.h
+++ b/sys/compat/svr4/svr4_timod.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TIMOD_H_
diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c
index ac4c1d62c8ef..d597691cc699 100644
--- a/sys/compat/svr4/svr4_ttold.c
+++ b/sys/compat/svr4/svr4_ttold.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_ttold.h b/sys/compat/svr4/svr4_ttold.h
index 81ea51448fd5..c578170a1ef9 100644
--- a/sys/compat/svr4/svr4_ttold.h
+++ b/sys/compat/svr4/svr4_ttold.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TTOLD_H_
diff --git a/sys/compat/svr4/svr4_types.h b/sys/compat/svr4/svr4_types.h
index 2aed74e4ff84..410746b6adc9 100644
--- a/sys/compat/svr4/svr4_types.h
+++ b/sys/compat/svr4/svr4_types.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TYPES_H_
diff --git a/sys/compat/svr4/svr4_ucontext.h b/sys/compat/svr4/svr4_ucontext.h
index c37865283da6..04bebe6eb81e 100644
--- a/sys/compat/svr4/svr4_ucontext.h
+++ b/sys/compat/svr4/svr4_ucontext.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_UCONTEXT_H_
diff --git a/sys/compat/svr4/svr4_ulimit.h b/sys/compat/svr4/svr4_ulimit.h
index bd83d721abbd..0735d42f722f 100644
--- a/sys/compat/svr4/svr4_ulimit.h
+++ b/sys/compat/svr4/svr4_ulimit.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_ULIMIT_H_
diff --git a/sys/compat/svr4/svr4_ustat.h b/sys/compat/svr4/svr4_ustat.h
index 3c805a4feb43..0033c96bae0d 100644
--- a/sys/compat/svr4/svr4_ustat.h
+++ b/sys/compat/svr4/svr4_ustat.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_USTAT_H_
diff --git a/sys/compat/svr4/svr4_util.h b/sys/compat/svr4/svr4_util.h
index a2f28e340416..629edd69cd4a 100644
--- a/sys/compat/svr4/svr4_util.h
+++ b/sys/compat/svr4/svr4_util.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_util.h,v 1.2 1999/07/30 12:45:21 newton Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_UTIL_H_
diff --git a/sys/compat/svr4/svr4_utsname.h b/sys/compat/svr4/svr4_utsname.h
index e104778c9d17..a3714c9b1c10 100644
--- a/sys/compat/svr4/svr4_utsname.h
+++ b/sys/compat/svr4/svr4_utsname.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_UTSNAME_H_
diff --git a/sys/compat/svr4/svr4_wait.h b/sys/compat/svr4/svr4_wait.h
index 2945c1948275..9a92c0114c1c 100644
--- a/sys/compat/svr4/svr4_wait.h
+++ b/sys/compat/svr4/svr4_wait.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_WAIT_H_
diff --git a/sys/compat/svr4/syscalls.conf b/sys/compat/svr4/syscalls.conf
index 5c01a85cad74..46f7bd3df7be 100644
--- a/sys/compat/svr4/syscalls.conf
+++ b/sys/compat/svr4/syscalls.conf
@@ -1,4 +1,4 @@
-# $Id: syscalls.conf,v 1.4 1998/03/13 19:13:54 jb Exp $
+# $FreeBSD$
 sysnames="svr4_syscallnames.c"
 sysproto="svr4_proto.h"
 sysproto_h=_SVR4_SYSPROTO_H_
diff --git a/sys/compat/svr4/syscalls.master b/sys/compat/svr4/syscalls.master
index 703120d7d236..43e8f4886c68 100644
--- a/sys/compat/svr4/syscalls.master
+++ b/sys/compat/svr4/syscalls.master
@@ -20,7 +20,7 @@
 ;	OBSOL	obsolete, not included in system, only specifies name
 ;	UNIMPL	not implemented, placeholder only
 ;
-; $Id: syscalls.master,v 1.2 1999/07/30 12:45:21 newton Exp $
+; $FreeBSD$
 ;
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index d6d3c1a063b7..dfd267a69063 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-#	$Id: Makefile.alpha,v 1.28 1999/07/02 04:16:57 mjacob Exp $
+# $FreeBSD$
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 66873d0cc1e9..0d82e7971baa 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.157 1999/07/02 04:00:01 jkh Exp $
+# $FreeBSD$
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 8740d2398e81..48492d5fc6ea 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.pc98,v 1.66 1999/07/03 08:17:40 kato Exp $
+# $FreeBSD$
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 66873d0cc1e9..0d82e7971baa 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.157 1999/07/02 04:00:01 jkh Exp $
+# $FreeBSD$
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 80ecf1a81a2b..6c0f0cf935d3 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.629 1999/08/21 17:40:37 wpaul Exp $
+# $FreeBSD$
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index 52ef13c794ff..73d380047bc5 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.alpha,v 1.23 1999/07/03 19:19:30 peter Exp $
+# $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 72349659ad1d..e6a940c18e11 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.259 1999/08/18 04:08:14 alc Exp $
+# $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 359b379f4030..84d3f62a989b 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-#	$Id: files.pc98,v 1.105 1999/08/09 10:34:59 phk Exp $
+# $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/majors b/sys/conf/majors
index 60feb64f5cf1..e4fda55c344f 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.81 1999/08/04 19:55:37 jkh Exp $
+$FreeBSD$
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 0bde01437475..4c9db90cab19 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-#	$Id: newvers.sh,v 1.42 1999/01/21 03:07:33 jkh Exp $
+# $FreeBSD$
 
 TYPE="FreeBSD"
 REVISION="4.0"
diff --git a/sys/conf/nfsswapkernel.c b/sys/conf/nfsswapkernel.c
index 12722fff6457..8f8a67e2f130 100644
--- a/sys/conf/nfsswapkernel.c
+++ b/sys/conf/nfsswapkernel.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * from: @(#)nfsswapvmunix.c	8.1 (Berkeley) 6/10/93
- * $Id: nfsswapkernel.c,v 1.4 1997/09/07 12:56:37 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/conf/options b/sys/conf/options
index f54689afd6b8..ba04359ad8f8 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.146 1999/08/16 22:39:53 gibbs Exp $
+# $FreeBSD$
 #
 #        On the handling of kernel options   
 # 
diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha
index d78c2205e96e..fdc5b7d75249 100644
--- a/sys/conf/options.alpha
+++ b/sys/conf/options.alpha
@@ -1,4 +1,4 @@
-#	$Id: options.alpha,v 1.11 1999/05/27 22:03:31 gallatin Exp $
+# $FreeBSD$
 
 EV5			opt_global.h
 EV4			opt_global.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index bd3ac0e5ddbe..f0adfd96ab8f 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.119 1999/08/06 14:01:55 hm Exp $
+# $FreeBSD$
 
 DISABLE_PSE
 IDE_DELAY
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 3c46c2decce3..9906c9b413eb 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-#	$Id: options.pc98,v 1.92 1999/08/08 11:13:47 kato Exp $
+# $FreeBSD$
 
 DISABLE_PSE
 IDE_DELAY
diff --git a/sys/conf/param.c b/sys/conf/param.c
index b9a906281f18..9a0a85f08a0a 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.3 (Berkeley) 8/20/94
- * $Id: param.c,v 1.33 1999/04/09 16:28:11 des Exp $
+ * $FreeBSD$
  */
 
 #include <stddef.h>
diff --git a/sys/conf/systags.sh b/sys/conf/systags.sh
index 179df30d73f7..a8e0e4df4945 100644
--- a/sys/conf/systags.sh
+++ b/sys/conf/systags.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)systags.sh	8.1 (Berkeley) 6/10/93
-#	$Id$
+# $FreeBSD$
 #
 # systags.sh - construct a system tags file using dependence relations
 #	in a .depend file
diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index 511f978280c7..04de1083bb92 100644
--- a/sys/ddb/db_access.c
+++ b/sys/ddb/db_access.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_access.c,v 1.13 1997/02/22 09:28:18 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h
index ca1b7f9e43cf..715c1cb002c3 100644
--- a/sys/ddb/db_access.h
+++ b/sys/ddb/db_access.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _DDB_DB_ACCESS_H_
diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c
index 3daba33b7214..21d13be68b71 100644
--- a/sys/ddb/db_aout.c
+++ b/sys/ddb/db_aout.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_aout.c,v 1.25 1999/02/12 12:15:07 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index e2abb6585516..9ac0001255f8 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_break.c,v 1.16 1998/06/08 02:11:19 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index 003ff8aec8b1..008acab85b1e 100644
--- a/sys/ddb/db_break.h
+++ b/sys/ddb/db_break.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_break.h,v 1.10 1998/06/07 17:09:36 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 53c79c638008..201d1f1bbb09 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_command.c,v 1.32 1999/07/01 19:42:55 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h
index 89e3bc4a5838..a95f5b3aaee3 100644
--- a/sys/ddb/db_command.h
+++ b/sys/ddb/db_command.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _DDB_DB_COMMAND_H_
diff --git a/sys/ddb/db_elf.c b/sys/ddb/db_elf.c
index 1eb9fa5095e8..b4fd53dd118d 100644
--- a/sys/ddb/db_elf.c
+++ b/sys/ddb/db_elf.c
@@ -1,4 +1,4 @@
-/* $Id: db_elf.c,v 1.5 1999/01/27 19:00:49 dillon Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: db_elf.c,v 1.4 1998/05/03 18:49:54 thorpej Exp $	*/
 
 /*-
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index 190c107e40db..87143e11a835 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_examine.c,v 1.25 1999/05/13 06:07:43 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 0603d9d91857..61f7fc13b94c 100644
--- a/sys/ddb/db_expr.c
+++ b/sys/ddb/db_expr.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_expr.c,v 1.11 1997/02/22 09:28:23 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index b17bdff88356..b8f407f7c99d 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_input.c,v 1.24 1999/07/14 10:53:41 yokota Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_kld.c b/sys/ddb/db_kld.c
index 09246c79b3bb..8bb1b6b6ed72 100644
--- a/sys/ddb/db_kld.c
+++ b/sys/ddb/db_kld.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_kld.c,v 1.5 1999/01/27 19:00:49 dillon Exp $
+ * $FreeBSD$
  *	from db_aout.c,v 1.20 1998/06/07 17:09:36 dfr Exp
  */
 
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index e66d43d64088..392b8b07cb30 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_lex.c,v 1.16 1998/06/27 15:40:56 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h
index 726eaa4310f9..c4e0ee2a6ba4 100644
--- a/sys/ddb/db_lex.h
+++ b/sys/ddb/db_lex.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_lex.h,v 1.10 1998/06/27 15:40:56 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DDB_DB_LEX_H_
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index 33183229964c..9192c183c6ae 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_output.c,v 1.24 1998/07/08 09:11:36 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index 73305d5e31d1..8172bbba6d83 100644
--- a/sys/ddb/db_output.h
+++ b/sys/ddb/db_output.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _DDB_DB_OUTPUT_H_
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index a02f9922de36..06e9f43da659 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_print.c,v 1.24 1999/01/27 23:45:37 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index 806032210783..f005fd832473 100644
--- a/sys/ddb/db_ps.c
+++ b/sys/ddb/db_ps.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: db_ps.c,v 1.18 1999/05/13 13:01:46 bde Exp $
+ * $FreeBSD$
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index 3d16d130c783..be780e378249 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_run.c,v 1.16 1998/07/05 10:12:18 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index 293f3ec954a3..7cba6883426b 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_sym.c,v 1.30 1999/02/12 12:44:19 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index 51d579bdeac8..e4decf403701 100644
--- a/sys/ddb/db_sym.h
+++ b/sys/ddb/db_sym.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_sym.h,v 1.17 1999/01/27 23:45:37 dillon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DDB_DB_SYM_H_
diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c
index f4da0f8eaff1..2111957ec456 100644
--- a/sys/ddb/db_trap.c
+++ b/sys/ddb/db_trap.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_trap.c,v 1.12 1997/03/28 12:39:43 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index dff4093b6930..8c0eb98fe743 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_variables.c,v 1.16 1998/07/08 09:11:39 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h
index 20d33388712d..f430f0d8c94d 100644
--- a/sys/ddb/db_variables.h
+++ b/sys/ddb/db_variables.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_variables.h,v 1.9 1998/06/07 17:09:38 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index f85362035f4e..6ba85c03995b 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_watch.c,v 1.17 1998/07/08 06:43:57 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index 58f4f6a2792c..18943f43942d 100644
--- a/sys/ddb/db_watch.h
+++ b/sys/ddb/db_watch.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index d745100d924a..3da61d35dd9d 100644
--- a/sys/ddb/db_write_cmd.c
+++ b/sys/ddb/db_write_cmd.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_write_cmd.c,v 1.11 1998/07/08 10:53:52 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index 38bf3cb8a142..46fb2b5e2505 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ddb.h,v 1.21 1999/01/27 19:00:49 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
index 4b475d3d1193..ad9604e69626 100644
--- a/sys/dev/advansys/adv_eisa.c
+++ b/sys/dev/advansys/adv_eisa.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_eisa.c,v 1.5 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index 5cc06c5801b2..7390939cb9c5 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -44,7 +44,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: adv_isa.c,v 1.11 1999/05/08 18:20:57 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index 1ca2cee1e597..8f8fc58f374b 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_pci.c,v 1.7 1999/07/03 20:16:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index c05604cedb6e..19cb21ad6fb5 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: advansys.c,v 1.10 1999/05/06 20:16:09 ken Exp $
+ * $FreeBSD$
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advansys.h b/sys/dev/advansys/advansys.h
index 51519238d582..9108e2d2ff86 100644
--- a/sys/dev/advansys/advansys.h
+++ b/sys/dev/advansys/advansys.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  * All rights reserved.
  *
- *      $Id: advansys.h,v 1.3 1997/02/22 09:38:38 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ADVANSYS_H_
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index 568bf9112f0b..ad5469f31978 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: advlib.c,v 1.12 1999/04/19 21:27:36 gibbs Exp $
+ * $FreeBSD$
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index b7684cca594d..7f59a852413c 100644
--- a/sys/dev/advansys/advlib.h
+++ b/sys/dev/advansys/advlib.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: advlib.h,v 1.4 1998/09/15 07:03:33 gibbs Exp $
+ * $FreeBSD$
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advmcode.c b/sys/dev/advansys/advmcode.c
index d49eb328a035..22491297f6cb 100644
--- a/sys/dev/advansys/advmcode.c
+++ b/sys/dev/advansys/advmcode.c
@@ -1,7 +1,7 @@
 /*
  * Downloadable microcode for Advanced Systems Inc. SCSI controllers
  *
- *	$Id: advmcode.c,v 1.4 1998/09/15 07:03:33 gibbs Exp $
+ * $FreeBSD$
  *
  * Obtained from:
  * advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
diff --git a/sys/dev/advansys/advmcode.h b/sys/dev/advansys/advmcode.h
index c3794693e6ad..666bb774e0eb 100644
--- a/sys/dev/advansys/advmcode.h
+++ b/sys/dev/advansys/advmcode.h
@@ -1,7 +1,7 @@
 /*
  * Exported interface to downloadable microcode for AdvanSys SCSI Adapters
  *
- *	$Id: advmcode.h,v 1.3 1997/02/22 09:28:48 peter Exp $
+ * $FreeBSD$
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index 650978630545..10eda815814a 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adw_pci.c,v 1.6 1999/07/03 20:16:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index 0b6bc7e1a897..b30f16c8e933 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: adwcam.c,v 1.3 1999/05/06 20:16:12 ken Exp $
+ * $FreeBSD$
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c
index c727ca633b75..289c3c67b1ee 100644
--- a/sys/dev/advansys/adwlib.c
+++ b/sys/dev/advansys/adwlib.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: adwlib.c,v 1.1 1998/10/07 03:20:46 gibbs Exp $
+ * $FreeBSD$
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/adwlib.h b/sys/dev/advansys/adwlib.h
index 5b9e5535b86f..3773cf14eaa2 100644
--- a/sys/dev/advansys/adwlib.h
+++ b/sys/dev/advansys/adwlib.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/adwmcode.c b/sys/dev/advansys/adwmcode.c
index 61c856bf6d53..84f77e541d14 100644
--- a/sys/dev/advansys/adwmcode.c
+++ b/sys/dev/advansys/adwmcode.c
@@ -2,7 +2,7 @@
  * Downloadable microcode for Second Generation
  * Advanced Systems Inc. SCSI controllers
  *
- *	$Id$
+ * $FreeBSD$
  *
  * Obtained from:
  * advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
diff --git a/sys/dev/advansys/adwmcode.h b/sys/dev/advansys/adwmcode.h
index 41abbf8a9caf..99d2d6fa8c5c 100644
--- a/sys/dev/advansys/adwmcode.h
+++ b/sys/dev/advansys/adwmcode.h
@@ -1,7 +1,7 @@
 /*
  * Exported interface to downloadable microcode for AdvanSys SCSI Adapters
  *
- *	$Id: advmcode.h,v 1.4 1998/09/15 07:03:34 gibbs Exp $
+ * $FreeBSD$
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adwvar.h b/sys/dev/advansys/adwvar.h
index c679123de185..1820b8a68ade 100644
--- a/sys/dev/advansys/adwvar.h
+++ b/sys/dev/advansys/adwvar.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  * All rights reserved.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ADWVAR_H_
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index fe9d7b987876..50cec6fba0dc 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -55,7 +55,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aha.c,v 1.26 1999/05/25 20:15:19 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include "pnp.h"
diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c
index b6e0cb08e523..6484eacb225c 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aha_isa.c,v 1.8 1999/05/08 18:20:55 peter Exp $
+ * $FreeBSD$
  */
 
 #include "pnp.h"
diff --git a/sys/dev/aha/ahareg.h b/sys/dev/aha/ahareg.h
index ba3a1c3ddac3..0e2ce77c9cf3 100644
--- a/sys/dev/aha/ahareg.h
+++ b/sys/dev/aha/ahareg.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: ahareg.h,v 1.5 1999/01/20 06:21:27 imp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _AHAREG_H_
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index a1dc84ac5e7a..67eead4dd7e2 100644
--- a/sys/dev/ahb/ahb.c
+++ b/sys/dev/ahb/ahb.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahb.c,v 1.13 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/dev/ahb/ahbreg.h b/sys/dev/ahb/ahbreg.h
index 1bed89ebff4a..c72f068aa3b9 100644
--- a/sys/dev/ahb/ahbreg.h
+++ b/sys/dev/ahb/ahbreg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Resource Constatns */
diff --git a/sys/dev/aic7xxx/93cx6.c b/sys/dev/aic7xxx/93cx6.c
index 19d64a9f330c..49d7952c4497 100644
--- a/sys/dev/aic7xxx/93cx6.c
+++ b/sys/dev/aic7xxx/93cx6.c
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *      $Id: 93cx6.c,v 1.2 1999/04/07 23:02:45 gibbs Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/aic7xxx/93cx6.h b/sys/dev/aic7xxx/93cx6.h
index 32645e1096ef..b1694834a06b 100644
--- a/sys/dev/aic7xxx/93cx6.h
+++ b/sys/dev/aic7xxx/93cx6.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic7xxx/Makefile b/sys/dev/aic7xxx/Makefile
index b47dab352081..aa478151de4e 100644
--- a/sys/dev/aic7xxx/Makefile
+++ b/sys/dev/aic7xxx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1997/09/27 19:37:22 gibbs Exp $
+# $FreeBSD$
 
 PROG=	aicasm
 
diff --git a/sys/dev/aic7xxx/ahc_eisa.c b/sys/dev/aic7xxx/ahc_eisa.c
index 39450187d3a6..e98be7d3a3d5 100644
--- a/sys/dev/aic7xxx/ahc_eisa.c
+++ b/sys/dev/aic7xxx/ahc_eisa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_eisa.c,v 1.11 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index 54f429f9bab5..64fcbd53c8f6 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_pci.c,v 1.17 1999/08/16 02:33:46 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c
index 9a1cd69a146c..af30729e86dd 100644
--- a/sys/dev/aic7xxx/aic7xxx.c
+++ b/sys/dev/aic7xxx/aic7xxx.c
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aic7xxx.c,v 1.33 1999/08/21 06:23:59 msmith Exp $
+ * $FreeBSD$
  */
 /*
  * A few notes on features of the driver.
diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h
index a4a1cf5ac298..fca4aeaf965f 100644
--- a/sys/dev/aic7xxx/aic7xxx.h
+++ b/sys/dev/aic7xxx/aic7xxx.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aic7xxx.h,v 1.10 1999/05/22 22:04:10 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _AIC7XXX_H_
diff --git a/sys/dev/aic7xxx/aic7xxx.reg b/sys/dev/aic7xxx/aic7xxx.reg
index 848c04ae7d4f..341b56c752e0 100644
--- a/sys/dev/aic7xxx/aic7xxx.reg
+++ b/sys/dev/aic7xxx/aic7xxx.reg
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aic7xxx.reg,v 1.15 1999/05/14 05:07:24 gibbs Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index bc333f4d8262..f8c5381fe7ec 100644
--- a/sys/dev/aic7xxx/aic7xxx.seq
+++ b/sys/dev/aic7xxx/aic7xxx.seq
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aic7xxx.seq,v 1.88 1999/05/14 05:07:25 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <dev/aic7xxx/aic7xxx.reg>
diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.c b/sys/dev/aic7xxx/aic7xxx_93cx6.c
index 19d64a9f330c..49d7952c4497 100644
--- a/sys/dev/aic7xxx/aic7xxx_93cx6.c
+++ b/sys/dev/aic7xxx/aic7xxx_93cx6.c
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *      $Id: 93cx6.c,v 1.2 1999/04/07 23:02:45 gibbs Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.h b/sys/dev/aic7xxx/aic7xxx_93cx6.h
index 32645e1096ef..b1694834a06b 100644
--- a/sys/dev/aic7xxx/aic7xxx_93cx6.h
+++ b/sys/dev/aic7xxx/aic7xxx_93cx6.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic7xxx/aicasm.c b/sys/dev/aic7xxx/aicasm.c
index f6a1a191e316..9af5c8343274 100644
--- a/sys/dev/aic7xxx/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm.c,v 1.21 1999/03/23 07:24:29 gibbs Exp $
+ * $FreeBSD$
  */
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/sys/dev/aic7xxx/aicasm.h b/sys/dev/aic7xxx/aicasm.h
index 50806757c166..02ee4647e1e3 100644
--- a/sys/dev/aic7xxx/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm.h,v 1.3 1997/06/27 19:38:47 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/sys/dev/aic7xxx/aicasm/Makefile b/sys/dev/aic7xxx/aicasm/Makefile
index b47dab352081..aa478151de4e 100644
--- a/sys/dev/aic7xxx/aicasm/Makefile
+++ b/sys/dev/aic7xxx/aicasm/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1997/09/27 19:37:22 gibbs Exp $
+# $FreeBSD$
 
 PROG=	aicasm
 
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c
index f6a1a191e316..9af5c8343274 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm.c,v 1.21 1999/03/23 07:24:29 gibbs Exp $
+ * $FreeBSD$
  */
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.h b/sys/dev/aic7xxx/aicasm/aicasm.h
index 50806757c166..02ee4647e1e3 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm.h,v 1.3 1997/06/27 19:38:47 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_gram.y b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
index fdf352249ab8..105da24de57d 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_gram.y
+++ b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_gram.y,v 1.5 1998/09/15 07:24:17 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
index 44bc8345d479..e5f497942b40 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_scan.l,v 1.5 1997/09/27 19:37:29 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
index 0704baa0942e..5b05d6d4e138 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_symbol.c,v 1.5 1998/09/15 07:24:17 gibbs Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
index ba98b435edaf..ac8f9b8ab162 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_symbol.h,v 1.3 1997/09/27 19:37:30 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/sys/dev/aic7xxx/aicasm_gram.y b/sys/dev/aic7xxx/aicasm_gram.y
index fdf352249ab8..105da24de57d 100644
--- a/sys/dev/aic7xxx/aicasm_gram.y
+++ b/sys/dev/aic7xxx/aicasm_gram.y
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_gram.y,v 1.5 1998/09/15 07:24:17 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sys/dev/aic7xxx/aicasm_scan.l b/sys/dev/aic7xxx/aicasm_scan.l
index 44bc8345d479..e5f497942b40 100644
--- a/sys/dev/aic7xxx/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm_scan.l
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_scan.l,v 1.5 1997/09/27 19:37:29 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm_symbol.c b/sys/dev/aic7xxx/aicasm_symbol.c
index 0704baa0942e..5b05d6d4e138 100644
--- a/sys/dev/aic7xxx/aicasm_symbol.c
+++ b/sys/dev/aic7xxx/aicasm_symbol.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_symbol.c,v 1.5 1998/09/15 07:24:17 gibbs Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/dev/aic7xxx/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm_symbol.h
index ba98b435edaf..ac8f9b8ab162 100644
--- a/sys/dev/aic7xxx/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm_symbol.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_symbol.h,v 1.3 1997/09/27 19:37:30 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/sys/dev/aic7xxx/sequencer.h b/sys/dev/aic7xxx/sequencer.h
index 0fe929ba2986..c84b39b4c04b 100644
--- a/sys/dev/aic7xxx/sequencer.h
+++ b/sys/dev/aic7xxx/sequencer.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: sequencer.h,v 1.3 1997/09/27 19:37:31 gibbs Exp $
+ * $FreeBSD$
  */
 
 struct ins_format1 {
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 66771534bbf0..342cba495952 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.26 1999/05/06 18:58:04 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 66771534bbf0..342cba495952 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.26 1999/05/06 18:58:04 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ar/if_arregs.h b/sys/dev/ar/if_arregs.h
index 974b76127962..6c5b020908e2 100644
--- a/sys/dev/ar/if_arregs.h
+++ b/sys/dev/ar/if_arregs.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef _IF_ARREGS_H_
 #define _IF_ARREGS_H_
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index bc4e199faabb..d0ef616318a5 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: ata-all.c,v 1.15 1999/06/25 09:02:56 sos Exp $
+ * $FreeBSD$
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h
index 5bcbed0e485e..183ae7263448 100644
--- a/sys/dev/ata/ata-all.h
+++ b/sys/dev/ata/ata-all.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ata-all.h,v 1.7 1999/06/25 09:02:57 sos Exp $
+ * $FreeBSD$
  */
 
 /* ATA register defines */
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 854650127919..d8196a4833b0 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ata-disk.c,v 1.17 1999/08/14 11:40:33 phk Exp $
+ * $FreeBSD$
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/ata-disk.h b/sys/dev/ata/ata-disk.h
index db4147bd1c83..70af5ce632ee 100644
--- a/sys/dev/ata/ata-disk.h
+++ b/sys/dev/ata/ata-disk.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ata-disk.h,v 1.7 1999/06/25 09:03:00 sos Exp $
+ * $FreeBSD$
  */
 
 /* ATA device parameter information */
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c
index 8e0ab97480fb..04157008cf0f 100644
--- a/sys/dev/ata/ata-dma.c
+++ b/sys/dev/ata/ata-dma.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ata-dma.c,v 1.9 1999/08/06 17:39:38 sos Exp $
+ * $FreeBSD$
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/atapi-all.c b/sys/dev/ata/atapi-all.c
index ff13d462fcb9..45f7087644eb 100644
--- a/sys/dev/ata/atapi-all.c
+++ b/sys/dev/ata/atapi-all.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-all.c,v 1.11 1999/08/10 21:59:58 sos Exp $
+ * $FreeBSD$
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/atapi-all.h b/sys/dev/ata/atapi-all.h
index 82f51a84e380..f259b87a536c 100644
--- a/sys/dev/ata/atapi-all.h
+++ b/sys/dev/ata/atapi-all.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-all.h,v 1.6 1999/05/20 09:12:04 sos Exp $
+ * $FreeBSD$
  */
 
 /* ATAPI misc defines */
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 439c4d69e75d..bd804b4979a1 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.c,v 1.11 1999/06/25 09:03:04 sos Exp $
+ * $FreeBSD$
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/atapi-cd.h b/sys/dev/ata/atapi-cd.h
index 95a0af6323cd..6afa00d10ac8 100644
--- a/sys/dev/ata/atapi-cd.h
+++ b/sys/dev/ata/atapi-cd.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.h,v 1.2 1999/03/03 21:10:29 sos Exp $
+ * $FreeBSD$
  */
 
 /* CDROM Table Of Contents */
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index f8c386598a1d..5a2fd18f0185 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-fd.c,v 1.12 1999/08/14 11:40:33 phk Exp $
+ * $FreeBSD$
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/atapi-fd.h b/sys/dev/ata/atapi-fd.h
index 59babb0d0035..02b60eb61091 100644
--- a/sys/dev/ata/atapi-fd.h
+++ b/sys/dev/ata/atapi-fd.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-fd.h,v 1.2 1999/05/20 09:12:06 sos Exp $
+ * $FreeBSD$
  */
 
 /* MODE SENSE parameter header */ 
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index 8dc2044d6607..ce3d6ff347f1 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-tape.c,v 1.11 1999/06/25 09:03:06 sos Exp $
+ * $FreeBSD$
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/atapi-tape.h b/sys/dev/ata/atapi-tape.h
index 9c6122597357..209f79dec070 100644
--- a/sys/dev/ata/atapi-tape.h
+++ b/sys/dev/ata/atapi-tape.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-tape.h,v 1.4 1999/06/25 09:03:07 sos Exp $
+ * $FreeBSD$
  */
 
 /* MODE SENSE parameter header */
diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index 3786ee9a0b98..3094c60140df 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbd.c,v 1.14 1999/08/22 09:52:32 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "atkbd.h"
diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c
index a8d638121b1d..f686170ec949 100644
--- a/sys/dev/atkbdc/atkbd_atkbdc.c
+++ b/sys/dev/atkbdc/atkbd_atkbdc.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbd_isa.c,v 1.4 1999/05/08 21:59:28 dfr Exp $
+ * $FreeBSD$
  */
 
 #include "atkbd.h"
diff --git a/sys/dev/atkbdc/atkbd_isa.c b/sys/dev/atkbdc/atkbd_isa.c
index a8d638121b1d..f686170ec949 100644
--- a/sys/dev/atkbdc/atkbd_isa.c
+++ b/sys/dev/atkbdc/atkbd_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbd_isa.c,v 1.4 1999/05/08 21:59:28 dfr Exp $
+ * $FreeBSD$
  */
 
 #include "atkbd.h"
diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c
index ded635795b0d..68fcffc29334 100644
--- a/sys/dev/atkbdc/atkbdc.c
+++ b/sys/dev/atkbdc/atkbdc.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: atkbdc.c,v 1.2 1999/05/18 11:33:04 yokota Exp $
+ * $FreeBSD$
  * from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp
  */
 
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index 387f9a534153..eae6e14fec84 100644
--- a/sys/dev/atkbdc/atkbdc_isa.c
+++ b/sys/dev/atkbdc/atkbdc_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbdc_isa.c,v 1.9 1999/06/29 17:35:09 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "atkbdc.h"
diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c
index 387f9a534153..eae6e14fec84 100644
--- a/sys/dev/atkbdc/atkbdc_subr.c
+++ b/sys/dev/atkbdc/atkbdc_subr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbdc_isa.c,v 1.9 1999/06/29 17:35:09 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "atkbdc.h"
diff --git a/sys/dev/atkbdc/atkbdcreg.h b/sys/dev/atkbdc/atkbdcreg.h
index ccf64e4032c7..2085bb67bb92 100644
--- a/sys/dev/atkbdc/atkbdcreg.h
+++ b/sys/dev/atkbdc/atkbdcreg.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: atkbdcreg.h,v 1.1 1999/01/09 02:44:50 yokota Exp $
+ * $FreeBSD$
  * from kbdio.h,v 1.8 1998/09/25 11:55:46 yokota Exp
  */
 
diff --git a/sys/dev/atkbdc/atkbdreg.h b/sys/dev/atkbdc/atkbdreg.h
index 04401520b759..bda6afb8582d 100644
--- a/sys/dev/atkbdc/atkbdreg.h
+++ b/sys/dev/atkbdc/atkbdreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbdreg.h,v 1.2 1999/03/10 10:36:52 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEV_KBD_ATKBDREG_H_
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index e7c82c97dd47..6e861ccdba9c 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: psm.c,v 1.16 1999/08/22 06:11:52 yokota Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 27b73d013a7d..46cf72e121e6 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.89 1999/07/12 15:51:48 roger Exp $ */
+/* $FreeBSD$ */
 /* BT848 Driver for Brooktree's Bt848, Bt848A, Bt849A, Bt878, Bt879 based cards.
    The Brooktree  BT848 Driver driver is based upon Mark Tinguely and
    Jim Lowe's driver for the Matrox Meteor PCI card . The 
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index a3a1fdd737da..5e4ecc9a8f29 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt848_i2c.c,v 1.5 1999/07/03 20:17:01 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/bktr/bktr_i2c.h b/sys/dev/bktr/bktr_i2c.h
index c7d22c50484e..075e9885ae5d 100644
--- a/sys/dev/bktr/bktr_i2c.h
+++ b/sys/dev/bktr/bktr_i2c.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  *
  */
 #ifndef _BT848_I2C_H
diff --git a/sys/dev/bktr/bktr_reg.h b/sys/dev/bktr/bktr_reg.h
index ab34cec12cd6..643d3f353f58 100644
--- a/sys/dev/bktr/bktr_reg.h
+++ b/sys/dev/bktr/bktr_reg.h
@@ -30,7 +30,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: brktree_reg.h,v 1.29 1999/06/12 14:54:56 roger Exp $
+ * $FreeBSD$
  */
 #ifndef PCI_LATENCY_TIMER
 #define	PCI_LATENCY_TIMER		0x0c	/* pci timer register */
diff --git a/sys/dev/bktr/ioctl_bt848.h b/sys/dev/bktr/ioctl_bt848.h
index 0767abddb684..30e18d156da3 100644
--- a/sys/dev/bktr/ioctl_bt848.h
+++ b/sys/dev/bktr/ioctl_bt848.h
@@ -1,7 +1,7 @@
 /*
  * extensions to ioctl_meteor.h for the bt848 cards
  *
- * $Id: ioctl_bt848.h,v 1.22 1999/02/15 11:04:36 roger Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index abedc4869915..23a30d39841d 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bt.c,v 1.22 1999/05/23 18:54:34 gibbs Exp $
+ * $FreeBSD$
  */
 
  /*
diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c
index d9cb5840438c..400b42b046f7 100644
--- a/sys/dev/buslogic/bt_eisa.c
+++ b/sys/dev/buslogic/bt_eisa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_eisa.c,v 1.8 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c
index 6a45d50a2de5..b51fe8eb9ed8 100644
--- a/sys/dev/buslogic/bt_isa.c
+++ b/sys/dev/buslogic/bt_isa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_isa.c,v 1.15 1999/06/28 09:19:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c
index 5aa884444497..154a2f2febc3 100644
--- a/sys/dev/buslogic/bt_pci.c
+++ b/sys/dev/buslogic/bt_pci.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_pci.c,v 1.8 1999/07/03 20:17:01 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/buslogic/btreg.h b/sys/dev/buslogic/btreg.h
index 00660e0ce81a..23b322861306 100644
--- a/sys/dev/buslogic/btreg.h
+++ b/sys/dev/buslogic/btreg.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: btreg.h,v 1.7 1999/04/23 23:28:20 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _BTREG_H_
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index e4faa3f4b8a6..7badacb7d7c0 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1,4 +1,4 @@
-/* $Id: ccd.c,v 1.52 1999/08/14 11:40:34 phk Exp $ */
+/* $FreeBSD$ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 4863ffe3c7ff..aa7e06c788fd 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -27,7 +27,7 @@
  */
 
 /*
- * $Id: if_cs.c,v 1.10 1999/04/16 21:22:20 peter Exp $
+ * $FreeBSD$
  *
  * Device driver for Crystal Semiconductor CS8920 based ethernet
  *   adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
diff --git a/sys/dev/cs/if_csreg.h b/sys/dev/cs/if_csreg.h
index 3d53f01db753..56d9fcd595af 100644
--- a/sys/dev/cs/if_csreg.h
+++ b/sys/dev/cs/if_csreg.h
@@ -27,7 +27,7 @@
  */
 
 /*
- * $Id: if_csreg.h,v 1.7 1998/07/19 16:13:39 root Exp root $
+ * $FreeBSD$
  */
 
 #define PP_ChipID 0x0000	/* offset   0h -> Corp -ID              */
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 56b0bbc3621f..4181c44e2b4e 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.91 1999/06/04 18:13:25 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 56b0bbc3621f..4181c44e2b4e 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.91 1999/06/04 18:13:25 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index 61848c3213de..71e16953af7a 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cy_pci.c,v 1.15 1999/05/10 10:23:38 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/cy/cyreg.h b/sys/dev/cy/cyreg.h
index baedda4175b2..88a36eb4a65e 100644
--- a/sys/dev/cy/cyreg.h
+++ b/sys/dev/cy/cyreg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cyreg.h,v 1.7 1998/08/13 19:03:22 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/dec/mcclock.c b/sys/dev/dec/mcclock.c
index fc06f829e3d9..a8a94be5e3d0 100644
--- a/sys/dev/dec/mcclock.c
+++ b/sys/dev/dec/mcclock.c
@@ -1,4 +1,4 @@
-/* $Id: mcclock.c,v 1.2 1998/06/14 13:45:41 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: mcclock.c,v 1.11 1998/04/19 07:50:25 jonathan Exp $ */
 
 /*
diff --git a/sys/dev/dec/mcclock_if.m b/sys/dev/dec/mcclock_if.m
index 79686237ed57..01b8a64dc6a2 100644
--- a/sys/dev/dec/mcclock_if.m
+++ b/sys/dev/dec/mcclock_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: mcclock_if.m,v 1.1 1998/06/14 13:52:55 dfr Exp $
+# $FreeBSD$
 #
 
 INTERFACE mcclock;
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 3e7e14e5f24c..60008abe5133 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.50 1999/05/31 11:25:31 phk Exp $
+ *  dgb.c $FreeBSD$
  *
  *  Digiboard driver.
  *
diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c
index b289be432d50..5deb61df9681 100644
--- a/sys/dev/dgb/dgm.c
+++ b/sys/dev/dgb/dgm.c
@@ -1,5 +1,5 @@
 /*-
- *	$Id: dgm.c,v 1.15 1999/05/31 11:25:33 phk Exp $
+ * $FreeBSD$
  *
  *  This driver and the associated header files support the ISA PC/Xem
  *  Digiboards.  Its evolutionary roots are described below.
diff --git a/sys/dev/dgb/dgmbios.h b/sys/dev/dgb/dgmbios.h
index 3193c9dafb2b..498bced5358a 100644
--- a/sys/dev/dgb/dgmbios.h
+++ b/sys/dev/dgb/dgmbios.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *
  * This file is an ascii copy of the file sxbios.bin included in the
  * Digiboard PC/Xem driver for Linux.  It is copyright 1992, DIGI 
diff --git a/sys/dev/dgb/dgmfep.h b/sys/dev/dgb/dgmfep.h
index ed30e4a2fe6f..7921fa3b058f 100644
--- a/sys/dev/dgb/dgmfep.h
+++ b/sys/dev/dgb/dgmfep.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *
  * This file is an ascii copy of the file sxbios.bin included in the
  * Digiboard PC/Xem driver for Linux.  It is copyright 1992, DIGI 
diff --git a/sys/dev/dgb/dgmreg.h b/sys/dev/dgb/dgmreg.h
index 95fddf846d24..2f052b530c11 100644
--- a/sys/dev/dgb/dgmreg.h
+++ b/sys/dev/dgb/dgmreg.h
@@ -1,5 +1,5 @@
 /*-
- *  dgmreg.h $Id: dgreg.h,v 1.4.2.1 1996/12/19 14:57:36 davidg Exp $
+ *  dgmreg.h $FreeBSD$
  *
  *  Digiboard driver.
  *
diff --git a/sys/dev/dgb/dgreg.h b/sys/dev/dgb/dgreg.h
index 8b520fb687ed..73c29624294e 100644
--- a/sys/dev/dgb/dgreg.h
+++ b/sys/dev/dgb/dgreg.h
@@ -1,5 +1,5 @@
 /*-
- *  dgreg.h $Id: dgreg.h,v 1.7 1997/02/22 09:29:43 peter Exp $
+ *  dgreg.h $FreeBSD$
  *
  *  Digiboard driver.
  *
diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h
index 298f1326b819..6202f5ac8c0a 100644
--- a/sys/dev/dpt/dpt.h
+++ b/sys/dev/dpt/dpt.h
@@ -40,7 +40,7 @@
  */
 
 
-#ident "$Id: dpt.h,v 1.4 1998/09/22 04:55:07 gibbs Exp $"
+#ident "$FreeBSD$"
 
 #ifndef _DPT_H
 #define _DPT_H
diff --git a/sys/dev/dpt/dpt_control.c b/sys/dev/dpt/dpt_control.c
index 93a4b39b6b2a..c676d8165b67 100644
--- a/sys/dev/dpt/dpt_control.c
+++ b/sys/dev/dpt/dpt_control.c
@@ -36,7 +36,7 @@
  * future.
  */
 
-#ident "$Id: dpt_control.c,v 1.13 1999/05/30 16:51:20 phk Exp $"
+#ident "$FreeBSD$"
 
 #include "opt_dpt.h"
 
diff --git a/sys/dev/dpt/dpt_eisa.c b/sys/dev/dpt/dpt_eisa.c
index caeab91f3028..8518214db90b 100644
--- a/sys/dev/dpt/dpt_eisa.c
+++ b/sys/dev/dpt/dpt_eisa.c
@@ -33,7 +33,7 @@
  */
 
 /*
- * $Id: dpt_eisa.c,v 1.7 1999/08/01 22:57:09 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/dev/dpt/dpt_eisa.h b/sys/dev/dpt/dpt_eisa.h
index 0731911d36cb..683ff655953c 100644
--- a/sys/dev/dpt/dpt_eisa.h
+++ b/sys/dev/dpt/dpt_eisa.h
@@ -32,7 +32,7 @@
  */
 
 /*
- * $Id: dpt_eisa.h,v 1.2 1998/09/15 08:33:35 gibbs Exp $
+ * $FreeBSD$
  */
 
 #define DPT_EISA_SLOT_OFFSET		0xc00
diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c
index 3828d08b6cb0..9df90db97c00 100644
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@@ -32,7 +32,7 @@
  *  dptpci.c:  PCI Bus Attachment for DPT SCSI HBAs
  */
 
-#ident "$Id: dpt_pci.c,v 1.14 1999/08/16 01:52:20 gibbs Exp $"
+#ident "$FreeBSD$"
 
 #include "opt_dpt.h"
 
diff --git a/sys/dev/dpt/dpt_pci.h b/sys/dev/dpt/dpt_pci.h
index 4db7bf985f57..fe7206a1882d 100644
--- a/sys/dev/dpt/dpt_pci.h
+++ b/sys/dev/dpt/dpt_pci.h
@@ -28,7 +28,7 @@
  *
  */
 
-#ident "$Id: dpt_pci.h,v 1.3 1997/10/02 04:25:30 ShimonR Exp $"
+#ident "$FreeBSD$"
 
 #define DPT_VENDOR_ID             0x00001044
 #define DPT_DEVICE_ID             0x0000a400
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index c42f171e2a43..5858ee2cbcbc 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -43,7 +43,7 @@
  *	       arrays that span controllers (Wow!).
  */
 
-#ident "$Id: dpt_scsi.c,v 1.25 1999/08/21 06:24:02 msmith Exp $"
+#ident "$FreeBSD$"
 
 #define _DPT_C_
 
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index d65ac48c3d38..fed261abfe59 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.152 1999/05/09 23:24:45 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index 5f9d2682061a..023457e37c33 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_ed_p.c,v 1.16 1999/05/09 17:06:52 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ed/if_edreg.h b/sys/dev/ed/if_edreg.h
index 20a14ed8d86e..db1a89d9f7ec 100644
--- a/sys/dev/ed/if_edreg.h
+++ b/sys/dev/ed/if_edreg.h
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: if_edreg.h,v 1.24 1998/10/08 17:04:47 kato Exp $
+ * $FreeBSD$
  */
 /*
  * National Semiconductor DS8390 NIC register definitions
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index 1aeb1df1af97..869ebbe6cabc 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.c,v 1.50 1999/08/01 22:57:09 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "opt_eisa.h"
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index 6174b6b36926..8330bb4a7353 100644
--- a/sys/dev/eisa/eisaconf.h
+++ b/sys/dev/eisa/eisaconf.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.h,v 1.18 1999/04/18 15:50:33 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_EISA_EISACONF_H_
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index d1f3460aa545..a4027a6ae37a 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.83 1999/08/18 22:14:20 mdodd Exp $
+ * $FreeBSD$
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c
index b6ccff13af41..663409d4b75a 100644
--- a/sys/dev/ep/if_ep_eisa.c
+++ b/sys/dev/ep/if_ep_eisa.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: 3c5x9.c,v 1.12 1999/05/08 21:59:15 dfr Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h
index 997b228d01f7..08ff37be4fc7 100644
--- a/sys/dev/ep/if_epreg.h
+++ b/sys/dev/ep/if_epreg.h
@@ -31,7 +31,7 @@
 
  */
 /*
- *  $Id: if_epreg.h,v 1.23 1998/04/17 22:36:35 des Exp $
+ * $FreeBSD$
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 2aef5b290ac4..bd8103e8bb7c 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ex.c,v 1.17 1999/08/18 06:11:58 mdodd Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index ba697cfbe193..86628aaaa361 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: fb.c,v 1.7 1999/07/04 14:58:15 phk Exp $
+ * $FreeBSD$
  */
 
 #include "fb.h"
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index ff13bd8ae47d..0dc20165c496 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: fbreg.h,v 1.3 1999/04/12 13:34:56 des Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEV_FB_FBREG_H_
diff --git a/sys/dev/fb/splash.c b/sys/dev/fb/splash.c
index 6a6dce0fc4f3..c75557083dc0 100644
--- a/sys/dev/fb/splash.c
+++ b/sys/dev/fb/splash.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: splash.c,v 1.4 1999/06/22 14:13:24 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "splash.h"
diff --git a/sys/dev/fb/splash_bmp.c b/sys/dev/fb/splash_bmp.c
index 6de5a28274d2..71a53b9c38a4 100644
--- a/sys/dev/fb/splash_bmp.c
+++ b/sys/dev/fb/splash_bmp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: splash_bmp.c,v 1.8 1999/06/16 14:04:45 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fb/splash_pcx.c b/sys/dev/fb/splash_pcx.c
index 9b81c3f7ae7d..544e8c795785 100644
--- a/sys/dev/fb/splash_pcx.c
+++ b/sys/dev/fb/splash_pcx.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: splash_pcx.c,v 1.2 1999/06/22 14:14:06 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fb/splashreg.h b/sys/dev/fb/splashreg.h
index a34a3b953b3e..b0c761562350 100644
--- a/sys/dev/fb/splashreg.h
+++ b/sys/dev/fb/splashreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: splashreg.h,v 1.2 1999/01/11 03:06:28 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEV_FB_SPLASHREG_H_
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index d6cddaa22d7e..6c96dae439a7 100644
--- a/sys/dev/fb/vga.c
+++ b/sys/dev/fb/vga.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vga.c,v 1.2 1999/06/26 10:52:54 peter Exp $
+ * $FreeBSD$
  */
 
 #include "vga.h"
diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h
index e9e9eb24a35f..94c65e0976fe 100644
--- a/sys/dev/fb/vgareg.h
+++ b/sys/dev/fb/vgareg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vgareg.h,v 1.1 1999/01/09 02:44:49 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEV_FB_VGAREG_H_
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index c2670fdea655..ce2ea33bc405 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.153 1999/08/23 20:58:59 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/fdc/fdcreg.h b/sys/dev/fdc/fdcreg.h
index 7fef8ad098d4..4d01c4121cea 100644
--- a/sys/dev/fdc/fdcreg.h
+++ b/sys/dev/fdc/fdcreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: fdreg.h,v 1.10 1997/02/22 09:36:11 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 00b793420dd1..9e3dd65ac396 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.53 1999/08/18 22:14:21 mdodd Exp $
+ * $FreeBSD$
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 3.x
diff --git a/sys/dev/fe/if_fereg.h b/sys/dev/fe/if_fereg.h
index d9b943c5febf..7e28201f6987 100644
--- a/sys/dev/fe/if_fereg.h
+++ b/sys/dev/fe/if_fereg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: if_fereg.h,v 1.5 1997/02/22 09:36:28 peter Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Registers on FMV-180 series' ISA bus interface ASIC.
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 724668c1a328..ee97515fc158 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.69 1999/05/09 10:45:54 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h
index d6db196244d7..e593608f0c3b 100644
--- a/sys/dev/fxp/if_fxpreg.h
+++ b/sys/dev/fxp/if_fxpreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxpreg.h,v 1.14 1999/02/11 21:47:10 julian Exp $
+ * $FreeBSD$
  */
 
 #define FXP_VENDORID_INTEL	0x8086
diff --git a/sys/dev/fxp/if_fxpvar.h b/sys/dev/fxp/if_fxpvar.h
index 042d2df96284..7c4717db941e 100644
--- a/sys/dev/fxp/if_fxpvar.h
+++ b/sys/dev/fxp/if_fxpvar.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxpvar.h,v 1.6 1998/08/02 00:29:15 dg Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c
index 70776809f0d1..ca7e2a3aad73 100644
--- a/sys/dev/hea/eni.c
+++ b/sys/dev/hea/eni.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni.c,v 1.8 1999/05/10 22:53:41 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef	lint
-__RCSID("@(#) $Id: eni.c,v 1.8 1999/05/10 22:53:41 mks Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni.h b/sys/dev/hea/eni.h
index ff4a81b0c2c4..e44a2a9f43e6 100644
--- a/sys/dev/hea/eni.h
+++ b/sys/dev/hea/eni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni.h,v 1.7 1998/06/29 19:45:14 jpt Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hea/eni_buffer.c b/sys/dev/hea/eni_buffer.c
index 509818d68f1d..1051dd499350 100644
--- a/sys/dev/hea/eni_buffer.c
+++ b/sys/dev/hea/eni_buffer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_buffer.c,v 1.3 1999/04/11 02:55:51 eivind Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_buffer.c,v 1.3 1999/04/11 02:55:51 eivind Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 static int	eni_test_memory __P((Eni_unit *));
diff --git a/sys/dev/hea/eni_globals.c b/sys/dev/hea/eni_globals.c
index 2f84e0b9da29..0c7d5207e81b 100644
--- a/sys/dev/hea/eni_globals.c
+++ b/sys/dev/hea/eni_globals.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_globals.c,v 1.2 1998/10/31 20:06:45 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_globals.c,v 1.2 1998/10/31 20:06:45 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni_if.c b/sys/dev/hea/eni_if.c
index 00f92337a221..08ce89a63ce2 100644
--- a/sys/dev/hea/eni_if.c
+++ b/sys/dev/hea/eni_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_if.c,v 1.3 1998/12/04 22:54:45 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_if.c,v 1.3 1998/12/04 22:54:45 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 static void	eni_get_stats __P((Eni_unit *));
diff --git a/sys/dev/hea/eni_init.c b/sys/dev/hea/eni_init.c
index 5706c65adb32..996c0eccb9a1 100644
--- a/sys/dev/hea/eni_init.c
+++ b/sys/dev/hea/eni_init.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_init.c,v 1.1 1998/09/15 08:22:53 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_init.c,v 1.1 1998/09/15 08:22:53 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni_intr.c b/sys/dev/hea/eni_intr.c
index ccc0d6bbc547..cbf7ef02eaa8 100644
--- a/sys/dev/hea/eni_intr.c
+++ b/sys/dev/hea/eni_intr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_intr.c,v 1.2 1998/09/17 09:34:58 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_intr.c,v 1.2 1998/09/17 09:34:58 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 static void	eni_suni_intr __P((Eni_unit *));
diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c
index 883602bb065a..2722233afd8a 100644
--- a/sys/dev/hea/eni_receive.c
+++ b/sys/dev/hea/eni_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_receive.c,v 1.3 1998/10/31 20:06:45 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_receive.c,v 1.3 1998/10/31 20:06:45 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 static void	eni_recv_stack __P((void *, KBuffer *));
diff --git a/sys/dev/hea/eni_stats.h b/sys/dev/hea/eni_stats.h
index 1f2a4139f5fb..ddcc55ff775c 100644
--- a/sys/dev/hea/eni_stats.h
+++ b/sys/dev/hea/eni_stats.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_stats.h,v 1.6 1998/08/26 23:28:54 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hea/eni_suni.h b/sys/dev/hea/eni_suni.h
index 3a0b0f74bec0..3ebce6030679 100644
--- a/sys/dev/hea/eni_suni.h
+++ b/sys/dev/hea/eni_suni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_suni.h,v 1.2 1997/05/06 22:08:17 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hea/eni_transmit.c b/sys/dev/hea/eni_transmit.c
index f44ec41223e4..c80438374673 100644
--- a/sys/dev/hea/eni_transmit.c
+++ b/sys/dev/hea/eni_transmit.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_transmit.c,v 1.3 1998/10/31 20:06:45 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_transmit.c,v 1.3 1998/10/31 20:06:45 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni_var.h b/sys/dev/hea/eni_var.h
index cc83a122dbdc..f13a99d94fab 100644
--- a/sys/dev/hea/eni_var.h
+++ b/sys/dev/hea/eni_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_var.h,v 1.4 1998/06/29 19:55:26 jpt Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hea/eni_vcm.c b/sys/dev/hea/eni_vcm.c
index a88fc01bc67a..d552ddf89a18 100644
--- a/sys/dev/hea/eni_vcm.c
+++ b/sys/dev/hea/eni_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_vcm.c,v 1.1 1998/09/15 08:22:54 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_vcm.c,v 1.1 1998/09/15 08:22:54 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore.h b/sys/dev/hfa/fore.h
index 42f44f0665b1..04099824075e 100644
--- a/sys/dev/hfa/fore.h
+++ b/sys/dev/hfa/fore.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore.h,v 1.8 1998/08/26 23:28:57 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hfa/fore_aali.h b/sys/dev/hfa/fore_aali.h
index d59dcfce3b10..c5bf8038f1a3 100644
--- a/sys/dev/hfa/fore_aali.h
+++ b/sys/dev/hfa/fore_aali.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_aali.h,v 1.5 1997/05/09 00:42:25 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c
index ccf91b372e28..ff3396d972e7 100644
--- a/sys/dev/hfa/fore_buffer.c
+++ b/sys/dev/hfa/fore_buffer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_buffer.c,v 1.2 1998/10/31 20:06:52 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_buffer.c,v 1.2 1998/10/31 20:06:52 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c
index bb4187f4fc36..5823a3623c5d 100644
--- a/sys/dev/hfa/fore_command.c
+++ b/sys/dev/hfa/fore_command.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_command.c,v 1.4 1998/12/04 22:54:45 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_command.c,v 1.4 1998/12/04 22:54:45 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c
index dae4c34371d2..ff8cc6c2e949 100644
--- a/sys/dev/hfa/fore_globals.c
+++ b/sys/dev/hfa/fore_globals.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_globals.c,v 1.2 1998/10/31 20:06:52 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_globals.c,v 1.2 1998/10/31 20:06:52 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c
index 2c4a9de21964..930e0f9f0ec9 100644
--- a/sys/dev/hfa/fore_if.c
+++ b/sys/dev/hfa/fore_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_if.c,v 1.3 1998/12/04 22:54:45 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_if.c,v 1.3 1998/12/04 22:54:45 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_include.h b/sys/dev/hfa/fore_include.h
index b146a3cc7d41..4ffe4ce424c6 100644
--- a/sys/dev/hfa/fore_include.h
+++ b/sys/dev/hfa/fore_include.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_include.h,v 1.8 1998/02/19 20:10:18 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c
index 7c1ee96dd905..1594f3e6b06e 100644
--- a/sys/dev/hfa/fore_init.c
+++ b/sys/dev/hfa/fore_init.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_init.c,v 1.3 1998/10/31 20:06:53 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_init.c,v 1.3 1998/10/31 20:06:53 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c
index 6fba5f224a7c..aa7f05cce99a 100644
--- a/sys/dev/hfa/fore_intr.c
+++ b/sys/dev/hfa/fore_intr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_intr.c,v 1.1 1998/09/15 08:22:55 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_intr.c,v 1.1 1998/09/15 08:22:55 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 #if defined(sun)
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index f7eeeeced31f..bdb42cabfb30 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_load.c,v 1.9 1999/05/30 16:51:25 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_load.c,v 1.9 1999/05/30 16:51:25 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c
index 0a5bcd2ca86c..e67874c4b584 100644
--- a/sys/dev/hfa/fore_output.c
+++ b/sys/dev/hfa/fore_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_output.c,v 1.2 1998/10/31 20:06:53 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_output.c,v 1.2 1998/10/31 20:06:53 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index a86545c6db7a..be07791aae6e 100644
--- a/sys/dev/hfa/fore_receive.c
+++ b/sys/dev/hfa/fore_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_receive.c,v 1.3 1998/10/31 20:06:53 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_receive.c,v 1.3 1998/10/31 20:06:53 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_slave.h b/sys/dev/hfa/fore_slave.h
index 05e7b5be8cfe..9f7d3224fcb4 100644
--- a/sys/dev/hfa/fore_slave.h
+++ b/sys/dev/hfa/fore_slave.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_slave.h,v 1.5 1997/08/22 19:45:50 jpt Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c
index c1a1fab14e81..a01c5e50f6a7 100644
--- a/sys/dev/hfa/fore_stats.c
+++ b/sys/dev/hfa/fore_stats.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_stats.c,v 1.2 1998/09/17 09:34:59 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_stats.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_stats.h b/sys/dev/hfa/fore_stats.h
index 3803ddd20ef8..53b568f69ebd 100644
--- a/sys/dev/hfa/fore_stats.h
+++ b/sys/dev/hfa/fore_stats.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_stats.h,v 1.3 1997/05/06 22:10:21 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c
index 15cb02efbe65..df5cff86b42a 100644
--- a/sys/dev/hfa/fore_timer.c
+++ b/sys/dev/hfa/fore_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_timer.c,v 1.1 1998/09/15 08:22:56 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_timer.c,v 1.1 1998/09/15 08:22:56 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c
index 4be4a8984892..45445d420313 100644
--- a/sys/dev/hfa/fore_transmit.c
+++ b/sys/dev/hfa/fore_transmit.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_transmit.c,v 1.2 1998/10/31 20:06:53 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_transmit.c,v 1.2 1998/10/31 20:06:53 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_var.h b/sys/dev/hfa/fore_var.h
index 25d21319ecc6..5a1533f3c2c6 100644
--- a/sys/dev/hfa/fore_var.h
+++ b/sys/dev/hfa/fore_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_var.h,v 1.8 1998/02/19 20:10:53 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c
index 325883b31b6e..e2bc530ef5e3 100644
--- a/sys/dev/hfa/fore_vcm.c
+++ b/sys/dev/hfa/fore_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_vcm.c,v 1.2 1998/09/17 09:34:59 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_vcm.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/ic/cd1400.h b/sys/dev/ic/cd1400.h
index ee9b9f27a4dd..90672c4ee7e6 100644
--- a/sys/dev/ic/cd1400.h
+++ b/sys/dev/ic/cd1400.h
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cd1400.h,v 1.4 1997/02/22 09:37:59 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ic/esp.h b/sys/dev/ic/esp.h
index 6621e6503917..a381ee7d22aa 100644
--- a/sys/dev/ic/esp.h
+++ b/sys/dev/ic/esp.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _IC_ESP_H_
diff --git a/sys/dev/ic/hd64570.h b/sys/dev/ic/hd64570.h
index e26e89fb789c..b676e25a9cd5 100644
--- a/sys/dev/ic/hd64570.h
+++ b/sys/dev/ic/hd64570.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef _HD64570_H_
 #define _HD64570_H_
diff --git a/sys/dev/ic/i8237.h b/sys/dev/ic/i8237.h
index e955a33b833d..2bc8a08317c6 100644
--- a/sys/dev/ic/i8237.h
+++ b/sys/dev/ic/i8237.h
@@ -1,7 +1,7 @@
 /*
  * Intel 8237 DMA Controller
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #define	DMA37MD_SINGLE	0x40	/* single pass mode */
diff --git a/sys/dev/ic/i82586.h b/sys/dev/ic/i82586.h
index 704d624b77ae..964621bd3677 100644
--- a/sys/dev/ic/i82586.h
+++ b/sys/dev/ic/i82586.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: i82586.h,v 1.7 1998/08/10 17:21:48 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ic/nec765.h b/sys/dev/ic/nec765.h
index 3a5561888e87..c08b73b7d600 100644
--- a/sys/dev/ic/nec765.h
+++ b/sys/dev/ic/nec765.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
- *	$Id: nec765.h,v 1.6 1997/02/22 09:38:04 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ic/ns16550.h b/sys/dev/ic/ns16550.h
index ba338886c764..e8fad7da832e 100644
--- a/sys/dev/ic/ns16550.h
+++ b/sys/dev/ic/ns16550.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c
index b7fca561cf41..509d0465e908 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ida.c,v 1.1 1999/06/24 03:31:57 jlemon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 456491623e4e..24be38be7e3a 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ida_disk.c,v 1.2 1999/07/04 14:58:16 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index 330ce7ca1941..70007fb87d43 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ida_pci.c,v 1.3 1999/07/29 01:03:02 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ida/idareg.h b/sys/dev/ida/idareg.h
index 69c39650b80f..506c495cd779 100644
--- a/sys/dev/ida/idareg.h
+++ b/sys/dev/ida/idareg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ida/idavar.h b/sys/dev/ida/idavar.h
index 7b8012a8e3b2..75401b476d8a 100644
--- a/sys/dev/ida/idavar.h
+++ b/sys/dev/ida/idavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index d6c928b98f9c..83142b44bde7 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.66 1999/08/21 06:24:14 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ie/if_ie507.h b/sys/dev/ie/if_ie507.h
index 7583ffd0a037..9be1396cf49e 100644
--- a/sys/dev/ie/if_ie507.h
+++ b/sys/dev/ie/if_ie507.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * Definitions for 3C507
  */
 
diff --git a/sys/dev/ie/if_iereg.h b/sys/dev/ie/if_iereg.h
index 3588b8414058..875f63ca9dbb 100644
--- a/sys/dev/ie/if_iereg.h
+++ b/sys/dev/ie/if_iereg.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * definitions for AT&T StarLAN 10 etc...
  */
 
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index 58144d052d77..a9649ea357c5 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ic.c,v 1.4 1999/05/08 21:59:03 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index bb4ee16e5098..158449e9bf14 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iic.c,v 1.12 1999/05/31 11:24:43 phk Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/iicbus/iic.h b/sys/dev/iicbus/iic.h
index 6649821e0240..5d362c1a2dd4 100644
--- a/sys/dev/iicbus/iic.h
+++ b/sys/dev/iicbus/iic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iic.h,v 1.1 1998/09/03 21:00:08 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __IIC_H
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c
index df46c1ad859e..b4e4f63276d2 100644
--- a/sys/dev/iicbus/iicbb.c
+++ b/sys/dev/iicbus/iicbb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iicbb.c,v 1.4 1999/05/08 21:59:04 dfr Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/iicbus/iicbb_if.m b/sys/dev/iicbus/iicbb_if.m
index bdf1108fac95..a99bfe86b888 100644
--- a/sys/dev/iicbus/iicbb_if.m
+++ b/sys/dev/iicbus/iicbb_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: iicbb_if.m,v 1.1 1998/10/31 11:31:07 nsouch Exp $
+# $FreeBSD$
 #
 
 INTERFACE iicbb;
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index e97cbfb0cde6..e4b6f8d45e39 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iicbus.c,v 1.9 1999/05/08 21:59:04 dfr Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/iicbus/iicbus.h b/sys/dev/iicbus/iicbus.h
index 3c230955bbc1..59bbaef4d3fe 100644
--- a/sys/dev/iicbus/iicbus.h
+++ b/sys/dev/iicbus/iicbus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iicbus.h,v 1.2 1998/10/31 11:31:07 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __IICBUS_H
diff --git a/sys/dev/iicbus/iicbus_if.m b/sys/dev/iicbus/iicbus_if.m
index 7e29333db495..ba30c61e0b9f 100644
--- a/sys/dev/iicbus/iicbus_if.m
+++ b/sys/dev/iicbus/iicbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: iicbus_if.m,v 1.2 1998/10/31 11:31:07 nsouch Exp $
+# $FreeBSD$
 #
 
 INTERFACE iicbus;
diff --git a/sys/dev/iicbus/iiconf.c b/sys/dev/iicbus/iiconf.c
index 5727c0580157..42d3a9621c08 100644
--- a/sys/dev/iicbus/iiconf.c
+++ b/sys/dev/iicbus/iiconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iiconf.c,v 1.6 1999/02/06 10:56:09 roger Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/iicbus/iiconf.h b/sys/dev/iicbus/iiconf.h
index 4c2376251f1d..03a4a762efd5 100644
--- a/sys/dev/iicbus/iiconf.h
+++ b/sys/dev/iicbus/iiconf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iiconf.h,v 1.4 1999/01/27 21:49:53 dillon Exp $
+ * $FreeBSD$
  */
 #ifndef __IICONF_H
 #define __IICONF_H
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index 4cea0b5dc2a7..f967551a9d4d 100644
--- a/sys/dev/iicbus/iicsmb.c
+++ b/sys/dev/iicbus/iicsmb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iicsmb.c,v 1.3 1999/05/08 21:59:05 dfr Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/isp/asm_pci.h b/sys/dev/isp/asm_pci.h
index 513cd54a4327..96c4ca797200 100644
--- a/sys/dev/isp/asm_pci.h
+++ b/sys/dev/isp/asm_pci.h
@@ -1,4 +1,4 @@
-/* $Id: asm_pci.h,v 1.12 1999/07/05 20:42:03 mjacob Exp $ */
+/* $FreeBSD$ */
 /* release_6_5_99 */
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 by Qlogic Corporation
diff --git a/sys/dev/isp/asm_sbus.h b/sys/dev/isp/asm_sbus.h
index b521b934d2fe..8165fe1489cf 100644
--- a/sys/dev/isp/asm_sbus.h
+++ b/sys/dev/isp/asm_sbus.h
@@ -1,4 +1,4 @@
-/* $Id: asm_sbus.h,v 1.6 1999/03/17 05:04:38 mjacob Exp $ */
+/* $FreeBSD$ */
 /* release_03_25_99 */
 /*
  * SBus Qlogic Host Adapter Firmware Tables
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index e69eb1a8bef3..377632e2a39b 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -1,4 +1,4 @@
-/* $Id: isp.c,v 1.22 1999/07/05 20:42:06 mjacob Exp $ */
+/* $FreeBSD$ */
 /*
  * Machine and OS Independent (well, as best as possible)
  * code for the Qlogic ISP SCSI adapters.
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index dd368dedce2a..5e6c84c5b9d9 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -1,4 +1,4 @@
-/* $Id: isp_freebsd.c,v 1.22 1999/07/05 20:42:07 mjacob Exp $ */
+/* $FreeBSD$ */
 /*
  * Platform (FreeBSD) dependent common attachment code for Qlogic adapters.
  *
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 552808d6584f..12bc9f2593b7 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -1,4 +1,4 @@
-/* $Id: isp_freebsd.h,v 1.17 1999/07/05 20:42:07 mjacob Exp $ */
+/* $FreeBSD$ */
 /*
  * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions (CAM version)
  *---------------------------------------
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 8fd49bbfd562..1aa31953b36b 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -1,4 +1,4 @@
-/* $Id: isp_pci.c,v 1.30 1999/08/16 19:52:29 mjacob Exp $ */
+/* $FreeBSD$ */
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
  * FreeBSD Version.
diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h
index 62c815f0d98b..c4efab2f81ba 100644
--- a/sys/dev/isp/ispmbox.h
+++ b/sys/dev/isp/ispmbox.h
@@ -1,4 +1,4 @@
-/* $Id: ispmbox.h,v 1.12 1999/07/05 20:42:07 mjacob Exp $ */
+/* $FreeBSD$ */
 /*
  * Mailbox and Queue Entry Definitions for for Qlogic ISP SCSI adapters.
  *
diff --git a/sys/dev/isp/ispreg.h b/sys/dev/isp/ispreg.h
index 26e1c37488c4..893f69784672 100644
--- a/sys/dev/isp/ispreg.h
+++ b/sys/dev/isp/ispreg.h
@@ -1,4 +1,4 @@
-/* $Id: ispreg.h,v 1.8 1999/03/25 22:52:45 mjacob Exp $ */
+/* $FreeBSD$ */
 /* release_5_11_99 */
 /*
  * Machine Independent (well, as best as possible) register
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index 5596934e8971..7a70c137575d 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -1,4 +1,4 @@
-/* $Id: ispvar.h,v 1.17 1999/07/05 20:42:08 mjacob Exp $ */
+/* $FreeBSD$ */
 /*
  * Soft Definitions for for Qlogic ISP SCSI adapters.
  *
diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
index 3786ee9a0b98..3094c60140df 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbd.c,v 1.14 1999/08/22 09:52:32 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "atkbd.h"
diff --git a/sys/dev/kbd/atkbdc.c b/sys/dev/kbd/atkbdc.c
index ded635795b0d..68fcffc29334 100644
--- a/sys/dev/kbd/atkbdc.c
+++ b/sys/dev/kbd/atkbdc.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: atkbdc.c,v 1.2 1999/05/18 11:33:04 yokota Exp $
+ * $FreeBSD$
  * from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp
  */
 
diff --git a/sys/dev/kbd/atkbdcreg.h b/sys/dev/kbd/atkbdcreg.h
index ccf64e4032c7..2085bb67bb92 100644
--- a/sys/dev/kbd/atkbdcreg.h
+++ b/sys/dev/kbd/atkbdcreg.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: atkbdcreg.h,v 1.1 1999/01/09 02:44:50 yokota Exp $
+ * $FreeBSD$
  * from kbdio.h,v 1.8 1998/09/25 11:55:46 yokota Exp
  */
 
diff --git a/sys/dev/kbd/atkbdreg.h b/sys/dev/kbd/atkbdreg.h
index 04401520b759..bda6afb8582d 100644
--- a/sys/dev/kbd/atkbdreg.h
+++ b/sys/dev/kbd/atkbdreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbdreg.h,v 1.2 1999/03/10 10:36:52 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEV_KBD_ATKBDREG_H_
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 869a8ffa2982..945df72e2050 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: kbd.c,v 1.9 1999/05/31 11:24:48 phk Exp $
+ * $FreeBSD$
  */
 
 #include "kbd.h"
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index b074e11a7d5a..4fc5fd63ec97 100644
--- a/sys/dev/kbd/kbdreg.h
+++ b/sys/dev/kbd/kbdreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: kbdreg.h,v 1.3 1999/03/10 10:36:52 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEV_KBD_KBDREG_H_
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index f262ec6ca17e..68ef5e2fa377 100644
--- a/sys/dev/kbd/kbdtables.h
+++ b/sys/dev/kbd/kbdtables.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: kbdtables.h,v 1.44 1999/01/28 10:55:55 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef KBD_DFLT_KEYMAP
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 058ca3f57426..6345dffd1131 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.c,v 1.64 1999/08/18 22:14:23 mdodd Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index c92ffc083bc7..33c7212295ee 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_lnc_p.c,v 1.11 1999/07/03 20:17:04 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/lnc/if_lncvar.h b/sys/dev/lnc/if_lncvar.h
index aeff426d5e17..f3d37f44654c 100644
--- a/sys/dev/lnc/if_lncvar.h
+++ b/sys/dev/lnc/if_lncvar.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.h,v 1.11 1999/07/06 19:22:51 des Exp $
+ * $FreeBSD$
  */
 
 #include <i386/isa/ic/Am7990.h>
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 0f5001715722..5ab40ef0761c 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.108 1999/05/31 11:26:15 phk Exp $
+ * $FreeBSD$
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
diff --git a/sys/dev/mcd/mcdreg.h b/sys/dev/mcd/mcdreg.h
index 219e119d5a87..f0f75f7b2254 100644
--- a/sys/dev/mcd/mcdreg.h
+++ b/sys/dev/mcd/mcdreg.h
@@ -41,7 +41,7 @@
  * the manufacturer or anyone else might provide better documentation,
  * so this file (and the driver) will then have a better quality.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef MCD_H
diff --git a/sys/dev/mii/Makefile.miidevs b/sys/dev/mii/Makefile.miidevs
index 440af1d34922..964ecf3839b5 100644
--- a/sys/dev/mii/Makefile.miidevs
+++ b/sys/dev/mii/Makefile.miidevs
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile.miidevs,v 1.1 1998/08/10 23:55:17 thorpej Exp $
-#	$Id$
+# $FreeBSD$
 
 AWK=	awk
 
diff --git a/sys/dev/mii/devlist2h.awk b/sys/dev/mii/devlist2h.awk
index c6872bc5a8e7..1863a227ab7f 100644
--- a/sys/dev/mii/devlist2h.awk
+++ b/sys/dev/mii/devlist2h.awk
@@ -64,7 +64,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id$
+# $FreeBSD$
 #
 function collectline(f, line) {
 	oparen = 0
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 86c624b1321c..9284c7ae11be 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -89,7 +89,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 static int exphy_probe		__P((device_t));
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index 833c3a24064e..e64488fa0a59 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -60,7 +60,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: mii.c,v 1.1 1999/08/21 17:40:41 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 static int miibus_readreg	__P((device_t, int, int));
diff --git a/sys/dev/mii/mii.h b/sys/dev/mii/mii.h
index 6c94671c371b..c21fe0377085 100644
--- a/sys/dev/mii/mii.h
+++ b/sys/dev/mii/mii.h
@@ -31,7 +31,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _DEV_MII_MII_H_
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index 408fa12b03ab..ff4719050930 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -61,7 +61,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 void	mii_phy_auto_timeout __P((void *));
diff --git a/sys/dev/mii/miibus_if.m b/sys/dev/mii/miibus_if.m
index 2bf1dd1daa70..d540964cb102 100644
--- a/sys/dev/mii/miibus_if.m
+++ b/sys/dev/mii/miibus_if.m
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 INTERFACE miibus;
 
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index 9fcb55cec150..ed86e437b560 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/
 
 /*-
diff --git a/sys/dev/mii/miidevs.h b/sys/dev/mii/miidevs.h
index 0177c202045d..11689a42bc3c 100644
--- a/sys/dev/mii/miidevs.h
+++ b/sys/dev/mii/miidevs.h
@@ -1,4 +1,4 @@
-/*	$Id$	*/
+/* $FreeBSD$	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index bd5121e711cb..52380fa946e3 100644
--- a/sys/dev/mii/miivar.h
+++ b/sys/dev/mii/miivar.h
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * 	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _DEV_MII_MIIVAR_H_
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index ac4cc7ab1333..4c58a4e5d1e9 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -93,7 +93,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 static int nsphy_probe		__P((device_t));
diff --git a/sys/dev/mii/nsphyreg.h b/sys/dev/mii/nsphyreg.h
index 9d9614286eb4..5ff0490b1dfe 100644
--- a/sys/dev/mii/nsphyreg.h
+++ b/sys/dev/mii/nsphyreg.h
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _DEV_MII_NSPHYREG_H_
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 2efd30588526..cb22eab1cefe 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -91,7 +91,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 static int ukphy_probe		__P((device_t));
diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c
index 11904a21601d..d39ef4651b93 100644
--- a/sys/dev/mii/ukphy_subr.c
+++ b/sys/dev/mii/ukphy_subr.c
@@ -59,7 +59,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index ddc41a8215f5..f6d6c663652b 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.44 1999/05/31 11:26:17 phk Exp $
+ * $FreeBSD$
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/dev/pccard/if_xe.c b/sys/dev/pccard/if_xe.c
index 4d67a35a54dc..d8351f09f730 100644
--- a/sys/dev/pccard/if_xe.c
+++ b/sys/dev/pccard/if_xe.c
@@ -23,8 +23,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $
- *	$FreeBSD$
+ * $FreeBSD$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/pccard/if_xereg.h b/sys/dev/pccard/if_xereg.h
index a4ecb35da19c..9eb7d3138288 100644
--- a/sys/dev/pccard/if_xereg.h
+++ b/sys/dev/pccard/if_xereg.h
@@ -23,8 +23,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_xereg.h,v 1.5 1999/05/20 21:53:58 scott Exp $
- *	$FreeBSD$
+ * $FreeBSD$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index e5498b40b5fd..8cebfb004c0d 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pcf.c,v 1.9 1999/05/08 21:59:27 dfr Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 75f41e87c72b..214d6f96b80f 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci.c,v 1.114 1999/07/29 01:03:03 mdodd Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/pci/pci_if.m b/sys/dev/pci/pci_if.m
index b2fa6758fef6..95b0081ca32b 100644
--- a/sys/dev/pci/pci_if.m
+++ b/sys/dev/pci/pci_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id$
+# $FreeBSD$
 #
 
 INTERFACE pci;
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index 9c0dba09331d..f90df10e14de 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcireg.h,v 1.20 1998/10/07 03:40:51 gibbs Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index f1c6f5e4d744..ae4958dbf265 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcivar.h,v 1.33 1999/05/20 15:33:33 gallatin Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index c98eb4bf96af..21c90d4a7dd6 100644
--- a/sys/dev/pdq/if_fea.c
+++ b/sys/dev/pdq/if_fea.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fea.c,v 1.16 1999/07/31 00:43:48 mdodd Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 7d816b8c8075..d70628a9e708 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fpa.c,v 1.11 1999/08/21 06:24:34 msmith Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/pdq/pdq.c b/sys/dev/pdq/pdq.c
index cb0e531221d5..055bdc2f9d28 100644
--- a/sys/dev/pdq/pdq.c
+++ b/sys/dev/pdq/pdq.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdq.c,v 1.3 1999/01/27 19:35:33 dillon Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 6bcb5c7b29c2..545d66ccf3f6 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdq_ifsubr.c,v 1.7 1998/02/20 13:11:45 bde Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/pdq/pdqreg.h b/sys/dev/pdq/pdqreg.h
index 6c4d51a1dfad..f3cfa84fdcb5 100644
--- a/sys/dev/pdq/pdqreg.h
+++ b/sys/dev/pdq/pdqreg.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdqreg.h,v 1.9 1996/05/16 14:25:26 thomas Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/pdq/pdqvar.h b/sys/dev/pdq/pdqvar.h
index 5587d188931e..8320eaec69f9 100644
--- a/sys/dev/pdq/pdqvar.h
+++ b/sys/dev/pdq/pdqvar.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdqvar.h,v 1.1.1.1 1997/01/17 23:19:49 joerg Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 6d60a78196f6..e82f49f23858 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
- *	$Id: if_plip.c,v 1.12 1999/02/14 16:19:16 nsouch Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ppbus/immio.c b/sys/dev/ppbus/immio.c
index 50b9c06a707e..a744dc86651e 100644
--- a/sys/dev/ppbus/immio.c
+++ b/sys/dev/ppbus/immio.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: immio.c,v 1.6 1999/01/30 15:35:39 nsouch Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index 08f454045821..bf2880798ebe 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lpbb.c,v 1.5 1999/05/08 21:59:06 dfr Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 956c6a7c8d6f..56312b4002ac 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -48,7 +48,7 @@
  *	from: unknown origin, 386BSD 0.1
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
  *	From Id: nlpt.c,v 1.14 1999/02/08 13:55:43 des Exp
- *	$Id: lpt.c,v 1.6 1999/06/03 22:03:35 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ppbus/lpt.h b/sys/dev/ppbus/lpt.h
index 3ca268d081fe..9075b4ec6e5a 100644
--- a/sys/dev/ppbus/lpt.h
+++ b/sys/dev/ppbus/lpt.h
@@ -34,7 +34,7 @@
  *	Id: lptreg.h,v 1.6 1997/02/22 09:36:52 peter Exp 
  *	From Id: nlpt.h,v 1.3 1999/01/10 12:04:54 nsouch Exp
  *
- *	$Id: lpt.h,v 1.2 1999/02/14 16:19:16 nsouch Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ppbus/lptio.h b/sys/dev/ppbus/lptio.h
index 2d70d7ee3397..56d196a62fef 100644
--- a/sys/dev/ppbus/lptio.h
+++ b/sys/dev/ppbus/lptio.h
@@ -11,7 +11,7 @@
  *
  *	Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za>
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_LPT_H_
diff --git a/sys/dev/ppbus/ppb_1284.c b/sys/dev/ppbus/ppb_1284.c
index 5da5fa3eac3a..30221747dddf 100644
--- a/sys/dev/ppbus/ppb_1284.c
+++ b/sys/dev/ppbus/ppb_1284.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppb_1284.c,v 1.7 1999/01/10 12:04:54 nsouch Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/ppbus/ppb_1284.h b/sys/dev/ppbus/ppb_1284.h
index ea009b7d381d..f975c26e2475 100644
--- a/sys/dev/ppbus/ppb_1284.h
+++ b/sys/dev/ppbus/ppb_1284.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppb_1284.h,v 1.3 1998/09/13 18:26:26 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __1284_H
diff --git a/sys/dev/ppbus/ppb_base.c b/sys/dev/ppbus/ppb_base.c
index fed87304e182..250999be814f 100644
--- a/sys/dev/ppbus/ppb_base.c
+++ b/sys/dev/ppbus/ppb_base.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppb_base.c,v 1.7 1999/01/27 20:09:19 dillon Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppb_msq.c b/sys/dev/ppbus/ppb_msq.c
index e0893e702f19..d5b729a18476 100644
--- a/sys/dev/ppbus/ppb_msq.c
+++ b/sys/dev/ppbus/ppb_msq.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppb_msq.c,v 1.4 1999/01/10 12:04:54 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #include <machine/stdarg.h>
diff --git a/sys/dev/ppbus/ppb_msq.h b/sys/dev/ppbus/ppb_msq.h
index 3ddf434c657a..25b55fd798b9 100644
--- a/sys/dev/ppbus/ppb_msq.h
+++ b/sys/dev/ppbus/ppb_msq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppb_msq.h,v 1.5 1999/01/30 15:35:39 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __PPB_MSQ_H
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index a11260ec5c24..f98fcf27aad1 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppbconf.c,v 1.13 1999/01/14 06:22:02 jdp Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h
index 62bd99cea7ce..4160f0ca2e91 100644
--- a/sys/dev/ppbus/ppbconf.h
+++ b/sys/dev/ppbus/ppbconf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppbconf.h,v 1.14 1999/04/05 15:43:11 peter Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __PPBCONF_H
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index e19be8c3a91b..0d8c97006a7f 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppi.c,v 1.14 1999/05/30 16:51:35 phk Exp $
+ * $FreeBSD$
  *
  */
 #include "ppi.h"
diff --git a/sys/dev/ppbus/ppi.h b/sys/dev/ppbus/ppi.h
index 243c87fa63c7..7d854e3bfb7f 100644
--- a/sys/dev/ppbus/ppi.h
+++ b/sys/dev/ppbus/ppi.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppi.h,v 1.2 1998/01/02 09:30:39 msmith Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __PPI_H
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index 5279f113e8b9..14204b18e085 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: pps.c,v 1.19 1999/05/31 11:25:00 phk Exp $
+ * $FreeBSD$
  *
  * This driver implements a draft-mogul-pps-api-02.txt PPS source.
  *
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index 11b5530f68e4..f589ecfee36a 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vpo.c,v 1.14 1999/05/06 21:14:49 ken Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index 4b9ff52fba31..b1582293d825 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vpoio.c,v 1.6 1999/01/30 15:35:39 nsouch Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/ppbus/vpoio.h b/sys/dev/ppbus/vpoio.h
index 1bd7d11adb1f..e007d3e8e422 100644
--- a/sys/dev/ppbus/vpoio.h
+++ b/sys/dev/ppbus/vpoio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vpoio.h,v 1.1.2.2 1998/06/14 14:37:43 son Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __VP0IO_H
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index 073eab558d8f..436caebf84a2 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppc.c,v 1.20 1999/02/14 22:02:47 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #include "ppc.h"
diff --git a/sys/dev/ppc/ppcreg.h b/sys/dev/ppc/ppcreg.h
index 3a61ae7675a9..faecb9771ff8 100644
--- a/sys/dev/ppc/ppcreg.h
+++ b/sys/dev/ppc/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppcreg.h,v 1.7 1999/01/10 16:41:13 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index b16f6e4f9131..a3a4db2be574 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rp.c,v 1.28 1999/05/31 11:26:24 phk Exp $
+ * $FreeBSD$
  */
 
 /* 
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index a9e39f13fdc2..5ec3eadead22 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.47 1999/05/31 11:26:26 phk Exp $ */
+/* $FreeBSD$ */
 
 /* Please send any comments to micke@dynas.se */
 
diff --git a/sys/dev/scd/scdreg.h b/sys/dev/scd/scdreg.h
index d04dc6919e2e..e9ce3b15a23f 100644
--- a/sys/dev/scd/scdreg.h
+++ b/sys/dev/scd/scdreg.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index e4de7e6956db..9a79c2635291 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_sf.c,v 1.12 1999/07/25 05:10:18 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -119,7 +119,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_sf.c,v 1.12 1999/07/25 05:10:18 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 static struct sf_type sf_devs[] = {
diff --git a/sys/dev/sf/if_sfreg.h b/sys/dev/sf/if_sfreg.h
index 4ead87013a32..e5149aef95b2 100644
--- a/sys/dev/sf/if_sfreg.h
+++ b/sys/dev/sf/if_sfreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_sfreg.h,v 1.4 1999/07/21 03:44:25 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 34b19d467495..4186f4be232b 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.90 1999/08/27 06:53:34 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/sys/dev/si/si.h b/sys/dev/si/si.h
index 416486c039b0..29d709bb3284 100644
--- a/sys/dev/si/si.h
+++ b/sys/dev/si/si.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.h,v 1.12 1998/03/23 16:27:43 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/callout.h>
diff --git a/sys/dev/si/sireg.h b/sys/dev/si/sireg.h
index 4697a7fe236d..711bf92e7ea0 100644
--- a/sys/dev/si/sireg.h
+++ b/sys/dev/si/sireg.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: sireg.h,v 1.6 1998/03/23 16:27:40 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 7a8c247fe2a8..962074416053 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.255 1999/08/09 11:02:38 phk Exp $
+ * $FreeBSD$
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
diff --git a/sys/dev/sio/sioreg.h b/sys/dev/sio/sioreg.h
index cb7aa5fbd198..052106525998 100644
--- a/sys/dev/sio/sioreg.h
+++ b/sys/dev/sio/sioreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
- *	$Id: sioreg.h,v 1.11 1998/09/26 14:00:29 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index aee546f554bb..4038967091a8 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_sk.c,v 1.51 1999/07/14 21:48:19 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -102,7 +102,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_sk.c,v 1.51 1999/07/14 21:48:19 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 static struct sk_type sk_devs[] = {
diff --git a/sys/dev/sk/if_skreg.h b/sys/dev/sk/if_skreg.h
index f03aeff36705..b0eaa90fce6c 100644
--- a/sys/dev/sk/if_skreg.h
+++ b/sys/dev/sk/if_skreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_skreg.h,v 1.5 1999/07/23 02:06:56 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/sk/xmaciireg.h b/sys/dev/sk/xmaciireg.h
index fe8946bdabdb..f649e93a044e 100644
--- a/sys/dev/sk/xmaciireg.h
+++ b/sys/dev/sk/xmaciireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: xmaciireg.h,v 1.10 1999/07/09 03:35:12 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index 06e5246552ef..b08943569a55 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smb.c,v 1.14 1999/07/04 14:58:21 phk Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/smbus/smb.h b/sys/dev/smbus/smb.h
index e0ebef8b2dd4..7ed0a82f58fa 100644
--- a/sys/dev/smbus/smb.h
+++ b/sys/dev/smbus/smb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smb.h,v 1.1 1998/09/03 21:00:08 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __SMB_H
diff --git a/sys/dev/smbus/smbconf.c b/sys/dev/smbus/smbconf.c
index 59c105c325c7..d97305c1c553 100644
--- a/sys/dev/smbus/smbconf.c
+++ b/sys/dev/smbus/smbconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smbconf.c,v 1.5 1999/02/13 17:57:19 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/smbus/smbconf.h b/sys/dev/smbus/smbconf.h
index c260de4f8625..40289f76a552 100644
--- a/sys/dev/smbus/smbconf.h
+++ b/sys/dev/smbus/smbconf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smbconf.h,v 1.4 1999/02/13 17:57:19 nsouch Exp $
+ * $FreeBSD$
  */
 #ifndef __SMBONF_H
 #define __SMBONF_H
diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c
index 2f2632ed3fc9..1107992f467b 100644
--- a/sys/dev/smbus/smbus.c
+++ b/sys/dev/smbus/smbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smbus.c,v 1.9 1999/05/08 21:59:08 dfr Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/smbus/smbus.h b/sys/dev/smbus/smbus.h
index c89cde1856d9..9f96b9dfe172 100644
--- a/sys/dev/smbus/smbus.h
+++ b/sys/dev/smbus/smbus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smbus.h,v 1.1.1.1 1998/08/10 18:26:05 son Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __SMBUS_H
diff --git a/sys/dev/smbus/smbus_if.m b/sys/dev/smbus/smbus_if.m
index 3e118811b5b0..d520c2b35709 100644
--- a/sys/dev/smbus/smbus_if.m
+++ b/sys/dev/smbus/smbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: smbus_if.m,v 1.3 1998/11/07 14:56:04 nsouch Exp $
+# $FreeBSD$
 #
 
 INTERFACE smbus;
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 0e7bf1afd7a8..756368655884 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -12,7 +12,7 @@
  *
  * Snoop stuff.
  *
- *	$Id: tty_snoop.c,v 1.40 1999/06/17 23:42:44 gpalmer Exp $
+ * $FreeBSD$
  */
 
 #include "snp.h"
diff --git a/sys/dev/speaker/speaker.h b/sys/dev/speaker/speaker.h
index 0d204bfe2f07..78b55b6135e3 100644
--- a/sys/dev/speaker/speaker.h
+++ b/sys/dev/speaker/speaker.h
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  *      modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_SPEAKER_H_
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 29f82055c98a..39d50c4c923a 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.39 1999/08/23 20:35:17 bde Exp $
+ * $FreeBSD$
  */
 
 #include "speaker.h"
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index ba883f7fecc9..6d56ab42712f 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.23 1999/05/06 22:14:46 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index ba883f7fecc9..6d56ab42712f 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.23 1999/05/06 22:14:46 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index 260f5ef0c5d0..04d0db82c418 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr_p.c,v 1.9 1999/05/09 17:06:59 peter Exp $
+ * $FreeBSD$
  */
 
 #include "sr.h"
diff --git a/sys/dev/sr/if_srregs.h b/sys/dev/sr/if_srregs.h
index 689b6abecf2d..64d9ba11c50e 100644
--- a/sys/dev/sr/if_srregs.h
+++ b/sys/dev/sr/if_srregs.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef _IF_SRREGS_H_
 #define _IF_SRREGS_H_
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index 685d724fb5cd..f8e134851ab3 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -30,7 +30,7 @@
  * skeleton produced from /usr/share/examples/drivers/make_pseudo_driver.sh
  * in 3.0-980524-SNAP then hacked a bit (but probably not enough :-).
  *
- * $Id: streams.c,v 1.9 1999/08/04 18:53:37 green Exp $
+ * $FreeBSD$
  */
 
 #include "streams.h"		/* generated file.. defines NSTREAMS */
diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index 2979c0da9442..960acca5a512 100644
--- a/sys/dev/syscons/blank/blank_saver.c
+++ b/sys/dev/syscons/blank/blank_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.15 1999/01/11 03:18:44 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index ebedfaa2e8c0..bc03f6446401 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.15 1999/02/05 12:40:15 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index 4a44c8519bcc..052fa9225908 100644
--- a/sys/dev/syscons/fade/fade_saver.c
+++ b/sys/dev/syscons/fade/fade_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.16 1999/01/11 03:18:46 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/fire/fire_saver.c b/sys/dev/syscons/fire/fire_saver.c
index db4b80b1a7b0..59c707916160 100644
--- a/sys/dev/syscons/fire/fire_saver.c
+++ b/sys/dev/syscons/fire/fire_saver.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fire_saver.c,v 1.4 1999/05/10 15:25:50 des Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index 103154be7a8d..d6cfe80da689 100644
--- a/sys/dev/syscons/green/green_saver.c
+++ b/sys/dev/syscons/green/green_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.15 1999/01/11 03:18:48 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/logo/logo_saver.c b/sys/dev/syscons/logo/logo_saver.c
index 24da9644a17f..2d2c660847ac 100644
--- a/sys/dev/syscons/logo/logo_saver.c
+++ b/sys/dev/syscons/logo/logo_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: logo_saver.c,v 1.6 1999/04/12 13:34:57 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/rain/rain_saver.c b/sys/dev/syscons/rain/rain_saver.c
index 200dc59931f0..6d2ed39e4654 100644
--- a/sys/dev/syscons/rain/rain_saver.c
+++ b/sys/dev/syscons/rain/rain_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: rain_saver.c,v 1.3 1999/04/12 13:34:57 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c
index 16c40e26e566..8a1cdaa87035 100644
--- a/sys/dev/syscons/scgfbrndr.c
+++ b/sys/dev/syscons/scgfbrndr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id:$
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c
index 433182d32a01..cf9585b77a5a 100644
--- a/sys/dev/syscons/schistory.c
+++ b/sys/dev/syscons/schistory.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: schistory.c,v 1.1 1999/06/22 14:13:26 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index 8d8dc6775b8c..cc5f328de290 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id:$
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index 114c5ecbf053..c8333d50c8d8 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvesactl.c,v 1.10 1999/06/01 18:17:31 jlemon Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index 16c40e26e566..8a1cdaa87035 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id:$
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 1187657b58ea..d01e34c5d6b1 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvidctl.c,v 1.10 1999/07/07 13:48:49 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index 3c62ec9e4d10..eebeb23182de 100644
--- a/sys/dev/syscons/scvtb.c
+++ b/sys/dev/syscons/scvtb.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvtb.c,v 1.1 1999/06/22 14:13:30 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index 51e1746f5f9d..093e564bef13 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.23 1999/02/05 12:40:15 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 56408dc78cee..645e4fd3c354 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.20 1999/02/05 12:40:16 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 8fcaaa4ebae6..cb6202f57fac 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.c,v 1.318 1999/08/17 22:06:17 billf Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 57f19a56b2e8..01d82a069fd4 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.h,v 1.51 1999/08/20 20:25:00 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEV_SYSCONS_SYSCONS_H_
diff --git a/sys/dev/syscons/warp/warp_saver.c b/sys/dev/syscons/warp/warp_saver.c
index cd6f42b3358b..7e5140720713 100644
--- a/sys/dev/syscons/warp/warp_saver.c
+++ b/sys/dev/syscons/warp/warp_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: warp_saver.c,v 1.5 1999/04/12 13:34:58 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index c83deefacdd5..5195324852b4 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ti.c,v 1.14 1999/07/27 13:54:15 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -131,7 +131,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_ti.c,v 1.14 1999/07/27 13:54:15 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/dev/ti/if_tireg.h b/sys/dev/ti/if_tireg.h
index 09b198230eba..36bbaddff5ad 100644
--- a/sys/dev/ti/if_tireg.h
+++ b/sys/dev/ti/if_tireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_tireg.h,v 1.8 1999/07/23 18:46:24 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ti/ti_fw.h b/sys/dev/ti/ti_fw.h
index 51bc01498ad7..8d4ae4dd1ea7 100644
--- a/sys/dev/ti/ti_fw.h
+++ b/sys/dev/ti/ti_fw.h
@@ -2,7 +2,7 @@
  * Firmware for Alteon Tigon 1 chip.
  * Generated by genfw.c
  *
- *      $Id$
+ * $FreeBSD$
  */
 static int tigonFwReleaseMajor = 0xc;
 static int tigonFwReleaseMinor = 0x3;
diff --git a/sys/dev/ti/ti_fw2.h b/sys/dev/ti/ti_fw2.h
index e2ee31f7e4c9..e46ac9640143 100644
--- a/sys/dev/ti/ti_fw2.h
+++ b/sys/dev/ti/ti_fw2.h
@@ -3,7 +3,7 @@
  * Built on Thu Jul 15 17:08:34 1999 by wpaul@xylophone
  * OS: FreeBSD 3.2-RELEASE
  *
- *	$Id: genfw.c,v 1.2 1999/03/18 17:16:43 wpaul Exp $
+ * $FreeBSD$
  */
 static int tigon2FwReleaseMajor = 0xc;
 static int tigon2FwReleaseMinor = 0x3;
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index b7cdc5d3c4c9..6830e10690c7 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.30 1999/08/21 06:24:35 msmith Exp $ */
+/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
diff --git a/sys/dev/tx/if_txreg.h b/sys/dev/tx/if_txreg.h
index 5d0d89570d7d..5efe056267f1 100644
--- a/sys/dev/tx/if_txreg.h
+++ b/sys/dev/tx/if_txreg.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_txvar.h,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*      $Id: if_txvar.h,v 1.2 1999/03/14 08:30:23 semenu Exp $ */
+/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko
diff --git a/sys/dev/tx/if_txvar.h b/sys/dev/tx/if_txvar.h
index 5d0d89570d7d..5efe056267f1 100644
--- a/sys/dev/tx/if_txvar.h
+++ b/sys/dev/tx/if_txvar.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_txvar.h,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*      $Id: if_txvar.h,v 1.2 1999/03/14 08:30:23 semenu Exp $ */
+/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko
diff --git a/sys/dev/vinum/COPYRIGHT b/sys/dev/vinum/COPYRIGHT
index ed43ff1f54eb..f0295e6a6d0e 100644
--- a/sys/dev/vinum/COPYRIGHT
+++ b/sys/dev/vinum/COPYRIGHT
@@ -33,5 +33,5 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: COPYRIGHT,v 1.1.1.1 1998/09/16 05:56:21 grog Exp $
+ * $FreeBSD$
  */
diff --git a/sys/dev/vinum/makestatetext b/sys/dev/vinum/makestatetext
index 02a927e4e308..3cb709c6b460 100755
--- a/sys/dev/vinum/makestatetext
+++ b/sys/dev/vinum/makestatetext
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Make statetexts.h from vinumstate.h
-# $Id: makestatetext,v 1.5 1999/01/15 07:30:45 grog Exp grog $
+# $FreeBSD$
 infile=vinumstate.h
 ofile=statetexts.h
 cat > $ofile <<FOO
diff --git a/sys/dev/vinum/request.h b/sys/dev/vinum/request.h
index 5788c21c3877..143cbea66fc7 100644
--- a/sys/dev/vinum/request.h
+++ b/sys/dev/vinum/request.h
@@ -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: request.h,v 1.15 1999/07/05 02:39:00 grog Exp grog $
+ * $FreeBSD$
  */
 
 /* Information needed to set up a transfer */
diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c
index f584af830fb0..7149ee862af2 100644
--- a/sys/dev/vinum/vinum.c
+++ b/sys/dev/vinum/vinum.c
@@ -35,7 +35,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinum.c,v 1.25 1999/06/25 07:54:48 grog Exp grog $
+ * $FreeBSD$
  */
 
 #define STATIC static					    /* nothing while we're testing XXX */
diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c
index 0fc1e1ed885a..2fbf557440e3 100644
--- a/sys/dev/vinum/vinumconfig.c
+++ b/sys/dev/vinum/vinumconfig.c
@@ -45,7 +45,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.26 1999/06/23 01:53:24 grog Exp grog $
+ * $FreeBSD$
  */
 
 #define STATIC static
diff --git a/sys/dev/vinum/vinumdaemon.c b/sys/dev/vinum/vinumdaemon.c
index 03528a92b95d..8f39f7da9f13 100644
--- a/sys/dev/vinum/vinumdaemon.c
+++ b/sys/dev/vinum/vinumdaemon.c
@@ -34,7 +34,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumdaemon.c,v 1.5 1999/06/23 03:22:01 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h
index c8166541c084..5745e2bcf46d 100644
--- a/sys/dev/vinum/vinumext.h
+++ b/sys/dev/vinum/vinumext.h
@@ -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: vinumext.h,v 1.20 1999/06/23 01:53:37 grog Exp grog $
+ * $FreeBSD$
  */
 
 /* vinumext.h: external definitions */
diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h
index 1baa60b6f174..22b62d6040c0 100644
--- a/sys/dev/vinum/vinumhdr.h
+++ b/sys/dev/vinum/vinumhdr.h
@@ -35,7 +35,7 @@
  */
 
 /* Header files used by all modules */
-/* $Id: vinumhdr.h,v 1.12 1999/01/28 08:58:33 grog Exp grog $ */
+/* $FreeBSD$ */
 
 #include <sys/param.h>
 #ifdef KERNEL
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index 448dad2052c1..5fa77868f869 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -39,7 +39,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinuminterrupt.c,v 1.6 1999/06/18 00:50:53 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index d49eb3ac1008..6cf3f0a23988 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.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: vinumio.c,v 1.25 1999/06/28 02:37:48 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumio.h b/sys/dev/vinum/vinumio.h
index a7c43d3989af..cecd3f6c02d1 100644
--- a/sys/dev/vinum/vinumio.h
+++ b/sys/dev/vinum/vinumio.h
@@ -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: vinumio.h,v 1.16 1999/03/29 08:43:19 grog Exp grog $
+ * $FreeBSD$
  */
 
 #ifdef VINUMDEBUG
diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c
index 5eaa697948cd..27b2d96eef70 100644
--- a/sys/dev/vinum/vinumioctl.c
+++ b/sys/dev/vinum/vinumioctl.c
@@ -41,7 +41,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumioctl.c,v 1.9 1999/07/03 04:59:57 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumkw.h b/sys/dev/vinum/vinumkw.h
index 31293bcaa98b..4d33c24028fa 100644
--- a/sys/dev/vinum/vinumkw.h
+++ b/sys/dev/vinum/vinumkw.h
@@ -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: vinumkw.h,v 1.13 1999/07/02 03:46:32 grog Exp grog $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/vinum/vinumlock.c b/sys/dev/vinum/vinumlock.c
index 8bc13207c13e..c7bf3dbad931 100644
--- a/sys/dev/vinum/vinumlock.c
+++ b/sys/dev/vinum/vinumlock.c
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumlock.c,v 1.10 1999/05/15 03:47:45 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinummemory.c b/sys/dev/vinum/vinummemory.c
index 27f6f8be0306..e13d7249dd84 100644
--- a/sys/dev/vinum/vinummemory.c
+++ b/sys/dev/vinum/vinummemory.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: vinummemory.c,v 1.20 1999/03/19 03:21:08 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c
index 5cff5fee2428..48ec43bc2ae9 100644
--- a/sys/dev/vinum/vinumparser.c
+++ b/sys/dev/vinum/vinumparser.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: vinumparser.c,v 1.16 1999/06/29 09:04:28 grog Exp grog $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/vinum/vinumraid5.c b/sys/dev/vinum/vinumraid5.c
index aa5427569054..b1be512e34c0 100644
--- a/sys/dev/vinum/vinumraid5.c
+++ b/sys/dev/vinum/vinumraid5.c
@@ -38,7 +38,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: raid5.c,v 1.15 1999/07/07 03:46:01 grog Exp grog $
+ * $FreeBSD$
  */
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index f788752a3539..2b7eae6a6051 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumrequest.c,v 1.24 1999/07/05 01:53:14 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c
index a701ae3c05dc..534976624cb5 100644
--- a/sys/dev/vinum/vinumrevive.c
+++ b/sys/dev/vinum/vinumrevive.c
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumrevive.c,v 1.8 1999/06/28 01:57:50 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumstate.c b/sys/dev/vinum/vinumstate.c
index b6e15baf9132..2e52f6c4e51d 100644
--- a/sys/dev/vinum/vinumstate.c
+++ b/sys/dev/vinum/vinumstate.c
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumstate.c,v 2.12 1999/07/05 01:36:48 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumstate.h b/sys/dev/vinum/vinumstate.h
index 38efa3122d5b..572f317d03dc 100644
--- a/sys/dev/vinum/vinumstate.h
+++ b/sys/dev/vinum/vinumstate.h
@@ -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: vinumstate.h,v 1.14 1999/03/25 02:17:38 grog Exp grog $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/vinum/vinumutil.c b/sys/dev/vinum/vinumutil.c
index fee35550fa34..45b8bde65f1a 100644
--- a/sys/dev/vinum/vinumutil.c
+++ b/sys/dev/vinum/vinumutil.c
@@ -35,7 +35,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumutil.c,v 1.12 1999/05/15 04:44:24 grog Exp grog $
+ * $FreeBSD$
  */
 
 /* This file contains utility routines used both in kernel and user context */
diff --git a/sys/dev/vinum/vinumvar.h b/sys/dev/vinum/vinumvar.h
index f844010742a9..a37c9e82d697 100644
--- a/sys/dev/vinum/vinumvar.h
+++ b/sys/dev/vinum/vinumvar.h
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumvar.h,v 1.20 1999/07/02 05:24:52 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <sys/time.h>
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index af68ae56aab7..8254f873620d 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -38,7 +38,7 @@
  * from: Utah Hdr: vn.c 1.13 94/04/02
  *
  *	from: @(#)vn.c	8.6 (Berkeley) 4/1/94
- *	$Id: vn.c,v 1.85 1999/08/23 09:35:12 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 2f91c23b2505..cae329a5761d 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_vr.c,v 1.14 1999/08/10 17:15:10 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -100,7 +100,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_vr.c,v 1.14 1999/08/10 17:15:10 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/dev/vr/if_vrreg.h b/sys/dev/vr/if_vrreg.h
index e1e4ae6d1cfc..fef8e48fc390 100644
--- a/sys/dev/vr/if_vrreg.h
+++ b/sys/dev/vr/if_vrreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_vrreg.h,v 1.4 1999/05/06 15:32:50 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 62cd9ebd4d90..a67cff8f4e61 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_vx.c,v 1.20 1999/01/27 20:09:20 dillon Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/wi/if_wavelan_ieee.h b/sys/dev/wi/if_wavelan_ieee.h
index f002933a9bdc..ef5f5ae709cc 100644
--- a/sys/dev/wi/if_wavelan_ieee.h
+++ b/sys/dev/wi/if_wavelan_ieee.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wavelan_ieee.h,v 1.4 1999/04/27 02:02:41 wpaul Exp $
+ * $FreeBSD$
  */
 
 #ifndef _IF_WAVELAN_IEEE_H
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 0a92e8092463..73e56d7295b6 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wi.c,v 1.9 1999/08/21 06:24:15 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -117,7 +117,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_wi.c,v 1.9 1999/08/21 06:24:15 msmith Exp $";
+  "$FreeBSD$";
 #endif
 
 static struct wi_softc wi_softc[NWI];
diff --git a/sys/dev/wi/if_wireg.h b/sys/dev/wi/if_wireg.h
index 75c963ea4686..d4173273f524 100644
--- a/sys/dev/wi/if_wireg.h
+++ b/sys/dev/wi/if_wireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wireg.h,v 1.4 1999/05/07 03:28:52 wpaul Exp $
+ * $FreeBSD$
  */
 
 struct wi_counters {
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 2c37caf84774..2a68f775e677 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.23 1999/08/18 06:11:59 mdodd Exp $ */
+/* $FreeBSD$ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index 4d67a35a54dc..d8351f09f730 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -23,8 +23,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $
- *	$FreeBSD$
+ * $FreeBSD$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/xe/if_xereg.h b/sys/dev/xe/if_xereg.h
index a4ecb35da19c..9eb7d3138288 100644
--- a/sys/dev/xe/if_xereg.h
+++ b/sys/dev/xe/if_xereg.h
@@ -23,8 +23,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_xereg.h,v 1.5 1999/05/20 21:53:58 scott Exp $
- *	$FreeBSD$
+ * $FreeBSD$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/cd9660/TODO b/sys/fs/cd9660/TODO
index cf3fadc5d882..b8d7f3efebb9 100644
--- a/sys/fs/cd9660/TODO
+++ b/sys/fs/cd9660/TODO
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
  2) should understand Rock Ridge
 
diff --git a/sys/fs/cd9660/cd9660_bmap.c b/sys/fs/cd9660/cd9660_bmap.c
index e787f83a98cc..e5fcd9ab32b3 100644
--- a/sys/fs/cd9660/cd9660_bmap.c
+++ b/sys/fs/cd9660/cd9660_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_bmap.c	8.3 (Berkeley) 1/23/94
- * $Id: cd9660_bmap.c,v 1.6 1997/02/22 09:38:47 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index 971322048310..b9aabbc7e2b8 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -38,7 +38,7 @@
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
  *
  *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_lookup.c,v 1.21 1999/01/27 21:49:54 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index ea22187acb74..d7093fe3fd7f 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.27 1999/01/27 21:49:54 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index 46e54466fb9a..0409efe2d817 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.6 (Berkeley) 5/14/95
- * $Id: cd9660_node.h,v 1.17 1998/02/03 21:39:30 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
index c4ad1d7b19a6..b4f97a98e112 100644
--- a/sys/fs/cd9660/cd9660_rrip.c
+++ b/sys/fs/cd9660/cd9660_rrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.c	8.6 (Berkeley) 12/5/94
- * $Id: cd9660_rrip.c,v 1.15 1999/05/11 19:54:24 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_rrip.h b/sys/fs/cd9660/cd9660_rrip.h
index cacee390d074..5008abf2a0ac 100644
--- a/sys/fs/cd9660/cd9660_rrip.h
+++ b/sys/fs/cd9660/cd9660_rrip.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.h	8.2 (Berkeley) 12/5/94
- * $Id: cd9660_rrip.h,v 1.3.2000.1 1996/09/30 12:46:48 dfr Exp $
+ * $FreeBSD$
  */
   
 typedef struct {
diff --git a/sys/fs/cd9660/cd9660_util.c b/sys/fs/cd9660/cd9660_util.c
index 21d4b9bbc343..2a11dc2f6361 100644
--- a/sys/fs/cd9660/cd9660_util.c
+++ b/sys/fs/cd9660/cd9660_util.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_util.c	8.3 (Berkeley) 12/5/94
- * $Id: cd9660_util.c,v 1.11 1999/04/18 10:58:02 dcs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 59421d07a57f..0ed30ed79da8 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.60 1999/08/25 12:24:39 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 86cd115b6634..ee2528b2d8cc 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
- * $Id: cd9660_vnops.c,v 1.56 1999/05/11 19:54:25 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index 5d211555e76a..6a685d2465e9 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.6 (Berkeley) 5/10/95
- * $Id: iso.h,v 1.16 1997/05/07 13:23:04 joerg Exp $
+ * $FreeBSD$
  */
 
 #define ISODCL(from, to) (to - from + 1)
diff --git a/sys/fs/cd9660/iso_rrip.h b/sys/fs/cd9660/iso_rrip.h
index 2b256d51eca0..0c06e98825ce 100644
--- a/sys/fs/cd9660/iso_rrip.h
+++ b/sys/fs/cd9660/iso_rrip.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_rrip.h	8.2 (Berkeley) 1/23/94
- * $Id: iso_rrip.h,v 1.4 1997/02/22 09:38:52 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/fs/coda/cnode.h b/sys/fs/coda/cnode.h
index ee4573d51020..75d29acc22ed 100644
--- a/sys/fs/coda/cnode.h
+++ b/sys/fs/coda/cnode.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: cnode.h,v 1.5 1998/11/11 20:32:20 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda.h b/sys/fs/coda/coda.h
index db2ec539b003..5a25bc67f152 100644
--- a/sys/fs/coda/coda.h
+++ b/sys/fs/coda/coda.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda.h,v 1.6 1998/11/11 20:32:20 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c
index 22a5963acd29..ea16d154b4f7 100644
--- a/sys/fs/coda/coda_fbsd.c
+++ b/sys/fs/coda/coda_fbsd.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_fbsd.c,v 1.15 1999/05/31 11:24:16 phk Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_io.h b/sys/fs/coda/coda_io.h
index e896ff0813b7..6620f4f0c32e 100644
--- a/sys/fs/coda/coda_io.h
+++ b/sys/fs/coda/coda_io.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_io.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_io.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_kernel.h b/sys/fs/coda/coda_kernel.h
index 33b372f49b13..cc0fd957f81c 100644
--- a/sys/fs/coda/coda_kernel.h
+++ b/sys/fs/coda/coda_kernel.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_kernel.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_kernel.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_namecache.c b/sys/fs/coda/coda_namecache.c
index 63ee9f9772f7..23425b5a13dd 100644
--- a/sys/fs/coda/coda_namecache.c
+++ b/sys/fs/coda/coda_namecache.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_namecache.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_namecache.c,v 1.8 1998/10/28 19:33:50 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_namecache.h b/sys/fs/coda/coda_namecache.h
index e4739114c2c8..11f2e80b12b2 100644
--- a/sys/fs/coda/coda_namecache.h
+++ b/sys/fs/coda/coda_namecache.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_namecache.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_namecache.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_opstats.h b/sys/fs/coda/coda_opstats.h
index e62c04d3db1f..8661a07ebfa0 100644
--- a/sys/fs/coda/coda_opstats.h
+++ b/sys/fs/coda/coda_opstats.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_opstats.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_opstats.h,v 1.3 1998/09/11 18:50:17 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_pioctl.h b/sys/fs/coda/coda_pioctl.h
index 57bc67ed0021..2c2577ce57ee 100644
--- a/sys/fs/coda/coda_pioctl.h
+++ b/sys/fs/coda/coda_pioctl.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_pioctl.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_pioctl.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c
index cde967f04c9b..520702ba48d2 100644
--- a/sys/fs/coda/coda_psdev.c
+++ b/sys/fs/coda/coda_psdev.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_psdev.c,v 1.10 1999/01/17 21:04:53 peter Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_psdev.h b/sys/fs/coda/coda_psdev.h
index 11922adfe02c..c6276f3e710c 100644
--- a/sys/fs/coda/coda_psdev.h
+++ b/sys/fs/coda/coda_psdev.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_psdev.c,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_subr.c b/sys/fs/coda/coda_subr.c
index f64123321f3b..aaf805c54ad6 100644
--- a/sys/fs/coda/coda_subr.c
+++ b/sys/fs/coda/coda_subr.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_subr.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_subr.c,v 1.9 1999/01/17 20:25:15 peter Exp $
+ * $FreeBSD$
  * 
   */
 
diff --git a/sys/fs/coda/coda_subr.h b/sys/fs/coda/coda_subr.h
index fe27bfda19ce..71c8a3de3812 100644
--- a/sys/fs/coda/coda_subr.h
+++ b/sys/fs/coda/coda_subr.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_subr.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_subr.h,v 1.5 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_venus.c b/sys/fs/coda/coda_venus.c
index 9853c7e834bb..f27357498d45 100644
--- a/sys/fs/coda/coda_venus.c
+++ b/sys/fs/coda/coda_venus.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/cfs/coda_venus.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_venus.c,v 1.7 1999/05/11 19:53:51 phk Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_venus.h b/sys/fs/coda/coda_venus.h
index 6fdd15c60fad..392a73f07114 100644
--- a/sys/fs/coda/coda_venus.h
+++ b/sys/fs/coda/coda_venus.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_venus.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_venus.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c
index fda83939beb5..35959df04239 100644
--- a/sys/fs/coda/coda_vfsops.c
+++ b/sys/fs/coda/coda_vfsops.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  *  	@(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vfsops.c,v 1.16 1999/07/21 12:51:36 phk Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_vfsops.h b/sys/fs/coda/coda_vfsops.h
index ef23c3fd3828..13a006d1b1c7 100644
--- a/sys/fs/coda/coda_vfsops.h
+++ b/sys/fs/coda/coda_vfsops.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/cfs/coda_vfsops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_vfsops.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c
index b0a9bedec0cb..6614b4b2c508 100644
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  *  	@(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vnops.c,v 1.17 1999/08/08 13:22:05 bde Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_vnops.h b/sys/fs/coda/coda_vnops.h
index d188eb6fe5ff..0fb598582d75 100644
--- a/sys/fs/coda/coda_vnops.h
+++ b/sys/fs/coda/coda_vnops.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vnops.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
   */
 
diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index 4e3853ce54c5..f9acbd043587 100644
--- a/sys/fs/deadfs/dead_vnops.c
+++ b/sys/fs/deadfs/dead_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
- * $Id: dead_vnops.c,v 1.24 1998/08/23 11:43:29 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index bbba54dcfdd8..463e52836918 100644
--- a/sys/fs/fdescfs/fdesc.h
+++ b/sys/fs/fdescfs/fdesc.h
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc.h	8.5 (Berkeley) 1/21/94
  *
- * $Id: fdesc.h,v 1.5 1997/02/22 09:40:14 peter Exp $
+ * $FreeBSD$
  */
 
 #ifdef KERNEL
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index 758f3b5abbe6..157454c502ef 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vfsops.c	8.4 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vfsops.c,v 1.17 1999/01/12 11:49:30 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index bc0cb5b48b7d..17a38d5be9d6 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.42 1999/05/31 11:27:49 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h
index ec186d0daccb..e63020752863 100644
--- a/sys/fs/fifofs/fifo.h
+++ b/sys/fs/fifofs/fifo.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.6 (Berkeley) 5/21/95
- * $Id: fifo.h,v 1.14 1997/09/14 02:57:51 peter Exp $
+ * $FreeBSD$
  */
 
 extern vop_t **fifo_vnodeop_p;
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index f7e47e1284fb..4a8199a672b5 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.42 1998/02/04 22:32:45 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/msdosfs/bootsect.h b/sys/fs/msdosfs/bootsect.h
index 11b93371a534..666c0f8f41b1 100644
--- a/sys/fs/msdosfs/bootsect.h
+++ b/sys/fs/msdosfs/bootsect.h
@@ -1,4 +1,4 @@
-/*	$Id: bootsect.h,v 1.5 1997/02/22 09:40:43 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: bootsect.h,v 1.9 1997/11/17 15:36:17 ws Exp $	*/
 
 /*
diff --git a/sys/fs/msdosfs/bpb.h b/sys/fs/msdosfs/bpb.h
index bc00a758de51..88b9eefb859a 100644
--- a/sys/fs/msdosfs/bpb.h
+++ b/sys/fs/msdosfs/bpb.h
@@ -1,4 +1,4 @@
-/*	$Id: bpb.h,v 1.5 1997/02/22 09:40:44 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: bpb.h,v 1.7 1997/11/17 15:36:24 ws Exp $	*/
 
 /*
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h
index ba2ef8c65dab..49eac87a2075 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/*	$Id: denode.h,v 1.17 1998/11/21 00:20:24 dt Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: denode.h,v 1.25 1997/11/17 15:36:28 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/direntry.h b/sys/fs/msdosfs/direntry.h
index 796fe78131c8..3225b78b8936 100644
--- a/sys/fs/msdosfs/direntry.h
+++ b/sys/fs/msdosfs/direntry.h
@@ -1,4 +1,4 @@
-/*	$Id: direntry.h,v 1.12 1998/02/26 06:45:42 msmith Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: direntry.h,v 1.14 1997/11/17 15:36:32 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/fat.h b/sys/fs/msdosfs/fat.h
index 74b05e2cf78d..9f20cbae4199 100644
--- a/sys/fs/msdosfs/fat.h
+++ b/sys/fs/msdosfs/fat.h
@@ -1,4 +1,4 @@
-/*	$Id: fat.h,v 1.6 1997/02/22 09:40:45 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: fat.h,v 1.12 1997/11/17 15:36:36 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_conv.c b/sys/fs/msdosfs/msdosfs_conv.c
index 2c792ebf89bb..8c43f93c0adc 100644
--- a/sys/fs/msdosfs/msdosfs_conv.c
+++ b/sys/fs/msdosfs/msdosfs_conv.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_conv.c,v 1.27 1998/05/17 21:18:08 dt Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index 3c6f9d9179fc..d864ddb5cea9 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_denode.c,v 1.44 1999/01/02 11:34:56 bde Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index 1ec29db1d9c0..fae002774668 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_fat.c,v 1.20 1998/04/06 11:39:04 phk Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index d2ad431d7f44..95e8e898ad30 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_lookup.c,v 1.28 1999/01/02 18:52:13 dt Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index adb5b5a0ebbf..92f00846514d 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vfsops.c,v 1.48 1999/08/23 21:07:13 bde Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 3c0a033e8d3f..2407e2e8a720 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.87 1999/07/25 04:01:32 bde Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index 31a2a6756066..6bd6551341f0 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/*	$Id: msdosfsmount.h,v 1.15 1998/02/23 09:39:29 ache Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/ntfs/ntfs.h b/sys/fs/ntfs/ntfs.h
index 657c97159d05..7aa65288a00c 100644
--- a/sys/fs/ntfs/ntfs.h
+++ b/sys/fs/ntfs/ntfs.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs.h,v 1.4 1999/04/20 21:06:41 semenu Exp $
+ * $FreeBSD$
  */
 
 /*#define NTFS_DEBUG 1*/
diff --git a/sys/fs/ntfs/ntfs_compr.c b/sys/fs/ntfs/ntfs_compr.c
index 953b4169d1f1..412047be2caa 100644
--- a/sys/fs/ntfs/ntfs_compr.c
+++ b/sys/fs/ntfs/ntfs_compr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_compr.c,v 1.4 1999/05/12 09:42:54 semenu Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ntfs/ntfs_compr.h b/sys/fs/ntfs/ntfs_compr.h
index a79d3e239a26..bdec08cc3e78 100644
--- a/sys/fs/ntfs/ntfs_compr.h
+++ b/sys/fs/ntfs/ntfs_compr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_compr.h,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 #define NTFS_COMPBLOCK_SIZE	0x1000
diff --git a/sys/fs/ntfs/ntfs_ihash.c b/sys/fs/ntfs/ntfs_ihash.c
index e79554527908..50ee7ac17353 100644
--- a/sys/fs/ntfs/ntfs_ihash.c
+++ b/sys/fs/ntfs/ntfs_ihash.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $Id: ntfs_ihash.c,v 1.4 1999/05/11 19:54:50 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ntfs/ntfs_ihash.h b/sys/fs/ntfs/ntfs_ihash.h
index 1b9c3dcd48a0..16132a90f919 100644
--- a/sys/fs/ntfs/ntfs_ihash.h
+++ b/sys/fs/ntfs/ntfs_ihash.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_ihash.h,v 1.2 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 void ntfs_nthashinit __P((void));
diff --git a/sys/fs/ntfs/ntfs_inode.h b/sys/fs/ntfs/ntfs_inode.h
index 0b6f6a202b26..a61338552804 100644
--- a/sys/fs/ntfs/ntfs_inode.h
+++ b/sys/fs/ntfs/ntfs_inode.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_inode.h,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 /* These flags are kept in i_flag. */
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c
index 46b45de3d1a9..b3e75b334d83 100644
--- a/sys/fs/ntfs/ntfs_subr.c
+++ b/sys/fs/ntfs/ntfs_subr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_subr.c,v 1.4 1999/05/12 09:43:01 semenu Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ntfs/ntfs_subr.h b/sys/fs/ntfs/ntfs_subr.h
index ca5f45cd4632..f0b9a8a1df44 100644
--- a/sys/fs/ntfs/ntfs_subr.h
+++ b/sys/fs/ntfs/ntfs_subr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_subr.h,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 #define	VA_LOADED		0x0001
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index 44877bd2e5d6..183d5dcd03cd 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vfsops.c,v 1.9 1999/08/13 10:29:29 phk Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/fs/ntfs/ntfs_vfsops.h b/sys/fs/ntfs/ntfs_vfsops.h
index 015684c90311..d7f5f5d26a11 100644
--- a/sys/fs/ntfs/ntfs_vfsops.h
+++ b/sys/fs/ntfs/ntfs_vfsops.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vfsops.h,v 1.2 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 #define VG_DONTLOADIN	0x0001	/* Tells ntfs_vgetex to do not call */
 				/* ntfs_loadnode on ntnode, even if */
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index fff9add0a322..578f8bf62dfb 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vnops.c,v 1.5 1999/05/12 09:43:06 semenu Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/fs/ntfs/ntfsmount.h b/sys/fs/ntfs/ntfsmount.h
index 1e6d322c7194..0a1f7918e383 100644
--- a/sys/fs/ntfs/ntfsmount.h
+++ b/sys/fs/ntfs/ntfsmount.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfsmount.h,v 1.3 1999/04/20 21:06:44 semenu Exp $
+ * $FreeBSD$
  */
 
 #define	NTFS_MFLAG_CASEINS	0x00000001
diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h
index 7d46a11cd4ac..f796d18c6706 100644
--- a/sys/fs/nullfs/null.h
+++ b/sys/fs/nullfs/null.h
@@ -35,7 +35,7 @@
  *
  *	@(#)null.h	8.3 (Berkeley) 8/20/94
  *
- * $Id: null.h,v 1.7 1997/05/25 04:50:02 peter Exp $
+ * $FreeBSD$
  */
 
 struct null_args {
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index 603f418fb1c3..1504fc84ac0e 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -35,7 +35,7 @@
  *
  *	@(#)null_subr.c	8.7 (Berkeley) 5/14/95
  *
- * $Id: null_subr.c,v 1.18 1998/07/15 02:32:18 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_debug_nullfs.h"
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 4ead5bd50c9f..f6ac5a0f749a 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.27 1998/07/30 17:40:45 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 638b9edfa69f..c9019210da55 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -37,11 +37,11 @@
  *
  * Ancestors:
  *	@(#)lofs_vnops.c	1.2 (Berkeley) 6/18/92
- *	$Id: null_vnops.c,v 1.33 1999/06/16 23:27:38 mckusick Exp $
+ * $FreeBSD$
  *	...and...
  *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  *
- * $Id: null_vnops.c,v 1.33 1999/06/16 23:27:38 mckusick Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/portalfs/portal.h b/sys/fs/portalfs/portal.h
index d60826e6a169..6e781455d75b 100644
--- a/sys/fs/portalfs/portal.h
+++ b/sys/fs/portalfs/portal.h
@@ -35,7 +35,7 @@
  *
  *	@(#)portal.h	8.4 (Berkeley) 1/21/94
  *
- * $Id: portal.h,v 1.4 1997/02/22 09:40:24 peter Exp $
+ * $FreeBSD$
  */
 
 struct portal_args {
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 633bf776e10b..d447664171f1 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vfsops.c	8.11 (Berkeley) 5/14/95
  *
- * $Id: portal_vfsops.c,v 1.21 1998/05/06 05:29:35 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index ad96332d4510..f158eadffd07 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.14 (Berkeley) 5/21/95
  *
- * $Id: portal_vnops.c,v 1.35 1999/01/12 11:49:30 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/procfs/README b/sys/fs/procfs/README
index 5f1b6cc7229b..f816b321b432 100644
--- a/sys/fs/procfs/README
+++ b/sys/fs/procfs/README
@@ -110,4 +110,4 @@ the debugger, the debugger should fork and the child should stop itself
 "attach".  as before, the child will hit a breakpoint on the first
 instruction in any newly exec'd image.
 
-$Id$
+$FreeBSD$
diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index f813070e699e..07c6da215a58 100644
--- a/sys/fs/procfs/procfs.h
+++ b/sys/fs/procfs/procfs.h
@@ -37,7 +37,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- *	$Id: procfs.h,v 1.26 1999/06/13 20:53:13 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index 21724e5c294c..4f4d84bf02af 100644
--- a/sys/fs/procfs/procfs_ctl.c
+++ b/sys/fs/procfs/procfs_ctl.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_ctl.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_ctl.c,v 1.16 1997/04/27 21:32:21 alex Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_dbregs.c b/sys/fs/procfs/procfs_dbregs.c
index 02509e006d78..ce990e983745 100644
--- a/sys/fs/procfs/procfs_dbregs.c
+++ b/sys/fs/procfs/procfs_dbregs.c
@@ -40,7 +40,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_fpregs.c b/sys/fs/procfs/procfs_fpregs.c
index 14c3fd39c04e..b3331e5a726e 100644
--- a/sys/fs/procfs/procfs_fpregs.c
+++ b/sys/fs/procfs/procfs_fpregs.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_fpregs.c	8.2 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_fpregs.c,v 1.7 1997/08/02 14:32:11 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index 47a0ce17c7e7..83d73ab320d3 100644
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- *	$Id: procfs_map.c,v 1.21 1999/02/07 21:48:21 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index 5fe9ef6794d9..35ee564e074b 100644
--- a/sys/fs/procfs/procfs_mem.c
+++ b/sys/fs/procfs/procfs_mem.c
@@ -37,7 +37,7 @@
  *
  *	@(#)procfs_mem.c	8.5 (Berkeley) 6/15/94
  *
- *	$Id: procfs_mem.c,v 1.36 1999/04/27 11:16:37 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/procfs/procfs_note.c b/sys/fs/procfs/procfs_note.c
index 8bfde33b640a..273010b32956 100644
--- a/sys/fs/procfs/procfs_note.c
+++ b/sys/fs/procfs/procfs_note.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_note.c	8.2 (Berkeley) 1/21/94
  *
- *	$Id: procfs_note.c,v 1.4 1997/02/22 09:40:28 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_regs.c b/sys/fs/procfs/procfs_regs.c
index d215d44a33cf..0edb9ad60639 100644
--- a/sys/fs/procfs/procfs_regs.c
+++ b/sys/fs/procfs/procfs_regs.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_regs.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_regs.c,v 1.7 1997/08/02 14:32:16 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_rlimit.c b/sys/fs/procfs/procfs_rlimit.c
index 07bcd1061936..5f00aafd072e 100644
--- a/sys/fs/procfs/procfs_rlimit.c
+++ b/sys/fs/procfs/procfs_rlimit.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  *
- *	$Id: procfs_rlimit.c,v 1.2 1999/07/09 17:56:59 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index 2c8cb697ad63..b3ebd1f1983c 100644
--- a/sys/fs/procfs/procfs_status.c
+++ b/sys/fs/procfs/procfs_status.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_status.c,v 1.14 1999/05/22 20:10:26 dt Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_subr.c b/sys/fs/procfs/procfs_subr.c
index cf313e863856..01e8ae9e014a 100644
--- a/sys/fs/procfs/procfs_subr.c
+++ b/sys/fs/procfs/procfs_subr.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_subr.c	8.6 (Berkeley) 5/14/95
  *
- *	$Id: procfs_subr.c,v 1.24 1999/04/30 13:04:21 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_type.c b/sys/fs/procfs/procfs_type.c
index 8f85c548b03f..cb2a45f6a3d6 100644
--- a/sys/fs/procfs/procfs_type.c
+++ b/sys/fs/procfs/procfs_type.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: procfs_type.c,v 1.4 1997/03/24 11:24:42 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_vfsops.c b/sys/fs/procfs/procfs_vfsops.c
index 2c22020e4fc0..0478e386d51c 100644
--- a/sys/fs/procfs/procfs_vfsops.c
+++ b/sys/fs/procfs/procfs_vfsops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vfsops.c	8.7 (Berkeley) 5/10/95
  *
- *	$Id: procfs_vfsops.c,v 1.26 1998/09/07 13:17:01 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index 9040c5bf4b41..2eb893415eea 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.70 1999/07/09 04:16:00 jlemon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index ca1835e5cd83..1afc40017da4 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.98 1999/08/25 00:26:34 julian Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index 0c6ca3418245..09963cbe2b65 100644
--- a/sys/fs/umapfs/umap.h
+++ b/sys/fs/umapfs/umap.h
@@ -35,7 +35,7 @@
  *
  *	@(#)umap.h	8.4 (Berkeley) 8/20/94
  *
- * $Id: umap.h,v 1.8 1997/02/22 09:40:37 peter Exp $
+ * $FreeBSD$
  */
 
 #define MAPFILEENTRIES 64
diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index 4974f03c110c..ed316a944cb1 100644
--- a/sys/fs/umapfs/umap_subr.c
+++ b/sys/fs/umapfs/umap_subr.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_subr.c	8.9 (Berkeley) 5/14/95
  *
- * $Id: umap_subr.c,v 1.15 1998/11/09 09:21:25 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index 3acc700a64fc..658a4ceee182 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_vfsops.c	8.8 (Berkeley) 5/14/95
  *
- * $Id: umap_vfsops.c,v 1.24 1999/03/12 19:40:39 imp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index ae47731b9215..0b73ccbb39dc 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.6 (Berkeley) 5/22/95
- * $Id: umap_vnops.c,v 1.27 1999/06/16 23:27:41 mckusick Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index 6a4aa226203e..1fc5f996cab0 100644
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.9 (Berkeley) 12/10/94
- * $Id: union.h,v 1.12 1998/02/26 03:23:51 kato Exp $
+ * $FreeBSD$
  */
 
 struct union_args {
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index 5ced12f6e322..6334810ae622 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.36 1998/12/14 05:00:59 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index db4d4d3b14e8..a02fb9a71f8f 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.20 (Berkeley) 5/20/95
- * $Id: union_vfsops.c,v 1.30 1998/09/07 13:17:02 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 25d2dfd2bf87..145f8ca6f0ad 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.61 1999/06/16 23:27:43 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index e4faa3f4b8a6..7badacb7d7c0 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -1,4 +1,4 @@
-/* $Id: ccd.c,v 1.52 1999/08/14 11:40:34 phk Exp $ */
+/* $FreeBSD$ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c
index 9a477c51fb42..cf564071491d 100644
--- a/sys/gnu/ext2fs/ext2_bmap.c
+++ b/sys/gnu/ext2fs/ext2_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.29 1999/08/08 18:43:03 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_ihash.c b/sys/gnu/ext2fs/ext2_ihash.c
index c2dd63e5b7f2..0a7c7d583191 100644
--- a/sys/gnu/ext2fs/ext2_ihash.c
+++ b/sys/gnu/ext2fs/ext2_ihash.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $Id: ufs_ihash.c,v 1.18 1999/01/02 11:34:56 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_mount.h b/sys/gnu/ext2fs/ext2_mount.h
index 70652b58f9ba..44974548e70a 100644
--- a/sys/gnu/ext2fs/ext2_mount.h
+++ b/sys/gnu/ext2fs/ext2_mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $Id: ufsmount.h,v 1.13 1998/01/30 11:34:06 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
diff --git a/sys/gnu/ext2fs/inode.h b/sys/gnu/ext2fs/inode.h
index 77fe7b3983b7..78fbc0adaff5 100644
--- a/sys/gnu/ext2fs/inode.h
+++ b/sys/gnu/ext2fs/inode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $Id: inode.h,v 1.25 1999/03/06 05:21:09 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_INODE_H_
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index 9a477c51fb42..cf564071491d 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.29 1999/08/08 18:43:03 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_mount.h b/sys/gnu/fs/ext2fs/ext2_mount.h
index 70652b58f9ba..44974548e70a 100644
--- a/sys/gnu/fs/ext2fs/ext2_mount.h
+++ b/sys/gnu/fs/ext2fs/ext2_mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $Id: ufsmount.h,v 1.13 1998/01/30 11:34:06 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index 77fe7b3983b7..78fbc0adaff5 100644
--- a/sys/gnu/fs/ext2fs/inode.h
+++ b/sys/gnu/fs/ext2fs/inode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $Id: inode.h,v 1.25 1999/03/06 05:21:09 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_INODE_H_
diff --git a/sys/gnu/i386/fpemul/control_w.h b/sys/gnu/i386/fpemul/control_w.h
index 9ab4345b876d..5c7aca44cc87 100644
--- a/sys/gnu/i386/fpemul/control_w.h
+++ b/sys/gnu/i386/fpemul/control_w.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *        $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/div_small.s b/sys/gnu/i386/fpemul/div_small.s
index 602250020ef0..944a93f3b192 100644
--- a/sys/gnu/i386/fpemul/div_small.s
+++ b/sys/gnu/i386/fpemul/div_small.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  * 
- *     $Id: div_small.s,v 1.6 1997/02/22 09:29:00 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/errors.c b/sys/gnu/i386/fpemul/errors.c
index f16b6a0b7e72..7ee9136bc15b 100644
--- a/sys/gnu/i386/fpemul/errors.c
+++ b/sys/gnu/i386/fpemul/errors.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: errors.c,v 1.8 1997/06/14 15:11:03 bde Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/exception.h b/sys/gnu/i386/fpemul/exception.h
index 88316f88e981..50e7d602eb69 100644
--- a/sys/gnu/i386/fpemul/exception.h
+++ b/sys/gnu/i386/fpemul/exception.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: exception.h,v 1.7 1997/02/22 09:29:02 peter Exp $
+ * $FreeBSD$
  *
  *
  */
diff --git a/sys/gnu/i386/fpemul/fpu_arith.c b/sys/gnu/i386/fpemul/fpu_arith.c
index c2183ba75d97..e8fa93f44400 100644
--- a/sys/gnu/i386/fpemul/fpu_arith.c
+++ b/sys/gnu/i386/fpemul/fpu_arith.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: fpu_arith.c,v 1.7 1997/02/22 09:29:03 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_asm.h b/sys/gnu/i386/fpemul/fpu_asm.h
index c72784b5cf70..ab505e906dc1 100644
--- a/sys/gnu/i386/fpemul/fpu_asm.h
+++ b/sys/gnu/i386/fpemul/fpu_asm.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: fpu_asm.h,v 1.6 1997/02/22 09:29:03 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_aux.c b/sys/gnu/i386/fpemul/fpu_aux.c
index 26bb61df769b..71b759f1e571 100644
--- a/sys/gnu/i386/fpemul/fpu_aux.c
+++ b/sys/gnu/i386/fpemul/fpu_aux.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: fpu_aux.c,v 1.7 1997/02/22 09:29:04 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_emu.h b/sys/gnu/i386/fpemul/fpu_emu.h
index 8571c8bbda6b..0dd2f7e49b21 100644
--- a/sys/gnu/i386/fpemul/fpu_emu.h
+++ b/sys/gnu/i386/fpemul/fpu_emu.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_entry.c b/sys/gnu/i386/fpemul/fpu_entry.c
index 35eb84bc507f..049b0139171e 100644
--- a/sys/gnu/i386/fpemul/fpu_entry.c
+++ b/sys/gnu/i386/fpemul/fpu_entry.c
@@ -55,7 +55,7 @@
  *
  * W. Metzenthen   June 1994.
  *
- *  $Id: fpu_entry.c,v 1.19 1999/01/17 20:28:12 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_etc.c b/sys/gnu/i386/fpemul/fpu_etc.c
index 0e1865360877..cd91e80da62f 100644
--- a/sys/gnu/i386/fpemul/fpu_etc.c
+++ b/sys/gnu/i386/fpemul/fpu_etc.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: fpu_etc.c,v 1.6 1997/02/22 09:29:06 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_proto.h b/sys/gnu/i386/fpemul/fpu_proto.h
index 6e87579e39fd..fc36478eedb5 100644
--- a/sys/gnu/i386/fpemul/fpu_proto.h
+++ b/sys/gnu/i386/fpemul/fpu_proto.h
@@ -1,6 +1,6 @@
 /*
  *
- *    $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_system.h b/sys/gnu/i386/fpemul/fpu_system.h
index dc3efe28e4a4..aff0a0d9114b 100644
--- a/sys/gnu/i386/fpemul/fpu_system.h
+++ b/sys/gnu/i386/fpemul/fpu_system.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_trig.c b/sys/gnu/i386/fpemul/fpu_trig.c
index 9d9ce227fb08..b1d913facd22 100644
--- a/sys/gnu/i386/fpemul/fpu_trig.c
+++ b/sys/gnu/i386/fpemul/fpu_trig.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: fpu_trig.c,v 1.8 1997/02/22 09:29:08 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/get_address.c b/sys/gnu/i386/fpemul/get_address.c
index ccaf68475265..4ae998b2d3fc 100644
--- a/sys/gnu/i386/fpemul/get_address.c
+++ b/sys/gnu/i386/fpemul/get_address.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: get_address.c,v 1.6 1997/02/22 09:29:09 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/load_store.c b/sys/gnu/i386/fpemul/load_store.c
index 50eec3e9ada0..2cfbba506147 100644
--- a/sys/gnu/i386/fpemul/load_store.c
+++ b/sys/gnu/i386/fpemul/load_store.c
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: load_store.c,v 1.11 1997/08/31 22:22:19 bde Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/math_emu.h b/sys/gnu/i386/fpemul/math_emu.h
index f57a427f5ed1..302be7b655ac 100644
--- a/sys/gnu/i386/fpemul/math_emu.h
+++ b/sys/gnu/i386/fpemul/math_emu.h
@@ -1,6 +1,6 @@
 /*
  *
- *    $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_2xm1.c b/sys/gnu/i386/fpemul/poly_2xm1.c
index c7902e5c50ee..e5a651574e4d 100644
--- a/sys/gnu/i386/fpemul/poly_2xm1.c
+++ b/sys/gnu/i386/fpemul/poly_2xm1.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *   $Id: poly_2xm1.c,v 1.6 1997/02/22 09:29:14 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_atan.c b/sys/gnu/i386/fpemul/poly_atan.c
index c7379bf89237..4f937fb82dc8 100644
--- a/sys/gnu/i386/fpemul/poly_atan.c
+++ b/sys/gnu/i386/fpemul/poly_atan.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: poly_atan.c,v 1.8 1997/02/22 09:29:15 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_div.s b/sys/gnu/i386/fpemul/poly_div.s
index 318dc1682ecf..505588d38bd8 100644
--- a/sys/gnu/i386/fpemul/poly_div.s
+++ b/sys/gnu/i386/fpemul/poly_div.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: poly_div.s,v 1.6 1997/02/22 09:29:16 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_l2.c b/sys/gnu/i386/fpemul/poly_l2.c
index a4684c9547f1..19a550165f92 100644
--- a/sys/gnu/i386/fpemul/poly_l2.c
+++ b/sys/gnu/i386/fpemul/poly_l2.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: poly_l2.c,v 1.8 1997/02/22 09:29:17 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_mul64.s b/sys/gnu/i386/fpemul/poly_mul64.s
index e8089d0a5318..2c6f12e2a2f5 100644
--- a/sys/gnu/i386/fpemul/poly_mul64.s
+++ b/sys/gnu/i386/fpemul/poly_mul64.s
@@ -59,7 +59,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: poly_mul64.s,v 1.6 1997/02/22 09:29:17 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_sin.c b/sys/gnu/i386/fpemul/poly_sin.c
index 8bcbe93f807d..efc478f59d9c 100644
--- a/sys/gnu/i386/fpemul/poly_sin.c
+++ b/sys/gnu/i386/fpemul/poly_sin.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: poly_sin.c,v 1.8 1997/02/22 09:29:18 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_tan.c b/sys/gnu/i386/fpemul/poly_tan.c
index 541f2137d689..7dbbddfccd56 100644
--- a/sys/gnu/i386/fpemul/poly_tan.c
+++ b/sys/gnu/i386/fpemul/poly_tan.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *      $Id: poly_tan.c,v 1.8 1997/02/22 09:29:19 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/polynomial.s b/sys/gnu/i386/fpemul/polynomial.s
index e989225cb12b..172bcc67dd6e 100644
--- a/sys/gnu/i386/fpemul/polynomial.s
+++ b/sys/gnu/i386/fpemul/polynomial.s
@@ -64,7 +64,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: polynomial.s,v 1.6 1997/02/22 09:29:19 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_add_sub.c b/sys/gnu/i386/fpemul/reg_add_sub.c
index b873fca5deb4..df08bcd97a1b 100644
--- a/sys/gnu/i386/fpemul/reg_add_sub.c
+++ b/sys/gnu/i386/fpemul/reg_add_sub.c
@@ -55,7 +55,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_add_sub.c,v 1.6 1997/02/22 09:29:20 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_compare.c b/sys/gnu/i386/fpemul/reg_compare.c
index abc0d224ee02..a23a7a5b1503 100644
--- a/sys/gnu/i386/fpemul/reg_compare.c
+++ b/sys/gnu/i386/fpemul/reg_compare.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_compare.c,v 1.9 1997/06/14 15:11:05 bde Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_constant.h b/sys/gnu/i386/fpemul/reg_constant.h
index 2c63cfa3c074..6c22cd7f48d0 100644
--- a/sys/gnu/i386/fpemul/reg_constant.h
+++ b/sys/gnu/i386/fpemul/reg_constant.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_div.s b/sys/gnu/i386/fpemul/reg_div.s
index adac83252a3a..fe73048da9a5 100644
--- a/sys/gnu/i386/fpemul/reg_div.s
+++ b/sys/gnu/i386/fpemul/reg_div.s
@@ -60,7 +60,7 @@
  * W. Metzenthen   June 1994.
  *
  * 
- *      $Id: reg_div.s,v 1.7 1997/04/22 06:54:50 jdp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_ld_str.c b/sys/gnu/i386/fpemul/reg_ld_str.c
index bb569b894b3b..5a2bcb812695 100644
--- a/sys/gnu/i386/fpemul/reg_ld_str.c
+++ b/sys/gnu/i386/fpemul/reg_ld_str.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_ld_str.c,v 1.11 1997/08/31 22:22:21 bde Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_mul.c b/sys/gnu/i386/fpemul/reg_mul.c
index e82da30b19f1..1b9cf2bce8c3 100644
--- a/sys/gnu/i386/fpemul/reg_mul.c
+++ b/sys/gnu/i386/fpemul/reg_mul.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_mul.c,v 1.6 1997/02/22 09:29:23 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_norm.s b/sys/gnu/i386/fpemul/reg_norm.s
index f1a24f3002f6..40d6a1d83ceb 100644
--- a/sys/gnu/i386/fpemul/reg_norm.s
+++ b/sys/gnu/i386/fpemul/reg_norm.s
@@ -61,7 +61,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_norm.s,v 1.6 1997/02/22 09:29:24 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_round.s b/sys/gnu/i386/fpemul/reg_round.s
index de20c51995c4..a01422f31b6b 100644
--- a/sys/gnu/i386/fpemul/reg_round.s
+++ b/sys/gnu/i386/fpemul/reg_round.s
@@ -65,7 +65,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_round.s,v 1.7 1997/04/22 06:54:52 jdp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_add.s b/sys/gnu/i386/fpemul/reg_u_add.s
index 0e963a34950d..fb7080966fe5 100644
--- a/sys/gnu/i386/fpemul/reg_u_add.s
+++ b/sys/gnu/i386/fpemul/reg_u_add.s
@@ -62,7 +62,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_u_add.s,v 1.7 1997/04/22 06:54:52 jdp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_div.s b/sys/gnu/i386/fpemul/reg_u_div.s
index 9061c908ccc4..8a7c234b0a94 100644
--- a/sys/gnu/i386/fpemul/reg_u_div.s
+++ b/sys/gnu/i386/fpemul/reg_u_div.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *      $Id: reg_u_div.s,v 1.7 1997/04/22 06:54:53 jdp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_mul.s b/sys/gnu/i386/fpemul/reg_u_mul.s
index 6133286b060e..4ce893cbd744 100644
--- a/sys/gnu/i386/fpemul/reg_u_mul.s
+++ b/sys/gnu/i386/fpemul/reg_u_mul.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_u_mul.s,v 1.7 1997/04/22 06:54:54 jdp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_sub.s b/sys/gnu/i386/fpemul/reg_u_sub.s
index df8baa49057b..e24c4afce717 100644
--- a/sys/gnu/i386/fpemul/reg_u_sub.s
+++ b/sys/gnu/i386/fpemul/reg_u_sub.s
@@ -61,7 +61,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_u_sub.s,v 1.7 1997/04/22 06:54:55 jdp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/status_w.h b/sys/gnu/i386/fpemul/status_w.h
index cf82a12974b3..4d15641598e2 100644
--- a/sys/gnu/i386/fpemul/status_w.h
+++ b/sys/gnu/i386/fpemul/status_w.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/version.h b/sys/gnu/i386/fpemul/version.h
index 98830e111bfe..38f6b93aebb5 100644
--- a/sys/gnu/i386/fpemul/version.h
+++ b/sys/gnu/i386/fpemul/version.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/wm_shrx.s b/sys/gnu/i386/fpemul/wm_shrx.s
index b50199d064af..e64219fd9419 100644
--- a/sys/gnu/i386/fpemul/wm_shrx.s
+++ b/sys/gnu/i386/fpemul/wm_shrx.s
@@ -62,7 +62,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: wm_shrx.s,v 1.6 1997/02/22 09:29:29 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/wm_sqrt.s b/sys/gnu/i386/fpemul/wm_sqrt.s
index f79329e0e174..dac6389796a0 100644
--- a/sys/gnu/i386/fpemul/wm_sqrt.s
+++ b/sys/gnu/i386/fpemul/wm_sqrt.s
@@ -60,7 +60,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: wm_sqrt.s,v 1.7 1997/04/22 06:54:57 jdp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index 3e7e14e5f24c..60008abe5133 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.50 1999/05/31 11:25:31 phk Exp $
+ *  dgb.c $FreeBSD$
  *
  *  Digiboard driver.
  *
diff --git a/sys/gnu/i386/isa/dgm.c b/sys/gnu/i386/isa/dgm.c
index b289be432d50..5deb61df9681 100644
--- a/sys/gnu/i386/isa/dgm.c
+++ b/sys/gnu/i386/isa/dgm.c
@@ -1,5 +1,5 @@
 /*-
- *	$Id: dgm.c,v 1.15 1999/05/31 11:25:33 phk Exp $
+ * $FreeBSD$
  *
  *  This driver and the associated header files support the ISA PC/Xem
  *  Digiboards.  Its evolutionary roots are described below.
diff --git a/sys/gnu/i386/isa/dgmbios.h b/sys/gnu/i386/isa/dgmbios.h
index 3193c9dafb2b..498bced5358a 100644
--- a/sys/gnu/i386/isa/dgmbios.h
+++ b/sys/gnu/i386/isa/dgmbios.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *
  * This file is an ascii copy of the file sxbios.bin included in the
  * Digiboard PC/Xem driver for Linux.  It is copyright 1992, DIGI 
diff --git a/sys/gnu/i386/isa/dgmfep.h b/sys/gnu/i386/isa/dgmfep.h
index ed30e4a2fe6f..7921fa3b058f 100644
--- a/sys/gnu/i386/isa/dgmfep.h
+++ b/sys/gnu/i386/isa/dgmfep.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *
  * This file is an ascii copy of the file sxbios.bin included in the
  * Digiboard PC/Xem driver for Linux.  It is copyright 1992, DIGI 
diff --git a/sys/gnu/i386/isa/dgmreg.h b/sys/gnu/i386/isa/dgmreg.h
index 95fddf846d24..2f052b530c11 100644
--- a/sys/gnu/i386/isa/dgmreg.h
+++ b/sys/gnu/i386/isa/dgmreg.h
@@ -1,5 +1,5 @@
 /*-
- *  dgmreg.h $Id: dgreg.h,v 1.4.2.1 1996/12/19 14:57:36 davidg Exp $
+ *  dgmreg.h $FreeBSD$
  *
  *  Digiboard driver.
  *
diff --git a/sys/gnu/i386/isa/dgreg.h b/sys/gnu/i386/isa/dgreg.h
index 8b520fb687ed..73c29624294e 100644
--- a/sys/gnu/i386/isa/dgreg.h
+++ b/sys/gnu/i386/isa/dgreg.h
@@ -1,5 +1,5 @@
 /*-
- *  dgreg.h $Id: dgreg.h,v 1.7 1997/02/22 09:29:43 peter Exp $
+ *  dgreg.h $FreeBSD$
  *
  *  Digiboard driver.
  *
diff --git a/sys/i386/Makefile b/sys/i386/Makefile
index 28362ba9dc77..c173c4fb1d71 100644
--- a/sys/i386/Makefile
+++ b/sys/i386/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1998/05/31 22:40:49 steve Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
 # Makefile for i386 links, tags file
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index eb5ed62af635..a31a36c89cdb 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -15,7 +15,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.102 1999/08/22 19:51:33 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index eb5ed62af635..a31a36c89cdb 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -15,7 +15,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.102 1999/08/22 19:51:33 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/boot/Makefile b/sys/i386/boot/Makefile
index dc8ad32a5f6a..3b0adfcc13a5 100644
--- a/sys/i386/boot/Makefile
+++ b/sys/i386/boot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.29 1997/07/10 21:58:43 joerg Exp $
+# $FreeBSD$
 
 SUBDIR=	cdboot dosboot kzipboot netboot rawboot
 
diff --git a/sys/i386/boot/Makefile.inc b/sys/i386/boot/Makefile.inc
index 520458a2126b..5050c0351094 100644
--- a/sys/i386/boot/Makefile.inc
+++ b/sys/i386/boot/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.3 1998/12/30 10:05:56 bde Exp $
+# $FreeBSD$
 
 BINDIR?=	/usr/mdec
 CFLAGS+=	-aout
diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile
index e4feaf98de98..3139674e074d 100644
--- a/sys/i386/boot/biosboot/Makefile
+++ b/sys/i386/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.67 1998/11/21 21:07:17 ache Exp $
+# $FreeBSD$
 #
 
 PROG=	boot
diff --git a/sys/i386/boot/biosboot/README.386BSD b/sys/i386/boot/biosboot/README.386BSD
index 345c95383628..3d7c09da5968 100644
--- a/sys/i386/boot/biosboot/README.386BSD
+++ b/sys/i386/boot/biosboot/README.386BSD
@@ -169,4 +169,4 @@ Before you do this ensure you have a booting floppy with correct
 disktab and bootblock files on it so that if it doesn't work, you can
 re-disklabel from the floppy.
 
-$Id: README.386BSD,v 1.9 1997/02/22 09:30:02 peter Exp $
+$FreeBSD$
diff --git a/sys/i386/boot/biosboot/README.MACH b/sys/i386/boot/biosboot/README.MACH
index 5f8b79d7b9d9..73d090a404bd 100644
--- a/sys/i386/boot/biosboot/README.MACH
+++ b/sys/i386/boot/biosboot/README.MACH
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:33:55  rpd
- *	$Id: README.MACH,v 1.5 1997/02/22 09:30:03 peter Exp $
+ * $FreeBSD$
  */
 
 ********NOTE: This is not all relevant to the 386BSD version**********
diff --git a/sys/i386/boot/biosboot/README.serial b/sys/i386/boot/biosboot/README.serial
index 732e4787e35c..7edcdeec060c 100644
--- a/sys/i386/boot/biosboot/README.serial
+++ b/sys/i386/boot/biosboot/README.serial
@@ -193,4 +193,4 @@ CAVEATS:
 	  from the new kernel.
 
 
-$Id: README.serial,v 1.9 1997/06/16 06:32:51 charnier Exp $
+$FreeBSD$
diff --git a/sys/i386/boot/biosboot/asm.S b/sys/i386/boot/biosboot/asm.S
index da01acab1091..f14c7f55104c 100644
--- a/sys/i386/boot/biosboot/asm.S
+++ b/sys/i386/boot/biosboot/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- *	$Id: asm.S,v 1.11 1997/02/22 09:30:04 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/boot/biosboot/asm.h b/sys/i386/boot/biosboot/asm.h
index b90bbcebf158..6f4bcc39e52d 100644
--- a/sys/i386/boot/biosboot/asm.h
+++ b/sys/i386/boot/biosboot/asm.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- *	$Id$
+ * $FreeBSD$
  */
 
 #define S_ARG0	 4(%esp)
diff --git a/sys/i386/boot/biosboot/bios.S b/sys/i386/boot/biosboot/bios.S
index bc80b2f3a946..30fc76432427 100644
--- a/sys/i386/boot/biosboot/bios.S
+++ b/sys/i386/boot/biosboot/bios.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: bios.S,v 1.13 1998/08/04 00:39:45 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c
index 394f86e82b92..a83c9fdd5c15 100644
--- a/sys/i386/boot/biosboot/boot.c
+++ b/sys/i386/boot/biosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.73 1998/10/10 14:02:06 bde Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/boot/biosboot/boot.h b/sys/i386/boot/biosboot/boot.h
index e107b471f35e..d5c413201754 100644
--- a/sys/i386/boot/biosboot/boot.h
+++ b/sys/i386/boot/biosboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id: boot.h,v 1.23 1997/12/04 21:52:42 joerg Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/boot/biosboot/boot2.S b/sys/i386/boot/biosboot/boot2.S
index e199b5f6ed69..1b25853b4e79 100644
--- a/sys/i386/boot/biosboot/boot2.S
+++ b/sys/i386/boot/biosboot/boot2.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:26  rpd
- *	$Id$
+ * $FreeBSD$
  */
 
 #include	"asm.h"
diff --git a/sys/i386/boot/biosboot/disk.c b/sys/i386/boot/biosboot/disk.c
index 8cd825698b1b..62fdde42681a 100644
--- a/sys/i386/boot/biosboot/disk.c
+++ b/sys/i386/boot/biosboot/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- *	$Id: disk.c,v 1.25 1997/02/22 09:30:09 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/io.c b/sys/i386/boot/biosboot/io.c
index b9c40588c46b..f70516002c15 100644
--- a/sys/i386/boot/biosboot/io.c
+++ b/sys/i386/boot/biosboot/io.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- *	$Id: io.c,v 1.24 1997/07/12 10:23:19 joerg Exp $
+ * $FreeBSD$
  */
 
 #include "boot.h"
diff --git a/sys/i386/boot/biosboot/probe_keyboard.c b/sys/i386/boot/biosboot/probe_keyboard.c
index 7856d586a58f..41d7e9769a3d 100644
--- a/sys/i386/boot/biosboot/probe_keyboard.c
+++ b/sys/i386/boot/biosboot/probe_keyboard.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/boot/biosboot/serial.S b/sys/i386/boot/biosboot/serial.S
index 11d63f08272d..8473d005300b 100644
--- a/sys/i386/boot/biosboot/serial.S
+++ b/sys/i386/boot/biosboot/serial.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: serial.S,v 1.11 1998/02/01 22:39:24 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/start.S b/sys/i386/boot/biosboot/start.S
index 3d27c5fe5f29..90fac5589d58 100644
--- a/sys/i386/boot/biosboot/start.S
+++ b/sys/i386/boot/biosboot/start.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:29  rpd
- *	$Id: start.S,v 1.11 1998/07/02 15:36:35 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/sys.c b/sys/i386/boot/biosboot/sys.c
index 4726f1ec1a1a..289a732cc3ca 100644
--- a/sys/i386/boot/biosboot/sys.c
+++ b/sys/i386/boot/biosboot/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- *	$Id: sys.c,v 1.20 1997/05/27 16:26:39 bde Exp $
+ * $FreeBSD$
  */
 
 #include "boot.h"
diff --git a/sys/i386/boot/biosboot/table.c b/sys/i386/boot/biosboot/table.c
index 83ffd1442b23..ac59b24311e3 100644
--- a/sys/i386/boot/biosboot/table.c
+++ b/sys/i386/boot/biosboot/table.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- *	$Id: table.c,v 1.18 1999/05/25 09:32:00 brian Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/boot/cdboot/Makefile b/sys/i386/boot/cdboot/Makefile
index b59e851fd870..1278a287cdce 100644
--- a/sys/i386/boot/cdboot/Makefile
+++ b/sys/i386/boot/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1998/03/12 12:26:47 bde Exp $
+# $FreeBSD$
 #
 
 PROG=	boot
diff --git a/sys/i386/boot/cdboot/asm.S b/sys/i386/boot/cdboot/asm.S
index e68981746626..2190a35b5f2b 100644
--- a/sys/i386/boot/cdboot/asm.S
+++ b/sys/i386/boot/cdboot/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- *	$Id: asm.S,v 1.9 1996/03/08 07:27:52 bde Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/boot/cdboot/boot.c b/sys/i386/boot/cdboot/boot.c
index b89813f66685..bee6b87d06f7 100644
--- a/sys/i386/boot/cdboot/boot.c
+++ b/sys/i386/boot/cdboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.1 1997/07/11 05:52:37 joerg Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/boot/cdboot/boot.h b/sys/i386/boot/cdboot/boot.h
index 4604c0877937..c0973b33eef3 100644
--- a/sys/i386/boot/cdboot/boot.h
+++ b/sys/i386/boot/cdboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id: boot.h,v 1.1 1997/07/11 05:52:38 joerg Exp $
+ * $FreeBSD$
  */
 /*
  * Extensions for El Torito CD-ROM booting:
diff --git a/sys/i386/boot/cdboot/cdrom.c b/sys/i386/boot/cdboot/cdrom.c
index d9555852e7fc..5668abcf0e57 100644
--- a/sys/i386/boot/cdboot/cdrom.c
+++ b/sys/i386/boot/cdboot/cdrom.c
@@ -27,7 +27,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: cdrom.c,v 1.2 1997/12/02 21:13:59 joerg Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/boot/cdboot/malloc.c b/sys/i386/boot/cdboot/malloc.c
index 2b8486d8aae1..a68e776e456d 100644
--- a/sys/i386/boot/cdboot/malloc.c
+++ b/sys/i386/boot/cdboot/malloc.c
@@ -27,7 +27,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/boot/dosboot/Makefile b/sys/i386/boot/dosboot/Makefile
index 26c0d0bf04aa..88a25c73a3fc 100644
--- a/sys/i386/boot/dosboot/Makefile
+++ b/sys/i386/boot/dosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1997/02/22 09:30:28 peter Exp $
+# $FreeBSD$
 #
 
 MPROG=	fbsdboot.exe
diff --git a/sys/i386/boot/dosboot/ansi.h b/sys/i386/boot/dosboot/ansi.h
index 3a112073c675..23f6d9ba92aa 100644
--- a/sys/i386/boot/dosboot/ansi.h
+++ b/sys/i386/boot/dosboot/ansi.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ansi.h	7.1 (Berkeley) 3/9/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef	_ANSI_H_
diff --git a/sys/i386/boot/dosboot/boot.c b/sys/i386/boot/dosboot/boot.c
index 635781e81827..0eb6d19203b8 100644
--- a/sys/i386/boot/dosboot/boot.c
+++ b/sys/i386/boot/dosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id$
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/boot/dosboot/boot.h b/sys/i386/boot/dosboot/boot.h
index c1bd09700662..f72fa1dc7c12 100644
--- a/sys/i386/boot/dosboot/boot.h
+++ b/sys/i386/boot/dosboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id$
+ * $FreeBSD$
  */
 
 #include "types.h"
diff --git a/sys/i386/boot/dosboot/bootinfo.h b/sys/i386/boot/dosboot/bootinfo.h
index d1a6fb68412e..7f5649174233 100644
--- a/sys/i386/boot/dosboot/bootinfo.h
+++ b/sys/i386/boot/dosboot/bootinfo.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_BOOTINFO_H_
diff --git a/sys/i386/boot/dosboot/cdefs.h b/sys/i386/boot/dosboot/cdefs.h
index 1b2205fbd5f4..07f727d8e7e3 100644
--- a/sys/i386/boot/dosboot/cdefs.h
+++ b/sys/i386/boot/dosboot/cdefs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      from: @(#)cdefs.h       8.1 (Berkeley) 6/2/93
- *      $Id$
+ * $FreeBSD$
  */
 
 #ifndef _CDEFS_H_
diff --git a/sys/i386/boot/dosboot/dinode.h b/sys/i386/boot/dosboot/dinode.h
index 6c9fbd42fecc..99a8849b190d 100644
--- a/sys/i386/boot/dosboot/dinode.h
+++ b/sys/i386/boot/dosboot/dinode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)dinode.h	7.10 (Berkeley) 5/8/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _UFS_DINODE_H_
diff --git a/sys/i386/boot/dosboot/dir.h b/sys/i386/boot/dosboot/dir.h
index 5d9cd1d3613c..1b72f4749c03 100644
--- a/sys/i386/boot/dosboot/dir.h
+++ b/sys/i386/boot/dosboot/dir.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)dir.h	7.3 (Berkeley) 2/5/91
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/boot/dosboot/disk.c b/sys/i386/boot/dosboot/disk.c
index f990a33a3fb3..3f93ab82a858 100644
--- a/sys/i386/boot/dosboot/disk.c
+++ b/sys/i386/boot/dosboot/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- *	$Id$
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <memory.h>
diff --git a/sys/i386/boot/dosboot/disklabe.h b/sys/i386/boot/dosboot/disklabe.h
index 81a7c06af6d6..d3983d3c6787 100644
--- a/sys/i386/boot/dosboot/disklabe.h
+++ b/sys/i386/boot/dosboot/disklabe.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93
- * $Id: disklabe.h,v 1.4 1997/02/22 09:30:46 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DISKLABEL_H_
diff --git a/sys/i386/boot/dosboot/dkbad.h b/sys/i386/boot/dosboot/dkbad.h
index f461d229aab2..1aea5ded055c 100644
--- a/sys/i386/boot/dosboot/dkbad.h
+++ b/sys/i386/boot/dosboot/dkbad.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkbad.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DKBAD_H_
diff --git a/sys/i386/boot/dosboot/endian.h b/sys/i386/boot/dosboot/endian.h
index 1d52a1b419b3..84d04b25d008 100644
--- a/sys/i386/boot/dosboot/endian.h
+++ b/sys/i386/boot/dosboot/endian.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)endian.h	7.8 (Berkeley) 4/3/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/i386/boot/dosboot/exec.h b/sys/i386/boot/dosboot/exec.h
index 5033235ae74f..d64f63b77489 100644
--- a/sys/i386/boot/dosboot/exec.h
+++ b/sys/i386/boot/dosboot/exec.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_EXEC_H_
diff --git a/sys/i386/boot/dosboot/fs.h b/sys/i386/boot/dosboot/fs.h
index f2c38b4269d5..f4c397d3cac6 100644
--- a/sys/i386/boot/dosboot/fs.h
+++ b/sys/i386/boot/dosboot/fs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fs.h	7.12 (Berkeley) 5/8/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _UFS_FS_H_
diff --git a/sys/i386/boot/dosboot/imgact.h b/sys/i386/boot/dosboot/imgact.h
index f9cc403977e6..f3ec5571819c 100644
--- a/sys/i386/boot/dosboot/imgact.h
+++ b/sys/i386/boot/dosboot/imgact.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef	_IMGACT_AOUT_H_
diff --git a/sys/i386/boot/dosboot/inode.h b/sys/i386/boot/dosboot/inode.h
index 0a692e3cfbeb..26ae12090e08 100644
--- a/sys/i386/boot/dosboot/inode.h
+++ b/sys/i386/boot/dosboot/inode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)inode.h	7.17 (Berkeley) 5/8/91
- *	$Id: inode.h,v 1.4 1997/02/22 09:30:56 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_INODE_H_
diff --git a/sys/i386/boot/dosboot/mexec.h b/sys/i386/boot/dosboot/mexec.h
index e978510b9b76..b045a235ece3 100644
--- a/sys/i386/boot/dosboot/mexec.h
+++ b/sys/i386/boot/dosboot/mexec.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_EXEC_H_
diff --git a/sys/i386/boot/dosboot/param.h b/sys/i386/boot/dosboot/param.h
index 61a82419b108..394c1f797d7e 100644
--- a/sys/i386/boot/dosboot/param.h
+++ b/sys/i386/boot/dosboot/param.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PARAM_H_
diff --git a/sys/i386/boot/dosboot/quota.h b/sys/i386/boot/dosboot/quota.h
index 425066e91d88..5ad06ce018bb 100644
--- a/sys/i386/boot/dosboot/quota.h
+++ b/sys/i386/boot/dosboot/quota.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)quota.h	7.9 (Berkeley) 2/22/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _QUOTA_
diff --git a/sys/i386/boot/dosboot/reboot.h b/sys/i386/boot/dosboot/reboot.h
index f0dcfd244a79..65453b05e51f 100644
--- a/sys/i386/boot/dosboot/reboot.h
+++ b/sys/i386/boot/dosboot/reboot.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reboot.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_REBOOT_H_
diff --git a/sys/i386/boot/dosboot/sys.c b/sys/i386/boot/dosboot/sys.c
index f9d2f9be9a08..04a25af8d907 100644
--- a/sys/i386/boot/dosboot/sys.c
+++ b/sys/i386/boot/dosboot/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- *	$Id$
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <string.h>
diff --git a/sys/i386/boot/dosboot/syslimit.h b/sys/i386/boot/dosboot/syslimit.h
index 3d691b7cbc08..0d914230c3b6 100644
--- a/sys/i386/boot/dosboot/syslimit.h
+++ b/sys/i386/boot/dosboot/syslimit.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)syslimits.h	7.4 (Berkeley) 2/4/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SYSLIMITS_H_
diff --git a/sys/i386/boot/dosboot/sysparam.h b/sys/i386/boot/dosboot/sysparam.h
index a9a5f35aabb9..4f93f2cc0266 100644
--- a/sys/i386/boot/dosboot/sysparam.h
+++ b/sys/i386/boot/dosboot/sysparam.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.2 (Berkeley) 1/21/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PARAM_H_
diff --git a/sys/i386/boot/dosboot/types.h b/sys/i386/boot/dosboot/types.h
index ee013c053202..85b64942897a 100644
--- a/sys/i386/boot/dosboot/types.h
+++ b/sys/i386/boot/dosboot/types.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.4 (Berkeley) 1/21/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TYPES_H_
diff --git a/sys/i386/boot/kzipboot/Makefile b/sys/i386/boot/kzipboot/Makefile
index c1dc06009dad..1c37ac40cae6 100644
--- a/sys/i386/boot/kzipboot/Makefile
+++ b/sys/i386/boot/kzipboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 1998/05/27 08:06:33 sos Exp $
+# $FreeBSD$
 
 PROG= kztail.o kzhead.o
 BINMODE = 444	# target is a relocatable object
diff --git a/sys/i386/boot/netboot/3c509.c b/sys/i386/boot/netboot/3c509.c
index adf721c3ec19..accc948c6b4f 100644
--- a/sys/i386/boot/netboot/3c509.c
+++ b/sys/i386/boot/netboot/3c509.c
@@ -18,7 +18,7 @@ Author: Martin Renters.
 
 3c509 support added by Serge Babkin (babkin@hq.icb.chel.su)
 
-$Id$
+$FreeBSD$
 
 ***************************************************************************/
 
diff --git a/sys/i386/boot/netboot/Makefile b/sys/i386/boot/netboot/Makefile
index 2d50c65a58e7..84d3d97103e1 100644
--- a/sys/i386/boot/netboot/Makefile
+++ b/sys/i386/boot/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.21 1998/11/28 08:03:24 joerg Exp $
+# $FreeBSD$
 #
 # Makefile for NETBOOT
 #
diff --git a/sys/i386/boot/netboot/netboot.8 b/sys/i386/boot/netboot/netboot.8
index 094d47fda4ec..2717ec53cc0d 100644
--- a/sys/i386/boot/netboot/netboot.8
+++ b/sys/i386/boot/netboot/netboot.8
@@ -1,4 +1,4 @@
-.\"	$Id: netboot.8,v 1.3 1997/05/31 18:29:58 tegge Exp $
+.\" $FreeBSD$
 .Dd May 15, 1997
 .Dt NETBOOT 8
 .\".Os BSD 4
diff --git a/sys/i386/boot/rawboot/Makefile b/sys/i386/boot/rawboot/Makefile
index 061b6959ecf7..474788b2c88c 100644
--- a/sys/i386/boot/rawboot/Makefile
+++ b/sys/i386/boot/rawboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1998/03/12 12:26:49 bde Exp $
+# $FreeBSD$
 #
 
 PROG=	boot
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index f889546e112f..2011cfea73e6 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -15,7 +15,7 @@
 # device lines is also present in the ./LINT configuration file. If you are
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.182 1999/08/15 09:54:56 phk Exp $
+# $FreeBSD$
 
 machine		i386
 cpu		I386_CPU
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 80ecf1a81a2b..6c0f0cf935d3 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.629 1999/08/21 17:40:37 wpaul Exp $
+# $FreeBSD$
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 66873d0cc1e9..0d82e7971baa 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.157 1999/07/02 04:00:01 jkh Exp $
+# $FreeBSD$
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 80ecf1a81a2b..6c0f0cf935d3 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.629 1999/08/21 17:40:37 wpaul Exp $
+# $FreeBSD$
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD
index 3f57f717949d..7dfbfab75635 100644
--- a/sys/i386/conf/PCCARD
+++ b/sys/i386/conf/PCCARD
@@ -12,7 +12,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: PCCARD,v 1.16 1999/08/15 09:38:20 phk Exp $
+# $FreeBSD$
 
 machine		i386
 cpu		I386_CPU
diff --git a/sys/i386/conf/devices.i386 b/sys/i386/conf/devices.i386
index ed921de75a0e..0e3045546c93 100644
--- a/sys/i386/conf/devices.i386
+++ b/sys/i386/conf/devices.i386
@@ -1,6 +1,6 @@
 # This file tells what major numbers the various possible swap devices have.
 #
-#	$Id: devices.i386,v 1.15 1998/12/27 13:55:48 sos Exp $
+# $FreeBSD$
 #
 wd	0
 wfd	1
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 72349659ad1d..e6a940c18e11 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.259 1999/08/18 04:08:14 alc Exp $
+# $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/i386/conf/majors.i386 b/sys/i386/conf/majors.i386
index 60feb64f5cf1..e4fda55c344f 100644
--- a/sys/i386/conf/majors.i386
+++ b/sys/i386/conf/majors.i386
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.81 1999/08/04 19:55:37 jkh Exp $
+$FreeBSD$
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index bd3ac0e5ddbe..f0adfd96ab8f 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.119 1999/08/06 14:01:55 hm Exp $
+# $FreeBSD$
 
 DISABLE_PSE
 IDE_DELAY
diff --git a/sys/i386/eisa/3c5x9.c b/sys/i386/eisa/3c5x9.c
index b6ccff13af41..663409d4b75a 100644
--- a/sys/i386/eisa/3c5x9.c
+++ b/sys/i386/eisa/3c5x9.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: 3c5x9.c,v 1.12 1999/05/08 21:59:15 dfr Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/adv_eisa.c b/sys/i386/eisa/adv_eisa.c
index 4b475d3d1193..ad9604e69626 100644
--- a/sys/i386/eisa/adv_eisa.c
+++ b/sys/i386/eisa/adv_eisa.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_eisa.c,v 1.5 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/ahb.c b/sys/i386/eisa/ahb.c
index a1dc84ac5e7a..67eead4dd7e2 100644
--- a/sys/i386/eisa/ahb.c
+++ b/sys/i386/eisa/ahb.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahb.c,v 1.13 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/ahbreg.h b/sys/i386/eisa/ahbreg.h
index 1bed89ebff4a..c72f068aa3b9 100644
--- a/sys/i386/eisa/ahbreg.h
+++ b/sys/i386/eisa/ahbreg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Resource Constatns */
diff --git a/sys/i386/eisa/ahc_eisa.c b/sys/i386/eisa/ahc_eisa.c
index 39450187d3a6..e98be7d3a3d5 100644
--- a/sys/i386/eisa/ahc_eisa.c
+++ b/sys/i386/eisa/ahc_eisa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_eisa.c,v 1.11 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/bt_eisa.c b/sys/i386/eisa/bt_eisa.c
index d9cb5840438c..400b42b046f7 100644
--- a/sys/i386/eisa/bt_eisa.c
+++ b/sys/i386/eisa/bt_eisa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_eisa.c,v 1.8 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/dpt_eisa.c b/sys/i386/eisa/dpt_eisa.c
index caeab91f3028..8518214db90b 100644
--- a/sys/i386/eisa/dpt_eisa.c
+++ b/sys/i386/eisa/dpt_eisa.c
@@ -33,7 +33,7 @@
  */
 
 /*
- * $Id: dpt_eisa.c,v 1.7 1999/08/01 22:57:09 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/dpt_eisa.h b/sys/i386/eisa/dpt_eisa.h
index 0731911d36cb..683ff655953c 100644
--- a/sys/i386/eisa/dpt_eisa.h
+++ b/sys/i386/eisa/dpt_eisa.h
@@ -32,7 +32,7 @@
  */
 
 /*
- * $Id: dpt_eisa.h,v 1.2 1998/09/15 08:33:35 gibbs Exp $
+ * $FreeBSD$
  */
 
 #define DPT_EISA_SLOT_OFFSET		0xc00
diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c
index 1aeb1df1af97..869ebbe6cabc 100644
--- a/sys/i386/eisa/eisaconf.c
+++ b/sys/i386/eisa/eisaconf.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.c,v 1.50 1999/08/01 22:57:09 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "opt_eisa.h"
diff --git a/sys/i386/eisa/eisaconf.h b/sys/i386/eisa/eisaconf.h
index 6174b6b36926..8330bb4a7353 100644
--- a/sys/i386/eisa/eisaconf.h
+++ b/sys/i386/eisa/eisaconf.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.h,v 1.18 1999/04/18 15:50:33 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_EISA_EISACONF_H_
diff --git a/sys/i386/eisa/if_fea.c b/sys/i386/eisa/if_fea.c
index c98eb4bf96af..21c90d4a7dd6 100644
--- a/sys/i386/eisa/if_fea.c
+++ b/sys/i386/eisa/if_fea.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fea.c,v 1.16 1999/07/31 00:43:48 mdodd Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/apic_vector.s b/sys/i386/i386/apic_vector.s
index 6a7bcf059a12..f484971eab2b 100644
--- a/sys/i386/i386/apic_vector.s
+++ b/sys/i386/i386/apic_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: apic_vector.s,v 1.43 1999/07/20 06:52:35 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/i386/atomic.c b/sys/i386/i386/atomic.c
index d7a5c495d6df..c19ba9e027b2 100644
--- a/sys/i386/i386/atomic.c
+++ b/sys/i386/i386/atomic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* This file creates publically callable functions to perform various
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 4c5dbd34bb5b..f678609719d0 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.136 1999/08/22 23:49:00 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index baf20187da6c..5fc0a4296738 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.c,v 1.21 1999/08/25 06:56:36 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/bioscall.s b/sys/i386/i386/bioscall.s
index 3d95a6278dd2..8ecee477fa5a 100644
--- a/sys/i386/i386/bioscall.s
+++ b/sys/i386/i386/bioscall.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bioscall.s,v 1.4 1999/08/25 06:44:32 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index bebec68ceca1..c16333ced110 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: busdma_machdep.c,v 1.13 1999/07/02 05:12:11 mjacob Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c
index b3b30b13f3f5..16e8106d5e73 100644
--- a/sys/i386/i386/db_disasm.c
+++ b/sys/i386/i386/db_disasm.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_disasm.c,v 1.21 1998/07/08 10:53:56 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index 0ad6dfbfd56a..cb7f228d671a 100644
--- a/sys/i386/i386/db_interface.c
+++ b/sys/i386/i386/db_interface.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_interface.c,v 1.44 1999/04/28 01:03:17 luoqi Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index 6a361a0052f9..074b4e639bcb 100644
--- a/sys/i386/i386/db_trace.c
+++ b/sys/i386/i386/db_trace.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_trace.c,v 1.33 1999/01/28 01:59:50 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/elf_machdep.c b/sys/i386/i386/elf_machdep.c
index 2814f066e0f0..51a2e77541f6 100644
--- a/sys/i386/i386/elf_machdep.c
+++ b/sys/i386/i386/elf_machdep.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: elf_machdep.c,v 1.4 1998/12/07 21:58:18 archie Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s
index dce98e87e5b6..f19622475bb8 100644
--- a/sys/i386/i386/exception.s
+++ b/sys/i386/i386/exception.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.62 1999/06/27 21:31:43 alc Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index 9f17b0c7d616..2df518268216 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.75 1999/07/29 08:33:00 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_user_ldt.h"
diff --git a/sys/i386/i386/globals.s b/sys/i386/i386/globals.s
index 574220aade84..8a46b522cc7c 100644
--- a/sys/i386/i386/globals.s
+++ b/sys/i386/i386/globals.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: globals.s,v 1.11 1999/05/12 21:38:41 luoqi Exp $
+ * $FreeBSD$
  */
 
 #include "opt_user_ldt.h"
diff --git a/sys/i386/i386/i686_mem.c b/sys/i386/i386/i686_mem.c
index d971aa95f02e..33342b92227c 100644
--- a/sys/i386/i386/i686_mem.c
+++ b/sys/i386/i386/i686_mem.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: i686_mem.c,v 1.4 1999/07/20 06:58:51 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index ba53f4eab87b..0f1e86d67737 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- *	$Id: identcpu.c,v 1.71 1999/07/06 13:23:56 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_cpu.h"
diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c
index e9244fbe2066..481a390393ec 100644
--- a/sys/i386/i386/in_cksum.c
+++ b/sys/i386/i386/in_cksum.c
@@ -32,7 +32,7 @@
  *
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
- *	$Id: in_cksum.c,v 1.14 1999/01/28 01:59:50 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index a58caadce1b4..a56bb36d91a5 100644
--- a/sys/i386/i386/initcpu.c
+++ b/sys/i386/i386/initcpu.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *		$Id: initcpu.c,v 1.17 1999/01/16 13:41:33 kato Exp $
+ * $FreeBSD$
  */
 
 #include "opt_cpu.h"
diff --git a/sys/i386/i386/k6_mem.c b/sys/i386/i386/k6_mem.c
index b28691bacde9..1045b28c9f77 100644
--- a/sys/i386/i386/k6_mem.c
+++ b/sys/i386/i386/k6_mem.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: k6_mem.c,v 1.1 1999/06/18 19:56:02 green Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/i386/legacy.c b/sys/i386/i386/legacy.c
index 0c28185a347b..22e98eda7106 100644
--- a/sys/i386/i386/legacy.c
+++ b/sys/i386/i386/legacy.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: nexus.c,v 1.15 1999/08/23 19:23:33 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 95b55613bf47..f2627266353c 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.124 1999/06/18 14:32:13 bde Exp $
+ * $FreeBSD$
  *
  *		originally from: locore.s, by William F. Jolitz
  *
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index dfde63760a87..a3c33bfc293a 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.358 1999/08/09 10:34:43 phk Exp $
+ * $FreeBSD$
  */
 
 #include "apm.h"
diff --git a/sys/i386/i386/math_emu.h b/sys/i386/i386/math_emu.h
index b996e5d78be8..6e189b4a5594 100644
--- a/sys/i386/i386/math_emu.h
+++ b/sys/i386/i386/math_emu.h
@@ -3,7 +3,7 @@
  *
  * (C) 1991 Linus Torvalds
  *
- *	$Id: math_emu.h,v 1.5 1997/02/22 09:32:27 peter Exp $
+ * $FreeBSD$
  */
 #ifndef _LINUX_MATH_EMU_H
 #define _LINUX_MATH_EMU_H
diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c
index 7f93e4b6f6f9..ec7e216d0b40 100644
--- a/sys/i386/i386/math_emulate.c
+++ b/sys/i386/i386/math_emulate.c
@@ -6,7 +6,7 @@
  * [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj]
  *
  *	from: 386BSD 0.1
- *	$Id: math_emulate.c,v 1.33 1999/01/28 01:59:50 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index c835a6ee2cce..ab31e7095ea3 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.64 1999/08/23 20:58:38 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 969cd0892495..283ed1701a3c 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/i386/mpapic.c b/sys/i386/i386/mpapic.c
index 8ae685485f43..ef591aa7b51d 100644
--- a/sys/i386/i386/mpapic.c
+++ b/sys/i386/i386/mpapic.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mpapic.c,v 1.32 1998/09/06 22:41:40 tegge Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/i386/mpboot.s b/sys/i386/i386/mpboot.s
index 962bafcc7792..d21354e3c793 100644
--- a/sys/i386/i386/mpboot.s
+++ b/sys/i386/i386/mpboot.s
@@ -31,7 +31,7 @@
  * mpboot.s:	FreeBSD machine support for the Intel MP Spec
  *		multiprocessor systems.
  *
- *	$Id: mpboot.s,v 1.10 1999/04/28 01:03:22 luoqi Exp $
+ * $FreeBSD$
  */
 
 #include <machine/asmacros.h>		/* miscellaneous asm macros */
diff --git a/sys/i386/i386/mplock.s b/sys/i386/i386/mplock.s
index fe8281dc50f6..bb1a4bf2a86d 100644
--- a/sys/i386/i386/mplock.s
+++ b/sys/i386/i386/mplock.s
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: mplock.s,v 1.24 1998/05/17 23:08:04 tegge Exp $
+ * $FreeBSD$
  *
  * Functions for locking between CPUs in a SMP system.
  *
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 969cd0892495..283ed1701a3c 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/i386/nexus.c b/sys/i386/i386/nexus.c
index 0c28185a347b..22e98eda7106 100644
--- a/sys/i386/i386/nexus.c
+++ b/sys/i386/i386/nexus.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: nexus.c,v 1.15 1999/08/23 19:23:33 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c
index b8bd5958c13d..60775d1329d7 100644
--- a/sys/i386/i386/perfmon.c
+++ b/sys/i386/i386/perfmon.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: perfmon.c,v 1.18 1999/05/11 01:54:52 alc Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 791060a03f8c..6129ed86f48f 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.245 1999/08/10 04:10:57 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/procfs_machdep.c b/sys/i386/i386/procfs_machdep.c
index b0f8e3cda6e2..6d48081e4d01 100644
--- a/sys/i386/i386/procfs_machdep.c
+++ b/sys/i386/i386/procfs_machdep.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_machdep.c	8.3 (Berkeley) 1/27/94
  *
  * From:
- *	$Id: procfs_machdep.c,v 1.11 1998/09/14 22:43:33 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/simplelock.s b/sys/i386/i386/simplelock.s
index 4442500ef80b..9abc3b74660a 100644
--- a/sys/i386/i386/simplelock.s
+++ b/sys/i386/i386/simplelock.s
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: simplelock.s,v 1.9 1998/05/17 23:08:03 tegge Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s
index 7093dbb86df4..ae99af947ab8 100644
--- a/sys/i386/i386/support.s
+++ b/sys/i386/i386/support.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: support.s,v 1.62 1999/03/30 09:00:40 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index fb6c1ff93688..ee277419c360 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.85 1999/07/10 15:27:55 bde Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/i386/i386/symbols.raw b/sys/i386/i386/symbols.raw
index 943d8ae860c4..0641f6657978 100644
--- a/sys/i386/i386/symbols.raw
+++ b/sys/i386/i386/symbols.raw
@@ -1,6 +1,6 @@
 #	@(#)symbols.raw	7.6 (Berkeley) 5/8/91
 #
-#	$Id: symbols.raw,v 1.13 1998/09/15 10:03:43 gibbs Exp $
+# $FreeBSD$
 #
 
 
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 76b45ff8c329..0f5930ca7a0a 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id: sys_machdep.c,v 1.41 1999/04/28 01:03:25 luoqi Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index e717563e7ed5..5e3ed49ee48a 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.139 1999/06/18 14:32:16 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index 188e20bc0f47..8a3e1c93030c 100644
--- a/sys/i386/i386/tsc.c
+++ b/sys/i386/i386/tsc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 2a0f13624b28..09e31cb980b1 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -46,7 +46,7 @@
  ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **
- **      $Id: userconfig.c,v 1.152 1999/08/09 13:52:12 mpp Exp $
+ ** $FreeBSD$
  **/
 
 /**
@@ -2545,7 +2545,7 @@ visuserconfig(void)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: userconfig.c,v 1.152 1999/08/09 13:52:12 mpp Exp $
+ * $FreeBSD$
  */
 
 #include "scbus.h"
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index 43d8cff9dfd8..b50b6f18d573 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vm86.c,v 1.26 1999/06/01 18:19:48 jlemon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/vm86bios.s b/sys/i386/i386/vm86bios.s
index b81116f06df7..778148176491 100644
--- a/sys/i386/i386/vm86bios.s
+++ b/sys/i386/i386/vm86bios.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vm86bios.s,v 1.13 1999/05/12 21:38:46 luoqi Exp $
+ * $FreeBSD$
  */
 
 #include <machine/asmacros.h>		/* miscellaneous asm macros */
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 21bc706129ce..b907f27c034c 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.124 1999/07/22 06:04:01 alc Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/i386/ibcs2/Makefile b/sys/i386/ibcs2/Makefile
index 99d779e07ad5..f90560ee821e 100644
--- a/sys/i386/ibcs2/Makefile
+++ b/sys/i386/ibcs2/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $Id$
+# $FreeBSD$
 
 all:
 	@echo "make ibcs2_sysent.c, ibcs2_isc_sysent.c or ibcs2_xenix_sysent.c only"
diff --git a/sys/i386/ibcs2/coff.h b/sys/i386/ibcs2/coff.h
index c4868fcfdacd..a0eecd97ba95 100644
--- a/sys/i386/ibcs2/coff.h
+++ b/sys/i386/ibcs2/coff.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _COFF_H
diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c
index 436489263ca3..5cc637a92cd8 100644
--- a/sys/i386/ibcs2/ibcs2_fcntl.c
+++ b/sys/i386/ibcs2/ibcs2_fcntl.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ibcs2_fcntl.c,v 1.11 1998/02/04 04:12:28 eivind Exp $
+ * $FreeBSD$
  */
 
 #include "opt_spx_hack.h"
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index d2ebfa85f176..2acf3d2bbd60 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ibcs2_ipc.c,v 1.13 1997/11/06 19:28:28 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_ipc.h b/sys/i386/ibcs2/ibcs2_ipc.h
index 664920bfa31f..bee650f76658 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.h
+++ b/sys/i386/ibcs2/ibcs2_ipc.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ibcs2_ipc.h,v 1.4 1999/02/07 19:35:40 guido Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c
index 89841418052e..bc268b6ac8ea 100644
--- a/sys/i386/ibcs2/ibcs2_isc.c
+++ b/sys/i386/ibcs2/ibcs2_isc.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2_isc.c,v 1.10 1997/07/20 09:39:43 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index aff36c81c303..cea6b15ddd44 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -45,7 +45,7 @@
  *
  *	@(#)sun_misc.c	8.1 (Berkeley) 6/18/93
  *
- * $Id: ibcs2_misc.c,v 1.31 1999/01/28 01:59:52 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/ibcs2/ibcs2_msg.c b/sys/i386/ibcs2/ibcs2_msg.c
index 8b7429b1edc2..6c36cf85540e 100644
--- a/sys/i386/ibcs2/ibcs2_msg.c
+++ b/sys/i386/ibcs2/ibcs2_msg.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ibcs2_msg.c,v 1.5 1997/11/06 19:28:34 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/ibcs2/ibcs2_other.c b/sys/i386/ibcs2/ibcs2_other.c
index cabb184b33c2..3578b3a07e5d 100644
--- a/sys/i386/ibcs2/ibcs2_other.c
+++ b/sys/i386/ibcs2/ibcs2_other.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ibcs2_other.c,v 1.8 1997/11/06 19:28:35 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/ibcs2/ibcs2_poll.h b/sys/i386/ibcs2/ibcs2_poll.h
index d04fce1bc453..6bd86ced28fd 100644
--- a/sys/i386/ibcs2/ibcs2_poll.h
+++ b/sys/i386/ibcs2/ibcs2_poll.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c
index 7770896ed3d8..fa111fa88f50 100644
--- a/sys/i386/ibcs2/ibcs2_signal.c
+++ b/sys/i386/ibcs2/ibcs2_signal.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ibcs2_signal.c,v 1.12 1997/11/06 19:28:38 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_sysvec.c b/sys/i386/ibcs2/ibcs2_sysvec.c
index a9a25fd666fe..bed71d6fb9fb 100644
--- a/sys/i386/ibcs2/ibcs2_sysvec.c
+++ b/sys/i386/ibcs2/ibcs2_sysvec.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ibcs2_sysvec.c,v 1.14 1999/02/04 21:21:38 newton Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index 89506bfced4e..67af2fcfdd5c 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.c
+++ b/sys/i386/ibcs2/ibcs2_xenix.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2_xenix.c,v 1.17 1998/12/04 22:54:46 archie Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index 3c70d0058851..5c0b316dacdd 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: imgact_coff.c,v 1.35 1999/01/28 01:59:52 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/syscalls.conf b/sys/i386/ibcs2/syscalls.conf
index ebdaa97f63b8..f000929cc5b2 100644
--- a/sys/i386/ibcs2/syscalls.conf
+++ b/sys/i386/ibcs2/syscalls.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf  $Id: syscalls.conf,v 1.4 1997/02/22 09:33:32 peter Exp $
+#	syscalls.conf $FreeBSD$
 sysnames="/dev/null"
 sysproto="ibcs2_proto.h"
 sysproto_h=_IBCS2_SYSPROTO_H_
diff --git a/sys/i386/ibcs2/syscalls.isc b/sys/i386/ibcs2/syscalls.isc
index d8806bf1c450..883374875c56 100644
--- a/sys/i386/ibcs2/syscalls.isc
+++ b/sys/i386/ibcs2/syscalls.isc
@@ -1,4 +1,4 @@
-	$Id: syscalls.isc,v 1.3 1997/02/22 09:33:35 peter Exp $
+ $FreeBSD$
 
 #include <sys/param.h>
 #include <sys/sysent.h>
diff --git a/sys/i386/ibcs2/syscalls.isc.conf b/sys/i386/ibcs2/syscalls.isc.conf
index 90e30ff70cd0..b9a3e554ead5 100644
--- a/sys/i386/ibcs2/syscalls.isc.conf
+++ b/sys/i386/ibcs2/syscalls.isc.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf  $Id: syscalls.isc.conf,v 1.3 1997/02/22 09:33:37 peter Exp $
+#	syscalls.conf $FreeBSD$
 sysnames="/dev/null"
 #sysproto="ibcs2_isc.h"
 sysproto="/dev/null"
diff --git a/sys/i386/ibcs2/syscalls.master b/sys/i386/ibcs2/syscalls.master
index ed3388c47600..ccbdf1f86ba7 100644
--- a/sys/i386/ibcs2/syscalls.master
+++ b/sys/i386/ibcs2/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.7 1997/02/22 09:33:38 peter Exp $
+ $FreeBSD$
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from IBCS2).
diff --git a/sys/i386/ibcs2/syscalls.xenix b/sys/i386/ibcs2/syscalls.xenix
index d8efc1ec8857..61182e6a34fc 100644
--- a/sys/i386/ibcs2/syscalls.xenix
+++ b/sys/i386/ibcs2/syscalls.xenix
@@ -1,4 +1,4 @@
-	$Id: syscalls.xenix,v 1.4 1997/02/22 09:33:39 peter Exp $
+ $FreeBSD$
 
 #include <sys/param.h>
 #include <sys/sysent.h>
diff --git a/sys/i386/ibcs2/syscalls.xenix.conf b/sys/i386/ibcs2/syscalls.xenix.conf
index 4b4af8b76ef4..18469ec7834c 100644
--- a/sys/i386/ibcs2/syscalls.xenix.conf
+++ b/sys/i386/ibcs2/syscalls.xenix.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf  $Id: syscalls.xenix.conf,v 1.3 1997/02/22 09:33:40 peter Exp $
+#	syscalls.conf $FreeBSD$
 sysnames="/dev/null"
 sysproto="ibcs2_xenix.h"
 sysproto_h=_IBCS2_XENIX_H_
diff --git a/sys/i386/include/_limits.h b/sys/i386/include/_limits.h
index fe6041b4c4b7..0d258ff9d94c 100644
--- a/sys/i386/include/_limits.h
+++ b/sys/i386/include/_limits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $Id: limits.h,v 1.12 1999/05/20 23:33:35 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h
index 9d7494e0fc12..22059f1d0725 100644
--- a/sys/i386/include/ansi.h
+++ b/sys/i386/include/ansi.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
- * $Id: ansi.h,v 1.15 1998/06/14 14:00:47 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ANSI_H_
diff --git a/sys/i386/include/apic.h b/sys/i386/include/apic.h
index 55e44e0bec2f..38c70709e7c2 100644
--- a/sys/i386/include/apic.h
+++ b/sys/i386/include/apic.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apic.h,v 1.11 1997/08/04 17:31:24 fsmp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_APIC_H_
diff --git a/sys/i386/include/apicreg.h b/sys/i386/include/apicreg.h
index 55e44e0bec2f..38c70709e7c2 100644
--- a/sys/i386/include/apicreg.h
+++ b/sys/i386/include/apicreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apic.h,v 1.11 1997/08/04 17:31:24 fsmp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_APIC_H_
diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h
index 5f7cf5b6ef02..754965ef388f 100644
--- a/sys/i386/include/apm_bios.h
+++ b/sys/i386/include/apm_bios.h
@@ -12,7 +12,7 @@
  *
  * Aug, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm_bios.h,v 1.24 1999/07/30 08:24:23 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_APM_BIOS_H_
diff --git a/sys/i386/include/apm_segments.h b/sys/i386/include/apm_segments.h
index 03355374e93a..9111b5cb0f09 100644
--- a/sys/i386/include/apm_segments.h
+++ b/sys/i386/include/apm_segments.h
@@ -12,7 +12,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_APM_SEGMENTS_H
diff --git a/sys/i386/include/asm.h b/sys/i386/include/asm.h
index f1023173b3d4..7ac124366024 100644
--- a/sys/i386/include/asm.h
+++ b/sys/i386/include/asm.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
- *	$Id: asm.h,v 1.3 1997/04/15 14:06:34 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h
index 00bdf7affe40..92b9e1a5d700 100644
--- a/sys/i386/include/asmacros.h
+++ b/sys/i386/include/asmacros.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: asmacros.h,v 1.16 1997/04/22 06:55:32 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ASMACROS_H_
diff --git a/sys/i386/include/asnames.h b/sys/i386/include/asnames.h
index 89218abb317e..ee2076807da6 100644
--- a/sys/i386/include/asnames.h
+++ b/sys/i386/include/asnames.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: asnames.h,v 1.38 1999/07/29 01:49:19 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ASNAMES_H_
diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h
index e9f9403f6198..b3fd514cbc91 100644
--- a/sys/i386/include/atomic.h
+++ b/sys/i386/include/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: atomic.h,v 1.4 1999/07/23 23:45:19 alc Exp $
+ * $FreeBSD$
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define _MACHINE_ATOMIC_H_
diff --git a/sys/i386/include/bootinfo.h b/sys/i386/include/bootinfo.h
index 928aa2b70de6..b8d1af3b2c51 100644
--- a/sys/i386/include/bootinfo.h
+++ b/sys/i386/include/bootinfo.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.h,v 1.11 1998/10/01 18:22:52 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_BOOTINFO_H_
diff --git a/sys/i386/include/bus.h b/sys/i386/include/bus.h
index 28e80ba2b89a..b6a9795a5ae5 100644
--- a/sys/i386/include/bus.h
+++ b/sys/i386/include/bus.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/i386/include/bus_at386.h b/sys/i386/include/bus_at386.h
index 28e80ba2b89a..b6a9795a5ae5 100644
--- a/sys/i386/include/bus_at386.h
+++ b/sys/i386/include/bus_at386.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/i386/include/bus_dma.h b/sys/i386/include/bus_dma.h
index 28e80ba2b89a..b6a9795a5ae5 100644
--- a/sys/i386/include/bus_dma.h
+++ b/sys/i386/include/bus_dma.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/i386/include/bus_memio.h b/sys/i386/include/bus_memio.h
index ee58d5a24ef2..3533a671fe8d 100644
--- a/sys/i386/include/bus_memio.h
+++ b/sys/i386/include/bus_memio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_BUS_MEMIO_H_
diff --git a/sys/i386/include/bus_pc98.h b/sys/i386/include/bus_pc98.h
index 28e80ba2b89a..b6a9795a5ae5 100644
--- a/sys/i386/include/bus_pc98.h
+++ b/sys/i386/include/bus_pc98.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/i386/include/bus_pio.h b/sys/i386/include/bus_pio.h
index 4eb051e18190..8742dd195e0b 100644
--- a/sys/i386/include/bus_pio.h
+++ b/sys/i386/include/bus_pio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_BUS_PIO_H_
diff --git a/sys/i386/include/cdk.h b/sys/i386/include/cdk.h
index f49aa32cf16c..8080f2b469f2 100644
--- a/sys/i386/include/cdk.h
+++ b/sys/i386/include/cdk.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
index 03e2d79e20f6..f5c654a6a64f 100644
--- a/sys/i386/include/clock.h
+++ b/sys/i386/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- *	$Id: clock.h,v 1.34 1998/03/05 21:45:42 tegge Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/i386/include/comstats.h b/sys/i386/include/comstats.h
index f332eebcfb19..0b8fc4e0de3f 100644
--- a/sys/i386/include/comstats.h
+++ b/sys/i386/include/comstats.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index d3e4ad47b9f0..4a2fe79f41ad 100644
--- a/sys/i386/include/cpu.h
+++ b/sys/i386/include/cpu.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
- *	$Id: cpu.h,v 1.39 1999/04/23 20:22:44 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index 9c72d0db5327..9618b252019f 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cpufunc.h,v 1.89 1999/08/19 00:32:48 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h
index ece2509927ab..93e01e26287d 100644
--- a/sys/i386/include/cputypes.h
+++ b/sys/i386/include/cputypes.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cputypes.h,v 1.11 1998/05/22 00:03:23 des Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/i386/include/db_machdep.h b/sys/i386/include/db_machdep.h
index aaa32f66661f..d5022d81e92d 100644
--- a/sys/i386/include/db_machdep.h
+++ b/sys/i386/include/db_machdep.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
- *	$Id: db_machdep.h,v 1.12 1997/02/22 09:34:24 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/i386/include/elf.h b/sys/i386/include/elf.h
index ac0cce3ee0e9..756c08c02042 100644
--- a/sys/i386/include/elf.h
+++ b/sys/i386/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf.h,v 1.6 1999/02/07 23:49:55 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h
index 63971e5a9073..9023c7680107 100644
--- a/sys/i386/include/endian.h
+++ b/sys/i386/include/endian.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)endian.h	7.8 (Berkeley) 4/3/91
- *	$Id: endian.h,v 1.15 1997/04/20 11:44:32 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/i386/include/exec.h b/sys/i386/include/exec.h
index 7670fd1cee1a..c233b09655b2 100644
--- a/sys/i386/include/exec.h
+++ b/sys/i386/include/exec.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_EXEC_H_
diff --git a/sys/i386/include/float.h b/sys/i386/include/float.h
index a0296ecc8c05..5cdbc97f7d4b 100644
--- a/sys/i386/include/float.h
+++ b/sys/i386/include/float.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h
index cd2561f8b9d1..c3e674f7f30c 100644
--- a/sys/i386/include/floatingpoint.h
+++ b/sys/i386/include/floatingpoint.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- *	$Id: floatingpoint.h,v 1.8 1997/02/22 09:34:37 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h
index f339f01c43c1..b212d6c7b77f 100644
--- a/sys/i386/include/frame.h
+++ b/sys/i386/include/frame.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- *	$Id: frame.h,v 1.17 1999/05/11 16:29:01 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_FRAME_H_
diff --git a/sys/i386/include/globaldata.h b/sys/i386/include/globaldata.h
index c02009b83432..28336d708534 100644
--- a/sys/i386/include/globaldata.h
+++ b/sys/i386/include/globaldata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: globaldata.h,v 1.9 1999/05/12 21:39:00 luoqi Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/globals.h b/sys/i386/include/globals.h
index 6305f86352db..b399b7c27ad1 100644
--- a/sys/i386/include/globals.h
+++ b/sys/i386/include/globals.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: globals.h,v 1.2 1999/05/12 21:39:01 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_GLOBALS_H_
diff --git a/sys/i386/include/i4b_cause.h b/sys/i386/include/i4b_cause.h
index 3edf3ad1e142..f94df0f9ca1c 100644
--- a/sys/i386/include/i4b_cause.h
+++ b/sys/i386/include/i4b_cause.h
@@ -27,7 +27,7 @@
  *	i4b_cause.h - causes and cause handling for i4b
  *	-----------------------------------------------
  *
- *	$Id: i4b_cause.h,v 1.9 1999/02/14 09:45:02 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:37:46 1999]
  *
diff --git a/sys/i386/include/i4b_debug.h b/sys/i386/include/i4b_debug.h
index 980bb0ae1d34..e2f1ee17f583 100644
--- a/sys/i386/include/i4b_debug.h
+++ b/sys/i386/include/i4b_debug.h
@@ -27,7 +27,7 @@
  *	i4b_debug.h - i4b debug header file
  *	-----------------------------------
  *
- *	$Id: i4b_debug.h,v 1.19 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 16:27:07 1999]
  *
diff --git a/sys/i386/include/i4b_ioctl.h b/sys/i386/include/i4b_ioctl.h
index 2f6c7530990a..785379f2549c 100644
--- a/sys/i386/include/i4b_ioctl.h
+++ b/sys/i386/include/i4b_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_ioctl.h - messages kernel <--> userland
  *	-------------------------------------------
  *
- *	$Id: i4b_ioctl.h,v 1.125 1999/07/30 07:02:11 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri Jul 30 08:53:47 1999]
  *
diff --git a/sys/i386/include/i4b_rbch_ioctl.h b/sys/i386/include/i4b_rbch_ioctl.h
index 97bdb90f6844..62d2829b8b83 100644
--- a/sys/i386/include/i4b_rbch_ioctl.h
+++ b/sys/i386/include/i4b_rbch_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_rbch_ioctl.h raw B-channel driver interface ioctls
  *	------------------------------------------------------
  *
- *	$Id: i4b_rbch_ioctl.h,v 1.1 1999/07/09 06:44:00 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Fri Jul  9 08:35:07 1999]
  *
diff --git a/sys/i386/include/i4b_tel_ioctl.h b/sys/i386/include/i4b_tel_ioctl.h
index 07fcde86df63..0f1004acae30 100644
--- a/sys/i386/include/i4b_tel_ioctl.h
+++ b/sys/i386/include/i4b_tel_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_tel_ioctl.h telephony interface ioctls
  *	------------------------------------------
  *
- *	$Id: i4b_tel_ioctl.h,v 1.10 1999/07/09 06:44:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri Jul  9 08:34:28 1999]
  *
diff --git a/sys/i386/include/i4b_trace.h b/sys/i386/include/i4b_trace.h
index 5b9a7307dd1c..3001e6466ee8 100644
--- a/sys/i386/include/i4b_trace.h
+++ b/sys/i386/include/i4b_trace.h
@@ -27,7 +27,7 @@
  *	i4b_trace.h - header file for trace data read device
  *	----------------------------------------------------
  *
- *	$Id: i4b_trace.h,v 1.6 1999/02/14 09:45:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:39:26 1999]
  *
diff --git a/sys/i386/include/ieeefp.h b/sys/i386/include/ieeefp.h
index ab4d529ea94c..3c9c49ddda34 100644
--- a/sys/i386/include/ieeefp.h
+++ b/sys/i386/include/ieeefp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- *	$Id: ieeefp.h,v 1.5 1997/02/22 09:34:41 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/if_wavelan_ieee.h b/sys/i386/include/if_wavelan_ieee.h
index f002933a9bdc..ef5f5ae709cc 100644
--- a/sys/i386/include/if_wavelan_ieee.h
+++ b/sys/i386/include/if_wavelan_ieee.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wavelan_ieee.h,v 1.4 1999/04/27 02:02:41 wpaul Exp $
+ * $FreeBSD$
  */
 
 #ifndef _IF_WAVELAN_IEEE_H
diff --git a/sys/i386/include/if_wl_wavelan.h b/sys/i386/include/if_wl_wavelan.h
index 1626f13862c5..63c5a93f7d9b 100644
--- a/sys/i386/include/if_wl_wavelan.h
+++ b/sys/i386/include/if_wl_wavelan.h
@@ -1,4 +1,4 @@
-/* $Id: if_wl_wavelan.h,v 1.2 1997/08/01 03:33:43 msmith Exp $ */
+/* $FreeBSD$ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/i386/include/iic.h b/sys/i386/include/iic.h
index 6649821e0240..5d362c1a2dd4 100644
--- a/sys/i386/include/iic.h
+++ b/sys/i386/include/iic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iic.h,v 1.1 1998/09/03 21:00:08 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __IIC_H
diff --git a/sys/i386/include/in_cksum.h b/sys/i386/include/in_cksum.h
index acfa10de0f04..f2d9beb18993 100644
--- a/sys/i386/include/in_cksum.h
+++ b/sys/i386/include/in_cksum.h
@@ -33,7 +33,7 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- *	$Id: in_cksum.h,v 1.4 1997/02/22 09:34:42 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/i386/include/ioctl_bt848.h b/sys/i386/include/ioctl_bt848.h
index 0767abddb684..30e18d156da3 100644
--- a/sys/i386/include/ioctl_bt848.h
+++ b/sys/i386/include/ioctl_bt848.h
@@ -1,7 +1,7 @@
 /*
  * extensions to ioctl_meteor.h for the bt848 cards
  *
- * $Id: ioctl_bt848.h,v 1.22 1999/02/15 11:04:36 roger Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/ioctl_ctx.h b/sys/i386/include/ioctl_ctx.h
index 5d7a5c57a332..8be709aea314 100644
--- a/sys/i386/include/ioctl_ctx.h
+++ b/sys/i386/include/ioctl_ctx.h
@@ -7,7 +7,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/ioctl_fd.h b/sys/i386/include/ioctl_fd.h
index 891d8f0a22a9..3b4da37da238 100644
--- a/sys/i386/include/ioctl_fd.h
+++ b/sys/i386/include/ioctl_fd.h
@@ -24,7 +24,7 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_IOCTL_FD_H_
diff --git a/sys/i386/include/ipl.h b/sys/i386/include/ipl.h
index 6207e93529b4..28c39aaf94e0 100644
--- a/sys/i386/include/ipl.h
+++ b/sys/i386/include/ipl.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ipl.h,v 1.15 1998/08/11 19:21:17 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_IPL_H_
diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h
index fe6041b4c4b7..0d258ff9d94c 100644
--- a/sys/i386/include/limits.h
+++ b/sys/i386/include/limits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $Id: limits.h,v 1.12 1999/05/20 23:33:35 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/i386/include/lock.h b/sys/i386/include/lock.h
index 1b3c00556426..1faff8261b32 100644
--- a/sys/i386/include/lock.h
+++ b/sys/i386/include/lock.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lock.h,v 1.8 1999/08/22 05:37:18 alc Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/include/lpt.h b/sys/i386/include/lpt.h
index 2d70d7ee3397..56d196a62fef 100644
--- a/sys/i386/include/lpt.h
+++ b/sys/i386/include/lpt.h
@@ -11,7 +11,7 @@
  *
  *	Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za>
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_LPT_H_
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index 491eb46b024a..755e1e72cce2 100644
--- a/sys/i386/include/md_var.h
+++ b/sys/i386/include/md_var.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: md_var.h,v 1.29 1999/04/28 01:04:02 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/i386/include/mouse.h b/sys/i386/include/mouse.h
index 98cc0ad38a05..12d49a2a5d75 100644
--- a/sys/i386/include/mouse.h
+++ b/sys/i386/include/mouse.h
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mouse.h,v 1.13 1999/07/12 15:16:12 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_MOUSE_H_
diff --git a/sys/i386/include/mpapic.h b/sys/i386/include/mpapic.h
index 988a2e1a69ce..a0099364a99f 100644
--- a/sys/i386/include/mpapic.h
+++ b/sys/i386/include/mpapic.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mpapic.h,v 1.10 1997/07/28 03:59:34 fsmp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_MPAPIC_H_
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 969cd0892495..283ed1701a3c 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/include/mtpr.h b/sys/i386/include/mtpr.h
index e8347e677541..679de2eed30d 100644
--- a/sys/i386/include/mtpr.h
+++ b/sys/i386/include/mtpr.h
@@ -1,4 +1,4 @@
 /*
  *	Unused in 386BSD port
- *	$Id$
+ * $FreeBSD$
  */
diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h
index 10384c6ebf9b..2e7a31d25082 100644
--- a/sys/i386/include/npx.h
+++ b/sys/i386/include/npx.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- *	$Id: npx.h,v 1.14 1997/07/20 11:06:44 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index 4f0cbc0d5576..1a8b1a724b95 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- *	$Id: param.h,v 1.49 1999/02/19 19:34:48 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PARAM_H_
diff --git a/sys/i386/include/pc/bios.h b/sys/i386/include/pc/bios.h
index 1ea2f9273191..3a317863812f 100644
--- a/sys/i386/include/pc/bios.h
+++ b/sys/i386/include/pc/bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.h,v 1.5 1999/08/18 02:20:04 msmith Exp $
+ * $FreeBSD$
  */
 
 /* 
diff --git a/sys/i386/include/pc/display.h b/sys/i386/include/pc/display.h
index 9e64a3f13307..cd2d5ff35b73 100644
--- a/sys/i386/include/pc/display.h
+++ b/sys/i386/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Color attributes for foreground text */
diff --git a/sys/i386/include/pc/msdos.h b/sys/i386/include/pc/msdos.h
index ea221c7954a5..b56bddc967dd 100644
--- a/sys/i386/include/pc/msdos.h
+++ b/sys/i386/include/pc/msdos.h
@@ -3,7 +3,7 @@
  * [obtained from mtools -wfj]
  * how to decipher DOS disk structures in coexisting with DOS
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #define MSECTOR_SIZE	512		/* MSDOS sector size in bytes */
diff --git a/sys/i386/include/pc/vesa.h b/sys/i386/include/pc/vesa.h
index f5ce264fce15..97c4a180d6f9 100644
--- a/sys/i386/include/pc/vesa.h
+++ b/sys/i386/include/pc/vesa.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vesa.h,v 1.4 1999/01/11 03:18:20 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PC_VESA_H
diff --git a/sys/i386/include/pcaudioio.h b/sys/i386/include/pcaudioio.h
index bae4564ee009..969f910f7f81 100644
--- a/sys/i386/include/pcaudioio.h
+++ b/sys/i386/include/pcaudioio.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_PCAUDIOIO_H_
diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h
index 5cee924dd9ff..ed3044cc4d6a 100644
--- a/sys/i386/include/pcb.h
+++ b/sys/i386/include/pcb.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- *	$Id: pcb.h,v 1.28 1999/06/01 18:20:06 jlemon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_PCB_H_
diff --git a/sys/i386/include/pcb_ext.h b/sys/i386/include/pcb_ext.h
index 36d07e9e8cec..154cf949ba0b 100644
--- a/sys/i386/include/pcb_ext.h
+++ b/sys/i386/include/pcb_ext.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_PCB_EXT_H_
diff --git a/sys/i386/include/pci_cfgreg.h b/sys/i386/include/pci_cfgreg.h
index 44556e7731ad..34b3fc54aaa3 100644
--- a/sys/i386/include/pci_cfgreg.h
+++ b/sys/i386/include/pci_cfgreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h
index c02009b83432..28336d708534 100644
--- a/sys/i386/include/pcpu.h
+++ b/sys/i386/include/pcpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: globaldata.h,v 1.9 1999/05/12 21:39:00 luoqi Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/perfmon.h b/sys/i386/include/perfmon.h
index 6a7ae14e38a2..c8f93f4ee52e 100644
--- a/sys/i386/include/perfmon.h
+++ b/sys/i386/include/perfmon.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: perfmon.h,v 1.4 1997/02/22 09:34:57 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index fd55bdcb2efa..b9f3f745a4e7 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 	$Id: pmap.h,v 1.60 1999/04/02 17:59:49 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h
index ae6cd6337bc3..bc2679e385c3 100644
--- a/sys/i386/include/proc.h
+++ b/sys/i386/include/proc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- *	$Id: proc.h,v 1.8 1997/05/07 19:55:13 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h
index e034e611e069..1d2b6009f52e 100644
--- a/sys/i386/include/profile.h
+++ b/sys/i386/include/profile.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $Id: profile.h,v 1.17 1998/07/14 05:09:43 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/i386/include/psl.h b/sys/i386/include/psl.h
index 5f1733587f8e..6a7e233a8408 100644
--- a/sys/i386/include/psl.h
+++ b/sys/i386/include/psl.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PSL_H_
diff --git a/sys/i386/include/ptrace.h b/sys/i386/include/ptrace.h
index 2c43a2eef8d4..55a26fd636ad 100644
--- a/sys/i386/include/ptrace.h
+++ b/sys/i386/include/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $Id: ptrace.h,v 1.6 1998/05/19 00:00:12 tegge Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/i386/include/random.h b/sys/i386/include/random.h
index 569173a1a6a2..e084f8111d1e 100644
--- a/sys/i386/include/random.h
+++ b/sys/i386/include/random.h
@@ -1,7 +1,7 @@
 /*
  * random.h -- A strong random number generator
  *
- * $Id: random.h,v 1.15 1998/06/18 15:32:05 bde Exp $
+ * $FreeBSD$
  *
  * Version 0.95, last modified 18-Oct-95
  * 
diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h
index 994bdfda0360..1f541c7b30d0 100644
--- a/sys/i386/include/reg.h
+++ b/sys/i386/include/reg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- *	$Id: reg.h,v 1.18 1999/04/28 01:04:06 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/i386/include/reloc.h b/sys/i386/include/reloc.h
index ead0334ee221..ef4b8dbc3e8c 100644
--- a/sys/i386/include/reloc.h
+++ b/sys/i386/include/reloc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_MACHINE_RELOC_H_
diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h
index 1a6e20d91af8..d043d8b5a113 100644
--- a/sys/i386/include/segments.h
+++ b/sys/i386/include/segments.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- *	$Id: segments.h,v 1.21 1999/07/29 01:49:19 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/i386/include/setjmp.h b/sys/i386/include/setjmp.h
index c0337c06ce6d..173ea2d92f8c 100644
--- a/sys/i386/include/setjmp.h
+++ b/sys/i386/include/setjmp.h
@@ -1,4 +1,4 @@
-/* $Id: setjmp.h,v 1.1 1998/01/10 23:04:51 jb Exp $ */
+/* $FreeBSD$ */
 /*
  * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
  * All rights reserved.
diff --git a/sys/i386/include/si.h b/sys/i386/include/si.h
index 416486c039b0..29d709bb3284 100644
--- a/sys/i386/include/si.h
+++ b/sys/i386/include/si.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.h,v 1.12 1998/03/23 16:27:43 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/callout.h>
diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h
index 51dc1960901e..deaa06ca7923 100644
--- a/sys/i386/include/signal.h
+++ b/sys/i386/include/signal.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $Id: signal.h,v 1.7 1997/02/22 09:35:12 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/i386/include/smb.h b/sys/i386/include/smb.h
index e0ebef8b2dd4..7ed0a82f58fa 100644
--- a/sys/i386/include/smb.h
+++ b/sys/i386/include/smb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smb.h,v 1.1 1998/09/03 21:00:08 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __SMB_H
diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h
index c425db6f7d32..0524d76b6fbe 100644
--- a/sys/i386/include/smp.h
+++ b/sys/i386/include/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: smp.h,v 1.45 1999/04/28 01:04:07 luoqi Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/include/smptests.h b/sys/i386/include/smptests.h
index a4093eee1c69..dd897284e234 100644
--- a/sys/i386/include/smptests.h
+++ b/sys/i386/include/smptests.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smptests.h,v 1.31 1998/03/07 20:48:16 tegge Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SMPTESTS_H_
diff --git a/sys/i386/include/speaker.h b/sys/i386/include/speaker.h
index 0d204bfe2f07..78b55b6135e3 100644
--- a/sys/i386/include/speaker.h
+++ b/sys/i386/include/speaker.h
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  *      modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_SPEAKER_H_
diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h
index f6e04fa98cbc..d95f9331f623 100644
--- a/sys/i386/include/specialreg.h
+++ b/sys/i386/include/specialreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: specialreg.h,v 1.16 1998/10/06 13:16:26 kato Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
diff --git a/sys/i386/include/stdarg.h b/sys/i386/include/stdarg.h
index 1766283e7f25..341eb87a4728 100644
--- a/sys/i386/include/stdarg.h
+++ b/sys/i386/include/stdarg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
- * $Id: stdarg.h,v 1.8 1997/02/22 09:35:17 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _STDARG_H_
diff --git a/sys/i386/include/sysarch.h b/sys/i386/include/sysarch.h
index a9248389acd2..009c7810259a 100644
--- a/sys/i386/include/sysarch.h
+++ b/sys/i386/include/sysarch.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sysarch.h,v 1.9 1998/07/28 03:33:27 jlemon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/trap.h b/sys/i386/include/trap.h
index 96928d189962..6cc059a1e584 100644
--- a/sys/i386/include/trap.h
+++ b/sys/i386/include/trap.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- *	$Id: trap.h,v 1.8 1999/07/25 13:16:08 cracauer Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_TRAP_H_
diff --git a/sys/i386/include/tss.h b/sys/i386/include/tss.h
index 636133a9a870..2003a66609b4 100644
--- a/sys/i386/include/tss.h
+++ b/sys/i386/include/tss.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- *	$Id: tss.h,v 1.8 1997/02/22 09:35:20 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_TSS_H_
diff --git a/sys/i386/include/types.h b/sys/i386/include/types.h
index c7eec31db1e1..39672cd98b09 100644
--- a/sys/i386/include/types.h
+++ b/sys/i386/include/types.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.3 (Berkeley) 1/5/94
- * $Id: types.h,v 1.16 1998/12/19 00:02:29 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_TYPES_H_
diff --git a/sys/i386/include/varargs.h b/sys/i386/include/varargs.h
index 5661462e11f4..d1d4ed0c0906 100644
--- a/sys/i386/include/varargs.h
+++ b/sys/i386/include/varargs.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $Id: varargs.h,v 1.6 1997/02/28 07:12:34 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _VARARGS_H_
diff --git a/sys/i386/include/vm86.h b/sys/i386/include/vm86.h
index 602ef0748f99..1231bb20a77f 100644
--- a/sys/i386/include/vm86.h
+++ b/sys/i386/include/vm86.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vm86.h,v 1.10 1999/04/28 01:04:09 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_VM86_H_
diff --git a/sys/i386/include/vmparam.h b/sys/i386/include/vmparam.h
index 9ec54e2d34af..0a5847dd5ff6 100644
--- a/sys/i386/include/vmparam.h
+++ b/sys/i386/include/vmparam.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- *	$Id: vmparam.h,v 1.30 1998/06/12 09:10:22 dg Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/include/wtio.h b/sys/i386/include/wtio.h
index 868e34774b8a..8262a01e093c 100644
--- a/sys/i386/include/wtio.h
+++ b/sys/i386/include/wtio.h
@@ -19,7 +19,7 @@
  * This driver is derived from the old 386bsd Wangtek streamer tape driver,
  * made by Robert Baron at CMU, based on Intel sources.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/isa/README.le b/sys/i386/isa/README.le
index a8c33c194b3c..74ed23c6b9d7 100644
--- a/sys/i386/isa/README.le
+++ b/sys/i386/isa/README.le
@@ -1,4 +1,4 @@
-$Id: README.le,v 1.4 1997/02/22 09:35:49 peter Exp $
+$FreeBSD$
 
 ----------------
 
diff --git a/sys/i386/isa/adv_isa.c b/sys/i386/isa/adv_isa.c
index 5cc06c5801b2..7390939cb9c5 100644
--- a/sys/i386/isa/adv_isa.c
+++ b/sys/i386/isa/adv_isa.c
@@ -44,7 +44,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: adv_isa.c,v 1.11 1999/05/08 18:20:57 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/aha_isa.c b/sys/i386/isa/aha_isa.c
index b6e0cb08e523..6484eacb225c 100644
--- a/sys/i386/isa/aha_isa.c
+++ b/sys/i386/isa/aha_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aha_isa.c,v 1.8 1999/05/08 18:20:55 peter Exp $
+ * $FreeBSD$
  */
 
 #include "pnp.h"
diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c
index e0f946d3d993..fbe2fde5860f 100644
--- a/sys/i386/isa/aic6360.c
+++ b/sys/i386/isa/aic6360.c
@@ -32,7 +32,7 @@
  */
 
 /*
- * $Id: aic6360.c,v 1.42 1998/10/22 05:58:38 bde Exp $
+ * $FreeBSD$
  *
  * Acknowledgements: Many of the algorithms used in this driver are
  * inspired by the work of Julian Elischer (julian@tfs.com) and
diff --git a/sys/i386/isa/apic_ipl.h b/sys/i386/isa/apic_ipl.h
index d9db79711519..921802e7b597 100644
--- a/sys/i386/isa/apic_ipl.h
+++ b/sys/i386/isa/apic_ipl.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apic_ipl.h,v 1.1 1997/05/31 08:49:08 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_APIC_IPL_H_
diff --git a/sys/i386/isa/apic_ipl.s b/sys/i386/isa/apic_ipl.s
index 57ddeca3009f..855de2651338 100644
--- a/sys/i386/isa/apic_ipl.s
+++ b/sys/i386/isa/apic_ipl.s
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apic_ipl.s,v 1.25 1999/07/10 15:27:58 bde Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/isa/apic_vector.s b/sys/i386/isa/apic_vector.s
index 6a7bcf059a12..f484971eab2b 100644
--- a/sys/i386/isa/apic_vector.s
+++ b/sys/i386/isa/apic_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: apic_vector.s,v 1.43 1999/07/20 06:52:35 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index dce5783cfc6a..b03cf04b3f23 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $Id: asc.c,v 1.38 1999/05/31 11:25:50 phk Exp $
+ * $FreeBSD$
  */
 
 #include "asc.h"
diff --git a/sys/i386/isa/ascreg.h b/sys/i386/isa/ascreg.h
index 41803004dc34..9fcb9a353908 100644
--- a/sys/i386/isa/ascreg.h
+++ b/sys/i386/isa/ascreg.h
@@ -31,7 +31,7 @@
  */
 
 /*
- * $Id$
+ * $FreeBSD$
  */
 
     /***    Registers (base=3EB): ************/
diff --git a/sys/i386/isa/atapi-cd.c b/sys/i386/isa/atapi-cd.c
index 865f82bae6a2..72412a931331 100644
--- a/sys/i386/isa/atapi-cd.c
+++ b/sys/i386/isa/atapi-cd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.c,v 1.20 1999/05/31 11:25:51 phk Exp $
+ * $FreeBSD$
  */
 
 #include "wdc.h"
diff --git a/sys/i386/isa/atapi-cd.h b/sys/i386/isa/atapi-cd.h
index 5bde4b72d157..3e71b3fe18cb 100644
--- a/sys/i386/isa/atapi-cd.h
+++ b/sys/i386/isa/atapi-cd.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.h,v 1.3 1999/01/31 21:51:03 sos Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/atpic_vector.s b/sys/i386/isa/atpic_vector.s
index cbb8b5ea49b9..24ce97b666b9 100644
--- a/sys/i386/isa/atpic_vector.s
+++ b/sys/i386/isa/atpic_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: icu_vector.s,v 1.12 1999/05/28 14:08:59 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 188e20bc0f47..8a3e1c93030c 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index d3bda1912379..efd84295f29d 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -8,7 +8,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use.
  *
- *	$Id: ctx.c,v 1.32 1999/05/31 11:25:54 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/ctxreg.h b/sys/i386/isa/ctxreg.h
index 836239bac689..55503c0a66cd 100644
--- a/sys/i386/isa/ctxreg.h
+++ b/sys/i386/isa/ctxreg.h
@@ -7,7 +7,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 56b0bbc3621f..4181c44e2b4e 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.91 1999/06/04 18:13:25 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/i386/isa/cyreg.h b/sys/i386/isa/cyreg.h
index baedda4175b2..88a36eb4a65e 100644
--- a/sys/i386/isa/cyreg.h
+++ b/sys/i386/isa/cyreg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cyreg.h,v 1.7 1998/08/13 19:03:22 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/diskslice_machdep.c b/sys/i386/isa/diskslice_machdep.c
index d6be12a9ddd0..342537904b6e 100644
--- a/sys/i386/isa/diskslice_machdep.c
+++ b/sys/i386/isa/diskslice_machdep.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: diskslice_machdep.c,v 1.35 1999/06/26 02:47:09 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/elink.c b/sys/i386/isa/elink.c
index 5d59813afac1..11b107f3f79e 100644
--- a/sys/i386/isa/elink.c
+++ b/sys/i386/isa/elink.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: elink.c,v 1.8 1997/07/20 14:09:54 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/elink.h b/sys/i386/isa/elink.h
index 1c39b45a7fc3..881b198641ce 100644
--- a/sys/i386/isa/elink.h
+++ b/sys/i386/isa/elink.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: elink.h,v 1.4 1997/02/22 09:36:08 peter Exp $
+ * $FreeBSD$
  */
 
 #ifdef PC98
diff --git a/sys/i386/isa/ic/cd1400.h b/sys/i386/isa/ic/cd1400.h
index ee9b9f27a4dd..90672c4ee7e6 100644
--- a/sys/i386/isa/ic/cd1400.h
+++ b/sys/i386/isa/ic/cd1400.h
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cd1400.h,v 1.4 1997/02/22 09:37:59 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/ic/esp.h b/sys/i386/isa/ic/esp.h
index cc74b0b67720..06b665b708fa 100644
--- a/sys/i386/isa/ic/esp.h
+++ b/sys/i386/isa/ic/esp.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: esp.h,v 1.4 1999/01/03 05:03:46 kato Exp $
+ * $FreeBSD$
  */
 
 #ifndef _IC_ESP_H_
diff --git a/sys/i386/isa/ic/hd64570.h b/sys/i386/isa/ic/hd64570.h
index e26e89fb789c..b676e25a9cd5 100644
--- a/sys/i386/isa/ic/hd64570.h
+++ b/sys/i386/isa/ic/hd64570.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef _HD64570_H_
 #define _HD64570_H_
diff --git a/sys/i386/isa/ic/i8042.h b/sys/i386/isa/ic/i8042.h
index 84ee90f08e62..988eaa8987dd 100644
--- a/sys/i386/isa/ic/i8042.h
+++ b/sys/i386/isa/ic/i8042.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  */
 
 #define	KBSTATP		0x64	/* kbd controller status port (I) */
diff --git a/sys/i386/isa/ic/i8237.h b/sys/i386/isa/ic/i8237.h
index e955a33b833d..2bc8a08317c6 100644
--- a/sys/i386/isa/ic/i8237.h
+++ b/sys/i386/isa/ic/i8237.h
@@ -1,7 +1,7 @@
 /*
  * Intel 8237 DMA Controller
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #define	DMA37MD_SINGLE	0x40	/* single pass mode */
diff --git a/sys/i386/isa/ic/i82586.h b/sys/i386/isa/ic/i82586.h
index 704d624b77ae..964621bd3677 100644
--- a/sys/i386/isa/ic/i82586.h
+++ b/sys/i386/isa/ic/i82586.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: i82586.h,v 1.7 1998/08/10 17:21:48 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/ic/lemac.h b/sys/i386/isa/ic/lemac.h
index f222f1ad7181..239741db9e40 100644
--- a/sys/i386/isa/ic/lemac.h
+++ b/sys/i386/isa/ic/lemac.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 #ifndef _LEMAC_H_
 #define	_LEMAC_H_
diff --git a/sys/i386/isa/ic/ns16550.h b/sys/i386/isa/ic/ns16550.h
index b91f5fd2a839..2d93e76a554d 100644
--- a/sys/i386/isa/ic/ns16550.h
+++ b/sys/i386/isa/ic/ns16550.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- *	$Id: ns16550.h,v 1.6 1999/01/03 05:03:46 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/ic/rsa.h b/sys/i386/isa/ic/rsa.h
index e760e306cacc..6f9376af2f23 100644
--- a/sys/i386/isa/ic/rsa.h
+++ b/sys/i386/isa/ic/rsa.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/ic/scd1400.h b/sys/i386/isa/ic/scd1400.h
index c651a3014ad7..272e56c9e4eb 100644
--- a/sys/i386/isa/ic/scd1400.h
+++ b/sys/i386/isa/ic/scd1400.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h
index cfe4dceb0873..14e8d14aa9be 100644
--- a/sys/i386/isa/icu.h
+++ b/sys/i386/isa/icu.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)icu.h	5.6 (Berkeley) 5/9/91
- *	$Id: icu.h,v 1.15 1997/07/22 20:12:05 fsmp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/icu_ipl.h b/sys/i386/isa/icu_ipl.h
index 147bad070f55..cdbac2bba163 100644
--- a/sys/i386/isa/icu_ipl.h
+++ b/sys/i386/isa/icu_ipl.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: icu_ipl.h,v 1.1 1997/05/31 08:50:34 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_ICU_IPL_H_
diff --git a/sys/i386/isa/icu_ipl.s b/sys/i386/isa/icu_ipl.s
index 0f3a3caeaa33..34753583a41e 100644
--- a/sys/i386/isa/icu_ipl.s
+++ b/sys/i386/isa/icu_ipl.s
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: icu_ipl.s,v 1.4 1998/08/11 15:08:12 bde Exp $
+ * $FreeBSD$
  */
 
 	.data
diff --git a/sys/i386/isa/icu_vector.s b/sys/i386/isa/icu_vector.s
index cbb8b5ea49b9..24ce97b666b9 100644
--- a/sys/i386/isa/icu_vector.s
+++ b/sys/i386/isa/icu_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: icu_vector.s,v 1.12 1999/05/28 14:08:59 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index 66771534bbf0..342cba495952 100644
--- a/sys/i386/isa/if_ar.c
+++ b/sys/i386/isa/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.26 1999/05/06 18:58:04 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_arregs.h b/sys/i386/isa/if_arregs.h
index 974b76127962..6c5b020908e2 100644
--- a/sys/i386/isa/if_arregs.h
+++ b/sys/i386/isa/if_arregs.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef _IF_ARREGS_H_
 #define _IF_ARREGS_H_
diff --git a/sys/i386/isa/if_cs.c b/sys/i386/isa/if_cs.c
index 4863ffe3c7ff..aa7e06c788fd 100644
--- a/sys/i386/isa/if_cs.c
+++ b/sys/i386/isa/if_cs.c
@@ -27,7 +27,7 @@
  */
 
 /*
- * $Id: if_cs.c,v 1.10 1999/04/16 21:22:20 peter Exp $
+ * $FreeBSD$
  *
  * Device driver for Crystal Semiconductor CS8920 based ethernet
  *   adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
diff --git a/sys/i386/isa/if_csreg.h b/sys/i386/isa/if_csreg.h
index 3d53f01db753..56d9fcd595af 100644
--- a/sys/i386/isa/if_csreg.h
+++ b/sys/i386/isa/if_csreg.h
@@ -27,7 +27,7 @@
  */
 
 /*
- * $Id: if_csreg.h,v 1.7 1998/07/19 16:13:39 root Exp root $
+ * $FreeBSD$
  */
 
 #define PP_ChipID 0x0000	/* offset   0h -> Corp -ID              */
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index d65ac48c3d38..fed261abfe59 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.152 1999/05/09 23:24:45 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_edreg.h b/sys/i386/isa/if_edreg.h
index 20a14ed8d86e..db1a89d9f7ec 100644
--- a/sys/i386/isa/if_edreg.h
+++ b/sys/i386/isa/if_edreg.h
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: if_edreg.h,v 1.24 1998/10/08 17:04:47 kato Exp $
+ * $FreeBSD$
  */
 /*
  * National Semiconductor DS8390 NIC register definitions
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 7945fb0800e2..86b796e8bd7f 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -6,7 +6,7 @@
  *
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
- * $Id: if_el.c,v 1.44 1999/08/20 14:12:12 mdodd Exp $
+ * $FreeBSD$
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
diff --git a/sys/i386/isa/if_elreg.h b/sys/i386/isa/if_elreg.h
index 8b133b3bd6d7..3fb3f15a295f 100644
--- a/sys/i386/isa/if_elreg.h
+++ b/sys/i386/isa/if_elreg.h
@@ -4,7 +4,7 @@
  * of the software, derivative works or modified versions, and any
  * portions thereof.
  *
- * $Id$
+ * $FreeBSD$
  */
 /* 3COM Etherlink 3C501 Register Definitions */
 
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index d1f3460aa545..a4027a6ae37a 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.83 1999/08/18 22:14:20 mdodd Exp $
+ * $FreeBSD$
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/i386/isa/if_epreg.h b/sys/i386/isa/if_epreg.h
index 997b228d01f7..08ff37be4fc7 100644
--- a/sys/i386/isa/if_epreg.h
+++ b/sys/i386/isa/if_epreg.h
@@ -31,7 +31,7 @@
 
  */
 /*
- *  $Id: if_epreg.h,v 1.23 1998/04/17 22:36:35 des Exp $
+ * $FreeBSD$
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/i386/isa/if_ex.c b/sys/i386/isa/if_ex.c
index 2aef5b290ac4..bd8103e8bb7c 100644
--- a/sys/i386/isa/if_ex.c
+++ b/sys/i386/isa/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ex.c,v 1.17 1999/08/18 06:11:58 mdodd Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 00b793420dd1..9e3dd65ac396 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.53 1999/08/18 22:14:21 mdodd Exp $
+ * $FreeBSD$
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 3.x
diff --git a/sys/i386/isa/if_fereg.h b/sys/i386/isa/if_fereg.h
index d9b943c5febf..7e28201f6987 100644
--- a/sys/i386/isa/if_fereg.h
+++ b/sys/i386/isa/if_fereg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: if_fereg.h,v 1.5 1997/02/22 09:36:28 peter Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Registers on FMV-180 series' ISA bus interface ASIC.
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index d6c928b98f9c..83142b44bde7 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.66 1999/08/21 06:24:14 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_ie507.h b/sys/i386/isa/if_ie507.h
index 7583ffd0a037..9be1396cf49e 100644
--- a/sys/i386/isa/if_ie507.h
+++ b/sys/i386/isa/if_ie507.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * Definitions for 3C507
  */
 
diff --git a/sys/i386/isa/if_iereg.h b/sys/i386/isa/if_iereg.h
index 3588b8414058..875f63ca9dbb 100644
--- a/sys/i386/isa/if_iereg.h
+++ b/sys/i386/isa/if_iereg.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * definitions for AT&T StarLAN 10 etc...
  */
 
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 073259d91138..700cb6dc8f5a 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_le.c,v 1.52 1999/08/18 06:11:59 mdodd Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index 058ca3f57426..6345dffd1131 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.c,v 1.64 1999/08/18 22:14:23 mdodd Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_lnc.h b/sys/i386/isa/if_lnc.h
index aeff426d5e17..f3d37f44654c 100644
--- a/sys/i386/isa/if_lnc.h
+++ b/sys/i386/isa/if_lnc.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.h,v 1.11 1999/07/06 19:22:51 des Exp $
+ * $FreeBSD$
  */
 
 #include <i386/isa/ic/Am7990.h>
diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c
index b7c90a8eeb90..7d8fa3031e8b 100644
--- a/sys/i386/isa/if_rdp.c
+++ b/sys/i386/isa/if_rdp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_rdp.c,v 1.3 1999/01/12 00:36:31 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_rdpreg.h b/sys/i386/isa/if_rdpreg.h
index cab679a4bd3e..ee56e82e4963 100644
--- a/sys/i386/isa/if_rdpreg.h
+++ b/sys/i386/isa/if_rdpreg.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_rdpreg.h,v 1.1.1.1 1998/12/21 12:43:35 j Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c
index ba883f7fecc9..6d56ab42712f 100644
--- a/sys/i386/isa/if_sr.c
+++ b/sys/i386/isa/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.23 1999/05/06 22:14:46 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_srregs.h b/sys/i386/isa/if_srregs.h
index 689b6abecf2d..64d9ba11c50e 100644
--- a/sys/i386/isa/if_srregs.h
+++ b/sys/i386/isa/if_srregs.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef _IF_SRREGS_H_
 #define _IF_SRREGS_H_
diff --git a/sys/i386/isa/if_wi.c b/sys/i386/isa/if_wi.c
index 0a92e8092463..73e56d7295b6 100644
--- a/sys/i386/isa/if_wi.c
+++ b/sys/i386/isa/if_wi.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wi.c,v 1.9 1999/08/21 06:24:15 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -117,7 +117,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_wi.c,v 1.9 1999/08/21 06:24:15 msmith Exp $";
+  "$FreeBSD$";
 #endif
 
 static struct wi_softc wi_softc[NWI];
diff --git a/sys/i386/isa/if_wireg.h b/sys/i386/isa/if_wireg.h
index 75c963ea4686..d4173273f524 100644
--- a/sys/i386/isa/if_wireg.h
+++ b/sys/i386/isa/if_wireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wireg.h,v 1.4 1999/05/07 03:28:52 wpaul Exp $
+ * $FreeBSD$
  */
 
 struct wi_counters {
diff --git a/sys/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c
index 2c37caf84774..2a68f775e677 100644
--- a/sys/i386/isa/if_wl.c
+++ b/sys/i386/isa/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.23 1999/08/18 06:11:59 mdodd Exp $ */
+/* $FreeBSD$ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index 7f59869e2d45..8db782237caa 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
  */
 
 /*
- * $Id: if_ze.c,v 1.60 1999/08/18 06:12:00 mdodd Exp $
+ * $FreeBSD$
  */
 
 /* XXX don't mix different PCCARD support code. */
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index a7059fae30aa..3043517939e6 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_zp.c,v 1.53 1999/08/18 06:12:00 mdodd Exp $
+ * $FreeBSD$
  */
 /*-
  * TODO:
diff --git a/sys/i386/isa/if_zpreg.h b/sys/i386/isa/if_zpreg.h
index 31720b5f5a37..b9848f7cfec3 100644
--- a/sys/i386/isa/if_zpreg.h
+++ b/sys/i386/isa/if_zpreg.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 /**************************************************************************
  *										  *
diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c
index 3a214a99522a..8bdb4b6d72d4 100644
--- a/sys/i386/isa/intr_machdep.c
+++ b/sys/i386/isa/intr_machdep.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  */
 /*
  * This file contains an aggregated module marked:
@@ -506,7 +506,7 @@ icu_unset(intr, handler)
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/isa/intr_machdep.h b/sys/i386/isa/intr_machdep.h
index 06593cf359f4..adea3037caa1 100644
--- a/sys/i386/isa/intr_machdep.h
+++ b/sys/i386/isa/intr_machdep.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: intr_machdep.h,v 1.15 1999/06/03 20:41:00 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_INTR_MACHDEP_H_
diff --git a/sys/i386/isa/ipl.s b/sys/i386/isa/ipl.s
index ad7eb1132bb5..964834d916fe 100644
--- a/sys/i386/isa/ipl.s
+++ b/sys/i386/isa/ipl.s
@@ -36,7 +36,7 @@
  *
  *	@(#)ipl.s
  *
- *	$Id: ipl.s,v 1.29 1999/07/03 06:33:48 alc Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/isa/ipl_funcs.c b/sys/i386/isa/ipl_funcs.c
index a4756d87dfc8..78b1c1d5fef2 100644
--- a/sys/i386/isa/ipl_funcs.c
+++ b/sys/i386/isa/ipl_funcs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ipl_funcs.c,v 1.27 1999/07/20 06:09:53 alc Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 8e153a71c62b..f87d9816f071 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa.c,v 1.127 1999/05/22 15:18:12 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h
index ea25f20604ee..cc66da9be045 100644
--- a/sys/i386/isa/isa.h
+++ b/sys/i386/isa/isa.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: isa.h,v 1.21 1997/02/22 09:36:41 peter Exp $
+ * $FreeBSD$
  */
 
 #ifdef PC98
diff --git a/sys/i386/isa/isa_compat.c b/sys/i386/isa/isa_compat.c
index 83fd0bcebeac..c84d1e22cc23 100644
--- a/sys/i386/isa/isa_compat.c
+++ b/sys/i386/isa/isa_compat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa_compat.c,v 1.12 1999/05/30 11:04:31 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/isa_compat.h b/sys/i386/isa/isa_compat.h
index 6d763811ae45..e6f57f6c81cf 100644
--- a/sys/i386/isa/isa_compat.h
+++ b/sys/i386/isa/isa_compat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa_compat.h,v 1.7 1999/05/09 09:56:52 phk Exp $
+ * $FreeBSD$
  */
 
 #include "vt.h"
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index 022dfc34da45..07cbd8d04c47 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.61 1999/05/08 18:20:05 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_ISA_DEVICE_H_
diff --git a/sys/i386/isa/isa_dma.c b/sys/i386/isa/isa_dma.c
index 7855aaa89fa1..698c67004a7e 100644
--- a/sys/i386/isa/isa_dma.c
+++ b/sys/i386/isa/isa_dma.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa_dma.c,v 1.2 1999/04/21 07:26:28 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/isa_dma.h b/sys/i386/isa/isa_dma.h
index 3fe234c3422c..15f8b3d804da 100644
--- a/sys/i386/isa/isa_dma.h
+++ b/sys/i386/isa/isa_dma.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.57 1999/01/17 06:33:43 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_ISA_DMA_H_
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index a0be302ca311..3ed23fea4b50 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: istallion.c,v 1.29 1999/05/31 11:26:09 phk Exp $
+ * $FreeBSD$
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index 09e86395df2c..ef72e12af63f 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: loran.c,v 1.19 1999/05/30 16:52:19 phk Exp $
+ * $FreeBSD$
  *
  * This device-driver helps the userland controlprogram for a LORAN-C
  * receiver avoid monopolizing the CPU.
diff --git a/sys/i386/isa/lptreg.h b/sys/i386/isa/lptreg.h
index db970a2788ee..70906f0073ec 100644
--- a/sys/i386/isa/lptreg.h
+++ b/sys/i386/isa/lptreg.h
@@ -6,7 +6,7 @@
  * William Jolitz.
  *
  *      form: @(#)lptreg.h	1.1 (Berkeley) 12/19/90
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 4705d15c63f4..a29d1b9b1e5b 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -337,7 +337,7 @@ static char	MATCDVERSION[]="Version  1(26) 18-Oct-95";
 static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV";
 /*	The proceeding strings may not be changed*/
 
-/* $Id: matcd.c,v 1.42 1999/07/03 21:02:09 peter Exp $ */
+/* $FreeBSD$ */
 
 /*---------------------------------------------------------------------------
 	Include declarations
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 0f5001715722..5ab40ef0761c 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.108 1999/05/31 11:26:15 phk Exp $
+ * $FreeBSD$
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
diff --git a/sys/i386/isa/mcdreg.h b/sys/i386/isa/mcdreg.h
index 219e119d5a87..f0f75f7b2254 100644
--- a/sys/i386/isa/mcdreg.h
+++ b/sys/i386/isa/mcdreg.h
@@ -41,7 +41,7 @@
  * the manufacturer or anyone else might provide better documentation,
  * so this file (and the driver) will then have a better quality.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef MCD_H
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index ddc41a8215f5..f6d6c663652b 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.44 1999/05/31 11:26:17 phk Exp $
+ * $FreeBSD$
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c
index 3a214a99522a..8bdb4b6d72d4 100644
--- a/sys/i386/isa/nmi.c
+++ b/sys/i386/isa/nmi.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  */
 /*
  * This file contains an aggregated module marked:
@@ -506,7 +506,7 @@ icu_unset(intr, handler)
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index a99b5674ea4b..374c06617013 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.75 1999/07/26 05:47:31 cracauer Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index cdf3b358220e..62875bf487c8 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pcaudio.c,v 1.50 1999/05/31 11:26:19 phk Exp $
+ * $FreeBSD$
  */
 
 #include "pca.h"
diff --git a/sys/i386/isa/pcf.c b/sys/i386/isa/pcf.c
index e5498b40b5fd..8cebfb004c0d 100644
--- a/sys/i386/isa/pcf.c
+++ b/sys/i386/isa/pcf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pcf.c,v 1.9 1999/05/08 21:59:27 dfr Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c
index 08cba7f52e06..741baa907f63 100644
--- a/sys/i386/isa/pcibus.c
+++ b/sys/i386/isa/pcibus.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.46 1999/08/10 09:22:21 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/isa/pcibus.h b/sys/i386/isa/pcibus.h
index 44556e7731ad..34b3fc54aaa3 100644
--- a/sys/i386/isa/pcibus.h
+++ b/sys/i386/isa/pcibus.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/isa/pnp.c b/sys/i386/isa/pnp.c
index 94a039c089b1..f8147d05e305 100644
--- a/sys/i386/isa/pnp.c
+++ b/sys/i386/isa/pnp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: pnp.c,v 1.10 1999/04/11 03:06:06 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/pnp.h b/sys/i386/isa/pnp.h
index b91b50d1198b..7b6392578d92 100644
--- a/sys/i386/isa/pnp.h
+++ b/sys/i386/isa/pnp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: pnp.h,v 1.8 1999/08/22 19:46:05 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_PNP_H_
diff --git a/sys/i386/isa/ppc.c b/sys/i386/isa/ppc.c
index 073eab558d8f..436caebf84a2 100644
--- a/sys/i386/isa/ppc.c
+++ b/sys/i386/isa/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppc.c,v 1.20 1999/02/14 22:02:47 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #include "ppc.h"
diff --git a/sys/i386/isa/ppcreg.h b/sys/i386/isa/ppcreg.h
index 3a61ae7675a9..faecb9771ff8 100644
--- a/sys/i386/isa/ppcreg.h
+++ b/sys/i386/isa/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppcreg.h,v 1.7 1999/01/10 16:41:13 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c
index 34479056ed73..d934ee56eee6 100644
--- a/sys/i386/isa/prof_machdep.c
+++ b/sys/i386/isa/prof_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: prof_machdep.c,v 1.12 1999/05/06 09:44:55 bde Exp $
+ * $FreeBSD$
  */
 
 #ifdef GUPROF
diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c
index 4268375a057c..c9c450fc4f02 100644
--- a/sys/i386/isa/random_machdep.c
+++ b/sys/i386/isa/random_machdep.c
@@ -1,7 +1,7 @@
 /*
  * random_machdep.c -- A strong random number generator
  *
- * $Id: random_machdep.c,v 1.30 1999/04/21 07:26:28 peter Exp $
+ * $FreeBSD$
  *
  * Version 0.95, last modified 18-Oct-95
  * 
diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c
index b16f6e4f9131..a3a4db2be574 100644
--- a/sys/i386/isa/rp.c
+++ b/sys/i386/isa/rp.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rp.c,v 1.28 1999/05/31 11:26:24 phk Exp $
+ * $FreeBSD$
  */
 
 /* 
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index a9e39f13fdc2..5ec3eadead22 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.47 1999/05/31 11:26:26 phk Exp $ */
+/* $FreeBSD$ */
 
 /* Please send any comments to micke@dynas.se */
 
diff --git a/sys/i386/isa/scdreg.h b/sys/i386/isa/scdreg.h
index d04dc6919e2e..e9ce3b15a23f 100644
--- a/sys/i386/isa/scdreg.h
+++ b/sys/i386/isa/scdreg.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index 34b19d467495..4186f4be232b 100644
--- a/sys/i386/isa/si.c
+++ b/sys/i386/isa/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.90 1999/08/27 06:53:34 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/sys/i386/isa/sireg.h b/sys/i386/isa/sireg.h
index 4697a7fe236d..711bf92e7ea0 100644
--- a/sys/i386/isa/sireg.h
+++ b/sys/i386/isa/sireg.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: sireg.h,v 1.6 1998/03/23 16:27:40 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/sound/mmap_test.c b/sys/i386/isa/sound/mmap_test.c
index c6afae932d47..8f2f5a547b98 100644
--- a/sys/i386/isa/sound/mmap_test.c
+++ b/sys/i386/isa/sound/mmap_test.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: mmap_test.c,v 1.2 1998/01/16 07:20:34 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sys/i386/isa/sound/pcm86.c b/sys/i386/isa/sound/pcm86.c
index c6f11f33fc55..11cbdee02139 100644
--- a/sys/i386/isa/sound/pcm86.c
+++ b/sys/i386/isa/sound/pcm86.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: pcm86.c,v 1.7 1999/01/01 08:18:06 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/sound/sound.doc b/sys/i386/isa/sound/sound.doc
index 2340d6079c18..13f370275036 100644
--- a/sys/i386/isa/sound/sound.doc
+++ b/sys/i386/isa/sound/sound.doc
@@ -1,4 +1,4 @@
-$Id: sound.doc,v 1.9 1998/10/22 15:37:35 bde Exp $
+$FreeBSD$
 
 Instructions on using audio on a FreeBSD 2.1 (or 2.0-current) system.
 See also /sys/i386/conf/LINT.
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 29f82055c98a..39d50c4c923a 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.39 1999/08/23 20:35:17 bde Exp $
+ * $FreeBSD$
  */
 
 #include "speaker.h"
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index e7818522d450..4baeeefbc06a 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: stallion.c,v 1.33 1999/05/31 11:26:33 phk Exp $
+ * $FreeBSD$
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/isa/timerreg.h b/sys/i386/isa/timerreg.h
index ff27bacc24a4..0bfd7fc8cd63 100644
--- a/sys/i386/isa/timerreg.h
+++ b/sys/i386/isa/timerreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s
index 608f13586c3b..5447a90126a0 100644
--- a/sys/i386/isa/vector.s
+++ b/sys/i386/isa/vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: vector.s,v 1.30 1997/05/26 17:58:27 fsmp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index e4707a175b24..101547102b8d 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vesa.c,v 1.27 1999/08/27 09:18:42 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "vga.h"
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 74de2820d876..972518391fc4 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.201 1999/08/14 11:40:40 phk Exp $
+ * $FreeBSD$
  */
 
 /* TODO:
diff --git a/sys/i386/isa/wd_cd.c b/sys/i386/isa/wd_cd.c
index 865f82bae6a2..72412a931331 100644
--- a/sys/i386/isa/wd_cd.c
+++ b/sys/i386/isa/wd_cd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.c,v 1.20 1999/05/31 11:25:51 phk Exp $
+ * $FreeBSD$
  */
 
 #include "wdc.h"
diff --git a/sys/i386/isa/wd_cd.h b/sys/i386/isa/wd_cd.h
index 5bde4b72d157..3e71b3fe18cb 100644
--- a/sys/i386/isa/wd_cd.h
+++ b/sys/i386/isa/wd_cd.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.h,v 1.3 1999/01/31 21:51:03 sos Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/wdreg.h b/sys/i386/isa/wdreg.h
index 6730c55cfa22..1cf76da0fc2d 100644
--- a/sys/i386/isa/wdreg.h
+++ b/sys/i386/isa/wdreg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: wdreg.h,v 1.26 1999/04/13 20:22:32 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c
index a089527fa1ea..f7837d7407bf 100644
--- a/sys/i386/isa/wfd.c
+++ b/sys/i386/isa/wfd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: wfd.c,v 1.27 1999/08/14 11:40:41 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c
index 7337796969a5..5dae30e4e97a 100644
--- a/sys/i386/isa/wst.c
+++ b/sys/i386/isa/wst.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: wst.c,v 1.23 1999/05/31 11:26:39 phk Exp $
+ * $FreeBSD$
  */
 
 #include "wdc.h"
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 36f2e012e77f..6cb7a1375651 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -20,7 +20,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wt.c,v 1.52 1999/05/31 11:26:40 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/isa/wtreg.h b/sys/i386/isa/wtreg.h
index 67836c50d8a7..33f0ee478750 100644
--- a/sys/i386/isa/wtreg.h
+++ b/sys/i386/isa/wtreg.h
@@ -19,7 +19,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/linux/Makefile b/sys/i386/linux/Makefile
index d399ad080a37..c062c96ec177 100644
--- a/sys/i386/linux/Makefile
+++ b/sys/i386/linux/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $Id: Makefile,v 1.2 1997/03/29 10:48:49 peter Exp $
+# $FreeBSD$
 
 all:
 	@echo "make linux_sysent.c only"
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c
index 3850a4de2fb5..6a766ba5d9f4 100644
--- a/sys/i386/linux/imgact_linux.c
+++ b/sys/i386/linux/imgact_linux.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: imgact_linux.c,v 1.31 1999/01/17 20:36:14 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index 93fafa2a3712..4e5db53e99cf 100644
--- a/sys/i386/linux/linux.h
+++ b/sys/i386/linux/linux.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: linux.h,v 1.34 1999/08/15 17:28:39 marcel Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_LINUX_LINUX_H_
diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c
index 5d5169d99689..c76402c31e68 100644
--- a/sys/i386/linux/linux_dummy.c
+++ b/sys/i386/linux/linux_dummy.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_dummy.c,v 1.11 1999/08/25 11:19:01 marcel Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_file.c b/sys/i386/linux/linux_file.c
index a5b051fd1be9..b0e8a367c83a 100644
--- a/sys/i386/linux/linux_file.c
+++ b/sys/i386/linux/linux_file.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_file.c,v 1.30 1999/08/14 18:20:44 marcel Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/i386/linux/linux_genassym.c b/sys/i386/linux/linux_genassym.c
index 99a88a510f6f..5d962a6c04d4 100644
--- a/sys/i386/linux/linux_genassym.c
+++ b/sys/i386/linux/linux_genassym.c
@@ -1,4 +1,4 @@
-/* $Id: linux_genassym.c,v 1.8 1998/07/29 15:50:41 bde Exp $ */
+/* $FreeBSD$ */
 
 #include <sys/param.h>
 
diff --git a/sys/i386/linux/linux_ioctl.c b/sys/i386/linux/linux_ioctl.c
index 53becd770429..56a0eda42066 100644
--- a/sys/i386/linux/linux_ioctl.c
+++ b/sys/i386/linux/linux_ioctl.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ioctl.c,v 1.40 1999/08/14 13:26:44 marcel Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_ipc.c b/sys/i386/linux/linux_ipc.c
index 7315fa9c2386..5efee536adb3 100644
--- a/sys/i386/linux/linux_ipc.c
+++ b/sys/i386/linux/linux_ipc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ipc.c,v 1.13 1997/11/06 19:28:57 phk Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c
index 74fb7319be80..98348750170d 100644
--- a/sys/i386/linux/linux_misc.c
+++ b/sys/i386/linux/linux_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_misc.c,v 1.67 1999/08/25 14:11:01 marcel Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/i386/linux/linux_signal.c b/sys/i386/linux/linux_signal.c
index 29b5c4c3ebf0..9f2200e526a6 100644
--- a/sys/i386/linux/linux_signal.c
+++ b/sys/i386/linux/linux_signal.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_signal.c,v 1.16 1999/07/06 06:54:00 cracauer Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_socket.c b/sys/i386/linux/linux_socket.c
index e757fc13c7f8..d29efb63d85d 100644
--- a/sys/i386/linux/linux_socket.c
+++ b/sys/i386/linux/linux_socket.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_socket.c,v 1.14 1998/12/30 21:20:00 sos Exp $
+ * $FreeBSD$
  */
 
 /* XXX we use functions that might not exist. */
diff --git a/sys/i386/linux/linux_stats.c b/sys/i386/linux/linux_stats.c
index bfa11f642edb..b1fc1a4e5ee8 100644
--- a/sys/i386/linux/linux_stats.c
+++ b/sys/i386/linux/linux_stats.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_stats.c,v 1.12 1999/05/11 19:54:20 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 6c626bca01d8..871ccfbed4c1 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_sysvec.c,v 1.47 1999/04/28 01:04:20 luoqi Exp $
+ * $FreeBSD$
  */
 
 /* XXX we use functions that might not exist. */
diff --git a/sys/i386/linux/linux_util.c b/sys/i386/linux/linux_util.c
index 11739158917a..7c87174089a9 100644
--- a/sys/i386/linux/linux_util.c
+++ b/sys/i386/linux/linux_util.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: svr4_util.c,v 1.5 1995/01/22 23:44:50 christos Exp
- *	$Id: linux_util.c,v 1.6 1997/03/24 11:24:31 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_util.h b/sys/i386/linux/linux_util.h
index 2905f00ca4ef..61a637171083 100644
--- a/sys/i386/linux/linux_util.h
+++ b/sys/i386/linux/linux_util.h
@@ -28,7 +28,7 @@
  *
  * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
  * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
- * $Id: linux_util.h,v 1.7 1998/12/16 16:28:57 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/linux/syscalls.conf b/sys/i386/linux/syscalls.conf
index d1e1425ed5a2..01e258801231 100644
--- a/sys/i386/linux/syscalls.conf
+++ b/sys/i386/linux/syscalls.conf
@@ -1,4 +1,4 @@
-# $Id: syscalls.conf,v 1.3 1997/02/22 09:38:31 peter Exp $
+# $FreeBSD$
 sysnames="/dev/null"
 sysproto="linux_proto.h"
 sysproto_h=_LINUX_SYSPROTO_H_
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index 369ee6ffd3a9..5e6ce0719a2a 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.22 1999/08/16 11:47:21 marcel Exp $
+ $FreeBSD$
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from LINUX).
diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c
index 08cba7f52e06..741baa907f63 100644
--- a/sys/i386/pci/pci_bus.c
+++ b/sys/i386/pci/pci_bus.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.46 1999/08/10 09:22:21 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index 08cba7f52e06..741baa907f63 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.46 1999/08/10 09:22:21 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index 08cba7f52e06..741baa907f63 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.46 1999/08/10 09:22:21 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/svr4/svr4_genassym.c b/sys/i386/svr4/svr4_genassym.c
index a21c0be0980c..41583f5896ca 100644
--- a/sys/i386/svr4/svr4_genassym.c
+++ b/sys/i386/svr4/svr4_genassym.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* Derived from:  Id: linux_genassym.c,v 1.8 1998/07/29 15:50:41 bde Exp */
 
 #include <sys/param.h>
diff --git a/sys/i386/svr4/svr4_locore.s b/sys/i386/svr4/svr4_locore.s
index 065dbdb117ba..6c3b0ae8fe4f 100644
--- a/sys/i386/svr4/svr4_locore.s
+++ b/sys/i386/svr4/svr4_locore.s
@@ -3,7 +3,7 @@
 
 #include <svr4/svr4_syscall.h>		/* system call numbers */
 
-/* $Id: svr4_locore.s,v 1.6 1999/07/30 12:47:17 newton Exp $ */
+/* $FreeBSD$ */
 	
 NON_GPROF_ENTRY(svr4_sigcode)
 	call	SVR4_SIGF_HANDLER(%esp)
diff --git a/sys/i386/svr4/svr4_machdep.c b/sys/i386/svr4/svr4_machdep.c
index 0c77505d58da..611828981ee9 100644
--- a/sys/i386/svr4/svr4_machdep.c
+++ b/sys/i386/svr4/svr4_machdep.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/svr4/svr4_machdep.h b/sys/i386/svr4/svr4_machdep.h
index 06b808942c2f..f183e60a47ac 100644
--- a/sys/i386/svr4/svr4_machdep.h
+++ b/sys/i386/svr4/svr4_machdep.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_I386_SVR4_MACHDEP_H_
diff --git a/sys/i4b/driver/i4b_bsdi_ibc.c b/sys/i4b/driver/i4b_bsdi_ibc.c
index 91688154c196..17d90c276f16 100644
--- a/sys/i4b/driver/i4b_bsdi_ibc.c
+++ b/sys/i4b/driver/i4b_bsdi_ibc.c
@@ -30,7 +30,7 @@
  *	i4b_bsdi_ibc.c - isdn4bsd kernel BSD/OS point to point driver
  *	-------------------------------------------------------------
  *
- *	$Id: i4b_bsdi_ibc.c,v 1.1 1999/04/23 08:35:07 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Fri Apr 23 10:27:57 1999]
  *
diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c
index afd34d7ddad3..24c5f2737608 100644
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@@ -27,7 +27,7 @@
  *	i4b_ctl.c - i4b system control port driver
  *	------------------------------------------
  *
- *	$Id: i4b_ctl.c,v 1.6 1999/08/06 14:02:02 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Tue Jun  8 09:27:15 1999]
  *
diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index b2ac7d01fc23..b5944513cc94 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -27,7 +27,7 @@
  *	i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
  *	---------------------------------------------------------
  *
- *	$Id: i4b_ipr.c,v 1.53 1999/07/22 18:30:15 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Thu Jul 22 19:46:53 1999]
  *
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index a2911d8b8d32..e3dcac43c58f 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -34,7 +34,7 @@
  *	the "cx" driver for Cronyx's HDLC-in-hardware device).  This driver
  *	is only the glue between sppp and i4b.
  *
- *	$Id: i4b_isppp.c,v 1.34 1999/07/24 13:21:42 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sat Jul 24 15:23:04 1999]
  *
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index 16d9de450ffd..3852b5bbdd27 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -27,7 +27,7 @@
  *	i4b_rbch.c - device driver for raw B channel data
  *	---------------------------------------------------
  *
- *	$Id: i4b_rbch.c,v 1.5 1999/08/06 14:02:04 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Fri Jul  9 09:37:02 1999]
  *
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index 4dd18c197233..5e5c9c2a0efb 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -27,7 +27,7 @@
  *	i4b_tel.c - device driver for ISDN telephony
  *	--------------------------------------------
  *
- *	$Id: i4b_tel.c,v 1.5 1999/08/06 14:02:04 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Fri Jul  9 08:35:30 1999]
  *
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index 528324102856..ad02f2b653a1 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -27,7 +27,7 @@
  *	i4btrc - device driver for trace data read device
  *	---------------------------------------------------
  *
- *	$Id: i4b_trace.c,v 1.5 1999/08/06 14:02:04 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Tue Jun  1 12:15:40 1999]
  *
diff --git a/sys/i4b/include/i4b_cause.h b/sys/i4b/include/i4b_cause.h
index 3edf3ad1e142..f94df0f9ca1c 100644
--- a/sys/i4b/include/i4b_cause.h
+++ b/sys/i4b/include/i4b_cause.h
@@ -27,7 +27,7 @@
  *	i4b_cause.h - causes and cause handling for i4b
  *	-----------------------------------------------
  *
- *	$Id: i4b_cause.h,v 1.9 1999/02/14 09:45:02 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:37:46 1999]
  *
diff --git a/sys/i4b/include/i4b_debug.h b/sys/i4b/include/i4b_debug.h
index 980bb0ae1d34..e2f1ee17f583 100644
--- a/sys/i4b/include/i4b_debug.h
+++ b/sys/i4b/include/i4b_debug.h
@@ -27,7 +27,7 @@
  *	i4b_debug.h - i4b debug header file
  *	-----------------------------------
  *
- *	$Id: i4b_debug.h,v 1.19 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 16:27:07 1999]
  *
diff --git a/sys/i4b/include/i4b_global.h b/sys/i4b/include/i4b_global.h
index b13ac0e558d6..c5c852d3348e 100644
--- a/sys/i4b/include/i4b_global.h
+++ b/sys/i4b/include/i4b_global.h
@@ -27,7 +27,7 @@
  *	i4b_global.h - i4b global include file
  *	--------------------------------------
  *
- *	$Id: i4b_global.h,v 1.21 1999/04/26 10:16:54 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Mon Apr 26 11:10:26 1999]
  *
diff --git a/sys/i4b/include/i4b_ioctl.h b/sys/i4b/include/i4b_ioctl.h
index 2f6c7530990a..785379f2549c 100644
--- a/sys/i4b/include/i4b_ioctl.h
+++ b/sys/i4b/include/i4b_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_ioctl.h - messages kernel <--> userland
  *	-------------------------------------------
  *
- *	$Id: i4b_ioctl.h,v 1.125 1999/07/30 07:02:11 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri Jul 30 08:53:47 1999]
  *
diff --git a/sys/i4b/include/i4b_isdnq931.h b/sys/i4b/include/i4b_isdnq931.h
index 15d06eec5ee0..0a85a7081f5b 100644
--- a/sys/i4b/include/i4b_isdnq931.h
+++ b/sys/i4b/include/i4b_isdnq931.h
@@ -27,7 +27,7 @@
  *	i4b_isdnq931.h - DSS1 layer 3 message types
  *	-------------------------------------------
  *
- *	$Id: i4b_isdnq931.h,v 1.5 1999/02/14 09:44:55 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sun Feb 14 10:04:01 1999]
  *
diff --git a/sys/i4b/include/i4b_l1l2.h b/sys/i4b/include/i4b_l1l2.h
index 5ad09bd9e82f..4386b7b3d608 100644
--- a/sys/i4b/include/i4b_l1l2.h
+++ b/sys/i4b/include/i4b_l1l2.h
@@ -27,7 +27,7 @@
  *	i4b_l1l2.h - i4b layer 1 / layer 2 interactions
  *	---------------------------------------------------
  *
- *	$Id: i4b_l1l2.h,v 1.8 1999/02/14 09:44:55 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sun Feb 14 10:04:07 1999]
  *
diff --git a/sys/i4b/include/i4b_l2l3.h b/sys/i4b/include/i4b_l2l3.h
index 4d4961208693..6dee953098e8 100644
--- a/sys/i4b/include/i4b_l2l3.h
+++ b/sys/i4b/include/i4b_l2l3.h
@@ -27,7 +27,7 @@
  *	i4b_l2l3.h - i4b layer 2 / layer 3 interactions
  *	-----------------------------------------------
  *
- *	$Id: i4b_l2l3.h,v 1.6 1999/02/14 09:44:55 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sun Feb 14 10:04:13 1999]
  *
diff --git a/sys/i4b/include/i4b_l3l4.h b/sys/i4b/include/i4b_l3l4.h
index 3655bb1e5b43..9a09838c4190 100644
--- a/sys/i4b/include/i4b_l3l4.h
+++ b/sys/i4b/include/i4b_l3l4.h
@@ -27,7 +27,7 @@
  *	i4b_l3l4.h - layer 3 / layer 4 interface
  *	------------------------------------------
  *
- *	$Id: i4b_l3l4.h,v 1.24 1999/03/18 14:33:40 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Wed Mar 17 16:16:40 1999]
  *
diff --git a/sys/i4b/include/i4b_mbuf.h b/sys/i4b/include/i4b_mbuf.h
index 0d63abbbc3aa..0604c33e94dc 100644
--- a/sys/i4b/include/i4b_mbuf.h
+++ b/sys/i4b/include/i4b_mbuf.h
@@ -27,7 +27,7 @@
  *	i4b - mbuf handling support routines
  *	--------------------------------------
  *
- *	$Id: i4b_mbuf.h,v 1.7 1999/02/14 09:44:55 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sun Feb 14 10:04:26 1999]
  *
diff --git a/sys/i4b/include/i4b_rbch_ioctl.h b/sys/i4b/include/i4b_rbch_ioctl.h
index 97bdb90f6844..62d2829b8b83 100644
--- a/sys/i4b/include/i4b_rbch_ioctl.h
+++ b/sys/i4b/include/i4b_rbch_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_rbch_ioctl.h raw B-channel driver interface ioctls
  *	------------------------------------------------------
  *
- *	$Id: i4b_rbch_ioctl.h,v 1.1 1999/07/09 06:44:00 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Fri Jul  9 08:35:07 1999]
  *
diff --git a/sys/i4b/include/i4b_tel_ioctl.h b/sys/i4b/include/i4b_tel_ioctl.h
index 07fcde86df63..0f1004acae30 100644
--- a/sys/i4b/include/i4b_tel_ioctl.h
+++ b/sys/i4b/include/i4b_tel_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_tel_ioctl.h telephony interface ioctls
  *	------------------------------------------
  *
- *	$Id: i4b_tel_ioctl.h,v 1.10 1999/07/09 06:44:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri Jul  9 08:34:28 1999]
  *
diff --git a/sys/i4b/include/i4b_trace.h b/sys/i4b/include/i4b_trace.h
index 5b9a7307dd1c..3001e6466ee8 100644
--- a/sys/i4b/include/i4b_trace.h
+++ b/sys/i4b/include/i4b_trace.h
@@ -27,7 +27,7 @@
  *	i4b_trace.h - header file for trace data read device
  *	----------------------------------------------------
  *
- *	$Id: i4b_trace.h,v 1.6 1999/02/14 09:45:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:39:26 1999]
  *
diff --git a/sys/i4b/layer1/i4b_asuscom_ipac.c b/sys/i4b/layer1/i4b_asuscom_ipac.c
index 5018e0852912..59f4211d7dd1 100644
--- a/sys/i4b/layer1/i4b_asuscom_ipac.c
+++ b/sys/i4b/layer1/i4b_asuscom_ipac.c
@@ -39,7 +39,7 @@
  *	code is modeled after Linux i4l driver written by Karsten
  *	Keil.
  *
- *	$Id: i4b_asuscom_ipac.c,v 1.1 1999/07/05 13:46:46 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Mon May 31 20:53:17 EEST 1999]
  *
diff --git a/sys/i4b/layer1/i4b_avm_a1.c b/sys/i4b/layer1/i4b_avm_a1.c
index 0d2015673d21..8cb1ec1a5f09 100644
--- a/sys/i4b/layer1/i4b_avm_a1.c
+++ b/sys/i4b/layer1/i4b_avm_a1.c
@@ -35,7 +35,7 @@
  *	i4b_avm_a1.c - AVM A1/Fritz passive card driver for isdn4bsd
  *	------------------------------------------------------------
  *
- *	$Id: i4b_avm_a1.c,v 1.21 1999/02/14 09:44:58 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:25:11 1999]
  *
diff --git a/sys/i4b/layer1/i4b_avm_fritz_pci.c b/sys/i4b/layer1/i4b_avm_fritz_pci.c
index b9b3395a0932..0b41c7bea129 100644
--- a/sys/i4b/layer1/i4b_avm_fritz_pci.c
+++ b/sys/i4b/layer1/i4b_avm_fritz_pci.c
@@ -35,7 +35,7 @@
  *	Fritz!Card PCI specific routines for isic driver
  *	------------------------------------------------
  *
- *	$Id: i4b_avm_fritz_pci.c,v 1.3 1999/08/06 14:02:12 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Tue Jun  1 14:08:01 1999]
  *
diff --git a/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c b/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c
index a6f0ad880f39..575da1abd0fc 100644
--- a/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c
+++ b/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c
@@ -33,7 +33,7 @@
  *	Fritz!Card pcmcia specific routines for isic driver
  *	---------------------------------------------------
  *
- *	$Id: i4b_avm_fritz_pcmcia.c,v 1.12 1999/05/03 08:48:25 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun May  2 12:01:16 1999]
  *
diff --git a/sys/i4b/layer1/i4b_avm_fritz_pnp.c b/sys/i4b/layer1/i4b_avm_fritz_pnp.c
index 8da5e0082d0c..a411c8cb1320 100644
--- a/sys/i4b/layer1/i4b_avm_fritz_pnp.c
+++ b/sys/i4b/layer1/i4b_avm_fritz_pnp.c
@@ -38,7 +38,7 @@
  *	Fritz!Card PnP specific routines for isic driver
  *	------------------------------------------------
  *
- *	$Id: i4b_avm_fritz_pnp.c,v 1.1 1999/08/06 14:02:13 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Thu 10 Jun 08:50:28 CEST 1999]
  *
diff --git a/sys/i4b/layer1/i4b_bchan.c b/sys/i4b/layer1/i4b_bchan.c
index bd9dfd0ae871..24f0aec4c975 100644
--- a/sys/i4b/layer1/i4b_bchan.c
+++ b/sys/i4b/layer1/i4b_bchan.c
@@ -27,7 +27,7 @@
  *	i4b_bchan.c - B channel handling L1 procedures
  *	----------------------------------------------
  *
- *	$Id: i4b_bchan.c,v 1.32 1999/03/17 10:41:08 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:25:27 1999]
  *
diff --git a/sys/i4b/layer1/i4b_ctx_s0P.c b/sys/i4b/layer1/i4b_ctx_s0P.c
index b5314db2239b..a651d6bf7d84 100644
--- a/sys/i4b/layer1/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/i4b_ctx_s0P.c
@@ -27,7 +27,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for Creatix PnP cards
  *	============================================================
  *
- *	$Id: i4b_ctx_s0P.c,v 1.18 1999/02/14 09:44:58 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:25:33 1999]
  *
diff --git a/sys/i4b/layer1/i4b_drn_ngo.c b/sys/i4b/layer1/i4b_drn_ngo.c
index 75aa9909996f..cca3a5b91277 100644
--- a/sys/i4b/layer1/i4b_drn_ngo.c
+++ b/sys/i4b/layer1/i4b_drn_ngo.c
@@ -27,7 +27,7 @@
  *	i4b_drn_ngo.c - Dr. Neuhaus Niccy GO@ and SAGEM Cybermod
  *	--------------------------------------------------------
  *
- *	$Id: i4b_drn_ngo.c,v 1.20 1999/02/14 09:44:58 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:25:39 1999]
  *
diff --git a/sys/i4b/layer1/i4b_dynalink.c b/sys/i4b/layer1/i4b_dynalink.c
index 1f75302db431..1e586ae002a4 100644
--- a/sys/i4b/layer1/i4b_dynalink.c
+++ b/sys/i4b/layer1/i4b_dynalink.c
@@ -33,7 +33,7 @@
  *	isdn4bsd layer1 driver for Dynalink IS64PH isdn TA
  *	==================================================
  *
- *	$Id: i4b_dynalink.c,v 1.10 1999/07/26 09:03:49 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:26:21 1999]
  *
diff --git a/sys/i4b/layer1/i4b_elsa_isdnmc.c b/sys/i4b/layer1/i4b_elsa_isdnmc.c
index 1924fceea19e..2b43323c70d6 100644
--- a/sys/i4b/layer1/i4b_elsa_isdnmc.c
+++ b/sys/i4b/layer1/i4b_elsa_isdnmc.c
@@ -33,7 +33,7 @@
  *	ELSA MicroLink ISDN/MC card specific routines
  *	---------------------------------------------
  *
- *	$Id: i4b_elsa_isdnmc.c,v 1.4 1999/02/14 09:44:59 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:26:25 1999]
  *
diff --git a/sys/i4b/layer1/i4b_elsa_mcall.c b/sys/i4b/layer1/i4b_elsa_mcall.c
index 5ad56203d5dd..e1792e2e2d3d 100644
--- a/sys/i4b/layer1/i4b_elsa_mcall.c
+++ b/sys/i4b/layer1/i4b_elsa_mcall.c
@@ -33,7 +33,7 @@
  *	ELSA MicroLink MC/all card specific routines
  *	--------------------------------------------
  *
- *	$Id: i4b_elsa_mcall.c,v 1.2 1999/02/14 09:44:59 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:26:29 1999]
  *
diff --git a/sys/i4b/layer1/i4b_elsa_qs1i.c b/sys/i4b/layer1/i4b_elsa_qs1i.c
index 573bb8672a6b..1dea51d676d6 100644
--- a/sys/i4b/layer1/i4b_elsa_qs1i.c
+++ b/sys/i4b/layer1/i4b_elsa_qs1i.c
@@ -27,7 +27,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for ELSA Quickstep 1000pro ISA
  *	=====================================================================
  *
- *	$Id: i4b_elsa_qs1i.c,v 1.15 1999/03/16 14:57:53 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Tue Mar 16 15:42:10 1999]
  *
diff --git a/sys/i4b/layer1/i4b_elsa_qs1p.c b/sys/i4b/layer1/i4b_elsa_qs1p.c
index 0cc0a01b7b9f..3c80e68a6a70 100644
--- a/sys/i4b/layer1/i4b_elsa_qs1p.c
+++ b/sys/i4b/layer1/i4b_elsa_qs1p.c
@@ -27,7 +27,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for ELSA Quickstep 1000pro PCI
  *	=====================================================================
  *
- *	$Id: i4b_elsa_qs1p.c,v 1.6 1999/03/16 15:21:55 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Wed Mar 10 07:24:32 1999]
  *
diff --git a/sys/i4b/layer1/i4b_hscx.c b/sys/i4b/layer1/i4b_hscx.c
index 4ddf779736db..efa1e7b6f696 100644
--- a/sys/i4b/layer1/i4b_hscx.c
+++ b/sys/i4b/layer1/i4b_hscx.c
@@ -27,7 +27,7 @@
  *	i4b - Siemens HSCX chip (B-channel) handling
  *	--------------------------------------------
  *
- *	$Id: i4b_hscx.c,v 1.42 1999/03/17 13:44:50 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Mar 17 11:59:05 1999]
  *
diff --git a/sys/i4b/layer1/i4b_hscx.h b/sys/i4b/layer1/i4b_hscx.h
index b611bf9955b3..ed4208ac4d45 100644
--- a/sys/i4b/layer1/i4b_hscx.h
+++ b/sys/i4b/layer1/i4b_hscx.h
@@ -30,7 +30,7 @@
  *
  *---------------------------------------------------------------------------
  *
- *	$Id: i4b_hscx.h,v 1.4 1999/02/14 09:44:59 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:26:56 1999]
  *
diff --git a/sys/i4b/layer1/i4b_ipac.h b/sys/i4b/layer1/i4b_ipac.h
index e58c4b8bde0b..4c2483e1feeb 100644
--- a/sys/i4b/layer1/i4b_ipac.h
+++ b/sys/i4b/layer1/i4b_ipac.h
@@ -27,7 +27,7 @@
  *	i4b_ipac.h - definitions for the Siemens IPAC PSB2115 chip
  *	==========================================================
  *
- *	$Id: i4b_ipac.h,v 1.6 1999/06/08 08:13:00 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Tue Jun  8 09:53:26 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isac.c b/sys/i4b/layer1/i4b_isac.c
index 71ec0c3120bb..64d20e772f57 100644
--- a/sys/i4b/layer1/i4b_isac.c
+++ b/sys/i4b/layer1/i4b_isac.c
@@ -27,7 +27,7 @@
  *	i4b_isac.c - i4b siemens isdn chipset driver ISAC handler
  *	---------------------------------------------------------
  *
- *	$Id: i4b_isac.c,v 1.30 1999/02/14 19:51:01 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:27:09 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isac.h b/sys/i4b/layer1/i4b_isac.h
index 942b9cc4dad8..82fb523ad0ac 100644
--- a/sys/i4b/layer1/i4b_isac.h
+++ b/sys/i4b/layer1/i4b_isac.h
@@ -30,7 +30,7 @@
  *
  *---------------------------------------------------------------------------
  *
- *	$Id: i4b_isac.h,v 1.6 1999/02/14 09:44:59 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:27:13 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic.c b/sys/i4b/layer1/i4b_isic.c
index a2361b986656..b1a141ed087c 100644
--- a/sys/i4b/layer1/i4b_isic.c
+++ b/sys/i4b/layer1/i4b_isic.c
@@ -27,7 +27,7 @@
  *	i4b_isic.c - global isic stuff
  *	==============================
  *
- *	$Id: i4b_isic.c,v 1.51 1999/07/26 09:03:49 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Mon Jul 26 10:59:56 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic_isa.c b/sys/i4b/layer1/i4b_isic_isa.c
index ba927c40ddd6..c240a80e8725 100644
--- a/sys/i4b/layer1/i4b_isic_isa.c
+++ b/sys/i4b/layer1/i4b_isic_isa.c
@@ -27,7 +27,7 @@
  *	i4b_isic_isa.c - ISA bus interface
  *	==================================
  *
- *	$Id: i4b_isic_isa.c,v 1.24 1999/07/26 09:03:49 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Mon Jul 26 10:59:51 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic_pci.c b/sys/i4b/layer1/i4b_isic_pci.c
index f732dd180309..59ef6d77e3b7 100644
--- a/sys/i4b/layer1/i4b_isic_pci.c
+++ b/sys/i4b/layer1/i4b_isic_pci.c
@@ -27,7 +27,7 @@
  *	i4b_isic_pci.c - PCI bus interface
  *	==================================
  *
- *	$Id: i4b_isic_pci.c,v 1.14 1999/04/28 04:12:51 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Wed Apr 21 09:57:37 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic_pcmcia.c b/sys/i4b/layer1/i4b_isic_pcmcia.c
index f6ceb5d2dab2..bf32211afab6 100644
--- a/sys/i4b/layer1/i4b_isic_pcmcia.c
+++ b/sys/i4b/layer1/i4b_isic_pcmcia.c
@@ -35,7 +35,7 @@
  *	i4b_isic_pcmcia.c - i4b FreeBSD PCMCIA support
  *	----------------------------------------------
  *
- *	$Id: i4b_isic_pcmcia.c,v 1.9 1999/04/27 09:49:49 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Mon Apr 26 10:52:57 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic_pnp.c b/sys/i4b/layer1/i4b_isic_pnp.c
index 0e534eb58ff6..e83061a7eb42 100644
--- a/sys/i4b/layer1/i4b_isic_pnp.c
+++ b/sys/i4b/layer1/i4b_isic_pnp.c
@@ -37,7 +37,7 @@
  *	i4b_isic_pnp.c - i4b pnp support
  *	--------------------------------
  *
- *	$Id: i4b_isic_pnp.c,v 1.23 1999/07/05 14:00:04 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Mon Jul  5 15:57:01 1999]
  *
diff --git a/sys/i4b/layer1/i4b_itk_ix1.c b/sys/i4b/layer1/i4b_itk_ix1.c
index c46af2b6ca84..9ec4cf3c0e78 100644
--- a/sys/i4b/layer1/i4b_itk_ix1.c
+++ b/sys/i4b/layer1/i4b_itk_ix1.c
@@ -26,7 +26,7 @@
  *	i4b_itk_ix1.c - ITK ix1 micro passive card driver for isdn4bsd
  *	--------------------------------------------------------------
  *
- *	$Id: i4b_itk_ix1.c,v 1.3 1999/02/14 09:44:59 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:28:00 1999]
  *
diff --git a/sys/i4b/layer1/i4b_l1.c b/sys/i4b/layer1/i4b_l1.c
index 79774bb313c1..847bb4fbb056 100644
--- a/sys/i4b/layer1/i4b_l1.c
+++ b/sys/i4b/layer1/i4b_l1.c
@@ -27,7 +27,7 @@
  *	i4b_l1.c - isdn4bsd layer 1 handler
  *	-----------------------------------
  *
- *	$Id: i4b_l1.c,v 1.29 1999/02/14 19:51:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:28:10 1999]
  *
diff --git a/sys/i4b/layer1/i4b_l1.h b/sys/i4b/layer1/i4b_l1.h
index f013bbbea3d3..3bf196f9da82 100644
--- a/sys/i4b/layer1/i4b_l1.h
+++ b/sys/i4b/layer1/i4b_l1.h
@@ -27,7 +27,7 @@
  *	i4b_l1.h - isdn4bsd layer 1 header file
  *	---------------------------------------
  *
- *	$Id: i4b_l1.h,v 1.64 1999/07/05 13:46:46 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Mon Jul  5 15:32:02 1999]
  *
diff --git a/sys/i4b/layer1/i4b_l1fsm.c b/sys/i4b/layer1/i4b_l1fsm.c
index f4134e405bd9..142cff3d8081 100644
--- a/sys/i4b/layer1/i4b_l1fsm.c
+++ b/sys/i4b/layer1/i4b_l1fsm.c
@@ -27,7 +27,7 @@
  *	i4b_l1fsm.c - isdn4bsd layer 1 I.430 state machine
  *	--------------------------------------------------
  *
- *	$Id: i4b_l1fsm.c,v 1.28 1999/02/14 19:51:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:28:26 1999]
  *
diff --git a/sys/i4b/layer1/i4b_siemens_isurf.c b/sys/i4b/layer1/i4b_siemens_isurf.c
index 09e6f471d46c..ed48a66d53e6 100644
--- a/sys/i4b/layer1/i4b_siemens_isurf.c
+++ b/sys/i4b/layer1/i4b_siemens_isurf.c
@@ -37,7 +37,7 @@
  *	Siemens I-Surf 2.0 PnP specific routines for isic driver
  *	--------------------------------------------------------
  *
- *	$Id: i4b_siemens_isurf.c,v 1.2 1999/07/05 13:22:12 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Mon 14 Jun 16:46:27 CEST 1999]
  *
diff --git a/sys/i4b/layer1/i4b_sws.c b/sys/i4b/layer1/i4b_sws.c
index 8de924595389..4759762ce769 100644
--- a/sys/i4b/layer1/i4b_sws.c
+++ b/sys/i4b/layer1/i4b_sws.c
@@ -47,7 +47,7 @@
  *		EXPERIMENTAL !!!!
  *		=================
  *
- *	$Id: i4b_sws.c,v 1.13 1999/02/14 09:44:59 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sun Feb 14 10:28:31 1999]
  *
diff --git a/sys/i4b/layer1/i4b_tel_s016.c b/sys/i4b/layer1/i4b_tel_s016.c
index e62d6a16457a..3a8424985ff4 100644
--- a/sys/i4b/layer1/i4b_tel_s016.c
+++ b/sys/i4b/layer1/i4b_tel_s016.c
@@ -37,7 +37,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for Teles S0/16 and clones
  *	=================================================================
  *
- *	$Id: i4b_tel_s016.c,v 1.13 1999/02/14 09:45:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:28:38 1999]
  *
diff --git a/sys/i4b/layer1/i4b_tel_s0163.c b/sys/i4b/layer1/i4b_tel_s0163.c
index 4b6f1b532caa..0d36135ce9e3 100644
--- a/sys/i4b/layer1/i4b_tel_s0163.c
+++ b/sys/i4b/layer1/i4b_tel_s0163.c
@@ -37,7 +37,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for Teles S0/16.3
  *	========================================================
  *
- *	$Id: i4b_tel_s0163.c,v 1.19 1999/07/26 09:03:25 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Mon Jul 26 10:59:38 1999]
  *
diff --git a/sys/i4b/layer1/i4b_tel_s08.c b/sys/i4b/layer1/i4b_tel_s08.c
index 8f4f284af42b..7fb53e639292 100644
--- a/sys/i4b/layer1/i4b_tel_s08.c
+++ b/sys/i4b/layer1/i4b_tel_s08.c
@@ -37,7 +37,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for Teles S0/8 and clones
  *	================================================================
  *
- *	$Id: i4b_tel_s08.c,v 1.14 1999/02/14 09:45:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:28:53 1999]
  *
diff --git a/sys/i4b/layer1/i4b_tel_s0P.c b/sys/i4b/layer1/i4b_tel_s0P.c
index f0315b071822..afbc6a5ff5ff 100644
--- a/sys/i4b/layer1/i4b_tel_s0P.c
+++ b/sys/i4b/layer1/i4b_tel_s0P.c
@@ -38,7 +38,7 @@
  *		EXPERIMENTAL !!!
  *		================
  *
- *	$Id: i4b_tel_s0P.c,v 1.14 1999/03/16 11:12:31 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Tue Mar 16 10:39:14 1999]
  *
diff --git a/sys/i4b/layer1/i4b_usr_sti.c b/sys/i4b/layer1/i4b_usr_sti.c
index d8b8792c7397..9c58ee816ba4 100644
--- a/sys/i4b/layer1/i4b_usr_sti.c
+++ b/sys/i4b/layer1/i4b_usr_sti.c
@@ -27,7 +27,7 @@
  *	i4b_usr_sti.c - USRobotics Sportster ISDN TA intern (Tina-pp)
  *	-------------------------------------------------------------
  *
- *	$Id: i4b_usr_sti.c,v 1.17 1999/02/14 09:45:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:29:05 1999]
  *
diff --git a/sys/i4b/layer1/isa_isic.c b/sys/i4b/layer1/isa_isic.c
index bd6b8c53ba86..c89bb5d2572c 100644
--- a/sys/i4b/layer1/isa_isic.c
+++ b/sys/i4b/layer1/isa_isic.c
@@ -33,7 +33,7 @@
  *	isa_isic.c - ISA bus frontend for i4b_isic driver
  *	--------------------------------------------------
  *
- *	$Id: isa_isic.c,v 1.23 1999/07/19 14:40:47 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Mon Jul 19 16:39:02 1999]
  *
diff --git a/sys/i4b/layer1/isapnp_isic.c b/sys/i4b/layer1/isapnp_isic.c
index a90299542c94..a72189b73dff 100644
--- a/sys/i4b/layer1/isapnp_isic.c
+++ b/sys/i4b/layer1/isapnp_isic.c
@@ -33,7 +33,7 @@
  *	isapnp_isic.c - ISA-P&P bus frontend for i4b_isic driver
  *	--------------------------------------------------------
  *
- *	$Id: isapnp_isic.c,v 1.11 1999/05/03 08:48:25 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun May  2 11:57:08 1999]
  *
diff --git a/sys/i4b/layer1/isic_supio.c b/sys/i4b/layer1/isic_supio.c
index 0a80fbb2595a..709dbcee4f03 100644
--- a/sys/i4b/layer1/isic_supio.c
+++ b/sys/i4b/layer1/isic_supio.c
@@ -38,7 +38,7 @@
  *	But we attach to the supio, so just see "isic" or "isicII".
  *	-----------------------------------------------------------
  *
- *	$Id: isic_supio.c,v 1.7 1999/03/24 10:09:03 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Mon Mar 22 22:49:20 MET 1999]
  *
diff --git a/sys/i4b/layer1/pci_isic.c b/sys/i4b/layer1/pci_isic.c
index 7e0a69988996..a339c2a289be 100644
--- a/sys/i4b/layer1/pci_isic.c
+++ b/sys/i4b/layer1/pci_isic.c
@@ -33,7 +33,7 @@
  *	pci_isic.c - pcmcia bus frontend for i4b_isic driver
  *	-------------------------------------------------------
  *
- *	$Id: pci_isic.c,v 1.3 1999/03/16 15:21:55 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Mar 10 07:22:08 1999]
  *
diff --git a/sys/i4b/layer1/pci_isic.h b/sys/i4b/layer1/pci_isic.h
index 0ac1918c9dd7..a19025c8aaf0 100644
--- a/sys/i4b/layer1/pci_isic.h
+++ b/sys/i4b/layer1/pci_isic.h
@@ -33,7 +33,7 @@
  *	pci_isic.h - pci bus frontend for i4b_isic driver
  *	-------------------------------------------------
  *
- *	$Id: pci_isic.h,v 1.1 1999/05/03 08:52:05 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Mar 10 07:22:08 1999]
  *
diff --git a/sys/i4b/layer1/pcmcia_isic.c b/sys/i4b/layer1/pcmcia_isic.c
index cb6ff4ce07d4..d4e0f8ec6c09 100644
--- a/sys/i4b/layer1/pcmcia_isic.c
+++ b/sys/i4b/layer1/pcmcia_isic.c
@@ -33,7 +33,7 @@
  *	pcmcia_isic.c - pcmcia bus frontend for i4b_isic driver
  *	-------------------------------------------------------
  *
- *	$Id: pcmcia_isic.c,v 1.5 1999/04/20 12:19:57 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Tue Apr 20 14:09:16 1999]
  *
diff --git a/sys/i4b/layer1/pcmcia_isic.h b/sys/i4b/layer1/pcmcia_isic.h
index d5953f01102f..c5426bde0c87 100644
--- a/sys/i4b/layer1/pcmcia_isic.h
+++ b/sys/i4b/layer1/pcmcia_isic.h
@@ -33,7 +33,7 @@
  *	pcmcia_isic.h - common definitions for pcmcia isic cards
  *	--------------------------------------------------------
  *
- *	$Id: pcmcia_isic.h,v 1.2 1999/02/14 09:45:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:29:33 1999]
  *
diff --git a/sys/i4b/layer2/i4b_iframe.c b/sys/i4b/layer2/i4b_iframe.c
index 3b3686cf4a4c..a043d851340f 100644
--- a/sys/i4b/layer2/i4b_iframe.c
+++ b/sys/i4b/layer2/i4b_iframe.c
@@ -27,7 +27,7 @@
  *	i4b_iframe.c - i frame handling routines
  *	------------------------------------------
  *
- *	$Id: i4b_iframe.c,v 1.20 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 15:52:41 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2.c b/sys/i4b/layer2/i4b_l2.c
index f282dd45c5e2..cee25ab9bbb6 100644
--- a/sys/i4b/layer2/i4b_l2.c
+++ b/sys/i4b/layer2/i4b_l2.c
@@ -27,7 +27,7 @@
  *      i4b_l2.c - ISDN layer 2 (Q.921)
  *	-------------------------------
  *
- *	$Id: i4b_l2.c,v 1.27 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 16:15:39 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2.h b/sys/i4b/layer2/i4b_l2.h
index af0809f0c657..0b838b0fd29d 100644
--- a/sys/i4b/layer2/i4b_l2.h
+++ b/sys/i4b/layer2/i4b_l2.h
@@ -27,7 +27,7 @@
  *	i4b_l2.h - ISDN layer 2 (Q.921) definitions
  *	---------------------------------------------
  *
- *	$Id: i4b_l2.h,v 1.18 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 15:51:17 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2fsm.c b/sys/i4b/layer2/i4b_l2fsm.c
index ea046622d5ab..051c5b2a064d 100644
--- a/sys/i4b/layer2/i4b_l2fsm.c
+++ b/sys/i4b/layer2/i4b_l2fsm.c
@@ -27,7 +27,7 @@
  *	i4b_l2fsm.c - layer 2 FSM
  *	-------------------------
  *
- *	$Id: i4b_l2fsm.c,v 1.15 1999/03/16 15:29:06 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Tue Mar 16 16:27:12 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2fsm.h b/sys/i4b/layer2/i4b_l2fsm.h
index 00b82d623fa4..ae3f6def3aa5 100644
--- a/sys/i4b/layer2/i4b_l2fsm.h
+++ b/sys/i4b/layer2/i4b_l2fsm.h
@@ -27,7 +27,7 @@
  *      i4b_l2fsm.h - layer 2 FSM
  *      -------------------------
  *
- *	$Id: i4b_l2fsm.h,v 1.4 1999/02/14 09:45:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:31:43 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2timer.c b/sys/i4b/layer2/i4b_l2timer.c
index 7a7db049fdbd..50ace65d6caf 100644
--- a/sys/i4b/layer2/i4b_l2timer.c
+++ b/sys/i4b/layer2/i4b_l2timer.c
@@ -27,7 +27,7 @@
  *	i4b_l2timer.c - layer 2 timer handling
  *	--------------------------------------
  *
- *	$Id: i4b_l2timer.c,v 1.15 1999/04/21 07:36:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Apr 21 09:17:58 1999]
  *
diff --git a/sys/i4b/layer2/i4b_lme.c b/sys/i4b/layer2/i4b_lme.c
index 8c5059e18d7b..cdfddee41cb1 100644
--- a/sys/i4b/layer2/i4b_lme.c
+++ b/sys/i4b/layer2/i4b_lme.c
@@ -27,7 +27,7 @@
  *	i4b_lme.c - layer management entity
  *	-------------------------------------
  *
- *	$Id: i4b_lme.c,v 1.9 1999/02/14 09:45:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:31:55 1999]
  *
diff --git a/sys/i4b/layer2/i4b_mbuf.c b/sys/i4b/layer2/i4b_mbuf.c
index 9da6d40e6178..21b12bb6eb25 100644
--- a/sys/i4b/layer2/i4b_mbuf.c
+++ b/sys/i4b/layer2/i4b_mbuf.c
@@ -27,7 +27,7 @@
  *	i4b - mbuf handling support routines
  *	------------------------------------
  *
- *	$Id: i4b_mbuf.c,v 1.11 1999/02/14 09:45:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:32:00 1999]
  *
diff --git a/sys/i4b/layer2/i4b_sframe.c b/sys/i4b/layer2/i4b_sframe.c
index 59afdf69dfb1..309d952e36e8 100644
--- a/sys/i4b/layer2/i4b_sframe.c
+++ b/sys/i4b/layer2/i4b_sframe.c
@@ -27,7 +27,7 @@
  *	i4b_sframe.c - s frame handling routines
  *	----------------------------------------
  *
- *	$Id: i4b_sframe.c,v 1.10 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 16:14:04 1999]
  *
diff --git a/sys/i4b/layer2/i4b_tei.c b/sys/i4b/layer2/i4b_tei.c
index b0299186f348..1ca81aa84b5e 100644
--- a/sys/i4b/layer2/i4b_tei.c
+++ b/sys/i4b/layer2/i4b_tei.c
@@ -27,7 +27,7 @@
  *	i4b_tei.c - tei handling procedures
  *	-----------------------------------
  *
- *	$Id: i4b_tei.c,v 1.15 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 16:14:14 1999]
  *
diff --git a/sys/i4b/layer2/i4b_uframe.c b/sys/i4b/layer2/i4b_uframe.c
index c27cfb8b256c..127bb303ce36 100644
--- a/sys/i4b/layer2/i4b_uframe.c
+++ b/sys/i4b/layer2/i4b_uframe.c
@@ -27,7 +27,7 @@
  *	i4b_uframe.c - routines for handling U-frames
  *	-----------------------------------------------
  *
- *	$Id: i4b_uframe.c,v 1.8 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 16:14:32 1999]
  *
diff --git a/sys/i4b/layer2/i4b_util.c b/sys/i4b/layer2/i4b_util.c
index 141bef08e1d5..32666672aff1 100644
--- a/sys/i4b/layer2/i4b_util.c
+++ b/sys/i4b/layer2/i4b_util.c
@@ -27,7 +27,7 @@
  *	i4b_util.c - layer 2 utility routines
  *	-------------------------------------
  *
- *	$Id: i4b_util.c,v 1.20 1999/04/15 09:53:55 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Thu Apr 15 10:47:52 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l2if.c b/sys/i4b/layer3/i4b_l2if.c
index 36ca34c04f0c..f5e3d320e79d 100644
--- a/sys/i4b/layer3/i4b_l2if.c
+++ b/sys/i4b/layer3/i4b_l2if.c
@@ -27,7 +27,7 @@
  *	i4b_l2if.c - Layer 3 interface to Layer 2
  *	-------------------------------------------
  *
- *	$Id: i4b_l2if.c,v 1.16 1999/05/25 10:05:40 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Tue May 25 11:55:15 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l3.h b/sys/i4b/layer3/i4b_l3.h
index 66a40b6e7355..32e6d806b8e9 100644
--- a/sys/i4b/layer3/i4b_l3.h
+++ b/sys/i4b/layer3/i4b_l3.h
@@ -27,7 +27,7 @@
  *	i4b_l3.h - layer 3 header file
  *	------------------------------
  *
- *	$Id: i4b_l3.h,v 1.9 1999/02/14 09:45:01 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:33:19 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l3fsm.c b/sys/i4b/layer3/i4b_l3fsm.c
index a022bf8b866f..6bc0e671458e 100644
--- a/sys/i4b/layer3/i4b_l3fsm.c
+++ b/sys/i4b/layer3/i4b_l3fsm.c
@@ -27,7 +27,7 @@
  *	i4b_l3fsm.c - layer 3 FSM
  *	-------------------------
  *
- *	$Id: i4b_l3fsm.c,v 1.16 1999/04/21 07:50:31 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Apr 21 09:42:26 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l3fsm.h b/sys/i4b/layer3/i4b_l3fsm.h
index a7553d5d3cd7..3b46875e8ae4 100644
--- a/sys/i4b/layer3/i4b_l3fsm.h
+++ b/sys/i4b/layer3/i4b_l3fsm.h
@@ -27,7 +27,7 @@
  *      i4b_l3fsm.c - layer 3 FSM
  *      -------------------------
  * 
- *	$Id: i4b_l3fsm.h,v 1.6 1999/02/14 09:45:01 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:33:31 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l3timer.c b/sys/i4b/layer3/i4b_l3timer.c
index a4a01bef7aa4..70c916d3a0aa 100644
--- a/sys/i4b/layer3/i4b_l3timer.c
+++ b/sys/i4b/layer3/i4b_l3timer.c
@@ -27,7 +27,7 @@
  *	i4b_l3timer.c - timer and timeout handling for layer 3
  *	------------------------------------------------------
  *
- *	$Id: i4b_l3timer.c,v 1.12 1999/04/21 07:50:31 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Apr 21 09:46:59 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l4if.c b/sys/i4b/layer3/i4b_l4if.c
index 46210d66da48..fa6ea162b650 100644
--- a/sys/i4b/layer3/i4b_l4if.c
+++ b/sys/i4b/layer3/i4b_l4if.c
@@ -27,7 +27,7 @@
  *	i4b_l4if.c - Layer 3 interface to Layer 4
  *	-------------------------------------------
  *
- *	$Id: i4b_l4if.c,v 1.19 1999/04/27 14:47:58 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Tue Apr 27 16:46:51 1999]
  *
diff --git a/sys/i4b/layer3/i4b_q931.c b/sys/i4b/layer3/i4b_q931.c
index 6e0256587ede..cc6d9040c58c 100644
--- a/sys/i4b/layer3/i4b_q931.c
+++ b/sys/i4b/layer3/i4b_q931.c
@@ -27,7 +27,7 @@
  *	i4b_q931.c - Q931 received messages handling
  *	--------------------------------------------
  *
- *	$Id: i4b_q931.c,v 1.21 1999/04/27 10:08:13 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Tue Apr 27 12:04:35 1999]
  *
diff --git a/sys/i4b/layer3/i4b_q931.h b/sys/i4b/layer3/i4b_q931.h
index 8c7a8a82dfa5..376d5ffb91ef 100644
--- a/sys/i4b/layer3/i4b_q931.h
+++ b/sys/i4b/layer3/i4b_q931.h
@@ -27,7 +27,7 @@
  *	i4b_q931.h - Q931 handling header file
  *	--------------------------------------
  *
- *	$Id: i4b_q931.h,v 1.6 1999/02/14 09:45:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:33:56 1999]
  *
diff --git a/sys/i4b/layer3/i4b_q932fac.c b/sys/i4b/layer3/i4b_q932fac.c
index fc28f9fcbd4b..e180b9d24970 100644
--- a/sys/i4b/layer3/i4b_q932fac.c
+++ b/sys/i4b/layer3/i4b_q932fac.c
@@ -27,7 +27,7 @@
  *	i4b_q932fac.c - Q932 facility handling
  *	--------------------------------------
  *
- *	$Id: i4b_q932fac.c,v 1.6 1999/02/14 09:45:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:34:02 1999]
  *
diff --git a/sys/i4b/layer3/i4b_q932fac.h b/sys/i4b/layer3/i4b_q932fac.h
index 7e83fce46f3c..4e745ea4a733 100644
--- a/sys/i4b/layer3/i4b_q932fac.h
+++ b/sys/i4b/layer3/i4b_q932fac.h
@@ -27,7 +27,7 @@
  *	i4b_q932fac.h - Q932 facility handling header file
  *	--------------------------------------------------
  *
- *	$Id: i4b_q932fac.h,v 1.6 1999/02/14 09:45:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:34:08 1999]
  *
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index fb2d129a8843..19a2fbaa7b0d 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -27,7 +27,7 @@
  *	i4b_i4bdrv.c - i4b userland interface driver
  *	--------------------------------------------
  *
- *	$Id: i4b_i4bdrv.c,v 1.7 1999/08/06 14:02:45 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Tue Jun  8 19:48:16 1999]
  *
diff --git a/sys/i4b/layer4/i4b_l4.c b/sys/i4b/layer4/i4b_l4.c
index 33960856597f..60cf4dc34123 100644
--- a/sys/i4b/layer4/i4b_l4.c
+++ b/sys/i4b/layer4/i4b_l4.c
@@ -27,7 +27,7 @@
  *	i4b_l4.c - kernel interface to userland
  *	-----------------------------------------
  *
- *	$Id: i4b_l4.c,v 1.39 1999/04/08 16:37:56 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Thu Apr  8 17:31:52 1999]
  *
diff --git a/sys/i4b/layer4/i4b_l4.h b/sys/i4b/layer4/i4b_l4.h
index 5d011b416935..0225137d6fee 100644
--- a/sys/i4b/layer4/i4b_l4.h
+++ b/sys/i4b/layer4/i4b_l4.h
@@ -27,7 +27,7 @@
  *	i4b_l4.h - kernel interface to userland header file
  *	---------------------------------------------------
  *
- *	$Id: i4b_l4.h,v 1.15 1999/03/18 14:33:41 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Mar 17 16:20:10 1999]
  *
diff --git a/sys/i4b/layer4/i4b_l4mgmt.c b/sys/i4b/layer4/i4b_l4mgmt.c
index 6090f297269a..aff1ecaee74e 100644
--- a/sys/i4b/layer4/i4b_l4mgmt.c
+++ b/sys/i4b/layer4/i4b_l4mgmt.c
@@ -27,7 +27,7 @@
  *	i4b_l4mgmt.c - layer 4 calldescriptor management utilites
  *	-----------------------------------------------------------
  *
- *	$Id: i4b_l4mgmt.c,v 1.24 1999/02/14 09:45:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:35:13 1999]
  *
diff --git a/sys/i4b/layer4/i4b_l4timer.c b/sys/i4b/layer4/i4b_l4timer.c
index 02bd758f5be4..fefb25d3f2a9 100644
--- a/sys/i4b/layer4/i4b_l4timer.c
+++ b/sys/i4b/layer4/i4b_l4timer.c
@@ -27,7 +27,7 @@
  *	i4b_l4timer.c - timer and timeout handling for layer 4
  *	--------------------------------------------------------
  *
- *	$Id: i4b_l4timer.c,v 1.13 1999/04/21 07:50:31 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Apr 21 09:49:08 1999]
  *
diff --git a/sys/i4b/tina-dd/i4b_tina_dd.c b/sys/i4b/tina-dd/i4b_tina_dd.c
index aba50027556d..f6d343f31373 100644
--- a/sys/i4b/tina-dd/i4b_tina_dd.c
+++ b/sys/i4b/tina-dd/i4b_tina_dd.c
@@ -28,7 +28,7 @@
  *	i4b_tina_dd.c - i4b Stollman Tina-dd control device driver
  *	----------------------------------------------------------
  *
- *	$Id: i4b_tina_dd.c,v 1.2 1999/01/12 11:05:03 eivind Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sat Dec  5 18:41:38 1998]
  *
diff --git a/sys/i4b/tina-dd/i4b_tina_ioctl.h b/sys/i4b/tina-dd/i4b_tina_ioctl.h
index d51f16d731a4..ec422f0b1df6 100644
--- a/sys/i4b/tina-dd/i4b_tina_ioctl.h
+++ b/sys/i4b/tina-dd/i4b_tina_ioctl.h
@@ -31,7 +31,7 @@
  *	i4b_tina_ioctl.h - i4b Stollman Tina-dd ioctl header file
  *	---------------------------------------------------------
  *
- *	$Id: i4b_tina_ioctl.h,v 1.2 1998/12/05 18:06:20 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sat Dec  5 18:41:51 1998]
  *
diff --git a/sys/isa/atkbd_isa.c b/sys/isa/atkbd_isa.c
index a8d638121b1d..f686170ec949 100644
--- a/sys/isa/atkbd_isa.c
+++ b/sys/isa/atkbd_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbd_isa.c,v 1.4 1999/05/08 21:59:28 dfr Exp $
+ * $FreeBSD$
  */
 
 #include "atkbd.h"
diff --git a/sys/isa/atkbdc_isa.c b/sys/isa/atkbdc_isa.c
index 387f9a534153..eae6e14fec84 100644
--- a/sys/isa/atkbdc_isa.c
+++ b/sys/isa/atkbdc_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbdc_isa.c,v 1.9 1999/06/29 17:35:09 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "atkbdc.h"
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index 188e20bc0f47..8a3e1c93030c 100644
--- a/sys/isa/atrtc.c
+++ b/sys/isa/atrtc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/isa/bt_isa.c b/sys/isa/bt_isa.c
index 6a45d50a2de5..b51fe8eb9ed8 100644
--- a/sys/isa/bt_isa.c
+++ b/sys/isa/bt_isa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_isa.c,v 1.15 1999/06/28 09:19:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index c2670fdea655..ce2ea33bc405 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.153 1999/08/23 20:58:59 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/isa/fdc.h b/sys/isa/fdc.h
index 83e291f98131..c1a4470514ab 100644
--- a/sys/isa/fdc.h
+++ b/sys/isa/fdc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fdc.h,v 1.13 1999/01/15 09:15:27 bde Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/isa/fdreg.h b/sys/isa/fdreg.h
index 7fef8ad098d4..4d01c4121cea 100644
--- a/sys/isa/fdreg.h
+++ b/sys/isa/fdreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: fdreg.h,v 1.10 1997/02/22 09:36:11 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/isa/ic/esp.h b/sys/isa/ic/esp.h
index 6621e6503917..a381ee7d22aa 100644
--- a/sys/isa/ic/esp.h
+++ b/sys/isa/ic/esp.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _IC_ESP_H_
diff --git a/sys/isa/ic/nec765.h b/sys/isa/ic/nec765.h
index 3a5561888e87..c08b73b7d600 100644
--- a/sys/isa/ic/nec765.h
+++ b/sys/isa/ic/nec765.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
- *	$Id: nec765.h,v 1.6 1997/02/22 09:38:04 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/isa/ic/ns16550.h b/sys/isa/ic/ns16550.h
index ba338886c764..e8fad7da832e 100644
--- a/sys/isa/ic/ns16550.h
+++ b/sys/isa/ic/ns16550.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c
index e1106ca8d265..c16b6632f1a5 100644
--- a/sys/isa/isa_common.c
+++ b/sys/isa/isa_common.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa_common.c,v 1.4 1999/07/29 01:02:56 mdodd Exp $
+ * $FreeBSD$
  */
 /*
  * Modifications for Intel architecture by Garrett A. Wollman.
diff --git a/sys/isa/isa_common.h b/sys/isa/isa_common.h
index 844799243e2b..c63f1efac862 100644
--- a/sys/isa/isa_common.h
+++ b/sys/isa/isa_common.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa_common.h,v 1.1 1999/05/22 15:18:25 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/isa/isa_if.m b/sys/isa/isa_if.m
index 72daf4a8768c..051b0dee11aa 100644
--- a/sys/isa/isa_if.m
+++ b/sys/isa/isa_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: isa_if.m,v 1.1 1999/05/22 15:18:26 dfr Exp $
+# $FreeBSD$
 #
 
 INTERFACE isa;
diff --git a/sys/isa/isahint.c b/sys/isa/isahint.c
index 31323ccfaaa1..9bb333fb93c8 100644
--- a/sys/isa/isahint.c
+++ b/sys/isa/isahint.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isahint.c,v 1.3 1999/05/28 09:25:00 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isa/isareg.h b/sys/isa/isareg.h
index e15f7cd9875f..a2162cd4dfca 100644
--- a/sys/isa/isareg.h
+++ b/sys/isa/isareg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: isareg.h,v 1.2 1999/01/06 05:49:30 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifdef PC98
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index 2f63e627d99e..2d157aae08b7 100644
--- a/sys/isa/isavar.h
+++ b/sys/isa/isavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isavar.h,v 1.8 1999/05/28 09:25:02 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ISA_ISAVAR_H_
diff --git a/sys/isa/pnp.h b/sys/isa/pnp.h
index 049eb7bc5b8a..cc50a1a00b77 100644
--- a/sys/isa/pnp.h
+++ b/sys/isa/pnp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  *      from: pnp.h,v 1.7 1998/09/13 22:15:44 eivind Exp
  */
 
diff --git a/sys/isa/ppc.c b/sys/isa/ppc.c
index 073eab558d8f..436caebf84a2 100644
--- a/sys/isa/ppc.c
+++ b/sys/isa/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppc.c,v 1.20 1999/02/14 22:02:47 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #include "ppc.h"
diff --git a/sys/isa/ppcreg.h b/sys/isa/ppcreg.h
index 3a61ae7675a9..faecb9771ff8 100644
--- a/sys/isa/ppcreg.h
+++ b/sys/isa/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppcreg.h,v 1.7 1999/01/10 16:41:13 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/isa/psm.c b/sys/isa/psm.c
index e7c82c97dd47..6e861ccdba9c 100644
--- a/sys/isa/psm.c
+++ b/sys/isa/psm.c
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: psm.c,v 1.16 1999/08/22 06:11:52 yokota Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/isa/rtc.h b/sys/isa/rtc.h
index ea187d9e186e..6f78657db0e1 100644
--- a/sys/isa/rtc.h
+++ b/sys/isa/rtc.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)rtc.h	7.1 (Berkeley) 5/12/91
- *	$Id: rtc.h,v 1.10 1997/02/22 09:37:03 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_RTC_H_
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 7a8c247fe2a8..962074416053 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.255 1999/08/09 11:02:38 phk Exp $
+ * $FreeBSD$
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
diff --git a/sys/isa/sioreg.h b/sys/isa/sioreg.h
index cb7aa5fbd198..052106525998 100644
--- a/sys/isa/sioreg.h
+++ b/sys/isa/sioreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
- *	$Id: sioreg.h,v 1.11 1998/09/26 14:00:29 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c
index 499a9026ac0f..2f8111dfdccb 100644
--- a/sys/isa/syscons_isa.c
+++ b/sys/isa/syscons_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: syscons_isa.c,v 1.6 1999/06/24 09:06:48 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c
index 813458e3531f..decd080c42dc 100644
--- a/sys/isa/vga_isa.c
+++ b/sys/isa/vga_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vga_isa.c,v 1.10 1999/05/30 16:52:49 phk Exp $
+ * $FreeBSD$
  */
 
 #include "vga.h"
diff --git a/sys/isofs/cd9660/TODO b/sys/isofs/cd9660/TODO
index cf3fadc5d882..b8d7f3efebb9 100644
--- a/sys/isofs/cd9660/TODO
+++ b/sys/isofs/cd9660/TODO
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
  2) should understand Rock Ridge
 
diff --git a/sys/isofs/cd9660/cd9660_bmap.c b/sys/isofs/cd9660/cd9660_bmap.c
index e787f83a98cc..e5fcd9ab32b3 100644
--- a/sys/isofs/cd9660/cd9660_bmap.c
+++ b/sys/isofs/cd9660/cd9660_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_bmap.c	8.3 (Berkeley) 1/23/94
- * $Id: cd9660_bmap.c,v 1.6 1997/02/22 09:38:47 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index 971322048310..b9aabbc7e2b8 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -38,7 +38,7 @@
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
  *
  *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_lookup.c,v 1.21 1999/01/27 21:49:54 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index ea22187acb74..d7093fe3fd7f 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.27 1999/01/27 21:49:54 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index 46e54466fb9a..0409efe2d817 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.6 (Berkeley) 5/14/95
- * $Id: cd9660_node.h,v 1.17 1998/02/03 21:39:30 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index c4ad1d7b19a6..b4f97a98e112 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.c	8.6 (Berkeley) 12/5/94
- * $Id: cd9660_rrip.c,v 1.15 1999/05/11 19:54:24 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_rrip.h b/sys/isofs/cd9660/cd9660_rrip.h
index cacee390d074..5008abf2a0ac 100644
--- a/sys/isofs/cd9660/cd9660_rrip.h
+++ b/sys/isofs/cd9660/cd9660_rrip.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.h	8.2 (Berkeley) 12/5/94
- * $Id: cd9660_rrip.h,v 1.3.2000.1 1996/09/30 12:46:48 dfr Exp $
+ * $FreeBSD$
  */
   
 typedef struct {
diff --git a/sys/isofs/cd9660/cd9660_util.c b/sys/isofs/cd9660/cd9660_util.c
index 21d4b9bbc343..2a11dc2f6361 100644
--- a/sys/isofs/cd9660/cd9660_util.c
+++ b/sys/isofs/cd9660/cd9660_util.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_util.c	8.3 (Berkeley) 12/5/94
- * $Id: cd9660_util.c,v 1.11 1999/04/18 10:58:02 dcs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 59421d07a57f..0ed30ed79da8 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.60 1999/08/25 12:24:39 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 86cd115b6634..ee2528b2d8cc 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
- * $Id: cd9660_vnops.c,v 1.56 1999/05/11 19:54:25 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index 5d211555e76a..6a685d2465e9 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.6 (Berkeley) 5/10/95
- * $Id: iso.h,v 1.16 1997/05/07 13:23:04 joerg Exp $
+ * $FreeBSD$
  */
 
 #define ISODCL(from, to) (to - from + 1)
diff --git a/sys/isofs/cd9660/iso_rrip.h b/sys/isofs/cd9660/iso_rrip.h
index 2b256d51eca0..0c06e98825ce 100644
--- a/sys/isofs/cd9660/iso_rrip.h
+++ b/sys/isofs/cd9660/iso_rrip.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_rrip.h	8.2 (Berkeley) 1/23/94
- * $Id: iso_rrip.h,v 1.4 1997/02/22 09:38:52 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/kern/bus_if.m b/sys/kern/bus_if.m
index 869639f074f1..d701283a7718 100644
--- a/sys/kern/bus_if.m
+++ b/sys/kern/bus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: bus_if.m,v 1.12 1999/07/11 13:42:36 dfr Exp $
+# $FreeBSD$
 #
 
 INTERFACE bus;
diff --git a/sys/kern/device_if.m b/sys/kern/device_if.m
index 181c5bfc000b..1d6215bf85c5 100644
--- a/sys/kern/device_if.m
+++ b/sys/kern/device_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: device_if.m,v 1.5 1999/05/14 11:22:41 dfr Exp $
+# $FreeBSD$
 #
 
 INTERFACE device;
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index df983dec2d2e..0b3cbf5fc203 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact_aout.c,v 1.52 1999/05/17 00:53:36 alc Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 59f347c5eacf..d58d2741860b 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: imgact_elf.c,v 1.61 1999/07/09 19:10:14 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_rlimit.h"
diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c
index 09e52f17b265..f3c2e6001dff 100644
--- a/sys/kern/imgact_gzip.c
+++ b/sys/kern/imgact_gzip.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: imgact_gzip.c,v 1.37 1999/05/09 16:04:09 peter Exp $
+ * $FreeBSD$
  *
  * This module handles execution of a.out files which have been run through
  * "gzip".  This saves diskspace, but wastes cpu-cycles and VM.
diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
index 4a6e6f7bb21c..38bab6bf214e 100644
--- a/sys/kern/imgact_shell.c
+++ b/sys/kern/imgact_shell.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact_shell.c,v 1.18 1999/01/29 22:59:43 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index 1db9b2c99642..f38e0bf07795 100644
--- a/sys/kern/inflate.c
+++ b/sys/kern/inflate.c
@@ -7,7 +7,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: inflate.c,v 1.11 1997/10/12 20:23:40 phk Exp $
+ * $FreeBSD$
  *
  *
  */
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 7791f7f3b9df..7a0e216ac69d 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.124 1999/07/01 13:21:36 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_init_path.h"
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index f76c2e2191b1..3222b1668235 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_acct.c	8.1 (Berkeley) 6/14/93
- *	$Id: kern_acct.c,v 1.20 1999/04/27 11:15:53 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 18305494b612..4d7b6a94e46c 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.96 1999/07/18 15:07:18 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ntp.h"
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 2f865348c8b6..58dc63f944ca 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_conf.c,v 1.59 1999/08/20 20:24:59 julian Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 653259694fb3..7e718a24f3fb 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
- * $Id: kern_descrip.c,v 1.65 1999/08/04 18:53:44 green Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index df235e46e8dd..fb5d71fd075e 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_environment.c,v 1.5 1999/01/27 21:24:50 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index ef105514faf2..6bb57e09a17c 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_exec.c,v 1.99 1999/04/27 11:15:55 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 10a54ac73ee7..50e29b8ccd48 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.81 1999/06/07 20:37:29 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 633e7e76becc..c02dadf2f94a 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_fork.c	8.6 (Berkeley) 4/8/94
- * $Id: kern_fork.c,v 1.63 1999/07/03 20:58:44 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index 22565f73cd67..1e46c79059b3 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: kern_intr.c,v 1.21 1998/11/10 09:16:29 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index e90a6897164c..16fd0487ecd1 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: malloc.c,v 1.44 1999/03/28 14:16:05 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 939888ec5786..19e4a6ad9313 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_ktrace.c	8.2 (Berkeley) 9/23/93
- * $Id: kern_ktrace.c,v 1.26 1999/04/28 11:36:55 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 26c1f6bfab24..8feb119b6285 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_linker.c,v 1.35 1999/08/20 00:18:07 grog Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ddb.h"
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 35f6567dabdd..2b2dfeb13c77 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_lock.c	8.18 (Berkeley) 5/21/95
- * $Id: kern_lock.c,v 1.26 1999/06/26 02:46:00 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include "opt_lint.h"
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index 21f38e2562de..27bb5c49f6af 100644
--- a/sys/kern/kern_lockf.c
+++ b/sys/kern/kern_lockf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lockf.c	8.3 (Berkeley) 1/6/94
- * $Id: kern_lockf.c,v 1.22 1999/05/08 22:46:46 dt Exp $
+ * $FreeBSD$
  */
 
 #include "opt_debug_lockf.h"
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 4b3a42a4c587..98098ad69059 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_malloc.c	8.3 (Berkeley) 1/4/94
- * $Id: kern_malloc.c,v 1.56 1999/05/12 11:11:27 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_vm.h"
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index aa69b24bd5d4..91940022e488 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sysctl.c	8.4 (Berkeley) 4/14/94
- * $Id: kern_mib.c,v 1.23 1999/08/08 18:42:48 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index 19dd2be31a66..c4e28a5842f1 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_module.c,v 1.18 1999/05/20 00:00:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index a5a81722d5b3..69130d68e995 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: kern_physio.c,v 1.37 1999/08/21 06:48:16 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index a8e35e173a7c..28e1f6d10b0a 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
- * $Id: kern_proc.c,v 1.53 1999/07/17 20:29:10 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index e4ad6f5c5801..5c2635046a4c 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_prot.c	8.6 (Berkeley) 1/21/94
- * $Id: kern_prot.c,v 1.46 1999/04/27 12:21:06 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/kern_random.c b/sys/kern/kern_random.c
index 4268375a057c..c9c450fc4f02 100644
--- a/sys/kern/kern_random.c
+++ b/sys/kern/kern_random.c
@@ -1,7 +1,7 @@
 /*
  * random_machdep.c -- A strong random number generator
  *
- * $Id: random_machdep.c,v 1.30 1999/04/21 07:26:28 peter Exp $
+ * $FreeBSD$
  *
  * Version 0.95, last modified 18-Oct-95
  * 
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 811ccf479b5f..813a978534df 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_resource.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_resource.c,v 1.47 1999/04/27 12:21:07 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 5583a250c0ed..5cd4f85135d5 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_shutdown.c	8.3 (Berkeley) 1/21/94
- * $Id: kern_shutdown.c,v 1.61 1999/08/21 06:24:20 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ddb.h"
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 0b4a89c18ef3..49465fce8ba6 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
- * $Id: kern_sig.c,v 1.60 1999/08/16 18:13:38 billf Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 73d7d2c8a092..2b32e3d10c70 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_subr.c	8.3 (Berkeley) 1/21/94
- * $Id: kern_subr.c,v 1.28 1999/03/12 03:09:29 julian Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 17d3a6c63da3..be058daa54a7 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_synch.c	8.9 (Berkeley) 5/19/95
- * $Id: kern_synch.c,v 1.76 1999/03/05 16:38:12 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c
index 562ad477b785..3ba15ad4502a 100644
--- a/sys/kern/kern_syscalls.c
+++ b/sys/kern/kern_syscalls.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     $Id: kern_syscalls.c,v 1.3 1999/01/17 18:58:04 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index c6877f60344c..af6c32aff393 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sysctl.c	8.4 (Berkeley) 4/14/94
- * $Id: kern_sysctl.c,v 1.88 1999/04/28 11:37:00 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 18305494b612..4d7b6a94e46c 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.96 1999/07/18 15:07:18 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ntp.h"
diff --git a/sys/kern/kern_threads.c b/sys/kern/kern_threads.c
index ba5b35d46c5a..3531e2c6d361 100644
--- a/sys/kern/kern_threads.c
+++ b/sys/kern/kern_threads.c
@@ -46,7 +46,7 @@
  * in Germany will I accept domestic beer.  This code may or may not work
  * and I certainly make no claims as to its fitness for *any* purpose.
  * 
- * $Id: kern_threads.c,v 1.13 1999/01/28 17:31:59 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 880f97221766..032b0385981e 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_time.c	8.1 (Berkeley) 6/10/93
- * $Id: kern_time.c,v 1.65 1999/04/27 11:16:07 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index c7d44016f1cf..45bc266c567b 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- *	$Id: kern_timeout.c,v 1.56 1999/03/06 04:46:19 wollman Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index 92b26cee0cea..5009db2585f2 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_xxx.c	8.2 (Berkeley) 11/14/93
- * $Id: kern_xxx.c,v 1.29 1999/04/27 11:16:09 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/link_aout.c b/sys/kern/link_aout.c
index e7955ec5d0af..50d1e1c88452 100644
--- a/sys/kern/link_aout.c
+++ b/sys/kern/link_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: link_aout.c,v 1.20 1999/05/08 13:03:47 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef __alpha__
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index e30294e89c4e..e481e2cfbbb0 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: link_elf.c,v 1.17 1999/05/08 13:03:49 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index e30294e89c4e..e481e2cfbbb0 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: link_elf.c,v 1.17 1999/05/08 13:03:49 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/makedevops.pl b/sys/kern/makedevops.pl
index 6c6ec306d31d..85f6bc5284bc 100644
--- a/sys/kern/makedevops.pl
+++ b/sys/kern/makedevops.pl
@@ -35,7 +35,7 @@
 # From @(#)makedevops.sh 1.1 1998/06/14 13:53:12 dfr Exp $
 # From @(#)makedevops.sh ?.? 1998/10/05
 #
-# $Id: makedevops.pl,v 1.9 1999/08/18 08:39:14 n_hibma Exp $
+# $FreeBSD$
 
 #
 # Script to produce device front-end sugar.
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index 0cbd2475f9d1..413d2b88f51d 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -1,6 +1,6 @@
 #! /bin/sh -
 #	@(#)makesyscalls.sh	8.1 (Berkeley) 6/10/93
-# $Id: makesyscalls.sh,v 1.34 1998/06/09 03:32:05 bde Exp $
+# $FreeBSD$
 
 set -e
 
diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c
index d6175ee11367..c4e3791f5342 100644
--- a/sys/kern/md5c.c
+++ b/sys/kern/md5c.c
@@ -22,7 +22,7 @@
  * These notices must be retained in any copies of any part of this
  * documentation and/or software.
  *
- * $Id: md5c.c,v 1.14 1998/05/01 16:40:19 bde Exp $
+ * $FreeBSD$
  *
  * This code is the same as the code published by RSA Inc.  It has been
  * edited for clarity and style only.
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index 3e90dc5a5031..4de4ee940e43 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -41,7 +41,7 @@
  *
  *	@(#)subr_autoconf.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: subr_autoconf.c,v 1.10 1999/04/17 09:12:35 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c
index 79dc27c22a71..080bec794813 100644
--- a/sys/kern/subr_blist.c
+++ b/sys/kern/subr_blist.c
@@ -60,7 +60,7 @@
  *
  *	This code can be compiled stand-alone for debugging.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifdef KERNEL
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 27e280e6a300..d03e65685c49 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: subr_bus.c,v 1.38 1999/08/14 13:32:25 n_hibma Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c
index b1e5edaa5c37..a7d1daf79e8e 100644
--- a/sys/kern/subr_clist.c
+++ b/sys/kern/subr_clist.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: tty_subr.c,v 1.30 1998/07/15 02:32:12 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c
index 18c3fcb1efd4..448b869c47c7 100644
--- a/sys/kern/subr_devstat.c
+++ b/sys/kern/subr_devstat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: subr_devstat.c,v 1.10 1999/04/11 02:27:06 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index a46e11ab7b0c..a52efbd9ef57 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.40 1999/06/26 02:46:44 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index d6be12a9ddd0..342537904b6e 100644
--- a/sys/kern/subr_diskmbr.c
+++ b/sys/kern/subr_diskmbr.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: diskslice_machdep.c,v 1.35 1999/06/26 02:47:09 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index d72940ec0b30..4d154c91300e 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -43,7 +43,7 @@
  *	from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: subr_diskslice.c,v 1.66 1999/08/14 11:40:43 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_devfs.h"
diff --git a/sys/kern/subr_dkbad.c b/sys/kern/subr_dkbad.c
index 13cf4e5dc1e2..d09541814fec 100644
--- a/sys/kern/subr_dkbad.c
+++ b/sys/kern/subr_dkbad.c
@@ -43,7 +43,7 @@
  *	from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: subr_dkbad.c,v 1.10 1999/06/26 02:46:03 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c
index 2caef177298d..997afa7a5a92 100644
--- a/sys/kern/subr_eventhandler.c
+++ b/sys/kern/subr_eventhandler.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index 7272789fc8f5..b08a3f8705a0 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_log.c	8.1 (Berkeley) 6/10/93
- * $Id: subr_log.c,v 1.36 1999/05/31 11:27:35 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c
index 7eb635a13bde..15df73bbf1e1 100644
--- a/sys/kern/subr_module.c
+++ b/sys/kern/subr_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: subr_module.c,v 1.3 1998/10/12 09:03:48 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index b9a906281f18..9a0a85f08a0a 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.3 (Berkeley) 8/20/94
- * $Id: param.c,v 1.33 1999/04/09 16:28:11 des Exp $
+ * $FreeBSD$
  */
 
 #include <stddef.h>
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 932b6e5fd1b7..e8d523e393d8 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
- * $Id: subr_prf.c,v 1.59 1999/08/07 20:13:32 green Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index bed6aa038ce4..ed9c0d8b77e3 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prof.c	8.3 (Berkeley) 9/23/93
- * $Id: subr_prof.c,v 1.28 1998/09/05 14:30:11 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c
index 609937eddf32..ed9a633ab761 100644
--- a/sys/kern/subr_rman.c
+++ b/sys/kern/subr_rman.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: subr_rman.c,v 1.7 1999/04/16 21:22:39 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/subr_scanf.c b/sys/kern/subr_scanf.c
index 8b1f7404c26d..ea3c03df6743 100644
--- a/sys/kern/subr_scanf.c
+++ b/sys/kern/subr_scanf.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: subr_scanf.c,v 1.5 1999/02/14 20:58:21 dillon Exp $
+ * $FreeBSD$
  * From: Id: vfscanf.c,v 1.13 1998/09/25 12:20:27 obrien Exp 
  */
 
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 969cd0892495..283ed1701a3c 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index e717563e7ed5..5e3ed49ee48a 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.139 1999/06/18 14:32:16 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c
index 5339179923e9..e0298f71702c 100644
--- a/sys/kern/subr_xxx.c
+++ b/sys/kern/subr_xxx.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_xxx.c	8.1 (Berkeley) 6/10/93
- * $Id: subr_xxx.c,v 1.12 1998/11/08 12:39:02 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 2a8104355398..e187c21dea20 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_generic.c	8.5 (Berkeley) 1/21/94
- * $Id: sys_generic.c,v 1.46 1999/03/27 21:16:33 alc Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 06b897f69a91..e4f6d506d9e4 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: sys_pipe.c,v 1.52 1999/06/05 03:53:57 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 814db9845c5e..8a40fb4eb339 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sys_process.c,v 1.46 1999/07/01 22:52:40 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index 123ff936aaf9..6ad438328dc6 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_socket.c	8.1 (Berkeley) 6/10/93
- * $Id: sys_socket.c,v 1.24 1999/04/04 21:41:16 dt Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index dc2ca3c25b96..843cc9d135b6 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.61 1999/08/05 08:18:45 jkh Exp $
+ $FreeBSD$
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c
index 116ae31ec405..4a006add5be3 100644
--- a/sys/kern/sysv_ipc.c
+++ b/sys/kern/sysv_ipc.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_ipc.c,v 1.10 1999/04/27 11:16:15 phk Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: sysv_ipc.c,v 1.7 1994/06/29 06:33:11 cgd Exp $	*/
 
 /*
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 4d0e3e7b7461..badbdc498c0f 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_msg.c,v 1.21 1999/04/27 11:16:16 phk Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Implementation of SVID messages
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 8a27aa936379..534f75431bb9 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_sem.c,v 1.22 1998/12/14 08:34:55 dillon Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Implementation of SVID semaphores
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 637188786fd6..533502cc5c0a 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_shm.c,v 1.41 1999/04/27 12:21:09 phk Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $	*/
 
 /*
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index fca46ba78601..ee1b6e76577c 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.120 1999/08/08 19:47:31 phk Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c
index fa2ae5c002ff..c104e223c106 100644
--- a/sys/kern/tty_compat.c
+++ b/sys/kern/tty_compat.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_compat.c	8.1 (Berkeley) 6/10/93
- * $Id: tty_compat.c,v 1.27 1998/02/25 06:16:37 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c
index 12f26e0f8f52..43c73be8ac7e 100644
--- a/sys/kern/tty_conf.c
+++ b/sys/kern/tty_conf.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_conf.c	8.4 (Berkeley) 1/21/94
- * $Id: tty_conf.c,v 1.12 1997/12/16 17:40:27 eivind Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 397b56b7941a..4fef6f65cc32 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: tty_cons.c,v 1.73 1999/08/13 10:52:22 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 47b7df93f24a..a29687c84ddd 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
- * $Id: tty_pty.c,v 1.65 1999/08/20 20:25:00 julian Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index 0e7bf1afd7a8..756368655884 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -12,7 +12,7 @@
  *
  * Snoop stuff.
  *
- *	$Id: tty_snoop.c,v 1.40 1999/06/17 23:42:44 gpalmer Exp $
+ * $FreeBSD$
  */
 
 #include "snp.h"
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index b1e5edaa5c37..a7d1daf79e8e 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: tty_subr.c,v 1.30 1998/07/15 02:32:12 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/tty_tb.c b/sys/kern/tty_tb.c
index 8f4c84c66383..39b75c2bf387 100644
--- a/sys/kern/tty_tb.c
+++ b/sys/kern/tty_tb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tb.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include "tb.h"
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index 1109c07382f0..1ee95bcaaa90 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
- * $Id: tty_tty.c,v 1.27 1999/05/31 11:27:41 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index cb6f6efdb748..d4aa88fa8ca7 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_domain.c	8.2 (Berkeley) 10/18/93
- *	$Id: uipc_domain.c,v 1.20 1999/01/21 00:26:41 julian Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 92505fb6b8ab..fdf341dc6cc2 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- *	$Id: uipc_mbuf.c,v 1.40 1999/07/01 13:21:39 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_param.h"
diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index 7d6e3b64bd5b..d114feef1a41 100644
--- a/sys/kern/uipc_proto.c
+++ b/sys/kern/uipc_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_proto.c	8.1 (Berkeley) 6/10/93
- * $Id: uipc_proto.c,v 1.18 1999/02/16 10:49:49 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index 14d73c32741e..f6115a97186e 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
- *	$Id: uipc_socket2.c,v 1.47 1999/06/17 23:54:48 green Exp $
+ * $FreeBSD$
  */
 
 #include "opt_param.h"
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 3bda374aba2e..0cf3c048d793 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
- *	$Id: uipc_socket.c,v 1.59 1999/06/04 02:27:02 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 14d73c32741e..f6115a97186e 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
- *	$Id: uipc_socket2.c,v 1.47 1999/06/17 23:54:48 green Exp $
+ * $FreeBSD$
  */
 
 #include "opt_param.h"
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 5cf6100c53da..05fb328ac9b1 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_syscalls.c	8.4 (Berkeley) 2/21/94
- * $Id: uipc_syscalls.c,v 1.55 1999/01/27 21:49:57 dillon Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 0d749bc06d83..d1c261368885 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)uipc_usrreq.c	8.3 (Berkeley) 1/4/94
- *	$Id: uipc_usrreq.c,v 1.44 1999/05/10 18:09:39 truckman Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 7d5fd4fa2f0d..7caf954a1ca3 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $Id: vfs_aio.c,v 1.56 1999/08/13 10:10:01 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index f23db16e163c..6b037752d8c7 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -11,7 +11,7 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *		John S. Dyson.
  *
- * $Id: vfs_bio.c,v 1.225 1999/08/08 18:42:48 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index ac6082f26267..7c7afa3bd0fa 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cache.c	8.5 (Berkeley) 3/22/95
- * $Id: vfs_cache.c,v 1.38 1998/09/09 07:41:41 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index f6fc890b3dca..f498b189fc2b 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cluster.c	8.7 (Berkeley) 2/13/94
- * $Id: vfs_cluster.c,v 1.86 1999/07/04 00:31:17 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include "opt_debug_cluster.h"
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index c2c53f73aa7b..87f3e4a7bc93 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.30 1999/07/03 08:24:00 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index 140f2d01f218..f10fcf590d86 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index dc2502dba2b6..c677e19c3aa0 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.220 1999/08/25 12:24:34 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 6b6a687112ae..ae7aeeb4ad7f 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.132 1999/08/22 16:50:30 jdp Exp $
+ * $FreeBSD$
  */
 
 /* For 4.3 integer FS ID compatibility */
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 8ea1226d1e0e..afe642c89cfd 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_init.c	8.3 (Berkeley) 1/4/94
- * $Id: vfs_init.c,v 1.45 1999/03/07 16:06:41 dfr Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 7d31e499f3b0..e168ce58c18d 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_lookup.c	8.4 (Berkeley) 2/16/94
- * $Id: vfs_lookup.c,v 1.33 1999/01/28 00:57:47 dillon Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index c2c53f73aa7b..87f3e4a7bc93 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.30 1999/07/03 08:24:00 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index dc2502dba2b6..c677e19c3aa0 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.220 1999/08/25 12:24:34 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 6b6a687112ae..ae7aeeb4ad7f 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.132 1999/08/22 16:50:30 jdp Exp $
+ * $FreeBSD$
  */
 
 /* For 4.3 integer FS ID compatibility */
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index a91ca18672f8..0a08938ae24b 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_vnops.c	8.2 (Berkeley) 1/21/94
- * $Id: vfs_vnops.c,v 1.75 1999/08/25 11:44:11 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vnode_if.pl b/sys/kern/vnode_if.pl
index 07e0e91781c5..9c042dbac7d8 100644
--- a/sys/kern/vnode_if.pl
+++ b/sys/kern/vnode_if.pl
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
-# $Id: vnode_if.sh,v 1.17 1999/02/28 11:30:00 bde Exp $
+# $FreeBSD$
 #
 
 # Script to produce VFS front-end sugar.
diff --git a/sys/kern/vnode_if.sh b/sys/kern/vnode_if.sh
index 07e0e91781c5..9c042dbac7d8 100644
--- a/sys/kern/vnode_if.sh
+++ b/sys/kern/vnode_if.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
-# $Id: vnode_if.sh,v 1.17 1999/02/28 11:30:00 bde Exp $
+# $FreeBSD$
 #
 
 # Script to produce VFS front-end sugar.
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index b60ff4a8492d..bac48ddfdeea 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -31,7 +31,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.src	8.12 (Berkeley) 5/14/95
-# $Id: vnode_if.src,v 1.20 1999/03/27 03:08:07 eivind Exp $
+# $FreeBSD$
 #
 
 #
diff --git a/sys/libkern/adddi3.c b/sys/libkern/adddi3.c
index 38b9df95e66b..51793da73f70 100644
--- a/sys/libkern/adddi3.c
+++ b/sys/libkern/adddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/anddi3.c b/sys/libkern/anddi3.c
index 9f92718ea670..d278a3619463 100644
--- a/sys/libkern/anddi3.c
+++ b/sys/libkern/anddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/ashldi3.c b/sys/libkern/ashldi3.c
index 74fa0fdcdbce..4e8e8d6441b3 100644
--- a/sys/libkern/ashldi3.c
+++ b/sys/libkern/ashldi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/ashrdi3.c b/sys/libkern/ashrdi3.c
index 7d22f9d77371..031fcc0523b4 100644
--- a/sys/libkern/ashrdi3.c
+++ b/sys/libkern/ashrdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/bcmp.c b/sys/libkern/bcmp.c
index cf0e525e0f68..7c09ce539414 100644
--- a/sys/libkern/bcmp.c
+++ b/sys/libkern/bcmp.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: bcmp.c,v 1.4 1997/02/22 09:39:51 peter Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/cmpdi2.c b/sys/libkern/cmpdi2.c
index d9c486bfe044..55198b90d89f 100644
--- a/sys/libkern/cmpdi2.c
+++ b/sys/libkern/cmpdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: cmpdi2.c,v 1.4 1997/02/22 09:39:52 peter Exp $
+ * $FreeBSD$
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/divdi3.c b/sys/libkern/divdi3.c
index 73a21b3256cd..b221ce58240c 100644
--- a/sys/libkern/divdi3.c
+++ b/sys/libkern/divdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/ffs.c b/sys/libkern/ffs.c
index 74e24502caee..533b8ec483a3 100644
--- a/sys/libkern/ffs.c
+++ b/sys/libkern/ffs.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/index.c b/sys/libkern/index.c
index c9483e7123b2..63512232fa2f 100644
--- a/sys/libkern/index.c
+++ b/sys/libkern/index.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/iordi3.c b/sys/libkern/iordi3.c
index 2819cf8e5a0a..8477ac24ea8b 100644
--- a/sys/libkern/iordi3.c
+++ b/sys/libkern/iordi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/locc.c b/sys/libkern/locc.c
index 9c9b9213a86b..a4510cad9c56 100644
--- a/sys/libkern/locc.c
+++ b/sys/libkern/locc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)locc.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/lshldi3.c b/sys/libkern/lshldi3.c
index 0aba85e00813..5d20c1d233cf 100644
--- a/sys/libkern/lshldi3.c
+++ b/sys/libkern/lshldi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/lshrdi3.c b/sys/libkern/lshrdi3.c
index b93de210cec7..6cce84eb658d 100644
--- a/sys/libkern/lshrdi3.c
+++ b/sys/libkern/lshrdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/mcount.c b/sys/libkern/mcount.c
index 7eaf3825e57c..ca3c1c4c1209 100644
--- a/sys/libkern/mcount.c
+++ b/sys/libkern/mcount.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/libkern/moddi3.c b/sys/libkern/moddi3.c
index d914dc17be64..c0e51b32fb7a 100644
--- a/sys/libkern/moddi3.c
+++ b/sys/libkern/moddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: moddi3.c,v 1.5 1997/02/22 09:39:56 peter Exp $
+ * $FreeBSD$
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/muldi3.c b/sys/libkern/muldi3.c
index 82515630e8a1..f17a2474dbdb 100644
--- a/sys/libkern/muldi3.c
+++ b/sys/libkern/muldi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/negdi2.c b/sys/libkern/negdi2.c
index c4065e218d03..a803bf40e8f7 100644
--- a/sys/libkern/negdi2.c
+++ b/sys/libkern/negdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/notdi2.c b/sys/libkern/notdi2.c
index f451088c3500..0a1e97e9e4eb 100644
--- a/sys/libkern/notdi2.c
+++ b/sys/libkern/notdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/qdivrem.c b/sys/libkern/qdivrem.c
index 82a363581a1d..241adeb7a6cb 100644
--- a/sys/libkern/qdivrem.c
+++ b/sys/libkern/qdivrem.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: qdivrem.c,v 1.6 1997/02/22 09:39:57 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/libkern/qsort.c b/sys/libkern/qsort.c
index 42f5932598a6..407ad6b0e67e 100644
--- a/sys/libkern/qsort.c
+++ b/sys/libkern/qsort.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: qsort.c,v 1.8 1998/04/15 17:46:34 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/quad.h b/sys/libkern/quad.h
index 0c9c9dd044cb..14f57542f761 100644
--- a/sys/libkern/quad.h
+++ b/sys/libkern/quad.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- *	$Id: quad.h,v 1.7 1999/05/14 05:05:32 gibbs Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/libkern/random.c b/sys/libkern/random.c
index 97b4c8e4273b..35ddea1add68 100644
--- a/sys/libkern/random.c
+++ b/sys/libkern/random.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)random.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/rindex.c b/sys/libkern/rindex.c
index bd661fbeb065..f51abccb84d4 100644
--- a/sys/libkern/rindex.c
+++ b/sys/libkern/rindex.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stddef.h>
diff --git a/sys/libkern/scanc.c b/sys/libkern/scanc.c
index 0233e2c81d62..2a68f583f014 100644
--- a/sys/libkern/scanc.c
+++ b/sys/libkern/scanc.c
@@ -32,7 +32,7 @@
  *
  *	@(#)scanc.c	8.1 (Berkeley) 6/10/93
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/skpc.c b/sys/libkern/skpc.c
index 9348b0e3ece6..8ea07da266a7 100644
--- a/sys/libkern/skpc.c
+++ b/sys/libkern/skpc.c
@@ -32,7 +32,7 @@
  *
  *	@(#)skpc.c	8.1 (Berkeley) 6/10/93
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/strcat.c b/sys/libkern/strcat.c
index 707cb145c355..2d9da767828f 100644
--- a/sys/libkern/strcat.c
+++ b/sys/libkern/strcat.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: strcat.c,v 1.4 1997/02/22 09:40:02 peter Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/strcmp.c b/sys/libkern/strcmp.c
index 494e21f10848..77c5f66233e9 100644
--- a/sys/libkern/strcmp.c
+++ b/sys/libkern/strcmp.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: strcmp.c,v 1.5 1997/02/22 09:40:02 peter Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/strcpy.c b/sys/libkern/strcpy.c
index 93de5b9914e1..cf6bd4ff029b 100644
--- a/sys/libkern/strcpy.c
+++ b/sys/libkern/strcpy.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: strcpy.c,v 1.5 1997/08/02 14:31:50 bde Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/strlen.c b/sys/libkern/strlen.c
index 52e0da1bed17..e3e50cbfca29 100644
--- a/sys/libkern/strlen.c
+++ b/sys/libkern/strlen.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: strlen.c,v 1.4 1997/02/22 09:40:03 peter Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/strncmp.c b/sys/libkern/strncmp.c
index d089d8920a9e..523a456fe4ef 100644
--- a/sys/libkern/strncmp.c
+++ b/sys/libkern/strncmp.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: strncmp.c,v 1.5 1997/02/22 09:40:03 peter Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/strncpy.c b/sys/libkern/strncpy.c
index 44ebc0ed4e10..2b36d1a19459 100644
--- a/sys/libkern/strncpy.c
+++ b/sys/libkern/strncpy.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: strncpy.c,v 1.4 1997/02/22 09:40:04 peter Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/subdi3.c b/sys/libkern/subdi3.c
index cb54477a4d45..9f34e6b4e370 100644
--- a/sys/libkern/subdi3.c
+++ b/sys/libkern/subdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/ucmpdi2.c b/sys/libkern/ucmpdi2.c
index 2d23081f6559..5cce1827ed30 100644
--- a/sys/libkern/ucmpdi2.c
+++ b/sys/libkern/ucmpdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ucmpdi2.c,v 1.6 1999/05/14 17:39:54 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/udivdi3.c b/sys/libkern/udivdi3.c
index 153c715c693f..0827fbdc826c 100644
--- a/sys/libkern/udivdi3.c
+++ b/sys/libkern/udivdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/umoddi3.c b/sys/libkern/umoddi3.c
index b076b0e232ae..30fb30713f3a 100644
--- a/sys/libkern/umoddi3.c
+++ b/sys/libkern/umoddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/xordi3.c b/sys/libkern/xordi3.c
index e49190902a22..b666446f049e 100644
--- a/sys/libkern/xordi3.c
+++ b/sys/libkern/xordi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index 4e3853ce54c5..f9acbd043587 100644
--- a/sys/miscfs/deadfs/dead_vnops.c
+++ b/sys/miscfs/deadfs/dead_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
- * $Id: dead_vnops.c,v 1.24 1998/08/23 11:43:29 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/devfs/devfs_tree.c b/sys/miscfs/devfs/devfs_tree.c
index c7bfb5680c3d..0c8e434ce6ac 100644
--- a/sys/miscfs/devfs/devfs_tree.c
+++ b/sys/miscfs/devfs/devfs_tree.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_tree.c,v 1.62 1999/08/25 22:50:11 julian Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/miscfs/devfs/devfs_vfsops.c b/sys/miscfs/devfs/devfs_vfsops.c
index f3611f18d5a8..dbc2f31a37be 100644
--- a/sys/miscfs/devfs/devfs_vfsops.c
+++ b/sys/miscfs/devfs/devfs_vfsops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_vfsops.c,v 1.35 1998/12/07 21:58:30 archie Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c
index 5506961ce841..9d6ce1339979 100644
--- a/sys/miscfs/devfs/devfs_vnops.c
+++ b/sys/miscfs/devfs/devfs_vnops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_vnops.c,v 1.78 1999/08/25 02:04:40 julian Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/miscfs/devfs/devfsdefs.h b/sys/miscfs/devfs/devfsdefs.h
index ece7f7e3bfcb..7df378ccade8 100644
--- a/sys/miscfs/devfs/devfsdefs.h
+++ b/sys/miscfs/devfs/devfsdefs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $Id: devfsdefs.h,v 1.18 1998/11/09 07:03:04 peter Exp $
+ * $FreeBSD$
  */
 #ifdef DEVFS_DEBUG
 #define DBPRINT(A) printf(A)
diff --git a/sys/miscfs/fdesc/fdesc.h b/sys/miscfs/fdesc/fdesc.h
index bbba54dcfdd8..463e52836918 100644
--- a/sys/miscfs/fdesc/fdesc.h
+++ b/sys/miscfs/fdesc/fdesc.h
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc.h	8.5 (Berkeley) 1/21/94
  *
- * $Id: fdesc.h,v 1.5 1997/02/22 09:40:14 peter Exp $
+ * $FreeBSD$
  */
 
 #ifdef KERNEL
diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c
index 758f3b5abbe6..157454c502ef 100644
--- a/sys/miscfs/fdesc/fdesc_vfsops.c
+++ b/sys/miscfs/fdesc/fdesc_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vfsops.c	8.4 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vfsops.c,v 1.17 1999/01/12 11:49:30 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index bc0cb5b48b7d..17a38d5be9d6 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.42 1999/05/31 11:27:49 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h
index ec186d0daccb..e63020752863 100644
--- a/sys/miscfs/fifofs/fifo.h
+++ b/sys/miscfs/fifofs/fifo.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.6 (Berkeley) 5/21/95
- * $Id: fifo.h,v 1.14 1997/09/14 02:57:51 peter Exp $
+ * $FreeBSD$
  */
 
 extern vop_t **fifo_vnodeop_p;
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index f7e47e1284fb..4a8199a672b5 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.42 1998/02/04 22:32:45 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/kernfs/kernfs.h b/sys/miscfs/kernfs/kernfs.h
index 47a80cfc9afd..361d4899bead 100644
--- a/sys/miscfs/kernfs/kernfs.h
+++ b/sys/miscfs/kernfs/kernfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs.h	8.6 (Berkeley) 3/29/95
- * $Id: kernfs.h,v 1.9 1998/03/01 22:46:12 msmith Exp $
+ * $FreeBSD$
  */
 
 #define	_PATH_KERNFS	"/kern"		/* Default mountpoint */
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index 295b647dea17..522f77d00877 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vfsops.c	8.10 (Berkeley) 5/14/95
- * $Id: kernfs_vfsops.c,v 1.29 1999/08/13 10:29:22 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index cf5b8d7bf648..0488709374dd 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vnops.c	8.15 (Berkeley) 5/21/95
- * $Id: kernfs_vnops.c,v 1.38 1999/01/27 22:42:06 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/nullfs/null.h b/sys/miscfs/nullfs/null.h
index 7d46a11cd4ac..f796d18c6706 100644
--- a/sys/miscfs/nullfs/null.h
+++ b/sys/miscfs/nullfs/null.h
@@ -35,7 +35,7 @@
  *
  *	@(#)null.h	8.3 (Berkeley) 8/20/94
  *
- * $Id: null.h,v 1.7 1997/05/25 04:50:02 peter Exp $
+ * $FreeBSD$
  */
 
 struct null_args {
diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c
index 603f418fb1c3..1504fc84ac0e 100644
--- a/sys/miscfs/nullfs/null_subr.c
+++ b/sys/miscfs/nullfs/null_subr.c
@@ -35,7 +35,7 @@
  *
  *	@(#)null_subr.c	8.7 (Berkeley) 5/14/95
  *
- * $Id: null_subr.c,v 1.18 1998/07/15 02:32:18 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_debug_nullfs.h"
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index 4ead5bd50c9f..f6ac5a0f749a 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.27 1998/07/30 17:40:45 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index 638b9edfa69f..c9019210da55 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -37,11 +37,11 @@
  *
  * Ancestors:
  *	@(#)lofs_vnops.c	1.2 (Berkeley) 6/18/92
- *	$Id: null_vnops.c,v 1.33 1999/06/16 23:27:38 mckusick Exp $
+ * $FreeBSD$
  *	...and...
  *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  *
- * $Id: null_vnops.c,v 1.33 1999/06/16 23:27:38 mckusick Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/portal/portal.h b/sys/miscfs/portal/portal.h
index d60826e6a169..6e781455d75b 100644
--- a/sys/miscfs/portal/portal.h
+++ b/sys/miscfs/portal/portal.h
@@ -35,7 +35,7 @@
  *
  *	@(#)portal.h	8.4 (Berkeley) 1/21/94
  *
- * $Id: portal.h,v 1.4 1997/02/22 09:40:24 peter Exp $
+ * $FreeBSD$
  */
 
 struct portal_args {
diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index 633bf776e10b..d447664171f1 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vfsops.c	8.11 (Berkeley) 5/14/95
  *
- * $Id: portal_vfsops.c,v 1.21 1998/05/06 05:29:35 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index ad96332d4510..f158eadffd07 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.14 (Berkeley) 5/21/95
  *
- * $Id: portal_vnops.c,v 1.35 1999/01/12 11:49:30 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/procfs/README b/sys/miscfs/procfs/README
index 5f1b6cc7229b..f816b321b432 100644
--- a/sys/miscfs/procfs/README
+++ b/sys/miscfs/procfs/README
@@ -110,4 +110,4 @@ the debugger, the debugger should fork and the child should stop itself
 "attach".  as before, the child will hit a breakpoint on the first
 instruction in any newly exec'd image.
 
-$Id$
+$FreeBSD$
diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h
index f813070e699e..07c6da215a58 100644
--- a/sys/miscfs/procfs/procfs.h
+++ b/sys/miscfs/procfs/procfs.h
@@ -37,7 +37,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- *	$Id: procfs.h,v 1.26 1999/06/13 20:53:13 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c
index 21724e5c294c..4f4d84bf02af 100644
--- a/sys/miscfs/procfs/procfs_ctl.c
+++ b/sys/miscfs/procfs/procfs_ctl.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_ctl.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_ctl.c,v 1.16 1997/04/27 21:32:21 alex Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_dbregs.c b/sys/miscfs/procfs/procfs_dbregs.c
index 02509e006d78..ce990e983745 100644
--- a/sys/miscfs/procfs/procfs_dbregs.c
+++ b/sys/miscfs/procfs/procfs_dbregs.c
@@ -40,7 +40,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_fpregs.c b/sys/miscfs/procfs/procfs_fpregs.c
index 14c3fd39c04e..b3331e5a726e 100644
--- a/sys/miscfs/procfs/procfs_fpregs.c
+++ b/sys/miscfs/procfs/procfs_fpregs.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_fpregs.c	8.2 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_fpregs.c,v 1.7 1997/08/02 14:32:11 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_map.c b/sys/miscfs/procfs/procfs_map.c
index 47a0ce17c7e7..83d73ab320d3 100644
--- a/sys/miscfs/procfs/procfs_map.c
+++ b/sys/miscfs/procfs/procfs_map.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- *	$Id: procfs_map.c,v 1.21 1999/02/07 21:48:21 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c
index 5fe9ef6794d9..35ee564e074b 100644
--- a/sys/miscfs/procfs/procfs_mem.c
+++ b/sys/miscfs/procfs/procfs_mem.c
@@ -37,7 +37,7 @@
  *
  *	@(#)procfs_mem.c	8.5 (Berkeley) 6/15/94
  *
- *	$Id: procfs_mem.c,v 1.36 1999/04/27 11:16:37 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_note.c b/sys/miscfs/procfs/procfs_note.c
index 8bfde33b640a..273010b32956 100644
--- a/sys/miscfs/procfs/procfs_note.c
+++ b/sys/miscfs/procfs/procfs_note.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_note.c	8.2 (Berkeley) 1/21/94
  *
- *	$Id: procfs_note.c,v 1.4 1997/02/22 09:40:28 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_regs.c b/sys/miscfs/procfs/procfs_regs.c
index d215d44a33cf..0edb9ad60639 100644
--- a/sys/miscfs/procfs/procfs_regs.c
+++ b/sys/miscfs/procfs/procfs_regs.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_regs.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_regs.c,v 1.7 1997/08/02 14:32:16 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_rlimit.c b/sys/miscfs/procfs/procfs_rlimit.c
index 07bcd1061936..5f00aafd072e 100644
--- a/sys/miscfs/procfs/procfs_rlimit.c
+++ b/sys/miscfs/procfs/procfs_rlimit.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  *
- *	$Id: procfs_rlimit.c,v 1.2 1999/07/09 17:56:59 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_status.c b/sys/miscfs/procfs/procfs_status.c
index 2c8cb697ad63..b3ebd1f1983c 100644
--- a/sys/miscfs/procfs/procfs_status.c
+++ b/sys/miscfs/procfs/procfs_status.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_status.c,v 1.14 1999/05/22 20:10:26 dt Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_subr.c b/sys/miscfs/procfs/procfs_subr.c
index cf313e863856..01e8ae9e014a 100644
--- a/sys/miscfs/procfs/procfs_subr.c
+++ b/sys/miscfs/procfs/procfs_subr.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_subr.c	8.6 (Berkeley) 5/14/95
  *
- *	$Id: procfs_subr.c,v 1.24 1999/04/30 13:04:21 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_type.c b/sys/miscfs/procfs/procfs_type.c
index 8f85c548b03f..cb2a45f6a3d6 100644
--- a/sys/miscfs/procfs/procfs_type.c
+++ b/sys/miscfs/procfs/procfs_type.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: procfs_type.c,v 1.4 1997/03/24 11:24:42 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index 2c22020e4fc0..0478e386d51c 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vfsops.c	8.7 (Berkeley) 5/10/95
  *
- *	$Id: procfs_vfsops.c,v 1.26 1998/09/07 13:17:01 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index 9040c5bf4b41..2eb893415eea 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.70 1999/07/09 04:16:00 jlemon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index ca1835e5cd83..1afc40017da4 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.98 1999/08/25 00:26:34 julian Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h
index 0c6ca3418245..09963cbe2b65 100644
--- a/sys/miscfs/umapfs/umap.h
+++ b/sys/miscfs/umapfs/umap.h
@@ -35,7 +35,7 @@
  *
  *	@(#)umap.h	8.4 (Berkeley) 8/20/94
  *
- * $Id: umap.h,v 1.8 1997/02/22 09:40:37 peter Exp $
+ * $FreeBSD$
  */
 
 #define MAPFILEENTRIES 64
diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c
index 4974f03c110c..ed316a944cb1 100644
--- a/sys/miscfs/umapfs/umap_subr.c
+++ b/sys/miscfs/umapfs/umap_subr.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_subr.c	8.9 (Berkeley) 5/14/95
  *
- * $Id: umap_subr.c,v 1.15 1998/11/09 09:21:25 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index 3acc700a64fc..658a4ceee182 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_vfsops.c	8.8 (Berkeley) 5/14/95
  *
- * $Id: umap_vfsops.c,v 1.24 1999/03/12 19:40:39 imp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index ae47731b9215..0b73ccbb39dc 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.6 (Berkeley) 5/22/95
- * $Id: umap_vnops.c,v 1.27 1999/06/16 23:27:41 mckusick Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/union/union.h b/sys/miscfs/union/union.h
index 6a4aa226203e..1fc5f996cab0 100644
--- a/sys/miscfs/union/union.h
+++ b/sys/miscfs/union/union.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.9 (Berkeley) 12/10/94
- * $Id: union.h,v 1.12 1998/02/26 03:23:51 kato Exp $
+ * $FreeBSD$
  */
 
 struct union_args {
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index 5ced12f6e322..6334810ae622 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.36 1998/12/14 05:00:59 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index db4d4d3b14e8..a02fb9a71f8f 100644
--- a/sys/miscfs/union/union_vfsops.c
+++ b/sys/miscfs/union/union_vfsops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.20 (Berkeley) 5/20/95
- * $Id: union_vfsops.c,v 1.30 1998/09/07 13:17:02 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index 25d2dfd2bf87..145f8ca6f0ad 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.61 1999/06/16 23:27:43 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index db7bdd1b6685..2f28cb759685 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.72 1999/08/21 17:40:39 wpaul Exp $
+# $FreeBSD$
 
 # XXX present but broken: atapi ip_mroute_mod joy pcic
 
diff --git a/sys/modules/Makefile.inc b/sys/modules/Makefile.inc
index 5aa863d3f3b9..2e4c96d251b4 100644
--- a/sys/modules/Makefile.inc
+++ b/sys/modules/Makefile.inc
@@ -1,3 +1,3 @@
-# $Id$
+# $FreeBSD$
 
 KLDMOD=	true
diff --git a/sys/modules/atapi/Makefile b/sys/modules/atapi/Makefile
index 22b5a7e23774..a145312597c9 100644
--- a/sys/modules/atapi/Makefile
+++ b/sys/modules/atapi/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1998/02/25 01:40:54 bde Exp $
+# $FreeBSD$
 
 .PATH:          ${.CURDIR}/../../i386/isa
 KMOD            = atapi
diff --git a/sys/modules/ax/Makefile b/sys/modules/ax/Makefile
index 0d320364369b..49c977f91bff 100644
--- a/sys/modules/ax/Makefile
+++ b/sys/modules/ax/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/24 20:55:04 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/bktr/Makefile b/sys/modules/bktr/Makefile
index f74deb73799b..cb17db2a800f 100644
--- a/sys/modules/bktr/Makefile
+++ b/sys/modules/bktr/Makefile
@@ -9,7 +9,7 @@
 # Note - as the driver requires contiguous memory, loading the driver once
 # memory has filled or become fragmented may fail.
 
-#	$Id: Makefile,v 1.1 1999/06/12 15:00:19 roger Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:  $S/pci
diff --git a/sys/modules/ccd/Makefile b/sys/modules/ccd/Makefile
index 93cf3c10dee8..223ad52b8ef5 100644
--- a/sys/modules/ccd/Makefile
+++ b/sys/modules/ccd/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.6 1998/02/01 18:12:12 bde Exp $ 
+# $FreeBSD$ 
 
 .PATH:  ${.CURDIR}/../../dev/ccd
 KMOD=   ccd
diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile
index 9c2dd4ba36d6..757725ac10e7 100644
--- a/sys/modules/cd9660/Makefile
+++ b/sys/modules/cd9660/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1998/02/06 23:54:19 eivind Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../isofs/cd9660
 KMOD=	cd9660
diff --git a/sys/modules/coda/Makefile b/sys/modules/coda/Makefile
index f30ec7b464a2..d3ce37ebd1f0 100644
--- a/sys/modules/coda/Makefile
+++ b/sys/modules/coda/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1998/10/16 04:30:42 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../coda
 KMOD=	coda
diff --git a/sys/modules/coff/Makefile b/sys/modules/coff/Makefile
index 759158538e9a..ab7ecd123ad2 100644
--- a/sys/modules/coff/Makefile
+++ b/sys/modules/coff/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/10/16 04:30:42 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../i386/ibcs2
 KMOD=	ibcs2_coff
diff --git a/sys/modules/fdesc/Makefile b/sys/modules/fdesc/Makefile
index 6052e62e063d..4981b5636dac 100644
--- a/sys/modules/fdesc/Makefile
+++ b/sys/modules/fdesc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:47:49 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/fdesc
 KMOD=	fdesc
diff --git a/sys/modules/fdescfs/Makefile b/sys/modules/fdescfs/Makefile
index 6052e62e063d..4981b5636dac 100644
--- a/sys/modules/fdescfs/Makefile
+++ b/sys/modules/fdescfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:47:49 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/fdesc
 KMOD=	fdesc
diff --git a/sys/modules/fpu/Makefile b/sys/modules/fpu/Makefile
index 680e3c78bcae..66c2ad1ae02a 100644
--- a/sys/modules/fpu/Makefile
+++ b/sys/modules/fpu/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.4 1997/07/20 08:46:27 bde Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../i386/i386
 KMOD=   fpu
diff --git a/sys/modules/fxp/Makefile b/sys/modules/fxp/Makefile
index 607f4597af6f..d54f1532b8bd 100644
--- a/sys/modules/fxp/Makefile
+++ b/sys/modules/fxp/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1999/04/18 13:31:23 dfr Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/gnufpu/Makefile b/sys/modules/gnufpu/Makefile
index 2332e4bc11b1..d7bfb676aa6f 100644
--- a/sys/modules/gnufpu/Makefile
+++ b/sys/modules/gnufpu/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.5 1997/08/26 13:49:26 bde Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../gnu/i386/fpemul
 KMOD=   gnufpu
diff --git a/sys/modules/ibcs2/Makefile b/sys/modules/ibcs2/Makefile
index 9bb8a5b303bf..f9e58255f0bd 100644
--- a/sys/modules/ibcs2/Makefile
+++ b/sys/modules/ibcs2/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.22 1998/11/11 07:04:10 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../i386/ibcs2
 KMOD=	ibcs2
diff --git a/sys/modules/ibcs2/ibcs2.8 b/sys/modules/ibcs2/ibcs2.8
index 3d21cece9d01..be34bd88ba48 100644
--- a/sys/modules/ibcs2/ibcs2.8
+++ b/sys/modules/ibcs2/ibcs2.8
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: ibcs2.8,v 1.8 1999/04/06 13:57:33 ghelmer Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 27, 1995
 .Dt IBCS2 8
diff --git a/sys/modules/ibcs2/ibcs2.sh b/sys/modules/ibcs2/ibcs2.sh
index 0fd465fa023e..c8bf2a809c81 100644
--- a/sys/modules/ibcs2/ibcs2.sh
+++ b/sys/modules/ibcs2/ibcs2.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: ibcs2,v 1.7 1997/02/22 12:47:59 peter Exp $
+# $FreeBSD$
 
 
 PATH=/bin:/sbin:/usr/bin:/usr/sbin; export PATH
diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile
index 65fc09e7ef1b..e5df9a67610e 100644
--- a/sys/modules/if_disc/Makefile
+++ b/sys/modules/if_disc/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.7 1999/04/28 01:17:58 msmith Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_disc
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile
index 14eaf4fd7e56..4f429dfab299 100644
--- a/sys/modules/if_ppp/Makefile
+++ b/sys/modules/if_ppp/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.17 1999/04/28 01:18:02 msmith Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_ppp
diff --git a/sys/modules/if_sl/Makefile b/sys/modules/if_sl/Makefile
index 96e3964f1ee8..5d177c34b719 100644
--- a/sys/modules/if_sl/Makefile
+++ b/sys/modules/if_sl/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.8 1999/04/28 01:18:05 msmith Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_sl
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index 153a41e3939c..038ef19a37dd 100644
--- a/sys/modules/if_tun/Makefile
+++ b/sys/modules/if_tun/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.9 1999/04/28 01:18:08 msmith Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_tun
diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile
index f44df9fe03c8..39412bcd95a6 100644
--- a/sys/modules/ip_mroute_mod/Makefile
+++ b/sys/modules/ip_mroute_mod/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:48:12 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../netinet
 KMOD=	ip_mroute
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index a75c2124f586..963349f86576 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.9 1998/10/16 04:30:46 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../netinet
 KMOD=	ipfw
diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile
index 335833f31b1d..a54ef87c389f 100644
--- a/sys/modules/joy/Makefile
+++ b/sys/modules/joy/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.10 1998/11/11 07:04:10 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../i386/isa
 KMOD	= joy
diff --git a/sys/modules/joy/joy.8 b/sys/modules/joy/joy.8
index b88217905eeb..e073e4731a47 100644
--- a/sys/modules/joy/joy.8
+++ b/sys/modules/joy/joy.8
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: joy.8,v 1.5 1999/04/06 13:54:18 ghelmer Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 16, 1996
 .Dt JOY 8
diff --git a/sys/modules/joy/joy.sh b/sys/modules/joy/joy.sh
index 3f165a6aa2a1..48c5482eb12b 100644
--- a/sys/modules/joy/joy.sh
+++ b/sys/modules/joy/joy.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-# $Id: joy,v 1.3 1997/02/22 12:48:17 peter Exp $
+# $FreeBSD$
 
 kldload joy
diff --git a/sys/modules/kernfs/Makefile b/sys/modules/kernfs/Makefile
index d1c7500349aa..1b29c5244249 100644
--- a/sys/modules/kernfs/Makefile
+++ b/sys/modules/kernfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:48:21 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/kernfs
 KMOD=	kernfs
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 72485f0be1b7..0ac294c4c42e 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.25 1999/01/26 21:29:01 julian Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../i386/linux
 KMOD=	linux
diff --git a/sys/modules/linux/linux.8 b/sys/modules/linux/linux.8
index df0d4973ad00..13f3f0b31f07 100644
--- a/sys/modules/linux/linux.8
+++ b/sys/modules/linux/linux.8
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: linux.8,v 1.6 1999/08/04 18:58:37 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 9, 1997
 .Dt LINUX 8
diff --git a/sys/modules/linux/linux.sh b/sys/modules/linux/linux.sh
index 8545fbbc47bc..aad1331a274c 100644
--- a/sys/modules/linux/linux.sh
+++ b/sys/modules/linux/linux.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: linux,v 1.5 1998/09/07 16:15:59 cracauer Exp $
+# $FreeBSD$
 
 FOUND=`kldstat -v | egrep 'linux(aout|elf)'`
 
diff --git a/sys/modules/mfs/Makefile b/sys/modules/mfs/Makefile
index 6fde55f65ac3..a5cbc9e4ba73 100644
--- a/sys/modules/mfs/Makefile
+++ b/sys/modules/mfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1998/10/16 04:30:47 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../ufs/mfs
 KMOD=	mfs
diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile
index 4e3d5d20563d..4cb73b089691 100644
--- a/sys/modules/mii/Makefile
+++ b/sys/modules/mii/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/08/21 17:40:39 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/dev/mii
diff --git a/sys/modules/msdos/Makefile b/sys/modules/msdos/Makefile
index cc8102277349..777aa2a251b6 100644
--- a/sys/modules/msdos/Makefile
+++ b/sys/modules/msdos/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/02/06 23:54:22 eivind Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../msdosfs
 KMOD=	msdos
diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile
index cc8102277349..777aa2a251b6 100644
--- a/sys/modules/msdosfs/Makefile
+++ b/sys/modules/msdosfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/02/06 23:54:22 eivind Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../msdosfs
 KMOD=	msdos
diff --git a/sys/modules/mx/Makefile b/sys/modules/mx/Makefile
index ae4ea4f67c77..cad21d2d87c8 100644
--- a/sys/modules/mx/Makefile
+++ b/sys/modules/mx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/24 20:55:05 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/nfs/Makefile b/sys/modules/nfs/Makefile
index 719adcd2692a..113d58922c05 100644
--- a/sys/modules/nfs/Makefile
+++ b/sys/modules/nfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.10 1998/07/07 02:27:09 bde Exp $
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../nfs
 KMOD=	nfs
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
index 719adcd2692a..113d58922c05 100644
--- a/sys/modules/nfsclient/Makefile
+++ b/sys/modules/nfsclient/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.10 1998/07/07 02:27:09 bde Exp $
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../nfs
 KMOD=	nfs
diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile
index 719adcd2692a..113d58922c05 100644
--- a/sys/modules/nfsserver/Makefile
+++ b/sys/modules/nfsserver/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.10 1998/07/07 02:27:09 bde Exp $
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../nfs
 KMOD=	nfs
diff --git a/sys/modules/ntfs/Makefile b/sys/modules/ntfs/Makefile
index 05beab5ac08f..0aea8277177b 100644
--- a/sys/modules/ntfs/Makefile
+++ b/sys/modules/ntfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/01/02 01:12:19 semen Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../ntfs
 KMOD=	ntfs
diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile
index 4b1957611a31..3fd3568b8686 100644
--- a/sys/modules/nullfs/Makefile
+++ b/sys/modules/nullfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/02/06 23:54:26 eivind Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/nullfs
 KMOD=	null
diff --git a/sys/modules/pcic/Makefile b/sys/modules/pcic/Makefile
index 550d58922a49..3cf397460710 100644
--- a/sys/modules/pcic/Makefile
+++ b/sys/modules/pcic/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.7 1998/10/16 04:30:48 peter Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../pccard
 KMOD=   pcic
diff --git a/sys/modules/pn/Makefile b/sys/modules/pn/Makefile
index 839832652fdf..dc567a6ffdac 100644
--- a/sys/modules/pn/Makefile
+++ b/sys/modules/pn/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/24 20:55:05 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/portal/Makefile b/sys/modules/portal/Makefile
index 0d35dd9c5c88..f6037ff996f5 100644
--- a/sys/modules/portal/Makefile
+++ b/sys/modules/portal/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:48:47 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/portal
 KMOD=	portal
diff --git a/sys/modules/portalfs/Makefile b/sys/modules/portalfs/Makefile
index 0d35dd9c5c88..f6037ff996f5 100644
--- a/sys/modules/portalfs/Makefile
+++ b/sys/modules/portalfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:48:47 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/portal
 KMOD=	portal
diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile
index 1ff51be5dd8c..068c51299563 100644
--- a/sys/modules/procfs/Makefile
+++ b/sys/modules/procfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.13 1998/10/16 04:30:48 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/procfs
 KMOD=	procfs
diff --git a/sys/modules/sf/Makefile b/sys/modules/sf/Makefile
index d2de96eb0f67..0e7509634a32 100644
--- a/sys/modules/sf/Makefile
+++ b/sys/modules/sf/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/25 04:32:38 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/sk/Makefile b/sys/modules/sk/Makefile
index 3aefa89cd13c..da9f5075fc7a 100644
--- a/sys/modules/sk/Makefile
+++ b/sys/modules/sk/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/23 05:47:56 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/splash/Makefile b/sys/modules/splash/Makefile
index 3d3d48b05bf8..1c634bf4bf98 100644
--- a/sys/modules/splash/Makefile
+++ b/sys/modules/splash/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1999/01/11 03:34:52 yokota Exp $
+# $FreeBSD$
 
 SUBDIR=	bmp pcx
 
diff --git a/sys/modules/splash/Makefile.inc b/sys/modules/splash/Makefile.inc
index 64212f6bfa21..265f86d1ed55 100644
--- a/sys/modules/splash/Makefile.inc
+++ b/sys/modules/splash/Makefile.inc
@@ -1,3 +1,3 @@
-# $Id: $
+# $FreeBSD$
 
 .include "../Makefile.inc"
diff --git a/sys/modules/splash/bmp/Makefile b/sys/modules/splash/bmp/Makefile
index 798e7e428389..af009a282619 100644
--- a/sys/modules/splash/bmp/Makefile
+++ b/sys/modules/splash/bmp/Makefile
@@ -1,4 +1,4 @@
-# $Id: $
+# $FreeBSD$
 
 KMOD=	splash_bmp
 SRCS= 	splash_bmp.c
diff --git a/sys/modules/splash/bmp/splash_bmp.c b/sys/modules/splash/bmp/splash_bmp.c
index 6de5a28274d2..71a53b9c38a4 100644
--- a/sys/modules/splash/bmp/splash_bmp.c
+++ b/sys/modules/splash/bmp/splash_bmp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: splash_bmp.c,v 1.8 1999/06/16 14:04:45 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/splash/pcx/Makefile b/sys/modules/splash/pcx/Makefile
index baf064c5b972..a64a61864db2 100644
--- a/sys/modules/splash/pcx/Makefile
+++ b/sys/modules/splash/pcx/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 KMOD=	splash_pcx
 SRCS=	splash_pcx.c
diff --git a/sys/modules/splash/pcx/splash_pcx.c b/sys/modules/splash/pcx/splash_pcx.c
index 9b81c3f7ae7d..544e8c795785 100644
--- a/sys/modules/splash/pcx/splash_pcx.c
+++ b/sys/modules/splash/pcx/splash_pcx.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: splash_pcx.c,v 1.2 1999/06/22 14:14:06 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/ste/Makefile b/sys/modules/ste/Makefile
index 423e2ad353e7..d078a43666df 100644
--- a/sys/modules/ste/Makefile
+++ b/sys/modules/ste/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/24 20:55:04 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/streams/Makefile b/sys/modules/streams/Makefile
index 8c83443d32b0..029846003497 100644
--- a/sys/modules/streams/Makefile
+++ b/sys/modules/streams/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.11 1999/02/01 00:52:21 grog Exp $ 
+# $FreeBSD$ 
 
 MAINTAINER  =  newton@atdot.dotat.org
 SOURCE=	${.CURDIR}/../../dev/streams
diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile
index 94a945b6a01c..8d9b050b19d1 100644
--- a/sys/modules/svr4/Makefile
+++ b/sys/modules/svr4/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/01/30 06:29:48 newton Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../i386/svr4 ${.CURDIR}/../../svr4
 KMOD=	svr4
diff --git a/sys/modules/svr4/README b/sys/modules/svr4/README
index c8a0aee38db4..0578721e3639 100644
--- a/sys/modules/svr4/README
+++ b/sys/modules/svr4/README
@@ -35,4 +35,4 @@ things)).  Patches will be appreciated (use send-pr).
    - Mark Newton
      newton@atdot.dotat.org
 
-$Id$
+$FreeBSD$
diff --git a/sys/modules/svr4/TO-DO b/sys/modules/svr4/TO-DO
index ad4d46abbba4..078b80d8943a 100644
--- a/sys/modules/svr4/TO-DO
+++ b/sys/modules/svr4/TO-DO
@@ -12,4 +12,4 @@ TO-DO list
   * Make SysV emulator use SysV shared memory support (duh)
 
 
-$Id$
+$FreeBSD$
diff --git a/sys/modules/svr4/svr4.sh b/sys/modules/svr4/svr4.sh
index 6acf6689334a..4cb76777fdec 100644
--- a/sys/modules/svr4/svr4.sh
+++ b/sys/modules/svr4/svr4.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: svr4.sh,v 1.1 1999/01/30 06:29:48 newton Exp $
+# $FreeBSD$
 
 STREAMS=`kldstat -v | egrep 'streams'`
 SVR4=`kldstat -v | egrep 'svr4elf'`
diff --git a/sys/modules/syscons/Makefile b/sys/modules/syscons/Makefile
index 14c8f2fee176..cbcdc08303a7 100644
--- a/sys/modules/syscons/Makefile
+++ b/sys/modules/syscons/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/12/31 13:42:00 des Exp $
+# $FreeBSD$
 
 SUBDIR=	blank daemon fade green logo rain snake star warp fire
 
diff --git a/sys/modules/syscons/Makefile.inc b/sys/modules/syscons/Makefile.inc
index 60392e0a0bf3..265f86d1ed55 100644
--- a/sys/modules/syscons/Makefile.inc
+++ b/sys/modules/syscons/Makefile.inc
@@ -1,3 +1,3 @@
-# $Id$
+# $FreeBSD$
 
 .include "../Makefile.inc"
diff --git a/sys/modules/syscons/blank/Makefile b/sys/modules/syscons/blank/Makefile
index 4f881865a818..e299c924f7a9 100644
--- a/sys/modules/syscons/blank/Makefile
+++ b/sys/modules/syscons/blank/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/02/01 17:59:51 bde Exp $
+# $FreeBSD$
 
 KMOD=	blank_saver
 SRCS= 	blank_saver.c
diff --git a/sys/modules/syscons/blank/blank_saver.c b/sys/modules/syscons/blank/blank_saver.c
index 2979c0da9442..960acca5a512 100644
--- a/sys/modules/syscons/blank/blank_saver.c
+++ b/sys/modules/syscons/blank/blank_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.15 1999/01/11 03:18:44 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile
index 4f0e6a3624e0..ea3407784191 100644
--- a/sys/modules/syscons/daemon/Makefile
+++ b/sys/modules/syscons/daemon/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1998/02/01 17:59:52 bde Exp $
+# $FreeBSD$
 
 KMOD=	daemon_saver
 SRCS= 	daemon_saver.c
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index ebedfaa2e8c0..bc03f6446401 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.15 1999/02/05 12:40:15 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/fade/Makefile b/sys/modules/syscons/fade/Makefile
index d5ac4067ecc2..5fc34ebfe19c 100644
--- a/sys/modules/syscons/fade/Makefile
+++ b/sys/modules/syscons/fade/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/02/01 17:59:53 bde Exp $
+# $FreeBSD$
 
 KMOD=	fade_saver
 SRCS= 	fade_saver.c
diff --git a/sys/modules/syscons/fade/fade_saver.c b/sys/modules/syscons/fade/fade_saver.c
index 4a44c8519bcc..052fa9225908 100644
--- a/sys/modules/syscons/fade/fade_saver.c
+++ b/sys/modules/syscons/fade/fade_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.16 1999/01/11 03:18:46 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/fire/fire_saver.c b/sys/modules/syscons/fire/fire_saver.c
index db4b80b1a7b0..59c707916160 100644
--- a/sys/modules/syscons/fire/fire_saver.c
+++ b/sys/modules/syscons/fire/fire_saver.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fire_saver.c,v 1.4 1999/05/10 15:25:50 des Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/modules/syscons/green/Makefile b/sys/modules/syscons/green/Makefile
index 9d8d1a3115ce..f62b1f4a2757 100644
--- a/sys/modules/syscons/green/Makefile
+++ b/sys/modules/syscons/green/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/02/01 17:59:54 bde Exp $
+# $FreeBSD$
 
 KMOD=	green_saver
 SRCS= 	green_saver.c
diff --git a/sys/modules/syscons/green/green_saver.c b/sys/modules/syscons/green/green_saver.c
index 103154be7a8d..d6cfe80da689 100644
--- a/sys/modules/syscons/green/green_saver.c
+++ b/sys/modules/syscons/green/green_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.15 1999/01/11 03:18:48 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/logo/Makefile b/sys/modules/syscons/logo/Makefile
index 1bccccdbde1a..2a9ede26cce9 100644
--- a/sys/modules/syscons/logo/Makefile
+++ b/sys/modules/syscons/logo/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1998/12/28 14:22:57 des Exp $
+# $FreeBSD$
 
 KMOD=	logo_saver
 SRCS= 	logo_saver.c
diff --git a/sys/modules/syscons/logo/logo_saver.c b/sys/modules/syscons/logo/logo_saver.c
index 24da9644a17f..2d2c660847ac 100644
--- a/sys/modules/syscons/logo/logo_saver.c
+++ b/sys/modules/syscons/logo/logo_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: logo_saver.c,v 1.6 1999/04/12 13:34:57 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/rain/Makefile b/sys/modules/syscons/rain/Makefile
index 8b964f34a0fa..ecc5ec332581 100644
--- a/sys/modules/syscons/rain/Makefile
+++ b/sys/modules/syscons/rain/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1998/12/27 22:03:09 des Exp $
+# $FreeBSD$
 
 KMOD=	rain_saver
 SRCS= 	rain_saver.c
diff --git a/sys/modules/syscons/rain/rain_saver.c b/sys/modules/syscons/rain/rain_saver.c
index 200dc59931f0..6d2ed39e4654 100644
--- a/sys/modules/syscons/rain/rain_saver.c
+++ b/sys/modules/syscons/rain/rain_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: rain_saver.c,v 1.3 1999/04/12 13:34:57 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile
index 88a7bfc98722..6dab3edc9ac2 100644
--- a/sys/modules/syscons/snake/Makefile
+++ b/sys/modules/syscons/snake/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/02/01 17:59:58 bde Exp $
+# $FreeBSD$
 
 KMOD=	snake_saver
 SRCS= 	snake_saver.c
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index 51e1746f5f9d..093e564bef13 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.23 1999/02/05 12:40:15 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/star/Makefile b/sys/modules/syscons/star/Makefile
index 02a8456e8dc0..7ae11d782852 100644
--- a/sys/modules/syscons/star/Makefile
+++ b/sys/modules/syscons/star/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/02/01 17:59:59 bde Exp $
+# $FreeBSD$
 
 KMOD=	star_saver
 SRCS= 	star_saver.c
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 56408dc78cee..645e4fd3c354 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.20 1999/02/05 12:40:16 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/warp/Makefile b/sys/modules/syscons/warp/Makefile
index 3902ca0eac53..45a3af9ecb23 100644
--- a/sys/modules/syscons/warp/Makefile
+++ b/sys/modules/syscons/warp/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1998/12/27 22:03:09 des Exp $
+# $FreeBSD$
 
 KMOD=	warp_saver
 SRCS= 	warp_saver.c
diff --git a/sys/modules/syscons/warp/warp_saver.c b/sys/modules/syscons/warp/warp_saver.c
index cd6f42b3358b..7e5140720713 100644
--- a/sys/modules/syscons/warp/warp_saver.c
+++ b/sys/modules/syscons/warp/warp_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: warp_saver.c,v 1.5 1999/04/12 13:34:58 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/ti/Makefile b/sys/modules/ti/Makefile
index 9fd0b6b0fc37..6f4844d7c6b5 100644
--- a/sys/modules/ti/Makefile
+++ b/sys/modules/ti/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/23 05:47:58 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/tl/Makefile b/sys/modules/tl/Makefile
index 250e268bb0ab..e1f03399e4e9 100644
--- a/sys/modules/tl/Makefile
+++ b/sys/modules/tl/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1999/08/27 19:45:18 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/umapfs/Makefile b/sys/modules/umapfs/Makefile
index 6a1332c12723..28acc62ee646 100644
--- a/sys/modules/umapfs/Makefile
+++ b/sys/modules/umapfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:49:25 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/umapfs
 KMOD=	umap
diff --git a/sys/modules/union/Makefile b/sys/modules/union/Makefile
index defca0bcc7d1..ff0ab8a32539 100644
--- a/sys/modules/union/Makefile
+++ b/sys/modules/union/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:49:27 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/union
 KMOD=	union
diff --git a/sys/modules/unionfs/Makefile b/sys/modules/unionfs/Makefile
index defca0bcc7d1..ff0ab8a32539 100644
--- a/sys/modules/unionfs/Makefile
+++ b/sys/modules/unionfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:49:27 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/union
 KMOD=	union
diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile
index ab9be45aa612..f38483fb54c7 100644
--- a/sys/modules/vesa/Makefile
+++ b/sys/modules/vesa/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1999/01/11 03:18:56 yokota Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../dev/syscons ${.CURDIR}/../../i386/isa
 KMOD	=	vesa
diff --git a/sys/modules/vinum/Makefile b/sys/modules/vinum/Makefile
index f8cb0bbcf23d..b717bbc2b7f1 100644
--- a/sys/modules/vinum/Makefile
+++ b/sys/modules/vinum/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile.vinum,v 1.2 1999/02/11 05:19:49 grog Exp grog $ 
+# $FreeBSD$ 
 
 MAINTAINER  =  grog@FreeBSD.org
 SOURCE=	${.CURDIR}/../../dev/vinum
diff --git a/sys/modules/vn/Makefile b/sys/modules/vn/Makefile
index 2f7407b470f1..929969d0cba7 100644
--- a/sys/modules/vn/Makefile
+++ b/sys/modules/vn/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.1 1999/01/21 17:18:34 peter Exp $ 
+# $FreeBSD$ 
 
 .PATH:  ${.CURDIR}/../../dev/vn
 KMOD=   vn
diff --git a/sys/modules/vr/Makefile b/sys/modules/vr/Makefile
index 468419ae9d65..cd9257dd6639 100644
--- a/sys/modules/vr/Makefile
+++ b/sys/modules/vr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/23 05:48:01 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/wb/Makefile b/sys/modules/wb/Makefile
index 862449c77861..0b8f4de8b80d 100644
--- a/sys/modules/wb/Makefile
+++ b/sys/modules/wb/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/23 05:48:01 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/xl/Makefile b/sys/modules/xl/Makefile
index 544cc4814948..6a5b533c1fcf 100644
--- a/sys/modules/xl/Makefile
+++ b/sys/modules/xl/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/23 05:48:01 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/msdosfs/bootsect.h b/sys/msdosfs/bootsect.h
index 11b93371a534..666c0f8f41b1 100644
--- a/sys/msdosfs/bootsect.h
+++ b/sys/msdosfs/bootsect.h
@@ -1,4 +1,4 @@
-/*	$Id: bootsect.h,v 1.5 1997/02/22 09:40:43 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: bootsect.h,v 1.9 1997/11/17 15:36:17 ws Exp $	*/
 
 /*
diff --git a/sys/msdosfs/bpb.h b/sys/msdosfs/bpb.h
index bc00a758de51..88b9eefb859a 100644
--- a/sys/msdosfs/bpb.h
+++ b/sys/msdosfs/bpb.h
@@ -1,4 +1,4 @@
-/*	$Id: bpb.h,v 1.5 1997/02/22 09:40:44 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: bpb.h,v 1.7 1997/11/17 15:36:24 ws Exp $	*/
 
 /*
diff --git a/sys/msdosfs/denode.h b/sys/msdosfs/denode.h
index ba2ef8c65dab..49eac87a2075 100644
--- a/sys/msdosfs/denode.h
+++ b/sys/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/*	$Id: denode.h,v 1.17 1998/11/21 00:20:24 dt Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: denode.h,v 1.25 1997/11/17 15:36:28 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/direntry.h b/sys/msdosfs/direntry.h
index 796fe78131c8..3225b78b8936 100644
--- a/sys/msdosfs/direntry.h
+++ b/sys/msdosfs/direntry.h
@@ -1,4 +1,4 @@
-/*	$Id: direntry.h,v 1.12 1998/02/26 06:45:42 msmith Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: direntry.h,v 1.14 1997/11/17 15:36:32 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/fat.h b/sys/msdosfs/fat.h
index 74b05e2cf78d..9f20cbae4199 100644
--- a/sys/msdosfs/fat.h
+++ b/sys/msdosfs/fat.h
@@ -1,4 +1,4 @@
-/*	$Id: fat.h,v 1.6 1997/02/22 09:40:45 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: fat.h,v 1.12 1997/11/17 15:36:36 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_conv.c b/sys/msdosfs/msdosfs_conv.c
index 2c792ebf89bb..8c43f93c0adc 100644
--- a/sys/msdosfs/msdosfs_conv.c
+++ b/sys/msdosfs/msdosfs_conv.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_conv.c,v 1.27 1998/05/17 21:18:08 dt Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index 3c6f9d9179fc..d864ddb5cea9 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_denode.c,v 1.44 1999/01/02 11:34:56 bde Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c
index 1ec29db1d9c0..fae002774668 100644
--- a/sys/msdosfs/msdosfs_fat.c
+++ b/sys/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_fat.c,v 1.20 1998/04/06 11:39:04 phk Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c
index d2ad431d7f44..95e8e898ad30 100644
--- a/sys/msdosfs/msdosfs_lookup.c
+++ b/sys/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_lookup.c,v 1.28 1999/01/02 18:52:13 dt Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index adb5b5a0ebbf..92f00846514d 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vfsops.c,v 1.48 1999/08/23 21:07:13 bde Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 3c0a033e8d3f..2407e2e8a720 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.87 1999/07/25 04:01:32 bde Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfsmount.h b/sys/msdosfs/msdosfsmount.h
index 31a2a6756066..6bd6551341f0 100644
--- a/sys/msdosfs/msdosfsmount.h
+++ b/sys/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/*	$Id: msdosfsmount.h,v 1.15 1998/02/23 09:39:29 ache Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $	*/
 
 /*-
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 511ec3e3a06b..0e73b83c6df5 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
- * $Id: bpf.c,v 1.52 1999/07/06 19:23:10 des Exp $
+ * $FreeBSD$
  */
 
 #include "bpf.h"
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index cc3ed962e7b9..fa5e46cc4844 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -38,7 +38,7 @@
  *      @(#)bpf.h	8.1 (Berkeley) 6/10/93
  *	@(#)bpf.h	1.34 (LBL)     6/16/96
  *
- * $Id: bpf.h,v 1.15 1998/09/15 19:35:37 fenner Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_BPF_H_
diff --git a/sys/net/bpf_compat.h b/sys/net/bpf_compat.h
index c09d54c09a75..0936b8490316 100644
--- a/sys/net/bpf_compat.h
+++ b/sys/net/bpf_compat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bpf_compat.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NET_BPF_COMPAT_H_
diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c
index ab2b088e8ccc..bff916348c53 100644
--- a/sys/net/bpf_filter.c
+++ b/sys/net/bpf_filter.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf_filter.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: bpf_filter.c,v 1.13 1999/04/11 02:52:31 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h
index 39ac4897915f..d87cc40b2f90 100644
--- a/sys/net/bpfdesc.h
+++ b/sys/net/bpfdesc.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpfdesc.h	8.1 (Berkeley) 6/10/93
  *
- * $Id: bpfdesc.h,v 1.11 1998/11/11 10:04:09 truckman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_BPFDESC_H_
diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c
index fde1f92833dd..d5072cc11b7b 100644
--- a/sys/net/bsd_comp.c
+++ b/sys/net/bsd_comp.c
@@ -40,7 +40,7 @@
 /*
  * This version is for use with mbufs on BSD-derived systems.
  *
- * $Id: bsd_comp.c,v 1.9 1997/09/02 01:18:31 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h
index c9c03a7c9249..c8b62e0c5724 100644
--- a/sys/net/ethernet.h
+++ b/sys/net/ethernet.h
@@ -1,7 +1,7 @@
 /*
  * Fundamental constants relating to ethernet.
  *
- * $Id: ethernet.h,v 1.8 1997/02/22 09:40:58 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/net/fddi.h b/sys/net/fddi.h
index 336ff4768cd6..fc6acc6c9c8f 100644
--- a/sys/net/fddi.h
+++ b/sys/net/fddi.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_fddi.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IF_FDDI_H_
diff --git a/sys/net/hostcache.c b/sys/net/hostcache.c
index 74b3916ae5d0..0a1d4c00d912 100644
--- a/sys/net/hostcache.c
+++ b/sys/net/hostcache.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: hostcache.c,v 1.4 1998/02/04 22:33:02 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/hostcache.h b/sys/net/hostcache.h
index 1e1280349261..6ffb9ace5e3a 100644
--- a/sys/net/hostcache.h
+++ b/sys/net/hostcache.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: hostcache.h,v 1.1 1997/06/18 01:24:22 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_HOSTCACHE_H
diff --git a/sys/net/if.c b/sys/net/if.c
index 1887c91a9c77..b5faac71040a 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.3 (Berkeley) 1/4/94
- *	$Id: if.c,v 1.73 1999/06/19 18:42:26 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/net/if.h b/sys/net/if.h
index 23f6dfcd3ca0..8ceea66b9fc0 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
- *	$Id: if.h,v 1.54 1999/06/19 18:42:27 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_H_
diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h
index e33abaec7e5e..97902a75b945 100644
--- a/sys/net/if_arp.h
+++ b/sys/net/if_arp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
- * $Id: if_arp.h,v 1.10 1998/01/10 07:29:10 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_ARP_H_
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index c0375a735a63..a1981f74ace8 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if_loop.c	8.1 (Berkeley) 6/10/93
- *	$Id: if_disc.c,v 1.21 1998/12/14 01:59:16 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h
index 19a573c8bb9a..aac7c1439dce 100644
--- a/sys/net/if_dl.h
+++ b/sys/net/if_dl.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
- * $Id: if_dl.h,v 1.6 1997/02/22 09:41:00 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_DL_H_
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index ce72cbd72b16..489bcb2c3361 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ethersubr.c,v 1.55 1999/01/31 08:17:16 julian Exp $
+ * $FreeBSD$
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index dbc4be8e9236..c4d65ec4edf1 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
- * $Id: if_fddisubr.c,v 1.34 1999/01/27 22:42:13 dillon Exp $
+ * $FreeBSD$
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index 8df7aa3e0279..495362b5c130 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_iso88025subr.c,v 1.2 1999/03/10 10:11:43 julian Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h
index 3cdf6521679c..8bcd63e5646a 100644
--- a/sys/net/if_llc.h
+++ b/sys/net/if_llc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)if_llc.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_LLC_H_
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 47663e829d04..e1607903f3df 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $Id: if_loop.c,v 1.40 1999/08/06 13:53:02 brian Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/if_media.c b/sys/net/if_media.c
index 50369dac6f58..128b92469758 100644
--- a/sys/net/if_media.c
+++ b/sys/net/if_media.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_media.c,v 1.1 1997/03/17 02:55:15 thorpej Exp $	*/
-/*	$Id: if_media.c,v 1.7 1999/04/16 21:22:45 peter Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1997
diff --git a/sys/net/if_media.h b/sys/net/if_media.h
index e363485fa2cc..a097ce71a307 100644
--- a/sys/net/if_media.h
+++ b/sys/net/if_media.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $	*/
-/*	$Id: if_media.h,v 1.5 1999/03/07 04:39:25 wpaul Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1997
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index b07927359f39..a4489ca01e4e 100644
--- a/sys/net/if_mib.c
+++ b/sys/net/if_mib.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_mib.c,v 1.6 1998/12/04 22:54:52 archie Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_mib.h b/sys/net/if_mib.h
index 94abc47ca66e..6c29389f6876 100644
--- a/sys/net/if_mib.h
+++ b/sys/net/if_mib.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_MIB_H
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 4e666b385ccc..f781204da1e5 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -69,7 +69,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: if_ppp.c,v 1.62 1999/08/06 13:53:02 brian Exp $ */
+/* $FreeBSD$ */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
 
diff --git a/sys/net/if_ppp.h b/sys/net/if_ppp.h
index d49a5dffc162..713d39a22a30 100644
--- a/sys/net/if_ppp.h
+++ b/sys/net/if_ppp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: if_ppp.h,v 1.12 1997/10/18 00:49:59 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _IF_PPP_H_
diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h
index c764daf77728..e4b4fd7cfcc6 100644
--- a/sys/net/if_pppvar.h
+++ b/sys/net/if_pppvar.h
@@ -39,7 +39,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: if_pppvar.h,v 1.12 1997/10/18 00:46:10 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index cce2fa60b1fa..74aad170abe2 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_sl.c	8.6 (Berkeley) 2/1/94
- * $Id: if_sl.c,v 1.75 1999/07/01 22:14:51 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h
index db88bfdcd065..06ac4d961524 100644
--- a/sys/net/if_slvar.h
+++ b/sys/net/if_slvar.h
@@ -32,7 +32,7 @@
  *
  *	@(#)if_slvar.h	8.3 (Berkeley) 2/1/94
  *
- * $Id: if_slvar.h,v 1.14 1997/09/21 22:01:05 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_SLVAR_H_
diff --git a/sys/net/if_sppp.h b/sys/net/if_sppp.h
index 6c88766fcfd3..5d47287a4f11 100644
--- a/sys/net/if_sppp.h
+++ b/sys/net/if_sppp.h
@@ -16,7 +16,7 @@
  *
  * From: Version 2.0, Fri Oct  6 20:39:21 MSK 1995
  *
- * $Id: if_sppp.h,v 1.13 1998/12/27 21:30:44 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_SPPP_H_
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 380f58877b74..1f079908cc6e 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -17,7 +17,7 @@
  *
  * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
  *
- * $Id: if_spppsubr.c,v 1.54 1999/02/23 15:08:44 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_tun.h b/sys/net/if_tun.h
index 1a1fa6461954..999372bb9207 100644
--- a/sys/net/if_tun.h
+++ b/sys/net/if_tun.h
@@ -13,7 +13,7 @@
  * UCL. This driver is based much more on read/write/select mode of
  * operation though.
  *
- * $Id: if_tun.h,v 1.13 1998/04/17 22:36:56 des Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_TUN_H_
diff --git a/sys/net/if_tunvar.h b/sys/net/if_tunvar.h
index 8a0e9b55d24b..2e9703f47962 100644
--- a/sys/net/if_tunvar.h
+++ b/sys/net/if_tunvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_tunvar.h,v 1.4 1999/03/24 21:20:12 des Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_TUNVAR_H_
diff --git a/sys/net/if_types.h b/sys/net/if_types.h
index 833ba471c378..ebcbcbfef19f 100644
--- a/sys/net/if_types.h
+++ b/sys/net/if_types.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_types.h	8.2 (Berkeley) 4/20/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_TYPES_H_
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 8163f60e2fcc..a598d193973c 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- *	$Id: if_var.h,v 1.13 1999/05/16 17:09:20 pb Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_NET_IF_VAR_H_
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 3e23fda037c1..dac28c8e520c 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_vlan.c,v 1.7 1999/04/07 23:26:43 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index 7498cbfecccc..a9679ea0b5ef 100644
--- a/sys/net/if_vlan_var.h
+++ b/sys/net/if_vlan_var.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_vlan_var.h,v 1.3 1999/03/15 00:33:02 wpaul Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_VLAN_VAR_H_
diff --git a/sys/net/iso88025.h b/sys/net/iso88025.h
index 70ecdc0c016f..ccb16e16836a 100644
--- a/sys/net/iso88025.h
+++ b/sys/net/iso88025.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: iso88025.h,v 1.10 1999/01/09 19:01:58 lile Exp $
+ * $FreeBSD$
  *
  * Information gathered from tokenring@freebsd, /sys/net/ethernet.h and
  * the Mach token ring driver.
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index 65aeb107327a..9ad7f6b2c399 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)netisr.h	8.1 (Berkeley) 6/10/93
- * $Id: netisr.h,v 1.14 1998/06/07 11:52:17 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_NETISR_H_
diff --git a/sys/net/ppp_comp.h b/sys/net/ppp_comp.h
index c187deee6920..b777bfc2d3b0 100644
--- a/sys/net/ppp_comp.h
+++ b/sys/net/ppp_comp.h
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $Id: ppp_comp.h,v 1.6 1998/03/22 06:51:55 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_PPP_COMP_H
diff --git a/sys/net/ppp_deflate.c b/sys/net/ppp_deflate.c
index bc152e83e0cd..fdc0c64fbd23 100644
--- a/sys/net/ppp_deflate.c
+++ b/sys/net/ppp_deflate.c
@@ -1,4 +1,4 @@
-/*	$Id: ppp_deflate.c,v 1.10 1998/06/20 16:28:03 peter Exp $	*/
+/* $FreeBSD$	*/
 
 /*
  * ppp_deflate.c - interface the zlib procedures for Deflate compression
diff --git a/sys/net/ppp_defs.h b/sys/net/ppp_defs.h
index 5dc126daf8bb..ac86be268788 100644
--- a/sys/net/ppp_defs.h
+++ b/sys/net/ppp_defs.h
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _PPP_DEFS_H_
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index 737c58192edd..78d427e5d85a 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -70,7 +70,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: ppp_tty.c,v 1.39 1999/04/27 11:17:07 phk Exp $ */
+/* $FreeBSD$ */
 
 #include "ppp.h"
 #if NPPP > 0
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 30608d849ebb..55887eb61eb9 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.c	8.4 (Berkeley) 11/2/94
- *	$Id: radix.c,v 1.17 1999/04/29 03:22:16 luoqi Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/radix.h b/sys/net/radix.h
index cd18f7a12af8..f68f67aaecd5 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.h	8.2 (Berkeley) 10/31/94
- *	$Id: radix.h,v 1.13 1997/10/12 20:25:13 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _RADIX_H_
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 9cbc31eaa380..97dbc102f616 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
- *	$Id: raw_cb.c,v 1.14 1997/10/28 15:58:33 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index 23849ee3bf19..5184de6f1376 100644
--- a/sys/net/raw_cb.h
+++ b/sys/net/raw_cb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
- * $Id: raw_cb.h,v 1.9 1997/04/27 20:00:58 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_RAW_CB_H_
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 109c94289deb..07b316d18041 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
- *	$Id: raw_usrreq.c,v 1.16 1997/11/07 08:53:18 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index b0af484581d3..eddd18afe961 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.2 (Berkeley) 11/15/93
- *	$Id: route.c,v 1.51 1999/01/27 22:42:14 dillon Exp $
+ * $FreeBSD$
  */
 
 #include "opt_inet.h"
diff --git a/sys/net/route.h b/sys/net/route.h
index d37b3ae8fdb2..a30a0f96e125 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.h	8.3 (Berkeley) 4/19/94
- * $Id: route.h,v 1.29 1999/05/06 18:12:56 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_ROUTE_H_
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 22c7bb5c6cd1..0c02e78a2659 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rtsock.c	8.5 (Berkeley) 11/2/94
- *	$Id: rtsock.c,v 1.39 1999/04/28 11:37:38 phk Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index afd6bf6e96be..f878bf55413e 100644
--- a/sys/net/slcompress.c
+++ b/sys/net/slcompress.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slcompress.c	8.2 (Berkeley) 4/16/94
- * $Id: slcompress.c,v 1.11 1997/08/19 14:10:47 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h
index 5c273ab02183..ca7ed031ccfc 100644
--- a/sys/net/slcompress.h
+++ b/sys/net/slcompress.h
@@ -34,7 +34,7 @@
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
- * $Id: slcompress.h,v 1.12 1997/08/19 14:10:48 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_SLCOMPRESS_H_
diff --git a/sys/net/slip.h b/sys/net/slip.h
index e7889e2ec7bd..917ebf0865b4 100644
--- a/sys/net/slip.h
+++ b/sys/net/slip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slip.h	8.1 (Berkeley) 2/12/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NET_SLIP_H_
diff --git a/sys/net/zlib.c b/sys/net/zlib.c
index 687e3801eb9f..64c4ad0eaf6a 100644
--- a/sys/net/zlib.c
+++ b/sys/net/zlib.c
@@ -10,7 +10,7 @@
  * - added inflateIncomp and deflateOutputPending
  * - allow strm->next_out to be NULL, meaning discard the output
  *
- * $Id: zlib.c,v 1.7 1998/06/20 16:28:04 peter Exp $
+ * $FreeBSD$
  */
 
 /* 
diff --git a/sys/net/zlib.h b/sys/net/zlib.h
index b9499cb72549..1f3ee5049f10 100644
--- a/sys/net/zlib.h
+++ b/sys/net/zlib.h
@@ -1,4 +1,4 @@
-/*	$Id: zlib.h,v 1.4 1998/03/21 20:56:16 peter Exp $	*/
+/* $FreeBSD$	*/
 
 /*
  * This file is derived from zlib.h and zconf.h from the zlib-1.0.4
diff --git a/sys/netatm/atm.h b/sys/netatm/atm.h
index 46dfb8626a8e..1145a9c462f8 100644
--- a/sys/netatm/atm.h
+++ b/sys/netatm/atm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm.h,v 1.8 1998/07/30 22:30:43 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_aal5.c b/sys/netatm/atm_aal5.c
index 7d6a22bd792b..2cf70c9e3cad 100644
--- a/sys/netatm/atm_aal5.c
+++ b/sys/netatm/atm_aal5.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_aal5.c,v 1.3 1998/10/31 20:06:54 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -39,7 +39,7 @@
 #include <sys/stat.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_aal5.c,v 1.3 1998/10/31 20:06:54 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index d2ab8b5d8ecb..e5bf21120bb8 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_cm.c,v 1.4 1999/01/27 22:16:15 dillon Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_cm.c,v 1.4 1999/01/27 22:16:15 dillon Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_cm.h b/sys/netatm/atm_cm.h
index 9e000ab9e562..0507caa8fcfa 100644
--- a/sys/netatm/atm_cm.h
+++ b/sys/netatm/atm_cm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_cm.h,v 1.3 1998/03/24 20:41:40 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c
index d68134fc03fe..9c645a590dc1 100644
--- a/sys/netatm/atm_device.c
+++ b/sys/netatm/atm_device.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_device.c,v 1.3 1998/10/31 20:06:54 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_device.c,v 1.3 1998/10/31 20:06:54 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c
index b4f9ce6e117b..1825eaf0b413 100644
--- a/sys/netatm/atm_if.c
+++ b/sys/netatm/atm_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_if.c,v 1.3 1998/12/04 22:54:52 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_if.c,v 1.3 1998/12/04 22:54:52 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_if.h b/sys/netatm/atm_if.h
index ccf9d035d211..d2ea47180c32 100644
--- a/sys/netatm/atm_if.h
+++ b/sys/netatm/atm_if.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_if.h,v 1.13 1998/08/07 22:10:37 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_ioctl.h b/sys/netatm/atm_ioctl.h
index 898557cceda5..547432058435 100644
--- a/sys/netatm/atm_ioctl.h
+++ b/sys/netatm/atm_ioctl.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_ioctl.h,v 1.1 1998/09/15 08:22:58 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_pcb.h b/sys/netatm/atm_pcb.h
index 12ac5d042fc8..b5518e8079ac 100644
--- a/sys/netatm/atm_pcb.h
+++ b/sys/netatm/atm_pcb.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_pcb.h,v 1.2 1998/07/30 22:30:51 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_proto.c b/sys/netatm/atm_proto.c
index 5327e4ed923a..a75024a94c20 100644
--- a/sys/netatm/atm_proto.c
+++ b/sys/netatm/atm_proto.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_proto.c,v 1.1 1998/09/15 08:22:58 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_proto.c,v 1.1 1998/09/15 08:22:58 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_sap.h b/sys/netatm/atm_sap.h
index 1386516a95da..35f54351c4f5 100644
--- a/sys/netatm/atm_sap.h
+++ b/sys/netatm/atm_sap.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_sap.h,v 1.3 1998/02/19 19:59:38 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_sigmgr.h b/sys/netatm/atm_sigmgr.h
index 1b9388e6543c..bd502a32424e 100644
--- a/sys/netatm/atm_sigmgr.h
+++ b/sys/netatm/atm_sigmgr.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_sigmgr.h,v 1.7 1998/03/24 20:43:59 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_signal.c b/sys/netatm/atm_signal.c
index 11660d5d5081..2ad3b54178f5 100644
--- a/sys/netatm/atm_signal.c
+++ b/sys/netatm/atm_signal.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_signal.c,v 1.2 1998/10/31 20:06:54 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_signal.c,v 1.2 1998/10/31 20:06:54 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c
index 004fba4949d0..2976ff17ceae 100644
--- a/sys/netatm/atm_socket.c
+++ b/sys/netatm/atm_socket.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_socket.c,v 1.2 1998/10/31 20:06:54 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_socket.c,v 1.2 1998/10/31 20:06:54 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_stack.h b/sys/netatm/atm_stack.h
index abd32c47fdfd..be7edc851821 100644
--- a/sys/netatm/atm_stack.h
+++ b/sys/netatm/atm_stack.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_stack.h,v 1.5 1998/02/19 19:59:59 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c
index 261ea109ad2e..507f4f1e0bab 100644
--- a/sys/netatm/atm_subr.c
+++ b/sys/netatm/atm_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_subr.c,v 1.3 1998/10/31 20:06:54 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_subr.c,v 1.3 1998/10/31 20:06:54 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_sys.h b/sys/netatm/atm_sys.h
index d6e9745272d6..0c240bfceef8 100644
--- a/sys/netatm/atm_sys.h
+++ b/sys/netatm/atm_sys.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_sys.h,v 1.1 1998/09/15 08:22:59 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_usrreq.c b/sys/netatm/atm_usrreq.c
index 2dd968e6b6cd..f88cf0d203f2 100644
--- a/sys/netatm/atm_usrreq.c
+++ b/sys/netatm/atm_usrreq.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_usrreq.c,v 1.4 1999/01/27 22:42:20 dillon Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_usrreq.c,v 1.4 1999/01/27 22:42:20 dillon Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_var.h b/sys/netatm/atm_var.h
index ab5f8565b39c..d19a475bd33d 100644
--- a/sys/netatm/atm_var.h
+++ b/sys/netatm/atm_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_var.h,v 1.9 1998/05/18 19:05:52 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_vc.h b/sys/netatm/atm_vc.h
index 1c7c7b0ad2f0..64d1b6f39a9d 100644
--- a/sys/netatm/atm_vc.h
+++ b/sys/netatm/atm_vc.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_vc.h,v 1.6 1998/02/19 20:00:34 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm.h b/sys/netatm/ipatm/ipatm.h
index b3ce348a285f..887509c0fee8 100644
--- a/sys/netatm/ipatm/ipatm.h
+++ b/sys/netatm/ipatm/ipatm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm.h,v 1.5 1998/03/24 20:49:49 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_event.c b/sys/netatm/ipatm/ipatm_event.c
index 66f736e6bbd0..0566d1cfd3b2 100644
--- a/sys/netatm/ipatm/ipatm_event.c
+++ b/sys/netatm/ipatm/ipatm_event.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_event.c,v 1.2 1998/09/17 09:35:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: ipatm_event.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index 7cac3da4e319..eeb3c00659e6 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_if.c,v 1.1 1998/09/15 08:23:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: ipatm_if.c,v 1.1 1998/09/15 08:23:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_input.c b/sys/netatm/ipatm/ipatm_input.c
index 5d292fe2c906..e3049cfb63dd 100644
--- a/sys/netatm/ipatm/ipatm_input.c
+++ b/sys/netatm/ipatm/ipatm_input.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_input.c,v 1.1 1998/09/15 08:23:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: ipatm_input.c,v 1.1 1998/09/15 08:23:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_load.c b/sys/netatm/ipatm/ipatm_load.c
index edb251e14b78..29e9837687c4 100644
--- a/sys/netatm/ipatm/ipatm_load.c
+++ b/sys/netatm/ipatm/ipatm_load.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_load.c,v 1.3 1999/01/27 22:42:20 dillon Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -46,7 +46,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: ipatm_load.c,v 1.3 1999/01/27 22:42:20 dillon Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_output.c b/sys/netatm/ipatm/ipatm_output.c
index 54def8a1e506..c7a1933d8dd2 100644
--- a/sys/netatm/ipatm/ipatm_output.c
+++ b/sys/netatm/ipatm/ipatm_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_output.c,v 1.1 1998/09/15 08:23:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: ipatm_output.c,v 1.1 1998/09/15 08:23:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_serv.h b/sys/netatm/ipatm/ipatm_serv.h
index 20462137968f..a807b0672357 100644
--- a/sys/netatm/ipatm/ipatm_serv.h
+++ b/sys/netatm/ipatm/ipatm_serv.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_serv.h,v 1.6 1998/02/19 20:14:21 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_usrreq.c b/sys/netatm/ipatm/ipatm_usrreq.c
index 6fc94d6feb76..d10f7c743ee8 100644
--- a/sys/netatm/ipatm/ipatm_usrreq.c
+++ b/sys/netatm/ipatm/ipatm_usrreq.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_usrreq.c,v 1.2 1998/10/31 20:06:55 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: ipatm_usrreq.c,v 1.2 1998/10/31 20:06:55 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_var.h b/sys/netatm/ipatm/ipatm_var.h
index 6048284b4d75..b587a6e0e4cd 100644
--- a/sys/netatm/ipatm/ipatm_var.h
+++ b/sys/netatm/ipatm/ipatm_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_var.h,v 1.8 1998/03/24 20:56:57 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index 8bfab7e5e064..409c3357aa94 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_vcm.c,v 1.2 1998/09/17 09:35:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: ipatm_vcm.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/kern_include.h b/sys/netatm/kern_include.h
index 78700db9595f..36a4071931e2 100644
--- a/sys/netatm/kern_include.h
+++ b/sys/netatm/kern_include.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: kern_include.h,v 1.1 1998/09/15 08:22:59 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/port.h b/sys/netatm/port.h
index fac693adedf7..d9a0b133c4ec 100644
--- a/sys/netatm/port.h
+++ b/sys/netatm/port.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: port.h,v 1.7 1998/03/24 20:25:28 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/queue.h b/sys/netatm/queue.h
index 8a8febf5e07e..67bff75481a8 100644
--- a/sys/netatm/queue.h
+++ b/sys/netatm/queue.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: queue.h,v 1.2 1997/05/06 22:14:38 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/sigpvc/sigpvc.h b/sys/netatm/sigpvc/sigpvc.h
index 893a68255b77..8cc8374b1ee5 100644
--- a/sys/netatm/sigpvc/sigpvc.h
+++ b/sys/netatm/sigpvc/sigpvc.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sigpvc.h,v 1.2 1997/05/06 22:15:43 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/sigpvc/sigpvc_if.c b/sys/netatm/sigpvc/sigpvc_if.c
index 7cdef3f4e995..bbd7d28d2840 100644
--- a/sys/netatm/sigpvc/sigpvc_if.c
+++ b/sys/netatm/sigpvc/sigpvc_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sigpvc_if.c,v 1.4 1999/01/19 23:11:39 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -46,7 +46,7 @@
 #include <netatm/sigpvc/sigpvc_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sigpvc_if.c,v 1.4 1999/01/19 23:11:39 mks Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/sigpvc/sigpvc_subr.c b/sys/netatm/sigpvc/sigpvc_subr.c
index 63e3b64fd577..adf462b0256f 100644
--- a/sys/netatm/sigpvc/sigpvc_subr.c
+++ b/sys/netatm/sigpvc/sigpvc_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sigpvc_subr.c,v 1.1 1998/09/15 08:23:02 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/sigpvc/sigpvc_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sigpvc_subr.c,v 1.1 1998/09/15 08:23:02 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 extern struct sp_info sigpvc_vcpool;
diff --git a/sys/netatm/sigpvc/sigpvc_var.h b/sys/netatm/sigpvc/sigpvc_var.h
index 24f92c0f2943..2cb96bcda2f0 100644
--- a/sys/netatm/sigpvc/sigpvc_var.h
+++ b/sys/netatm/sigpvc/sigpvc_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sigpvc_var.h,v 1.5 1998/02/19 20:16:28 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index b291e55f8301..0c445ae7e9f6 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_arp.c,v 1.4 1999/01/19 23:11:40 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/spans/spans_cls.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_arp.c,v 1.4 1999/01/19 23:11:40 mks Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index d4c9c953e99f..44daad7eda4a 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_cls.c,v 1.4 1999/01/27 22:42:22 dillon Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/spans/spans_cls.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_cls.c,v 1.4 1999/01/27 22:42:22 dillon Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/spans/spans_cls.h b/sys/netatm/spans/spans_cls.h
index d2cacaca99e5..02e2f6a12a07 100644
--- a/sys/netatm/spans/spans_cls.h
+++ b/sys/netatm/spans/spans_cls.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_cls.h,v 1.6 1998/05/18 19:11:17 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c
index 12c9a163bbb7..5cdd77872d99 100644
--- a/sys/netatm/spans/spans_if.c
+++ b/sys/netatm/spans/spans_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_if.c,v 1.4 1998/12/04 22:54:53 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -46,7 +46,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_if.c,v 1.4 1998/12/04 22:54:53 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_kxdr.c b/sys/netatm/spans/spans_kxdr.c
index 3843341c2241..d2e4ee4aea4c 100644
--- a/sys/netatm/spans/spans_kxdr.c
+++ b/sys/netatm/spans/spans_kxdr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_kxdr.c,v 1.1 1998/09/15 08:23:03 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_kxdr.c,v 1.1 1998/09/15 08:23:03 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index 486da9ae4745..09c4c9f3cdbf 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_msg.c,v 1.3 1998/10/31 20:06:56 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_msg.c,v 1.3 1998/10/31 20:06:56 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_print.c b/sys/netatm/spans/spans_print.c
index 4068be94c233..3e280685893e 100644
--- a/sys/netatm/spans/spans_print.c
+++ b/sys/netatm/spans/spans_print.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_print.c,v 1.4 1998/12/04 22:54:53 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_print.c,v 1.4 1998/12/04 22:54:53 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index 2cd2f7226242..47e4edc82d93 100644
--- a/sys/netatm/spans/spans_proto.c
+++ b/sys/netatm/spans/spans_proto.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_proto.c,v 1.2 1998/09/17 09:35:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_proto.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c
index b2a418c454b5..a53d31de2263 100644
--- a/sys/netatm/spans/spans_subr.c
+++ b/sys/netatm/spans/spans_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_subr.c,v 1.2 1998/09/17 09:35:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_subr.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/spans/spans_util.c b/sys/netatm/spans/spans_util.c
index 904f176d2d56..e174e16de6c0 100644
--- a/sys/netatm/spans/spans_util.c
+++ b/sys/netatm/spans/spans_util.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_util.c,v 1.2 1998/09/17 09:35:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_util.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/spans/spans_var.h b/sys/netatm/spans/spans_var.h
index 8f9ac8a31b56..f93d1fc5a2d2 100644
--- a/sys/netatm/spans/spans_var.h
+++ b/sys/netatm/spans/spans_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_var.h,v 1.7 1998/04/09 14:24:18 johnc Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/spans/spans_xdr.x b/sys/netatm/spans/spans_xdr.x
index 7e53f5371c02..1f46857d73fb 100644
--- a/sys/netatm/spans/spans_xdr.x
+++ b/sys/netatm/spans/spans_xdr.x
@@ -23,7 +23,7 @@
 % * Copies of this Software may be made, however, the above copyright
 % * notice must be reproduced on all copies.
 % *
-% *	@(#) $Id: spans_xdr.x,v 1.4 1997/05/06 22:17:36 mks Exp $
+% *	@(#) $FreeBSD$
 % *
 % */
 %
@@ -61,7 +61,7 @@
 % */
 %
 %#ifndef lint
-%static char *RCSid = "@(#) $Id: spans_xdr.x,v 1.4 1997/05/06 22:17:36 mks Exp $";
+%static char *RCSid = "@(#) $FreeBSD$";
 %#endif
 %
 #endif
diff --git a/sys/netatm/uni/q2110_sigaa.c b/sys/netatm/uni/q2110_sigaa.c
index 381356f6c7e8..cdec794f522f 100644
--- a/sys/netatm/uni/q2110_sigaa.c
+++ b/sys/netatm/uni/q2110_sigaa.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: q2110_sigaa.c,v 1.1 1998/09/15 08:23:05 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: q2110_sigaa.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/q2110_sigcpcs.c b/sys/netatm/uni/q2110_sigcpcs.c
index 7752fd04278e..6fdf512cfb75 100644
--- a/sys/netatm/uni/q2110_sigcpcs.c
+++ b/sys/netatm/uni/q2110_sigcpcs.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: q2110_sigcpcs.c,v 1.1 1998/09/15 08:23:05 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: q2110_sigcpcs.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/q2110_subr.c b/sys/netatm/uni/q2110_subr.c
index 32f3833aa134..f1ea3776572d 100644
--- a/sys/netatm/uni/q2110_subr.c
+++ b/sys/netatm/uni/q2110_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: q2110_subr.c,v 1.1 1998/09/15 08:23:05 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: q2110_subr.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/qsaal1_sigaa.c b/sys/netatm/uni/qsaal1_sigaa.c
index 1788794c5b00..579e08bdeb22 100644
--- a/sys/netatm/uni/qsaal1_sigaa.c
+++ b/sys/netatm/uni/qsaal1_sigaa.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: qsaal1_sigaa.c,v 1.1 1998/09/15 08:23:05 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: qsaal1_sigaa.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/qsaal1_sigcpcs.c b/sys/netatm/uni/qsaal1_sigcpcs.c
index 203e483e6a03..8f579845de14 100644
--- a/sys/netatm/uni/qsaal1_sigcpcs.c
+++ b/sys/netatm/uni/qsaal1_sigcpcs.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: qsaal1_sigcpcs.c,v 1.1 1998/09/15 08:23:05 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: qsaal1_sigcpcs.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/qsaal1_subr.c b/sys/netatm/uni/qsaal1_subr.c
index 9ad2468dc52a..ee18866be373 100644
--- a/sys/netatm/uni/qsaal1_subr.c
+++ b/sys/netatm/uni/qsaal1_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: qsaal1_subr.c,v 1.1 1998/09/15 08:23:06 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: qsaal1_subr.c,v 1.1 1998/09/15 08:23:06 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c
index 9f6824b81abc..7a8bbaaacd0a 100644
--- a/sys/netatm/uni/sscf_uni.c
+++ b/sys/netatm/uni/sscf_uni.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscf_uni.c,v 1.4 1998/12/04 22:54:53 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/sscf_uni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscf_uni.c,v 1.4 1998/12/04 22:54:53 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscf_uni.h b/sys/netatm/uni/sscf_uni.h
index cf244462d503..e55d6b8e9d30 100644
--- a/sys/netatm/uni/sscf_uni.h
+++ b/sys/netatm/uni/sscf_uni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscf_uni.h,v 1.2 1997/05/06 22:19:34 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/sscf_uni_lower.c b/sys/netatm/uni/sscf_uni_lower.c
index 56db85fd7de9..c1690667d522 100644
--- a/sys/netatm/uni/sscf_uni_lower.c
+++ b/sys/netatm/uni/sscf_uni_lower.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscf_uni_lower.c,v 1.2 1998/09/17 09:35:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/sscf_uni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscf_uni_lower.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscf_uni_upper.c b/sys/netatm/uni/sscf_uni_upper.c
index 24a41f555be3..df0ea2565df1 100644
--- a/sys/netatm/uni/sscf_uni_upper.c
+++ b/sys/netatm/uni/sscf_uni_upper.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscf_uni_upper.c,v 1.2 1998/09/17 09:35:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/sscf_uni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscf_uni_upper.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscf_uni_var.h b/sys/netatm/uni/sscf_uni_var.h
index ffed7ded6447..f8b70aacaf76 100644
--- a/sys/netatm/uni/sscf_uni_var.h
+++ b/sys/netatm/uni/sscf_uni_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscf_uni_var.h,v 1.5 1998/02/19 20:22:05 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c
index b4fb6e25671d..ad50d3d25219 100644
--- a/sys/netatm/uni/sscop.c
+++ b/sys/netatm/uni/sscop.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop.c,v 1.3 1998/10/31 20:07:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop.c,v 1.3 1998/10/31 20:07:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop.h b/sys/netatm/uni/sscop.h
index 2f786b3be8fd..89ca468bcc37 100644
--- a/sys/netatm/uni/sscop.h
+++ b/sys/netatm/uni/sscop.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop.h,v 1.4 1998/08/26 23:29:19 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c
index 3810f91123fd..393a39413e5f 100644
--- a/sys/netatm/uni/sscop_lower.c
+++ b/sys/netatm/uni/sscop_lower.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_lower.c,v 1.2 1998/09/17 09:35:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop_lower.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_misc.h b/sys/netatm/uni/sscop_misc.h
index 4348cef90015..5fcea10bcc0f 100644
--- a/sys/netatm/uni/sscop_misc.h
+++ b/sys/netatm/uni/sscop_misc.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_misc.h,v 1.4 1998/08/26 23:29:19 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/sscop_pdu.c b/sys/netatm/uni/sscop_pdu.c
index 03562841d8ca..5fd4c07bb9af 100644
--- a/sys/netatm/uni/sscop_pdu.c
+++ b/sys/netatm/uni/sscop_pdu.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_pdu.c,v 1.2 1998/10/31 20:07:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop_pdu.c,v 1.2 1998/10/31 20:07:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/netatm/uni/sscop_pdu.h b/sys/netatm/uni/sscop_pdu.h
index 387a6028606c..9a930d0feaff 100644
--- a/sys/netatm/uni/sscop_pdu.h
+++ b/sys/netatm/uni/sscop_pdu.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_pdu.h,v 1.3 1997/05/06 22:20:15 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/sscop_sigaa.c b/sys/netatm/uni/sscop_sigaa.c
index 675398216139..5e91d7cde51f 100644
--- a/sys/netatm/uni/sscop_sigaa.c
+++ b/sys/netatm/uni/sscop_sigaa.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_sigaa.c,v 1.1 1998/09/15 08:23:07 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop_sigaa.c,v 1.1 1998/09/15 08:23:07 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_sigcpcs.c b/sys/netatm/uni/sscop_sigcpcs.c
index 6b1c477bbb01..9223bb2cfec0 100644
--- a/sys/netatm/uni/sscop_sigcpcs.c
+++ b/sys/netatm/uni/sscop_sigcpcs.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_sigcpcs.c,v 1.1 1998/09/15 08:23:08 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop_sigcpcs.c,v 1.1 1998/09/15 08:23:08 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_subr.c b/sys/netatm/uni/sscop_subr.c
index 44d0808aa09b..1a70d3bc033e 100644
--- a/sys/netatm/uni/sscop_subr.c
+++ b/sys/netatm/uni/sscop_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_subr.c,v 1.3 1998/10/31 20:07:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop_subr.c,v 1.3 1998/10/31 20:07:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_timer.c b/sys/netatm/uni/sscop_timer.c
index e6b1b906d7f2..42a98fb07215 100644
--- a/sys/netatm/uni/sscop_timer.c
+++ b/sys/netatm/uni/sscop_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_timer.c,v 1.3 1998/10/31 20:07:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop_timer.c,v 1.3 1998/10/31 20:07:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_upper.c b/sys/netatm/uni/sscop_upper.c
index f2ad1bd95c5e..5f345fc61a51 100644
--- a/sys/netatm/uni/sscop_upper.c
+++ b/sys/netatm/uni/sscop_upper.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_upper.c,v 1.2 1998/09/17 09:35:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop_upper.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_var.h b/sys/netatm/uni/sscop_var.h
index 9a739d39090c..f29108a40d0b 100644
--- a/sys/netatm/uni/sscop_var.h
+++ b/sys/netatm/uni/sscop_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_var.h,v 1.6 1998/04/07 23:21:57 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/uni.h b/sys/netatm/uni/uni.h
index 700e859ca684..b7cd1bd48b4a 100644
--- a/sys/netatm/uni/uni.h
+++ b/sys/netatm/uni/uni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uni.h,v 1.2 1997/05/06 22:20:39 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/uni_load.c b/sys/netatm/uni/uni_load.c
index 7be1eba01a0c..bd51a4774b06 100644
--- a/sys/netatm/uni/uni_load.c
+++ b/sys/netatm/uni/uni_load.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uni_load.c,v 1.1 1998/09/15 08:23:09 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/uni.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uni_load.c,v 1.1 1998/09/15 08:23:09 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c
index 48140996665f..7c23a01b473c 100644
--- a/sys/netatm/uni/uniarp.c
+++ b/sys/netatm/uni/uniarp.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniarp.c,v 1.5 1999/01/19 23:16:11 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uniarp.c,v 1.5 1999/01/19 23:16:11 mks Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c
index 88a26a59c76b..6e08e57db388 100644
--- a/sys/netatm/uni/uniarp_cache.c
+++ b/sys/netatm/uni/uniarp_cache.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniarp_cache.c,v 1.2 1998/10/31 20:07:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uniarp_cache.c,v 1.2 1998/10/31 20:07:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_input.c b/sys/netatm/uni/uniarp_input.c
index 80920292226f..afa9927a58ba 100644
--- a/sys/netatm/uni/uniarp_input.c
+++ b/sys/netatm/uni/uniarp_input.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniarp_input.c,v 1.3 1998/12/04 22:54:53 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uniarp_input.c,v 1.3 1998/12/04 22:54:53 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_output.c b/sys/netatm/uni/uniarp_output.c
index 4f7a16388d09..f8cd594caac1 100644
--- a/sys/netatm/uni/uniarp_output.c
+++ b/sys/netatm/uni/uniarp_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniarp_output.c,v 1.1 1998/09/15 08:23:09 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uniarp_output.c,v 1.1 1998/09/15 08:23:09 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_timer.c b/sys/netatm/uni/uniarp_timer.c
index b65ca568cdd8..2b550ad9d342 100644
--- a/sys/netatm/uni/uniarp_timer.c
+++ b/sys/netatm/uni/uniarp_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniarp_timer.c,v 1.1 1998/09/15 08:23:10 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uniarp_timer.c,v 1.1 1998/09/15 08:23:10 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c
index e2e9c2d28973..95e20e2785d2 100644
--- a/sys/netatm/uni/uniarp_vcm.c
+++ b/sys/netatm/uni/uniarp_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniarp_vcm.c,v 1.2 1998/09/17 09:35:02 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uniarp_vcm.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c
index 88e79a020487..c0a40854bfd9 100644
--- a/sys/netatm/uni/uniip.c
+++ b/sys/netatm/uni/uniip.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniip.c,v 1.2 1998/10/31 20:07:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uniip.c,v 1.2 1998/10/31 20:07:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/uniip_var.h b/sys/netatm/uni/uniip_var.h
index ea1eb8c98cd3..409d2ad6de0f 100644
--- a/sys/netatm/uni/uniip_var.h
+++ b/sys/netatm/uni/uniip_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniip_var.h,v 1.9 1998/07/13 00:00:39 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/unisig.h b/sys/netatm/uni/unisig.h
index b69714d2c25a..1f06f5ccffc1 100644
--- a/sys/netatm/uni/unisig.h
+++ b/sys/netatm/uni/unisig.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig.h,v 1.2 1997/05/06 22:21:33 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c
index 08fe4b728a7c..6cd9bde21412 100644
--- a/sys/netatm/uni/unisig_decode.c
+++ b/sys/netatm/uni/unisig_decode.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_decode.c,v 1.2 1998/09/17 09:35:02 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/unisig_decode.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_decode.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 #define	ALLOC_IE(ie)						\
diff --git a/sys/netatm/uni/unisig_decode.h b/sys/netatm/uni/unisig_decode.h
index dbd184aedee9..3a181f06abd7 100644
--- a/sys/netatm/uni/unisig_decode.h
+++ b/sys/netatm/uni/unisig_decode.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_decode.h,v 1.5 1998/08/26 23:29:21 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c
index 34a039aec159..9789ae94fa7c 100644
--- a/sys/netatm/uni/unisig_encode.c
+++ b/sys/netatm/uni/unisig_encode.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_encode.c,v 1.2 1998/09/17 09:35:02 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/unisig_decode.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_encode.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_if.c b/sys/netatm/uni/unisig_if.c
index 33bfb488dc83..08dad264ae36 100644
--- a/sys/netatm/uni/unisig_if.c
+++ b/sys/netatm/uni/unisig_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_if.c,v 1.5 1998/12/11 21:47:46 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -47,7 +47,7 @@
 #include <netatm/uni/unisig_msg.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_if.c,v 1.5 1998/12/11 21:47:46 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_mbuf.c b/sys/netatm/uni/unisig_mbuf.c
index c7f00912c9e3..af6d47821a7c 100644
--- a/sys/netatm/uni/unisig_mbuf.c
+++ b/sys/netatm/uni/unisig_mbuf.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_mbuf.c,v 1.3 1998/10/31 20:07:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/unisig_msg.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_mbuf.c,v 1.3 1998/10/31 20:07:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_mbuf.h b/sys/netatm/uni/unisig_mbuf.h
index f394047eeb35..986ae43ab5cb 100644
--- a/sys/netatm/uni/unisig_mbuf.h
+++ b/sys/netatm/uni/unisig_mbuf.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_mbuf.h,v 1.5 1998/08/26 23:29:22 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c
index f52f46e8f446..7d4125883832 100644
--- a/sys/netatm/uni/unisig_msg.c
+++ b/sys/netatm/uni/unisig_msg.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_msg.c,v 1.3 1998/10/31 20:07:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/unisig_print.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_msg.c,v 1.3 1998/10/31 20:07:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_msg.h b/sys/netatm/uni/unisig_msg.h
index 1305bc77e0de..9ea3c4db924f 100644
--- a/sys/netatm/uni/unisig_msg.h
+++ b/sys/netatm/uni/unisig_msg.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_msg.h,v 1.1 1998/09/15 08:23:11 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/unisig_print.c b/sys/netatm/uni/unisig_print.c
index 93133cad3d6e..174b7518902f 100644
--- a/sys/netatm/uni/unisig_print.c
+++ b/sys/netatm/uni/unisig_print.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_print.c,v 1.1 1998/09/15 08:23:12 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/unisig_print.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_print.c,v 1.1 1998/09/15 08:23:12 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_print.h b/sys/netatm/uni/unisig_print.h
index 5e906c8284a7..22f440a06abc 100644
--- a/sys/netatm/uni/unisig_print.h
+++ b/sys/netatm/uni/unisig_print.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_print.h,v 1.2 1997/05/06 22:22:27 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c
index 8a3daac6753a..39aa8b0e44a6 100644
--- a/sys/netatm/uni/unisig_proto.c
+++ b/sys/netatm/uni/unisig_proto.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_proto.c,v 1.2 1998/09/17 09:35:02 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/unisig_mbuf.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_proto.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_sigmgr_state.c b/sys/netatm/uni/unisig_sigmgr_state.c
index e2213bf2ec6a..b4360c9a5f21 100644
--- a/sys/netatm/uni/unisig_sigmgr_state.c
+++ b/sys/netatm/uni/unisig_sigmgr_state.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_sigmgr_state.c,v 1.3 1998/10/31 20:07:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -47,7 +47,7 @@
 #include <netatm/uni/sscf_uni.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_sigmgr_state.c,v 1.3 1998/10/31 20:07:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c
index 888cedcf99ab..124784a5eae8 100644
--- a/sys/netatm/uni/unisig_subr.c
+++ b/sys/netatm/uni/unisig_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_subr.c,v 1.4 1998/10/31 20:08:03 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/unisig_msg.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_subr.c,v 1.4 1998/10/31 20:08:03 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_util.c b/sys/netatm/uni/unisig_util.c
index a3a2ab2ba3cb..5243628dd0b2 100644
--- a/sys/netatm/uni/unisig_util.c
+++ b/sys/netatm/uni/unisig_util.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_util.c,v 1.3 1998/10/31 20:07:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/unisig_msg.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_util.c,v 1.3 1998/10/31 20:07:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_var.h b/sys/netatm/uni/unisig_var.h
index b8d422930250..ca7e7faf56d5 100644
--- a/sys/netatm/uni/unisig_var.h
+++ b/sys/netatm/uni/unisig_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_var.h,v 1.1 1998/09/15 08:23:13 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c
index 84f995e9cf31..b6775095d730 100644
--- a/sys/netatm/uni/unisig_vc_state.c
+++ b/sys/netatm/uni/unisig_vc_state.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_vc_state.c,v 1.3 1998/10/31 20:07:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/unisig_decode.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_vc_state.c,v 1.3 1998/10/31 20:07:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netinet/fil.c b/sys/netinet/fil.c
index f91ee3dec08b..ee0ff9096f38 100644
--- a/sys/netinet/fil.c
+++ b/sys/netinet/fil.c
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)fil.c	1.36 6/5/96 (C) 1993-1996 Darren Reed";
-static const char rcsid[] = "@(#)$Id: fil.c,v 1.3 1998/06/20 18:37:49 peter Exp $";
+static const char rcsid[] = "@(#)$FreeBSD$";
 #endif
 
 #include "opt_ipfilter.h"
@@ -1098,7 +1098,7 @@ nodata:
  * SUCH DAMAGE.
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- * $Id: fil.c,v 1.3 1998/06/20 18:37:49 peter Exp $
+ * $FreeBSD$
  */
 /*
  * Copy data from an mbuf chain starting "off" bytes from the beginning,
diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index c19cc3540cc1..02d147c31331 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: icmp_var.h,v 1.12 1998/12/04 04:21:25 dillon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_ICMP_VAR_H_
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 9b7e4156a30a..197f7a0f421e 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ether.c,v 1.57 1999/04/15 17:58:24 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 3540119748c5..79f1252781c7 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.h	8.3 (Berkeley) 5/2/95
- *	$Id: if_ether.h,v 1.20 1997/02/22 09:41:25 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IF_ETHER_H_
diff --git a/sys/netinet/if_fddi.h b/sys/netinet/if_fddi.h
index 336ff4768cd6..fc6acc6c9c8f 100644
--- a/sys/netinet/if_fddi.h
+++ b/sys/netinet/if_fddi.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_fddi.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IF_FDDI_H_
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index c1c90c041642..83cc650c21a5 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
- * $Id: igmp.c,v 1.26 1998/12/12 21:45:49 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index 01d6d0917977..7d943d6eb548 100644
--- a/sys/netinet/igmp.h
+++ b/sys/netinet/igmp.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IGMP_H_
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index 84485e328f99..0dd330fb19e0 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- *	$Id: igmp_var.h,v 1.13 1999/02/16 10:49:51 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IGMP_VAR_H_
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 0c78b995ebbc..4562672f1e6c 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.c	8.4 (Berkeley) 1/9/95
- *	$Id: in.c,v 1.40 1999/04/24 12:28:51 luigi Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 1838defb6f6b..ba5d24f91ad4 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $Id: in.h,v 1.42 1999/05/08 14:28:52 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_H_
diff --git a/sys/netinet/in_cksum.c b/sys/netinet/in_cksum.c
index 5da488f6594d..eaf14935070a 100644
--- a/sys/netinet/in_cksum.c
+++ b/sys/netinet/in_cksum.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_hostcache.c b/sys/netinet/in_hostcache.c
index a3f08b6db1d9..33e0187565fa 100644
--- a/sys/netinet/in_hostcache.c
+++ b/sys/netinet/in_hostcache.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: in_hostcache.c,v 1.1 1997/06/18 01:24:28 wollman Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_hostcache.h b/sys/netinet/in_hostcache.h
index 81ae4bdb99e6..98e8fd433ecb 100644
--- a/sys/netinet/in_hostcache.h
+++ b/sys/netinet/in_hostcache.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_HOSTCACHE_H
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index bc48c3bd31b1..162eaa392256 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.c	8.4 (Berkeley) 5/24/95
- *	$Id: in_pcb.c,v 1.51 1999/06/25 23:46:47 pb Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 33d8d7a73dcf..0912fea898ea 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: in_pcb.h,v 1.26 1998/05/15 20:11:33 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_PCB_H_
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 083d10bd686f..786b4e8c7669 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_proto.c	8.2 (Berkeley) 2/9/95
- *	$Id: in_proto.c,v 1.47 1998/08/23 03:07:14 wollman Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ipdivert.h"
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index 98f86c6410a1..52d062dd7830 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: in_rmx.c,v 1.35 1998/08/05 16:59:20 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h
index aa6f0d719ca6..5d18c56e7175 100644
--- a/sys/netinet/in_systm.h
+++ b/sys/netinet/in_systm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
- * $Id: in_systm.h,v 1.6 1998/06/07 17:12:14 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_SYSTM_H_
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index 5fd0a09f08cc..9569f48f59a1 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.2 (Berkeley) 1/9/95
- *	$Id: in_var.h,v 1.29 1998/06/07 17:12:14 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_VAR_H_
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index c5e916bbf36b..0b6f1b6361d5 100644
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip.h	8.2 (Berkeley) 6/1/94
- *	$Id: ip.h,v 1.14 1998/02/26 08:31:52 dima Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IP_H_
diff --git a/sys/netinet/ip_auth.c b/sys/netinet/ip_auth.c
index dab93b0ef0c2..4afda70b809d 100644
--- a/sys/netinet/ip_auth.c
+++ b/sys/netinet/ip_auth.c
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  */
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: ip_auth.c,v 1.5 1998/08/15 21:51:53 bde Exp $";
+static const char rcsid[] = "@(#)$FreeBSD$";
 #endif
 
 #if defined(KERNEL) && !defined(_KERNEL)
diff --git a/sys/netinet/ip_auth.h b/sys/netinet/ip_auth.h
index 267c21743427..72e51b22ae1c 100644
--- a/sys/netinet/ip_auth.h
+++ b/sys/netinet/ip_auth.h
@@ -5,7 +5,7 @@
  * provided that this notice is preserved and due credit is given
  * to the original author and the contributors.
  *
- * $Id: ip_auth.h,v 1.1.1.1 1997/11/16 05:55:52 peter Exp $
+ * $FreeBSD$
  *
  */
 #ifndef	__IP_AUTH_H__
diff --git a/sys/netinet/ip_compat.h b/sys/netinet/ip_compat.h
index 1f91cf3c949b..e3fd1fee5f85 100644
--- a/sys/netinet/ip_compat.h
+++ b/sys/netinet/ip_compat.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_compat.h	1.8 1/14/96
- * $Id: ip_compat.h,v 2.0.2.31.2.11 1998/05/23 14:29:36 darrenr Exp $
+ * $FreeBSD$
  */
 
 #ifndef	__IP_COMPAT_H__
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index e4b82b942384..32a13f20f896 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ip_divert.c,v 1.37 1999/02/08 05:53:39 julian Exp $
+ * $FreeBSD$
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c
index 5bd6a3d057ac..66d9e532737c 100644
--- a/sys/netinet/ip_dummynet.c
+++ b/sys/netinet/ip_dummynet.c
@@ -10,7 +10,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_dummynet.c,v 1.16 1999/08/11 14:37:58 luigi Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netinet/ip_dummynet.h b/sys/netinet/ip_dummynet.h
index 98eae8206156..55d9614006b1 100644
--- a/sys/netinet/ip_dummynet.h
+++ b/sys/netinet/ip_dummynet.h
@@ -10,7 +10,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_dummynet.h,v 1.4 1999/04/20 13:32:04 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _IP_DUMMYNET_H
diff --git a/sys/netinet/ip_fil.c b/sys/netinet/ip_fil.c
index 6cbdac90533c..2dbea5dbf8ac 100644
--- a/sys/netinet/ip_fil.c
+++ b/sys/netinet/ip_fil.c
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_fil.c,v 1.6 1998/08/15 21:51:53 bde Exp $";
+static const char rcsid[] = "@(#)$FreeBSD$";
 #endif
 
 #include "opt_ipfilter.h"
diff --git a/sys/netinet/ip_fil.h b/sys/netinet/ip_fil.h
index e40ef555ae92..79f68964cbc9 100644
--- a/sys/netinet/ip_fil.h
+++ b/sys/netinet/ip_fil.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_fil.h	1.35 6/5/96
- * $Id: ip_fil.h,v 1.5 1998/06/08 09:47:41 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef	__IP_FIL_H__
diff --git a/sys/netinet/ip_flow.c b/sys/netinet/ip_flow.c
index fdebdb0b03ea..6c9119b5ee86 100644
--- a/sys/netinet/ip_flow.c
+++ b/sys/netinet/ip_flow.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ip_flow.c,v 1.7 1999/04/11 02:50:42 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_flow.h b/sys/netinet/ip_flow.h
index 4ba163018338..4675996cc790 100644
--- a/sys/netinet/ip_flow.h
+++ b/sys/netinet/ip_flow.h
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IP_FLOW_H
diff --git a/sys/netinet/ip_frag.c b/sys/netinet/ip_frag.c
index 7ad47f784b08..de104e55452b 100644
--- a/sys/netinet/ip_frag.c
+++ b/sys/netinet/ip_frag.c
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_frag.c	1.11 3/24/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_frag.c,v 1.2 1998/03/21 11:34:06 peter Exp $";
+static const char rcsid[] = "@(#)$FreeBSD$";
 #endif
 
 #if !defined(_KERNEL) && defined(KERNEL)
diff --git a/sys/netinet/ip_frag.h b/sys/netinet/ip_frag.h
index 9122f17a5115..c50905042fa1 100644
--- a/sys/netinet/ip_frag.h
+++ b/sys/netinet/ip_frag.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_frag.h	1.5 3/24/96
- * $Id: ip_frag.h,v 2.0.2.12.2.1 1998/05/23 14:29:39 darrenr Exp $
+ * $FreeBSD$
  */
 
 #ifndef	__IP_FRAG_H__
diff --git a/sys/netinet/ip_ftp_pxy.c b/sys/netinet/ip_ftp_pxy.c
index 7e37d9675371..917dbb2bf1f9 100644
--- a/sys/netinet/ip_ftp_pxy.c
+++ b/sys/netinet/ip_ftp_pxy.c
@@ -2,7 +2,7 @@
  * Simple FTP transparent proxy for in-kernel use.  For use with the NAT
  * code.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #define	isdigit(x)	((x) >= '0' && (x) <= '9')
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index f32bff2a2589..49e03c3709ca 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -12,7 +12,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_fw.c,v 1.118 1999/08/21 18:35:50 green Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h
index c14a96b81e9a..07ac1bb8fb6d 100644
--- a/sys/netinet/ip_fw.h
+++ b/sys/netinet/ip_fw.h
@@ -11,7 +11,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_fw.h,v 1.41 1999/08/11 15:34:46 luigi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _IP_FW_H
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index 5a5abc4689e3..6bb234b4da16 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- *	$Id: ip_icmp.c,v 1.34 1999/03/06 23:10:42 archie Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index af2f787b029c..4dd6c9750d7c 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $Id: ip_icmp.h,v 1.11 1997/02/22 09:41:34 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IP_ICMP_H_
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 55b7132a0e34..6cf40de7ab1f 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- *	$Id: ip_input.c,v 1.119 1999/05/04 16:20:32 luigi Exp $
+ * $FreeBSD$
  */
 
 #define	_IP_VHL
diff --git a/sys/netinet/ip_log.c b/sys/netinet/ip_log.c
index 8a826ed2985c..3f73a3e21fb6 100644
--- a/sys/netinet/ip_log.c
+++ b/sys/netinet/ip_log.c
@@ -5,7 +5,7 @@
  * provided that this notice is preserved and due credit is given
  * to the original author and the contributors.
  *
- * $Id: ip_log.c,v 1.5 1998/11/26 18:54:52 eivind Exp $
+ * $FreeBSD$
  */
 #include "opt_ipfilter.h"
 
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index bf63c7694af6..20aa381e97c6 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -9,7 +9,7 @@
  * Modified by Bill Fenner, PARC, April 1995
  *
  * MROUTING Revision: 3.5
- * $Id: ip_mroute.c,v 1.53 1999/01/18 02:06:57 fenner Exp $
+ * $FreeBSD$
  */
 
 #include "opt_mrouting.h"
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index 0526bbb18f75..abccedaa02a9 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $Id: ip_mroute.h,v 1.14 1998/08/23 03:07:14 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IP_MROUTE_H_
diff --git a/sys/netinet/ip_nat.c b/sys/netinet/ip_nat.c
index 243c8bb19144..a8f8744f5149 100644
--- a/sys/netinet/ip_nat.c
+++ b/sys/netinet/ip_nat.c
@@ -9,7 +9,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_nat.c	1.11 6/5/96 (C) 1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_nat.c,v 1.4 1998/08/15 21:51:53 bde Exp $";
+static const char rcsid[] = "@(#)$FreeBSD$";
 #endif
 
 #include "opt_ipfilter.h"
diff --git a/sys/netinet/ip_nat.h b/sys/netinet/ip_nat.h
index 65ab99dd9ed9..d02a84457774 100644
--- a/sys/netinet/ip_nat.h
+++ b/sys/netinet/ip_nat.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_nat.h	1.5 2/4/96
- * $Id: ip_nat.h,v 1.1.1.5 1998/06/20 18:17:53 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef	__IP_NAT_H__
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index e0d8de36f37e..32200c1e1186 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- *	$Id: ip_output.c,v 1.89 1999/05/04 09:26:12 luigi Exp $
+ * $FreeBSD$
  */
 
 #define _IP_VHL
diff --git a/sys/netinet/ip_proxy.c b/sys/netinet/ip_proxy.c
index 31764298d50b..e604051aa548 100644
--- a/sys/netinet/ip_proxy.c
+++ b/sys/netinet/ip_proxy.c
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  */
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: ip_proxy.c,v 1.3 1998/06/20 18:37:50 peter Exp $";
+static const char rcsid[] = "@(#)$FreeBSD$";
 #endif
 
 #if defined(__FreeBSD__) && defined(KERNEL) && !defined(_KERNEL)
diff --git a/sys/netinet/ip_proxy.h b/sys/netinet/ip_proxy.h
index a361e9368ada..cd7e9f9a671a 100644
--- a/sys/netinet/ip_proxy.h
+++ b/sys/netinet/ip_proxy.h
@@ -5,7 +5,7 @@
  * provided that this notice is preserved and due credit is given
  * to the original author and the contributors.
  *
- * $Id: ip_proxy.h,v 2.0.2.10.2.1 1997/11/27 09:33:27 darrenr Exp $
+ * $FreeBSD$
  */
 
 #ifndef	__IP_PROXY_H__
diff --git a/sys/netinet/ip_state.c b/sys/netinet/ip_state.c
index b6a805496135..d5a36375b399 100644
--- a/sys/netinet/ip_state.c
+++ b/sys/netinet/ip_state.c
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_state.c	1.8 6/5/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_state.c,v 1.4 1998/11/26 18:54:52 eivind Exp $";
+static const char rcsid[] = "@(#)$FreeBSD$";
 #endif
 
 #include "opt_ipfilter.h"
diff --git a/sys/netinet/ip_state.h b/sys/netinet/ip_state.h
index f2ae94bb7020..2b7e8989de4d 100644
--- a/sys/netinet/ip_state.h
+++ b/sys/netinet/ip_state.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_state.h	1.3 1/12/96 (C) 1995 Darren Reed
- * $Id: ip_state.h,v 2.0.2.14.2.6 1998/05/24 05:18:04 darrenr Exp $
+ * $FreeBSD$
  */
 #ifndef	__IP_STATE_H__
 #define	__IP_STATE_H__
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 1de266497f28..08b3a06d3304 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.2 (Berkeley) 1/9/95
- *	$Id: ip_var.h,v 1.44 1998/08/23 03:07:14 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IP_VAR_H_
diff --git a/sys/netinet/ipl.h b/sys/netinet/ipl.h
index d1608d54ecbb..0985545e110c 100644
--- a/sys/netinet/ipl.h
+++ b/sys/netinet/ipl.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ipl.h	1.21 6/5/96
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	__IPL_H__
diff --git a/sys/netinet/mlf_ipl.c b/sys/netinet/mlf_ipl.c
index 39249a5d1de6..74d9ab063939 100644
--- a/sys/netinet/mlf_ipl.c
+++ b/sys/netinet/mlf_ipl.c
@@ -5,7 +5,7 @@
  * provided that this notice is preserved and due credit is given
  * to the original author and the contributors.
  *
- * $Id$
+ * $FreeBSD$
  */
 /*
  * 29/12/94 Added code from Marc Huber <huber@fzi.de> to allow it to allocate
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index d8117dde0ac3..e153cc17cf12 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_ip.c	8.7 (Berkeley) 5/15/95
- *	$Id: raw_ip.c,v 1.59 1999/05/03 23:57:30 billf Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index 89624e30e278..268b54e272c1 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- * $Id: tcp.h,v 1.9 1998/06/08 09:47:42 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_H_
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index c82049e559fa..a01607dac3ec 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.c	8.1 (Berkeley) 6/10/93
- * $Id: tcp_debug.c,v 1.12 1998/01/08 23:41:53 eivind Exp $
+ * $FreeBSD$
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index a33743b0779e..c359cb4034b1 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_DEBUG_H_
diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h
index 4a535564dc36..2af6e2b6d0e4 100644
--- a/sys/netinet/tcp_fsm.h
+++ b/sys/netinet/tcp_fsm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
- * $Id: tcp_fsm.h,v 1.10 1997/08/16 19:15:38 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_FSM_H_
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index e0236b063f81..94813ea6914f 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.89 1999/08/18 15:40:05 csgr Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ipfw.h"		/* for ipfw_fwd		*/
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 6303221e82b7..0fbceb897a32 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_output.c	8.4 (Berkeley) 5/24/95
- *	$Id: tcp_output.c,v 1.33 1999/04/07 22:22:06 julian Exp $
+ * $FreeBSD$
  */
 
 #include "opt_tcpdebug.h"
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index e0236b063f81..94813ea6914f 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.89 1999/08/18 15:40:05 csgr Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ipfw.h"		/* for ipfw_fwd		*/
diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h
index 8cccf199e10b..0ad0fb838be1 100644
--- a/sys/netinet/tcp_seq.h
+++ b/sys/netinet/tcp_seq.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_seq.h	8.3 (Berkeley) 6/21/95
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_SEQ_H_
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index f5c5b10aa412..3320b079dd52 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_subr.c,v 1.57 1999/07/11 18:32:45 green Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 00746a5b33d2..de7ecc92734a 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_timer.c,v 1.28 1998/04/24 09:25:35 dg Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index a2fcb7721257..3c0f39e47a4d 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- *	$Id: tcp_timer.h,v 1.12 1997/02/22 09:41:42 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_TIMER_H_
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index f5c5b10aa412..3320b079dd52 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_subr.c,v 1.57 1999/07/11 18:32:45 green Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index b6d4ae8a5911..231da99d6a1a 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- *	$Id: tcp_usrreq.c,v 1.43 1999/05/03 23:57:32 billf Exp $
+ * $FreeBSD$
  */
 
 #include "opt_tcpdebug.h"
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index e2c448a3cea4..eadd4f5b7cfd 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * 	$Id: tcp_var.h,v 1.49 1999/01/20 17:32:00 fenner Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_VAR_H_
diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h
index ba2e0f28d8d8..2cf3df1d3ba6 100644
--- a/sys/netinet/tcpip.h
+++ b/sys/netinet/tcpip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
- * $Id: tcpip.h,v 1.6 1997/02/22 09:41:43 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_TCPIP_H_
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index e73e1f4ddbbb..635267f065a1 100644
--- a/sys/netinet/udp.h
+++ b/sys/netinet/udp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_UDP_H_
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index f086ad8b331d..337e796ad07a 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
- *	$Id: udp_usrreq.c,v 1.54 1999/08/17 12:17:53 csgr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 4784a3508944..5ede8a6a3d43 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: udp_var.h,v 1.17 1999/02/16 10:49:52 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_UDP_VAR_H_
diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c
index f23759c50641..5035256f5618 100644
--- a/sys/netipx/ipx.c
+++ b/sys/netipx/ipx.c
@@ -33,7 +33,7 @@
  * 
  *	@(#)ipx.c
  *
- * $Id: ipx.c,v 1.15 1998/12/09 13:48:08 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx.h b/sys/netipx/ipx.h
index f92657338f89..3bcf5f0b24bc 100644
--- a/sys/netipx/ipx.h
+++ b/sys/netipx/ipx.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx.h
  *
- * $Id: ipx.h,v 1.12 1997/05/10 09:58:49 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_IPX_H_
diff --git a/sys/netipx/ipx_cksum.c b/sys/netipx/ipx_cksum.c
index 497c05a564ed..4bb9124f0f33 100644
--- a/sys/netipx/ipx_cksum.c
+++ b/sys/netipx/ipx_cksum.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_cksum.c
  *
- * $Id: ipx_cksum.c,v 1.6 1997/05/10 09:58:50 jhay Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx_if.h b/sys/netipx/ipx_if.h
index c4f1864422a4..c6ec19e0ded0 100644
--- a/sys/netipx/ipx_if.h
+++ b/sys/netipx/ipx_if.h
@@ -33,7 +33,7 @@
  * 
  *	@(#)ipx_if.h
  *
- * $Id: ipx_if.h,v 1.8 1997/05/10 09:58:51 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_IPX_IF_H_
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index 38b2b3c34d2f..44634b31a4d0 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_input.c
  *
- * $Id: ipx_input.c,v 1.17 1998/04/06 09:30:42 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c
index 5b8b8aa0cf17..4f5721f00fef 100644
--- a/sys/netipx/ipx_ip.c
+++ b/sys/netipx/ipx_ip.c
@@ -33,7 +33,7 @@
  * 
  *	@(#)ipx_ip.c
  *
- * $Id: ipx_ip.c,v 1.21 1998/06/07 17:12:19 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netipx/ipx_ip.h b/sys/netipx/ipx_ip.h
index e8bd9cf80f03..0543df5dab29 100644
--- a/sys/netipx/ipx_ip.h
+++ b/sys/netipx/ipx_ip.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipxip.h
  *
- * $Id: ipx_ip.h,v 1.11 1997/06/26 19:35:50 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_IPXIP_H_
diff --git a/sys/netipx/ipx_outputfl.c b/sys/netipx/ipx_outputfl.c
index e732c33b83ee..fb5c2fbbcaa1 100644
--- a/sys/netipx/ipx_outputfl.c
+++ b/sys/netipx/ipx_outputfl.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_outputfl.c
  *
- * $Id: ipx_outputfl.c,v 1.11 1999/02/06 10:48:10 jhay Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c
index 7a55c878a59f..6b57bdc2cab6 100644
--- a/sys/netipx/ipx_pcb.c
+++ b/sys/netipx/ipx_pcb.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_pcb.c
  *
- * $Id: ipx_pcb.c,v 1.15 1999/02/06 10:48:10 jhay Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx_pcb.h b/sys/netipx/ipx_pcb.h
index 3f03602dcfc8..586f26305560 100644
--- a/sys/netipx/ipx_pcb.h
+++ b/sys/netipx/ipx_pcb.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_pcb.h
  *
- * $Id: ipx_pcb.h,v 1.11 1997/06/26 19:35:54 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_IPX_PCB_H_
diff --git a/sys/netipx/ipx_proto.c b/sys/netipx/ipx_proto.c
index f7b8e5947299..36e2b5334fa3 100644
--- a/sys/netipx/ipx_proto.c
+++ b/sys/netipx/ipx_proto.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_proto.c
  *
- * $Id: ipx_proto.c,v 1.13 1998/02/09 06:10:24 eivind Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ipx.h"
diff --git a/sys/netipx/ipx_tun.c b/sys/netipx/ipx_tun.c
index 14afb0846577..f2709eb8c8cf 100644
--- a/sys/netipx/ipx_tun.c
+++ b/sys/netipx/ipx_tun.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_tun.c
  *
- * $Id: ipx_tun.c,v 1.7 1997/03/24 11:33:34 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index 8106eccb9c04..2e20f0fb45cd 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_usrreq.c
  *
- * $Id: ipx_usrreq.c,v 1.22 1999/02/06 10:48:11 jhay Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ipx.h"
diff --git a/sys/netipx/ipx_var.h b/sys/netipx/ipx_var.h
index 8d521a015940..acdafe5adcf6 100644
--- a/sys/netipx/ipx_var.h
+++ b/sys/netipx/ipx_var.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_var.h
  *
- * $Id: ipx_var.h,v 1.11 1998/08/23 03:07:15 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_IPX_VAR_H_
diff --git a/sys/netipx/spx.h b/sys/netipx/spx.h
index 20a4116c2b15..6fca28a17d7a 100644
--- a/sys/netipx/spx.h
+++ b/sys/netipx/spx.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx.h
  *
- * $Id: spx.h,v 1.13 1997/06/26 19:36:00 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_SPX_H_
diff --git a/sys/netipx/spx_debug.c b/sys/netipx/spx_debug.c
index e9b26c385570..d8e0a6f34f0f 100644
--- a/sys/netipx/spx_debug.c
+++ b/sys/netipx/spx_debug.c
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_debug.c
  *
- * $Id: spx_debug.c,v 1.12 1998/01/08 23:41:57 eivind Exp $
+ * $FreeBSD$
  */
 
 #include "opt_inet.h"
diff --git a/sys/netipx/spx_debug.h b/sys/netipx/spx_debug.h
index a3f10cb57341..94f2e2f3bbf9 100644
--- a/sys/netipx/spx_debug.h
+++ b/sys/netipx/spx_debug.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_debug.h
  *
- * $Id: spx_debug.h,v 1.9 1997/05/10 09:58:57 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_SPX_DEBUG_H_
diff --git a/sys/netipx/spx_timer.h b/sys/netipx/spx_timer.h
index 5fc19d1acb71..602200975fad 100644
--- a/sys/netipx/spx_timer.h
+++ b/sys/netipx/spx_timer.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_timer.h
  *
- * $Id: spx_timer.h,v 1.8 1997/05/10 09:58:57 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_SPX_TIMER_H_
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index 8a23b0ee047a..7418eaced6d1 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_usrreq.h
  *
- * $Id: spx_usrreq.c,v 1.24 1999/01/28 00:57:51 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/spx_var.h b/sys/netipx/spx_var.h
index ed36a9322164..7dfb783ee89d 100644
--- a/sys/netipx/spx_var.h
+++ b/sys/netipx/spx_var.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_var.h
  *
- * $Id: spx_var.h,v 1.7 1997/05/10 09:58:58 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_SPX_VAR_H_
diff --git a/sys/netns/idp.h b/sys/netns/idp.h
index 3d624233d179..e83275659767 100644
--- a/sys/netns/idp.h
+++ b/sys/netns/idp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_IDP_H_
diff --git a/sys/netns/idp_usrreq.c b/sys/netns/idp_usrreq.c
index 6ff4b4f62cf1..a03770f02ddb 100644
--- a/sys/netns/idp_usrreq.c
+++ b/sys/netns/idp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/idp_var.h b/sys/netns/idp_var.h
index 13bedb726a91..ce4314177404 100644
--- a/sys/netns/idp_var.h
+++ b/sys/netns/idp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp_var.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_IDP_VAR_H_
diff --git a/sys/netns/ns.c b/sys/netns/ns.c
index ce58ba1a24f6..7af5acf12ac9 100644
--- a/sys/netns/ns.c
+++ b/sys/netns/ns.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns.c	8.2 (Berkeley) 11/15/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns.h b/sys/netns/ns.h
index 2224534f725d..a20b868cab61 100644
--- a/sys/netns/ns.h
+++ b/sys/netns/ns.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_NS_H_
diff --git a/sys/netns/ns_cksum.c b/sys/netns/ns_cksum.c
index 617fb2c0f2eb..1f9a58aad096 100644
--- a/sys/netns/ns_cksum.c
+++ b/sys/netns/ns_cksum.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_cksum.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_error.c b/sys/netns/ns_error.c
index b72f1994abdd..fc4db94bd69e 100644
--- a/sys/netns/ns_error.c
+++ b/sys/netns/ns_error.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_error.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_error.h b/sys/netns/ns_error.h
index d02913e90415..234080130fa7 100644
--- a/sys/netns/ns_error.h
+++ b/sys/netns/ns_error.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_error.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_NS_ERROR_H_
diff --git a/sys/netns/ns_if.h b/sys/netns/ns_if.h
index a44f36581be7..4dfabe7c7494 100644
--- a/sys/netns/ns_if.h
+++ b/sys/netns/ns_if.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_if.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_NS_IF_H_
diff --git a/sys/netns/ns_input.c b/sys/netns/ns_input.c
index 363d787e720b..21d64a09a8a6 100644
--- a/sys/netns/ns_input.c
+++ b/sys/netns/ns_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_input.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c
index 6eec470fbd78..0c5fbeb84647 100644
--- a/sys/netns/ns_ip.c
+++ b/sys/netns/ns_ip.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_ip.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netns/ns_output.c b/sys/netns/ns_output.c
index 8b044896d4ea..572ed36585fe 100644
--- a/sys/netns/ns_output.c
+++ b/sys/netns/ns_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_output.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_pcb.c b/sys/netns/ns_pcb.c
index 48c8154b1d83..85f7548e68e9 100644
--- a/sys/netns/ns_pcb.c
+++ b/sys/netns/ns_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_pcb.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_pcb.h b/sys/netns/ns_pcb.h
index 37b85dc9d16a..8b5646a32cc5 100644
--- a/sys/netns/ns_pcb.h
+++ b/sys/netns/ns_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: ns_pcb.h,v 1.8 1997/02/22 09:42:21 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_NS_PCB_H_
diff --git a/sys/netns/ns_proto.c b/sys/netns/ns_proto.c
index 5abf989df6ed..1bee0e472814 100644
--- a/sys/netns/ns_proto.c
+++ b/sys/netns/ns_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)ns_proto.c	8.1 (Berkeley) 6/10/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/sp.h b/sys/netns/sp.h
index 97ab3d9835d1..adef4fd64b31 100644
--- a/sys/netns/sp.h
+++ b/sys/netns/sp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sp.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_SP_H_
diff --git a/sys/netns/spidp.h b/sys/netns/spidp.h
index 02513cdd6216..3920f672a214 100644
--- a/sys/netns/spidp.h
+++ b/sys/netns/spidp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spidp.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_SPIDP_H_
diff --git a/sys/netns/spp_debug.c b/sys/netns/spp_debug.c
index 88adcab67d40..840d93a844c9 100644
--- a/sys/netns/spp_debug.c
+++ b/sys/netns/spp_debug.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_debug.c	8.1 (Berkeley) 6/10/93
- * $Id: spp_debug.c,v 1.8 1997/02/22 09:42:25 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_inet.h"
diff --git a/sys/netns/spp_debug.h b/sys/netns/spp_debug.h
index 6f6e5c2d544c..db0d71318a52 100644
--- a/sys/netns/spp_debug.h
+++ b/sys/netns/spp_debug.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_debug.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_SPP_DEBUG_H_
diff --git a/sys/netns/spp_timer.h b/sys/netns/spp_timer.h
index 501c584a58e2..7501a0cc9889 100644
--- a/sys/netns/spp_timer.h
+++ b/sys/netns/spp_timer.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_timer.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_SPP_TIMER_H_
diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c
index 995ae77cb0c4..4ab74ce1e250 100644
--- a/sys/netns/spp_usrreq.c
+++ b/sys/netns/spp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/spp_var.h b/sys/netns/spp_var.h
index e7c74196f490..e1d88dee9ec2 100644
--- a/sys/netns/spp_var.h
+++ b/sys/netns/spp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_var.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_SPP_VAR_H_
diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c
index d91bf90bae35..32952484de43 100644
--- a/sys/nfs/bootp_subr.c
+++ b/sys/nfs/bootp_subr.c
@@ -1,4 +1,4 @@
-/*	$Id: bootp_subr.c,v 1.18 1998/12/07 21:58:43 archie Exp $	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
diff --git a/sys/nfs/krpc.h b/sys/nfs/krpc.h
index 0610e4a36740..6c889b57f77c 100644
--- a/sys/nfs/krpc.h
+++ b/sys/nfs/krpc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $	*/
-/*	$Id: krpc.h,v 1.4 1997/08/16 19:15:52 wollman Exp $	*/
+/* $FreeBSD$	*/
 
 #include <sys/cdefs.h>
 
diff --git a/sys/nfs/krpc_subr.c b/sys/nfs/krpc_subr.c
index fc232b9b74b9..2127d46a6d29 100644
--- a/sys/nfs/krpc_subr.c
+++ b/sys/nfs/krpc_subr.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $	*/
-/*	$Id: krpc_subr.c,v 1.11 1998/08/23 03:07:16 wollman Exp $	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index 6fd3a89efdaf..c0cd18fae776 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFS_H_
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index 9d93fed1f9fe..1dad3c43512c 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_bio.c	8.9 (Berkeley) 3/30/95
- * $Id: nfs_bio.c,v 1.75 1999/08/12 18:04:39 dt Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 9ffb490e1cfb..d42c5ac645d9 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.80 1999/08/08 18:42:55 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfs/nfs_common.h b/sys/nfs/nfs_common.h
index 8533d529231d..b13c0099b816 100644
--- a/sys/nfs/nfs_common.h
+++ b/sys/nfs/nfs_common.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsm_subs.h,v 1.25 1999/08/04 14:41:39 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index 77ebecbb3551..13ff9b2902a0 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_node.c	8.6 (Berkeley) 5/22/95
- * $Id: nfs_node.c,v 1.30 1999/06/15 23:24:14 mjacob Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index 2542ee73f129..32b5d3971b0c 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_nqlease.c	8.9 (Berkeley) 5/20/95
- * $Id: nfs_nqlease.c,v 1.42 1999/06/05 05:34:58 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index b5ee411d946b..a8ce893d8525 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c  8.8 (Berkeley) 7/31/95
- * $Id: nfs_serv.c,v 1.82 1999/07/28 08:20:49 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index 8949d7a32fd8..0059c5119ec1 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.52 1999/05/02 23:56:25 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c
index b5adf4a74bd9..b866cbe67813 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_srvcache.c	8.3 (Berkeley) 3/30/95
- * $Id: nfs_srvcache.c,v 1.16 1998/02/09 06:10:36 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 9ffb490e1cfb..d42c5ac645d9 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.80 1999/08/08 18:42:55 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 004bdd2d966e..210dde6c5cca 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.49 1999/04/27 11:17:52 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 89fe668f8563..3e90bdb58a89 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
- * $Id: nfs_vfsops.c,v 1.83 1999/04/10 18:53:29 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 0600c26dd178..f7250cc55c0f 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.138 1999/07/31 01:51:58 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfsdiskless.h b/sys/nfs/nfsdiskless.h
index f499a2c4baea..487e0bf65226 100644
--- a/sys/nfs/nfsdiskless.h
+++ b/sys/nfs/nfsdiskless.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsdiskless.h,v 1.9 1997/05/12 19:02:55 tegge Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfsm_subs.h b/sys/nfs/nfsm_subs.h
index 8533d529231d..b13c0099b816 100644
--- a/sys/nfs/nfsm_subs.h
+++ b/sys/nfs/nfsm_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsm_subs.h,v 1.25 1999/08/04 14:41:39 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h
index ecb4f058d52a..77ac7e329464 100644
--- a/sys/nfs/nfsmount.h
+++ b/sys/nfs/nfsmount.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsmount.h	8.3 (Berkeley) 3/30/95
- * $Id: nfsmount.h,v 1.14 1998/05/19 07:11:27 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index 49adeb21e5c7..3bc818ff2594 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.9 (Berkeley) 5/14/95
- * $Id: nfsnode.h,v 1.27 1998/11/13 02:39:09 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfsproto.h b/sys/nfs/nfsproto.h
index 665a187dd3b1..cbb2832704bd 100644
--- a/sys/nfs/nfsproto.h
+++ b/sys/nfs/nfsproto.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsproto.h  8.2 (Berkeley) 3/30/95
- * $Id: nfsproto.h,v 1.5 1998/05/31 19:00:19 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFSPROTO_H_
diff --git a/sys/nfs/nfsrtt.h b/sys/nfs/nfsrtt.h
index dd7ffae67719..447308633015 100644
--- a/sys/nfs/nfsrtt.h
+++ b/sys/nfs/nfsrtt.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrtt.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsrtt.h,v 1.8 1997/06/03 17:22:47 dfr Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfsrvcache.h b/sys/nfs/nfsrvcache.h
index a05ab31b2c30..eec5850bd381 100644
--- a/sys/nfs/nfsrvcache.h
+++ b/sys/nfs/nfsrvcache.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.3 (Berkeley) 3/30/95
- * $Id: nfsrvcache.h,v 1.10 1998/02/03 22:15:04 bde Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfsv2.h b/sys/nfs/nfsv2.h
index 6e5f2c55a22f..6f8f85e00d44 100644
--- a/sys/nfs/nfsv2.h
+++ b/sys/nfs/nfsv2.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsv2.h	8.1 (Berkeley) 6/10/93
- * $Id: nfsv2.h,v 1.7 1997/02/22 09:42:52 peter Exp $
+ * $FreeBSD$
  */
 
 #include <nfs/nfsproto.h>
diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h
index 59f64d547770..2ba78aead0f4 100644
--- a/sys/nfs/nqnfs.h
+++ b/sys/nfs/nqnfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nqnfs.h	8.3 (Berkeley) 3/30/95
- * $Id: nqnfs.h,v 1.17 1998/06/01 07:23:26 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/rpcv2.h b/sys/nfs/rpcv2.h
index 00afefed9542..525df093a42d 100644
--- a/sys/nfs/rpcv2.h
+++ b/sys/nfs/rpcv2.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rpcv2.h	8.2 (Berkeley) 3/30/95
- * $Id: rpcv2.h,v 1.8 1997/05/11 18:05:39 tegge Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/xdr_subs.h b/sys/nfs/xdr_subs.h
index bb60dd0aaa2b..82ee38ad491b 100644
--- a/sys/nfs/xdr_subs.h
+++ b/sys/nfs/xdr_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)xdr_subs.h	8.3 (Berkeley) 3/30/95
- * $Id: xdr_subs.h,v 1.11 1999/06/05 05:35:03 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c
index d91bf90bae35..32952484de43 100644
--- a/sys/nfsclient/bootp_subr.c
+++ b/sys/nfsclient/bootp_subr.c
@@ -1,4 +1,4 @@
-/*	$Id: bootp_subr.c,v 1.18 1998/12/07 21:58:43 archie Exp $	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
diff --git a/sys/nfsclient/krpc.h b/sys/nfsclient/krpc.h
index 0610e4a36740..6c889b57f77c 100644
--- a/sys/nfsclient/krpc.h
+++ b/sys/nfsclient/krpc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $	*/
-/*	$Id: krpc.h,v 1.4 1997/08/16 19:15:52 wollman Exp $	*/
+/* $FreeBSD$	*/
 
 #include <sys/cdefs.h>
 
diff --git a/sys/nfsclient/krpc_subr.c b/sys/nfsclient/krpc_subr.c
index fc232b9b74b9..2127d46a6d29 100644
--- a/sys/nfsclient/krpc_subr.c
+++ b/sys/nfsclient/krpc_subr.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $	*/
-/*	$Id: krpc_subr.c,v 1.11 1998/08/23 03:07:16 wollman Exp $	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index 6fd3a89efdaf..c0cd18fae776 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFS_H_
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 9d93fed1f9fe..1dad3c43512c 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_bio.c	8.9 (Berkeley) 3/30/95
- * $Id: nfs_bio.c,v 1.75 1999/08/12 18:04:39 dt Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index 004bdd2d966e..210dde6c5cca 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.49 1999/04/27 11:17:52 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c
index 77ebecbb3551..13ff9b2902a0 100644
--- a/sys/nfsclient/nfs_node.c
+++ b/sys/nfsclient/nfs_node.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_node.c	8.6 (Berkeley) 5/22/95
- * $Id: nfs_node.c,v 1.30 1999/06/15 23:24:14 mjacob Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 8949d7a32fd8..0059c5119ec1 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.52 1999/05/02 23:56:25 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 9ffb490e1cfb..d42c5ac645d9 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.80 1999/08/08 18:42:55 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index 89fe668f8563..3e90bdb58a89 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
- * $Id: nfs_vfsops.c,v 1.83 1999/04/10 18:53:29 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 0600c26dd178..f7250cc55c0f 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.138 1999/07/31 01:51:58 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 6fd3a89efdaf..c0cd18fae776 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFS_H_
diff --git a/sys/nfsclient/nfsdiskless.h b/sys/nfsclient/nfsdiskless.h
index f499a2c4baea..487e0bf65226 100644
--- a/sys/nfsclient/nfsdiskless.h
+++ b/sys/nfsclient/nfsdiskless.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsdiskless.h,v 1.9 1997/05/12 19:02:55 tegge Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/nfsm_subs.h b/sys/nfsclient/nfsm_subs.h
index 8533d529231d..b13c0099b816 100644
--- a/sys/nfsclient/nfsm_subs.h
+++ b/sys/nfsclient/nfsm_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsm_subs.h,v 1.25 1999/08/04 14:41:39 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h
index ecb4f058d52a..77ac7e329464 100644
--- a/sys/nfsclient/nfsmount.h
+++ b/sys/nfsclient/nfsmount.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsmount.h	8.3 (Berkeley) 3/30/95
- * $Id: nfsmount.h,v 1.14 1998/05/19 07:11:27 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index 49adeb21e5c7..3bc818ff2594 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.9 (Berkeley) 5/14/95
- * $Id: nfsnode.h,v 1.27 1998/11/13 02:39:09 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index 6fd3a89efdaf..c0cd18fae776 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFS_H_
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 6fd3a89efdaf..c0cd18fae776 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFS_H_
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index b5ee411d946b..a8ce893d8525 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c  8.8 (Berkeley) 7/31/95
- * $Id: nfs_serv.c,v 1.82 1999/07/28 08:20:49 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c
index b5adf4a74bd9..b866cbe67813 100644
--- a/sys/nfsserver/nfs_srvcache.c
+++ b/sys/nfsserver/nfs_srvcache.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_srvcache.c	8.3 (Berkeley) 3/30/95
- * $Id: nfs_srvcache.c,v 1.16 1998/02/09 06:10:36 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index 8949d7a32fd8..0059c5119ec1 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.52 1999/05/02 23:56:25 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 9ffb490e1cfb..d42c5ac645d9 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.80 1999/08/08 18:42:55 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index 004bdd2d966e..210dde6c5cca 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.49 1999/04/27 11:17:52 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
index 8533d529231d..b13c0099b816 100644
--- a/sys/nfsserver/nfsm_subs.h
+++ b/sys/nfsserver/nfsm_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsm_subs.h,v 1.25 1999/08/04 14:41:39 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsserver/nfsproto.h b/sys/nfsserver/nfsproto.h
index 665a187dd3b1..cbb2832704bd 100644
--- a/sys/nfsserver/nfsproto.h
+++ b/sys/nfsserver/nfsproto.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsproto.h  8.2 (Berkeley) 3/30/95
- * $Id: nfsproto.h,v 1.5 1998/05/31 19:00:19 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFSPROTO_H_
diff --git a/sys/nfsserver/nfsrvcache.h b/sys/nfsserver/nfsrvcache.h
index a05ab31b2c30..eec5850bd381 100644
--- a/sys/nfsserver/nfsrvcache.h
+++ b/sys/nfsserver/nfsrvcache.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.3 (Berkeley) 3/30/95
- * $Id: nfsrvcache.h,v 1.10 1998/02/03 22:15:04 bde Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index 6fd3a89efdaf..c0cd18fae776 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFS_H_
diff --git a/sys/ntfs/ntfs.h b/sys/ntfs/ntfs.h
index 657c97159d05..7aa65288a00c 100644
--- a/sys/ntfs/ntfs.h
+++ b/sys/ntfs/ntfs.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs.h,v 1.4 1999/04/20 21:06:41 semenu Exp $
+ * $FreeBSD$
  */
 
 /*#define NTFS_DEBUG 1*/
diff --git a/sys/ntfs/ntfs_compr.c b/sys/ntfs/ntfs_compr.c
index 953b4169d1f1..412047be2caa 100644
--- a/sys/ntfs/ntfs_compr.c
+++ b/sys/ntfs/ntfs_compr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_compr.c,v 1.4 1999/05/12 09:42:54 semenu Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ntfs/ntfs_compr.h b/sys/ntfs/ntfs_compr.h
index a79d3e239a26..bdec08cc3e78 100644
--- a/sys/ntfs/ntfs_compr.h
+++ b/sys/ntfs/ntfs_compr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_compr.h,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 #define NTFS_COMPBLOCK_SIZE	0x1000
diff --git a/sys/ntfs/ntfs_extern.h b/sys/ntfs/ntfs_extern.h
index 197adf11d9ef..9f714382c2ef 100644
--- a/sys/ntfs/ntfs_extern.h
+++ b/sys/ntfs/ntfs_extern.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_extern.h,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 struct sockaddr;
diff --git a/sys/ntfs/ntfs_ihash.c b/sys/ntfs/ntfs_ihash.c
index e79554527908..50ee7ac17353 100644
--- a/sys/ntfs/ntfs_ihash.c
+++ b/sys/ntfs/ntfs_ihash.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $Id: ntfs_ihash.c,v 1.4 1999/05/11 19:54:50 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ntfs/ntfs_ihash.h b/sys/ntfs/ntfs_ihash.h
index 1b9c3dcd48a0..16132a90f919 100644
--- a/sys/ntfs/ntfs_ihash.h
+++ b/sys/ntfs/ntfs_ihash.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_ihash.h,v 1.2 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 void ntfs_nthashinit __P((void));
diff --git a/sys/ntfs/ntfs_inode.h b/sys/ntfs/ntfs_inode.h
index 0b6f6a202b26..a61338552804 100644
--- a/sys/ntfs/ntfs_inode.h
+++ b/sys/ntfs/ntfs_inode.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_inode.h,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 /* These flags are kept in i_flag. */
diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c
index 46b45de3d1a9..b3e75b334d83 100644
--- a/sys/ntfs/ntfs_subr.c
+++ b/sys/ntfs/ntfs_subr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_subr.c,v 1.4 1999/05/12 09:43:01 semenu Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ntfs/ntfs_subr.h b/sys/ntfs/ntfs_subr.h
index ca5f45cd4632..f0b9a8a1df44 100644
--- a/sys/ntfs/ntfs_subr.h
+++ b/sys/ntfs/ntfs_subr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_subr.h,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 #define	VA_LOADED		0x0001
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index 44877bd2e5d6..183d5dcd03cd 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vfsops.c,v 1.9 1999/08/13 10:29:29 phk Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/ntfs/ntfs_vfsops.h b/sys/ntfs/ntfs_vfsops.h
index 015684c90311..d7f5f5d26a11 100644
--- a/sys/ntfs/ntfs_vfsops.h
+++ b/sys/ntfs/ntfs_vfsops.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vfsops.h,v 1.2 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 #define VG_DONTLOADIN	0x0001	/* Tells ntfs_vgetex to do not call */
 				/* ntfs_loadnode on ntnode, even if */
diff --git a/sys/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c
index fff9add0a322..578f8bf62dfb 100644
--- a/sys/ntfs/ntfs_vnops.c
+++ b/sys/ntfs/ntfs_vnops.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vnops.c,v 1.5 1999/05/12 09:43:06 semenu Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/ntfs/ntfsmount.h b/sys/ntfs/ntfsmount.h
index 1e6d322c7194..0a1f7918e383 100644
--- a/sys/ntfs/ntfsmount.h
+++ b/sys/ntfs/ntfsmount.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfsmount.h,v 1.3 1999/04/20 21:06:44 semenu Exp $
+ * $FreeBSD$
  */
 
 #define	NTFS_MFLAG_CASEINS	0x00000001
diff --git a/sys/pc98/boot/Makefile b/sys/pc98/boot/Makefile
index 4af81f7ab1f4..904c72fd7786 100644
--- a/sys/pc98/boot/Makefile
+++ b/sys/pc98/boot/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
   
 SUBDIR=	biosboot kzipboot netboot rawboot
 
diff --git a/sys/pc98/boot/Makefile.inc b/sys/pc98/boot/Makefile.inc
index 88916943ec96..a3603a63e939 100644
--- a/sys/pc98/boot/Makefile.inc
+++ b/sys/pc98/boot/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.3 1998/03/14 02:33:54 kato Exp $
+# $FreeBSD$
 
 BINDIR?=	/usr/mdec
 CFLAGS+=	-aout
diff --git a/sys/pc98/boot/biosboot/Makefile b/sys/pc98/boot/biosboot/Makefile
index 3a2640c950d3..925028d109ad 100644
--- a/sys/pc98/boot/biosboot/Makefile
+++ b/sys/pc98/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.21 1999/01/03 05:03:46 kato Exp $
+# $FreeBSD$
 #
 
 PROG=	boot
diff --git a/sys/pc98/boot/biosboot/README.386BSD b/sys/pc98/boot/biosboot/README.386BSD
index e9423ecc1fd5..3d7c09da5968 100644
--- a/sys/pc98/boot/biosboot/README.386BSD
+++ b/sys/pc98/boot/biosboot/README.386BSD
@@ -169,4 +169,4 @@ Before you do this ensure you have a booting floppy with correct
 disktab and bootblock files on it so that if it doesn't work, you can
 re-disklabel from the floppy.
 
-$Id: README.386BSD,v 1.10 1998/09/15 09:59:58 gibbs Exp $
+$FreeBSD$
diff --git a/sys/pc98/boot/biosboot/README.MACH b/sys/pc98/boot/biosboot/README.MACH
index e5562c096a88..73d090a404bd 100644
--- a/sys/pc98/boot/biosboot/README.MACH
+++ b/sys/pc98/boot/biosboot/README.MACH
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:33:55  rpd
- *	$Id: README.MACH,v 1.3 1997/02/22 09:43:02 peter Exp $
+ * $FreeBSD$
  */
 
 ********NOTE: This is not all relevant to the 386BSD version**********
diff --git a/sys/pc98/boot/biosboot/README.serial b/sys/pc98/boot/biosboot/README.serial
index bf47e6c4a470..7edcdeec060c 100644
--- a/sys/pc98/boot/biosboot/README.serial
+++ b/sys/pc98/boot/biosboot/README.serial
@@ -193,4 +193,4 @@ CAVEATS:
 	  from the new kernel.
 
 
-$Id: README.serial,v 1.5 1998/04/07 15:33:47 kato Exp $
+$FreeBSD$
diff --git a/sys/pc98/boot/biosboot/asm.S b/sys/pc98/boot/biosboot/asm.S
index 77a4b2f261d3..f14c7f55104c 100644
--- a/sys/pc98/boot/biosboot/asm.S
+++ b/sys/pc98/boot/biosboot/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- *	$Id: asm.S,v 1.3 1997/02/22 09:43:03 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/pc98/boot/biosboot/asm.h b/sys/pc98/boot/biosboot/asm.h
index b90bbcebf158..6f4bcc39e52d 100644
--- a/sys/pc98/boot/biosboot/asm.h
+++ b/sys/pc98/boot/biosboot/asm.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- *	$Id$
+ * $FreeBSD$
  */
 
 #define S_ARG0	 4(%esp)
diff --git a/sys/pc98/boot/biosboot/bios.S b/sys/pc98/boot/biosboot/bios.S
index 2d456512c1e0..88d9506c46b4 100644
--- a/sys/pc98/boot/biosboot/bios.S
+++ b/sys/pc98/boot/biosboot/bios.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: bios.S,v 1.8 1997/07/13 12:13:01 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/boot.c b/sys/pc98/boot/biosboot/boot.c
index 5de351fe8229..c225bd35bda3 100644
--- a/sys/pc98/boot/biosboot/boot.c
+++ b/sys/pc98/boot/biosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.18 1998/10/05 07:58:05 kato Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/pc98/boot/biosboot/boot.h b/sys/pc98/boot/biosboot/boot.h
index 32941f9ea418..4e32192eebc6 100644
--- a/sys/pc98/boot/biosboot/boot.h
+++ b/sys/pc98/boot/biosboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id: boot.h,v 1.13 1997/12/05 11:50:39 kato Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/boot/biosboot/disk.c b/sys/pc98/boot/biosboot/disk.c
index 0d38ebce98c9..ad9d3ff74d88 100644
--- a/sys/pc98/boot/biosboot/disk.c
+++ b/sys/pc98/boot/biosboot/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- *	$Id: disk.c,v 1.8 1997/02/22 09:43:07 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/io.c b/sys/pc98/boot/biosboot/io.c
index 0e4b6f3f30b9..3b540dd1c892 100644
--- a/sys/pc98/boot/biosboot/io.c
+++ b/sys/pc98/boot/biosboot/io.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- *	$Id: io.c,v 1.12 1997/07/13 12:13:02 kato Exp $
+ * $FreeBSD$
  */
 
 #include "boot.h"
diff --git a/sys/pc98/boot/biosboot/serial.S b/sys/pc98/boot/biosboot/serial.S
index 2cc22465fe79..f2df31aec6cf 100644
--- a/sys/pc98/boot/biosboot/serial.S
+++ b/sys/pc98/boot/biosboot/serial.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: serial.S,v 1.7 1998/01/02 09:29:15 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/start.S b/sys/pc98/boot/biosboot/start.S
index 013a40b142ec..a7e69355d621 100644
--- a/sys/pc98/boot/biosboot/start.S
+++ b/sys/pc98/boot/biosboot/start.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:29  rpd
- *	$Id: start.S,v 1.5 1998/05/02 02:06:07 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/sys.c b/sys/pc98/boot/biosboot/sys.c
index ab70bbe0dbfe..1b138b36d479 100644
--- a/sys/pc98/boot/biosboot/sys.c
+++ b/sys/pc98/boot/biosboot/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- *	$Id: sys.c,v 1.14 1998/04/12 04:48:11 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/table.c b/sys/pc98/boot/biosboot/table.c
index 4542942b7964..81dc130a0314 100644
--- a/sys/pc98/boot/biosboot/table.c
+++ b/sys/pc98/boot/biosboot/table.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- *	$Id: table.c,v 1.7 1998/09/15 14:08:34 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/boot/kzipboot/Makefile b/sys/pc98/boot/kzipboot/Makefile
index beb70a5e56cc..6bf04e18bdde 100644
--- a/sys/pc98/boot/kzipboot/Makefile
+++ b/sys/pc98/boot/kzipboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 1998/05/28 13:48:40 kato Exp $
+# $FreeBSD$
 
 PROG= kztail.o kzhead.o
 BINMODE = 444	# target is a relocatable object
diff --git a/sys/pc98/boot/netboot/3c509.c b/sys/pc98/boot/netboot/3c509.c
index adf721c3ec19..accc948c6b4f 100644
--- a/sys/pc98/boot/netboot/3c509.c
+++ b/sys/pc98/boot/netboot/3c509.c
@@ -18,7 +18,7 @@ Author: Martin Renters.
 
 3c509 support added by Serge Babkin (babkin@hq.icb.chel.su)
 
-$Id$
+$FreeBSD$
 
 ***************************************************************************/
 
diff --git a/sys/pc98/boot/rawboot/Makefile b/sys/pc98/boot/rawboot/Makefile
index 7aafe0de65fd..be5f4cab8f79 100644
--- a/sys/pc98/boot/rawboot/Makefile
+++ b/sys/pc98/boot/rawboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1998/03/30 12:24:12 kato Exp $
+# $FreeBSD$
 #
 
 PROG=	boot
diff --git a/sys/pc98/cbus/cbus.h b/sys/pc98/cbus/cbus.h
index 50abf6975043..e148441fb84e 100644
--- a/sys/pc98/cbus/cbus.h
+++ b/sys/pc98/cbus/cbus.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: pc98.h,v 1.10 1997/02/22 09:43:42 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PC98_PC98_PC98_H_
diff --git a/sys/pc98/cbus/cbus_dma.c b/sys/pc98/cbus/cbus_dma.c
index 9bf92aeb2cd0..10573944d479 100644
--- a/sys/pc98/cbus/cbus_dma.c
+++ b/sys/pc98/cbus/cbus_dma.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa_dma.c,v 1.3 1999/05/10 09:09:08 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index eb9636363b10..ba644841a9e4 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.74 1999/07/30 11:43:10 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index feae60901435..267eefc4864a 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.68 1999/08/14 11:40:47 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pc98/cbus/fdcreg.h b/sys/pc98/cbus/fdcreg.h
index b02fc4f1e7e5..ae95cf283885 100644
--- a/sys/pc98/cbus/fdcreg.h
+++ b/sys/pc98/cbus/fdcreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: fdreg.h,v 1.4 1997/02/22 09:43:34 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c
index 4702090d54c7..64da30263823 100644
--- a/sys/pc98/cbus/gdc.c
+++ b/sys/pc98/cbus/gdc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pc98gdc.c,v 1.10 1999/06/24 10:51:29 kato Exp $
+ * $FreeBSD$
  */
 
 #include "gdc.h"
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index fd3529128419..cb4b8d03b865 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: olpt.c,v 1.2 1999/07/06 19:23:20 des Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c
index bcc707768b38..bbd10a477add 100644
--- a/sys/pc98/cbus/pckbd.c
+++ b/sys/pc98/cbus/pckbd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pc98kbd.c,v 1.9 1999/08/23 13:50:08 kato Exp $
+ * $FreeBSD$
  */
 
 #include "pckbd.h"
diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c
index eb9636363b10..ba644841a9e4 100644
--- a/sys/pc98/cbus/pcrtc.c
+++ b/sys/pc98/cbus/pcrtc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.74 1999/07/30 11:43:10 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/cbus/ppc.c b/sys/pc98/cbus/ppc.c
index e21d8413f3d0..266c01540484 100644
--- a/sys/pc98/cbus/ppc.c
+++ b/sys/pc98/cbus/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  *
  */
 #include "ppc.h"
diff --git a/sys/pc98/cbus/ppcreg.h b/sys/pc98/cbus/ppcreg.h
index 3acbbf62cdf5..4e85f41cb95d 100644
--- a/sys/pc98/cbus/ppcreg.h
+++ b/sys/pc98/cbus/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/pc98/cbus/sc_machdep.h b/sys/pc98/cbus/sc_machdep.h
index e48c5e2209ab..be8419f2df02 100644
--- a/sys/pc98/cbus/sc_machdep.h
+++ b/sys/pc98/cbus/sc_machdep.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: sc_machdep.h,v 1.1 1999/06/24 10:51:31 kato Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PC98_PC98_SC_MACHDEP_H_
diff --git a/sys/pc98/cbus/scgdcrndr.c b/sys/pc98/cbus/scgdcrndr.c
index 68730e5f151a..ba28a7022de2 100644
--- a/sys/pc98/cbus/scgdcrndr.c
+++ b/sys/pc98/cbus/scgdcrndr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scgdcrndr.c,v 1.1 1999/06/24 10:51:32 kato Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/pc98/cbus/scvtb.c b/sys/pc98/cbus/scvtb.c
index 2f6f49dbb407..6be4a99cb09f 100644
--- a/sys/pc98/cbus/scvtb.c
+++ b/sys/pc98/cbus/scvtb.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvtbpc98.c,v 1.2 1999/06/24 14:03:07 kato Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 857bd2b1c8c1..565b27ddcde4 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.102 1999/08/17 04:33:11 nyan Exp $
+ * $FreeBSD$
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
diff --git a/sys/pc98/cbus/syscons_cbus.c b/sys/pc98/cbus/syscons_cbus.c
index 51d0917d6788..8bf43db127db 100644
--- a/sys/pc98/cbus/syscons_cbus.c
+++ b/sys/pc98/cbus/syscons_cbus.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: syscons_pc98.c,v 1.3 1999/07/03 08:50:45 kato Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 1c47ba7ac6f7..05c3b8bf2eb9 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC98,v 1.83 1999/08/15 09:38:21 phk Exp $
+# $FreeBSD$
 
 # GENERIC98 -- Generic PC98 machine with WD/SCSI disks
 
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index 1c47ba7ac6f7..05c3b8bf2eb9 100644
--- a/sys/pc98/conf/GENERIC98
+++ b/sys/pc98/conf/GENERIC98
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC98,v 1.83 1999/08/15 09:38:21 phk Exp $
+# $FreeBSD$
 
 # GENERIC98 -- Generic PC98 machine with WD/SCSI disks
 
diff --git a/sys/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98
index 8740d2398e81..48492d5fc6ea 100644
--- a/sys/pc98/conf/Makefile.pc98
+++ b/sys/pc98/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.pc98,v 1.66 1999/07/03 08:17:40 kato Exp $
+# $FreeBSD$
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/pc98/conf/devices.pc98 b/sys/pc98/conf/devices.pc98
index 0de2c6f1cc87..0e3045546c93 100644
--- a/sys/pc98/conf/devices.pc98
+++ b/sys/pc98/conf/devices.pc98
@@ -1,6 +1,6 @@
 # This file tells what major numbers the various possible swap devices have.
 #
-#	$Id: devices.pc98,v 1.7 1998/12/30 07:51:20 kato Exp $
+# $FreeBSD$
 #
 wd	0
 wfd	1
diff --git a/sys/pc98/conf/files.pc98 b/sys/pc98/conf/files.pc98
index 359b379f4030..84d3f62a989b 100644
--- a/sys/pc98/conf/files.pc98
+++ b/sys/pc98/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-#	$Id: files.pc98,v 1.105 1999/08/09 10:34:59 phk Exp $
+# $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/pc98/conf/majors.pc98 b/sys/pc98/conf/majors.pc98
index 50265b21d206..7d56998aa189 100644
--- a/sys/pc98/conf/majors.pc98
+++ b/sys/pc98/conf/majors.pc98
@@ -1,4 +1,4 @@
-$Id: majors.pc98,v 1.62 1999/08/08 11:12:51 kato Exp $
+$FreeBSD$
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98
index 3c46c2decce3..9906c9b413eb 100644
--- a/sys/pc98/conf/options.pc98
+++ b/sys/pc98/conf/options.pc98
@@ -1,4 +1,4 @@
-#	$Id: options.pc98,v 1.92 1999/08/08 11:13:47 kato Exp $
+# $FreeBSD$
 
 DISABLE_PSE
 IDE_DELAY
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index 52f786f19c6c..939e2289b29e 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.129 1999/08/09 10:35:00 phk Exp $
+ * $FreeBSD$
  */
 
 #include "apm.h"
diff --git a/sys/pc98/i386/userconfig.c b/sys/pc98/i386/userconfig.c
index c52b97a6141b..b2859eaf14d7 100644
--- a/sys/pc98/i386/userconfig.c
+++ b/sys/pc98/i386/userconfig.c
@@ -46,7 +46,7 @@
  ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **
- **      $Id: userconfig.c,v 1.87 1999/08/10 08:35:57 kato Exp $
+ ** $FreeBSD$
  **/
 
 /**
@@ -2561,7 +2561,7 @@ visuserconfig(void)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: userconfig.c,v 1.87 1999/08/10 08:35:57 kato Exp $
+ * $FreeBSD$
  */
 
 #include "scbus.h"
diff --git a/sys/pc98/pc98/atcompat_diskslice.c b/sys/pc98/pc98/atcompat_diskslice.c
index b2c1d38a4bb4..ee18554b8ce7 100644
--- a/sys/pc98/pc98/atcompat_diskslice.c
+++ b/sys/pc98/pc98/atcompat_diskslice.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: atcompat_diskslice.c,v 1.16 1999/06/26 02:47:14 mckusick Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c
index eb9636363b10..ba644841a9e4 100644
--- a/sys/pc98/pc98/clock.c
+++ b/sys/pc98/pc98/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.74 1999/07/30 11:43:10 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c
index 3841c814c72e..1bc1e7653adc 100644
--- a/sys/pc98/pc98/diskslice_machdep.c
+++ b/sys/pc98/pc98/diskslice_machdep.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: diskslice_machdep.c,v 1.21 1999/08/08 10:06:27 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index feae60901435..267eefc4864a 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.68 1999/08/14 11:40:47 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pc98/pc98/fdreg.h b/sys/pc98/pc98/fdreg.h
index b02fc4f1e7e5..ae95cf283885 100644
--- a/sys/pc98/pc98/fdreg.h
+++ b/sys/pc98/pc98/fdreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: fdreg.h,v 1.4 1997/02/22 09:43:34 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/if_ed.c b/sys/pc98/pc98/if_ed.c
index 53aad1eeb495..2f8d4a29bcf7 100644
--- a/sys/pc98/pc98/if_ed.c
+++ b/sys/pc98/pc98/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.66 1999/08/10 12:55:06 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/if_ed98.h b/sys/pc98/pc98/if_ed98.h
index a7e4a0510f08..44b77f41de88 100644
--- a/sys/pc98/pc98/if_ed98.h
+++ b/sys/pc98/pc98/if_ed98.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * 	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/isa_dma.c b/sys/pc98/pc98/isa_dma.c
index 9bf92aeb2cd0..10573944d479 100644
--- a/sys/pc98/pc98/isa_dma.c
+++ b/sys/pc98/pc98/isa_dma.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa_dma.c,v 1.3 1999/05/10 09:09:08 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 52f786f19c6c..939e2289b29e 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.129 1999/08/09 10:35:00 phk Exp $
+ * $FreeBSD$
  */
 
 #include "apm.h"
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index b82d1d37bfde..23ce0f88e668 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.22 1999/05/31 11:28:36 phk Exp $
+ * $FreeBSD$
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/pc98/pc98/npx.c b/sys/pc98/pc98/npx.c
index d44207eba142..786b01780538 100644
--- a/sys/pc98/pc98/npx.c
+++ b/sys/pc98/pc98/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.49 1999/07/26 12:22:41 kato Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/pc98/pc98/olpt.c b/sys/pc98/pc98/olpt.c
index fd3529128419..cb4b8d03b865 100644
--- a/sys/pc98/pc98/olpt.c
+++ b/sys/pc98/pc98/olpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: olpt.c,v 1.2 1999/07/06 19:23:20 des Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/pc98.c b/sys/pc98/pc98/pc98.c
index b7d96a10e299..8517f9723bb8 100644
--- a/sys/pc98/pc98/pc98.c
+++ b/sys/pc98/pc98/pc98.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: pc98.c,v 1.55 1998/12/02 08:04:12 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/pc98.h b/sys/pc98/pc98/pc98.h
index 50abf6975043..e148441fb84e 100644
--- a/sys/pc98/pc98/pc98.h
+++ b/sys/pc98/pc98/pc98.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: pc98.h,v 1.10 1997/02/22 09:43:42 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PC98_PC98_PC98_H_
diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c
index 4702090d54c7..64da30263823 100644
--- a/sys/pc98/pc98/pc98gdc.c
+++ b/sys/pc98/pc98/pc98gdc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pc98gdc.c,v 1.10 1999/06/24 10:51:29 kato Exp $
+ * $FreeBSD$
  */
 
 #include "gdc.h"
diff --git a/sys/pc98/pc98/pc98kbd.c b/sys/pc98/pc98/pc98kbd.c
index bcc707768b38..bbd10a477add 100644
--- a/sys/pc98/pc98/pc98kbd.c
+++ b/sys/pc98/pc98/pc98kbd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pc98kbd.c,v 1.9 1999/08/23 13:50:08 kato Exp $
+ * $FreeBSD$
  */
 
 #include "pckbd.h"
diff --git a/sys/pc98/pc98/pcaudio.c b/sys/pc98/pc98/pcaudio.c
index 5c8dbf27a1fc..e6181d93ef1b 100644
--- a/sys/pc98/pc98/pcaudio.c
+++ b/sys/pc98/pc98/pcaudio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pcaudio.c,v 1.24 1999/05/31 11:28:38 phk Exp $
+ * $FreeBSD$
  */
 
 #include "pca.h"
diff --git a/sys/pc98/pc98/ppc.c b/sys/pc98/pc98/ppc.c
index e21d8413f3d0..266c01540484 100644
--- a/sys/pc98/pc98/ppc.c
+++ b/sys/pc98/pc98/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  *
  */
 #include "ppc.h"
diff --git a/sys/pc98/pc98/ppcreg.h b/sys/pc98/pc98/ppcreg.h
index 3acbbf62cdf5..4e85f41cb95d 100644
--- a/sys/pc98/pc98/ppcreg.h
+++ b/sys/pc98/pc98/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/pc98/pc98/sc_machdep.h b/sys/pc98/pc98/sc_machdep.h
index e48c5e2209ab..be8419f2df02 100644
--- a/sys/pc98/pc98/sc_machdep.h
+++ b/sys/pc98/pc98/sc_machdep.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: sc_machdep.h,v 1.1 1999/06/24 10:51:31 kato Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PC98_PC98_SC_MACHDEP_H_
diff --git a/sys/pc98/pc98/scgdcrndr.c b/sys/pc98/pc98/scgdcrndr.c
index 68730e5f151a..ba28a7022de2 100644
--- a/sys/pc98/pc98/scgdcrndr.c
+++ b/sys/pc98/pc98/scgdcrndr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scgdcrndr.c,v 1.1 1999/06/24 10:51:32 kato Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/pc98/pc98/scvtbpc98.c b/sys/pc98/pc98/scvtbpc98.c
index 2f6f49dbb407..6be4a99cb09f 100644
--- a/sys/pc98/pc98/scvtbpc98.c
+++ b/sys/pc98/pc98/scvtbpc98.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvtbpc98.c,v 1.2 1999/06/24 14:03:07 kato Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 857bd2b1c8c1..565b27ddcde4 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.102 1999/08/17 04:33:11 nyan Exp $
+ * $FreeBSD$
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c
index 44b2dd67d19a..1d1318862539 100644
--- a/sys/pc98/pc98/spkr.c
+++ b/sys/pc98/pc98/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.17 1999/08/18 08:24:35 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index 85a547c1fd2a..c3fb5b180484 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.127 1999/08/27 07:26:25 julian Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/pc98/pc98/syscons_pc98.c b/sys/pc98/pc98/syscons_pc98.c
index 51d0917d6788..8bf43db127db 100644
--- a/sys/pc98/pc98/syscons_pc98.c
+++ b/sys/pc98/pc98/syscons_pc98.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: syscons_pc98.c,v 1.3 1999/07/03 08:50:45 kato Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index 1c20cb6fc6b5..4f118d04972d 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.86 1999/08/14 11:40:47 phk Exp $
+ * $FreeBSD$
  */
 
 /* TODO:
diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c
index 865f82bae6a2..72412a931331 100644
--- a/sys/pc98/pc98/wd_cd.c
+++ b/sys/pc98/pc98/wd_cd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.c,v 1.20 1999/05/31 11:25:51 phk Exp $
+ * $FreeBSD$
  */
 
 #include "wdc.h"
diff --git a/sys/pc98/pc98/wfd.c b/sys/pc98/pc98/wfd.c
index a089527fa1ea..f7837d7407bf 100644
--- a/sys/pc98/pc98/wfd.c
+++ b/sys/pc98/pc98/wfd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: wfd.c,v 1.27 1999/08/14 11:40:41 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c
index 7337796969a5..5dae30e4e97a 100644
--- a/sys/pc98/pc98/wst.c
+++ b/sys/pc98/pc98/wst.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: wst.c,v 1.23 1999/05/31 11:26:39 phk Exp $
+ * $FreeBSD$
  */
 
 #include "wdc.h"
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index 07be6c1c21ea..6497ce4c5044 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pccard.c,v 1.81 1999/08/01 18:12:50 imp Exp $
+ * $FreeBSD$
  */
 
 #include "opt_pcic.h"
diff --git a/sys/pccard/pcic.h b/sys/pccard/pcic.h
index 34ae30c7c543..5988089d43cd 100644
--- a/sys/pccard/pcic.h
+++ b/sys/pccard/pcic.h
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic.h,v 1.0 1999/02/26 20:52:54 roger Exp $ 
+ * $FreeBSD$ 
 */
 
 int register_pcic_intr(int intr, int device_id, u_int flags,
diff --git a/sys/pccard/pcic_pci.c b/sys/pccard/pcic_pci.c
index e596a75fbce4..5b23c5e57c27 100644
--- a/sys/pccard/pcic_pci.c
+++ b/sys/pccard/pcic_pci.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic_p.c,v 1.12 1999/05/09 17:07:11 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pccard/pcic_pci.h b/sys/pccard/pcic_pci.h
index 47934f3d02a9..bd8e06c79e45 100644
--- a/sys/pccard/pcic_pci.h
+++ b/sys/pccard/pcic_pci.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic_p.h,v 1.5 1999/04/01 15:28:10 nsayer Exp $
+ * $FreeBSD$
  */
 
 /* PCI/CardBus Device IDs */
diff --git a/sys/pci/adv_pci.c b/sys/pci/adv_pci.c
index 1ca2cee1e597..8f8fc58f374b 100644
--- a/sys/pci/adv_pci.c
+++ b/sys/pci/adv_pci.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_pci.c,v 1.7 1999/07/03 20:16:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/adw_pci.c b/sys/pci/adw_pci.c
index 650978630545..10eda815814a 100644
--- a/sys/pci/adw_pci.c
+++ b/sys/pci/adw_pci.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adw_pci.c,v 1.6 1999/07/03 20:16:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/ahc_pci.c b/sys/pci/ahc_pci.c
index 54f429f9bab5..64fcbd53c8f6 100644
--- a/sys/pci/ahc_pci.c
+++ b/sys/pci/ahc_pci.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_pci.c,v 1.17 1999/08/16 02:33:46 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index 4f98d1a44299..ff4c5d3fb435 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpm.c,v 1.5 1999/07/03 20:17:00 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pci/brktree_reg.h b/sys/pci/brktree_reg.h
index ab34cec12cd6..643d3f353f58 100644
--- a/sys/pci/brktree_reg.h
+++ b/sys/pci/brktree_reg.h
@@ -30,7 +30,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: brktree_reg.h,v 1.29 1999/06/12 14:54:56 roger Exp $
+ * $FreeBSD$
  */
 #ifndef PCI_LATENCY_TIMER
 #define	PCI_LATENCY_TIMER		0x0c	/* pci timer register */
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index 27b73d013a7d..46cf72e121e6 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.89 1999/07/12 15:51:48 roger Exp $ */
+/* $FreeBSD$ */
 /* BT848 Driver for Brooktree's Bt848, Bt848A, Bt849A, Bt878, Bt879 based cards.
    The Brooktree  BT848 Driver driver is based upon Mark Tinguely and
    Jim Lowe's driver for the Matrox Meteor PCI card . The 
diff --git a/sys/pci/bt848_i2c.c b/sys/pci/bt848_i2c.c
index a3a1fdd737da..5e4ecc9a8f29 100644
--- a/sys/pci/bt848_i2c.c
+++ b/sys/pci/bt848_i2c.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt848_i2c.c,v 1.5 1999/07/03 20:17:01 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pci/bt848_i2c.h b/sys/pci/bt848_i2c.h
index c7d22c50484e..075e9885ae5d 100644
--- a/sys/pci/bt848_i2c.h
+++ b/sys/pci/bt848_i2c.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  *
  */
 #ifndef _BT848_I2C_H
diff --git a/sys/pci/bt_pci.c b/sys/pci/bt_pci.c
index 5aa884444497..154a2f2febc3 100644
--- a/sys/pci/bt_pci.c
+++ b/sys/pci/bt_pci.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_pci.c,v 1.8 1999/07/03 20:17:01 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/cy_pci.c b/sys/pci/cy_pci.c
index 61848c3213de..71e16953af7a 100644
--- a/sys/pci/cy_pci.c
+++ b/sys/pci/cy_pci.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cy_pci.c,v 1.15 1999/05/10 10:23:38 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/cy_pcireg.h b/sys/pci/cy_pcireg.h
index 150dc54ae57d..707c4db62fec 100644
--- a/sys/pci/cy_pcireg.h
+++ b/sys/pci/cy_pcireg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cy_pcireg.h,v 1.5 1999/01/11 23:43:54 bde Exp $
+ * $FreeBSD$
  */
 
 #define CY_PCI_BASE_ADDR0		0x10
diff --git a/sys/pci/dpt_pci.c b/sys/pci/dpt_pci.c
index 3828d08b6cb0..9df90db97c00 100644
--- a/sys/pci/dpt_pci.c
+++ b/sys/pci/dpt_pci.c
@@ -32,7 +32,7 @@
  *  dptpci.c:  PCI Bus Attachment for DPT SCSI HBAs
  */
 
-#ident "$Id: dpt_pci.c,v 1.14 1999/08/16 01:52:20 gibbs Exp $"
+#ident "$FreeBSD$"
 
 #include "opt_dpt.h"
 
diff --git a/sys/pci/dpt_pci.h b/sys/pci/dpt_pci.h
index 4db7bf985f57..fe7206a1882d 100644
--- a/sys/pci/dpt_pci.h
+++ b/sys/pci/dpt_pci.h
@@ -28,7 +28,7 @@
  *
  */
 
-#ident "$Id: dpt_pci.h,v 1.3 1997/10/02 04:25:30 ShimonR Exp $"
+#ident "$FreeBSD$"
 
 #define DPT_VENDOR_ID             0x00001044
 #define DPT_DEVICE_ID             0x0000a400
diff --git a/sys/pci/es1370.c b/sys/pci/es1370.c
index dff26f8fb6a7..d1370aa08f54 100644
--- a/sys/pci/es1370.c
+++ b/sys/pci/es1370.c
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: es1370.c,v 1.5 1999/06/15 00:00:10 newton Exp $
+ * $FreeBSD$
  */
 
 #include "pcm.h"
diff --git a/sys/pci/es1370_reg.h b/sys/pci/es1370_reg.h
index 72546c61449a..a1adc354be7b 100644
--- a/sys/pci/es1370_reg.h
+++ b/sys/pci/es1370_reg.h
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _ES1370_REG_H
diff --git a/sys/pci/ida_pci.c b/sys/pci/ida_pci.c
index 330ce7ca1941..70007fb87d43 100644
--- a/sys/pci/ida_pci.c
+++ b/sys/pci/ida_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ida_pci.c,v 1.3 1999/07/29 01:03:02 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c
index d71bfcc4f548..9870df27ff55 100644
--- a/sys/pci/ide_pci.c
+++ b/sys/pci/ide_pci.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ide_pci.c,v 1.38 1999/07/22 19:45:33 julian Exp $
+ * $FreeBSD$
  */
 
 #include "wd.h"
diff --git a/sys/pci/ide_pcireg.h b/sys/pci/ide_pcireg.h
index 769645f33134..1f1c540be300 100644
--- a/sys/pci/ide_pcireg.h
+++ b/sys/pci/ide_pcireg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: wd82371reg.h,v 1.3 1997/02/22 09:44:15 peter Exp $
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _PCI_IDEPCIREG_H_
diff --git a/sys/pci/if_al.c b/sys/pci/if_al.c
index 05ea4176fa9b..5d07973947af 100644
--- a/sys/pci/if_al.c
+++ b/sys/pci/if_al.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_al.c,v 1.8 1999/08/21 22:10:48 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -91,7 +91,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_al.c,v 1.8 1999/08/21 22:10:48 msmith Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_alreg.h b/sys/pci/if_alreg.h
index 6d8e354779f1..2af519bd35cb 100644
--- a/sys/pci/if_alreg.h
+++ b/sys/pci/if_alreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_alreg.h,v 1.1 1999/05/21 04:37:24 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_ax.c b/sys/pci/if_ax.c
index e9612ee3e220..da6637f53241 100644
--- a/sys/pci/if_ax.c
+++ b/sys/pci/if_ax.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ax.c,v 1.11 1999/07/06 19:23:22 des Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -90,7 +90,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_ax.c,v 1.11 1999/07/06 19:23:22 des Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_axreg.h b/sys/pci/if_axreg.h
index 0e17fa5aa72f..669234a80757 100644
--- a/sys/pci/if_axreg.h
+++ b/sys/pci/if_axreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_axreg.h,v 1.6 1999/05/06 15:32:43 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_ed_p.c b/sys/pci/if_ed_p.c
index 5f9d2682061a..023457e37c33 100644
--- a/sys/pci/if_ed_p.c
+++ b/sys/pci/if_ed_p.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_ed_p.c,v 1.16 1999/05/09 17:06:52 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/if_fpa.c b/sys/pci/if_fpa.c
index 7d816b8c8075..d70628a9e708 100644
--- a/sys/pci/if_fpa.c
+++ b/sys/pci/if_fpa.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fpa.c,v 1.11 1999/08/21 06:24:34 msmith Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c
index 724668c1a328..ee97515fc158 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/if_fxp.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.69 1999/05/09 10:45:54 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_fxpreg.h b/sys/pci/if_fxpreg.h
index d6db196244d7..e593608f0c3b 100644
--- a/sys/pci/if_fxpreg.h
+++ b/sys/pci/if_fxpreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxpreg.h,v 1.14 1999/02/11 21:47:10 julian Exp $
+ * $FreeBSD$
  */
 
 #define FXP_VENDORID_INTEL	0x8086
diff --git a/sys/pci/if_fxpvar.h b/sys/pci/if_fxpvar.h
index 042d2df96284..7c4717db941e 100644
--- a/sys/pci/if_fxpvar.h
+++ b/sys/pci/if_fxpvar.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxpvar.h,v 1.6 1998/08/02 00:29:15 dg Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_lnc_p.c b/sys/pci/if_lnc_p.c
index c92ffc083bc7..33c7212295ee 100644
--- a/sys/pci/if_lnc_p.c
+++ b/sys/pci/if_lnc_p.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_lnc_p.c,v 1.11 1999/07/03 20:17:04 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/if_mx.c b/sys/pci/if_mx.c
index 5dca10c5bc58..a6fbdb4486cf 100644
--- a/sys/pci/if_mx.c
+++ b/sys/pci/if_mx.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_mx.c,v 1.21 1999/07/06 19:23:26 des Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_mx.c,v 1.21 1999/07/06 19:23:26 des Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_mxreg.h b/sys/pci/if_mxreg.h
index 5755826ee512..c19e8911f365 100644
--- a/sys/pci/if_mxreg.h
+++ b/sys/pci/if_mxreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_mxreg.h,v 1.7 1999/05/28 18:43:14 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_pn.c b/sys/pci/if_pn.c
index 02d5a4802cf6..c3744dbe4058 100644
--- a/sys/pci/if_pn.c
+++ b/sys/pci/if_pn.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_pn.c,v 1.24 1999/07/28 02:19:51 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -105,7 +105,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_pn.c,v 1.24 1999/07/28 02:19:51 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_pnreg.h b/sys/pci/if_pnreg.h
index 70723530802d..0c567d0178d7 100644
--- a/sys/pci/if_pnreg.h
+++ b/sys/pci/if_pnreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_pnreg.h,v 1.15 1999/07/28 02:19:52 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 223f8784c4d9..657aabbf88fe 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_rl.c,v 1.21 1999/08/21 06:24:35 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -128,7 +128,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_rl.c,v 1.21 1999/08/21 06:24:35 msmith Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_rlreg.h b/sys/pci/if_rlreg.h
index f064ef6cd2f5..5eff4a42b2ba 100644
--- a/sys/pci/if_rlreg.h
+++ b/sys/pci/if_rlreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_rlreg.h,v 1.10 1999/07/22 20:56:49 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index e4de7e6956db..9a79c2635291 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_sf.c,v 1.12 1999/07/25 05:10:18 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -119,7 +119,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_sf.c,v 1.12 1999/07/25 05:10:18 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 static struct sf_type sf_devs[] = {
diff --git a/sys/pci/if_sfreg.h b/sys/pci/if_sfreg.h
index 4ead87013a32..e5149aef95b2 100644
--- a/sys/pci/if_sfreg.h
+++ b/sys/pci/if_sfreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_sfreg.h,v 1.4 1999/07/21 03:44:25 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index aee546f554bb..4038967091a8 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_sk.c,v 1.51 1999/07/14 21:48:19 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -102,7 +102,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_sk.c,v 1.51 1999/07/14 21:48:19 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 static struct sk_type sk_devs[] = {
diff --git a/sys/pci/if_skreg.h b/sys/pci/if_skreg.h
index f03aeff36705..b0eaa90fce6c 100644
--- a/sys/pci/if_skreg.h
+++ b/sys/pci/if_skreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_skreg.h,v 1.5 1999/07/23 02:06:56 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_sr_p.c b/sys/pci/if_sr_p.c
index 260f5ef0c5d0..04d0db82c418 100644
--- a/sys/pci/if_sr_p.c
+++ b/sys/pci/if_sr_p.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr_p.c,v 1.9 1999/05/09 17:06:59 peter Exp $
+ * $FreeBSD$
  */
 
 #include "sr.h"
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 6b5bfd4d0e42..d8085782feb3 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ste.c,v 1.1 1999/08/21 18:34:44 wpaul Exp $
+ * $FreeBSD$
  */
 
 
@@ -82,7 +82,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_ste.c,v 1.1 1999/08/21 18:34:44 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_stereg.h b/sys/pci/if_stereg.h
index 78bc215c002f..4fe1a0f85de2 100644
--- a/sys/pci/if_stereg.h
+++ b/sys/pci/if_stereg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_stereg.h,v 1.1 1999/08/21 18:34:45 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index c83deefacdd5..5195324852b4 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ti.c,v 1.14 1999/07/27 13:54:15 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -131,7 +131,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_ti.c,v 1.14 1999/07/27 13:54:15 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_tireg.h b/sys/pci/if_tireg.h
index 09b198230eba..36bbaddff5ad 100644
--- a/sys/pci/if_tireg.h
+++ b/sys/pci/if_tireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_tireg.h,v 1.8 1999/07/23 18:46:24 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index bfa0e3db1c5c..80fc4aad8a0d 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_tl.c,v 1.37 1999/07/23 02:06:56 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -227,7 +227,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_tl.c,v 1.37 1999/07/23 02:06:56 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_tlreg.h b/sys/pci/if_tlreg.h
index e9ef74dfede7..b06f5e9a94cb 100644
--- a/sys/pci/if_tlreg.h
+++ b/sys/pci/if_tlreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_tlreg.h,v 1.12 1999/07/23 02:17:59 wpaul Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index b7cdc5d3c4c9..6830e10690c7 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.30 1999/08/21 06:24:35 msmith Exp $ */
+/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
diff --git a/sys/pci/if_txvar.h b/sys/pci/if_txvar.h
index 5d0d89570d7d..5efe056267f1 100644
--- a/sys/pci/if_txvar.h
+++ b/sys/pci/if_txvar.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_txvar.h,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*      $Id: if_txvar.h,v 1.2 1999/03/14 08:30:23 semenu Exp $ */
+/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 2f91c23b2505..cae329a5761d 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_vr.c,v 1.14 1999/08/10 17:15:10 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -100,7 +100,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_vr.c,v 1.14 1999/08/10 17:15:10 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_vrreg.h b/sys/pci/if_vrreg.h
index e1e4ae6d1cfc..fef8e48fc390 100644
--- a/sys/pci/if_vrreg.h
+++ b/sys/pci/if_vrreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_vrreg.h,v 1.4 1999/05/06 15:32:50 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index 1ea58f4144bf..fb635b2cd5e9 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wb.c,v 1.13 1999/07/11 00:56:07 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -129,7 +129,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_wb.c,v 1.13 1999/07/11 00:56:07 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_wbreg.h b/sys/pci/if_wbreg.h
index ed8b35afb2cc..5411339fd401 100644
--- a/sys/pci/if_wbreg.h
+++ b/sys/pci/if_wbreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wbreg.h,v 1.4 1999/07/11 00:56:07 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index be5b83ea5d18..04d76a7a083c 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_xl.c,v 1.50 1999/08/02 21:57:57 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -163,7 +163,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_xl.c,v 1.50 1999/08/02 21:57:57 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_xlreg.h b/sys/pci/if_xlreg.h
index c74824612f03..b50f068e3f42 100644
--- a/sys/pci/if_xlreg.h
+++ b/sys/pci/if_xlreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_xlreg.h,v 1.17 1999/05/30 18:09:17 wpaul Exp $
+ * $FreeBSD$
  */
 
 #define XL_EE_READ	0x0080	/* read, 5 bit address */
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c
index 7163d37998ed..e90466b45621 100644
--- a/sys/pci/intpm.c
+++ b/sys/pci/intpm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: intpm.c,v 1.12 1999/07/24 19:13:54 nsouch Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/intpmreg.h b/sys/pci/intpmreg.h
index fdadef07e151..73816e7748d5 100644
--- a/sys/pci/intpmreg.h
+++ b/sys/pci/intpmreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*Register Difinition for Intel Chipset with ACPI Support*/
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c
index 8fd49bbfd562..1aa31953b36b 100644
--- a/sys/pci/isp_pci.c
+++ b/sys/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $Id: isp_pci.c,v 1.30 1999/08/16 19:52:29 mjacob Exp $ */
+/* $FreeBSD$ */
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
  * FreeBSD Version.
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 03256db1e129..6b166b300af0 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncr.c,v 1.149 1999/06/15 13:14:56 des Exp $
+** $FreeBSD$
 **
 **  Device driver for the   NCR 53C8XX   PCI-SCSI-Controller Family.
 **
@@ -1360,7 +1360,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 #if !defined(lint)
 static const char ident[] =
-	"\n$Id: ncr.c,v 1.149 1999/06/15 13:14:56 des Exp $\n";
+	"\n$FreeBSD$\n";
 #endif
 
 static const u_long	ncr_version = NCR_VERSION	* 11
diff --git a/sys/pci/ncrreg.h b/sys/pci/ncrreg.h
index 2b5c92572dce..fcc72124377f 100644
--- a/sys/pci/ncrreg.h
+++ b/sys/pci/ncrreg.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncrreg.h,v 1.11 1997/08/31 19:42:31 se Exp $
+** $FreeBSD$
 **
 **  Device driver for the   NCR 53C810   PCI-SCSI-Controller.
 **
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index 75f41e87c72b..214d6f96b80f 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci.c,v 1.114 1999/07/29 01:03:03 mdodd Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pci/pci_compat.c b/sys/pci/pci_compat.c
index db4d56afa76e..c007dc577063 100644
--- a/sys/pci/pci_compat.c
+++ b/sys/pci/pci_compat.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci_compat.c,v 1.30 1999/07/03 20:17:08 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pci/pci_if.m b/sys/pci/pci_if.m
index b2fa6758fef6..95b0081ca32b 100644
--- a/sys/pci/pci_if.m
+++ b/sys/pci/pci_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id$
+# $FreeBSD$
 #
 
 INTERFACE pci;
diff --git a/sys/pci/pcic_p.c b/sys/pci/pcic_p.c
index e596a75fbce4..5b23c5e57c27 100644
--- a/sys/pci/pcic_p.c
+++ b/sys/pci/pcic_p.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic_p.c,v 1.12 1999/05/09 17:07:11 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/pcic_p.h b/sys/pci/pcic_p.h
index 47934f3d02a9..bd8e06c79e45 100644
--- a/sys/pci/pcic_p.h
+++ b/sys/pci/pcic_p.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic_p.h,v 1.5 1999/04/01 15:28:10 nsayer Exp $
+ * $FreeBSD$
  */
 
 /* PCI/CardBus Device IDs */
diff --git a/sys/pci/pcireg.h b/sys/pci/pcireg.h
index 9c0dba09331d..f90df10e14de 100644
--- a/sys/pci/pcireg.h
+++ b/sys/pci/pcireg.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcireg.h,v 1.20 1998/10/07 03:40:51 gibbs Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c
index a5882df530b8..e883b5f2f286 100644
--- a/sys/pci/pcisupport.c
+++ b/sys/pci/pcisupport.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcisupport.c,v 1.124 1999/08/09 21:11:44 mdodd Exp $
+** $FreeBSD$
 **
 **  Device driver for DEC/INTEL PCI chipsets.
 **
diff --git a/sys/pci/pcivar.h b/sys/pci/pcivar.h
index f1c6f5e4d744..ae4958dbf265 100644
--- a/sys/pci/pcivar.h
+++ b/sys/pci/pcivar.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcivar.h,v 1.33 1999/05/20 15:33:33 gallatin Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pci/simos.c b/sys/pci/simos.c
index 7a9954b14097..2a9a706b311b 100644
--- a/sys/pci/simos.c
+++ b/sys/pci/simos.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: simos.c,v 1.5 1999/05/06 20:16:39 ken Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/simos.h b/sys/pci/simos.h
index 46093547cf0d..e703074e58c3 100644
--- a/sys/pci/simos.h
+++ b/sys/pci/simos.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/ti_fw.h b/sys/pci/ti_fw.h
index 51bc01498ad7..8d4ae4dd1ea7 100644
--- a/sys/pci/ti_fw.h
+++ b/sys/pci/ti_fw.h
@@ -2,7 +2,7 @@
  * Firmware for Alteon Tigon 1 chip.
  * Generated by genfw.c
  *
- *      $Id$
+ * $FreeBSD$
  */
 static int tigonFwReleaseMajor = 0xc;
 static int tigonFwReleaseMinor = 0x3;
diff --git a/sys/pci/ti_fw2.h b/sys/pci/ti_fw2.h
index e2ee31f7e4c9..e46ac9640143 100644
--- a/sys/pci/ti_fw2.h
+++ b/sys/pci/ti_fw2.h
@@ -3,7 +3,7 @@
  * Built on Thu Jul 15 17:08:34 1999 by wpaul@xylophone
  * OS: FreeBSD 3.2-RELEASE
  *
- *	$Id: genfw.c,v 1.2 1999/03/18 17:16:43 wpaul Exp $
+ * $FreeBSD$
  */
 static int tigon2FwReleaseMajor = 0xc;
 static int tigon2FwReleaseMinor = 0x3;
diff --git a/sys/pci/xmaciireg.h b/sys/pci/xmaciireg.h
index fe8946bdabdb..f649e93a044e 100644
--- a/sys/pci/xmaciireg.h
+++ b/sys/pci/xmaciireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: xmaciireg.h,v 1.10 1999/07/09 03:35:12 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index e34e3c2e65e7..1b56e6bb2787 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: xrpu.c,v 1.15 1999/07/13 08:15:22 phk Exp $
+ * $FreeBSD$
  *
  * A very simple device driver for PCI cards based on Xilinx 6200 series
  * FPGA/RPU devices.  Current Functionality is to allow you to open and
diff --git a/sys/posix4/aio.h b/sys/posix4/aio.h
index 73319ece7920..b96e9eb26372 100644
--- a/sys/posix4/aio.h
+++ b/sys/posix4/aio.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: aio.h,v 1.3 1998/03/23 14:05:25 bde Exp $
+ * $FreeBSD$
  */
 
 /* aio.h: P1003.1B-1993 Asynchronous I/O */
diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c
index 4f92cf697bfd..2f0dabb94805 100644
--- a/sys/powerpc/aim/vm_machdep.c
+++ b/sys/powerpc/aim/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.19 1999/08/05 23:38:13 jdp Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/powerpc/include/_limits.h b/sys/powerpc/include/_limits.h
index fe6041b4c4b7..0d258ff9d94c 100644
--- a/sys/powerpc/include/_limits.h
+++ b/sys/powerpc/include/_limits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $Id: limits.h,v 1.12 1999/05/20 23:33:35 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/powerpc/include/bootinfo.h b/sys/powerpc/include/bootinfo.h
index cd45e408d85f..86b7e7a729bb 100644
--- a/sys/powerpc/include/bootinfo.h
+++ b/sys/powerpc/include/bootinfo.h
@@ -1,4 +1,4 @@
-/* $Id: bootinfo.h,v 1.3 1998/10/14 09:53:24 peter Exp $ */
+/* $FreeBSD$ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/powerpc/include/clock.h b/sys/powerpc/include/clock.h
index e1915230a842..f243f8b20334 100644
--- a/sys/powerpc/include/clock.h
+++ b/sys/powerpc/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- *	$Id: clock.h,v 1.2 1998/07/22 08:26:23 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/powerpc/include/limits.h b/sys/powerpc/include/limits.h
index fe6041b4c4b7..0d258ff9d94c 100644
--- a/sys/powerpc/include/limits.h
+++ b/sys/powerpc/include/limits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $Id: limits.h,v 1.12 1999/05/20 23:33:35 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/powerpc/include/md_var.h b/sys/powerpc/include/md_var.h
index 94e87ffd7d83..42d40f3f2dfa 100644
--- a/sys/powerpc/include/md_var.h
+++ b/sys/powerpc/include/md_var.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: md_var.h,v 1.6 1999/07/01 21:58:38 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/powerpc/include/ptrace.h b/sys/powerpc/include/ptrace.h
index 2c43a2eef8d4..55a26fd636ad 100644
--- a/sys/powerpc/include/ptrace.h
+++ b/sys/powerpc/include/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $Id: ptrace.h,v 1.6 1998/05/19 00:00:12 tegge Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/powerpc/powerpc/elf_machdep.c b/sys/powerpc/powerpc/elf_machdep.c
index 646e3536573e..5582fcb1337d 100644
--- a/sys/powerpc/powerpc/elf_machdep.c
+++ b/sys/powerpc/powerpc/elf_machdep.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: elf_machdep.c,v 1.5 1999/07/16 09:16:11 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c
index 945f537aaddf..dc838f71ace7 100644
--- a/sys/powerpc/powerpc/genassym.c
+++ b/sys/powerpc/powerpc/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.7 1999/06/28 09:15:35 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/procfs_machdep.c b/sys/powerpc/powerpc/procfs_machdep.c
index cfaa023fd01f..000eb02a0a7f 100644
--- a/sys/powerpc/powerpc/procfs_machdep.c
+++ b/sys/powerpc/powerpc/procfs_machdep.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_machdep.c	8.3 (Berkeley) 1/27/94
  *
  * From:
- *	$Id: procfs_machdep.c,v 1.2 1998/09/14 22:43:19 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c
index 4f92cf697bfd..2f0dabb94805 100644
--- a/sys/powerpc/powerpc/vm_machdep.c
+++ b/sys/powerpc/powerpc/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.19 1999/08/05 23:38:13 jdp Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/svr4/Makefile b/sys/svr4/Makefile
index d8fd59b7fb3c..670fccb6a668 100644
--- a/sys/svr4/Makefile
+++ b/sys/svr4/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $Id: Makefile,v 1.3 1997/03/29 11:17:26 peter Exp $
+# $FreeBSD$
 
 all:
 	@echo "make svr4_sysent.c only"
diff --git a/sys/svr4/imgact_svr4.c b/sys/svr4/imgact_svr4.c
index 5fcfcb5bafca..707e7e4d3ac4 100644
--- a/sys/svr4/imgact_svr4.c
+++ b/sys/svr4/imgact_svr4.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4.h b/sys/svr4/svr4.h
index a42d49d4f9d4..52910bf349c3 100644
--- a/sys/svr4/svr4.h
+++ b/sys/svr4/svr4.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #if !defined(_SVR4_H)
diff --git a/sys/svr4/svr4_acl.h b/sys/svr4/svr4_acl.h
index f1a405f2fd6a..6d9454f65ecd 100644
--- a/sys/svr4/svr4_acl.h
+++ b/sys/svr4/svr4_acl.h
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef	_SVR4_ACL_H_
 #define	_SVR4_ACL_H_
diff --git a/sys/svr4/svr4_dirent.h b/sys/svr4/svr4_dirent.h
index 26ee8164aeb0..244078227888 100644
--- a/sys/svr4/svr4_dirent.h
+++ b/sys/svr4/svr4_dirent.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_DIRENT_H_
diff --git a/sys/svr4/svr4_errno.h b/sys/svr4/svr4_errno.h
index 50dd46a43127..cc39929acfd5 100644
--- a/sys/svr4/svr4_errno.h
+++ b/sys/svr4/svr4_errno.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_ERRNO_H_
diff --git a/sys/svr4/svr4_exec.h b/sys/svr4/svr4_exec.h
index 301915940bd3..716dad18924a 100644
--- a/sys/svr4/svr4_exec.h
+++ b/sys/svr4/svr4_exec.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_EXEC_H_
diff --git a/sys/svr4/svr4_fcntl.c b/sys/svr4/svr4_fcntl.c
index add04e382f73..60b975966a4b 100644
--- a/sys/svr4/svr4_fcntl.c
+++ b/sys/svr4/svr4_fcntl.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_fcntl.c,v 1.3 1999/07/30 12:45:15 newton Exp $
+ * $FreeBSD$
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/svr4/svr4_fcntl.h b/sys/svr4/svr4_fcntl.h
index 6ee21fae8339..615e09c219fb 100644
--- a/sys/svr4/svr4_fcntl.h
+++ b/sys/svr4/svr4_fcntl.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_FCNTL_H_
diff --git a/sys/svr4/svr4_filio.c b/sys/svr4/svr4_filio.c
index 9dfeced92f6b..0be9f221c7bc 100644
--- a/sys/svr4/svr4_filio.c
+++ b/sys/svr4/svr4_filio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4_filio.h b/sys/svr4/svr4_filio.h
index 254e2da813c7..37184cb72610 100644
--- a/sys/svr4/svr4_filio.h
+++ b/sys/svr4/svr4_filio.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_FILIO_H_
diff --git a/sys/svr4/svr4_fuser.h b/sys/svr4/svr4_fuser.h
index bc726c12cefa..25cdcf13e0be 100644
--- a/sys/svr4/svr4_fuser.h
+++ b/sys/svr4/svr4_fuser.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *	Derived from:
  *	$NetBSD: svr4_fuser.h,v 1.4 1998/09/04 19:54:38 christos Exp $	 */
 
diff --git a/sys/svr4/svr4_hrt.h b/sys/svr4/svr4_hrt.h
index 8fc0231f4645..c160b8eeb6e9 100644
--- a/sys/svr4/svr4_hrt.h
+++ b/sys/svr4/svr4_hrt.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_HRT_H_
diff --git a/sys/svr4/svr4_ioctl.c b/sys/svr4/svr4_ioctl.c
index 02c120217636..401c58b2a960 100644
--- a/sys/svr4/svr4_ioctl.c
+++ b/sys/svr4/svr4_ioctl.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4_ioctl.h b/sys/svr4/svr4_ioctl.h
index f95e5ee53453..a5c6a5324181 100644
--- a/sys/svr4/svr4_ioctl.h
+++ b/sys/svr4/svr4_ioctl.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_IOCTL_H_
diff --git a/sys/svr4/svr4_ipc.c b/sys/svr4/svr4_ipc.c
index 1f9b7573cc72..f884fa16c4ed 100644
--- a/sys/svr4/svr4_ipc.c
+++ b/sys/svr4/svr4_ipc.c
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *	Derived from:
  *	$NetBSD: svr4_ipc.c,v 1.7 1998/10/19 22:43:00 tron Exp $	*/
 
diff --git a/sys/svr4/svr4_ipc.h b/sys/svr4/svr4_ipc.h
index 56d7f5572be7..6aadb7e050ec 100644
--- a/sys/svr4/svr4_ipc.h
+++ b/sys/svr4/svr4_ipc.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SVR4_IPC_H_
diff --git a/sys/svr4/svr4_misc.c b/sys/svr4/svr4_misc.c
index 35aa8e603e6e..9535cba8972b 100644
--- a/sys/svr4/svr4_misc.c
+++ b/sys/svr4/svr4_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_misc.c,v 1.4 1999/07/30 12:45:16 newton Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/svr4/svr4_mman.h b/sys/svr4/svr4_mman.h
index 77500fad8a3d..db7c3dacef5f 100644
--- a/sys/svr4/svr4_mman.h
+++ b/sys/svr4/svr4_mman.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SVR4_MMAN_H_
diff --git a/sys/svr4/svr4_resource.c b/sys/svr4/svr4_resource.c
index 32717998d72e..7c39f44b3a1e 100644
--- a/sys/svr4/svr4_resource.c
+++ b/sys/svr4/svr4_resource.c
@@ -39,7 +39,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/svr4/svr4_resource.h b/sys/svr4/svr4_resource.h
index caab421cd6c6..3512df387674 100644
--- a/sys/svr4/svr4_resource.h
+++ b/sys/svr4/svr4_resource.h
@@ -38,7 +38,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/svr4/svr4_siginfo.h b/sys/svr4/svr4_siginfo.h
index 0f4c3e28f7cc..be898374dc2b 100644
--- a/sys/svr4/svr4_siginfo.h
+++ b/sys/svr4/svr4_siginfo.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SIGINFO_H_
diff --git a/sys/svr4/svr4_signal.c b/sys/svr4/svr4_signal.c
index 2e1e088f902f..b1239871942d 100644
--- a/sys/svr4/svr4_signal.c
+++ b/sys/svr4/svr4_signal.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4_signal.h b/sys/svr4/svr4_signal.h
index 0b02985068d4..8fb861d20147 100644
--- a/sys/svr4/svr4_signal.h
+++ b/sys/svr4/svr4_signal.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SIGNAL_H_
diff --git a/sys/svr4/svr4_socket.c b/sys/svr4/svr4_socket.c
index f42690071599..e2eafa304e5d 100644
--- a/sys/svr4/svr4_socket.c
+++ b/sys/svr4/svr4_socket.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_socket.c,v 1.2 1999/07/30 12:45:17 newton Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/svr4/svr4_socket.h b/sys/svr4/svr4_socket.h
index e7ee86b9b5f8..96e3582738fb 100644
--- a/sys/svr4/svr4_socket.h
+++ b/sys/svr4/svr4_socket.h
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_socket.h,v 1.2 1999/07/30 12:45:18 newton Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SVR4_SOCKET_H_
diff --git a/sys/svr4/svr4_sockio.c b/sys/svr4/svr4_sockio.c
index c0c9767bc6d6..7d6184612762 100644
--- a/sys/svr4/svr4_sockio.c
+++ b/sys/svr4/svr4_sockio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4_sockio.h b/sys/svr4/svr4_sockio.h
index f363caaddcbb..dd4e220c9f48 100644
--- a/sys/svr4/svr4_sockio.h
+++ b/sys/svr4/svr4_sockio.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SOCKIO_H_
diff --git a/sys/svr4/svr4_sockmod.h b/sys/svr4/svr4_sockmod.h
index 36e0a8a24b60..927ba0d28367 100644
--- a/sys/svr4/svr4_sockmod.h
+++ b/sys/svr4/svr4_sockmod.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SOCKMOD_H_
diff --git a/sys/svr4/svr4_stat.c b/sys/svr4/svr4_stat.c
index 2b6755127dd0..9ffcbc58d754 100644
--- a/sys/svr4/svr4_stat.c
+++ b/sys/svr4/svr4_stat.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4_stat.h b/sys/svr4/svr4_stat.h
index 082cb409f786..7eeff44f30ac 100644
--- a/sys/svr4/svr4_stat.h
+++ b/sys/svr4/svr4_stat.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_STAT_H_
diff --git a/sys/svr4/svr4_statvfs.h b/sys/svr4/svr4_statvfs.h
index cc904abb89e3..b3bf473a1b52 100644
--- a/sys/svr4/svr4_statvfs.h
+++ b/sys/svr4/svr4_statvfs.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_STATVFS_H_
diff --git a/sys/svr4/svr4_stream.c b/sys/svr4/svr4_stream.c
index 41709258bd8c..4ced1bc07f3a 100644
--- a/sys/svr4/svr4_stream.c
+++ b/sys/svr4/svr4_stream.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_stream.c,v 1.2 1999/07/30 12:45:18 newton Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/svr4/svr4_stropts.h b/sys/svr4/svr4_stropts.h
index 52badbb502ef..2fa14a1e988a 100644
--- a/sys/svr4/svr4_stropts.h
+++ b/sys/svr4/svr4_stropts.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_STROPTS_H_
diff --git a/sys/svr4/svr4_sysconfig.h b/sys/svr4/svr4_sysconfig.h
index 331fa7ebaa0f..874c5653e634 100644
--- a/sys/svr4/svr4_sysconfig.h
+++ b/sys/svr4/svr4_sysconfig.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SYSCONFIG_H_
diff --git a/sys/svr4/svr4_systeminfo.h b/sys/svr4/svr4_systeminfo.h
index 0e05a658d0b7..40bc2b85d757 100644
--- a/sys/svr4/svr4_systeminfo.h
+++ b/sys/svr4/svr4_systeminfo.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SYSTEMINFO_H_
diff --git a/sys/svr4/svr4_sysvec.c b/sys/svr4/svr4_sysvec.c
index 95427ec67a94..099bb9c4dfa9 100644
--- a/sys/svr4/svr4_sysvec.c
+++ b/sys/svr4/svr4_sysvec.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_sysvec.c,v 1.4 1999/07/30 12:45:19 newton Exp $
+ * $FreeBSD$
  */
 
 /* XXX we use functions that might not exist. */
diff --git a/sys/svr4/svr4_termios.c b/sys/svr4/svr4_termios.c
index 45525a230607..450c0847a99e 100644
--- a/sys/svr4/svr4_termios.c
+++ b/sys/svr4/svr4_termios.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4_termios.h b/sys/svr4/svr4_termios.h
index f7eddd443667..8afa4f321bc3 100644
--- a/sys/svr4/svr4_termios.h
+++ b/sys/svr4/svr4_termios.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TERMIOS_H_
diff --git a/sys/svr4/svr4_time.h b/sys/svr4/svr4_time.h
index cc9d7a7a1865..3d61771fc904 100644
--- a/sys/svr4/svr4_time.h
+++ b/sys/svr4/svr4_time.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TIME_H_
diff --git a/sys/svr4/svr4_timod.h b/sys/svr4/svr4_timod.h
index 7d98e05d782c..f0c508f511b8 100644
--- a/sys/svr4/svr4_timod.h
+++ b/sys/svr4/svr4_timod.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TIMOD_H_
diff --git a/sys/svr4/svr4_ttold.c b/sys/svr4/svr4_ttold.c
index ac4c1d62c8ef..d597691cc699 100644
--- a/sys/svr4/svr4_ttold.c
+++ b/sys/svr4/svr4_ttold.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4_ttold.h b/sys/svr4/svr4_ttold.h
index 81ea51448fd5..c578170a1ef9 100644
--- a/sys/svr4/svr4_ttold.h
+++ b/sys/svr4/svr4_ttold.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TTOLD_H_
diff --git a/sys/svr4/svr4_types.h b/sys/svr4/svr4_types.h
index 2aed74e4ff84..410746b6adc9 100644
--- a/sys/svr4/svr4_types.h
+++ b/sys/svr4/svr4_types.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TYPES_H_
diff --git a/sys/svr4/svr4_ucontext.h b/sys/svr4/svr4_ucontext.h
index c37865283da6..04bebe6eb81e 100644
--- a/sys/svr4/svr4_ucontext.h
+++ b/sys/svr4/svr4_ucontext.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_UCONTEXT_H_
diff --git a/sys/svr4/svr4_ulimit.h b/sys/svr4/svr4_ulimit.h
index bd83d721abbd..0735d42f722f 100644
--- a/sys/svr4/svr4_ulimit.h
+++ b/sys/svr4/svr4_ulimit.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_ULIMIT_H_
diff --git a/sys/svr4/svr4_ustat.h b/sys/svr4/svr4_ustat.h
index 3c805a4feb43..0033c96bae0d 100644
--- a/sys/svr4/svr4_ustat.h
+++ b/sys/svr4/svr4_ustat.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_USTAT_H_
diff --git a/sys/svr4/svr4_util.h b/sys/svr4/svr4_util.h
index a2f28e340416..629edd69cd4a 100644
--- a/sys/svr4/svr4_util.h
+++ b/sys/svr4/svr4_util.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_util.h,v 1.2 1999/07/30 12:45:21 newton Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_UTIL_H_
diff --git a/sys/svr4/svr4_utsname.h b/sys/svr4/svr4_utsname.h
index e104778c9d17..a3714c9b1c10 100644
--- a/sys/svr4/svr4_utsname.h
+++ b/sys/svr4/svr4_utsname.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_UTSNAME_H_
diff --git a/sys/svr4/svr4_wait.h b/sys/svr4/svr4_wait.h
index 2945c1948275..9a92c0114c1c 100644
--- a/sys/svr4/svr4_wait.h
+++ b/sys/svr4/svr4_wait.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_WAIT_H_
diff --git a/sys/svr4/syscalls.conf b/sys/svr4/syscalls.conf
index 5c01a85cad74..46f7bd3df7be 100644
--- a/sys/svr4/syscalls.conf
+++ b/sys/svr4/syscalls.conf
@@ -1,4 +1,4 @@
-# $Id: syscalls.conf,v 1.4 1998/03/13 19:13:54 jb Exp $
+# $FreeBSD$
 sysnames="svr4_syscallnames.c"
 sysproto="svr4_proto.h"
 sysproto_h=_SVR4_SYSPROTO_H_
diff --git a/sys/svr4/syscalls.master b/sys/svr4/syscalls.master
index 703120d7d236..43e8f4886c68 100644
--- a/sys/svr4/syscalls.master
+++ b/sys/svr4/syscalls.master
@@ -20,7 +20,7 @@
 ;	OBSOL	obsolete, not included in system, only specifies name
 ;	UNIMPL	not implemented, placeholder only
 ;
-; $Id: syscalls.master,v 1.2 1999/07/30 12:45:21 newton Exp $
+; $FreeBSD$
 ;
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/sys/sys/_posix.h b/sys/sys/_posix.h
index b64222051d80..ea0436a93b54 100644
--- a/sys/sys/_posix.h
+++ b/sys/sys/_posix.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: _posix.h,v 1.3 1998/10/16 03:55:01 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/_sigset.h b/sys/sys/_sigset.h
index 471baa97b754..4a0fee85f7f1 100644
--- a/sys/sys/_sigset.h
+++ b/sys/sys/_sigset.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $Id: signal.h,v 1.14 1998/08/05 09:04:36 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_SIGNAL_H_
diff --git a/sys/sys/acct.h b/sys/sys/acct.h
index e38675d1ae5a..d59d974cb41e 100644
--- a/sys/sys/acct.h
+++ b/sys/sys/acct.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)acct.h	8.4 (Berkeley) 1/9/95
- * $Id: acct.h,v 1.9 1998/02/01 20:08:35 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_ACCT_H_
diff --git a/sys/sys/aio.h b/sys/sys/aio.h
index 251d354272d5..68a5698503d1 100644
--- a/sys/sys/aio.h
+++ b/sys/sys/aio.h
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $Id: aio.h,v 1.9 1999/01/17 22:33:08 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_AIO_H_
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index 609a37072f9f..f84498589ed8 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $Id: buf.h,v 1.77 1999/07/09 16:41:18 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_BUF_H_
diff --git a/sys/sys/blist.h b/sys/sys/blist.h
index 05d82398d1b6..a26932cae89f 100644
--- a/sys/sys/blist.h
+++ b/sys/sys/blist.h
@@ -24,7 +24,7 @@
  *		that.  Managing something like 512MB worth of 4K blocks 
  *		eats around 32 KBytes of memory. 
  *
- *	$Id: blist.h,v Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_BLIST_H_
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 609a37072f9f..f84498589ed8 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $Id: buf.h,v 1.77 1999/07/09 16:41:18 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_BUF_H_
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index f02b3190d84c..03a644975cce 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bus.h,v 1.21 1999/07/24 09:34:10 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_BUS_H_
diff --git a/sys/sys/bus_dma.h b/sys/sys/bus_dma.h
index 28e80ba2b89a..b6a9795a5ae5 100644
--- a/sys/sys/bus_dma.h
+++ b/sys/sys/bus_dma.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/sys/bus_private.h b/sys/sys/bus_private.h
index f3539a3d4dac..27b0a6c0e297 100644
--- a/sys/sys/bus_private.h
+++ b/sys/sys/bus_private.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bus_private.h,v 1.8 1999/05/14 09:13:39 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_BUS_PRIVATE_H_
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index ddb830b866d7..971ac9f88079 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $Id: callout.h,v 1.11 1998/01/11 00:43:51 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_CALLOUT_H_
diff --git a/sys/sys/ccdvar.h b/sys/sys/ccdvar.h
index 862419dc3ffc..82ac51d9b559 100644
--- a/sys/sys/ccdvar.h
+++ b/sys/sys/ccdvar.h
@@ -1,4 +1,4 @@
-/* $Id: ccdvar.h,v 1.7 1998/09/15 10:07:26 gibbs Exp $ */
+/* $FreeBSD$ */
 
 /*	$NetBSD: ccdvar.h,v 1.7.2.1 1995/10/12 21:30:18 thorpej Exp $	*/
 
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index 587e7d72ecac..f062c772da77 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- * $Id: cdefs.h,v 1.23 1998/10/29 04:41:24 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_CDEFS_H_
diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h
index 516e67abe0b8..dbb0f29f9abc 100644
--- a/sys/sys/cdio.h
+++ b/sys/sys/cdio.h
@@ -1,7 +1,7 @@
 /*
  * 16 Feb 93	Julian Elischer	(julian@dialix.oz.au)
  *
- *	$Id: cdio.h,v 1.18 1998/06/08 09:47:47 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/chio.h b/sys/sys/chio.h
index 3e0cea197bac..7a2403f27dd3 100644
--- a/sys/sys/chio.h
+++ b/sys/sys/chio.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: chio.h,v 1.12 1998/09/15 10:07:26 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_CHIO_H_
diff --git a/sys/sys/clist.h b/sys/sys/clist.h
index 5e87f2b11cdd..d1c22fa3d599 100644
--- a/sys/sys/clist.h
+++ b/sys/sys/clist.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clist.h	8.1 (Berkeley) 6/4/93
- * $Id: clist.h,v 1.7 1997/02/22 09:44:58 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_CLIST_H_
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 00645fb949b4..4e5a94a5aba8 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $Id: conf.h,v 1.78 1999/08/25 22:50:12 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_CONF_H_
diff --git a/sys/sys/cons.h b/sys/sys/cons.h
index a626091976ec..b6414a1244ca 100644
--- a/sys/sys/cons.h
+++ b/sys/sys/cons.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
- *	$Id: cons.h,v 1.20 1999/06/22 14:12:55 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CONS_H_
diff --git a/sys/sys/consio.h b/sys/sys/consio.h
index abc9c1fca1e8..d121457cfc66 100644
--- a/sys/sys/consio.h
+++ b/sys/sys/consio.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: console.h,v 1.45 1999/03/10 10:36:47 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_CONSIO_H_
diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h
index 18c0b246ec90..becc5474d370 100644
--- a/sys/sys/copyright.h
+++ b/sys/sys/copyright.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id: copyright.h,v 1.6 1999/02/10 13:09:09 kato Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/sys/devfsext.h b/sys/sys/devfsext.h
index fd66d85b4a6d..478adc0a4a95 100644
--- a/sys/sys/devfsext.h
+++ b/sys/sys/devfsext.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $Id: devfsext.h,v 1.23 1999/08/08 18:42:59 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DEVFSEXT_H_
diff --git a/sys/sys/device.h b/sys/sys/device.h
index 5425d7728ad5..fc5ce337439e 100644
--- a/sys/sys/device.h
+++ b/sys/sys/device.h
@@ -40,7 +40,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device.h	8.2 (Berkeley) 2/17/94
- * $Id: device.h,v 1.7 1997/09/21 22:09:03 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DEVICE_H_
diff --git a/sys/sys/devicestat.h b/sys/sys/devicestat.h
index c94b8ce23580..8887744ea306 100644
--- a/sys/sys/devicestat.h
+++ b/sys/sys/devicestat.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devicestat.h,v 1.3 1998/11/14 21:58:41 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEVICESTAT_H
diff --git a/sys/sys/dir.h b/sys/sys/dir.h
index bea51b01eb0b..670850ac37ef 100644
--- a/sys/sys/dir.h
+++ b/sys/sys/dir.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/4/94
- * $Id: dir.h,v 1.4 1997/02/22 09:45:01 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DIR_H_
diff --git a/sys/sys/dirent.h b/sys/sys/dirent.h
index 33b2d7f91865..19db37ba43e7 100644
--- a/sys/sys/dirent.h
+++ b/sys/sys/dirent.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dirent.h	8.3 (Berkeley) 8/10/94
- * $Id: dirent.h,v 1.8 1997/04/10 13:54:19 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_DIRENT_H_
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 1e3865c9000a..e664e26743e7 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $Id: disklabel.h,v 1.41 1999/08/11 03:02:05 imp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DISKLABEL_H_
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index 1e3865c9000a..e664e26743e7 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $Id: disklabel.h,v 1.41 1999/08/11 03:02:05 imp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DISKLABEL_H_
diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h
index 1e3865c9000a..e664e26743e7 100644
--- a/sys/sys/diskpc98.h
+++ b/sys/sys/diskpc98.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $Id: disklabel.h,v 1.41 1999/08/11 03:02:05 imp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DISKLABEL_H_
diff --git a/sys/sys/diskslice.h b/sys/sys/diskslice.h
index 881cf3048d7a..418df7cc6c63 100644
--- a/sys/sys/diskslice.h
+++ b/sys/sys/diskslice.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: diskslice.h,v 1.29 1998/08/23 20:16:35 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_DISKSLICE_H_
diff --git a/sys/sys/dkbad.h b/sys/sys/dkbad.h
index a076e00444fb..4aad13214f47 100644
--- a/sys/sys/dkbad.h
+++ b/sys/sys/dkbad.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkbad.h	8.2 (Berkeley) 7/10/94
- * $Id: dkbad.h,v 1.10 1998/02/01 20:08:36 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DKBAD_H_
diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h
index d7abbb19244d..c62d6ce1350f 100644
--- a/sys/sys/dkstat.h
+++ b/sys/sys/dkstat.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkstat.h	8.2 (Berkeley) 1/21/94
- * $Id: dkstat.h,v 1.9 1997/09/07 05:27:05 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DKSTAT_H_
diff --git a/sys/sys/dmap.h b/sys/sys/dmap.h
index d31bbc0eba40..793176086738 100644
--- a/sys/sys/dmap.h
+++ b/sys/sys/dmap.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dmap.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DMAP_H_
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index 0bf516be15d9..3b7f14c37aac 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)domain.h	8.1 (Berkeley) 6/2/93
- * $Id: domain.h,v 1.11 1999/01/21 00:26:39 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DOMAIN_H_
diff --git a/sys/sys/elf32.h b/sys/sys/elf32.h
index d88ef2c3252a..309f1a43eada 100644
--- a/sys/sys/elf32.h
+++ b/sys/sys/elf32.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf32.h,v 1.5 1998/09/14 20:30:13 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_ELF32_H_
diff --git a/sys/sys/elf64.h b/sys/sys/elf64.h
index 464815a27d9b..022b174f559d 100644
--- a/sys/sys/elf64.h
+++ b/sys/sys/elf64.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf64.h,v 1.7 1998/09/14 20:30:13 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_ELF64_H_
diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h
index 7785d202f152..207050debe02 100644
--- a/sys/sys/elf_common.h
+++ b/sys/sys/elf_common.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf_common.h,v 1.3 1998/09/14 20:30:13 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_ELF_COMMON_H_
diff --git a/sys/sys/elf_generic.h b/sys/sys/elf_generic.h
index bc1203b69a46..32c3e161b5a4 100644
--- a/sys/sys/elf_generic.h
+++ b/sys/sys/elf_generic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf_generic.h,v 1.2 1998/09/14 20:30:13 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_ELF_GENERIC_H_
diff --git a/sys/sys/errno.h b/sys/sys/errno.h
index 0ccb10528b5a..c25b6afef90d 100644
--- a/sys/sys/errno.h
+++ b/sys/sys/errno.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)errno.h	8.5 (Berkeley) 1/21/94
- * $Id: errno.h,v 1.11 1998/12/14 18:54:04 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_ERRNO_H_
diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h
index b0198daf30aa..4ebdc2112d8c 100644
--- a/sys/sys/eventhandler.h
+++ b/sys/sys/eventhandler.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eventhandler.h,v 1.1 1999/08/21 06:24:39 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index ef643ec89ea7..d58fbe89ac4d 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $Id: exec.h,v 1.23 1999/01/29 08:36:45 dillon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_EXEC_H_
diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h
index 055dfad49ae1..b2413ead61ed 100644
--- a/sys/sys/fbio.h
+++ b/sys/sys/fbio.h
@@ -36,7 +36,7 @@
  *
  *	@(#)fbio.h	8.2 (Berkeley) 10/30/93
  *
- * $Id: fbio.h,v 1.6 1999/06/22 14:13:43 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_FBIO_H_
diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index 7133e17bbf63..b81f904daaba 100644
--- a/sys/sys/fcntl.h
+++ b/sys/sys/fcntl.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fcntl.h	8.3 (Berkeley) 1/21/94
- * $Id: fcntl.h,v 1.6 1997/02/22 09:45:13 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_FCNTL_H_
diff --git a/sys/sys/fdcio.h b/sys/sys/fdcio.h
index 891d8f0a22a9..3b4da37da238 100644
--- a/sys/sys/fdcio.h
+++ b/sys/sys/fdcio.h
@@ -24,7 +24,7 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_IOCTL_FD_H_
diff --git a/sys/sys/file.h b/sys/sys/file.h
index ec425b4c5418..072a7652fc44 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)file.h	8.3 (Berkeley) 1/9/95
- * $Id: file.h,v 1.17 1999/04/04 21:41:25 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_FILE_H_
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index 92b5562ff91d..4505875fe5c4 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
- * $Id: filedesc.h,v 1.14 1998/11/11 10:04:12 truckman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_FILEDESC_H_
diff --git a/sys/sys/filio.h b/sys/sys/filio.h
index d0c94af7b644..07dff6266568 100644
--- a/sys/sys/filio.h
+++ b/sys/sys/filio.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filio.h	8.1 (Berkeley) 3/28/94
- * $Id: filio.h,v 1.4 1997/02/22 09:45:16 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_FILIO_H_
diff --git a/sys/sys/gmon.h b/sys/sys/gmon.h
index 9107c93f071a..79434a4888a9 100644
--- a/sys/sys/gmon.h
+++ b/sys/sys/gmon.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)gmon.h	8.2 (Berkeley) 1/4/94
- * $Id: gmon.h,v 1.13 1997/07/13 16:38:31 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_GMON_H_
diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h
index d206f268a18d..ec147ba8698c 100644
--- a/sys/sys/imgact.h
+++ b/sys/sys/imgact.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact.h,v 1.18 1998/12/30 10:38:59 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_IMGACT_H_
diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h
index f05c0026c55f..5b4b68fcbdbd 100644
--- a/sys/sys/imgact_aout.h
+++ b/sys/sys/imgact_aout.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93
- *	$Id: imgact_aout.h,v 1.8 1997/12/19 20:44:48 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_IMGACT_AOUT_H_
diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
index 618abec7427a..596ecdbb14d8 100644
--- a/sys/sys/imgact_elf.h
+++ b/sys/sys/imgact_elf.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: imgact_elf.h,v 1.13 1999/02/06 16:39:16 mjacob Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_IMGACT_ELF_H_
diff --git a/sys/sys/inflate.h b/sys/sys/inflate.h
index 73d9175e8ffa..8b1e95de1958 100644
--- a/sys/sys/inflate.h
+++ b/sys/sys/inflate.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: inflate.h,v 1.8 1997/02/22 09:45:20 peter Exp $
+ * $FreeBSD$
  *
  */
 #ifndef	_SYS_INFLATE_H_
diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h
index 6c717030b615..01b45cb9f879 100644
--- a/sys/sys/interrupt.h
+++ b/sys/sys/interrupt.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: interrupt.h,v 1.7 1998/08/11 15:08:13 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_INTERRUPT_H_
diff --git a/sys/sys/inttypes.h b/sys/sys/inttypes.h
index 824786a65aa6..f1d94c615e7f 100644
--- a/sys/sys/inttypes.h
+++ b/sys/sys/inttypes.h
@@ -1,6 +1,6 @@
 /*
  * This file is in the public domain.
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_INTTYPES_H_
diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h
index 26cd972aef1e..3dc3c1e0164a 100644
--- a/sys/sys/ioccom.h
+++ b/sys/sys/ioccom.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioccom.h	8.2 (Berkeley) 3/28/94
- * $Id: ioccom.h,v 1.6 1997/02/22 09:45:21 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_IOCCOM_H_
diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index 48e018395471..11a22c60434e 100644
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl.h	8.6 (Berkeley) 3/28/94
- * $Id: ioctl.h,v 1.6 1997/02/22 09:45:22 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_IOCTL_H_
diff --git a/sys/sys/ioctl_bt848.h b/sys/sys/ioctl_bt848.h
index 0767abddb684..30e18d156da3 100644
--- a/sys/sys/ioctl_bt848.h
+++ b/sys/sys/ioctl_bt848.h
@@ -1,7 +1,7 @@
 /*
  * extensions to ioctl_meteor.h for the bt848 cards
  *
- * $Id: ioctl_bt848.h,v 1.22 1999/02/15 11:04:36 roger Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/ioctl_compat.h b/sys/sys/ioctl_compat.h
index ab067b97e42b..baf42e090f83 100644
--- a/sys/sys/ioctl_compat.h
+++ b/sys/sys/ioctl_compat.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl_compat.h	8.4 (Berkeley) 1/21/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_IOCTL_COMPAT_H_
diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h
index cb7ff9ece4e9..d81c5bc9d118 100644
--- a/sys/sys/ipc.h
+++ b/sys/sys/ipc.h
@@ -41,7 +41,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ipc.h	8.4 (Berkeley) 2/19/95
- * $Id: ipc.h,v 1.12 1998/02/25 02:17:46 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/jail.h b/sys/sys/jail.h
index ca6fb944edc9..560f4b858666 100644
--- a/sys/sys/jail.h
+++ b/sys/sys/jail.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: jail.h,v 1.2 1999/05/16 10:51:52 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/sys/kbio.h b/sys/sys/kbio.h
index c8e99471e67a..2712a125de22 100644
--- a/sys/sys/kbio.h
+++ b/sys/sys/kbio.h
@@ -1,5 +1,5 @@
 /*-
- * $Id: $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_KBIO_H_
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index 5a2b617a448f..c6d984c1bb05 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $Id: kernel.h,v 1.57 1999/07/04 00:25:33 mckusick Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_KERNEL_H_
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index b0382bd7a1e3..b88b2b62c119 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/2/93
- * $Id: ktrace.h,v 1.13 1999/05/13 09:09:37 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_KTRACE_H_
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index bdc060346a6e..6f7c4ae90a59 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_LIBKERN_H_
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index 00645fb949b4..4e5a94a5aba8 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $Id: conf.h,v 1.78 1999/08/25 22:50:12 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_CONF_H_
diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index 0c0cfa1d354c..407aba14f8d1 100644
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: linker.h,v 1.14 1999/01/27 23:45:44 dillon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_LINKER_H_
diff --git a/sys/sys/linker_set.h b/sys/sys/linker_set.h
index 837da207f7a5..a4736a56707d 100644
--- a/sys/sys/linker_set.h
+++ b/sys/sys/linker_set.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: linker_set.h,v 1.2 1999/05/08 12:52:26 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_LINKER_SET_H_
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index 67a56d97b97b..04157c0fc3dc 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lock.h	8.12 (Berkeley) 5/19/95
- * $Id: lock.h,v 1.14 1999/06/26 02:45:40 mckusick Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_LOCK_H_
diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h
index 2bd1898bdaf5..17980f6a1bbd 100644
--- a/sys/sys/lockf.h
+++ b/sys/sys/lockf.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lockf.h	8.1 (Berkeley) 6/11/93
- * $Id: lockf.h,v 1.8 1997/09/07 05:27:16 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_LOCKF_H_
diff --git a/sys/sys/lockmgr.h b/sys/sys/lockmgr.h
index 67a56d97b97b..04157c0fc3dc 100644
--- a/sys/sys/lockmgr.h
+++ b/sys/sys/lockmgr.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lock.h	8.12 (Berkeley) 5/19/95
- * $Id: lock.h,v 1.14 1999/06/26 02:45:40 mckusick Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_LOCK_H_
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index c1fc86d7516c..bf85c33db3dc 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)malloc.h	8.5 (Berkeley) 5/3/95
- * $Id: malloc.h,v 1.41 1999/01/27 21:50:00 dillon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_MALLOC_H_
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 959b70b073e1..475b997ab6cb 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mbuf.h	8.5 (Berkeley) 2/19/95
- * $Id: mbuf.h,v 1.30 1998/11/05 14:28:25 dg Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_MBUF_H_
diff --git a/sys/sys/md5.h b/sys/sys/md5.h
index 1b636b590151..a69f79099560 100644
--- a/sys/sys/md5.h
+++ b/sys/sys/md5.h
@@ -1,5 +1,5 @@
 /* MD5.H - header file for MD5C.C
- * $Id: md5.h,v 1.10 1998/03/27 10:22:35 phk Exp $
+ * $FreeBSD$
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index 7329d8f7ae46..d5257ea69536 100644
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mman.h	8.2 (Berkeley) 1/9/95
- * $Id: mman.h,v 1.24 1999/01/06 23:05:40 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_MMAN_H_
diff --git a/sys/sys/module.h b/sys/sys/module.h
index 45f3a405990d..83cea0d51463 100644
--- a/sys/sys/module.h
+++ b/sys/sys/module.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: module.h,v 1.10 1999/01/29 08:36:45 dillon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_MODULE_H_
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index a988d3f58945..625d12d9f566 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mount.h	8.21 (Berkeley) 5/20/95
- *	$Id: mount.h,v 1.74 1999/02/16 10:49:55 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_MOUNT_H_
diff --git a/sys/sys/mouse.h b/sys/sys/mouse.h
index 98cc0ad38a05..12d49a2a5d75 100644
--- a/sys/sys/mouse.h
+++ b/sys/sys/mouse.h
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mouse.h,v 1.13 1999/07/12 15:16:12 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_MOUSE_H_
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index 7b998c2ff4f9..3dd70f1bc89d 100644
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: msg.h,v 1.4 1994/06/29 06:44:43 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h
index 4cfd004e49f8..aa7df03e7915 100644
--- a/sys/sys/msgbuf.h
+++ b/sys/sys/msgbuf.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)msgbuf.h	8.1 (Berkeley) 6/2/93
- * $Id: msgbuf.h,v 1.10 1998/05/19 08:58:35 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_MSGBUF_H_
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index 1a91daf0c7fa..30b8b993819e 100644
--- a/sys/sys/mtio.h
+++ b/sys/sys/mtio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mtio.h	8.1 (Berkeley) 6/2/93
- * $Id: mtio.h,v 1.17 1999/02/05 07:57:26 mjacob Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_MTIO_H_
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 5c41f34269ab..c4611d9c3fc4 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)namei.h	8.5 (Berkeley) 1/9/95
- * $Id: namei.h,v 1.20 1998/03/28 10:33:22 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_NAMEI_H_
diff --git a/sys/sys/param.h b/sys/sys/param.h
index ef89e207e8f4..b61279471c54 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $Id: param.h,v 1.50 1999/06/20 08:34:24 jb Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PARAM_H_
diff --git a/sys/sys/pioctl.h b/sys/sys/pioctl.h
index 8c936a030799..b43a47ff5bff 100644
--- a/sys/sys/pioctl.h
+++ b/sys/sys/pioctl.h
@@ -33,7 +33,7 @@
 /*
  * procfs ioctl definitions.
  *
- * $Id: pioctl.h,v 1.6 1997/12/20 03:05:35 sef Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PIOCTL_H
diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h
index 9b06500d75c2..e95f45534537 100644
--- a/sys/sys/pipe.h
+++ b/sys/sys/pipe.h
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: pipe.h,v 1.11 1998/11/11 10:04:12 truckman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PIPE_H_
diff --git a/sys/sys/poll.h b/sys/sys/poll.h
index 9e8986aae763..7620a39bd512 100644
--- a/sys/sys/poll.h
+++ b/sys/sys/poll.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: poll.h,v 1.3 1997/12/15 03:09:48 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_POLL_H_
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index f735c2181307..7885af31d6d7 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.15 (Berkeley) 5/19/95
- * $Id: proc.h,v 1.85 1999/07/04 00:25:34 mckusick Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PROC_H_
diff --git a/sys/sys/procfs.h b/sys/sys/procfs.h
index d0656861cc68..04f0e1c71a80 100644
--- a/sys/sys/procfs.h
+++ b/sys/sys/procfs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PROCFS_H_
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index 99a1d92dd731..15f6e13aef55 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- *	$Id: protosw.h,v 1.25 1998/08/23 03:07:17 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PROTOSW_H_
diff --git a/sys/sys/ptio.h b/sys/sys/ptio.h
index dd4f1492c889..1292280528d3 100644
--- a/sys/sys/ptio.h
+++ b/sys/sys/ptio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ptio.h,v 1.1 1999/08/20 03:48:11 ken Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PTIO_H_
diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h
index 288a0fa2766c..f7f77edeec81 100644
--- a/sys/sys/ptrace.h
+++ b/sys/sys/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.2 (Berkeley) 1/4/94
- * $Id: ptrace.h,v 1.7 1997/02/22 09:45:43 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_PTRACE_H_
diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index fd4df60a60dd..4bf34b8d720e 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $Id: queue.h,v 1.25 1999/04/20 22:37:17 n_hibma Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_QUEUE_H_
diff --git a/sys/sys/random.h b/sys/sys/random.h
index 569173a1a6a2..e084f8111d1e 100644
--- a/sys/sys/random.h
+++ b/sys/sys/random.h
@@ -1,7 +1,7 @@
 /*
  * random.h -- A strong random number generator
  *
- * $Id: random.h,v 1.15 1998/06/18 15:32:05 bde Exp $
+ * $FreeBSD$
  *
  * Version 0.95, last modified 18-Oct-95
  * 
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
index d9678bcf09a1..d0c4210515eb 100644
--- a/sys/sys/reboot.h
+++ b/sys/sys/reboot.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reboot.h	8.3 (Berkeley) 12/13/94
- * $Id: reboot.h,v 1.16 1997/02/22 09:45:45 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_REBOOT_H_
diff --git a/sys/sys/resource.h b/sys/sys/resource.h
index 7e09e86dadce..3dc21820fb5e 100644
--- a/sys/sys/resource.h
+++ b/sys/sys/resource.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)resource.h	8.4 (Berkeley) 1/9/95
- * $Id: resource.h,v 1.8 1997/11/18 08:07:37 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_RESOURCE_H_
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index 9e476eccce2e..eca8e47d968e 100644
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)resourcevar.h	8.4 (Berkeley) 1/9/95
- * $Id: resourcevar.h,v 1.12 1998/05/28 09:30:27 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_RESOURCEVAR_H_
diff --git a/sys/sys/rman.h b/sys/sys/rman.h
index 278e33cba9d2..6283f315ce1e 100644
--- a/sys/sys/rman.h
+++ b/sys/sys/rman.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rman.h,v 1.1 1998/10/29 01:48:30 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_RMAN_H_
diff --git a/sys/sys/rtprio.h b/sys/sys/rtprio.h
index 6f196ab1c0be..5d115f5693db 100644
--- a/sys/sys/rtprio.h
+++ b/sys/sys/rtprio.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rtprio.h,v 1.6 1998/03/08 17:25:35 dufault Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_RTPRIO_H_
diff --git a/sys/sys/scsiio.h b/sys/sys/scsiio.h
index b7cbfd4136c3..b49c8d6707da 100644
--- a/sys/sys/scsiio.h
+++ b/sys/sys/scsiio.h
@@ -1,5 +1,5 @@
 /*
- * $Id: scsiio.h,v 1.9 1998/02/01 04:13:13 wollman Exp $
+ * $FreeBSD$
  */
 #ifndef	_SYS_SCSIIO_H_
 #define	_SYS_SCSIIO_H_
diff --git a/sys/sys/select.h b/sys/sys/select.h
index e69971e3b684..89e7f9adcbbc 100644
--- a/sys/sys/select.h
+++ b/sys/sys/select.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)select.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SELECT_H_
diff --git a/sys/sys/selinfo.h b/sys/sys/selinfo.h
index e69971e3b684..89e7f9adcbbc 100644
--- a/sys/sys/selinfo.h
+++ b/sys/sys/selinfo.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)select.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SELECT_H_
diff --git a/sys/sys/sem.h b/sys/sys/sem.h
index b51fc2467527..798f5bb7d124 100644
--- a/sys/sys/sem.h
+++ b/sys/sys/sem.h
@@ -1,4 +1,4 @@
-/* $Id: sem.h,v 1.17 1998/12/14 21:01:47 dillon Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index 0e8bf40783b4..a792f561b116 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1,4 +1,4 @@
-/* $Id: shm.h,v 1.11 1997/02/22 09:45:52 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 471baa97b754..4a0fee85f7f1 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $Id: signal.h,v 1.14 1998/08/05 09:04:36 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_SIGNAL_H_
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index e2bdb4a97c61..058f0f1562dc 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signalvar.h	8.6 (Berkeley) 2/19/95
- * $Id: signalvar.h,v 1.24 1999/07/06 07:13:48 cracauer Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_SIGNALVAR_H_		/* tmp for user.h */
diff --git a/sys/sys/sliceio.h b/sys/sys/sliceio.h
index 2a519affb507..e93eb3bbcaae 100644
--- a/sys/sys/sliceio.h
+++ b/sys/sys/sliceio.h
@@ -1,5 +1,5 @@
 /*
- * $Id: sliceio.h,v 1.1 1998/04/19 23:32:43 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_SLICEIO_H_
diff --git a/sys/sys/smp.h b/sys/sys/smp.h
index c425db6f7d32..0524d76b6fbe 100644
--- a/sys/sys/smp.h
+++ b/sys/sys/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: smp.h,v 1.45 1999/04/28 01:04:07 luoqi Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index b7da75a1c515..a7b88d464b20 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $Id: socket.h,v 1.26 1998/09/15 11:44:44 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SOCKET_H_
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index 8fb052c297c5..fb1542582c8b 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socketvar.h	8.3 (Berkeley) 2/19/95
- *	$Id: socketvar.h,v 1.37 1999/04/04 21:41:28 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SOCKETVAR_H_
diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h
index 36f0c2e213be..afefc83d7f20 100644
--- a/sys/sys/sockio.h
+++ b/sys/sys/sockio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sockio.h	8.1 (Berkeley) 3/28/94
- * $Id: sockio.h,v 1.11 1997/10/07 07:39:40 joerg Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_SOCKIO_H_
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 52a1a416601b..f6dc2319ca3f 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stat.h	8.12 (Berkeley) 6/16/95
- * $Id: stat.h,v 1.16 1999/05/11 19:54:58 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_STAT_H_
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index c40111565347..b776b22531c6 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
- * $Id: sysctl.h,v 1.73 1999/04/28 11:38:10 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SYSCTL_H_
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index 9bfc9788eca0..ab258c2e5ea3 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sysent.h,v 1.19 1998/09/14 05:36:51 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SYSENT_H_
diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index 3546e6b1d374..634db8f3b3c2 100644
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SYSLIMITS_H_
diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h
index 0a9df010ce3f..8359101a59e8 100644
--- a/sys/sys/syslog.h
+++ b/sys/sys/syslog.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
- * $Id: syslog.h,v 1.16 1998/07/13 06:45:17 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SYSLOG_H_
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index e2fdc9ff4ddb..9ed5a11fff6e 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $Id: systm.h,v 1.95 1999/07/24 09:34:11 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SYSTM_H_
diff --git a/sys/sys/tablet.h b/sys/sys/tablet.h
index e934d3c3dcab..5caa181af9f1 100644
--- a/sys/sys/tablet.h
+++ b/sys/sys/tablet.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tablet.h	8.4 (Berkeley) 7/10/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_TABLET_H_
diff --git a/sys/sys/termios.h b/sys/sys/termios.h
index 09025b4ab34c..72f4b9e060cf 100644
--- a/sys/sys/termios.h
+++ b/sys/sys/termios.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)termios.h	8.3 (Berkeley) 3/28/94
- * $Id: termios.h,v 1.10 1998/03/12 14:09:53 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TERMIOS_H_
diff --git a/sys/sys/time.h b/sys/sys/time.h
index 32ea4a0d8f98..1742eb4c837b 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $Id: time.h,v 1.38 1999/04/25 08:59:55 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TIME_H_
diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h
index be00cda04262..40aba11ae6b4 100644
--- a/sys/sys/timeb.h
+++ b/sys/sys/timeb.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)timeb.h	8.2 (Berkeley) 1/21/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TIMEB_H_
diff --git a/sys/sys/timepps.h b/sys/sys/timepps.h
index b278aa14b8b3..58e562f3612d 100644
--- a/sys/sys/timepps.h
+++ b/sys/sys/timepps.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: timepps.h,v 1.7 1999/03/30 11:44:59 phk Exp $
+ * $FreeBSD$
  *
  * The is a FreeBSD protype version of the "draft-mogul-pps-api-02.txt" 
  * specification for Pulse Per Second timing interfaces.  
diff --git a/sys/sys/timers.h b/sys/sys/timers.h
index 6482d3c92018..043d37670b08 100644
--- a/sys/sys/timers.h
+++ b/sys/sys/timers.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  * Description : Basic timers header.
  */
diff --git a/sys/sys/times.h b/sys/sys/times.h
index 961ebfd18264..ba6dee0ed709 100644
--- a/sys/sys/times.h
+++ b/sys/sys/times.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)times.h	8.4 (Berkeley) 1/21/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_TIMES_H_
diff --git a/sys/sys/timetc.h b/sys/sys/timetc.h
index 32ea4a0d8f98..1742eb4c837b 100644
--- a/sys/sys/timetc.h
+++ b/sys/sys/timetc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $Id: time.h,v 1.38 1999/04/25 08:59:55 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TIME_H_
diff --git a/sys/sys/tprintf.h b/sys/sys/tprintf.h
index 239bb52a78e7..ef5660907adb 100644
--- a/sys/sys/tprintf.h
+++ b/sys/sys/tprintf.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tprintf.h	8.1 (Berkeley) 6/2/93
- * $Id: tprintf.h,v 1.7 1998/07/13 06:45:18 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TPRINTF_H_
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index 63a49e90417c..00fb7a8ad5ca 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.h	8.6 (Berkeley) 1/21/94
- * $Id: tty.h,v 1.46 1999/08/08 20:24:48 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TTY_H_
diff --git a/sys/sys/ttychars.h b/sys/sys/ttychars.h
index 3b96b40ab7db..d9b59b7f01e9 100644
--- a/sys/sys/ttychars.h
+++ b/sys/sys/ttychars.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttychars.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TTYCHARS_H_
diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h
index a181b77daa5e..ac6c45a41592 100644
--- a/sys/sys/ttycom.h
+++ b/sys/sys/ttycom.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttycom.h	8.1 (Berkeley) 3/28/94
- * $Id: ttycom.h,v 1.12 1997/02/22 09:46:14 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_TTYCOM_H_
diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h
index f6f8f48a9812..6d23e3bdd074 100644
--- a/sys/sys/ttydefaults.h
+++ b/sys/sys/ttydefaults.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
- * $Id: ttydefaults.h,v 1.11 1997/02/22 09:46:16 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/ttydev.h b/sys/sys/ttydev.h
index 79e54f4611c2..739ec477c619 100644
--- a/sys/sys/ttydev.h
+++ b/sys/sys/ttydev.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydev.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * $FreeBSD$
  */
 
 /* COMPATIBILITY HEADER FILE */
diff --git a/sys/sys/types.h b/sys/sys/types.h
index cd42c19516ca..bc9c0d44b2d1 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.6 (Berkeley) 2/19/95
- * $Id: types.h,v 1.34 1999/07/18 02:26:02 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TYPES_H_
diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h
index f65dbe05f0c9..6009f93a675d 100644
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ucred.h	8.4 (Berkeley) 1/9/95
- * $Id: ucred.h,v 1.11 1999/04/27 11:18:38 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_UCRED_H_
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index 5373f886fbec..e55b84055563 100644
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $Id: uio.h,v 1.8 1997/12/19 10:03:31 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_UIO_H_
diff --git a/sys/sys/un.h b/sys/sys/un.h
index 36dd7257b310..a99ba68d9a14 100644
--- a/sys/sys/un.h
+++ b/sys/sys/un.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)un.h	8.3 (Berkeley) 2/19/95
- * $Id: un.h,v 1.14 1998/05/15 20:11:40 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_UN_H_
diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h
index d6216039f6b9..7503cddf2574 100644
--- a/sys/sys/unistd.h
+++ b/sys/sys/unistd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.2 (Berkeley) 1/7/94
- * $Id: unistd.h,v 1.18 1998/12/19 02:55:34 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_UNISTD_H_
diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h
index 7c3881267ef8..c0b8a373a197 100644
--- a/sys/sys/unpcb.h
+++ b/sys/sys/unpcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unpcb.h	8.1 (Berkeley) 6/2/93
- * $Id: unpcb.h,v 1.7 1998/05/15 20:11:40 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_UNPCB_H_
diff --git a/sys/sys/user.h b/sys/sys/user.h
index 37fe257a420e..62ea5c53069a 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)user.h	8.2 (Berkeley) 9/23/93
- * $Id: user.h,v 1.20 1999/01/26 02:38:11 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_USER_H_
diff --git a/sys/sys/utsname.h b/sys/sys/utsname.h
index 0387cc1d206e..375c3d403f36 100644
--- a/sys/sys/utsname.h
+++ b/sys/sys/utsname.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utsname.h	8.1 (Berkeley) 1/4/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_UTSNAME_H
diff --git a/sys/sys/vadvise.h b/sys/sys/vadvise.h
index 28b29582efdc..cf179f04c07f 100644
--- a/sys/sys/vadvise.h
+++ b/sys/sys/vadvise.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vadvise.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_VADVISE_H_
diff --git a/sys/sys/vcmd.h b/sys/sys/vcmd.h
index 36d3cf83b294..837255cf6dd4 100644
--- a/sys/sys/vcmd.h
+++ b/sys/sys/vcmd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vcmd.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_VCMD_H_
diff --git a/sys/sys/vlimit.h b/sys/sys/vlimit.h
index 6a63166b345d..a5a86d7f65b8 100644
--- a/sys/sys/vlimit.h
+++ b/sys/sys/vlimit.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vlimit.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_VLIMIT_H_
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index b476d00bac8b..e382d900f6df 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vmmeter.h	8.2 (Berkeley) 7/10/94
- * $Id: vmmeter.h,v 1.17 1999/02/08 02:42:13 dillon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_VMMETER_H_
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index b9c43e37fc49..e78db4317881 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $Id: vnode.h,v 1.97 1999/08/25 12:24:30 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_VNODE_H_
diff --git a/sys/sys/vsio.h b/sys/sys/vsio.h
index 93a1c70bcd28..702e71dce2b3 100644
--- a/sys/sys/vsio.h
+++ b/sys/sys/vsio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vsio.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_VSIO_H_
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index b0716d27fa7a..c854e149d3c6 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)wait.h	8.2 (Berkeley) 7/10/94
- * $Id: wait.h,v 1.8 1997/02/22 09:46:31 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_WAIT_H_
diff --git a/sys/sys/xrpuio.h b/sys/sys/xrpuio.h
index a5eca5631e11..70de800d9a4a 100644
--- a/sys/sys/xrpuio.h
+++ b/sys/sys/xrpuio.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/tools/devlist2h.awk b/sys/tools/devlist2h.awk
index c6872bc5a8e7..1863a227ab7f 100644
--- a/sys/tools/devlist2h.awk
+++ b/sys/tools/devlist2h.awk
@@ -64,7 +64,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id$
+# $FreeBSD$
 #
 function collectline(f, line) {
 	oparen = 0
diff --git a/sys/tools/miidevs2h.awk b/sys/tools/miidevs2h.awk
index c6872bc5a8e7..1863a227ab7f 100644
--- a/sys/tools/miidevs2h.awk
+++ b/sys/tools/miidevs2h.awk
@@ -64,7 +64,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id$
+# $FreeBSD$
 #
 function collectline(f, line) {
 	oparen = 0
diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk
index 07e0e91781c5..9c042dbac7d8 100644
--- a/sys/tools/vnode_if.awk
+++ b/sys/tools/vnode_if.awk
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
-# $Id: vnode_if.sh,v 1.17 1999/02/28 11:30:00 bde Exp $
+# $FreeBSD$
 #
 
 # Script to produce VFS front-end sugar.
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 8e205129bea5..74443805a332 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.18 (Berkeley) 5/26/95
- * $Id: ffs_alloc.c,v 1.59 1999/08/23 20:35:19 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index 5b3df8b65882..ebd630f45c77 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_balloc.c	8.8 (Berkeley) 6/16/95
- * $Id: ffs_balloc.c,v 1.22 1999/01/28 00:57:54 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index 169bf30bdd4c..177a820fd214 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.6 (Berkeley) 3/30/95
- * $Id: ffs_extern.h,v 1.25 1999/01/07 16:14:16 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_FFS_EXTERN_H
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 0895173b6659..aad428527aea 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_inode.c	8.13 (Berkeley) 4/21/95
- * $Id: ffs_inode.c,v 1.54 1999/05/02 23:56:48 alc Exp $
+ * $FreeBSD$
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ffs/ffs_softdep_stub.c b/sys/ufs/ffs/ffs_softdep_stub.c
index a396960312d6..652e20ba3cde 100644
--- a/sys/ufs/ffs/ffs_softdep_stub.c
+++ b/sys/ufs/ffs/ffs_softdep_stub.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ffs_softdep_stub.c	9.1 (McKusick) 7/10/97
- *	$Id$
+ * $FreeBSD$
  */
 
 /* 
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index 5052b89f8a8c..f005c71171ad 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_subr.c	8.5 (Berkeley) 3/21/95
- * $Id: ffs_subr.c,v 1.22 1998/11/29 03:12:06 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_tables.c b/sys/ufs/ffs/ffs_tables.c
index a3dfe4f0d22e..0256ee2244bd 100644
--- a/sys/ufs/ffs/ffs_tables.c
+++ b/sys/ufs/ffs/ffs_tables.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_tables.c	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 37c82cc883aa..3efbdebb8f39 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.31 (Berkeley) 5/20/95
- * $Id: ffs_vfsops.c,v 1.102 1999/08/13 10:29:33 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index dbf2a913b4bd..59b8dcdbdeeb 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vnops.c	8.15 (Berkeley) 5/14/95
- * $Id: ffs_vnops.c,v 1.58 1999/06/26 02:46:39 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index 9f997318f997..91979d87cefc 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fs.h	8.13 (Berkeley) 3/21/95
- * $Id: fs.h,v 1.12 1997/03/24 03:19:37 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_FFS_FS_H_
diff --git a/sys/ufs/mfs/mfs_extern.h b/sys/ufs/mfs/mfs_extern.h
index f6dc287736cf..e146382e3bec 100644
--- a/sys/ufs/mfs/mfs_extern.h
+++ b/sys/ufs/mfs/mfs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_extern.h	8.4 (Berkeley) 3/30/95
- * $Id: mfs_extern.h,v 1.13 1999/05/10 17:12:43 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_MFS_MFS_EXTERN_H_
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index 87b129a32ddb..044bf634390d 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vfsops.c	8.11 (Berkeley) 6/19/95
- * $Id: mfs_vfsops.c,v 1.67 1999/08/24 18:35:33 phk Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c
index c2a5fbd03fa0..ad691df4e91c 100644
--- a/sys/ufs/mfs/mfs_vnops.c
+++ b/sys/ufs/mfs/mfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vnops.c	8.11 (Berkeley) 5/22/95
- * $Id: mfs_vnops.c,v 1.45 1999/06/26 02:46:41 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/mfs/mfsnode.h b/sys/ufs/mfs/mfsnode.h
index f56d4da7101d..da428144b9a6 100644
--- a/sys/ufs/mfs/mfsnode.h
+++ b/sys/ufs/mfs/mfsnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfsnode.h	8.3 (Berkeley) 5/19/95
- * $Id: mfsnode.h,v 1.10 1997/10/16 10:50:05 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_MFS_MFSNODE_H_
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index 0b8b60947479..461a6c0bdf20 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dinode.h	8.3 (Berkeley) 1/21/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_DINODE_H_
diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h
index 6a7a853035b8..a8948b9aaeff 100644
--- a/sys/ufs/ufs/dir.h
+++ b/sys/ufs/ufs/dir.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/21/94
- * $Id: dir.h,v 1.7 1997/02/22 09:47:38 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_DIR_H_
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 77fe7b3983b7..78fbc0adaff5 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $Id: inode.h,v 1.25 1999/03/06 05:21:09 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_INODE_H_
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index e5ce29b8bf1e..f449a1a5d881 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quota.h	8.3 (Berkeley) 8/19/94
- * $Id: quota.h,v 1.12 1999/03/05 09:28:33 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_QUOTA_H_
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 9a477c51fb42..cf564071491d 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.29 1999/08/08 18:43:03 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c
index a46e11ab7b0c..a52efbd9ef57 100644
--- a/sys/ufs/ufs/ufs_disksubr.c
+++ b/sys/ufs/ufs/ufs_disksubr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.40 1999/06/26 02:46:44 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index 7798b975c9d6..ee2779d78778 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_extern.h	8.10 (Berkeley) 5/14/95
- * $Id: ufs_extern.h,v 1.23 1998/03/08 09:59:24 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_EXTERN_H_
diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c
index c2dd63e5b7f2..0a7c7d583191 100644
--- a/sys/ufs/ufs/ufs_ihash.c
+++ b/sys/ufs/ufs/ufs_ihash.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $Id: ufs_ihash.c,v 1.18 1999/01/02 11:34:56 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index 1f4e0b1af8d7..edb8c153f190 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_inode.c	8.9 (Berkeley) 5/14/95
- * $Id: ufs_inode.c,v 1.23 1998/07/03 22:17:02 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index 29e522768a96..020750d5ddc2 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lookup.c	8.15 (Berkeley) 6/16/95
- * $Id: ufs_lookup.c,v 1.28 1999/06/16 23:27:51 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 99c35c7b5711..e1b5b5d986f1 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_quota.c	8.5 (Berkeley) 5/20/95
- * $Id: ufs_quota.c,v 1.24 1998/07/15 02:32:34 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c
index ad89a3195039..59f064e20ad9 100644
--- a/sys/ufs/ufs/ufs_readwrite.c
+++ b/sys/ufs/ufs/ufs_readwrite.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_readwrite.c	8.11 (Berkeley) 5/8/95
- * $Id: ufs_readwrite.c,v 1.62 1999/08/01 06:04:52 alc Exp $
+ * $FreeBSD$
  */
 
 #define	BLKSIZE(a, b, c)	blksize(a, b, c)
diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c
index 55eb12db35ef..f1284008a816 100644
--- a/sys/ufs/ufs/ufs_vfsops.c
+++ b/sys/ufs/ufs/ufs_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vfsops.c	8.8 (Berkeley) 5/20/95
- * $Id: ufs_vfsops.c,v 1.14 1999/04/27 11:18:43 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index e474bdab5b18..e95c5e962c87 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vnops.c	8.27 (Berkeley) 5/27/95
- * $Id: ufs_vnops.c,v 1.121 1999/08/23 20:35:21 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 70652b58f9ba..44974548e70a 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $Id: ufsmount.h,v 1.13 1998/01/30 11:34:06 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c
index a850260dd7d6..91115f4115ac 100644
--- a/sys/vm/default_pager.c
+++ b/sys/vm/default_pager.c
@@ -36,7 +36,7 @@
  * physically freed after having been cleaned and even then vm_page->swapblk
  * is maintained whenever a resident page also has swap backing store.
  *
- *	$Id: default_pager.c,v 1.18 1999/01/21 09:33:06 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/default_pager.h b/sys/vm/default_pager.h
index 58911450a5ef..842969accd4c 100644
--- a/sys/vm/default_pager.h
+++ b/sys/vm/default_pager.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _DEFAULT_PAGER_H_
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 0652b277cab4..d08c14bc5d05 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device_pager.c	8.1 (Berkeley) 6/11/93
- * $Id: device_pager.c,v 1.42 1999/05/13 04:02:07 luoqi Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index 32d1846e15b6..194ac283b309 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: pmap.h,v 1.30 1999/04/23 20:29:57 dt Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 9ba177056946..a3e603b1d70c 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -64,7 +64,7 @@
  *
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
  *
- * $Id: swap_pager.c,v 1.123 1999/08/17 05:56:00 alc Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index 50acaf115dc7..4557036b8a50 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swap_pager.h	7.1 (Berkeley) 12/5/90
- *	$Id: swap_pager.h,v 1.23 1999/01/21 08:29:10 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index 19ea10e5eb78..1fd27452dd03 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm.h	8.2 (Berkeley) 12/13/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef VM_H
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index 93c9c606afa6..c8b90ba72320 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $Id: vm_extern.h,v 1.41 1999/04/13 19:17:15 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _VM_EXTERN_H_
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index dd53ad9c57b7..7431e53418df 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -66,7 +66,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_fault.c,v 1.103 1999/07/20 05:46:56 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index a83d029a5715..e53079a43a0f 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,7 +59,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_glue.c,v 1.87 1999/07/21 18:02:26 alc Exp $
+ * $FreeBSD$
  */
 
 #include "opt_rlimit.h"
diff --git a/sys/vm/vm_inherit.h b/sys/vm/vm_inherit.h
index b3cfbd812636..8d7b7f6df501 100644
--- a/sys/vm/vm_inherit.h
+++ b/sys/vm/vm_inherit.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index 4eb8acce353f..f7f1df84a199 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_init.c,v 1.17 1998/02/04 22:33:45 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 6602ee57a7e0..409c5f487fde 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_kern.c,v 1.57 1999/08/15 21:55:19 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h
index 0f470bd3c7c8..9be497653d80 100644
--- a/sys/vm/vm_kern.h
+++ b/sys/vm/vm_kern.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_kern.h,v 1.18 1999/08/15 21:55:20 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _VM_VM_KERN_H_
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 6ea4395b3b83..03633e99d95c 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.c,v 1.175 1999/08/10 04:50:20 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index f12c042cd6e8..c5fbee562cbc 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.h,v 1.47 1999/08/23 18:08:34 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index 1f355d4e6828..4e7f0fb12c3d 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_meter.c	8.4 (Berkeley) 1/4/94
- * $Id: vm_meter.c,v 1.30 1999/02/07 21:48:22 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index fe9bf90427b9..9fb8458bc1a0 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
  *
  *	@(#)vm_mmap.c	8.4 (Berkeley) 1/12/94
- * $Id: vm_mmap.c,v 1.100 1999/06/05 18:21:53 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 7ff5175a73b9..0ed361db755e 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.c,v 1.165 1999/08/15 21:55:20 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 62e52e9ee283..385ef70ca0df 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.h,v 1.58 1999/07/16 05:11:37 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index c384580c0175..f6db00ef98a0 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_page.c	7.4 (Berkeley) 5/7/91
- *	$Id: vm_page.c,v 1.140 1999/08/17 18:09:01 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 7a93d18b2d50..6ffb8676eebb 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_page.h,v 1.69 1999/08/17 04:02:33 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 7ce3a3a7f7a8..bc8784cc587d 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -65,7 +65,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.c,v 1.145 1999/08/17 00:07:35 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h
index 68c0561fc5e8..7af6b06ff0f1 100644
--- a/sys/vm/vm_pageout.h
+++ b/sys/vm/vm_pageout.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.h,v 1.23 1998/01/22 17:30:43 dyson Exp $
+ * $FreeBSD$
  */
 
 #ifndef _VM_VM_PAGEOUT_H_
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index f4639e5b3421..70452ed04ebd 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pager.c,v 1.50 1999/07/04 00:25:38 mckusick Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index aff14ab29aef..d5df7c8f0ec7 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_pager.h	8.4 (Berkeley) 1/12/94
- * $Id: vm_pager.h,v 1.21 1999/03/14 09:20:00 julian Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index a3680c48c693..66733cc4b1ca 100644
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_param.h,v 1.10 1999/06/20 04:55:29 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_prot.h b/sys/vm/vm_prot.h
index cdddcea786a5..68e552e018ad 100644
--- a/sys/vm/vm_prot.h
+++ b/sys/vm/vm_prot.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_prot.h,v 1.7 1997/02/22 09:48:38 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index a2218cdbc441..8a178bd895c8 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
- * $Id: vm_swap.c,v 1.83 1999/08/24 05:58:35 green Exp $
+ * $FreeBSD$
  */
 
 #include "opt_swap.h"
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index d095283888ba..f81101b2e78a 100644
--- a/sys/vm/vm_unix.c
+++ b/sys/vm/vm_unix.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_unix.c 1.1 89/11/07$
  *
  *	@(#)vm_unix.c	8.1 (Berkeley) 6/11/93
- * $Id: vm_unix.c,v 1.20 1999/02/09 01:39:29 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_zone.c b/sys/vm/vm_zone.c
index 0d684a74d321..3befc9119c00 100644
--- a/sys/vm/vm_zone.c
+++ b/sys/vm/vm_zone.c
@@ -11,7 +11,7 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *	John S. Dyson.
  *
- * $Id: vm_zone.c,v 1.25 1999/01/08 17:31:29 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_zone.h b/sys/vm/vm_zone.h
index 8fe91d1e1aaf..b8aa933b3c37 100644
--- a/sys/vm/vm_zone.h
+++ b/sys/vm/vm_zone.h
@@ -11,7 +11,7 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *	John S. Dyson.
  *
- * $Id: vm_zone.h,v 1.11 1999/01/08 17:31:30 eivind Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_ZONE_H
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index c44391c1ee97..367d3a39f398 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vnode_pager.c	7.5 (Berkeley) 4/20/91
- *	$Id: vnode_pager.c,v 1.112 1999/07/01 19:53:43 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h
index b833e635ff26..339851d21b65 100644
--- a/sys/vm/vnode_pager.h
+++ b/sys/vm/vnode_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode_pager.h	8.1 (Berkeley) 6/11/93
- * $Id: vnode_pager.h,v 1.11 1998/02/26 06:39:59 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_VNODE_PAGER_
diff --git a/tools/3.0-upgrade/cvt-wtmp.c b/tools/3.0-upgrade/cvt-wtmp.c
index f5d3653710b4..c5d3b54a7bbc 100644
--- a/tools/3.0-upgrade/cvt-wtmp.c
+++ b/tools/3.0-upgrade/cvt-wtmp.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: cvt-wtmp.c,v 1.4 1997/02/22 14:08:01 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/tools/LibraryReport/LibraryReport.tcl b/tools/LibraryReport/LibraryReport.tcl
index 37b4379bf6c7..fbf63896c71d 100755
--- a/tools/LibraryReport/LibraryReport.tcl
+++ b/tools/LibraryReport/LibraryReport.tcl
@@ -50,7 +50,7 @@ exec tclsh $0 $*
 #
 ################################################################################
 #
-# $Id$
+# $FreeBSD$
 #
 
 #########################################################################################
diff --git a/tools/diag/ac/ac b/tools/diag/ac/ac
index f2815e5eca39..6bff17339a14 100644
--- a/tools/diag/ac/ac
+++ b/tools/diag/ac/ac
@@ -4,7 +4,7 @@
 #
 # ac - check if the FreeBSD handbook is in sync with the committers list
 #
-# $Id$
+# $FreeBSD$
 
 : ${CVSROOT=/usr/cvs}
 contrib=src/share/doc/handbook/contrib.sgml
diff --git a/tools/diag/httpd-error/httpd-error b/tools/diag/httpd-error/httpd-error
index b1ff405321c0..6882067d75db 100755
--- a/tools/diag/httpd-error/httpd-error
+++ b/tools/diag/httpd-error/httpd-error
@@ -4,7 +4,7 @@
 #
 # httpd-error - check for Web files which does not exists on your host
 #
-# $Id$
+# $FreeBSD$
 
 mode=${1}
 
diff --git a/tools/test/devrandom/hammer.random b/tools/test/devrandom/hammer.random
index a619816f2db5..ea4cb5f64032 100644
--- a/tools/test/devrandom/hammer.random
+++ b/tools/test/devrandom/hammer.random
@@ -5,7 +5,7 @@
 # Read and display random numbers.
 # Try tapping shift/alt/ctrl to get more randomness.
 #
-# $Id$
+# $FreeBSD$
 #
 
 for (;;) {
diff --git a/tools/test/devrandom/hammer.urandom b/tools/test/devrandom/hammer.urandom
index 4e434fae5476..d0b6aa89da58 100644
--- a/tools/test/devrandom/hammer.urandom
+++ b/tools/test/devrandom/hammer.urandom
@@ -5,7 +5,7 @@
 # Read and display random numbers.
 # This also reads /dev/zero to make sure there is no brokenness there.
 #
-# $Id$
+# $FreeBSD$
 #
 
 open(ZERO, "/dev/zero") || die "Cannot open /dev/zero - $!\n";
diff --git a/tools/test/devrandom/stat.16bit b/tools/test/devrandom/stat.16bit
index 83398d5d273a..32a6a9caf550 100644
--- a/tools/test/devrandom/stat.16bit
+++ b/tools/test/devrandom/stat.16bit
@@ -8,7 +8,7 @@
 # Redirect the output from this to a file - and go to the movies while
 # it runs. This program is a CPU Hog!
 #
-# $Id$
+# $FreeBSD$
 #
 
 for ($i = 0; $i < (1024*64); $i++) {
diff --git a/tools/test/devrandom/stat.8bit b/tools/test/devrandom/stat.8bit
index 5c304cb2e68e..03fdbdd5b39d 100644
--- a/tools/test/devrandom/stat.8bit
+++ b/tools/test/devrandom/stat.8bit
@@ -8,7 +8,7 @@
 # Redirect the output from this to a file - and make a cup of coffee while
 # it runs. This program is a CPU Hog!
 #
-# $Id$
+# $FreeBSD$
 #
 
 for ($i = 0; $i < (1024*32); $i++) {
diff --git a/tools/tools/README b/tools/tools/README
index b305823f6169..4ae496136ddf 100644
--- a/tools/tools/README
+++ b/tools/tools/README
@@ -1,4 +1,4 @@
-#	$Id: README,v 1.14 1998/12/17 12:21:19 cracauer Exp $
+# $FreeBSD$
 
 This directory is for tools.
 
diff --git a/tools/tools/diffburst/Makefile b/tools/tools/diffburst/Makefile
index 4e58e4cdd866..6cec60ba256a 100644
--- a/tools/tools/diffburst/Makefile
+++ b/tools/tools/diffburst/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1997/12/06 00:44:04 archie Exp $
+# $FreeBSD$
 
 PROG=		diffburst
 SRCS=		main.c
diff --git a/tools/tools/epfe/epfe.pl b/tools/tools/epfe/epfe.pl
index 4afd824d4791..0aea2c247a64 100644
--- a/tools/tools/epfe/epfe.pl
+++ b/tools/tools/epfe/epfe.pl
@@ -7,7 +7,7 @@
 #	$ cd /usr/share/examples/printing
 #	$ epfe < ../../doc/handbook/printing.sgml
 #
-# $Id$
+# $FreeBSD$
 
 $in = 0; @a = ();
 sub Print { s/\&amp\;/&/g; push(@a,$_); }
diff --git a/tools/tools/html-mv/html-mv b/tools/tools/html-mv/html-mv
index c91f53362b50..29ea1f2db81d 100644
--- a/tools/tools/html-mv/html-mv
+++ b/tools/tools/html-mv/html-mv
@@ -17,7 +17,7 @@
 # FAQ_Can_FreeBSD_handle_multiport_serial_cards_sharing_irqs_.html
 # [...]
 # 
-# $Id$
+# $FreeBSD$
 
 case $# in 0)
 	echo "usage `basename $0` file"
diff --git a/tools/tools/ifinfo/Makefile b/tools/tools/ifinfo/Makefile
index 740a553e275b..2fe0e83260f5 100644
--- a/tools/tools/ifinfo/Makefile
+++ b/tools/tools/ifinfo/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	ifinfo
 SRCS=	ifinfo.c rfc1650.c
diff --git a/tools/tools/ifinfo/ifinfo.c b/tools/tools/ifinfo/ifinfo.c
index b6d837c7ed97..63fad7e75fa0 100644
--- a/tools/tools/ifinfo/ifinfo.c
+++ b/tools/tools/ifinfo/ifinfo.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ifinfo.c,v 1.3 1997/02/22 14:08:24 peter Exp $
+ * $FreeBSD$
  */
 #include <sys/types.h>
 #include <sys/socket.h>		/* for PF_LINK */
diff --git a/tools/tools/ifinfo/ifinfo.h b/tools/tools/ifinfo/ifinfo.h
index 24bd4761a2a8..c05a8b82eca5 100644
--- a/tools/tools/ifinfo/ifinfo.h
+++ b/tools/tools/ifinfo/ifinfo.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 #ifndef	ifinfo_h
 #define	ifinfo_h	1
diff --git a/tools/tools/kdrv/KernelDriver b/tools/tools/kdrv/KernelDriver
index 1644753a529d..b840ff48150a 100755
--- a/tools/tools/kdrv/KernelDriver
+++ b/tools/tools/kdrv/KernelDriver
@@ -73,7 +73,7 @@ exec tclsh $0 $*
 #
 ################################################################################
 #
-# $Id: KernelDriver,v 1.4 1998/05/04 03:30:43 doconnor Exp $
+# $FreeBSD$
 #
 ################################################################################
 
diff --git a/tools/tools/kdrv/sample.drvinfo b/tools/tools/kdrv/sample.drvinfo
index 7618d0b549e4..eeb6a254d080 100644
--- a/tools/tools/kdrv/sample.drvinfo
+++ b/tools/tools/kdrv/sample.drvinfo
@@ -2,7 +2,7 @@
 # Sample driver information file for KernelDriver.  See the top of
 # the KernelDriver script for a more exact definition of the syntax.
 #
-# $Id: sample.drvinfo,v 1.2 1998/05/06 05:45:17 msmith Exp $
+# $FreeBSD$
 
 # Device driver name
 #
diff --git a/tools/tools/kernxref/kernxref.sh b/tools/tools/kernxref/kernxref.sh
index 60973b073aa2..956ad5154992 100644
--- a/tools/tools/kernxref/kernxref.sh
+++ b/tools/tools/kernxref/kernxref.sh
@@ -7,7 +7,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $Id: kernxref.sh,v 1.11 1998/12/08 08:14:37 archie Exp $
+# $FreeBSD$
 #
 # This shellscript will make a cross reference of the symbols of the LINT 
 # kernel.
diff --git a/tools/tools/mid/mid-index b/tools/tools/mid/mid-index
index 053c21e8e959..a5ec10b78f3b 100755
--- a/tools/tools/mid/mid-index
+++ b/tools/tools/mid/mid-index
@@ -2,7 +2,7 @@
 #
 # create message-id / in-reply-to database
 #
-# $Id: mid-index,v 1.5 1998/04/13 13:08:47 wosch Exp $
+# $FreeBSD$
 
 sub usage { die "usage: mid-index name < filelist"; }
 
diff --git a/tools/tools/portsinfo/portsinfo.sh b/tools/tools/portsinfo/portsinfo.sh
index e1c3fd3b8851..f3dcf5039b92 100644
--- a/tools/tools/portsinfo/portsinfo.sh
+++ b/tools/tools/portsinfo/portsinfo.sh
@@ -3,7 +3,7 @@
 #
 # portsinfo - Generate list of new ports for last two weeks.
 #
-# $Id: portsinfo.sh,v 1.3 1997/09/29 18:16:38 wosch Exp $
+# $FreeBSD$
 
 PATH=/bin:/usr/bin:/usr/local/bin:$PATH; export PATH
 
diff --git a/tools/tools/scsi-defects/scsi-defects.pl b/tools/tools/scsi-defects/scsi-defects.pl
index 5f48ec01c5a5..0827182d6e5f 100755
--- a/tools/tools/scsi-defects/scsi-defects.pl
+++ b/tools/tools/scsi-defects/scsi-defects.pl
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 # 
-# $Id$
+# $FreeBSD$
 #
 
 #
diff --git a/tools/tools/tcl_bmake/mkMakefile.sh b/tools/tools/tcl_bmake/mkMakefile.sh
index 0c2ca73d4733..f49a79eac3a5 100644
--- a/tools/tools/tcl_bmake/mkMakefile.sh
+++ b/tools/tools/tcl_bmake/mkMakefile.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: mkMakefile.sh,v 1.28 1998/01/17 15:52:22 bde Exp $
+# $FreeBSD$
 #
 # This script generates a bmake Makefile for src/lib/libtcl
 #
@@ -45,7 +45,7 @@ echo '#
 # Please change src/tools/tools/tcl_bmake/mkMakefile.sh instead
 #
 # Generated by src/tools/tools/tcl_bmake/mkMakefile.sh version:
-# $Id: mkMakefile.sh,v 1.28 1998/01/17 15:52:22 bde Exp $
+# $FreeBSD$
 #
 ' | tr -d '$' >> ${LIBTCL}Makefile
 
diff --git a/tools/tools/upgrade/getosreldate.sh b/tools/tools/upgrade/getosreldate.sh
index cb23ef310d12..3c9564851e16 100755
--- a/tools/tools/upgrade/getosreldate.sh
+++ b/tools/tools/upgrade/getosreldate.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id$
+# $FreeBSD$
 
 RELDATE=`sysctl -n kern.osreldate 2>/dev/null`
 if [ "x$RELDATE" = x ]; then
diff --git a/tools/tools/upgrade/move_aout_libs.sh b/tools/tools/upgrade/move_aout_libs.sh
index 7d9600ffbb60..b00af5204372 100755
--- a/tools/tools/upgrade/move_aout_libs.sh
+++ b/tools/tools/upgrade/move_aout_libs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$Id: move_aout_libs.sh,v 1.4 1999/02/01 12:45:03 jkh Exp $
+# $FreeBSD$
 # 
 # Search for a.out libraries and move them to an aout subdirectory of
 # the elf library directory.
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index ff5f87564dae..f03d0cd658ff 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
-#	$Id: Makefile,v 1.127 1999/04/18 15:56:20 peter Exp $
+# $FreeBSD$
 
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct xsend
diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index 5c69684fff41..4631cdb1b92c 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)apply.1	8.2 (Berkeley) 4/4/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1994
 .Dt APPLY 1
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index 7392d139db4d..af3161251965 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.7 1998/10/10 12:48:48 bde Exp $
+# $FreeBSD$
 
 PROG=	ar
 CFLAGS+=-I${.CURDIR} -Wall
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index e9118e7f2e54..3741299cb8ae 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ar.1	8.1 (Berkeley) 6/29/93
-.\"	$Id: ar.1,v 1.4 1997/02/22 19:54:01 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 29, 1993
 .Dt AR 1
diff --git a/usr.bin/ar/ar.1aout b/usr.bin/ar/ar.1aout
index e9118e7f2e54..3741299cb8ae 100644
--- a/usr.bin/ar/ar.1aout
+++ b/usr.bin/ar/ar.1aout
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ar.1	8.1 (Berkeley) 6/29/93
-.\"	$Id: ar.1,v 1.4 1997/02/22 19:54:01 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 29, 1993
 .Dt AR 1
diff --git a/usr.bin/ar/ar.5 b/usr.bin/ar/ar.5
index 2e3d336c9128..e163cf6cf799 100644
--- a/usr.bin/ar/ar.5
+++ b/usr.bin/ar/ar.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ar.5.5	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt AR 5
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index b2c85fc79537..c53c1e44dcfa 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ar.c,v 1.6 1997/06/23 06:41:30 charnier Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index 393af8387875..df96d573b49b 100644
--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1998/09/19 22:42:03 obrien Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/Makefile.inc"
 
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index d21dfd39c92b..017bfdc0f146 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -92,7 +92,7 @@ enum { ATQ, ATRM, AT, BATCH, CAT };	/* what program we want to run */
 
 /* File scope variables */
 
-static const char rcsid[] = "$Id: at.c,v 1.15 1998/12/06 07:42:09 archie Exp $";
+static const char rcsid[] = "$FreeBSD$";
 char *no_export[] =
 {
     "TERM", "TERMCAP", "DISPLAY", "_"
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index 02c79306e98e..b6dd8288b65a 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -1,4 +1,4 @@
-.\" $Id: at.man,v 1.10 1999/08/15 08:25:13 mpp Exp $
+.\" $FreeBSD$
 .Dd April 12, 1995
 .Dt "AT" 1
 .Os FreeBSD 2.1
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index c111dd823384..6098c9501e9e 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -38,7 +38,7 @@
 /* File scope variables */
 
 static const char rcsid[] =
-	"$Id: panic.c,v 1.7 1997/06/23 06:44:18 charnier Exp $";
+  "$FreeBSD$";
 
 /* External variables */
 
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index dd1fd907de92..df7fe30ea610 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -148,7 +148,7 @@ static int sc_tokid;	/* scanner - token id */
 static int sc_tokplur;	/* scanner - is token plural? */
 
 static const char rcsid[] =
-	"$Id: parsetime.c,v 1.16 1998/12/06 07:42:09 archie Exp $";
+  "$FreeBSD$";
 
 /* Local functions */
 
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index 398b2a89a741..9c17863c00f3 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -48,7 +48,7 @@
 
 /* File scope variables */
 
-static const char rcsid[] = "$Id: perm.c,v 1.6 1998/12/06 07:42:09 archie Exp $";
+static const char rcsid[] = "$FreeBSD$";
 
 /* Function declarations */
 
diff --git a/usr.bin/banner/banner.6 b/usr.bin/banner/banner.6
index 2d773715a337..119a3e822c7b 100644
--- a/usr.bin/banner/banner.6
+++ b/usr.bin/banner/banner.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)banner.6	8.2 (Berkeley) 4/29/95
-.\"	$Id: banner.6,v 1.2 1997/08/23 15:49:52 joerg Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 29, 1995
 .Dt BANNER 6
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 697125cc0407..ba95e761270d 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)basename.1	8.2 (Berkeley) 4/18/94
-.\"	$Id: basename.1,v 1.4 1997/02/22 19:54:11 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt BASENAME 1
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index c0caf75658e2..4b4a2d8a45ee 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)biff.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: biff.1,v 1.4 1997/02/22 19:54:13 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt BIFF 1
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index 185d6349167e..606afa8a919d 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: biff.c,v 1.4 1997/12/29 00:08:50 alex Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/brandelf/brandelf.1 b/usr.bin/brandelf/brandelf.1
index 0a8099c92522..2c4e82091364 100644
--- a/usr.bin/brandelf/brandelf.1
+++ b/usr.bin/brandelf/brandelf.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 6, 1997
 .Dt BRANDELF 1
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index 5ad14693a7b7..cea64801f598 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: brandelf.c,v 1.10 1998/04/21 02:44:12 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <elf.h>
diff --git a/usr.bin/c89/c89.1 b/usr.bin/c89/c89.1
index 75b4c770d30f..a683df08f43d 100644
--- a/usr.bin/c89/c89.1
+++ b/usr.bin/c89/c89.1
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: c89.1,v 1.1.1.1 1997/09/17 20:44:54 joerg Exp $
+.\" $FreeBSD$
 .\" "
 .Dd September 17, 1997
 .Os
diff --git a/usr.bin/c89/c89.sh b/usr.bin/c89/c89.sh
index a9ad3d0c35d0..157fbbff884a 100755
--- a/usr.bin/c89/c89.sh
+++ b/usr.bin/c89/c89.sh
@@ -24,7 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id: c89.sh,v 1.2 1997/09/18 20:55:50 joerg Exp $
+# $FreeBSD$
 #
 # This is the Posix.2 mandated C compiler.  Basically, a hook to the
 # cc(1) command.
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index 1f2e5417c1b0..cfe76c4ab782 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)calendar.1  8.1 (Berkeley) 6/29/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 29, 1993
 .Dt CALENDAR 1
diff --git a/usr.bin/calendar/calendars/calendar.all b/usr.bin/calendar/calendars/calendar.all
index 35a40cc1ce79..652829ef863d 100644
--- a/usr.bin/calendar/calendars/calendar.all
+++ b/usr.bin/calendar/calendars/calendar.all
@@ -1,7 +1,7 @@
 /*
  * International and national calendar files
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_all_
diff --git a/usr.bin/calendar/calendars/calendar.birthday b/usr.bin/calendar/calendars/calendar.birthday
index 10ea34328ca9..06a30c0d5268 100644
--- a/usr.bin/calendar/calendars/calendar.birthday
+++ b/usr.bin/calendar/calendars/calendar.birthday
@@ -1,7 +1,7 @@
 /*
  * Birthday
  *
- * $Id: calendar.birthday,v 1.9 1998/10/22 07:56:22 torstenb Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_birthday_
diff --git a/usr.bin/calendar/calendars/calendar.christian b/usr.bin/calendar/calendars/calendar.christian
index e238918a00cd..d7562f74176d 100644
--- a/usr.bin/calendar/calendars/calendar.christian
+++ b/usr.bin/calendar/calendars/calendar.christian
@@ -1,7 +1,7 @@
 /*
  * Christian
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_christian_
diff --git a/usr.bin/calendar/calendars/calendar.computer b/usr.bin/calendar/calendars/calendar.computer
index 55fb081f6a89..0b45111acde0 100644
--- a/usr.bin/calendar/calendars/calendar.computer
+++ b/usr.bin/calendar/calendars/calendar.computer
@@ -1,7 +1,7 @@
 /*
  * Computer
  *
- * $Id: calendar.computer,v 1.4 1997/02/22 19:28:19 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_computer_
diff --git a/usr.bin/calendar/calendars/calendar.croatian b/usr.bin/calendar/calendars/calendar.croatian
index 187a0c7cc2db..af9a55854387 100644
--- a/usr.bin/calendar/calendars/calendar.croatian
+++ b/usr.bin/calendar/calendars/calendar.croatian
@@ -1,7 +1,7 @@
 /*
  * Croatian calendar files
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_croatian_
diff --git a/usr.bin/calendar/calendars/calendar.german b/usr.bin/calendar/calendars/calendar.german
index 7ee93eb0b9ba..d22207cfd500 100644
--- a/usr.bin/calendar/calendars/calendar.german
+++ b/usr.bin/calendar/calendars/calendar.german
@@ -1,7 +1,7 @@
 /*
  * German calendar file(s)
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_german_
diff --git a/usr.bin/calendar/calendars/calendar.history b/usr.bin/calendar/calendars/calendar.history
index 1755bedb07d9..ba83c637e4c5 100644
--- a/usr.bin/calendar/calendars/calendar.history
+++ b/usr.bin/calendar/calendars/calendar.history
@@ -1,7 +1,7 @@
 /*
  * History
  *
- * $Id: calendar.history,v 1.7 1997/02/25 01:20:25 mpp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_history_
diff --git a/usr.bin/calendar/calendars/calendar.holiday b/usr.bin/calendar/calendars/calendar.holiday
index 6da2a1acd7dd..0ae713c1523b 100644
--- a/usr.bin/calendar/calendars/calendar.holiday
+++ b/usr.bin/calendar/calendars/calendar.holiday
@@ -1,7 +1,7 @@
 /*
  * Holiday
  *
- * $Id: calendar.holiday,v 1.6 1997/02/22 19:28:22 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_holiday_
diff --git a/usr.bin/calendar/calendars/calendar.judaic b/usr.bin/calendar/calendars/calendar.judaic
index e0dfab22a5d9..f1bc9e43e263 100644
--- a/usr.bin/calendar/calendars/calendar.judaic
+++ b/usr.bin/calendar/calendars/calendar.judaic
@@ -1,7 +1,7 @@
 /*
  * Judaic
  *
- * $Id: calendar.judaic,v 1.5 1998/01/19 14:34:53 jgrosch Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_judaic_
diff --git a/usr.bin/calendar/calendars/calendar.music b/usr.bin/calendar/calendars/calendar.music
index 5a60e595d26e..99629ce73c81 100644
--- a/usr.bin/calendar/calendars/calendar.music
+++ b/usr.bin/calendar/calendars/calendar.music
@@ -1,7 +1,7 @@
 /*
  * Music
  *
- * $Id: calendar.music,v 1.6 1997/02/22 19:28:23 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_music_
diff --git a/usr.bin/calendar/calendars/calendar.russian b/usr.bin/calendar/calendars/calendar.russian
index ce192a0b5198..e308873676c1 100644
--- a/usr.bin/calendar/calendars/calendar.russian
+++ b/usr.bin/calendar/calendars/calendar.russian
@@ -1,7 +1,7 @@
 /*
  * Russian calendar files
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_russian_
diff --git a/usr.bin/calendar/calendars/calendar.usholiday b/usr.bin/calendar/calendars/calendar.usholiday
index 1d3e45d0b367..712a4b784599 100644
--- a/usr.bin/calendar/calendars/calendar.usholiday
+++ b/usr.bin/calendar/calendars/calendar.usholiday
@@ -1,7 +1,7 @@
 /*
  * USA holiday
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_usholiday_
diff --git a/usr.bin/calendar/calendars/calendar.world b/usr.bin/calendar/calendars/calendar.world
index 87201392b43a..7e2833b3a5fe 100644
--- a/usr.bin/calendar/calendars/calendar.world
+++ b/usr.bin/calendar/calendars/calendar.world
@@ -1,7 +1,7 @@
 /*
  * World wide calendar files, except national calendars
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_world_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all
index 72068aa760ea..92c0e51ff73e 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all
@@ -1,7 +1,7 @@
 /*
  * deutscher Kalender
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_all_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag
index d723afa2fa23..4969fc7b7d2d 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag
@@ -1,7 +1,7 @@
 /*
  * Feiertage
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_feiertag_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte
index 6a2a25e484c8..24d51f61fe57 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte
@@ -13,7 +13,7 @@
  * 
  * ISBN 3-924521-59-X
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_geschichte_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche
index efa73245aee0..aa4ef195e74d 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche
@@ -1,7 +1,7 @@
 /*
  * Kirche in Deutschland
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_kirche_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur
index 865e88e988ef..62acab9011a8 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur
@@ -1,7 +1,7 @@
 /*
  * Literatur
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_literatur_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik
index d08fcd77e5da..ad63646271f6 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik
@@ -1,7 +1,7 @@
 /*
  * Musik
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_musik_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft
index 87f9c726d51c..175fe0fa4207 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft
@@ -1,7 +1,7 @@
 /*
  * Wissenschaft
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_wissenschaft_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
index 72068aa760ea..92c0e51ff73e 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
@@ -1,7 +1,7 @@
 /*
  * deutscher Kalender
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_all_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
index d723afa2fa23..4969fc7b7d2d 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
@@ -1,7 +1,7 @@
 /*
  * Feiertage
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_feiertag_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
index 6a2a25e484c8..24d51f61fe57 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
@@ -13,7 +13,7 @@
  * 
  * ISBN 3-924521-59-X
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_geschichte_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
index efa73245aee0..aa4ef195e74d 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
@@ -1,7 +1,7 @@
 /*
  * Kirche in Deutschland
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_kirche_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
index 865e88e988ef..62acab9011a8 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
@@ -1,7 +1,7 @@
 /*
  * Literatur
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_literatur_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
index d08fcd77e5da..ad63646271f6 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
@@ -1,7 +1,7 @@
 /*
  * Musik
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_musik_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
index 87f9c726d51c..175fe0fa4207 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
@@ -1,7 +1,7 @@
 /*
  * Wissenschaft
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_wissenschaft_
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all
index 17285bd2d3f5..11be34324383 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all
+++ b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all
@@ -1,7 +1,7 @@
 /*
  *  hrvatski calendar
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _hr_HR_ISO_8859_2_all
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici
index c1ecd5972175..b78ea99533f8 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici
+++ b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici
@@ -1,7 +1,7 @@
 /*
  * hrvatski praznici
  *
- * $Id: calendar.praznici,v 1.4 1997/02/22 19:28:33 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _hr_HR_ISO_8859_2_praznici
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
index 17285bd2d3f5..11be34324383 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
+++ b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
@@ -1,7 +1,7 @@
 /*
  *  hrvatski calendar
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _hr_HR_ISO_8859_2_all
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
index c1ecd5972175..b78ea99533f8 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
+++ b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
@@ -1,7 +1,7 @@
 /*
  * hrvatski praznici
  *
- * $Id: calendar.praznici,v 1.4 1997/02/22 19:28:33 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _hr_HR_ISO_8859_2_praznici
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all
index 89548e84c192..fcdc5e7f8f5e 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÊ ËÁÌÅÎÄÁÒØ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_all
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common
index 6bd7764fa82d..2a45b1d2650f 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id: calendar.common,v 1.6 1997/05/01 14:39:55 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_common_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk
index 25c0eef3f577..22de9d3588b7 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk
@@ -1,7 +1,7 @@
 /*
  * ðÅÒÅ×ÏÄ ÞÁÓÏ× ÄÌÑ ÍÏÓËÏ×ÓËÏÊ ×ÒÅÍÅÎÎÏÊ ÚÏÎÙ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_msk_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox
index 51ef35baa737..0105343eae8a 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox
@@ -1,7 +1,7 @@
 /*
  * ðÒÁ×ÏÓÌÁ×ÎÙÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_orthodox_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan
index 993a32dca5af..c37c993680e9 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan
@@ -1,7 +1,7 @@
 /*
  * ñÚÙÞÅÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_pagan_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
index 89548e84c192..fcdc5e7f8f5e 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÊ ËÁÌÅÎÄÁÒØ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_all
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
index 6bd7764fa82d..2a45b1d2650f 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id: calendar.common,v 1.6 1997/05/01 14:39:55 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_common_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
index 25c0eef3f577..22de9d3588b7 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
@@ -1,7 +1,7 @@
 /*
  * ðÅÒÅ×ÏÄ ÞÁÓÏ× ÄÌÑ ÍÏÓËÏ×ÓËÏÊ ×ÒÅÍÅÎÎÏÊ ÚÏÎÙ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_msk_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
index 51ef35baa737..0105343eae8a 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
@@ -1,7 +1,7 @@
 /*
  * ðÒÁ×ÏÓÌÁ×ÎÙÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_orthodox_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
index 993a32dca5af..c37c993680e9 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
@@ -1,7 +1,7 @@
 /*
  * ñÚÙÞÅÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_pagan_
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index d79ff34c855d..cdc367898562 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: day.c,v 1.11 1997/10/26 12:51:30 wosch Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 7747fa12e16e..846b96ed5805 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: io.c,v 1.10 1997/06/23 06:52:13 charnier Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index 2527eb0da4b5..12bff9f86e92 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index c7e5dec31776..4cd9ab2c979e 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cap_mkdb.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: cap_mkdb.1,v 1.4 1997/02/22 19:54:19 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CAP_MKDB 1
diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile
index 1154024e846f..2d25d76a12a0 100644
--- a/usr.bin/chat/Makefile
+++ b/usr.bin/chat/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1997/08/22 15:42:31 peter Exp $
+# $FreeBSD$
 
 PROG=	chat
 CFLAGS+=-Wall
diff --git a/usr.bin/chat/chat.8 b/usr.bin/chat/chat.8
index 26ef735b53c9..efcf1948c09d 100644
--- a/usr.bin/chat/chat.8
+++ b/usr.bin/chat/chat.8
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\" manual page [] for chat 1.8
-.\" $Id: chat.8,v 1.11 1998/06/03 04:21:36 jkoshy Exp $
+.\" $FreeBSD$
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index c25b8cfd8775..217dc303767f 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -79,7 +79,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: chat.c,v 1.12 1998/06/23 21:58:41 peter Exp $";
+  "$FreeBSD$";
 #endif
 
 #include <stdio.h>
diff --git a/usr.bin/checknr/checknr.1 b/usr.bin/checknr/checknr.1
index 8d2eefafb80f..928b905dc546 100644
--- a/usr.bin/checknr/checknr.1
+++ b/usr.bin/checknr/checknr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)checknr.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CHECKNR 1
diff --git a/usr.bin/chflags/chflags.1 b/usr.bin/chflags/chflags.1
index 99424f8a437b..1af45709cbdc 100644
--- a/usr.bin/chflags/chflags.1
+++ b/usr.bin/chflags/chflags.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.2 (Berkeley) 3/31/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt CHFLAGS 1
diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile
index 032743af039c..c0bbd6aea174 100644
--- a/usr.bin/chkey/Makefile
+++ b/usr.bin/chkey/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1997/05/28 15:54:04 wpaul Exp $
+# $FreeBSD$
 
 PROG=	chkey
 SRCS=	chkey.c update.c generic.c
diff --git a/usr.bin/chkey/chkey.1 b/usr.bin/chkey/chkey.1
index 6aab3000a359..be4668de7694 100644
--- a/usr.bin/chkey/chkey.1
+++ b/usr.bin/chkey/chkey.1
@@ -1,6 +1,6 @@
 .\" @(#)chkey.1 1.5 91/03/11 TIRPC 1.0;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 5, 1989
 .Dt CHKEY 1
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 098bca2a7e34..e0978b655e1a 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\"     $Id: chpass.1,v 1.15 1999/02/23 02:41:26 ghelmer Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 2809f8bef74f..77f9f7832f84 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -40,7 +40,7 @@ static const char copyright[] =
 #ifndef lint
 static const char sccsid[] = "From: @(#)chpass.c	8.4 (Berkeley) 4/2/94";
 static const char rcsid[] =
-	"$Id: chpass.c,v 1.14 1997/03/29 04:28:38 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index cf4ae4d40299..cfb951302d65 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: edit.c,v 1.13 1999/02/23 02:41:26 ghelmer Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c
index dbc262bcacde..0877987f88bb 100644
--- a/usr.bin/chpass/pw_yp.c
+++ b/usr.bin/chpass/pw_yp.c
@@ -35,7 +35,7 @@
  * Center for Telecommunications Research
  * Columbia University, New York City
  *
- *	$Id: pw_yp.c,v 1.13 1998/10/17 14:08:12 bde Exp $
+ * $FreeBSD$
  */
 
 #ifdef YP
diff --git a/usr.bin/chpass/pw_yp.h b/usr.bin/chpass/pw_yp.h
index 0a1e1c0573d9..15f63d038776 100644
--- a/usr.bin/chpass/pw_yp.h
+++ b/usr.bin/chpass/pw_yp.h
@@ -35,7 +35,7 @@
  * Center for Telecommunications Research
  * Columbia University, New York City
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifdef YP
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index d8917f51bc96..e7dd06b6db88 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)util.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: util.c,v 1.6 1998/03/23 07:41:49 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 37a6e2476b78..66a1d18f0c87 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cksum.1	8.2 (Berkeley) 4/28/95
-.\"	$Id: cksum.1,v 1.7 1997/11/09 16:08:11 obrien Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt CKSUM 1
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index dbe488c956c3..01a7165c1d9c 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)cksum.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: cksum.c,v 1.8 1997/11/09 05:47:55 obrien Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 005dfd2ebd60..6153e5160cb4 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cmp.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: cmp.1,v 1.5 1997/06/26 11:22:10 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CMP 1
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index 577998e261f4..afd9c2778526 100644
--- a/usr.bin/col/col.1
+++ b/usr.bin/col/col.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)col.1	8.1 (Berkeley) 6/29/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 29, 1993
 .Dt COL 1
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index 7330c088b43d..1167e4694736 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)colcrt.1	8.1 (Berkeley) 6/30/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 30, 1993
 .Dt COLCRT 1
diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile
index ccb5e98f452e..29b5e108b553 100644
--- a/usr.bin/colldef/Makefile
+++ b/usr.bin/colldef/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 1998/05/05 13:16:22 bde Exp $
+# $FreeBSD$
 
 PROG = colldef
 LFLAGS = -8 -i
diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index 66bb90f6d536..9f4f78169c7d 100644
--- a/usr.bin/colldef/colldef.1
+++ b/usr.bin/colldef/colldef.1
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: colldef.1,v 1.5 1997/06/26 11:25:16 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January, 27 1995
 .Dt COLLDEF 1
diff --git a/usr.bin/colldef/data/Makefile b/usr.bin/colldef/data/Makefile
index 8bffc4e625a4..b828085c3b5a 100644
--- a/usr.bin/colldef/data/Makefile
+++ b/usr.bin/colldef/data/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 1999/06/05 03:03:57 julian Exp $
+# $FreeBSD$
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/colldef/data/de_DE.DIS_8859-15.src b/usr.bin/colldef/data/de_DE.DIS_8859-15.src
index e952d169902e..f5d609346cc7 100644
--- a/usr.bin/colldef/data/de_DE.DIS_8859-15.src
+++ b/usr.bin/colldef/data/de_DE.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.DIS_8859-15.src,v 1.2 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 substitute <ss> with "ss"
diff --git a/usr.bin/colldef/data/de_DE.ISO_8859-1.src b/usr.bin/colldef/data/de_DE.ISO_8859-1.src
index f366e97d2916..52d155d75a54 100644
--- a/usr.bin/colldef/data/de_DE.ISO_8859-1.src
+++ b/usr.bin/colldef/data/de_DE.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.ISO_8859-1.src,v 1.5 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 substitute <ss> with "ss"
diff --git a/usr.bin/colldef/data/es_ES.DIS_8859-15.src b/usr.bin/colldef/data/es_ES.DIS_8859-15.src
index d31a73bf0372..002b63503d5a 100644
--- a/usr.bin/colldef/data/es_ES.DIS_8859-15.src
+++ b/usr.bin/colldef/data/es_ES.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id: es_ES.DIS_8859-15.src,v 1.3 1997/02/22 19:54:35 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/usr.bin/colldef/data/es_ES.ISO_8859-1.src b/usr.bin/colldef/data/es_ES.ISO_8859-1.src
index e088e21b5c46..7c2b21fc5955 100644
--- a/usr.bin/colldef/data/es_ES.ISO_8859-1.src
+++ b/usr.bin/colldef/data/es_ES.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/is_IS.DIS_8859-15.src b/usr.bin/colldef/data/is_IS.DIS_8859-15.src
index 605a8433ae1e..fe4dd9beae88 100644
--- a/usr.bin/colldef/data/is_IS.DIS_8859-15.src
+++ b/usr.bin/colldef/data/is_IS.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id: is_IS.DIS_8859-15.src,v 1.4 1997/02/22 19:54:38 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/usr.bin/colldef/data/is_IS.ISO_8859-1.src b/usr.bin/colldef/data/is_IS.ISO_8859-1.src
index 288459c0b3fd..50cd9a95ca8f 100644
--- a/usr.bin/colldef/data/is_IS.ISO_8859-1.src
+++ b/usr.bin/colldef/data/is_IS.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/lt_LN.ASCII.src b/usr.bin/colldef/data/lt_LN.ASCII.src
index 525ebb979707..df3c34088764 100644
--- a/usr.bin/colldef/data/lt_LN.ASCII.src
+++ b/usr.bin/colldef/data/lt_LN.ASCII.src
@@ -1,6 +1,6 @@
 # ASCII
 #
-# $Id: lt_LN.ISO_8859-1.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 order \
 	\x00;...;\xff
diff --git a/usr.bin/colldef/data/lt_LN.DIS_8859-15.src b/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
index 71de58338709..449ce85e6336 100644
--- a/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
+++ b/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id: lt_LN.DIS_8859-15.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/usr.bin/colldef/data/lt_LN.ISO_8859-1.src b/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
index 93a2da01484a..99b7d08ddb00 100644
--- a/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
+++ b/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/lt_LN.ISO_8859-2.src b/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
index 772fe3220385..aee3671f0966 100644
--- a/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
+++ b/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
@@ -1,6 +1,6 @@
 # latin2 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-2
 order \
diff --git a/usr.bin/colldef/data/ru_SU.CP866.src b/usr.bin/colldef/data/ru_SU.CP866.src
index 88ca377082a7..2fc2d20835c3 100644
--- a/usr.bin/colldef/data/ru_SU.CP866.src
+++ b/usr.bin/colldef/data/ru_SU.CP866.src
@@ -1,6 +1,6 @@
 # CP866 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.CP866
 order \
diff --git a/usr.bin/colldef/data/ru_SU.KOI8-R.src b/usr.bin/colldef/data/ru_SU.KOI8-R.src
index f6b0a1877bef..3a67bc4e39fb 100644
--- a/usr.bin/colldef/data/ru_SU.KOI8-R.src
+++ b/usr.bin/colldef/data/ru_SU.KOI8-R.src
@@ -1,6 +1,6 @@
 # koi8-r (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.KOI8-R
 order \
diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y
index da485dacd989..c4beb8b59b95 100644
--- a/usr.bin/colldef/parse.y
+++ b/usr.bin/colldef/parse.y
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: parse.y,v 1.13 1999/02/12 20:56:49 ache Exp $
+ * $FreeBSD$
  */
 
 #include <err.h>
diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l
index 405068d5a272..d99f001caa1c 100644
--- a/usr.bin/colldef/scan.l
+++ b/usr.bin/colldef/scan.l
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: scan.l,v 1.8 1999/02/12 20:39:06 ache Exp $
+ * $FreeBSD$
  */
 
 #include <ctype.h>
diff --git a/usr.bin/colrm/colrm.1 b/usr.bin/colrm/colrm.1
index 3b3266b7fd32..ddc083b3ceb5 100644
--- a/usr.bin/colrm/colrm.1
+++ b/usr.bin/colrm/colrm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)colrm.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt COLRM 1
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 2c9e0e496e6e..b00182d604dd 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: colrm.c,v 1.5 1997/12/29 00:08:59 alex Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index 298eed842ecf..4b8ec9ba5234 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)column.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Os
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index 8876de8df644..7fe49374dd85 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)comm.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Os
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 70e7c0d01616..25e0f2f77439 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)comm.c	8.4 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: comm.c,v 1.4 1997/09/07 15:09:17 joerg Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile
index 137f88bc719e..d8cd73854eb7 100644
--- a/usr.bin/compile_et/Makefile
+++ b/usr.bin/compile_et/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1998/03/20 16:21:39 bde Exp $
+# $FreeBSD$
 
 PROG=	compile_et
 SRCS=	compile_et.c error_table.y
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index a06c8a0a9a1e..075052f06cf4 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)compress.1	8.2 (Berkeley) 4/18/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt COMPRESS 1
diff --git a/usr.bin/compress/zopen.3 b/usr.bin/compress/zopen.3
index 1584edded25b..f97ebde61fb6 100644
--- a/usr.bin/compress/zopen.3
+++ b/usr.bin/compress/zopen.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)zopen.3	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt ZOPEN 3
diff --git a/usr.bin/compress/zopen.h b/usr.bin/compress/zopen.h
index 322fd2de9a23..1a22de12cab3 100644
--- a/usr.bin/compress/zopen.h
+++ b/usr.bin/compress/zopen.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _ZOPEN_H_
diff --git a/usr.bin/cpp/cpp.sh b/usr.bin/cpp/cpp.sh
index df09d6de30de..19dee9d4d558 100644
--- a/usr.bin/cpp/cpp.sh
+++ b/usr.bin/cpp/cpp.sh
@@ -36,7 +36,7 @@
 # SUCH DAMAGE.
 #
 #	From: @(#)cpp.sh	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 #
 # Transitional front end to CCCP to make it behave like (Reiser) CCP:
 #	specifies -traditional
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index c030cedb2640..55c637e7ddf1 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)C.c	8.4 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 49ac44239959..5e841f21b978 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ctags.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CTAGS 1
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index 207165109d2d..e0e9a7127d1a 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cut.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CUT 1
diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index 8faa06ae3329..7b1e7f085c43 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/02/22 19:54:49 peter Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
 
diff --git a/usr.bin/dnsquery/Makefile b/usr.bin/dnsquery/Makefile
index 2486aded5c42..ac7cc113aaa8 100644
--- a/usr.bin/dnsquery/Makefile
+++ b/usr.bin/dnsquery/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/02/22 19:54:50 peter Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
 
diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile
index e6a364db0fad..d620c8ec3485 100644
--- a/usr.bin/doscmd/Makefile
+++ b/usr.bin/doscmd/Makefile
@@ -1,6 +1,6 @@
 # from BSDI Makefile,v 2.6 1996/04/08 20:06:40 bostic Exp
 #
-# $Id: Makefile,v 1.18 1999/03/16 20:57:19 imp Exp $
+# $FreeBSD$
 
 PROG=	doscmd
 SRCS=	AsyncIO.c ParseBuffer.c bios.c callback.c cpu.c dos.c cmos.c config.c \
diff --git a/usr.bin/doscmd/ParseBuffer.c b/usr.bin/doscmd/ParseBuffer.c
index 88c4771ecce5..2eeaeed31647 100644
--- a/usr.bin/doscmd/ParseBuffer.c
+++ b/usr.bin/doscmd/ParseBuffer.c
@@ -29,7 +29,7 @@
  *
  *	BSDI ParseBuffer.c,v 2.2 1996/04/08 19:32:15 bostic Exp
  *
- * $Id: ParseBuffer.c,v 1.2 1996/09/22 05:52:53 miff Exp $
+ * $FreeBSD$
  */
 
 #include <stdlib.h>
diff --git a/usr.bin/doscmd/bios.c b/usr.bin/doscmd/bios.c
index ccfdce826381..c6cea9204ff5 100644
--- a/usr.bin/doscmd/bios.c
+++ b/usr.bin/doscmd/bios.c
@@ -29,7 +29,7 @@
  *
  *	BSDI bios.c,v 2.3 1996/04/08 19:32:19 bostic Exp
  *
- * $Id: bios.c,v 1.2 1997/08/15 23:41:23 jlemon Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/callback.c b/usr.bin/doscmd/callback.c
index 4b333ecc7c37..890c7142d454 100644
--- a/usr.bin/doscmd/callback.c
+++ b/usr.bin/doscmd/callback.c
@@ -1,6 +1,6 @@
 /* No copyright?!
 **
-** $Id: callback.c,v 1.3 1996/09/24 00:02:25 miff Exp $
+** $FreeBSD$
 */
 
 
diff --git a/usr.bin/doscmd/callback.h b/usr.bin/doscmd/callback.h
index f81127e59f79..d3c656fd7c26 100644
--- a/usr.bin/doscmd/callback.h
+++ b/usr.bin/doscmd/callback.h
@@ -1,7 +1,7 @@
 /* 
 ** No copyright?!
 **
-** $Id: callback.h,v 1.4 1996/09/22 15:42:48 miff Exp $
+** $FreeBSD$
 */
 typedef void		(*callback_t)(regcontext_t *REGS);
 
diff --git a/usr.bin/doscmd/cmos.c b/usr.bin/doscmd/cmos.c
index 115cbc7ccde6..1486c6fd348e 100644
--- a/usr.bin/doscmd/cmos.c
+++ b/usr.bin/doscmd/cmos.c
@@ -29,7 +29,7 @@
  *
  *	BSDI cmos.c,v 2.3 1996/04/08 19:32:20 bostic Exp
  *
- * $Id: cmos.c,v 1.2 1996/09/18 16:12:24 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/com.h b/usr.bin/doscmd/com.h
index c2857e2a43d4..98982a958722 100644
--- a/usr.bin/doscmd/com.h
+++ b/usr.bin/doscmd/com.h
@@ -29,7 +29,7 @@
  *
  *	BSDI com.h,v 2.2 1996/04/08 19:32:21 bostic Exp
  *
- * $Id: com.h,v 1.3 1996/09/22 15:42:48 miff Exp $
+ * $FreeBSD$
  */
 
 /* com.h for doscmd int14.c */
diff --git a/usr.bin/doscmd/config.c b/usr.bin/doscmd/config.c
index 823c00a937fc..d20aa1579a17 100644
--- a/usr.bin/doscmd/config.c
+++ b/usr.bin/doscmd/config.c
@@ -29,7 +29,7 @@
  *
  *	BSDI config.c,v 2.2 1996/04/08 19:32:22 bostic Exp
  *
- * $Id: config.c,v 1.1 1997/08/09 01:42:35 dyson Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/cpu.c b/usr.bin/doscmd/cpu.c
index bad8725e9bd1..c273084547e0 100644
--- a/usr.bin/doscmd/cpu.c
+++ b/usr.bin/doscmd/cpu.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright ?!
 **
-** $Id: cpu.c,v 1.5 1996/09/25 11:05:54 miff Exp $
+** $FreeBSD$
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/crt0.c b/usr.bin/doscmd/crt0.c
index 9b3779b15af6..ec9c706f7f5c 100644
--- a/usr.bin/doscmd/crt0.c
+++ b/usr.bin/doscmd/crt0.c
@@ -29,7 +29,7 @@
  *
  *	BSDI crt0.c,v 2.2 1996/04/08 19:32:24 bostic Exp
  *
- * $Id: crt0.c,v 1.2 1996/09/18 16:12:25 miff Exp $
+ * $FreeBSD$
  */
 
 char **environ;
diff --git a/usr.bin/doscmd/cwd.c b/usr.bin/doscmd/cwd.c
index 6a9b60f4a9cf..a5d6c88c83f4 100644
--- a/usr.bin/doscmd/cwd.c
+++ b/usr.bin/doscmd/cwd.c
@@ -29,7 +29,7 @@
  *
  *	BSDI cwd.c,v 2.2 1996/04/08 19:32:25 bostic Exp
  *
- * $Id: cwd.c,v 1.2 1998/07/01 19:56:13 imp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/doscmd/cwd.h b/usr.bin/doscmd/cwd.h
index 323512ff9e4e..dfe7e4ea4486 100644
--- a/usr.bin/doscmd/cwd.h
+++ b/usr.bin/doscmd/cwd.h
@@ -29,7 +29,7 @@
  *
  *	BSDI cwd.h,v 2.2 1996/04/08 19:32:26 bostic Exp
  *
- * $Id: cwd.h,v 1.3 1996/09/23 09:59:23 miff Exp $
+ * $FreeBSD$
  */
 
 static inline u_char *
diff --git a/usr.bin/doscmd/debug.c b/usr.bin/doscmd/debug.c
index e736f8db4c6b..dde4fcb72c00 100644
--- a/usr.bin/doscmd/debug.c
+++ b/usr.bin/doscmd/debug.c
@@ -31,7 +31,7 @@
  *
  * from: BSDI doscmd.c,v 2.3 1996/04/08 19:32:30 bostic Exp
  *
- * $Id: debug.c,v 1.5 1996/09/25 00:03:43 miff Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/doscmd/dispatch.h b/usr.bin/doscmd/dispatch.h
index 59620f159312..7506c534220a 100644
--- a/usr.bin/doscmd/dispatch.h
+++ b/usr.bin/doscmd/dispatch.h
@@ -23,7 +23,7 @@
 ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ** SUCH DAMAGE.
 **
-** $Id: dispatch.h,v 1.3 1996/09/22 05:52:56 miff Exp $
+** $FreeBSD$
 */
 
 /*
diff --git a/usr.bin/doscmd/dos.c b/usr.bin/doscmd/dos.c
index b81330483f18..7b8fa0c9a911 100644
--- a/usr.bin/doscmd/dos.c
+++ b/usr.bin/doscmd/dos.c
@@ -31,7 +31,7 @@
  *
  *	BSDI int21.c,v 2.2 1996/04/08 19:32:51 bostic Exp
  *
- * $Id: dos.c,v 1.4 1998/07/16 23:54:23 imp Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/dos.h b/usr.bin/doscmd/dos.h
index 030438e7e922..1ec83ac7f32c 100644
--- a/usr.bin/doscmd/dos.h
+++ b/usr.bin/doscmd/dos.h
@@ -29,7 +29,7 @@
  *
  *	BSDI dos.h,v 2.2 1996/04/08 19:32:28 bostic Exp
  *
- * $Id: dos.h,v 1.7 1996/09/23 09:59:24 miff Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1
index 08b320c1b9f9..4d039a4b0b66 100644
--- a/usr.bin/doscmd/doscmd.1
+++ b/usr.bin/doscmd/doscmd.1
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	BSDI doscmd.1,v 2.3 1996/04/08 19:32:29 bostic Exp
-.\"	$Id: doscmd.1,v 1.9 1999/07/12 20:23:25 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 30, 1995
 .Dt DOSCMD 1
diff --git a/usr.bin/doscmd/doscmd.c b/usr.bin/doscmd/doscmd.c
index 454a38be2938..8e8da70f5191 100644
--- a/usr.bin/doscmd/doscmd.c
+++ b/usr.bin/doscmd/doscmd.c
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd.c,v 2.3 1996/04/08 19:32:30 bostic Exp
  *
- * $Id: doscmd.c,v 1.7 1998/07/16 23:54:25 imp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/doscmd/doscmd.h b/usr.bin/doscmd/doscmd.h
index 224f9efe1178..1c960647d6f4 100644
--- a/usr.bin/doscmd/doscmd.h
+++ b/usr.bin/doscmd/doscmd.h
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd.h,v 2.3 1996/04/08 19:32:32 bostic Exp
  *
- * $Id: doscmd.h,v 1.3 1997/09/30 22:03:41 jlemon Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/doscmd/doscmd_loader.c b/usr.bin/doscmd/doscmd_loader.c
index 7032bfb5cf25..d219ad52b46e 100644
--- a/usr.bin/doscmd/doscmd_loader.c
+++ b/usr.bin/doscmd/doscmd_loader.c
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd_loader.c,v 2.3 1996/04/08 19:32:33 bostic Exp
  *
- * $Id: doscmd_loader.c,v 1.2 1996/09/22 05:52:59 miff Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/ems.c b/usr.bin/doscmd/ems.c
index 25b68db32695..1b9b04568432 100644
--- a/usr.bin/doscmd/ems.c
+++ b/usr.bin/doscmd/ems.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* 
diff --git a/usr.bin/doscmd/ems.h b/usr.bin/doscmd/ems.h
index 990866cff785..276bddc6bbde 100644
--- a/usr.bin/doscmd/ems.h
+++ b/usr.bin/doscmd/ems.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ems.h,v 1.1 1997/09/30 22:03:45 jlemon Exp $
+ * $FreeBSD$
  */
 
 #ifndef EMS_H
diff --git a/usr.bin/doscmd/emsdriv.S b/usr.bin/doscmd/emsdriv.S
index ffa2c9839212..40c7affd00b7 100644
--- a/usr.bin/doscmd/emsdriv.S
+++ b/usr.bin/doscmd/emsdriv.S
@@ -24,7 +24,7 @@
 ! (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 ! THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 !
-!	$Id$
+! $FreeBSD$
 
 
 !
diff --git a/usr.bin/doscmd/emuint.c b/usr.bin/doscmd/emuint.c
index 1b2bfdd73290..9c230a3c0dae 100644
--- a/usr.bin/doscmd/emuint.c
+++ b/usr.bin/doscmd/emuint.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/usr.bin/doscmd/emuint.h b/usr.bin/doscmd/emuint.h
index d90b60ec36ec..d3797687eda3 100644
--- a/usr.bin/doscmd/emuint.h
+++ b/usr.bin/doscmd/emuint.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/doscmd/exe.c b/usr.bin/doscmd/exe.c
index 0314a62442e7..ce9a8f02d049 100644
--- a/usr.bin/doscmd/exe.c
+++ b/usr.bin/doscmd/exe.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	BSDI exe.c,v 2.2 1996/04/08 19:32:34 bostic Exp
- * $Id: exe.c,v 1.3 1996/09/22 06:26:01 miff Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/int.c b/usr.bin/doscmd/int.c
index 2385f5624a1f..3b72e24bebaa 100644
--- a/usr.bin/doscmd/int.c
+++ b/usr.bin/doscmd/int.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright?!
 **
-** $Id: int.c,v 1.4 1997/03/18 02:36:56 msmith Exp $
+** $FreeBSD$
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/int10.c b/usr.bin/doscmd/int10.c
index 0f02cbd94032..32bec88c1c53 100644
--- a/usr.bin/doscmd/int10.c
+++ b/usr.bin/doscmd/int10.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int10.c,v 2.3 1996/04/08 19:32:40 bostic Exp
  *
- * $Id: int10.c,v 1.2 1996/09/22 05:53:00 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int13.c b/usr.bin/doscmd/int13.c
index 2e6db4b96ec0..84cb13f6eb0d 100644
--- a/usr.bin/doscmd/int13.c
+++ b/usr.bin/doscmd/int13.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int13.c,v 2.3 1996/04/08 19:32:43 bostic Exp
  *
- * $Id: int13.c,v 1.1 1997/08/09 01:42:46 dyson Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int14.c b/usr.bin/doscmd/int14.c
index 602bb80b14f0..4d367eb7f4a0 100644
--- a/usr.bin/doscmd/int14.c
+++ b/usr.bin/doscmd/int14.c
@@ -32,7 +32,7 @@
  *
  *	BSDI int14.c,v 2.2 1996/04/08 19:32:45 bostic Exp
  *
- * $Id: int14.c,v 1.3 1996/09/22 15:42:53 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int16.c b/usr.bin/doscmd/int16.c
index ccf99cd7e458..517e1312c186 100644
--- a/usr.bin/doscmd/int16.c
+++ b/usr.bin/doscmd/int16.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int16.c,v 2.2 1996/04/08 19:32:47 bostic Exp
  *
- * $Id: int16.c,v 1.3 1996/09/22 15:42:54 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int17.c b/usr.bin/doscmd/int17.c
index 88621917a55a..d62d6da9b321 100644
--- a/usr.bin/doscmd/int17.c
+++ b/usr.bin/doscmd/int17.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int17.c,v 2.2 1996/04/08 19:32:48 bostic Exp
  *
- * $Id: int17.c,v 1.2 1998/01/22 02:44:54 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int1a.c b/usr.bin/doscmd/int1a.c
index 7a973307540e..ff7df30f8376 100644
--- a/usr.bin/doscmd/int1a.c
+++ b/usr.bin/doscmd/int1a.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int1a.c,v 2.2 1996/04/08 19:32:49 bostic Exp
  *
- * $Id: int1a.c,v 1.1 1997/08/09 01:42:49 dyson Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int2f.c b/usr.bin/doscmd/int2f.c
index e8fecb3d9538..8bfe3d8db71e 100644
--- a/usr.bin/doscmd/int2f.c
+++ b/usr.bin/doscmd/int2f.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int2f.c,v 2.2 1996/04/08 19:32:53 bostic Exp
  *
- * $Id: int2f.c,v 1.1 1997/08/09 01:42:50 dyson Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/intff.c b/usr.bin/doscmd/intff.c
index a32c64698c80..fd167af6cf4e 100644
--- a/usr.bin/doscmd/intff.c
+++ b/usr.bin/doscmd/intff.c
@@ -29,7 +29,7 @@
  *
  *	BSDI intff.c,v 2.2 1996/04/08 19:32:56 bostic Exp
  *
- * $Id: intff.c,v 1.4 1998/07/02 05:12:53 imp Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/mem.c b/usr.bin/doscmd/mem.c
index 025d86e37bfe..bae413f660fc 100644
--- a/usr.bin/doscmd/mem.c
+++ b/usr.bin/doscmd/mem.c
@@ -29,7 +29,7 @@
  *
  *	BSDI mem.c,v 2.2 1996/04/08 19:32:57 bostic Exp
  *
- * $Id: mem.c,v 1.4 1996/09/22 15:42:57 miff Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/mouse.c b/usr.bin/doscmd/mouse.c
index 859366705fb4..c9a07740a0fa 100644
--- a/usr.bin/doscmd/mouse.c
+++ b/usr.bin/doscmd/mouse.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int33.c,v 2.2 1996/04/08 19:32:54 bostic Exp
  *
- * $Id: mouse.c,v 1.3 1996/09/22 15:42:58 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/mouse.h b/usr.bin/doscmd/mouse.h
index e819c50ad901..b77cba48f57d 100644
--- a/usr.bin/doscmd/mouse.h
+++ b/usr.bin/doscmd/mouse.h
@@ -29,7 +29,7 @@
  *
  *	BSDI mouse.h,v 2.2 1996/04/08 19:32:58 bostic Exp
  *
- * $Id: mouse.h,v 1.3 1996/09/22 15:42:58 miff Exp $
+ * $FreeBSD$
  */
 
 typedef struct {
diff --git a/usr.bin/doscmd/net.c b/usr.bin/doscmd/net.c
index 464113f62e72..b899d96599a8 100644
--- a/usr.bin/doscmd/net.c
+++ b/usr.bin/doscmd/net.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright!
 **
-** $Id: net.c,v 1.3 1996/09/22 15:42:58 miff Exp $
+** $FreeBSD$
 **
 ** NetBIOS etc. hooks.
 */
diff --git a/usr.bin/doscmd/port.c b/usr.bin/doscmd/port.c
index c9a06b29957f..eb2158f1e7d1 100644
--- a/usr.bin/doscmd/port.c
+++ b/usr.bin/doscmd/port.c
@@ -29,7 +29,7 @@
  *
  *	BSDI port.c,v 2.2 1996/04/08 19:33:03 bostic Exp
  *
- * $Id: port.c,v 1.1 1997/08/09 01:42:54 dyson Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/redir.S b/usr.bin/doscmd/redir.S
index 4cb4e2e86c34..1f40f3cce6e8 100644
--- a/usr.bin/doscmd/redir.S
+++ b/usr.bin/doscmd/redir.S
@@ -24,7 +24,7 @@
 ! (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 ! THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 !
-!      $Id$
+! $FreeBSD$
 
 
 !
diff --git a/usr.bin/doscmd/register.h b/usr.bin/doscmd/register.h
index 1b6cecc23512..ba0e91e03a9a 100644
--- a/usr.bin/doscmd/register.h
+++ b/usr.bin/doscmd/register.h
@@ -23,7 +23,7 @@
 ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ** SUCH DAMAGE.
 **
-** $Id: register.h,v 1.4 1997/03/18 02:36:56 msmith Exp $
+** $FreeBSD$
 */
 
 /******************************************************************************
diff --git a/usr.bin/doscmd/setver.c b/usr.bin/doscmd/setver.c
index 2ae35180338c..5826567373ed 100644
--- a/usr.bin/doscmd/setver.c
+++ b/usr.bin/doscmd/setver.c
@@ -29,7 +29,7 @@
  *
  *	BSDI setver.c,v 2.2 1996/04/08 19:33:04 bostic Exp
  *
- * $Id: setver.c,v 1.2 1996/09/22 05:53:09 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/signal.c b/usr.bin/doscmd/signal.c
index f42e4cd61d59..704159760575 100644
--- a/usr.bin/doscmd/signal.c
+++ b/usr.bin/doscmd/signal.c
@@ -29,7 +29,7 @@
  *
  *	BSDI signal.c,v 2.2 1996/04/08 19:33:06 bostic Exp
  *
- * $Id: signal.c,v 1.2 1998/02/28 16:02:24 jraynard Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/timer.c b/usr.bin/doscmd/timer.c
index afaa69f804d3..41b30199585a 100644
--- a/usr.bin/doscmd/timer.c
+++ b/usr.bin/doscmd/timer.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright?!
 **
-** $Id: timer.c,v 1.3 1996/09/22 15:42:59 miff Exp $
+** $FreeBSD$
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/trace.c b/usr.bin/doscmd/trace.c
index 65a6ae36199e..9be758fd7ba6 100644
--- a/usr.bin/doscmd/trace.c
+++ b/usr.bin/doscmd/trace.c
@@ -29,7 +29,7 @@
  *
  *	BSDI trace.c,v 2.2 1996/04/08 19:33:07 bostic Exp
  *
- * $Id: trace.c,v 1.3 1996/09/25 00:03:44 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/trap.c b/usr.bin/doscmd/trap.c
index f8107502673c..8b41caa43084 100644
--- a/usr.bin/doscmd/trap.c
+++ b/usr.bin/doscmd/trap.c
@@ -29,7 +29,7 @@
  *
  *	BSDI trap.c,v 2.3 1996/04/08 19:33:08 bostic Exp
  *
- * $Id: trap.c,v 1.3 1999/07/06 07:15:10 cracauer Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/trap.h b/usr.bin/doscmd/trap.h
index 2aa4e9dfa20c..6cba0df95c3d 100644
--- a/usr.bin/doscmd/trap.h
+++ b/usr.bin/doscmd/trap.h
@@ -29,7 +29,7 @@
  *
  *	BSDI trap.h,v 2.2 1996/04/08 19:33:09 bostic Exp
  *
- * $Id: trap.h,v 1.2 1996/09/22 05:53:11 miff Exp $
+ * $FreeBSD$
  */
 
 #define	CLI	0xfa
diff --git a/usr.bin/doscmd/tty.c b/usr.bin/doscmd/tty.c
index ef42817a05f2..d18f157095f7 100644
--- a/usr.bin/doscmd/tty.c
+++ b/usr.bin/doscmd/tty.c
@@ -29,7 +29,7 @@
  *
  *	BSDI tty.c,v 2.4 1996/04/08 22:03:27 prb Exp
  *
- * $Id: tty.c,v 1.4 1998/02/22 23:36:54 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef NO_X
diff --git a/usr.bin/doscmd/video.h b/usr.bin/doscmd/video.h
index 2ddded173c57..7b36eb782056 100644
--- a/usr.bin/doscmd/video.h
+++ b/usr.bin/doscmd/video.h
@@ -29,7 +29,7 @@
  *
  *	BSDI video.h,v 2.2 1996/04/08 19:33:12 bostic Exp
  *
- * $Id: video.h,v 1.2 1996/09/22 05:53:12 miff Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/doscmd/xms.c b/usr.bin/doscmd/xms.c
index b016a0aff87e..9dbd4ba71f9d 100644
--- a/usr.bin/doscmd/xms.c
+++ b/usr.bin/doscmd/xms.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: xms.c,v 1.3 1997/09/30 22:04:06 jlemon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/doscmd/xms.h b/usr.bin/doscmd/xms.h
index 14a223f895d5..51890282b24c 100644
--- a/usr.bin/doscmd/xms.h
+++ b/usr.bin/doscmd/xms.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef XMS_H
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 8a36cda3c01c..08b1ab456c3e 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)du.1	8.2 (Berkeley) 4/1/94
-.\"	$Id: du.1,v 1.10 1997/12/29 20:56:21 jkh Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 1, 1994
 .Dt DU 1
diff --git a/usr.bin/ee/ee.1 b/usr.bin/ee/ee.1
index 6d4ef415f851..2571b6fa77fa 100644
--- a/usr.bin/ee/ee.1
+++ b/usr.bin/ee/ee.1
@@ -1,5 +1,5 @@
 .\"
-.\"  $Id$
+.\" $FreeBSD$
 .\"
 .Dd August 30, 1995
 .Dt EE 1
diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c
index bb38c7007d16..c44ec0057cf4 100644
--- a/usr.bin/ee/ee.c
+++ b/usr.bin/ee/ee.c
@@ -52,7 +52,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ee.c,v 1.11 1998/10/01 21:18:18 obrien Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 char *ee_copyright_message = 
@@ -64,7 +64,7 @@ char *ee_long_notice[] = {
 	"copyright.  All rights are reserved."
 	};
 
-char *version = "@(#) ee, version 1.3  $Revision: 1.11 $";
+char *version = "@(#) ee, version 1.3  $Revision: 1.12 $";
 
 #ifdef NCURSE
 #include "new_curse.h"
diff --git a/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg b/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
index 21055c2f038c..ef2ce2230d3e 100644
--- a/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
+++ b/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $Id$
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg b/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
index 21055c2f038c..ef2ce2230d3e 100644
--- a/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $Id$
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
index 6a5fad2b324a..0a383ad0cfe2 100644
--- a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $Id$
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/en_US.US-ASCII/ee.msg b/usr.bin/ee/nls/en_US.US-ASCII/ee.msg
index 6a5fad2b324a..0a383ad0cfe2 100644
--- a/usr.bin/ee/nls/en_US.US-ASCII/ee.msg
+++ b/usr.bin/ee/nls/en_US.US-ASCII/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $Id$
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
index 10c3255c5dfb..e4c2c9567b35 100644
--- a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
+++ b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $
-$ $Id: ee.msg,v 1.7 1998/01/12 07:53:05 charnier Exp $
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
index 10c3255c5dfb..e4c2c9567b35 100644
--- a/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $
-$ $Id: ee.msg,v 1.7 1998/01/12 07:53:05 charnier Exp $
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/enigma/enigma.1 b/usr.bin/enigma/enigma.1
index 61a4c2689a94..aa025e2028a0 100644
--- a/usr.bin/enigma/enigma.1
+++ b/usr.bin/enigma/enigma.1
@@ -4,7 +4,7 @@
 .\" Since enigma itself is distributed in the Public Domain, this file
 .\" is also.
 .\"
-.\" $Id: enigma.1,v 1.3 1999/06/24 06:22:20 mpp Exp $
+.\" $FreeBSD$
 .\" "
 .Dd October 30, 1998
 .Os
diff --git a/usr.bin/error/error.1 b/usr.bin/error/error.1
index 7f5f79c8b224..b944ee6a222f 100644
--- a/usr.bin/error/error.1
+++ b/usr.bin/error/error.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)error.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt ERROR 1
diff --git a/usr.bin/error/filter.c b/usr.bin/error/filter.c
index 1b82cfdf5ee4..84fd970572a9 100644
--- a/usr.bin/error/filter.c
+++ b/usr.bin/error/filter.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)filter.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: filter.c,v 1.2 1997/11/03 07:44:06 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/error/input.c b/usr.bin/error/input.c
index 97b9667cfdd8..602fed616ae6 100644
--- a/usr.bin/error/input.c
+++ b/usr.bin/error/input.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/main.c b/usr.bin/error/main.c
index 7ae8100dbd75..7e8b9d587f51 100644
--- a/usr.bin/error/main.c
+++ b/usr.bin/error/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.3 1997/11/03 07:44:12 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/pi.c b/usr.bin/error/pi.c
index c5c1ffb9145c..405f548e4b08 100644
--- a/usr.bin/error/pi.c
+++ b/usr.bin/error/pi.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pi.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: pi.c,v 1.3 1997/11/03 07:44:15 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/subr.c b/usr.bin/error/subr.c
index 9a44019ba76b..cd0846392cab 100644
--- a/usr.bin/error/subr.c
+++ b/usr.bin/error/subr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)subr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/touch.c b/usr.bin/error/touch.c
index 08952f7b593d..de6a396ebd3d 100644
--- a/usr.bin/error/touch.c
+++ b/usr.bin/error/touch.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)touch.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: touch.c,v 1.5 1998/02/25 02:24:04 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 4b7014669d68..6c4aebc604b7 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)expand.1	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt EXPAND 1
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index a8014f9a44a2..f16f64582754 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
 #else
 static const char rcsid[] = 
-	"$Id: expand.c,v 1.3 1998/02/02 07:10:59 cwt Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/false/false.1 b/usr.bin/false/false.1
index 13989ef97dd1..28339d3b761f 100644
--- a/usr.bin/false/false.1
+++ b/usr.bin/false/false.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)false.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FALSE 1
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index fd6e78bd6215..40b6835eaa2e 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -1,4 +1,4 @@
-.\" $Id: fetch.1,v 1.29 1999/02/23 18:51:13 wollman Exp $
+.\" $FreeBSD$
 .Dd February 22, 1999
 .Dt FETCH 1
 .Os FreeBSD 4.0
diff --git a/usr.bin/fetch/fetch.h b/usr.bin/fetch/fetch.h
index 685fdd673042..bea7db93a38e 100644
--- a/usr.bin/fetch/fetch.h
+++ b/usr.bin/fetch/fetch.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: fetch.h,v 1.6 1998/09/20 00:01:26 jkh Exp $
+ * $FreeBSD$
  */
 
 #ifndef fetch_h
diff --git a/usr.bin/fetch/file.c b/usr.bin/fetch/file.c
index 1bdccc8fdc49..24dfd75ab4ca 100644
--- a/usr.bin/fetch/file.c
+++ b/usr.bin/fetch/file.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: file.c,v 1.4 1998/09/17 00:15:15 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/ftp.c b/usr.bin/fetch/ftp.c
index f2f2640e5630..922887bb2789 100644
--- a/usr.bin/fetch/ftp.c
+++ b/usr.bin/fetch/ftp.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ftp.c,v 1.13 1999/02/05 01:01:17 fenner Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/http.c b/usr.bin/fetch/http.c
index 0805e2716677..4e19485a9f8f 100644
--- a/usr.bin/fetch/http.c
+++ b/usr.bin/fetch/http.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: http.c,v 1.27 1999/05/18 19:37:37 jmg Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/main.c b/usr.bin/fetch/main.c
index 6524fd666b03..7cae99ba4e06 100644
--- a/usr.bin/fetch/main.c
+++ b/usr.bin/fetch/main.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: main.c,v 1.51 1999/03/08 19:16:14 wollman Exp $ */
+/* $FreeBSD$ */
 
 #include <sys/types.h>
 
diff --git a/usr.bin/fetch/uri.c b/usr.bin/fetch/uri.c
index 95d4c91898bf..3aeb0d1c74a8 100644
--- a/usr.bin/fetch/uri.c
+++ b/usr.bin/fetch/uri.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/util.c b/usr.bin/fetch/util.c
index 1a927626e40e..bac316d3a508 100644
--- a/usr.bin/fetch/util.c
+++ b/usr.bin/fetch/util.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: util.c,v 1.5 1997/02/11 20:46:06 wollman Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/file/LEGAL.NOTICE b/usr.bin/file/LEGAL.NOTICE
index 122c5f615624..29f21aed456b 100644
--- a/usr.bin/file/LEGAL.NOTICE
+++ b/usr.bin/file/LEGAL.NOTICE
@@ -1,6 +1,6 @@
 Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
 Software written by Ian F. Darwin and others; maintained by Christos Zoulas.
-$Id$
+$FreeBSD$
 
 This software (or derivative software) may not be made subject to any 
 license which denies anyone permission to alter it and redistribute it 
diff --git a/usr.bin/file/MAINT b/usr.bin/file/MAINT
index 2b91576c9de7..cb318445c60f 100644
--- a/usr.bin/file/MAINT
+++ b/usr.bin/file/MAINT
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 Maintenance notes:
 
diff --git a/usr.bin/file/Magdir/Localstuff b/usr.bin/file/Magdir/Localstuff
index 0b6d9554bb9e..a3e1e0bfce4c 100644
--- a/usr.bin/file/Magdir/Localstuff
+++ b/usr.bin/file/Magdir/Localstuff
@@ -2,6 +2,6 @@
 #------------------------------------------------------------------------------
 # Localstuff:  file(1) magic for locally observed files
 #
-# $Id$
+# $FreeBSD$
 # Add any locally observed files here.  Remember:
 # text if readable, executable if runnable binary, data if unreadable.
diff --git a/usr.bin/file/Magdir/softquad b/usr.bin/file/Magdir/softquad
index f570b0974f3f..0fd952a2ee43 100644
--- a/usr.bin/file/Magdir/softquad
+++ b/usr.bin/file/Magdir/softquad
@@ -2,7 +2,7 @@
 #------------------------------------------------------------------------------
 # softquad:  file(1) magic for SoftQuad Publishing Software
 #
-# $Id$
+# $FreeBSD$
 # Author/Editor and RulesBuilder
 #
 # XXX - byte order?
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 2e00f0bc0861..3834e4b0b307 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,6 +1,6 @@
 # Makefile for file(1) cmd.
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
-# @(#)$Id: Makefile,v 1.11 1997/04/04 02:42:53 mpp Exp $
+# @(#)$FreeBSD$
 #
 # This software is not subject to any license of the American Telephone
 # and Telegraph Company or of the Regents of the University of California.
diff --git a/usr.bin/file/PORTING b/usr.bin/file/PORTING
index 1fa5da16e7c0..7e65021d2950 100644
--- a/usr.bin/file/PORTING
+++ b/usr.bin/file/PORTING
@@ -1,5 +1,5 @@
 Portability of the new file(1) command.
-@(#) $Id$
+@(#) $FreeBSD$
 
 Read this file only if the program doesn't compile on your system.
 
diff --git a/usr.bin/file/README b/usr.bin/file/README
index 21932922b2b1..9872176410be 100644
--- a/usr.bin/file/README
+++ b/usr.bin/file/README
@@ -1,5 +1,5 @@
 ** README for file(1) Command **
-@(#) $Id: README,v 1.1.1.2 1997/03/18 17:58:39 mpp Exp $
+@(#) $FreeBSD$
 
 This is Release 3.x of Ian Darwin's (copyright but distributable)
 file(1) command. This version is the standard "file" command for Linux,
diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c
index 041ead0e717e..9c5b94547f55 100644
--- a/usr.bin/file/apprentice.c
+++ b/usr.bin/file/apprentice.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: apprentice.c,v 1.7 1998/01/28 07:36:21 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/ascmagic.c b/usr.bin/file/ascmagic.c
index a2b5d761039a..bf116999e3dc 100644
--- a/usr.bin/file/ascmagic.c
+++ b/usr.bin/file/ascmagic.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/compress.c b/usr.bin/file/compress.c
index fba9c9119319..f1e8ae8b2510 100644
--- a/usr.bin/file/compress.c
+++ b/usr.bin/file/compress.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/cvsimport.sh b/usr.bin/file/cvsimport.sh
index f9818fa7fb4e..0436074fc634 100644
--- a/usr.bin/file/cvsimport.sh
+++ b/usr.bin/file/cvsimport.sh
@@ -3,7 +3,7 @@
 # This shell script can be used in order to handle future imports
 # of newer versions of file(1)
 #
-# $Id: cvsimport.sh,v 1.3 1997/02/22 19:29:10 peter Exp $
+# $FreeBSD$
 if [ $# -ne 2 ] ; then 
 	echo "usage: $0 <major> <minor>" 1>&2
 	exit 1
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index bb3221faed92..685afc242591 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,4 +1,4 @@
-.\" $Id: file.1,v 1.11 1998/01/28 07:36:22 charnier Exp $
+.\" $FreeBSD$
 .Dd July 30, 1997
 .Dt FILE 1 "Copyright but distributable"
 .Os
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index 485e398ee216..f420cac9f1c0 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h
index d62942e221c9..7d42ad88c712 100644
--- a/usr.bin/file/file.h
+++ b/usr.bin/file/file.h
@@ -1,6 +1,6 @@
 /*
  * file.h - definitions for file(1) program
- * @(#)$Id: file.h,v 1.8 1998/01/28 07:36:23 charnier Exp $
+ * @(#)$FreeBSD$
  *
  * Copyright (c) Ian F. Darwin, 1987.
  * Written by Ian F. Darwin.
diff --git a/usr.bin/file/fsmagic.c b/usr.bin/file/fsmagic.c
index b12a617b23ff..b9f690c10540 100644
--- a/usr.bin/file/fsmagic.c
+++ b/usr.bin/file/fsmagic.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: fsmagic.c,v 1.7 1998/01/28 07:36:23 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/internat.c b/usr.bin/file/internat.c
index ffb7aa2e21dc..f04208e08a01 100644
--- a/usr.bin/file/internat.c
+++ b/usr.bin/file/internat.c
@@ -1,7 +1,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "file.h"
diff --git a/usr.bin/file/is_tar.c b/usr.bin/file/is_tar.c
index 69d822d9beeb..362825f3e8d6 100644
--- a/usr.bin/file/is_tar.c
+++ b/usr.bin/file/is_tar.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index 6355245187bb..12923ac0057a 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -1,5 +1,5 @@
 .\"
-.\" @(#)$Id: magic.5,v 1.8 1997/11/04 03:56:56 steve Exp $
+.\" @(#)$FreeBSD$
 .\"
 .\" install as magic.4 on USG, magic.5 on V7 or Berkeley systems.
 .\"
diff --git a/usr.bin/file/names.h b/usr.bin/file/names.h
index 1fed1bfa2a1b..1273375f6a49 100644
--- a/usr.bin/file/names.h
+++ b/usr.bin/file/names.h
@@ -10,7 +10,7 @@
  *
  * See LEGAL.NOTICE
  *
- * $Id: names.h,v 1.1.1.3 1997/03/18 17:58:52 mpp Exp $
+ * $FreeBSD$
  */
 
 /* these types are used to index the table 'types': keep em in sync! */
diff --git a/usr.bin/file/patchlevel.h b/usr.bin/file/patchlevel.h
index b6cea964c4bc..7fe74e7f1d65 100644
--- a/usr.bin/file/patchlevel.h
+++ b/usr.bin/file/patchlevel.h
@@ -3,7 +3,7 @@
 
 /*
  * Patchlevel file for Ian Darwin's MAGIC command.
- * $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/usr.bin/file/print.c b/usr.bin/file/print.c
index 5ccf07dc6afd..8cd079ad8fcd 100644
--- a/usr.bin/file/print.c
+++ b/usr.bin/file/print.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: print.c,v 1.7 1998/01/28 07:36:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/readelf.c b/usr.bin/file/readelf.c
index fb87af7a63df..5674402a4602 100644
--- a/usr.bin/file/readelf.c
+++ b/usr.bin/file/readelf.c
@@ -1,7 +1,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: readelf.c,v 1.4 1998/02/20 04:54:00 jb Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #ifdef BUILTIN_ELF
diff --git a/usr.bin/file/readelf.h b/usr.bin/file/readelf.h
index 853eed600f95..28d44976c241 100644
--- a/usr.bin/file/readelf.h
+++ b/usr.bin/file/readelf.h
@@ -1,6 +1,6 @@
 /*
  * readelf.h 
- * @(#)$Id: readelf.h,v 1.1.1.1 1997/03/18 17:58:55 mpp Exp $
+ * @(#)$FreeBSD$
  *
  * Provide elf data structures for non-elf machines, allowing file
  * non-elf hosts to determine if an elf binary is stripped.
diff --git a/usr.bin/file/softmagic.c b/usr.bin/file/softmagic.c
index 5227acd50d5d..c1e79257963c 100644
--- a/usr.bin/file/softmagic.c
+++ b/usr.bin/file/softmagic.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/tar.h b/usr.bin/file/tar.h
index 6a9e1dd22398..87f0d55f25ad 100644
--- a/usr.bin/file/tar.h
+++ b/usr.bin/file/tar.h
@@ -5,7 +5,7 @@
  *
  * Created 25 August 1985 by John Gilmore, ihnp4!hoptoad!gnu.
  *
- * $Id$ # checkin only
+ * $FreeBSD$ # checkin only
  */
 
 /*
diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile
index 28cd21e83437..79fdc9267dce 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	file2c
 MAN1=	file2c.1
diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index ef4e77b489b8..0cf0d42826a7 100644
--- a/usr.bin/file2c/file2c.1
+++ b/usr.bin/file2c/file2c.1
@@ -5,7 +5,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
 .\" ---------------------------------------------------------------------------
 .\"
-.\" $Id: file2c.1,v 1.4 1997/06/23 04:51:58 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 28, 1995
 .Dt FILE2C 1
diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
index 232d51b8c650..f946bbd5cc82 100644
--- a/usr.bin/file2c/file2c.c
+++ b/usr.bin/file2c/file2c.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: file2c.c,v 1.3 1997/02/22 19:55:01 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index a2de73f421e3..59e76ef28034 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)find.1	8.7 (Berkeley) 5/9/95
-.\"	$Id: find.1,v 1.19 1999/04/19 08:26:00 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 9, 1995
 .Dt FIND 1
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index 0005cb6a808a..c6cb12ef1297 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)option.c	8.2 (Berkeley) 4/16/94";
 */
 static const char rcsid[] =
-	"$Id: option.c,v 1.6 1997/11/28 15:48:08 steve Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index 1c43820a6854..4fa1860ce043 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)finger.1	8.3 (Berkeley) 5/5/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 1, 1997
 .Dt FINGER 1
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index ec0e6b9889e5..77f365a537a1 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -55,7 +55,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
 #else
 static const char rcsid[] =
-	"$Id: finger.c,v 1.13 1999/05/08 00:46:04 obrien Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index a3209cba89d4..7d4d99f6fb6f 100644
--- a/usr.bin/finger/finger.h
+++ b/usr.bin/finger/finger.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)finger.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 typedef struct person {
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 5d8023f721bd..3d0a4091c070 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)lprint.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-	"$Id: lprint.c,v 1.8 1997/07/02 06:34:49 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index c4698b461c29..2903c063806f 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-	"$Id: net.c,v 1.10 1998/06/09 04:30:40 imp Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index 8c38d7c414fe..acf9dff350a3 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index e391840cfefe..54c68f0f6f98 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-	"$Id: util.c,v 1.6 1999/08/21 18:25:38 imp Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index e7413905239a..2760430e5546 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fmt.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FMT 1
diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c
index 51cbe5cd1d62..94dd8c6de00d 100644
--- a/usr.bin/fmt/fmt.c
+++ b/usr.bin/fmt/fmt.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)fmt.c	8.1 (Berkeley) 7/20/93";
 #else
 static const char rcsid[] =
-	"$Id: fmt.c,v 1.10 1997/08/21 03:41:41 jlemon Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/fold/fold.1 b/usr.bin/fold/fold.1
index 3e020cf1cac3..a37121d6c8a7 100644
--- a/usr.bin/fold/fold.1
+++ b/usr.bin/fold/fold.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fold.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FOLD 1
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 080c9abfbcae..386caaffcea2 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fold.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/fpr/fpr.1 b/usr.bin/fpr/fpr.1
index 7e9811258840..489885ed773f 100644
--- a/usr.bin/fpr/fpr.1
+++ b/usr.bin/fpr/fpr.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fpr.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FPR 1
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index 553b22682291..0078a9e6b5d6 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)from.1	8.2 (Berkeley) 12/30/93
-.\"	$Id: from.1,v 1.5 1999/07/26 23:12:12 green Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt FROM 1
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index 4daa4c4a3a18..6b3320712f06 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: from.c,v 1.6 1999/07/26 23:12:12 green Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/fsplit/fsplit.1 b/usr.bin/fsplit/fsplit.1
index fe4d06b844a5..23a3ddfea62a 100644
--- a/usr.bin/fsplit/fsplit.1
+++ b/usr.bin/fsplit/fsplit.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsplit.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FSPLIT 1
diff --git a/usr.bin/fsplit/fsplit.c b/usr.bin/fsplit/fsplit.c
index 03cf08a46500..d80837efb506 100644
--- a/usr.bin/fsplit/fsplit.c
+++ b/usr.bin/fsplit/fsplit.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fsplit.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: fsplit.c,v 1.3 1997/07/08 11:01:35 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile
index 6ff6ab1224c4..8e9e277d38d0 100644
--- a/usr.bin/fstat/Makefile
+++ b/usr.bin/fstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.2 1997/08/22 14:22:31 jmg Exp $
+# $FreeBSD$
 
 PROG=	fstat
 CFLAGS+=-Wall
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index fd005e580665..9354ec12891c 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fstat.1	8.3 (Berkeley) 2/25/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 25, 1994
 .Dt FSTAT 1
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 424f1379daad..b8e0c973a470 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fstat.c	8.3 (Berkeley) 5/2/95";
 #endif
 static const char rcsid[] =
-	"$Id: fstat.c,v 1.16 1998/07/06 21:01:16 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index c74e3adfc9b7..bbd82e253aa6 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1997/12/13 20:38:12 pst Exp $
+# $FreeBSD$
 #	$NetBSD: Makefile,v 1.15 1997/10/18 15:31:20 lukem Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 4/3/94
 
diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index 04b7c43ffbc7..acc3c6bde69c 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,4 +1,4 @@
-/*	$Id: cmds.c,v 1.14 1998/02/14 15:38:29 steve Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: cmds.c,v 1.30.2.1 1997/11/18 00:58:26 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)cmds.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$Id: cmds.c,v 1.14 1998/02/14 15:38:29 steve Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: cmds.c,v 1.30.2.1 1997/11/18 00:58:26 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/cmdtab.c b/usr.bin/ftp/cmdtab.c
index 37920e7d8bca..542d32053d95 100644
--- a/usr.bin/ftp/cmdtab.c
+++ b/usr.bin/ftp/cmdtab.c
@@ -1,4 +1,4 @@
-/*	$Id$	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: cmdtab.c,v 1.17 1997/08/18 10:20:17 lukem Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)cmdtab.c	8.4 (Berkeley) 10/9/94";
 #else
-__RCSID("$Id$");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: cmdtab.c,v 1.17 1997/08/18 10:20:17 lukem Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/complete.c b/usr.bin/ftp/complete.c
index 901a916d7bab..ee0453f61e15 100644
--- a/usr.bin/ftp/complete.c
+++ b/usr.bin/ftp/complete.c
@@ -1,4 +1,4 @@
-/*	$Id$	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: complete.c,v 1.11 1997/09/13 09:05:53 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$Id$");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: complete.c,v 1.11 1997/09/13 09:05:53 lukem Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/ftp/domacro.c b/usr.bin/ftp/domacro.c
index c5ddc92061d7..907af4583b9a 100644
--- a/usr.bin/ftp/domacro.c
+++ b/usr.bin/ftp/domacro.c
@@ -1,4 +1,4 @@
-/*	$Id$	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: domacro.c,v 1.10 1997/07/20 09:45:45 lukem Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)domacro.c	8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$Id$");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: domacro.c,v 1.10 1997/07/20 09:45:45 lukem Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h
index a334c0b6744c..a8ac97b8c866 100644
--- a/usr.bin/ftp/extern.h
+++ b/usr.bin/ftp/extern.h
@@ -1,4 +1,4 @@
-/*	$Id: extern.h,v 1.6 1997/12/13 20:38:15 pst Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: extern.h,v 1.17.2.1 1997/11/18 00:59:50 mellon Exp $	*/
 
 /*-
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c
index a675886ccb7e..1d73c0f9655e 100644
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$Id: fetch.c,v 1.5 1997/12/16 08:58:15 ache Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: fetch.c,v 1.16.2.1 1997/11/18 01:00:22 mellon Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 05981aec01cf..59b371f34b7b 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" 	$Id: ftp.1,v 1.10 1999/07/01 14:32:07 ru Exp $
+.\" $FreeBSD$
 .\" 	$NetBSD: ftp.1,v 1.21 1997/06/10 21:59:58 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index 154f6942f5d6..d2edd014d54b 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,4 +1,4 @@
-/*	$Id: ftp.c,v 1.15 1998/12/09 20:49:20 eivind Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$Id: ftp.c,v 1.15 1998/12/09 20:49:20 eivind Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/ftp_var.h b/usr.bin/ftp/ftp_var.h
index 2a4f2c8615ea..d26d22df7f14 100644
--- a/usr.bin/ftp/ftp_var.h
+++ b/usr.bin/ftp/ftp_var.h
@@ -1,4 +1,4 @@
-/*	$Id: ftp_var.h,v 1.6 1997/12/13 20:38:18 pst Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: ftp_var.h,v 1.20.2.1 1997/11/18 01:01:37 mellon Exp $	*/
 
 /*
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index f8b21d71debf..f2cad20744c1 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.18 1999/06/25 14:11:15 ru Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: main.c,v 1.26 1997/10/14 16:31:22 christos Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 1989, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$Id: main.c,v 1.18 1999/06/25 14:11:15 ru Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: main.c,v 1.26 1997/10/14 16:31:22 christos Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/pathnames.h b/usr.bin/ftp/pathnames.h
index bc649d68efc4..bf71177a33d4 100644
--- a/usr.bin/ftp/pathnames.h
+++ b/usr.bin/ftp/pathnames.h
@@ -1,4 +1,4 @@
-/*	$Id: pathnames.h,v 1.2 1997/06/25 08:56:43 msmith Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: pathnames.h,v 1.7 1997/01/09 20:19:40 tls Exp $	*/
 
 /*
diff --git a/usr.bin/ftp/ruserpass.c b/usr.bin/ftp/ruserpass.c
index c0e7f95cbea6..84355d320e17 100644
--- a/usr.bin/ftp/ruserpass.c
+++ b/usr.bin/ftp/ruserpass.c
@@ -1,4 +1,4 @@
-/*	$Id: ruserpass.c,v 1.7 1997/12/13 20:38:20 pst Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: ruserpass.c,v 1.14.2.1 1997/11/18 01:02:05 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)ruserpass.c	8.4 (Berkeley) 4/27/95";
 #else
-__RCSID("$Id: ruserpass.c,v 1.7 1997/12/13 20:38:20 pst Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: ruserpass.c,v 1.14.2.1 1997/11/18 01:02:05 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/util.c b/usr.bin/ftp/util.c
index 45baf324d705..24024a19342d 100644
--- a/usr.bin/ftp/util.c
+++ b/usr.bin/ftp/util.c
@@ -1,4 +1,4 @@
-/*	$Id: util.c,v 1.6 1998/07/19 00:01:24 jmz Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: util.c,v 1.16.2.1 1997/11/18 01:02:33 mellon Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$Id: util.c,v 1.6 1998/07/19 00:01:24 jmz Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: util.c,v 1.16.2.1 1997/11/18 01:02:33 mellon Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/gcore/aoutcore.c b/usr.bin/gcore/aoutcore.c
index 6d8f9d358cc8..6ad9568ede3f 100644
--- a/usr.bin/gcore/aoutcore.c
+++ b/usr.bin/gcore/aoutcore.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gcore.c	8.2 (Berkeley) 9/23/93";
 #endif
 static const char rcsid[] =
-	"$Id: gcore.c,v 1.13 1998/11/01 06:35:36 jdp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index f612232b458a..f66e584ac146 100644
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: elfcore.c,v 1.2 1998/11/01 06:35:36 jdp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/usr.bin/gcore/gcore.1 b/usr.bin/gcore/gcore.1
index a4d3e3cb9e89..ed3d0d628138 100644
--- a/usr.bin/gcore/gcore.1
+++ b/usr.bin/gcore/gcore.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gcore.1	8.2 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt GCORE 1
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index 6d8f9d358cc8..6ad9568ede3f 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gcore.c	8.2 (Berkeley) 9/23/93";
 #endif
 static const char rcsid[] =
-	"$Id: gcore.c,v 1.13 1998/11/01 06:35:36 jdp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/gcore/md-nop.c b/usr.bin/gcore/md-nop.c
index b7dcdc4a73fc..331901c1841c 100644
--- a/usr.bin/gcore/md-nop.c
+++ b/usr.bin/gcore/md-nop.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)md-nop.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile
index 44ed94145c35..45af07adf895 100644
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/02/22 19:55:04 peter Exp $
+# $FreeBSD$
 
 PROG=	gencat
 SRCS=	gencat.c genlib.c
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index c9959e332396..b7936c6ef128 100644
--- a/usr.bin/gencat/gencat.1
+++ b/usr.bin/gencat/gencat.1
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: gencat.1,v 1.2 1998/11/18 04:30:53 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 11, 1997
 .Dt GENCAT 1
diff --git a/usr.bin/gensetdefs/Makefile b/usr.bin/gensetdefs/Makefile
index 0ea2b678a9f4..00dd6aaf7da1 100644
--- a/usr.bin/gensetdefs/Makefile
+++ b/usr.bin/gensetdefs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1999/05/04 20:31:26 ghelmer Exp $
+# $FreeBSD$
 
 PROG=	gensetdefs
 MAN8=	gensetdefs.8
diff --git a/usr.bin/gensetdefs/gensetdefs.8 b/usr.bin/gensetdefs/gensetdefs.8
index ecbfe3a3668b..8b0bf59073a0 100644
--- a/usr.bin/gensetdefs/gensetdefs.8
+++ b/usr.bin/gensetdefs/gensetdefs.8
@@ -1,5 +1,5 @@
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd March 10, 1999
 .Dt GENSETDEFS 8
diff --git a/usr.bin/gensetdefs/gensetdefs.c b/usr.bin/gensetdefs/gensetdefs.c
index 9a35e097cebf..7e36992214f7 100644
--- a/usr.bin/gensetdefs/gensetdefs.c
+++ b/usr.bin/gensetdefs/gensetdefs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/global/Makefile b/usr.bin/global/Makefile
index 8676dc3ceaf2..a37a2f967cda 100644
--- a/usr.bin/global/Makefile
+++ b/usr.bin/global/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/12/15 02:28:04 skynyrd Exp $
+# $FreeBSD$
 
 SUBDIR= lib global gtags gctags btreeop htags systags
 
diff --git a/usr.bin/global/Makefile.inc b/usr.bin/global/Makefile.inc
index 34657a06430a..0e33fa03b8fe 100644
--- a/usr.bin/global/Makefile.inc
+++ b/usr.bin/global/Makefile.inc
@@ -1,4 +1,4 @@
-# $Id: Makefile.inc,v 1.5 1999/01/18 07:38:09 simokawa Exp $
+# $FreeBSD$
 
 .if !defined(GLOBAL_MAKEFILE_INC_BEEN_HERE)
 
diff --git a/usr.bin/global/btreeop/Makefile b/usr.bin/global/btreeop/Makefile
index 12f4357e7bbe..da762b8ccbbb 100644
--- a/usr.bin/global/btreeop/Makefile
+++ b/usr.bin/global/btreeop/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/12/17 15:18:49 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/btreeop
diff --git a/usr.bin/global/gctags/Makefile b/usr.bin/global/gctags/Makefile
index b66694a58d1f..48ae79232d68 100644
--- a/usr.bin/global/gctags/Makefile
+++ b/usr.bin/global/gctags/Makefile
@@ -1,5 +1,5 @@
 
-# $Id: Makefile,v 1.4 1997/12/17 15:18:52 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/gctags
diff --git a/usr.bin/global/global/Makefile b/usr.bin/global/global/Makefile
index 0deeda464303..61c4d092ab73 100644
--- a/usr.bin/global/global/Makefile
+++ b/usr.bin/global/global/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/12/17 15:18:53 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/global
diff --git a/usr.bin/global/gtags/Makefile b/usr.bin/global/gtags/Makefile
index 05f506f77ce1..ab3fc7624f49 100644
--- a/usr.bin/global/gtags/Makefile
+++ b/usr.bin/global/gtags/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1997/12/17 15:18:54 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/gtags
diff --git a/usr.bin/global/htags/Makefile b/usr.bin/global/htags/Makefile
index c842decafa7a..197d5bb6ad47 100644
--- a/usr.bin/global/htags/Makefile
+++ b/usr.bin/global/htags/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/12/15 02:28:19 skynyrd Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/htags
diff --git a/usr.bin/global/lib/Makefile b/usr.bin/global/lib/Makefile
index 793f953cb09f..ad6b48d8ecdb 100644
--- a/usr.bin/global/lib/Makefile
+++ b/usr.bin/global/lib/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1997/12/21 08:31:50 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/lib
diff --git a/usr.bin/global/systags/Makefile b/usr.bin/global/systags/Makefile
index c2b06a1d1175..ed125c424c68 100644
--- a/usr.bin/global/systags/Makefile
+++ b/usr.bin/global/systags/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/12/15 23:34:57 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/systags
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index 6a7b17ef82b5..c6e77103e739 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)arcs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: arcs.c,v 1.4 1997/07/11 06:11:35 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index 90b9ec95eef0..df83a70025d1 100644
--- a/usr.bin/gprof/gprof.1
+++ b/usr.bin/gprof/gprof.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gprof.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt GPROF 1
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index 2b6285184d42..dfb1e2c82a7f 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: gprof.c,v 1.9 1999/05/23 00:37:54 jmz Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 9c122bb19bca..0fb74f44ce98 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)printgprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index 15af8e198521..c77b19fa008b 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)printlist.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 2a23d53eeb55..8e333a5d3ab7 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)head.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt HEAD 1
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index fc4bdf61664b..e93896bc3ef0 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)head.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: head.c,v 1.8 1997/07/11 06:13:18 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index b72da84ce8c7..2d3bdcbd964a 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: display.c,v 1.2 1997/07/10 06:48:12 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 1fd6d07c14c1..a743a5082e27 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hexdump.1	8.2 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt HEXDUMP 1
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index 8491c42d0d52..c8ce78de8c3a 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)hexdump.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: hexdump.c,v 1.2 1997/07/10 06:48:16 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index ae21411fa694..f3bf5878dafe 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hexsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index 001b90088c7d..87cea73a83ab 100644
--- a/usr.bin/hexdump/od.1
+++ b/usr.bin/hexdump/od.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)od.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: od.1,v 1.5 1997/02/22 19:55:07 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 27, 1994
 .Os
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 7636ab80a439..65a160e64453 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)odsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: odsyntax.c,v 1.6 1997/11/04 05:33:14 ache Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index 34a223649e60..d02cd09a0185 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: parse.c,v 1.2 1997/07/10 06:48:24 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index 70a87aa51c52..9f521895ddab 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/02/22 19:55:08 peter Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
 
diff --git a/usr.bin/id/groups.1 b/usr.bin/id/groups.1
index a19c5935bd18..48bbff64d07b 100644
--- a/usr.bin/id/groups.1
+++ b/usr.bin/id/groups.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)groups.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt GROUPS 1
diff --git a/usr.bin/id/groups.sh b/usr.bin/id/groups.sh
index 904f200fcac5..b6350be8057e 100644
--- a/usr.bin/id/groups.sh
+++ b/usr.bin/id/groups.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)groups.sh	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PATH=/bin:/usr/bin; export PATH
 
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index 56fdcb7c9b56..de43f87ee2c2 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)id.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: id.1,v 1.4 1998/02/28 21:37:54 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt ID 1
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index 2b6c96b407bc..c609a0f7c90b 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)id.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-	"$Id: id.c,v 1.7 1998/08/21 06:47:58 obrien Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index 125a05ee8d98..16e542e41d83 100644
--- a/usr.bin/id/whoami.1
+++ b/usr.bin/id/whoami.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)whoami.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt WHOAMI 1
diff --git a/usr.bin/id/whoami.sh b/usr.bin/id/whoami.sh
index 1c24bcc71989..9b18bac19953 100644
--- a/usr.bin/id/whoami.sh
+++ b/usr.bin/id/whoami.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)whoami.sh	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PATH=/bin:/usr/bin; export PATH
 
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index 376a6030a292..7a646c0fcfd9 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)args.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index 71fb6bc8d032..b7af9b4c2af3 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)indent.1	8.1 (Berkeley) 7/1/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd July 1, 1993
 .Dt INDENT 1
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index c903d705765e..02d34445ee75 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
 #endif
 static const char rcsid[] =
-	"$Id: indent.c,v 1.3 1998/10/18 04:46:24 thepish Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index 11c9a8d7ad54..596c849d6c35 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: io.c,v 1.3 1997/07/15 09:50:59 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile
index 6cc7bda7d56d..9c0e45c0702c 100644
--- a/usr.bin/ipcrm/Makefile
+++ b/usr.bin/ipcrm/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	ipcrm
 
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 7dd2c830908c..78e4054a02fc 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\" $Id: ipcrm.1,v 1.5 1997/07/15 09:54:34 charnier Exp $
+.\" $FreeBSD$
 .\""
 .Dd August 8, 1994
 .Dt IPCRM 1
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index cca197e0bc8e..b52100f632bc 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile
index 5e4afcc5c781..665371074767 100644
--- a/usr.bin/ipcs/Makefile
+++ b/usr.bin/ipcs/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	ipcs
 BINGRP=	kmem
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index e4d441c4a3f4..b52961465f65 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: ipcs.1,v 1.7 1997/07/15 09:55:58 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 18, 1994
 .Dt "IPCS" 1
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index 5eee8b1c5027..a752e6cbf360 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index 7e0b5bd78793..a95454b17b7f 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)join.1	8.3 (Berkeley) 4/28/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt JOIN 1
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index a0229b538a90..4b4add9bc1d6 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)join.c	8.6 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: join.c,v 1.8 1997/08/19 15:58:15 jlemon Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index d0f0ce457fc2..d8419c71b0c0 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)jot.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: jot.1,v 1.5 1999/07/12 20:23:37 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt JOT 1
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 7d96f2b22f67..12b5998cac94 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)jot.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: jot.c,v 1.10 1999/07/22 17:11:59 sheldonh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index ac47abf887b6..b4df3ebb698b 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kdump.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: kdump.1,v 1.3 1997/04/27 08:45:44 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt KDUMP 1
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index c8d46025d599..7fad0f3f7eea 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)kdump.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: kdump.c,v 1.14 1999/06/26 07:31:13 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #define KERNEL
diff --git a/usr.bin/key/key.1 b/usr.bin/key/key.1
index 56a6e1c0838c..a20dd419d558 100644
--- a/usr.bin/key/key.1
+++ b/usr.bin/key/key.1
@@ -1,5 +1,5 @@
 .\"	from: @(#)key.1	1.0 (Bellcore) 12/2/91
-.\" $Id: key.1,v 1.3 1997/07/16 06:51:12 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 2, 1991
 .Dt KEY 1
diff --git a/usr.bin/keyinfo/keyinfo.1 b/usr.bin/keyinfo/keyinfo.1
index 5b6a6c5b6817..775043736354 100644
--- a/usr.bin/keyinfo/keyinfo.1
+++ b/usr.bin/keyinfo/keyinfo.1
@@ -1,5 +1,5 @@
 .\"	from: @(#)keyinfo.1	1.1 (Bellcore) 7/20/93
-.\"	$Id: keyinfo.1,v 1.5 1997/07/16 06:52:13 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 26, 1996
 .Dt KEYINFO 1
diff --git a/usr.bin/keyinfo/keyinfo.pl b/usr.bin/keyinfo/keyinfo.pl
index 260a72479f98..8316c5896505 100644
--- a/usr.bin/keyinfo/keyinfo.pl
+++ b/usr.bin/keyinfo/keyinfo.pl
@@ -3,7 +3,7 @@
 # Search /etc/skeykeys for the skey string for this user OR user specified
 # in 1st parameter.
 #
-# $Id$
+# $FreeBSD$
 #
 
 die "usage: keyinfo [user]\n" unless $#ARGV < 1;
diff --git a/usr.bin/keyinit/keyinit.1 b/usr.bin/keyinit/keyinit.1
index 8513507faef5..ee3dba152038 100644
--- a/usr.bin/keyinit/keyinit.1
+++ b/usr.bin/keyinit/keyinit.1
@@ -1,5 +1,5 @@
 .\"	@(#)keyinit.1	1.0 (Bellcore) 7/20/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd July 20, 1993
 .Dt KEYINIT 1
diff --git a/usr.bin/keylogin/Makefile b/usr.bin/keylogin/Makefile
index 1c3b861ab67c..bf279eb25b22 100644
--- a/usr.bin/keylogin/Makefile
+++ b/usr.bin/keylogin/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	keylogin
 
diff --git a/usr.bin/keylogin/keylogin.1 b/usr.bin/keylogin/keylogin.1
index e20ddfab469d..501d002cffba 100644
--- a/usr.bin/keylogin/keylogin.1
+++ b/usr.bin/keylogin/keylogin.1
@@ -1,6 +1,6 @@
 .\" @(#)keylogin.1 1.5 91/03/11 TIRPC 1.0;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd September 9, 1987
 .Dt KEYLOGIN 1
diff --git a/usr.bin/keylogout/Makefile b/usr.bin/keylogout/Makefile
index e3743ad6029e..cc433e444669 100644
--- a/usr.bin/keylogout/Makefile
+++ b/usr.bin/keylogout/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	keylogout
 
diff --git a/usr.bin/keylogout/keylogout.1 b/usr.bin/keylogout/keylogout.1
index 373304b2b402..7a3503e55e0a 100644
--- a/usr.bin/keylogout/keylogout.1
+++ b/usr.bin/keylogout/keylogout.1
@@ -1,4 +1,4 @@
-.\" $Id$
+.\" $FreeBSD$
 .\" @(#)keylogout.1 1.4 91/03/11 TIRPC 1.0; from 1.3 89/07/26 SMI;
 .Dd April 15, 1989
 .Dt KEYLOGOUT 1
diff --git a/usr.bin/keylogout/keylogout.c b/usr.bin/keylogout/keylogout.c
index 86d391bc7070..d5276d2e168f 100644
--- a/usr.bin/keylogout/keylogout.c
+++ b/usr.bin/keylogout/keylogout.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/killall/Makefile b/usr.bin/killall/Makefile
index b7b319627392..0a0ced7d0db2 100644
--- a/usr.bin/killall/Makefile
+++ b/usr.bin/killall/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 MAINTAINER= wosch
 
 MAN1=	killall.1
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index 2e51e058bfbb..c7b3c3e0feb2 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -22,7 +22,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: killall.1,v 1.9 1997/11/01 15:06:40 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 25, 1995
 .Os FreeBSD 2.2 
diff --git a/usr.bin/killall/killall.pl b/usr.bin/killall/killall.pl
index e18489acf706..6238c7b49668 100755
--- a/usr.bin/killall/killall.pl
+++ b/usr.bin/killall/killall.pl
@@ -26,7 +26,7 @@
 #
 # killall - kill processes by name
 #
-# $Id: killall.pl,v 1.10 1998/08/30 16:54:58 wosch Exp $
+# $FreeBSD$
 
 
 $ENV{'PATH'} = '/bin:/usr/bin'; # security
diff --git a/usr.bin/ktrace/Makefile b/usr.bin/ktrace/Makefile
index b551a37d461a..c00bb7510459 100644
--- a/usr.bin/ktrace/Makefile
+++ b/usr.bin/ktrace/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	1.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.4 1997/02/22 19:55:27 peter Exp $
+# $FreeBSD$
 
 PROG=	ktrace
 SRCS=	ktrace.c subr.c
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index 6708e3ca7d2d..20a461a39410 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ktrace.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: ktrace.1,v 1.6 1997/04/27 08:45:45 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt KTRACE 1
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index f96c4fd45744..1c5a98ba6796 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)ktrace.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: ktrace.c,v 1.10 1997/03/29 04:30:16 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 8af26bab5cfa..4e4b3bf466a5 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)subr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/kzip/Makefile b/usr.bin/kzip/Makefile
index 7c9f8c3b438f..8ff6f7f09623 100644
--- a/usr.bin/kzip/Makefile
+++ b/usr.bin/kzip/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	kzip
 MAN8=	kzip.8
diff --git a/usr.bin/kzip/kzip.8 b/usr.bin/kzip/kzip.8
index f720da67fc1f..a966d365f314 100644
--- a/usr.bin/kzip/kzip.8
+++ b/usr.bin/kzip/kzip.8
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: kzip.8,v 1.5 1998/03/23 07:44:18 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 15, 1996
 .Os
diff --git a/usr.bin/kzip/kzip.c b/usr.bin/kzip/kzip.c
index 74bd701751da..430dcc39f619 100644
--- a/usr.bin/kzip/kzip.c
+++ b/usr.bin/kzip/kzip.c
@@ -13,7 +13,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: kzip.c,v 1.11 1998/06/01 18:34:19 jhay Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1
index 78b8ea025231..b1c9ed8aba1c 100644
--- a/usr.bin/lam/lam.1
+++ b/usr.bin/lam/lam.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)lam.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LAM 1
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 599337a71855..277081095af7 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lam.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index 8983fc19763d..27be940c0811 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)last.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LAST 1
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index 7e84c7ded476..33248e24b3c7 100644
--- a/usr.bin/lastcomm/lastcomm.1
+++ b/usr.bin/lastcomm/lastcomm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)lastcomm.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: lastcomm.1,v 1.5 1997/02/22 19:55:32 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 18, 1996
 .Dt LASTCOMM 1
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index 64aae8fa4860..4beed143c977 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)lastcomm.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ldd/Makefile b/usr.bin/ldd/Makefile
index a3a726944965..d7cd01069682 100644
--- a/usr.bin/ldd/Makefile
+++ b/usr.bin/ldd/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.9 1998/06/12 14:11:15 peter Exp $
+# $FreeBSD$
 
 PROG=		ldd
 SRCS=		ldd.c
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index 860b05336296..d565d607102f 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ldd.c,v 1.16 1998/08/30 18:30:59 jdp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/ldd/sods.c b/usr.bin/ldd/sods.c
index 70784e6258b0..a41afaa63c13 100644
--- a/usr.bin/ldd/sods.c
+++ b/usr.bin/ldd/sods.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: sods.c,v 1.7 1998/05/01 08:40:11 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <assert.h>
diff --git a/usr.bin/leave/Makefile b/usr.bin/leave/Makefile
index 4c6129171217..eacf6f1e021d 100644
--- a/usr.bin/leave/Makefile
+++ b/usr.bin/leave/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $Id$
+# $FreeBSD$
 
 PROG=	leave
 CFLAGS+=-Wall
diff --git a/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index 32b1999e76e8..f0cc56e726f5 100644
--- a/usr.bin/leave/leave.1
+++ b/usr.bin/leave/leave.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)leave.1	8.3 (Berkeley) 4/28/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt LEAVE 1
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index c39269692683..d76465531fa4 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)leave.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: leave.c,v 1.3 1998/01/06 17:27:09 helbig Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index 5d98811d4840..855da64da498 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.11 1997/10/05 09:39:58 jkh Exp $
+# $FreeBSD$
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile
index 8fd744f3c9e8..0091cc2747bc 100644
--- a/usr.bin/lex/lib/Makefile
+++ b/usr.bin/lex/lib/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1997/02/22 19:55:36 peter Exp $
+# $FreeBSD$
 
 LIB=    ln
 SRCS=   libmain.c libyywrap.c
diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1
index 29033ea1d77d..258dc55b3708 100644
--- a/usr.bin/limits/limits.1
+++ b/usr.bin/limits/limits.1
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\"	$Id: limits.1,v 1.11 1999/04/13 02:32:12 ghelmer Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 15, 1996
 .Dt LIMITS 1
diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
index e2f8bef620e4..b9de9a4c9cd7 100644
--- a/usr.bin/limits/limits.c
+++ b/usr.bin/limits/limits.c
@@ -20,7 +20,7 @@
  *
  * Display/change(+runprogram)/eval resource limits.
  *
- *	$Id: limits.c,v 1.4 1997/05/10 19:00:58 davidn Exp $
+ * $FreeBSD$
  */
 
 #include <err.h>
diff --git a/usr.bin/locate/Makefile b/usr.bin/locate/Makefile
index 2c82bee27aa6..1d495e420ece 100644
--- a/usr.bin/locate/Makefile
+++ b/usr.bin/locate/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.4 1997/02/22 19:55:40 peter Exp $
+# $FreeBSD$
 
 MAINTAINER= wosch
 
diff --git a/usr.bin/locate/Makefile.inc b/usr.bin/locate/Makefile.inc
index 0f80876250b2..48174083d848 100644
--- a/usr.bin/locate/Makefile.inc
+++ b/usr.bin/locate/Makefile.inc
@@ -1,3 +1,3 @@
-#	$Id$
+# $FreeBSD$
 
 LIBEXECDIR?=	/usr/libexec
diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile
index bcb016e24a7f..e0018d89b7fd 100644
--- a/usr.bin/locate/bigram/Makefile
+++ b/usr.bin/locate/bigram/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	locate.bigram
 NOMAN=	noman
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index 663428a0526d..137b590697ae 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile
index 7e4c4fd573fe..fb1fb510e59a 100644
--- a/usr.bin/locate/code/Makefile
+++ b/usr.bin/locate/code/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	locate.code
 CFLAGS+=-I${.CURDIR}/../locate 
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index 47d20590dbad..c7cb09715fb4 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id: locate.code.c,v 1.9 1997/02/22 19:55:43 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index c1b14bf657e9..064cf08a52be 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	locate
 SRCS=	util.c locate.c
diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh
index 86251a33ca75..75c683246ca4 100644
--- a/usr.bin/locate/locate/concatdb.sh
+++ b/usr.bin/locate/locate/concatdb.sh
@@ -30,7 +30,7 @@
 #
 # Sequence of databases is important.
 #
-# $Id: concatdb.sh,v 1.7 1998/03/08 15:28:32 wosch Exp $
+# $FreeBSD$
 
 # The directory containing locate subprograms
 : ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
diff --git a/usr.bin/locate/locate/fastfind.c b/usr.bin/locate/locate/fastfind.c
index d886ffa55667..68f8a86d2b2b 100644
--- a/usr.bin/locate/locate/fastfind.c
+++ b/usr.bin/locate/locate/fastfind.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: fastfind.c,v 1.10 1997/07/21 12:08:13 charnier Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index 2519a0722c7f..e4cffa873aa3 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: locate.1,v 1.10 1998/02/07 05:30:14 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LOCATE 1
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index 819d8a50c926..a0ffe0dbdcc0 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)locate.c    8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index 9e997d447231..24df8d4002be 100644
--- a/usr.bin/locate/locate/locate.h
+++ b/usr.bin/locate/locate/locate.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)locate.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Symbolic constants shared by locate.c and code.c */
diff --git a/usr.bin/locate/locate/locate.rc b/usr.bin/locate/locate/locate.rc
index e1f400083ba9..57835b363a3c 100644
--- a/usr.bin/locate/locate/locate.rc
+++ b/usr.bin/locate/locate/locate.rc
@@ -1,7 +1,7 @@
 #
 # /etc/locate.rc -  command script for updatedb(8)
 #
-# $Id: locate.rc,v 1.6 1998/03/08 16:09:26 wosch Exp $
+# $FreeBSD$
 
 #
 # All commented values are the defaults
diff --git a/usr.bin/locate/locate/locate.updatedb.8 b/usr.bin/locate/locate/locate.updatedb.8
index 9e9bb1e8c1af..fad70894c050 100644
--- a/usr.bin/locate/locate/locate.updatedb.8
+++ b/usr.bin/locate/locate/locate.updatedb.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 11, 1996
 .Dt LOCATE.UPDATEDB 8
diff --git a/usr.bin/locate/locate/mklocatedb.sh b/usr.bin/locate/locate/mklocatedb.sh
index 864760e87ec7..4df3afa1386f 100644
--- a/usr.bin/locate/locate/mklocatedb.sh
+++ b/usr.bin/locate/locate/mklocatedb.sh
@@ -28,7 +28,7 @@
 # 
 # usage: mklocatedb [-presort] < filelist > database
 #
-# $Id: mklocatedb.sh,v 1.7 1998/03/08 16:09:28 wosch Exp $
+# $FreeBSD$
 
 # The directory containing locate subprograms
 : ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh
index 0eea10e3c2b7..fbf1e61b0a49 100644
--- a/usr.bin/locate/locate/updatedb.sh
+++ b/usr.bin/locate/locate/updatedb.sh
@@ -26,7 +26,7 @@
 #
 # updatedb - update locate database for local mounted filesystems
 #
-# $Id: updatedb.sh,v 1.14 1999/05/14 10:18:43 wosch Exp $
+# $FreeBSD$
 
 : ${LOCATE_CONFIG="/etc/locate.rc"}
 if [ -f "$LOCATE_CONFIG" -a -r "$LOCATE_CONFIG" ]; then
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index 87ad02f10574..38fe284a80f8 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: util.c,v 1.4 1997/02/22 19:55:50 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/lock/lock.1 b/usr.bin/lock/lock.1
index 8f707777f50e..d3538ed2fe0f 100644
--- a/usr.bin/lock/lock.1
+++ b/usr.bin/lock/lock.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)lock.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LOCK 1
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index 786c31ac762b..d5b60ae10da1 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lock.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: lock.c,v 1.4 1997/07/21 12:09:34 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/lockf/Makefile b/usr.bin/lockf/Makefile
index 47fb6ab863e1..77d89c45bbdf 100644
--- a/usr.bin/lockf/Makefile
+++ b/usr.bin/lockf/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 
 PROG=	lockf
 CFLAGS+=-Wall
diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1
index 36b50de0cc84..e4fc80eb93dc 100644
--- a/usr.bin/lockf/lockf.1
+++ b/usr.bin/lockf/lockf.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: lockf.1,v 1.5 1998/03/23 07:44:28 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 7, 1998
 .Os FreeBSD
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index 76b4870634dd..0a91048cafc4 100644
--- a/usr.bin/lockf/lockf.c
+++ b/usr.bin/lockf/lockf.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: lockf.c,v 1.6 1997/07/22 07:32:23 charnier Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index 413b39af49ba..b2abd2ba2de2 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logger.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LOGGER 1
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index c272ae269305..e7be77125506 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)logger.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 595a2fc9fc81..2813ccbdfe30 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $Id: Makefile,v 1.27 1999/01/20 21:58:46 jdp Exp $
+# $FreeBSD$
 
 PROG=	login
 MAN1=	login.1
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index 7bea546b6dc9..2ee22ef7f0db 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)login.1	8.2 (Berkeley) 5/5/94
-.\"	$Id: login.1,v 1.13 1999/01/11 09:07:42 asami Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 5, 1994
 .Dt LOGIN 1
diff --git a/usr.bin/login/login.access.5 b/usr.bin/login/login.access.5
index ff6d21cc14fe..10788ed38e6f 100644
--- a/usr.bin/login/login.access.5
+++ b/usr.bin/login/login.access.5
@@ -1,5 +1,5 @@
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .\" this is comment
 .Dd April 30, 1994
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 94a463d90ffa..7b7cc97b7d77 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: login.c,v 1.47 1999/04/24 17:26:32 ache Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index d8de2ce01f46..e75afcb925ec 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logname.1	8.1 (Berkeley) 6/9/93
-.\"	$Id: logname.1,v 1.3 1997/04/27 08:45:45 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt LOGNAME 1
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index 32958aff71a3..ed688b467f37 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)look.1	8.1 (Berkeley) 6/14/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 14, 1993
 .Dt LOOK 1
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index ddca4d02f698..ad2f35c4f3bf 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)look.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: look.c,v 1.9 1997/09/15 11:02:10 jkh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1
index 418556e414e1..68b074b2bdb5 100644
--- a/usr.bin/lorder/lorder.1
+++ b/usr.bin/lorder/lorder.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lorder.1	8.2 (Berkeley) 4/28/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt LORDER 1
diff --git a/usr.bin/lsvfs/Makefile b/usr.bin/lsvfs/Makefile
index 3b25443ca3a2..b2b06113e666 100644
--- a/usr.bin/lsvfs/Makefile
+++ b/usr.bin/lsvfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 PROG=	lsvfs
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/lsvfs/lsvfs.1 b/usr.bin/lsvfs/lsvfs.1
index 3bd508350a33..bd075c85db55 100644
--- a/usr.bin/lsvfs/lsvfs.1
+++ b/usr.bin/lsvfs/lsvfs.1
@@ -1,4 +1,4 @@
-.\" $Id: lsvfs.1,v 1.5 1997/02/22 19:55:59 peter Exp $
+.\" $FreeBSD$
 .\" Garrett A. Wollman, September 1994
 .\" This file is in the public domain.
 .\"
diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c
index d9889042d32a..cb6a032e634b 100644
--- a/usr.bin/lsvfs/lsvfs.c
+++ b/usr.bin/lsvfs/lsvfs.c
@@ -3,7 +3,7 @@
  * Garrett A. Wollman, September 1994
  * This file is in the public domain.
  *
- * $Id: lsvfs.c,v 1.11 1998/08/29 13:53:22 bde Exp $
+ * $FreeBSD$
  */
 
 #define _NEW_VFSCONF
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 5c51141e71b3..e863a13cbdff 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)eval.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: eval.c,v 1.8 1997/08/18 21:01:45 jlemon Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 68d69295eb25..3e5551f4e283 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,5 +1,5 @@
 .\"
-.\"	@(#) $Id: m4.1,v 1.7 1998/12/13 23:15:50 steve Exp $
+.\"	@(#) $FreeBSD$
 .\"
 .Dd January 26, 1993
 .Dt M4 1
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index d95f1f2215f6..41b7b1385fe9 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 9e9c70e87698..452f849cf4d2 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 81ea50be8861..7109ef44ab2a 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.1	8.2 (Berkeley) 12/30/93
-.\"	$Id: mail.1,v 1.14 1998/01/02 16:43:49 joerg Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt MAIL 1
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index 5101a74931ef..fd14c58e971b 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)temp.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: temp.c,v 1.4 1998/10/10 09:58:20 thepish Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "rcv.h"
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 9f6b524a23f7..7530945384ee 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
-#	$Id: Makefile,v 1.10 1997/02/22 19:27:05 peter Exp $
+# $FreeBSD$
 
 PROG=	make
 CFLAGS+= -I${.CURDIR} ${CROSS_MAKE_FLAGS}
diff --git a/usr.bin/make/PSD.doc/Makefile b/usr.bin/make/PSD.doc/Makefile
index 432ff314964e..d9f5acd3a47a 100644
--- a/usr.bin/make/PSD.doc/Makefile
+++ b/usr.bin/make/PSD.doc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$Id$
+# $FreeBSD$
 
 DIR=	psd/12.make
 SRCS=	tutorial.ms
diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms
index 31de37865ec1..d4269ca06488 100644
--- a/usr.bin/make/PSD.doc/tutorial.ms
+++ b/usr.bin/make/PSD.doc/tutorial.ms
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tutorial.ms	8.1 (Berkeley) 8/18/93
-.\"	$Id: tutorial.ms,v 1.6 1997/02/22 19:27:31 peter Exp $
+.\" $FreeBSD$
 .\"
 .EH 'PSD:12-%''PMake \*- A Tutorial'
 .OH 'PMake \*- A Tutorial''PSD:12-%'
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 7f70daddfef6..5397e270a4bf 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: arch.c,v 1.10 1998/10/15 16:09:56 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index 8ed5aa754a92..74983452f698 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: buf.c,v 1.8 1997/02/22 19:27:06 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index 8721bfb6ac20..207262be48d5 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)buf.h	8.1 (Berkeley) 6/6/93
- *	$Id: buf.h,v 1.7 1997/02/22 19:27:06 peter Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index e894699d25f8..ee13bf0d5421 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: compat.c,v 1.13 1999/07/31 20:38:22 hoek Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -43,7 +43,7 @@
 static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index f19b93a71ce9..bbcebd6bb869 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cond.c,v 1.9 1999/08/12 13:30:08 hoek Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 3d44e2e07e12..5732247eb83d 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)config.h	8.1 (Berkeley) 6/6/93
- *	$Id: config.h,v 1.6 1997/02/22 19:27:08 peter Exp $
+ * $FreeBSD$
  */
 
 #define	DEFSHELL	1			/* Bourne shell */
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index eb059993186b..95e6bfb45fc6 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dir.c,v 1.7 1997/02/22 19:27:08 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index 62687c5e57e3..487957222eee 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)dir.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /* dir.h --
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 983b9fdba898..0d907cafaa46 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: for.c,v 1.7 1997/02/22 19:27:09 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index 12dfbd9cd415..021980053ea3 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: hash.c,v 1.6 1997/02/22 19:27:10 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index 6e88ed8f44d9..6a1dcbd12f44 100644
--- a/usr.bin/make/hash.h
+++ b/usr.bin/make/hash.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)hash.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /* hash.h --
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 0dbc3adc2a03..7fac04e3ba17 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: job.c,v 1.13 1999/08/17 00:39:19 hoek Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index 6dac5e497071..87aef22057e6 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)job.h	8.1 (Berkeley) 6/6/93
- *	$Id: job.h,v 1.8 1997/04/21 20:32:11 phk Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/list.h b/usr.bin/make/list.h
index fef964250586..e053f1a6d6f0 100644
--- a/usr.bin/make/list.h
+++ b/usr.bin/make/list.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)list.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index 3cb3ee1909bb..e297ff09d46a 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)lst.h	8.1 (Berkeley) 6/6/93
- *	$Id: lst.h,v 1.7 1997/02/22 19:27:13 peter Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstAppend.c b/usr.bin/make/lst.lib/lstAppend.c
index e936f730826b..a6d3a7bbd143 100644
--- a/usr.bin/make/lst.lib/lstAppend.c
+++ b/usr.bin/make/lst.lib/lstAppend.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstAtEnd.c b/usr.bin/make/lst.lib/lstAtEnd.c
index c4f7480963df..9d22bef9ba05 100644
--- a/usr.bin/make/lst.lib/lstAtEnd.c
+++ b/usr.bin/make/lst.lib/lstAtEnd.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstAtFront.c b/usr.bin/make/lst.lib/lstAtFront.c
index 720e6635e17a..57a895062890 100644
--- a/usr.bin/make/lst.lib/lstAtFront.c
+++ b/usr.bin/make/lst.lib/lstAtFront.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstClose.c b/usr.bin/make/lst.lib/lstClose.c
index f28119f056d1..d0a8e9f6600a 100644
--- a/usr.bin/make/lst.lib/lstClose.c
+++ b/usr.bin/make/lst.lib/lstClose.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstConcat.c b/usr.bin/make/lst.lib/lstConcat.c
index 5cb8a67f63bb..fd98a308bf86 100644
--- a/usr.bin/make/lst.lib/lstConcat.c
+++ b/usr.bin/make/lst.lib/lstConcat.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDatum.c b/usr.bin/make/lst.lib/lstDatum.c
index ec7d11c91e68..afb84b46fec6 100644
--- a/usr.bin/make/lst.lib/lstDatum.c
+++ b/usr.bin/make/lst.lib/lstDatum.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDeQueue.c b/usr.bin/make/lst.lib/lstDeQueue.c
index 62335022c838..a10becbc0be9 100644
--- a/usr.bin/make/lst.lib/lstDeQueue.c
+++ b/usr.bin/make/lst.lib/lstDeQueue.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c
index e2414522ac61..2a84d638c0c0 100644
--- a/usr.bin/make/lst.lib/lstDestroy.c
+++ b/usr.bin/make/lst.lib/lstDestroy.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index cc5e75e1ebb1..a29fa2febecc 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstEnQueue.c b/usr.bin/make/lst.lib/lstEnQueue.c
index d7627f33b3e5..cafc4a699473 100644
--- a/usr.bin/make/lst.lib/lstEnQueue.c
+++ b/usr.bin/make/lst.lib/lstEnQueue.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFind.c b/usr.bin/make/lst.lib/lstFind.c
index fbbae6689410..a74d6b9b6bf2 100644
--- a/usr.bin/make/lst.lib/lstFind.c
+++ b/usr.bin/make/lst.lib/lstFind.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c
index 6c64cf1483fe..96ce3b079cf4 100644
--- a/usr.bin/make/lst.lib/lstFindFrom.c
+++ b/usr.bin/make/lst.lib/lstFindFrom.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFirst.c b/usr.bin/make/lst.lib/lstFirst.c
index e7a30397d555..b9f2ae55286a 100644
--- a/usr.bin/make/lst.lib/lstFirst.c
+++ b/usr.bin/make/lst.lib/lstFirst.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstForEach.c b/usr.bin/make/lst.lib/lstForEach.c
index 1688e9d36d7c..95ee44abbc27 100644
--- a/usr.bin/make/lst.lib/lstForEach.c
+++ b/usr.bin/make/lst.lib/lstForEach.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c
index 7692c57e7806..aff154f70e0c 100644
--- a/usr.bin/make/lst.lib/lstForEachFrom.c
+++ b/usr.bin/make/lst.lib/lstForEachFrom.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInit.c b/usr.bin/make/lst.lib/lstInit.c
index a16fca27c458..7b3c2b089312 100644
--- a/usr.bin/make/lst.lib/lstInit.c
+++ b/usr.bin/make/lst.lib/lstInit.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInsert.c b/usr.bin/make/lst.lib/lstInsert.c
index 8c4ebcb30b04..3c3861e11803 100644
--- a/usr.bin/make/lst.lib/lstInsert.c
+++ b/usr.bin/make/lst.lib/lstInsert.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInt.h b/usr.bin/make/lst.lib/lstInt.h
index dd38bf0eaa69..0e287405ab39 100644
--- a/usr.bin/make/lst.lib/lstInt.h
+++ b/usr.bin/make/lst.lib/lstInt.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)lstInt.h	8.1 (Berkeley) 6/6/93
- *	$Id: lstInt.h,v 1.5 1997/02/22 19:27:40 peter Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstIsAtEnd.c b/usr.bin/make/lst.lib/lstIsAtEnd.c
index 2c480197c1e0..50a4de019319 100644
--- a/usr.bin/make/lst.lib/lstIsAtEnd.c
+++ b/usr.bin/make/lst.lib/lstIsAtEnd.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstIsEmpty.c b/usr.bin/make/lst.lib/lstIsEmpty.c
index 6a9a7bdb5a29..79a27431e4dd 100644
--- a/usr.bin/make/lst.lib/lstIsEmpty.c
+++ b/usr.bin/make/lst.lib/lstIsEmpty.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstLast.c b/usr.bin/make/lst.lib/lstLast.c
index 49b2f8e39adc..1affe2e0c383 100644
--- a/usr.bin/make/lst.lib/lstLast.c
+++ b/usr.bin/make/lst.lib/lstLast.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstMember.c b/usr.bin/make/lst.lib/lstMember.c
index cc5cb4f416d4..7e3c2ceb9f72 100644
--- a/usr.bin/make/lst.lib/lstMember.c
+++ b/usr.bin/make/lst.lib/lstMember.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstNext.c b/usr.bin/make/lst.lib/lstNext.c
index f6e2656e89ef..6008d0a485b5 100644
--- a/usr.bin/make/lst.lib/lstNext.c
+++ b/usr.bin/make/lst.lib/lstNext.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstOpen.c b/usr.bin/make/lst.lib/lstOpen.c
index fbb7d0e7b298..9af9c7cd163d 100644
--- a/usr.bin/make/lst.lib/lstOpen.c
+++ b/usr.bin/make/lst.lib/lstOpen.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstRemove.c b/usr.bin/make/lst.lib/lstRemove.c
index e84d301ec626..be8b375e4b7d 100644
--- a/usr.bin/make/lst.lib/lstRemove.c
+++ b/usr.bin/make/lst.lib/lstRemove.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstReplace.c b/usr.bin/make/lst.lib/lstReplace.c
index a2dcb459da2d..967da863f6a4 100644
--- a/usr.bin/make/lst.lib/lstReplace.c
+++ b/usr.bin/make/lst.lib/lstReplace.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstSucc.c b/usr.bin/make/lst.lib/lstSucc.c
index b43a00cb4dc0..6412f3e52d8a 100644
--- a/usr.bin/make/lst.lib/lstSucc.c
+++ b/usr.bin/make/lst.lib/lstSucc.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 3aecd8332fe4..25726b871a5f 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id: main.c,v 1.32 1999/07/31 20:53:01 hoek Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index ff3e61786354..642e7e78ccf8 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
-.\"	$Id: make.1,v 1.22 1999/08/14 06:47:13 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 19, 1994
 .Dt MAKE 1
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 509215c2746e..6c53c052caac 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: make.c,v 1.8 1997/02/22 19:27:16 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -43,7 +43,7 @@
 static char sccsid[] = "@(#)make.c	8.1 (Berkeley) 6/6/93";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 3845e7dafa0a..24106519eb30 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)make.h	8.3 (Berkeley) 6/13/95
- *	$Id: make.h,v 1.9 1999/07/31 20:53:02 hoek Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index 4b8b21152b0e..ce1665d96c85 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nonints.h	8.3 (Berkeley) 3/19/94
- *	$Id: nonints.h,v 1.6 1997/02/22 19:27:17 peter Exp $
+ * $FreeBSD$
  */
 
 /* arch.c */
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 5b2ceb79781d..e7e5daf9debc 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id: parse.c,v 1.20 1999/01/08 18:37:34 jkh Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index d456c357ff2d..1f15c082ead7 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pathnames.h	5.2 (Berkeley) 6/1/90
- *	$Id: pathnames.h,v 1.7 1997/02/22 19:27:20 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PATH_OBJDIR
diff --git a/usr.bin/make/sprite.h b/usr.bin/make/sprite.h
index ca55509e22e6..ee20057f43bb 100644
--- a/usr.bin/make/sprite.h
+++ b/usr.bin/make/sprite.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sprite.h	8.1 (Berkeley) 6/6/93
- *	$Id: sprite.h,v 1.7 1997/02/22 19:27:21 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index 7d17dd621ea4..524d9001aa95 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: str.c,v 1.9 1997/02/22 19:27:23 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -43,7 +43,7 @@
 static char sccsid[] = "@(#)str.c	5.8 (Berkeley) 6/1/90";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 898cc9e1bdf8..0bec455ead4e 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: suff.c,v 1.9 1998/04/26 09:44:48 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index 21aaa64dbe31..04ab41889195 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: targ.c,v 1.7 1997/02/22 19:27:24 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c
index 62b0e79dab60..174954eb445a 100644
--- a/usr.bin/make/util.c
+++ b/usr.bin/make/util.c
@@ -3,7 +3,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <stdio.h>
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 2f29567b4e50..f9ae2b126d06 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: var.c,v 1.13 1999/07/31 20:53:02 hoek Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/mesg/mesg.1 b/usr.bin/mesg/mesg.1
index 2dce0b1651f9..7bdf0fd17246 100644
--- a/usr.bin/mesg/mesg.1
+++ b/usr.bin/mesg/mesg.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mesg.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: mesg.1,v 1.5 1997/03/29 20:01:59 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MESG 1
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 5faffa4a7ef2..4e5878b2a1ae 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mesg.c	8.2 (Berkeley) 1/21/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile
index 4d7fff388e33..edc5d85e81c7 100644
--- a/usr.bin/minigzip/Makefile
+++ b/usr.bin/minigzip/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.1 1997/12/13 09:57:48 msmith Exp $
+# $FreeBSD$
 
 PROG=	minigzip
 LDADD+=	-lz
diff --git a/usr.bin/minigzip/minigzip.1 b/usr.bin/minigzip/minigzip.1
index 7ace82cbf4e5..48a60ea11324 100644
--- a/usr.bin/minigzip/minigzip.1
+++ b/usr.bin/minigzip/minigzip.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: minigzip.1,v 1.1.1.1 1997/12/13 09:57:48 msmith Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 13, 1997
 .Dt MINIGZIP 1
diff --git a/usr.bin/mk_cmds/Makefile b/usr.bin/mk_cmds/Makefile
index 8cc838403d60..5286e0126add 100644
--- a/usr.bin/mk_cmds/Makefile
+++ b/usr.bin/mk_cmds/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/05/04 20:09:03 bde Exp $
+# $FreeBSD$
 
 PROG=	mk_cmds
 SRCS=	mk_cmds.c options.c utils.c ct.y cmd_tbl.l y.tab.h
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index f19fbc87c61a..9165a0e2a6f4 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkdep.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MKDEP 1
diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh
index ff4e2f360131..ec00dcfbdf92 100644
--- a/usr.bin/mkdep/mkdep.gcc.sh
+++ b/usr.bin/mkdep/mkdep.gcc.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkdep.gcc.sh	8.1 (Berkeley) 6/6/93
-#	$Id: mkdep.gcc.sh,v 1.14 1998/08/24 10:16:39 cracauer Exp $
+# $FreeBSD$
 
 D=.depend			# default dependency file is .depend
 append=0
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index 44fe0044cb1c..a7443c57664f 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkfifo.1	8.2 (Berkeley) 1/5/94
-.\"	$Id: mkfifo.1,v 1.4 1997/04/27 08:45:45 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 5, 1994
 .Dt MKFIFO 1
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 270951a5d0d7..7f97a13566ba 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mkfifo.c	8.2 (Berkeley) 1/5/94";
 #endif
 static const char rcsid[] =
-	"$Id: mkfifo.c,v 1.3 1997/07/24 07:02:55 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index 41933a9c1a5d..955c8c2fe961 100644
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/7/93
-#	$Id: Makefile,v 1.18 1998/05/04 20:09:03 bde Exp $
+# $FreeBSD$
 
 PROG=	mklocale
 SRCS=	yacc.y lex.l y.tab.h
diff --git a/usr.bin/mklocale/data/Makefile b/usr.bin/mklocale/data/Makefile
index 2ef612c9f74d..1c446a9ca13b 100644
--- a/usr.bin/mklocale/data/Makefile
+++ b/usr.bin/mklocale/data/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.18 1999/06/05 03:04:00 julian Exp $
+# $FreeBSD$
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src b/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
index 3f9ad913e06a..a9fa03fc89e5 100644
--- a/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
+++ b/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_2 Locale
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 ENCODING	"NONE"
diff --git a/usr.bin/mklocale/data/zh_CN.EUC.src b/usr.bin/mklocale/data/zh_CN.EUC.src
index 1680f3cc1998..b298ef5de562 100644
--- a/usr.bin/mklocale/data/zh_CN.EUC.src
+++ b/usr.bin/mklocale/data/zh_CN.EUC.src
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zh_CN.EUC.src,v 1.1 1998/08/10 09:49:42 phk Exp $
+ * $FreeBSD$
  */
 
 ENCODING	"EUC"
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index 842b434db494..34ec49f24ab5 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mklocale.1	8.2 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt MKLOCALE 1
diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1
index 00d981389a2e..9486c8c4bf73 100644
--- a/usr.bin/mkstr/mkstr.1
+++ b/usr.bin/mkstr/mkstr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkstr.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MKSTR 1
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index 588af2c20760..a0db88949595 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mkstr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: mkstr.c,v 1.2 1997/07/24 07:05:02 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index 25e8b4ff731f..1e5eff0c3758 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd November, 20, 1996
 .Dt MKTEMP 1
diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile
index e63efcf6009e..79048432118c 100644
--- a/usr.bin/more/Makefile
+++ b/usr.bin/more/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	more
 CFLAGS+=-I${.CURDIR} -DTERMIOS
diff --git a/usr.bin/more/command.c b/usr.bin/more/command.c
index ba6430ad99db..0a400d881bc6 100644
--- a/usr.bin/more/command.c
+++ b/usr.bin/more/command.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)command.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id: command.c,v 1.12 1999/06/01 20:02:31 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/more/decode.c b/usr.bin/more/decode.c
index 2d490fae5605..4a3315275946 100644
--- a/usr.bin/more/decode.c
+++ b/usr.bin/more/decode.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)decode.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id: decode.c,v 1.2 1999/05/30 18:06:53 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/input.c b/usr.bin/more/input.c
index b22c3d9fd2a3..50e2031724ab 100644
--- a/usr.bin/more/input.c
+++ b/usr.bin/more/input.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/less.h b/usr.bin/more/less.h
index deb7ec50620d..e17ec4038210 100644
--- a/usr.bin/more/less.h
+++ b/usr.bin/more/less.h
@@ -33,7 +33,7 @@
  *
  *	@(#)less.h	8.1 (Berkeley) 6/6/93
  *
- *	$Id: less.h,v 1.3 1999/05/30 18:06:55 hoek Exp $
+ * $FreeBSD$
  */
 
 #define	NULL_POSITION	((off_t)(-1))
diff --git a/usr.bin/more/line.c b/usr.bin/more/line.c
index 88178bb76a2b..6b980739b1dc 100644
--- a/usr.bin/more/line.c
+++ b/usr.bin/more/line.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)line.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/main.c b/usr.bin/more/main.c
index 52e81bf10391..f7159eaafbb8 100644
--- a/usr.bin/more/main.c
+++ b/usr.bin/more/main.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/7/93";
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.11 1999/05/30 18:06:56 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/more.1 b/usr.bin/more/more.1
index c31a7c1f43c8..09bd03066c89 100644
--- a/usr.bin/more/more.1
+++ b/usr.bin/more/more.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)more.1	8.2 (Berkeley) 4/18/94
-.\"	$Id: more.1,v 1.11 1999/07/12 20:23:47 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt MORE 1
diff --git a/usr.bin/more/option.c b/usr.bin/more/option.c
index 79fd849e2a36..53f332b9e6ce 100644
--- a/usr.bin/more/option.c
+++ b/usr.bin/more/option.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)option.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: option.c,v 1.4 1998/07/25 05:56:49 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/more/output.c b/usr.bin/more/output.c
index 862dbc22a4b5..337a294e6b9a 100644
--- a/usr.bin/more/output.c
+++ b/usr.bin/more/output.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)output.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id: output.c,v 1.9 1999/05/30 18:06:56 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/prim.c b/usr.bin/more/prim.c
index bb815672e51f..03fcad8d408e 100644
--- a/usr.bin/more/prim.c
+++ b/usr.bin/more/prim.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)prim.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/tags.c b/usr.bin/more/tags.c
index c48c99fc3891..1014d48494b7 100644
--- a/usr.bin/more/tags.c
+++ b/usr.bin/more/tags.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)tags.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id: tags.c,v 1.5 1999/06/04 19:35:22 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index 8613f79cb5ea..21cb15155568 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	msgs
 DPADD=	${LIBTERMCAP}
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 2efddec4372e..3139f00dc943 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)msgs.1	8.2 (Berkeley) 4/28/95
-.\"	$Id: msgs.1,v 1.6 1999/07/12 20:23:47 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt MSGS 1
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index ff09c9e07248..17536400f468 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)msgs.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: msgs.c,v 1.13 1998/07/14 19:07:30 ghelmer Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/mt/Makefile b/usr.bin/mt/Makefile
index b09a36b6d372..0e692e92cd12 100644
--- a/usr.bin/mt/Makefile
+++ b/usr.bin/mt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	mt
 CFLAGS+=-I${.CURDIR}/../../sys
diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1
index 9a988057e9c8..5647313b2a14 100644
--- a/usr.bin/mt/mt.1
+++ b/usr.bin/mt/mt.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mt.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MT 1
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index ff2a2d64b574..9fcb727e197a 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mt.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: mt.c,v 1.24 1999/03/10 18:42:20 mjacob Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile
index 7d0212cbd0fe..569453240d60 100644
--- a/usr.bin/ncal/Makefile
+++ b/usr.bin/ncal/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 PROG= ncal
 SRCS= ncal.c
 
diff --git a/usr.bin/ncal/ncal.1 b/usr.bin/ncal/ncal.1
index 635cc926ea33..5636440d0e56 100644
--- a/usr.bin/ncal/ncal.1
+++ b/usr.bin/ncal/ncal.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ncal.1,v 1.6 1998/03/23 07:45:08 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 16, 1997
 .Dt CAL 1
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 03f48a93b06a..5feac67afa9a 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ncal.c,v 1.7 1999/03/27 21:08:13 helbig Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <calendar.h>
diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index 90ed87dbe5cd..f0a72e48eae1 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)atalk.c	1.1 (Whistle) 6/6/96";
 */
 static const char rcsid[] =
-	"$Id: atalk.c,v 1.10 1997/07/29 06:51:39 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 26191f8b82a8..61ad2b6cd30b 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)if.c	8.3 (Berkeley) 4/28/95";
 */
 static const char rcsid[] =
-	"$Id: if.c,v 1.25 1999/04/20 22:04:31 billf Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 08777aa20e91..826afccce4ee 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)inet.c	8.5 (Berkeley) 5/24/95";
 */
 static const char rcsid[] =
-	"$Id: inet.c,v 1.31 1999/03/10 17:25:42 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index 215cbd0309b0..3495adaadf5d 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ns.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-	"$Id: ipx.c,v 1.9 1997/07/29 06:51:39 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 0f3072ef3bd9..f3c956387b50 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -42,7 +42,7 @@ char const copyright[] =
 static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 3/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.25 1999/04/26 16:11:48 luigi Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 76e001fdc827..921b31ac7bee 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mbuf.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: mbuf.c,v 1.14 1998/08/23 15:23:11 gpalmer Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 22b3a5d0619d..6a77a482af28 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)netstat.1	8.8 (Berkeley) 4/18/94
-.\"	$Id: netstat.1,v 1.13 1999/07/12 20:23:49 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt NETSTAT 1
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 24b5a9b4e1ab..129337bfbcae 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "From: @(#)route.c	8.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: route.c,v 1.32 1998/07/06 20:52:08 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 195588e2c1aa..345e28a4ee41 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)unix.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unix.c,v 1.10 1998/08/08 08:13:04 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile
index e976b9a5bb9f..75f369face5a 100644
--- a/usr.bin/newkey/Makefile
+++ b/usr.bin/newkey/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1997/05/28 15:52:07 wpaul Exp $
+# $FreeBSD$
 
 PROG= newkey
 SRCS= newkey.c update.c generic.c
diff --git a/usr.bin/newkey/generic.c b/usr.bin/newkey/generic.c
index 2c3ec1e8cbe1..4067867d6598 100644
--- a/usr.bin/newkey/generic.c
+++ b/usr.bin/newkey/generic.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)generic.c 1.2 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/newkey/newkey.8 b/usr.bin/newkey/newkey.8
index ad9f990ad07e..d17c9594a69e 100644
--- a/usr.bin/newkey/newkey.8
+++ b/usr.bin/newkey/newkey.8
@@ -1,5 +1,5 @@
 .\" @(#)newkey.8 1.3 91/03/11 TIRPC 1.0; from 1.12 90/02/03 SMI;
-.\" $Id$
+.\" $FreeBSD$
 .Dd October 12, 1987
 .Dt NEWKEY 8
 .Os
diff --git a/usr.bin/newkey/newkey.c b/usr.bin/newkey/newkey.c
index dcf14ecab28e..141614ee088d 100644
--- a/usr.bin/newkey/newkey.c
+++ b/usr.bin/newkey/newkey.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)newkey.c 1.8 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c
index 609977a593df..2f1c53fab9ae 100644
--- a/usr.bin/newkey/update.c
+++ b/usr.bin/newkey/update.c
@@ -32,7 +32,7 @@
 static	char sccsid[] = "@(#)update.c 1.2 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-	"$Id: update.c,v 1.3 1998/02/20 04:38:20 jb Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 4d29692de52d..94f36d750187 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsstat.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: nfsstat.1,v 1.6 1997/02/22 19:56:24 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NFSSTAT 1
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 3ba45c9cc0c0..f68f6216c3e5 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -45,7 +45,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)nfsstat.c	8.2 (Berkeley) 3/31/95";
 #endif
 static const char rcsid[] =
-	"$Id: nfsstat.c,v 1.11 1998/10/24 19:36:52 msmith Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index 010a3458f493..2531a9ca4aaf 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nice.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: nice.1,v 1.8 1999/06/25 20:54:28 billf Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NICE 1
diff --git a/usr.bin/nm/nm.1 b/usr.bin/nm/nm.1
index a1f8b3c462fa..d6a52d22b42e 100644
--- a/usr.bin/nm/nm.1
+++ b/usr.bin/nm/nm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nm.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: nm.1,v 1.7 1997/02/22 19:56:28 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NM 1
diff --git a/usr.bin/nm/nm.1aout b/usr.bin/nm/nm.1aout
index a1f8b3c462fa..d6a52d22b42e 100644
--- a/usr.bin/nm/nm.1aout
+++ b/usr.bin/nm/nm.1aout
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nm.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: nm.1,v 1.7 1997/02/22 19:56:28 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NM 1
diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c
index 1e6cbc5d6de6..91665b229a51 100644
--- a/usr.bin/nm/nm.c
+++ b/usr.bin/nm/nm.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nm.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: nm.c,v 1.11 1997/07/31 06:53:36 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/nohup/nohup.1 b/usr.bin/nohup/nohup.1
index 780cd7ba823c..1fcc7efd3a21 100644
--- a/usr.bin/nohup/nohup.1
+++ b/usr.bin/nohup/nohup.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nohup.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NOHUP 1
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 3455c7cb797e..8992997b6cfd 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nohup.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: nohup.c,v 1.2 1997/07/31 06:54:45 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/objformat/objformat.1 b/usr.bin/objformat/objformat.1
index 28cb408bb2cd..9fde70c17d69 100644
--- a/usr.bin/objformat/objformat.1
+++ b/usr.bin/objformat/objformat.1
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: objformat.1,v 1.1 1998/10/25 13:25:42 obrien Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 25, 1998
 .Os
diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile
index 1e3f9778feb3..7f7241dc5e72 100644
--- a/usr.bin/opieinfo/Makefile
+++ b/usr.bin/opieinfo/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiekey/Makefile b/usr.bin/opiekey/Makefile
index de04e8daa6e0..6c43636ad57b 100644
--- a/usr.bin/opiekey/Makefile
+++ b/usr.bin/opiekey/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile
index bb52c8229bcd..7fc70ffbf5e7 100644
--- a/usr.bin/opiepasswd/Makefile
+++ b/usr.bin/opiepasswd/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/pagesize/pagesize.1 b/usr.bin/pagesize/pagesize.1
index d89cd9a33d8e..aac371d04db0 100644
--- a/usr.bin/pagesize/pagesize.1
+++ b/usr.bin/pagesize/pagesize.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pagesize.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PAGESIZE 1
diff --git a/usr.bin/pagesize/pagesize.sh b/usr.bin/pagesize/pagesize.sh
index 4c7aeea75e08..fd5477b3222b 100644
--- a/usr.bin/pagesize/pagesize.sh
+++ b/usr.bin/pagesize/pagesize.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)pagesize.sh	8.1 (Berkeley) 4/3/94
-#	$Id$
+# $FreeBSD$
 #
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index d376bff0a3e7..9ac3f0dab724 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
-# $Id: Makefile,v 1.31 1999/02/14 13:56:15 des Exp $
+# $FreeBSD$
 
 PROG=	passwd
 SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
diff --git a/usr.bin/passwd/extern.h b/usr.bin/passwd/extern.h
index 7a4bd127c98d..287646c6a380 100644
--- a/usr.bin/passwd/extern.h
+++ b/usr.bin/passwd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)extern.h	8.1 (Berkeley) 4/2/94
- *	$Id$
+ * $FreeBSD$
  */
 
 int	krb_passwd __P((char *, char *, char *, char *));
diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c
index 339d5e31be09..07e1d183d440 100644
--- a/usr.bin/passwd/local_passwd.c
+++ b/usr.bin/passwd/local_passwd.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 140c203d16e4..8019c759b8d9 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)passwd.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: passwd.1,v 1.14 1999/04/30 18:19:42 hoek Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PASSWD 1
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 19a18309ace9..e69864a0dedb 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)passwd.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: passwd.c,v 1.14 1998/03/23 14:14:24 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index 7b97915e509e..77253ffafbbd 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)paste.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PASTE 1
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index 7e14a56b7799..a1971199b49c 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)paste.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: paste.c,v 1.4 1997/08/05 03:40:04 asami Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index 74d6d7c8f454..d6afef327138 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pr.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: pr.1,v 1.4 1997/02/22 19:56:37 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt PR 1
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index d3f8a145d4e0..18f76ee93e89 100644
--- a/usr.bin/printenv/printenv.1
+++ b/usr.bin/printenv/printenv.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printenv.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: printenv.1,v 1.3 1999/07/12 20:23:52 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PRINTENV 1
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index e84aa2de1bf9..665d28fe3dd8 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printf.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PRINTF 1
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index c9bdb10412ad..7d1a471e98bd 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)quota.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: quota.1,v 1.5 1997/02/22 19:56:38 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt QUOTA 1
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index c9a15eebb473..246922df88b5 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)quota.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: quota.c,v 1.9 1998/06/09 04:30:54 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/ranlib/Makefile b/usr.bin/ranlib/Makefile
index 60ba526cff88..8148e57c2bac 100644
--- a/usr.bin/ranlib/Makefile
+++ b/usr.bin/ranlib/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	ranlib
 SRCS=	archive.c build.c misc.c ranlib.c touch.c
diff --git a/usr.bin/ranlib/build.c b/usr.bin/ranlib/build.c
index eedb7215d08d..b4d8bc69a8ee 100644
--- a/usr.bin/ranlib/build.c
+++ b/usr.bin/ranlib/build.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)build.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/ranlib/misc.c b/usr.bin/ranlib/misc.c
index 97e970de1140..19b4854cbfa7 100644
--- a/usr.bin/ranlib/misc.c
+++ b/usr.bin/ranlib/misc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ranlib/ranlib.1 b/usr.bin/ranlib/ranlib.1
index 2d37924b7668..d57cf9836a42 100644
--- a/usr.bin/ranlib/ranlib.1
+++ b/usr.bin/ranlib/ranlib.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ranlib.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: ranlib.1,v 1.5 1997/02/22 19:56:39 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RANLIB 1
diff --git a/usr.bin/ranlib/ranlib.1aout b/usr.bin/ranlib/ranlib.1aout
index 2d37924b7668..d57cf9836a42 100644
--- a/usr.bin/ranlib/ranlib.1aout
+++ b/usr.bin/ranlib/ranlib.1aout
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ranlib.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: ranlib.1,v 1.5 1997/02/22 19:56:39 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RANLIB 1
diff --git a/usr.bin/ranlib/ranlib.5 b/usr.bin/ranlib/ranlib.5
index 8f7ec14d122e..668ef88c30da 100644
--- a/usr.bin/ranlib/ranlib.5
+++ b/usr.bin/ranlib/ranlib.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ranlib.5.5	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RANLIB 5
diff --git a/usr.bin/ranlib/ranlib.c b/usr.bin/ranlib/ranlib.c
index 0b60eb1c68cc..40263318e6a6 100644
--- a/usr.bin/ranlib/ranlib.c
+++ b/usr.bin/ranlib/ranlib.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ranlib.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/ranlib/touch.c b/usr.bin/ranlib/touch.c
index bfb10f727616..b062e087c4fe 100644
--- a/usr.bin/ranlib/touch.c
+++ b/usr.bin/ranlib/touch.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)touch.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: touch.c,v 1.4 1997/08/04 06:48:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rdist/Makefile b/usr.bin/rdist/Makefile
index 9aae11958470..ea47411d40a7 100644
--- a/usr.bin/rdist/Makefile
+++ b/usr.bin/rdist/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 7/19/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	rdist
 SRCS=	docmd.c expand.c gram.y lookup.c main.c rshrcmd.c server.c
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c
index 2da37c6efd01..7ea9a8c1103a 100644
--- a/usr.bin/rdist/docmd.c
+++ b/usr.bin/rdist/docmd.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "From: @(#)docmd.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/expand.c b/usr.bin/rdist/expand.c
index 83178d00aec2..d5f7ed4fd8a5 100644
--- a/usr.bin/rdist/expand.c
+++ b/usr.bin/rdist/expand.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: expand.c,v 1.6 1998/04/06 06:18:20 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/gram.y b/usr.bin/rdist/gram.y
index 4040f948a207..bd77901726d6 100644
--- a/usr.bin/rdist/gram.y
+++ b/usr.bin/rdist/gram.y
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)gram.y	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/lookup.c b/usr.bin/rdist/lookup.c
index acf4bae4fc54..b97ce3f5bf71 100644
--- a/usr.bin/rdist/lookup.c
+++ b/usr.bin/rdist/lookup.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)lookup.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: lookup.c,v 1.4 1998/04/06 06:18:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/main.c b/usr.bin/rdist/main.c
index c6ab940e9b8b..d4d94a2219b6 100644
--- a/usr.bin/rdist/main.c
+++ b/usr.bin/rdist/main.c
@@ -39,7 +39,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.3 1997/08/05 06:41:26 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index b66b5aca2545..9e265b00130f 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rdist.1	8.3 (Berkeley) 3/17/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 17, 1994
 .Dt RDIST 1
diff --git a/usr.bin/rdist/rshrcmd.c b/usr.bin/rdist/rshrcmd.c
index 306ef05fe6f8..c747cc6cf5ea 100644
--- a/usr.bin/rdist/rshrcmd.c
+++ b/usr.bin/rdist/rshrcmd.c
@@ -6,7 +6,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include	"defs.h"
diff --git a/usr.bin/rdist/server.c b/usr.bin/rdist/server.c
index d91d723084b5..44c2610fa114 100644
--- a/usr.bin/rdist/server.c
+++ b/usr.bin/rdist/server.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)server.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: server.c,v 1.8 1998/04/20 06:20:24 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/wait.h>
diff --git a/usr.bin/renice/renice.8 b/usr.bin/renice/renice.8
index 1e99fceeb5ab..09ddf5bb9fbd 100644
--- a/usr.bin/renice/renice.8
+++ b/usr.bin/renice/renice.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)renice.8	8.1 (Berkeley) 6/9/93
-.\"     $Id: renice.8,v 1.3 1999/07/12 20:23:54 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt RENICE 8
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index 5962ed1707e3..baed30a8b582 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)renice.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rev/rev.1 b/usr.bin/rev/rev.1
index f112ac5976f1..5f15501512b3 100644
--- a/usr.bin/rev/rev.1
+++ b/usr.bin/rev/rev.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rev.1	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt REV 1
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index e5ca71f07b80..2f2fef112f4c 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.12 1998/09/19 22:42:05 obrien Exp $
+# $FreeBSD$
 
 PROG=	rlogin
 SRCS=	rlogin.c
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index e24234bdaab9..d95e642394cc 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rlogin.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RLOGIN 1
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index fd8793b41263..0df97a34bcf0 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -40,7 +40,7 @@ static const char copyright[] =
 #ifndef lint
 static const char sccsid[] = "@(#)rlogin.c	8.1 (Berkeley) 6/6/93";
 static const char rcsid[] =
-	"$Id: rlogin.c,v 1.19 1999/05/25 11:14:33 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index 4fc6684325c2..cf783040f807 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-	"$Id: rpc_cout.c,v 1.5 1997/08/06 06:47:39 charnier Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index b6d7b2c81699..9224dbbc9832 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-	"$Id: rpc_main.c,v 1.9 1998/03/07 05:43:59 jb Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index 00b5561e7681..45282c87418c 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 175cf29fb3f3..75583a586596 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index a4e1150d7355..7c9abed8f8b2 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -1,5 +1,5 @@
 .\" @(#)rpcgen.1 1.35 93/06/02 SMI
-.\" $Id$
+.\" $FreeBSD$
 .\" Copyright 1985-1993 Sun Microsystems, Inc.
 .Dd March 28, 1993
 .Dt RPCGEN 1
diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile
index f9377c6dbd1b..045c37cf1188 100644
--- a/usr.bin/rpcinfo/Makefile
+++ b/usr.bin/rpcinfo/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.2 (Berkeley) 5/11/90
-#	$Id$
+# $FreeBSD$
 
 PROG=	rpcinfo
 MAN8 = rpcinfo.8
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index 1b6a1bb6dbff..e3fb914fcd09 100644
--- a/usr.bin/rpcinfo/rpcinfo.8
+++ b/usr.bin/rpcinfo/rpcinfo.8
@@ -1,5 +1,5 @@
 .\"	from: @(#)rpcinfo.8c	2.2 88/08/03 4.0 RPCSRC; from 1.24 88/02/25 SMI
-.\"	$Id: rpcinfo.8,v 1.3 1997/02/22 19:56:44 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 17, 1987
 .Dt RPCINFO 8
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index 4b77f34c47b8..99089bb2f305 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -2,7 +2,7 @@
 /*static char sccsid[] = "from: @(#)rpcinfo.c 1.22 87/08/12 SMI";*/
 /*static char sccsid[] = "from: @(#)rpcinfo.c	2.2 88/08/11 4.0 RPCSRC";*/
 static char rcsid[] =
-	"$Id: rpcinfo.c,v 1.7 1998/06/09 04:30:56 imp Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rs/rs.1 b/usr.bin/rs/rs.1
index a500d3f63dd3..d21bde35448e 100644
--- a/usr.bin/rs/rs.1
+++ b/usr.bin/rs/rs.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rs.1	8.2 (Berkeley) 12/30/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt RS 1
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index b495a8f630c2..bd7dc33dcce8 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: rs.c,v 1.3 1997/08/07 06:42:37 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index 5d545f94fdbd..6b102f4dc950 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.8 1998/09/19 22:42:05 obrien Exp $
+# $FreeBSD$
 
 PROG=	rsh
 SRCS=	rsh.c
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 291fd099d1c6..836d830d63d8 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rsh.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RSH 1
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index 13f3c2163b80..deea9d94990d 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)rsh.c	8.3 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-	"$Id: rsh.c,v 1.16 1998/10/09 06:47:57 markm Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index ab50a8a88f4c..2e67e374bfa7 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	rup
 MAN1=	rup.1
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index b19041548d7b..f7e83d715d12 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rup.1,v 1.5 1997/02/22 19:56:48 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 7, 1993
 .Dt RUP 1
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 89b6ffb3c1b8..b916e9d23440 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: rup.c,v 1.9 1997/09/15 09:46:42 jkh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index 2d8de0d22a5d..175856aa3bdb 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ruptime.1	8.2 (Berkeley) 4/5/94
-.\"	$Id: ruptime.1,v 1.5 1999/08/14 01:04:10 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 5, 1994
 .Dt RUPTIME 1
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index e075d920c5b9..ab275b901bbe 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: ruptime.c,v 1.10 1997/03/29 04:32:02 imp Exp $ */
+/* $FreeBSD$ */
 
 #ifndef lint
 static char copyright[] =
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index a6b753ff4e5a..6ec50ab8ea50 100644
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG = rusers
 MAN1 = rusers.1
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index 424971e3b03a..05044f57816b 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rusers.1	6.7 (Berkeley) 4/23/91
-.\"	$Id: rusers.1,v 1.5 1997/02/22 19:56:52 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 23, 1991
 .Dt RUSERS 1
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 2ac8837aa2e4..a59abd62872d 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: rusers.c,v 1.6 1997/08/08 12:12:54 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index e81c30aafafe..33a2dcc6b634 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG = rwall
 MAN1 = rwall.1
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index d7265a05852d..abdcda5b5bbe 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rwall.1	6.7 (Berkeley) 4/23/91
-.\"	$Id: rwall.1,v 1.4 1997/02/22 19:56:55 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 23, 1991
 .Dt RWALL 1
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index a39e478a8840..214a5a59236e 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)wall.c	5.14 (Berkeley) 3/2/91";
 #endif
 static const char rcsid[] =
-	"$Id: rwall.c,v 1.6 1997/08/08 12:18:16 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rwho/rwho.1 b/usr.bin/rwho/rwho.1
index edd0288f4d7d..3568c2d22879 100644
--- a/usr.bin/rwho/rwho.1
+++ b/usr.bin/rwho/rwho.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rwho.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RWHO 1
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index 2a6a7ab483ef..c9045f1f9e2f 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rwho.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: rwho.c,v 1.11 1997/08/08 12:20:24 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/sasc/sasc.1 b/usr.bin/sasc/sasc.1
index 325f6fd45321..cf5635ecd842 100644
--- a/usr.bin/sasc/sasc.1
+++ b/usr.bin/sasc/sasc.1
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: sasc.1,v 1.6 1997/08/08 12:22:29 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 6, 1995
 .Dt SASC 1
diff --git a/usr.bin/sasc/sasc.c b/usr.bin/sasc/sasc.c
index e811abfd9177..3b023ea8eaa6 100644
--- a/usr.bin/sasc/sasc.c
+++ b/usr.bin/sasc/sasc.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index 277c5f7f1bcb..ac00cb1d29ad 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)script.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: script.1,v 1.5 1998/06/04 21:06:02 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt SCRIPT 1
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index c4f3e917dee1..708a59b68e61 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)script.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: script.c,v 1.9 1998/09/19 09:45:42 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index 1313fcaec0f0..136f56ce1197 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)compile.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: compile.c,v 1.11 1998/12/07 05:35:54 archie Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 353dedbc8e3d..88f4ea52b3e4 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/3/94";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.7 1997/08/11 07:21:03 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index 237f67a3f50c..c9b013a8dbd9 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index cf0edbef809d..77ef93a58d96 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)process.c	8.6 (Berkeley) 4/20/94";
 #endif
 static const char rcsid[] =
-	"$Id: process.c,v 1.8 1998/12/07 05:33:39 archie Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index eb20cb04710d..96d94c5dc34a 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sed.1	8.2 (Berkeley) 12/30/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt SED 1
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index da59e14d98ab..795d939c58dc 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shar.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: shar.1,v 1.5 1997/04/27 08:45:46 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt SHAR 1
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index 386efa0aab57..c2aae0484399 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)showmount.8	8.3 (Berkeley) 3/29/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd March 29, 1995
 .Dt SHOWMOUNT 8
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index 08d7d5023f2b..ecc528d8e6ec 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)showmount.c	8.3 (Berkeley) 3/29/95";
 #endif
 static const char rcsid[] =
-	"$Id: showmount.c,v 1.6 1997/08/11 07:27:27 charnier Exp $";
+  "$FreeBSD$";
 #endif not lint
 
 #include <sys/types.h>
diff --git a/usr.bin/size/size.1 b/usr.bin/size/size.1
index 24341dbaad1e..1cd1f9f7bec7 100644
--- a/usr.bin/size/size.1
+++ b/usr.bin/size/size.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)size.1	8.2 (Berkeley) 4/18/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt SIZE 1
diff --git a/usr.bin/size/size.c b/usr.bin/size/size.c
index 69322d34b05d..b42e975da34a 100644
--- a/usr.bin/size/size.c
+++ b/usr.bin/size/size.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)size.c	8.2 (Berkeley) 12/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: size.c,v 1.3 1997/08/11 07:28:19 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/sockstat/Makefile b/usr.bin/sockstat/Makefile
index eafc337e1d54..a72aadfe8ba8 100644
--- a/usr.bin/sockstat/Makefile
+++ b/usr.bin/sockstat/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/04/14 16:17:34 des Exp $
+# $FreeBSD$
 
 MAINTAINER=	des@freebsd.org
 MAN1=		sockstat.1
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1
index d009bf93dfd9..b9b810bfb2f3 100644
--- a/usr.bin/sockstat/sockstat.1
+++ b/usr.bin/sockstat/sockstat.1
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"      $Id: sockstat.1,v 1.1 1999/04/15 13:40:43 des Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 13, 1999
 .Dt LSOCK 1
diff --git a/usr.bin/sockstat/sockstat.pl b/usr.bin/sockstat/sockstat.pl
index 9d9261c27f1b..3c251884cb49 100644
--- a/usr.bin/sockstat/sockstat.pl
+++ b/usr.bin/sockstat/sockstat.pl
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#      $Id: sockstat.pl,v 1.2 1999/05/01 11:31:19 des Exp $
+# $FreeBSD$
 #
 
 my (%myaddr, %hisaddr);
diff --git a/usr.bin/soelim/soelim.1 b/usr.bin/soelim/soelim.1
index aa5bf4d1c795..2c8c835d7c97 100644
--- a/usr.bin/soelim/soelim.1
+++ b/usr.bin/soelim/soelim.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)soelim.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt SOELIM 1
diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c
index 635088a0a7c5..9152a2791b44 100644
--- a/usr.bin/soelim/soelim.c
+++ b/usr.bin/soelim/soelim.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)soelim.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index 927250c26ffb..12759bf0de64 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)split.1	8.3 (Berkeley) 4/16/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 16, 1994
 .Dt SPLIT 1
diff --git a/usr.bin/strings/strings.1 b/usr.bin/strings/strings.1
index d644237ffafe..df660b0c333f 100644
--- a/usr.bin/strings/strings.1
+++ b/usr.bin/strings/strings.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strings.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt STRINGS 1
diff --git a/usr.bin/strings/strings.c b/usr.bin/strings/strings.c
index 80011677c3f5..6a49d632035e 100644
--- a/usr.bin/strings/strings.c
+++ b/usr.bin/strings/strings.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)strings.c	8.2 (Berkeley) 1/28/94";
 #endif
 static const char rcsid[] =
-	"$Id: strings.c,v 1.6 1997/08/11 07:31:28 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/strip/strip.1 b/usr.bin/strip/strip.1
index de225ab4832b..e91d6d9ada33 100644
--- a/usr.bin/strip/strip.1
+++ b/usr.bin/strip/strip.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strip.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: strip.1,v 1.5 1997/02/22 19:57:13 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt STRIP 1
diff --git a/usr.bin/strip/strip.1aout b/usr.bin/strip/strip.1aout
index de225ab4832b..e91d6d9ada33 100644
--- a/usr.bin/strip/strip.1aout
+++ b/usr.bin/strip/strip.1aout
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strip.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: strip.1,v 1.5 1997/02/22 19:57:13 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt STRIP 1
diff --git a/usr.bin/strip/strip.c b/usr.bin/strip/strip.c
index 7baf965d14bb..03ba76c6baac 100644
--- a/usr.bin/strip/strip.c
+++ b/usr.bin/strip/strip.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)strip.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: strip.c,v 1.10 1997/03/29 04:32:36 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index 2ffba8c85145..33064a4e089d 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.22 1999/08/13 16:51:40 sheldonh Exp $
+# $FreeBSD$
 
 PROG=	su
 SRCS=	su.c
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index 78ce5f15bd1b..c7a05977a351 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)su.1	8.2 (Berkeley) 4/18/94
-.\"	$Id: su.1,v 1.14 1998/06/08 05:29:51 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .\" this is for hilit19's braindeadness: "
 .Dd April 18, 1994
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 72ace2656633..2e5651e9bfc0 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)su.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: su.c,v 1.31 1999/07/02 11:20:59 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/symorder/symorder.1 b/usr.bin/symorder/symorder.1
index 9769490e0142..51cd83b6d33e 100644
--- a/usr.bin/symorder/symorder.1
+++ b/usr.bin/symorder/symorder.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)symorder.1	6.5 (Berkeley) 4/22/91
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 22, 1991
 .Dt SYMORDER 1
diff --git a/usr.bin/symorder/symorder.c b/usr.bin/symorder/symorder.c
index 91302292ea1a..503c67eca60f 100644
--- a/usr.bin/symorder/symorder.c
+++ b/usr.bin/symorder/symorder.c
@@ -42,7 +42,7 @@ char const copyright[] =
 static char sccsid[] = "@(#)symorder.c	5.8 (Berkeley) 4/1/91";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index bbdb58e6a83d..e15d7e28a50b 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index 83b5b02476a1..ffb0259d474a 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-	"$Id: cmdtab.c,v 1.3 1997/09/25 00:37:31 wollman Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "systat.h"
diff --git a/usr.bin/systat/devs.c b/usr.bin/systat/devs.c
index ac13b768e118..6f9c8117063e 100644
--- a/usr.bin/systat/devs.c
+++ b/usr.bin/systat/devs.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devs.c,v 1.2 1998/09/20 00:11:23 ken Exp $
+ * $FreeBSD$
  */
 /*
  * Some code and ideas taken from the old disks.c.
diff --git a/usr.bin/systat/devs.h b/usr.bin/systat/devs.h
index ce49c40d0ab9..ec656543b91b 100644
--- a/usr.bin/systat/devs.h
+++ b/usr.bin/systat/devs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 int dsinit(int, struct statinfo *, struct statinfo *, struct statinfo *);
diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c
index 458aa84edfc6..3b5b82935364 100644
--- a/usr.bin/systat/icmp.c
+++ b/usr.bin/systat/icmp.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index 21d4424e151f..b499a8b21046 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iostat.c,v 1.6 1998/09/15 08:16:40 gibbs Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1980, 1992, 1993
diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c
index 4501af17791f..d54c76ddb41d 100644
--- a/usr.bin/systat/ip.c
+++ b/usr.bin/systat/ip.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-	"$Id: ip.c,v 1.1 1997/09/25 00:37:32 wollman Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 44310948040e..8454682e8eba 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.9 1998/07/06 22:07:58 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
index 389e143e9662..f542da99e727 100644
--- a/usr.bin/systat/mbufs.c
+++ b/usr.bin/systat/mbufs.c
@@ -34,7 +34,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
 static const char rcsid[] =
-	"$Id: mbufs.c,v 1.7 1998/06/09 04:17:21 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/mode.c b/usr.bin/systat/mode.c
index 17d79b00df45..3eb85c033f1b 100644
--- a/usr.bin/systat/mode.c
+++ b/usr.bin/systat/mode.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/systat/mode.h b/usr.bin/systat/mode.h
index 586ecb1f11fd..caa6bae7e246 100644
--- a/usr.bin/systat/mode.h
+++ b/usr.bin/systat/mode.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index 479b33673eb0..b5d0422143a8 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)netcmds.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-	"$Id: netcmds.c,v 1.7 1997/12/04 03:44:44 steve Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 227f210711e5..ba53fdae58ab 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)netstat.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-	"$Id: netstat.c,v 1.10 1998/06/12 14:15:24 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index fa323b00599c..eda7b91f1207 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)swap.c	8.3 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-	"$Id: swap.c,v 1.10 1999/02/06 06:43:56 dillon Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index c39031b8074d..cbbd77b748ca 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
-.\"	$Id: systat.1,v 1.19 1999/07/30 07:44:25 des Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 9, 1997
 .Dt SYSTAT 1
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index 72f0f284fdf8..d8045d8fecff 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)systat.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <curses.h>
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index e0edbe1c199a..433721ec187f 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-	"$Id: tcp.c,v 1.1 1997/09/27 00:44:55 wollman Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index d3b5a68d322b..184c7e66152d 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #endif
 static const char rcsid[] =
-	"$Id: vmstat.c,v 1.35 1999/03/22 03:44:01 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index 6efe193aed32..7acf45063725 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)reverse.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: reverse.c,v 1.7 1997/08/13 06:46:56 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index 39864d09c684..8ffb8b7c8683 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tail.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TAIL 1
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index 921a12e168ad..bddde1ba259f 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	talk
 DPADD=	${LIBCURSES} ${LIBTERMCAP}
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index f4cdcd111f4b..c8094b47c51d 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ctl.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: ctl.c,v 1.4 1998/01/14 07:20:59 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index 2f2d8430bbb2..fa3ebad7a5c8 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ctl_transact.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 8dbd7583d386..16c7605d447d 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index 641f80fa3237..871dc9ac786b 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)get_addrs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c
index 1d303e8dd031..05a8368e6b1f 100644
--- a/usr.bin/talk/get_iface.c
+++ b/usr.bin/talk/get_iface.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: get_iface.c,v 1.5 1998/01/14 07:21:03 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index 762f4ff83700..73e20a162bd9 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)get_names.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index c5cd612a474d..b752e0aa4926 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)init_disp.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index a788d43bd00d..f941c8dde78d 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)invite.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index 4770d5b0c3a5..9653e1b11d7d 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: io.c,v 1.6 1998/01/14 07:21:10 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index fad2e391d2ae..3c6f3edc2765 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)look_up.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index ea9560887689..82c5038fc447 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)msgs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index 8226e9df5542..64bf639f86ce 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)talk.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TALK 1
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index 09b6c753f1ea..d71d49ae2b7d 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)talk.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "talk.h"
diff --git a/usr.bin/tconv/Makefile b/usr.bin/tconv/Makefile
index 0a4af30bbe34..403397f67e4a 100644
--- a/usr.bin/tconv/Makefile
+++ b/usr.bin/tconv/Makefile
@@ -1,5 +1,5 @@
 # Makefile for tconv
-# $Id$
+# $FreeBSD$
 
 PROG=   tconv
 SRCS=   tconv.c quit.c
diff --git a/usr.bin/tconv/tconv.1 b/usr.bin/tconv/tconv.1
index 1a6d0c5bf651..2cfa9c100989 100644
--- a/usr.bin/tconv/tconv.1
+++ b/usr.bin/tconv/tconv.1
@@ -1,5 +1,5 @@
 .\" @(#) mytinfo tconv.1 3.2 92/02/01 public domain, By Ross Ridge
-.\" $Id: tconv.1,v 1.8 1997/08/13 06:58:44 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 1, 1992
 .Dt TCONV 1
diff --git a/usr.bin/tconv/tconv.c b/usr.bin/tconv/tconv.c
index 5beeb1becc53..a9d035d028d6 100644
--- a/usr.bin/tconv/tconv.c
+++ b/usr.bin/tconv/tconv.c
@@ -58,7 +58,7 @@
 static const char SCCSid[] =
 	"@(#) mytinfo tconv.c 3.2 92/02/01 public domain, By Ross Ridge";
 static const char rcsid[] =
-	"$Id: tconv.c,v 1.3 1997/08/13 06:58:45 charnier Exp $";
+  "$FreeBSD$";
 #endif
 
 /* the right margin of the output */
diff --git a/usr.bin/tcopy/tcopy.1 b/usr.bin/tcopy/tcopy.1
index 9155207375fc..85a344eed2fa 100644
--- a/usr.bin/tcopy/tcopy.1
+++ b/usr.bin/tcopy/tcopy.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tcopy.1	8.2 (Berkeley) 4/17/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 17, 1994
 .Dt TCOPY 1
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index 3b9ffdd81a5b..18be38f28c17 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tcopy.c	8.2 (Berkeley) 4/17/94";
 #endif
 static const char rcsid[] =
-	"$Id: tcopy.c,v 1.5 1999/04/30 13:13:32 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1
index 271afde59077..adacd0764ff5 100644
--- a/usr.bin/tee/tee.1
+++ b/usr.bin/tee/tee.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tee.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TEE 1
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index d844c5b00ba4..c393200780c1 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tee.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index 7091304b46f2..ca2e968be6fd 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnet.1	8.5 (Berkeley) 3/1/94
-.\"	$Id: telnet.1,v 1.12 1999/06/17 07:12:39 ru Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 1, 1994
 .Dt TELNET 1
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index 3c6a15116d47..4ae5dc4c11c0 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.6 1998/06/09 04:31:02 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index 85ab1af52151..0f87f58f39ce 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tftp.1	8.2 (Berkeley) 4/18/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt TFTP 1
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index ae517a486329..9dc00afeddba 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tftp.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: tftp.c,v 1.3 1998/02/20 04:30:34 jb Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
diff --git a/usr.bin/tftp/tftpsubs.c b/usr.bin/tftp/tftpsubs.c
index 277d561403e0..5f3549d7dcf8 100644
--- a/usr.bin/tftp/tftpsubs.c
+++ b/usr.bin/tftp/tftpsubs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tftpsubs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* Simple minded read-ahead/write-behind subroutines for tftp user and
diff --git a/usr.bin/time/time.1 b/usr.bin/time/time.1
index b2b2a50be597..4d29566bfbfa 100644
--- a/usr.bin/time/time.1
+++ b/usr.bin/time/time.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)time.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TIME 1
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 1400a97e5859..960d00e27aac 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: time.c,v 1.12 1998/10/13 14:52:32 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/libacu/acucommon.c b/usr.bin/tip/libacu/acucommon.c
index fe0d146b1783..efb644fce7d6 100644
--- a/usr.bin/tip/libacu/acucommon.c
+++ b/usr.bin/tip/libacu/acucommon.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acucommon.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/libacu/unidialer.c b/usr.bin/tip/libacu/unidialer.c
index bac2368c0772..0206571007a1 100644
--- a/usr.bin/tip/libacu/unidialer.c
+++ b/usr.bin/tip/libacu/unidialer.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)unidialer.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unidialer.c,v 1.5 1997/08/18 07:15:41 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/libacu/ventel.c b/usr.bin/tip/libacu/ventel.c
index a438b4252e43..08f2be588e62 100644
--- a/usr.bin/tip/libacu/ventel.c
+++ b/usr.bin/tip/libacu/ventel.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ventel.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index 3f65c5547334..3ee0381f9468 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acu.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: acu.c,v 1.3 1997/08/18 07:15:58 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/acutab.c b/usr.bin/tip/tip/acutab.c
index cb0dd85a1342..2d38c7d3efb8 100644
--- a/usr.bin/tip/tip/acutab.c
+++ b/usr.bin/tip/tip/acutab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acutab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index c605022e87d3..f0caf1e648d8 100644
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmds.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: cmds.c,v 1.8 1998/10/03 11:01:39 dfr Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cmdtab.c b/usr.bin/tip/tip/cmdtab.c
index f9efc7b05dc9..3ad19e89afa8 100644
--- a/usr.bin/tip/tip/cmdtab.c
+++ b/usr.bin/tip/tip/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cu.c b/usr.bin/tip/tip/cu.c
index 50955fc6a129..2b3b2ed60d42 100644
--- a/usr.bin/tip/tip/cu.c
+++ b/usr.bin/tip/tip/cu.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cu.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: cu.c,v 1.2 1997/08/18 07:16:02 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index 0f71ea97fa95..90f7a613ad70 100644
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hunt.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/tip/log.c b/usr.bin/tip/tip/log.c
index acf5d87e4cd4..20004e8aa683 100644
--- a/usr.bin/tip/tip/log.c
+++ b/usr.bin/tip/tip/log.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)log.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: log.c,v 1.2 1997/08/18 07:16:03 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/modems.5 b/usr.bin/tip/tip/modems.5
index 0e74ca2d3df1..5fd486699ed5 100644
--- a/usr.bin/tip/tip/modems.5
+++ b/usr.bin/tip/tip/modems.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)modems.5	3/24/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd March 24, 1995
 .Dt MODEMS 5
diff --git a/usr.bin/tip/tip/partab.c b/usr.bin/tip/tip/partab.c
index c49721e643f0..94b2ab195e5d 100644
--- a/usr.bin/tip/tip/partab.c
+++ b/usr.bin/tip/tip/partab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)partab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index 9071eb62028f..2bc934389252 100644
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)remote.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/syslimits.h>
diff --git a/usr.bin/tip/tip/tip.1 b/usr.bin/tip/tip/tip.1
index 00ebfd7f538e..dd9327fe0769 100644
--- a/usr.bin/tip/tip/tip.1
+++ b/usr.bin/tip/tip/tip.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tip.1	8.4 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt TIP 1
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index 124286e6e1f4..810c9c6b123f 100644
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tip.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: tip.c,v 1.9 1998/06/09 14:51:05 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c
index d9417d68602d..c9292a870a30 100644
--- a/usr.bin/tip/tip/tipout.c
+++ b/usr.bin/tip/tip/tipout.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tipout.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: tipout.c,v 1.4 1997/08/18 07:16:08 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index 52bcfeba1e62..8be5cd9a0db0 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)value.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: value.c,v 1.3 1997/08/18 07:16:12 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/tip/vars.c b/usr.bin/tip/tip/vars.c
index 34d604e6d0c9..6aba4993e23d 100644
--- a/usr.bin/tip/tip/vars.c
+++ b/usr.bin/tip/tip/vars.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vars.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: vars.c,v 1.2 1997/08/18 07:16:12 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tn3270/api/api_bsd.c b/usr.bin/tn3270/api/api_bsd.c
index 7a884e83a12c..0e39a855b0fd 100644
--- a/usr.bin/tn3270/api/api_bsd.c
+++ b/usr.bin/tn3270/api/api_bsd.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)api_bsd.c	8.2 (Berkeley) 1/7/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #if	defined(unix)
diff --git a/usr.bin/tn3270/ascii/mset.c b/usr.bin/tn3270/ascii/mset.c
index a26852d27cbe..8e344930320d 100644
--- a/usr.bin/tn3270/ascii/mset.c
+++ b/usr.bin/tn3270/ascii/mset.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mset.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tn3270/mset/map3270.5 b/usr.bin/tn3270/mset/map3270.5
index 40a49781328a..d9249f563191 100644
--- a/usr.bin/tn3270/mset/map3270.5
+++ b/usr.bin/tn3270/mset/map3270.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)map3270.5	8.4 (Berkeley) 6/1/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH MAP3270 5  "June 1, 1994"
 .UC 6
diff --git a/usr.bin/tn3270/mset/mset.1 b/usr.bin/tn3270/mset/mset.1
index 362493bd32ce..8caa8aa25aa2 100644
--- a/usr.bin/tn3270/mset/mset.1
+++ b/usr.bin/tn3270/mset/mset.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mset.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MSET 1
diff --git a/usr.bin/tn3270/tn3270/tn3270.1 b/usr.bin/tn3270/tn3270/tn3270.1
index 41d795494ee1..d1675a782a93 100644
--- a/usr.bin/tn3270/tn3270/tn3270.1
+++ b/usr.bin/tn3270/tn3270/tn3270.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tn3270.1	8.2 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt TN3270 1
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index ee651d03ccc9..a3935021d162 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -19,7 +19,7 @@
  *          Steven Wallace  <swallace@freebsd.org>
  *          Wolfram Schneider <wosch@FreeBSD.org>
  *
- * $Id: machine.c,v 1.25 1999/05/11 14:32:15 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index dbb337774174..b1583f316f67 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)touch.1	8.3 (Berkeley) 4/28/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt TOUCH 1
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index e48f9f57be90..834f49e78585 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tput.1	8.2 (Berkeley) 3/19/94
-.\"	$Id: tput.1,v 1.3 1997/04/27 08:45:46 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 19, 1994
 .Dt TPUT 1
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index 55ad1bd448bc..ff27e4add3ce 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)str.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index d38ab2a0dad6..7403dba1619b 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tr.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd October 11, 1997
 .Dt TR 1
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index 52ccb1a1c8c8..b842e6d3452f 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: tr.c,v 1.6 1997/08/18 07:24:58 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <locale.h>
diff --git a/usr.bin/true/true.1 b/usr.bin/true/true.1
index c0bf4d2fade5..1eee432284c2 100644
--- a/usr.bin/true/true.1
+++ b/usr.bin/true/true.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)true.1	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt TRUE 1
diff --git a/usr.bin/truss/alpha-fbsd.c b/usr.bin/truss/alpha-fbsd.c
index 09f7394de4ed..125e126da9c4 100644
--- a/usr.bin/truss/alpha-fbsd.c
+++ b/usr.bin/truss/alpha-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: alpha-fbsd.c,v 1.1 1998/10/03 00:43:05 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/amd64-fbsd32.c b/usr.bin/truss/amd64-fbsd32.c
index 3096c82c2bdf..463f475cefaf 100644
--- a/usr.bin/truss/amd64-fbsd32.c
+++ b/usr.bin/truss/amd64-fbsd32.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-fbsd.c,v 1.5 1998/01/09 09:31:40 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/amd64-linux32.c b/usr.bin/truss/amd64-linux32.c
index 2d334ba01540..ec7632b83e0d 100644
--- a/usr.bin/truss/amd64-linux32.c
+++ b/usr.bin/truss/amd64-linux32.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-linux.c,v 1.5 1998/01/09 09:31:42 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/i386-fbsd.c b/usr.bin/truss/i386-fbsd.c
index 3096c82c2bdf..463f475cefaf 100644
--- a/usr.bin/truss/i386-fbsd.c
+++ b/usr.bin/truss/i386-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-fbsd.c,v 1.5 1998/01/09 09:31:40 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index 2d334ba01540..ec7632b83e0d 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-linux.c,v 1.5 1998/01/09 09:31:42 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index b82db46c9be6..ab5c0bae20dd 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.12 1998/10/03 00:43:05 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index fbef7e11a30b..afa011308e93 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: setup.c,v 1.7 1998/01/05 07:30:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/syscall.h b/usr.bin/truss/syscall.h
index 5f3757c81ef2..2b3c66b5928c 100644
--- a/usr.bin/truss/syscall.h
+++ b/usr.bin/truss/syscall.h
@@ -18,7 +18,7 @@
  * IN (meaning that the data is passed *into* the system call).
  */
 /*
- * $Id: syscall.h,v 1.3 1997/12/20 18:40:41 sef Exp $
+ * $FreeBSD$
  */
 
 enum Argtype { None = 1, Hex, Octal, Int, String, Ptr, Stat, Ioctl, Quad,
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index 53865fddcb43..bdd087bbf50c 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: syscalls.c,v 1.7 1999/08/05 12:03:50 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c
index 056f367c39bc..016afb1ff596 100644
--- a/usr.bin/tset/map.c
+++ b/usr.bin/tset/map.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: map.c,v 1.4 1997/08/18 07:27:53 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c
index 1e94df18c83a..4d8d705a9a25 100644
--- a/usr.bin/tset/misc.c
+++ b/usr.bin/tset/misc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c
index 68fa7a2259c0..0f3081437d60 100644
--- a/usr.bin/tset/set.c
+++ b/usr.bin/tset/set.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)set.c	8.2 (Berkeley) 2/28/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <termios.h>
diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c
index f64b86944176..857f9b1737bf 100644
--- a/usr.bin/tset/term.c
+++ b/usr.bin/tset/term.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)term.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: term.c,v 1.2 1997/08/18 07:27:56 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index fb07cf18b999..bb0481ad9be6 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tset.1	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt TSET 1
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index a097dcac8eef..df6b5b452d1a 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tset.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcdif[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/wrterm.c b/usr.bin/tset/wrterm.c
index d6274cfd1e04..8c5936898d63 100644
--- a/usr.bin/tset/wrterm.c
+++ b/usr.bin/tset/wrterm.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)wrterm.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tsort/tsort.1 b/usr.bin/tsort/tsort.1
index 8d9f25f1b294..6be1978fc06d 100644
--- a/usr.bin/tsort/tsort.1
+++ b/usr.bin/tsort/tsort.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tsort.1	8.3 (Berkeley) 4/1/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 1, 1994
 .Dt TSORT 1
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index fca46e904856..2f73a80d1fe9 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: tsort.c,v 1.8 1997/03/29 04:33:15 imp Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/tty/tty.1 b/usr.bin/tty/tty.1
index 67f2d634b351..dbf0e777661c 100644
--- a/usr.bin/tty/tty.1
+++ b/usr.bin/tty/tty.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tty.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: tty.1,v 1.4 1997/02/22 19:57:29 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TTY 1
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index 7a7e688d8a3e..4d02fa9dccd4 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index b84e826f8910..470fea1450a2 100644
--- a/usr.bin/ul/ul.1
+++ b/usr.bin/ul/ul.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ul.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt UL 1
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index f6fbdf035b7e..cfdd55245690 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ul.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: ul.c,v 1.4 1997/08/20 11:01:59 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index b2d1168cf79b..08f7508312e4 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)uname.1	8.3 (Berkeley) 4/8/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 8, 1994
 .Dt UNAME 1
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index 4d70913d7b2d..ed05c85d73af 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unexpand.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unexpand.c,v 1.3 1997/08/26 11:02:36 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index d0509692b49a..2c06332d938e 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unifdef.1	8.2 (Berkeley) 4/1/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 1, 1994
 .Dt UNIFDEF 1
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index 58b92de9ceaf..0b7344b2eb77 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unifdef.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unifdef.c,v 1.2 1997/08/20 11:07:53 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index 1728369f959b..e14dd517cda1 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)uniq.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: uniq.1,v 1.3 1997/09/07 15:09:22 joerg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt UNIQ 1
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index fe47d42c3175..0cc7977bbaf7 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uniq.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: uniq.c,v 1.4 1997/09/07 15:09:22 joerg Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile
index 5f4f8057fd57..946132c7bb99 100644
--- a/usr.bin/units/Makefile
+++ b/usr.bin/units/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 19:57:30 peter Exp $
+# $FreeBSD$
 
 PROG=	units
 
diff --git a/usr.bin/units/README b/usr.bin/units/README
index b7a173a38320..974cbe9fee3f 100644
--- a/usr.bin/units/README
+++ b/usr.bin/units/README
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 This is a program which I wrote as a clone of the UNIX 'units'
 command.  I threw it together in a couple days, but it seems to work,
diff --git a/usr.bin/units/pathnames.h b/usr.bin/units/pathnames.h
index f41f2077f168..227dd00b4922 100644
--- a/usr.bin/units/pathnames.h
+++ b/usr.bin/units/pathnames.h
@@ -1,4 +1,4 @@
-/*	$Id$	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index 85f0159a51ec..f1c2de8602e7 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -1,4 +1,4 @@
-.\" $Id: units.1,v 1.6 1997/08/21 06:49:32 charnier Exp $
+.\" $FreeBSD$
 .Dd July 14, 1993
 .Dt UNITS 1
 .Os
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index 3eae64b59130..7d1fd785d5b6 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -17,7 +17,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/units.lib b/usr.bin/units/units.lib
index f02649a78c78..a2f821459881 100644
--- a/usr.bin/units/units.lib
+++ b/usr.bin/units/units.lib
@@ -1,4 +1,4 @@
-/ $Id: units.lib,v 1.3 1997/02/22 19:57:34 peter Exp $
+/ $FreeBSD$
 
 / primitive units
 
diff --git a/usr.bin/unvis/unvis.1 b/usr.bin/unvis/unvis.1
index f16c3ff60c77..a3cb608a0d9c 100644
--- a/usr.bin/unvis/unvis.1
+++ b/usr.bin/unvis/unvis.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unvis.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt UNVIS 1
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
index 1549fd9ac249..418b74ec460b 100644
--- a/usr.bin/unvis/unvis.c
+++ b/usr.bin/unvis/unvis.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unvis.c,v 1.3 1997/08/21 06:52:43 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/users/users.1 b/usr.bin/users/users.1
index 1542aa95a2c3..874960705300 100644
--- a/usr.bin/users/users.1
+++ b/usr.bin/users/users.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)users.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt USERS 1
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index a3ab2b5ba8c9..7acb26836e40 100644
--- a/usr.bin/users/users.c
+++ b/usr.bin/users/users.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)users.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: users.c,v 1.3 1997/08/22 06:50:33 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index bb01770f05b8..247e80212d1e 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uudecode.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: uudecode.c,v 1.11 1998/01/25 19:25:54 wosch Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 784b39407f68..9616d6608974 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)uuencode.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: uuencode.1,v 1.6 1997/08/22 06:52:59 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt UUENCODE 1
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index b10a524a1900..e8696e900d0a 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uuencode.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/uuencode/uuencode.format.5 b/usr.bin/uuencode/uuencode.format.5
index 4ffc7f217a3a..10f16995c8c1 100644
--- a/usr.bin/uuencode/uuencode.format.5
+++ b/usr.bin/uuencode/uuencode.format.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)uuencode.format.5	8.2 (Berkeley) 1/12/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd January 12, 1994
 .Dt UUENCODE 5
diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile
index 6fc47954892c..ee668d894e64 100644
--- a/usr.bin/vacation/Makefile
+++ b/usr.bin/vacation/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	vacation
 CFLAGS+= -Wall
diff --git a/usr.bin/vacation/vacation.1 b/usr.bin/vacation/vacation.1
index e90eef6c7411..7d2c6aee6558 100644
--- a/usr.bin/vacation/vacation.1
+++ b/usr.bin/vacation/vacation.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)vacation.1	8.1 (Berkeley) 6/16/93
-.\"	$Id: vacation.1,v 1.7 1999/06/17 14:44:41 sheldonh Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1993
 .Dt VACATION 1
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c
index b94afe77ac80..98a2987abd3c 100644
--- a/usr.bin/vacation/vacation.c
+++ b/usr.bin/vacation/vacation.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: vacation.c	8.2 (Berkeley) 1/26/94";
 #endif
 static const char rcsid[] =
-	"$Id: vacation.c,v 1.16 1999/06/17 14:49:19 sheldonh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index 8b5102aef366..09c63380307f 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vfontedpr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: vfontedpr.c,v 1.10 1997/09/18 14:07:33 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index 513658f4df32..7e03ac7b0918 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vgrind.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt VGRIND 1
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index 5449f77d2911..105442b80b45 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vgrindefs.5	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt VGRINDEFS 5
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index 94b352ac8a2d..d2c463e06d2d 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.23 1998/09/05 12:25:54 asami Exp $
+# $FreeBSD$
 #
 # This has most of the glue needed to compile tknvi and the perl hooks,
 # but not all.
diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c
index 2bbf15d92f53..6cf63f35ac05 100644
--- a/usr.bin/vis/foldit.c
+++ b/usr.bin/vis/foldit.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)foldit.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/vis/vis.1 b/usr.bin/vis/vis.1
index b2840580d3f7..47c080dffa24 100644
--- a/usr.bin/vis/vis.1
+++ b/usr.bin/vis/vis.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vis.1	8.4 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt VIS 1
diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c
index edead0124b09..0ff6a21f0a0f 100644
--- a/usr.bin/vis/vis.c
+++ b/usr.bin/vis/vis.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vis.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 7fb1ddb86010..860628e88693 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)vmstat.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: vmstat.8,v 1.14 1999/04/26 14:08:04 kris Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1996
 .Dt VMSTAT 8
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index c67a1eb637c8..a06b44e0b9f1 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vmstat.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: vmstat.c,v 1.35 1999/05/12 11:49:47 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index 5b38b58dd126..2a7eb1d1bf94 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pr_time.c	8.2 (Berkeley) 4/4/94";
 #endif
 static const char rcsid[] =
-	"$Id: pr_time.c,v 1.11 1997/12/28 17:50:10 alex Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1
index 87370c59782c..20ebaa0ffbd5 100644
--- a/usr.bin/w/uptime.1
+++ b/usr.bin/w/uptime.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)uptime.1	8.2 (Berkeley) 4/18/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt UPTIME 1
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index 87d08ddd7306..12f3da808c13 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)w.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: w.1,v 1.10 1998/03/22 17:39:08 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt W 1
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index ff3eb57583fb..6441ee8f8966 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)w.c	8.4 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-	"$Id: w.c,v 1.35 1999/07/04 17:26:12 billf Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 65890cac45bc..2b58a1b97eb8 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ttymsg.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-	"$Id: ttymsg.c,v 1.2 1998/03/23 07:47:31 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/wall/wall.1 b/usr.bin/wall/wall.1
index b948a7e639ae..73f928036640 100644
--- a/usr.bin/wall/wall.1
+++ b/usr.bin/wall/wall.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wall.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt WALL 1
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index 288bea32c2c4..448f7a943550 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)wall.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-	"$Id: wall.c,v 1.9 1997/09/15 01:03:16 ache Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index fec2b5f57629..86fc751fe7ac 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wc.1	8.2 (Berkeley) 4/19/94
-.\"	$Id: wc.1,v 1.4 1997/02/22 19:57:44 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt WC 1
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index c04a6b05c5b2..3793a905af2a 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)wc.c	8.1 (Berkeley) 6/6/93";
 #else
 static const char rcsid[] =
-	"$Id: wc.c,v 1.9 1999/08/06 14:37:13 sheldonh Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index 7e369a9a0c1b..b5fe8bb05c80 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)what.1	8.1 (Berkeley) 6/6/93
 .\"
-.\" $Id: what.1,v 1.8 1998/04/14 06:31:23 phk Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt WHAT 1
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index ebc4d1107e9b..5a9bf35018ec 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)what.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: what.c,v 1.3 1997/08/25 06:49:45 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index b569301bdf42..8e6404b4c92d 100644
--- a/usr.bin/whereis/whereis.1
+++ b/usr.bin/whereis/whereis.1
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)whereis.1	8.2 (Berkeley) 12/30/93
 .\"
-.\" $Id: whereis.1,v 1.6 1998/08/31 16:41:08 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 15, 1996
 .Dt WHEREIS 1
diff --git a/usr.bin/whereis/whereis.pl b/usr.bin/whereis/whereis.pl
index f53d2a6fb2be..1af1d4769f97 100644
--- a/usr.bin/whereis/whereis.pl
+++ b/usr.bin/whereis/whereis.pl
@@ -28,7 +28,7 @@
 #
 # Rewritten from scratch for FreeBSD after the 4.3BSD manual page.
 #
-# $Id: whereis.pl,v 1.6 1998/10/04 10:33:37 obrien Exp $
+# $FreeBSD$
 #
 
 sub usage
diff --git a/usr.bin/which/Makefile b/usr.bin/which/Makefile
index d049eee35790..94646408bc84 100644
--- a/usr.bin/which/Makefile
+++ b/usr.bin/which/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 MAINTAINER= wosch
 
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index ec1d8c45a461..e9ae9d32ae70 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: which.1,v 1.11 1998/05/15 11:22:42 jkoshy Exp $
+.\" $FreeBSD$
 .Dd January 26, 1995
 .Dt WHICH 1
 .Os FreeBSD
diff --git a/usr.bin/which/which.pl b/usr.bin/which/which.pl
index 55214a607558..781e1c151602 100755
--- a/usr.bin/which/which.pl
+++ b/usr.bin/which/which.pl
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id: which.pl,v 1.12 1998/01/02 13:46:25 helbig Exp $
+# $FreeBSD$
 
 $all = $silent = $found = 0;
 @path = split(/:/, $ENV{'PATH'});
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index 1964a1a78bb5..6352eab33d8c 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)who.1	8.2 (Berkeley) 12/30/93
-.\"	$Id: who.1,v 1.5 1997/08/26 11:14:56 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt WHO 1
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index 26500ca68877..76ecdc2ae94d 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)who.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: who.c,v 1.6 1998/04/26 19:10:51 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 11138392cbf7..bdb2e3b637a0 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)whois.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: whois.1,v 1.5 1999/02/01 19:22:27 wollman Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 1, 1999
 .Dt WHOIS 1
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index 321136c6ef1c..d1a0855930ed 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: whois.c,v 1.7 1999/02/01 19:22:27 wollman Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 6391a8e30e03..5070cfb8bb3a 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)window.1	8.2 (Berkeley) 12/30/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt WINDOW 1
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index a5fe52d34034..2b9490209418 100644
--- a/usr.bin/write/write.1
+++ b/usr.bin/write/write.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)write.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: write.1,v 1.5 1997/03/22 17:19:32 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt WRITE 1
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index f1a37fb6003a..406eeb3f7565 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)write.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: write.c,v 1.10 1997/09/15 00:40:34 ache Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index b16fb8929fd7..8dec056ca98d 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)xargs.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt XARGS 1
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 41bf75a1486e..2ad94cc90926 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)xargs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: xargs.c,v 1.7 1998/10/13 14:52:32 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 46f1b3b00147..46179cbf73fd 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)install.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: install.1,v 1.12 1998/06/02 12:00:08 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 22, 1996
 .Dt INSTALL 1
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 0948040f561e..769d095624c5 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)xinstall.c	8.1 (Berkeley) 7/21/93";
 #endif
 static const char rcsid[] =
-	"$Id: xinstall.c,v 1.33 1998/10/13 14:52:33 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index 6ba805cb26a9..fef8dae73801 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.3 1995/07/04 01:53:05 cgd Exp $
-#	$Id$
+# $FreeBSD$
 
 PROG=	lint1
 SRCS=	cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index 7b15b2c0ae15..d076b3676cc9 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd August 28, 1994
 .Dt LINT 1
diff --git a/usr.bin/xstr/xstr.1 b/usr.bin/xstr/xstr.1
index 497965ad6cb2..777da20493b9 100644
--- a/usr.bin/xstr/xstr.1
+++ b/usr.bin/xstr/xstr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)xstr.1	8.2 (Berkeley) 12/30/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt XSTR 1
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 5820f7066913..8160bb857630 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)xstr.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index 4e4fec28da1c..3a871d989b4e 100644
--- a/usr.bin/yacc/Makefile
+++ b/usr.bin/yacc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.3 (Berkeley) 5/12/90
-#	$Id$
+# $FreeBSD$
 
 PROG=	yacc
 SRCS=	closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index 82751060fbd7..4caf45857640 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h
index 612d4ee4e048..a8d8113d3165 100644
--- a/usr.bin/yacc/defs.h
+++ b/usr.bin/yacc/defs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	5.6 (Berkeley) 5/24/93
- *	$Id: defs.h,v 1.6 1997/08/28 06:33:52 charnier Exp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>	/* for __P macro */
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 0e789ec69c22..3229f345104c 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -39,7 +39,7 @@
 static char const sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* routines for printing error messages  */
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index 275f7d1605f7..bd61e489e46b 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 96d87a9714cb..07816d2ac114 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 1501a592ff81..0a5511fdf568 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char const sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.8 1997/08/28 06:33:53 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index ad44c4c2b78a..e7ca1e36b91b 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -39,7 +39,7 @@
 static char const sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
 #endif
 static const char rcsid[] =
-	"$Id: mkpar.c,v 1.8 1999/07/04 17:26:16 billf Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index 3d32c065d599..255aeea809b2 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: output.c,v 1.9 1997/04/29 03:05:38 steve Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index e0eed8d65313..4e2e588241a9 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: reader.c,v 1.6 1997/02/22 19:58:01 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index 28df10bab639..f3d6dd0d3630 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -56,7 +56,7 @@ char *banner[] =
 {
     "#ifndef lint",
     "static char const ",
-    "yyrcsid[] = \"$Id: skeleton.c,v 1.19 1999/07/30 06:40:00 obrien Exp $\";",
+    "yyrcsid[] = \"$FreeBSD$\";",
     "#endif",
     "#include <stdlib.h>",
     "#define YYBYACC 1",
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index 2f2ee2e136d1..f155021bb68e 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index c2cfee5d8b85..69ce15e1d271 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index 680363c12640..37408c0b3fa9 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index f532779264ff..23a3b0d5b4a9 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yacc.1	5.8 (Berkeley) 5/24/93
-.\"     $Id: yacc.1,v 1.7 1997/05/14 02:33:08 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 24, 1993
 .Dt YACC 1
diff --git a/usr.bin/yacc/yyfix.1 b/usr.bin/yacc/yyfix.1
index 7aad08e056b3..3b50a624e2d8 100644
--- a/usr.bin/yacc/yyfix.1
+++ b/usr.bin/yacc/yyfix.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yyfix.1	5.4 (Berkeley) 3/23/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 23, 1993
 .Dt YYFIX 1
diff --git a/usr.bin/yes/yes.1 b/usr.bin/yes/yes.1
index 76ae9dbf0188..e19020f70aea 100644
--- a/usr.bin/yes/yes.1
+++ b/usr.bin/yes/yes.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yes.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt YES 1
diff --git a/usr.bin/ypcat/Makefile b/usr.bin/ypcat/Makefile
index d04375c9dd7f..58ee6907f07f 100644
--- a/usr.bin/ypcat/Makefile
+++ b/usr.bin/ypcat/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id$
+# $FreeBSD$
 
 PROG=	ypcat
 
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 605a0c3cd083..139b2c6e5799 100644
--- a/usr.bin/ypcat/ypcat.1
+++ b/usr.bin/ypcat/ypcat.1
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: ypcat.1,v 1.6 1997/08/29 11:48:48 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 3, 1993
 .Dt YPCAT 1
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index 2604115a3881..e90e763a0349 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ypmatch/Makefile b/usr.bin/ypmatch/Makefile
index bdf13edac4c9..22e62996937e 100644
--- a/usr.bin/ypmatch/Makefile
+++ b/usr.bin/ypmatch/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id$
+# $FreeBSD$
 
 PROG=	ypmatch
 
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index d3cc5bf53966..6491407e942a 100644
--- a/usr.bin/ypmatch/ypmatch.1
+++ b/usr.bin/ypmatch/ypmatch.1
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: ypmatch.1,v 1.6 1997/08/29 11:52:52 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 3, 1993
 .Dt YPMATCH 1
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index 25e4530146fa..be266bb7e1e0 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ypmatch.c,v 1.5 1997/08/29 11:52:52 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile
index 38d9edda0be2..f28f864ab097 100644
--- a/usr.bin/ypwhich/Makefile
+++ b/usr.bin/ypwhich/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id: Makefile,v 1.3 1997/02/22 19:58:13 peter Exp $
+# $FreeBSD$
 
 PROG=	ypwhich
 
diff --git a/usr.bin/ypwhich/ypwhich.1 b/usr.bin/ypwhich/ypwhich.1
index d3adc258ce43..88ca36d759ba 100644
--- a/usr.bin/ypwhich/ypwhich.1
+++ b/usr.bin/ypwhich/ypwhich.1
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: ypwhich.1,v 1.2 1998/03/23 07:48:45 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 23, 1994
 .Dt YPWHICH 1
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index 763875f5e6bd..2bc9ff377dd5 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ypwhich.c,v 1.9 1997/08/29 11:56:51 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
-- 
cgit v1.3


From 2b944ee2b959e9b29fd72dcbf87aad8ad5537bc4 Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Sat, 15 Jan 2000 15:25:43 +0000
Subject: This is the 3rd stage of syscons code reorganization.

- Split terminal emulation code from the main part of the driver so
that we can have alternative terminal emulator modules if we like in
the future.  (We are not quite there yet, though.)

- Put sysmouse related code in a separate file, thus, simplifying the
main part of the driver.

As some files are added to the source tree, you need to run config(8)
before you compile a new kernel next time.

You shouldn't see any functional change by this commit; this is only
internal code reorganization.
---
 sys/conf/files.alpha                      |    4 +
 sys/conf/files.i386                       |    4 +
 sys/dev/syscons/daemon/daemon_saver.c     |    2 +-
 sys/dev/syscons/scgfbrndr.c               |   23 +-
 sys/dev/syscons/schistory.c               |    8 +-
 sys/dev/syscons/scmouse.c                 |  216 +-----
 sys/dev/syscons/scterm-dumb.c             |  156 ++++
 sys/dev/syscons/scterm-sc.c               |  729 ++++++++++++++++++
 sys/dev/syscons/scterm.c                  |  128 +++
 sys/dev/syscons/sctermvar.h               |  437 +++++++++++
 sys/dev/syscons/scvgarndr.c               |   23 +-
 sys/dev/syscons/scvidctl.c                |  105 ++-
 sys/dev/syscons/scvtb.c                   |    1 -
 sys/dev/syscons/snake/snake_saver.c       |    2 +-
 sys/dev/syscons/star/star_saver.c         |    2 +-
 sys/dev/syscons/syscons.c                 | 1199 +++++++----------------------
 sys/dev/syscons/syscons.h                 |  224 ++++--
 sys/dev/syscons/sysmouse.c                |  344 +++++++++
 sys/modules/syscons/daemon/daemon_saver.c |    2 +-
 sys/modules/syscons/snake/snake_saver.c   |    2 +-
 sys/modules/syscons/star/star_saver.c     |    2 +-
 sys/sys/consio.h                          |   15 +
 22 files changed, 2378 insertions(+), 1250 deletions(-)
 create mode 100644 sys/dev/syscons/scterm-dumb.c
 create mode 100644 sys/dev/syscons/scterm-sc.c
 create mode 100644 sys/dev/syscons/scterm.c
 create mode 100644 sys/dev/syscons/sctermvar.h
 create mode 100644 sys/dev/syscons/sysmouse.c

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index b7434e44699f..ecb411ee37c4 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -181,10 +181,14 @@ dev/sound/isa/sb.c		optional	pcm isa
 dev/sound/isa/sbc.c		optional	sbc
 dev/syscons/schistory.c		optional	sc
 dev/syscons/scmouse.c		optional	sc
+dev/syscons/scterm.c		optional	sc
+dev/syscons/scterm-dumb.c	optional	sc
+dev/syscons/scterm-sc.c		optional	sc
 dev/syscons/scvgarndr.c		optional	sc
 dev/syscons/scvidctl.c		optional	sc
 dev/syscons/scvtb.c		optional	sc
 dev/syscons/syscons.c		optional	sc
+dev/syscons/sysmouse.c		optional	sc
 isa/atkbd_isa.c			optional	atkbd
 isa/atkbdc_isa.c		optional	atkbdc
 isa/fd.c			optional	fd
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 813aa93002f6..e9bbc68f467a 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -92,11 +92,15 @@ dev/sound/isa/sb.c		optional	pcm isa
 dev/sound/isa/sbc.c		optional	sbc
 dev/syscons/schistory.c		optional	sc
 dev/syscons/scmouse.c		optional	sc
+dev/syscons/scterm.c		optional	sc
+dev/syscons/scterm-dumb.c	optional	sc
+dev/syscons/scterm-sc.c		optional	sc
 dev/syscons/scvesactl.c		optional	sc
 dev/syscons/scvgarndr.c		optional	sc
 dev/syscons/scvidctl.c		optional	sc
 dev/syscons/scvtb.c		optional	sc
 dev/syscons/syscons.c		optional	sc
+dev/syscons/sysmouse.c		optional	sc
 gnu/i386/fpemul/div_small.s	optional	gpl_math_emulate
 gnu/i386/fpemul/errors.c	optional	gpl_math_emulate
 gnu/i386/fpemul/fpu_arith.c	optional	gpl_math_emulate
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index bc03f6446401..b056b486a039 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -240,7 +240,7 @@ daemon_saver(video_adapter_t *adp, int blank)
 			sc_vtb_clear(&scp->scr, sc->scr_map[0x20],
 				     (FG_LIGHTGREY | BG_BLACK) << 8);
 			(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
-			set_border(scp, 0);
+			sc_set_border(scp, 0);
 			xlen = ylen = tlen = 0;
 		}
 		if (blanked++ < 2)
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c
index 7290558f8159..afdd073627a8 100644
--- a/sys/dev/syscons/scgfbrndr.c
+++ b/sys/dev/syscons/scgfbrndr.c
@@ -38,7 +38,6 @@
 #include <sys/kernel.h>
 
 #include <machine/console.h>
-#include <machine/md_var.h>
 
 #include <dev/fb/fbreg.h>
 #include <dev/fb/vgareg.h>
@@ -83,6 +82,8 @@ static vr_draw_border_t		vga_grborder;
 
 static void			vga_nop(scr_stat *scp, ...);
 
+static struct linker_set	vga_set;
+
 static sc_rndr_sw_t txtrndrsw = {
 	vga_txtclear,
 	vga_txtborder,
@@ -93,10 +94,10 @@ static sc_rndr_sw_t txtrndrsw = {
 	(vr_set_mouse_t *)vga_nop,
 	vga_txtmouse,
 };
-RENDERER(mda, 0, txtrndrsw);
-RENDERER(cga, 0, txtrndrsw);
-RENDERER(ega, 0, txtrndrsw);
-RENDERER(vga, 0, txtrndrsw);
+RENDERER(mda, 0, txtrndrsw, vga_set);
+RENDERER(cga, 0, txtrndrsw, vga_set);
+RENDERER(ega, 0, txtrndrsw, vga_set);
+RENDERER(vga, 0, txtrndrsw, vga_set);
 
 #ifdef SC_PIXEL_MODE
 static sc_rndr_sw_t egarndrsw = {
@@ -109,7 +110,7 @@ static sc_rndr_sw_t egarndrsw = {
 	(vr_set_mouse_t *)vga_nop,
 	vga_pxlmouse,
 };
-RENDERER(ega, PIXEL_MODE, egarndrsw);
+RENDERER(ega, PIXEL_MODE, egarndrsw, vga_set);
 
 static sc_rndr_sw_t vgarndrsw = {
 	vga_pxlclear,
@@ -121,7 +122,7 @@ static sc_rndr_sw_t vgarndrsw = {
 	(vr_set_mouse_t *)vga_nop,
 	vga_pxlmouse,
 };
-RENDERER(vga, PIXEL_MODE, vgarndrsw);
+RENDERER(vga, PIXEL_MODE, vgarndrsw, vga_set);
 #endif /* SC_PIXEL_MODE */
 
 #ifndef SC_NO_MODE_CHANGE
@@ -135,11 +136,13 @@ static sc_rndr_sw_t grrndrsw = {
 	(vr_set_mouse_t *)vga_nop,
 	(vr_draw_mouse_t *)vga_nop,
 };
-RENDERER(cga, GRAPHICS_MODE, grrndrsw);
-RENDERER(ega, GRAPHICS_MODE, grrndrsw);
-RENDERER(vga, GRAPHICS_MODE, grrndrsw);
+RENDERER(cga, GRAPHICS_MODE, grrndrsw, vga_set);
+RENDERER(ega, GRAPHICS_MODE, grrndrsw, vga_set);
+RENDERER(vga, GRAPHICS_MODE, grrndrsw, vga_set);
 #endif /* SC_NO_MODE_CHANGE */
 
+RENDERER_MODULE(vga, vga_set);
+
 #ifndef SC_NO_CUTPASTE
 static u_short mouse_and_mask[16] = {
 	0xc000, 0xe000, 0xf000, 0xf800, 0xfc00, 0xfe00, 0xff00, 0xff80,
diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c
index aa7de06ca64b..49fc6eae8c09 100644
--- a/sys/dev/syscons/schistory.c
+++ b/sys/dev/syscons/schistory.c
@@ -44,6 +44,7 @@
 #include <sys/malloc.h>
 
 #include <machine/console.h>
+#include <machine/pc/display.h>
 
 #include <dev/syscons/syscons.h>
 
@@ -120,10 +121,12 @@ sc_alloc_history_buffer(scr_stat *scp, int lines, int prev_ysize, int wait)
 	if (history != NULL) {
 		if (lines > min_lines)
 			extra_history_size -= lines - min_lines;
+		/* XXX error check? */
 		sc_vtb_init(history, VTB_RINGBUFFER, scp->xsize, lines,
 			    NULL, wait);
+		/* FIXME: XXX no good? */
 		sc_vtb_clear(history, scp->sc->scr_map[0x20],
-			     scp->term.cur_color);
+			     SC_NORM_ATTR << 8);
 		if (prev_history != NULL)
 			copy_history(prev_history, history);
 		scp->history_pos = sc_vtb_tail(history);
@@ -182,7 +185,8 @@ sc_free_history_buffer(scr_stat *scp, int prev_ysize)
 
 	cur_lines = sc_vtb_rows(history);
 	min_lines = imax(SC_HISTORY_SIZE, prev_ysize);
-	extra_history_size += (cur_lines > min_lines) ? cur_lines - min_lines : 0;
+	extra_history_size += (cur_lines > min_lines) ? 
+				  cur_lines - min_lines : 0;
 
 	sc_vtb_destroy(history);
 	free(history, M_DEVBUF);
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index b0663a005f02..e55946c0211d 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -38,7 +38,6 @@
 #include <sys/signalvar.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 
 #include <machine/console.h>
@@ -73,16 +72,13 @@ typedef struct old_mouse_info {
     } u;
 } old_mouse_info_t;
 
-/* local variables */
 #ifndef SC_NO_SYSMOUSE
-static int		mouse_level;		/* sysmouse protocol level */
-static mousestatus_t	mouse_status = { 0, 0, 0, 0, 0, 0 };
+
+/* local variables */
 static int		cut_buffer_size;
 static u_char		*cut_buffer;
-#endif /* SC_NO_SYSMOUE */
 
 /* local functions */
-#ifndef SC_NO_SYSMOUSE
 static void set_mouse_pos(scr_stat *scp);
 #ifndef SC_NO_CUTPASTE
 static int skip_spc_right(scr_stat *scp, int p);
@@ -95,7 +91,6 @@ static void mouse_cut_line(scr_stat *scp);
 static void mouse_cut_extend(scr_stat *scp);
 static void mouse_paste(scr_stat *scp);
 #endif /* SC_NO_CUTPASTE */
-#endif /* SC_NO_SYSMOUE */
 
 #ifndef SC_NO_CUTPASTE
 /* allocate a cut buffer */
@@ -120,15 +115,6 @@ sc_alloc_cut_buffer(scr_stat *scp, int wait)
 }
 #endif /* SC_NO_CUTPASTE */
 
-#ifndef SC_NO_SYSMOUSE
-
-/* modify the sysmouse software level */
-void
-sc_mouse_set_level(int level)
-{
-    mouse_level = level;
-}
-
 /* move mouse */
 void
 sc_mouse_move(scr_stat *scp, int x, int y)
@@ -612,39 +598,21 @@ int
 sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
 	       struct proc *p)
 {
-
+    mouse_info_t *mouse;
+    mouse_info_t buf;
+    scr_stat *cur_scp;
     scr_stat *scp;
     int s;
-    int i;
+    int f;
 
-    /* scp == NULL, if tp == sc_get_mouse_tty() (/dev/sysmouse) */
     scp = SC_STAT(tp->t_dev);
 
     switch (cmd) {
 
     case CONS_MOUSECTL:		/* control mouse arrow */
     case OLD_CONS_MOUSECTL:
-    {
-	/* MOUSE_BUTTON?DOWN -> MOUSE_MSC_BUTTON?UP */
-	static int butmap[8] = {
-            MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON2UP | MOUSE_MSC_BUTTON3UP,
-            MOUSE_MSC_BUTTON2UP | MOUSE_MSC_BUTTON3UP,
-            MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON3UP,
-            MOUSE_MSC_BUTTON3UP,
-            MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON2UP,
-            MOUSE_MSC_BUTTON2UP,
-            MOUSE_MSC_BUTTON1UP,
-            0,
-	};
-	mouse_info_t *mouse = (mouse_info_t*)data;
-	mouse_info_t buf;
-	scr_stat *cur_scp;
-	struct tty *mtty;
-	int f;
-
-	if (scp == NULL)
-	    return ENOTTY;
 
+	mouse = (mouse_info_t*)data;
 	if (cmd == OLD_CONS_MOUSECTL) {
 	    static u_char swapb[] = { 0, 4, 2, 6, 1, 5, 3, 7 };
 	    old_mouse_info_t *old_mouse = (old_mouse_info_t *)data;
@@ -767,45 +735,9 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
 	    }
 	    splx(s);
 
-	    mouse_status.dx += mouse->u.data.x;
-	    mouse_status.dy += mouse->u.data.y;
-	    mouse_status.dz += mouse->u.data.z;
-	    if (mouse->operation == MOUSE_ACTION)
-	        mouse_status.button = mouse->u.data.buttons;
-	    mouse_status.flags |= 
-		((mouse->u.data.x || mouse->u.data.y || mouse->u.data.z) ? 
-		    MOUSE_POSCHANGED : 0)
-		| (mouse_status.obutton ^ mouse_status.button);
-	    if (mouse_status.flags == 0)
+	    if (sysmouse_event(mouse) == 0)
 		return 0;
 
-	    mtty = sc_get_mouse_tty();
-	    if (mtty->t_state & TS_ISOPEN) {
-		u_char buf[MOUSE_SYS_PACKETSIZE];
-
-		/* the first five bytes are compatible with MouseSystems' */
-		buf[0] = MOUSE_MSC_SYNC
-		    | butmap[mouse_status.button & MOUSE_STDBUTTONS];
-		i = imax(imin(mouse->u.data.x, 255), -256);
-		buf[1] = i >> 1;
-		buf[3] = i - buf[1];
-		i = -imax(imin(mouse->u.data.y, 255), -256);
-		buf[2] = i >> 1;
-		buf[4] = i - buf[2];
-		for (i = 0; i < MOUSE_MSC_PACKETSIZE; i++)
-	    		(*linesw[mtty->t_line].l_rint)(buf[i], mtty);
-		if (mouse_level >= 1) { 	/* extended part */
-		    i = imax(imin(mouse->u.data.z, 127), -128);
-		    buf[5] = (i >> 1) & 0x7f;
-		    buf[6] = (i - (i >> 1)) & 0x7f;
-		    /* buttons 4-10 */
-		    buf[7] = (~mouse_status.button >> 3) & 0x7f;
-		    for (i = MOUSE_MSC_PACKETSIZE; 
-			 i < MOUSE_SYS_PACKETSIZE; i++)
-	    		(*linesw[mtty->t_line].l_rint)(buf[i], mtty);
-		}
-	    }
-
 	    /* 
 	     * If any buttons are down or the mouse has moved a lot, 
 	     * stop the screen saver.
@@ -862,30 +794,13 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
 	    if (SC_VTY(tp->t_dev) != SC_CONSOLECTL)
 		return ENOTTY;
 #endif
-	    if (mouse->u.event.value > 0) {
+	    if (mouse->u.event.value > 0)
 		cur_scp->mouse_buttons |= mouse->u.event.id;
-	        mouse_status.button |= mouse->u.event.id;
-	    } else {
+	    else
 		cur_scp->mouse_buttons &= ~mouse->u.event.id;
-	        mouse_status.button &= ~mouse->u.event.id;
-	    }
-	    mouse_status.flags |= mouse_status.obutton ^ mouse_status.button;
-	    if (mouse_status.flags == 0)
-		return 0;
 
-	    mtty = sc_get_mouse_tty();
-	    if (mtty->t_state & TS_ISOPEN) {
-		u_char buf[MOUSE_SYS_PACKETSIZE];
-
-		buf[0] = MOUSE_MSC_SYNC 
-			 | butmap[mouse_status.button & MOUSE_STDBUTTONS];
-		buf[7] = (~mouse_status.button >> 3) & 0x7f;
-		buf[1] = buf[2] = buf[3] = buf[4] = buf[5] = buf[6] = 0;
-		for (i = 0; 
-		     i < ((mouse_level >= 1) ? MOUSE_SYS_PACKETSIZE 
-					     : MOUSE_MSC_PACKETSIZE); i++)
-	    	    (*linesw[mtty->t_line].l_rint)(buf[i], mtty);
-	    }
+	    if (sysmouse_event(mouse) == 0)
+		return 0;
 
 	    /* if a button is held down, stop the screen saver */
 	    if (mouse->u.event.value > 0)
@@ -961,11 +876,12 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
 	    } else {
 		if (mouse->u.mouse_char >= UCHAR_MAX - 4)
 		    return EINVAL;
-	    	s = spltty();
+		s = spltty();
 		sc_remove_all_mouse(scp->sc);
 #ifndef SC_NO_FONT_LOADING
 		if (ISTEXTSC(cur_scp) && (cur_scp->font_size != FONT_NONE))
-		    copy_font(cur_scp, LOAD, cur_scp->font_size, cur_scp->font);
+		    sc_load_font(cur_scp, 0, cur_scp->font_size, cur_scp->font,
+				 cur_scp->sc->mouse_char, 4);
 #endif
 		scp->sc->mouse_char = mouse->u.mouse_char;
 		splx(s);
@@ -979,108 +895,6 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
 	return 0;
     }
 
-    /* MOUSE_XXX: /dev/sysmouse ioctls */
-    case MOUSE_GETHWINFO:	/* get device information */
-    {
-	mousehw_t *hw = (mousehw_t *)data;
-
-	if (tp != sc_get_mouse_tty())
-	    return ENOTTY;
-	hw->buttons = 10;		/* XXX unknown */
-	hw->iftype = MOUSE_IF_SYSMOUSE;
-	hw->type = MOUSE_MOUSE;
-	hw->model = MOUSE_MODEL_GENERIC;
-	hw->hwid = 0;
-	return 0;
-    }
-
-    case MOUSE_GETMODE:		/* get protocol/mode */
-    {
-	mousemode_t *mode = (mousemode_t *)data;
-
-	if (tp != sc_get_mouse_tty())
-	    return ENOTTY;
-	mode->level = mouse_level;
-	switch (mode->level) {
-	case 0:
-	    /* at this level, sysmouse emulates MouseSystems protocol */
-	    mode->protocol = MOUSE_PROTO_MSC;
-	    mode->rate = -1;		/* unknown */
-	    mode->resolution = -1;	/* unknown */
-	    mode->accelfactor = 0;	/* disabled */
-	    mode->packetsize = MOUSE_MSC_PACKETSIZE;
-	    mode->syncmask[0] = MOUSE_MSC_SYNCMASK;
-	    mode->syncmask[1] = MOUSE_MSC_SYNC;
-	    break;
-
-	case 1:
-	    /* at this level, sysmouse uses its own protocol */
-	    mode->protocol = MOUSE_PROTO_SYSMOUSE;
-	    mode->rate = -1;
-	    mode->resolution = -1;
-	    mode->accelfactor = 0;
-	    mode->packetsize = MOUSE_SYS_PACKETSIZE;
-	    mode->syncmask[0] = MOUSE_SYS_SYNCMASK;
-	    mode->syncmask[1] = MOUSE_SYS_SYNC;
-	    break;
-	}
-	return 0;
-    }
-
-    case MOUSE_SETMODE:		/* set protocol/mode */
-    {
-	mousemode_t *mode = (mousemode_t *)data;
-
-	if (tp != sc_get_mouse_tty())
-	    return ENOTTY;
-	if ((mode->level < 0) || (mode->level > 1))
-	    return EINVAL;
-	sc_mouse_set_level(mode->level);
-	return 0;
-    }
-
-    case MOUSE_GETLEVEL:	/* get operation level */
-	if (tp != sc_get_mouse_tty())
-	    return ENOTTY;
-	*(int *)data = mouse_level;
-	return 0;
-
-    case MOUSE_SETLEVEL:	/* set operation level */
-	if (tp != sc_get_mouse_tty())
-	    return ENOTTY;
-	if ((*(int *)data  < 0) || (*(int *)data > 1))
-	    return EINVAL;
-	sc_mouse_set_level(*(int *)data);
-	return 0;
-
-    case MOUSE_GETSTATUS:	/* get accumulated mouse events */
-	if (tp != sc_get_mouse_tty())
-	    return ENOTTY;
-	s = spltty();
-	*(mousestatus_t *)data = mouse_status;
-	mouse_status.flags = 0;
-	mouse_status.obutton = mouse_status.button;
-	mouse_status.dx = 0;
-	mouse_status.dy = 0;
-	mouse_status.dz = 0;
-	splx(s);
-	return 0;
-
-#if notyet
-    case MOUSE_GETVARS:		/* get internal mouse variables */
-    case MOUSE_SETVARS:		/* set internal mouse variables */
-	if (tp != sc_get_mouse_tty())
-	    return ENOTTY;
-	return ENODEV;
-#endif
-
-    case MOUSE_READSTATE:	/* read status from the device */
-    case MOUSE_READDATA:	/* read data from the device */
-	if (tp != sc_get_mouse_tty())
-	    return ENOTTY;
-	return ENODEV;
-    }
-
     return ENOIOCTL;
 }
 
diff --git a/sys/dev/syscons/scterm-dumb.c b/sys/dev/syscons/scterm-dumb.c
new file mode 100644
index 000000000000..19e421d594a1
--- /dev/null
+++ b/sys/dev/syscons/scterm-dumb.c
@@ -0,0 +1,156 @@
+/*-
+ * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include "sc.h"
+#include "opt_syscons.h"
+
+#if NSC > 0
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/consio.h>
+
+#include <machine/pc/display.h>
+
+#include <dev/syscons/syscons.h>
+#include <dev/syscons/sctermvar.h>
+
+#ifdef SC_DUMB_TERMINAL
+
+/* dumb terminal emulator */
+
+static sc_term_init_t	dumb_init;
+static sc_term_term_t	dumb_term;
+static sc_term_puts_t	dumb_puts;
+static sc_term_ioctl_t	dumb_ioctl;
+static sc_term_clear_t	dumb_clear;
+static sc_term_input_t	dumb_input;
+static void		dumb_nop(void);
+
+static sc_term_sw_t sc_term_dumb = {
+	{ NULL, NULL },
+	"dumb",				/* emulator name */
+	"dumb terminal",		/* description */
+	"*",				/* matching renderer */
+	0,				/* softc size */
+	0,
+	dumb_init,
+	dumb_term,
+	dumb_puts,
+	dumb_ioctl,
+	(sc_term_reset_t *)dumb_nop,
+	(sc_term_default_attr_t *)dumb_nop,
+	dumb_clear,
+	(sc_term_notify_t *)dumb_nop,
+	dumb_input,
+};
+
+SCTERM_MODULE(dumb, sc_term_dumb);
+
+static int
+dumb_init(scr_stat *scp, void **softc, int code)
+{
+	switch (code) {
+	case SC_TE_COLD_INIT:
+		++sc_term_dumb.te_refcount;
+		break;
+	case SC_TE_WARM_INIT:
+		break;
+	}
+	return 0;
+}
+
+static int
+dumb_term(scr_stat *scp, void **softc)
+{
+	--sc_term_dumb.te_refcount;
+	return 0;
+}
+
+static void
+dumb_puts(scr_stat *scp, u_char *buf, int len)
+{
+	while (len > 0) {
+		++scp->sc->write_in_progress;
+		sc_term_gen_print(scp, &buf, &len, SC_NORM_ATTR << 8);
+    		sc_term_gen_scroll(scp, scp->sc->scr_map[0x20],
+				   SC_NORM_ATTR << 8);
+		--scp->sc->write_in_progress;
+	}
+}
+
+static int
+dumb_ioctl(scr_stat *scp, struct tty *tp, u_long cmd, caddr_t data,
+	   int flag, struct proc *p)
+{
+	vid_info_t *vi;
+
+	switch (cmd) {
+	case GIO_ATTR:      	/* get current attributes */
+		*(int*)data = SC_NORM_ATTR;
+		return 0;
+	case CONS_GETINFO:  	/* get current (virtual) console info */
+		vi = (vid_info_t *)data;
+		if (vi->size != sizeof(struct vid_info))
+			return EINVAL;
+		vi->mv_norm.fore = SC_NORM_ATTR & 0x0f;
+		vi->mv_norm.back = (SC_NORM_ATTR >> 4) & 0x0f;
+		vi->mv_rev.fore = SC_NORM_ATTR & 0x0f;
+		vi->mv_rev.back = (SC_NORM_ATTR >> 4) & 0x0f;
+		/*
+		 * The other fields are filled by the upper routine. XXX
+		 */
+		return ENOIOCTL;
+	}
+	return ENOIOCTL;
+}
+
+static void
+dumb_clear(scr_stat *scp)
+{
+	sc_move_cursor(scp, 0, 0);
+	sc_vtb_clear(&scp->vtb, scp->sc->scr_map[0x20], SC_NORM_ATTR << 8);
+	mark_all(scp);
+}
+
+static int
+dumb_input(scr_stat *scp, int c, struct tty *tp)
+{
+	return FALSE;
+}
+
+static void
+dumb_nop(void)
+{
+	/* nothing */
+}
+
+#endif /* SC_DUMB_TERMINAL */
+
+#endif /* NSC > 1 */
diff --git a/sys/dev/syscons/scterm-sc.c b/sys/dev/syscons/scterm-sc.c
new file mode 100644
index 000000000000..317f7da5bcec
--- /dev/null
+++ b/sys/dev/syscons/scterm-sc.c
@@ -0,0 +1,729 @@
+/*-
+ * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+ * Copyright (c) 1992-1998 Søren Schmidt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include "sc.h"
+#include "opt_syscons.h"
+
+#if NSC > 0
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/consio.h>
+
+#include <machine/pc/display.h>
+
+#include <dev/syscons/syscons.h>
+#include <dev/syscons/sctermvar.h>
+
+#ifndef SC_DUMB_TERMINAL
+
+#define MAX_ESC_PAR	5
+
+/* attribute flags */
+typedef struct {
+	u_short		fg;			/* foreground color */
+	u_short		bg;			/* background color */
+} color_t;
+
+typedef struct {
+	int		flags;
+#define SCTERM_BUSY	(1 << 0)
+	int		esc;
+	int		num_param;
+	int		last_param;
+	int		param[MAX_ESC_PAR];
+	int		saved_xpos;
+	int		saved_ypos;
+	int		attr_mask;		/* current logical attr mask */
+#define NORMAL_ATTR	0x00
+#define BLINK_ATTR	0x01
+#define BOLD_ATTR	0x02
+#define UNDERLINE_ATTR	0x04
+#define REVERSE_ATTR	0x08
+#define FG_CHANGED	0x10
+#define BG_CHANGED	0x20
+	int		cur_attr;		/* current hardware attr word */
+	color_t		cur_color;		/* current hardware color */
+	color_t		std_color;		/* normal hardware color */
+	color_t		rev_color;		/* reverse hardware color */
+	color_t		dflt_std_color;		/* default normal color */
+	color_t		dflt_rev_color;		/* default reverse color */
+} term_stat;
+
+static sc_term_init_t	scterm_init;
+static sc_term_term_t	scterm_term;
+static sc_term_puts_t	scterm_puts;
+static sc_term_ioctl_t	scterm_ioctl;
+static sc_term_reset_t	scterm_reset;
+static sc_term_default_attr_t	scterm_default_attr;
+static sc_term_clear_t	scterm_clear;
+static sc_term_notify_t	scterm_notify;
+static sc_term_input_t	scterm_input;
+
+static sc_term_sw_t sc_term_sc = {
+	{ NULL, NULL },
+	"sc",				/* emulator name */
+	"syscons terminal",		/* description */
+	"*",				/* matching renderer, any :-) */
+	sizeof(term_stat),		/* softc size */
+	0,
+	scterm_init,
+	scterm_term,
+	scterm_puts,
+	scterm_ioctl,
+	scterm_reset,
+	scterm_default_attr,
+	scterm_clear,
+	scterm_notify,
+	scterm_input,
+};
+
+SCTERM_MODULE(sc, sc_term_sc);
+
+static term_stat	reserved_term_stat;
+static void		scterm_scan_esc(scr_stat *scp, term_stat *tcp,
+					u_char c);
+static int		mask2attr(term_stat *tcp);
+
+static int
+scterm_init(scr_stat *scp, void **softc, int code)
+{
+	term_stat *tcp;
+
+	if (*softc == NULL) {
+		if (reserved_term_stat.flags & SCTERM_BUSY)
+			return EINVAL;
+		*softc = &reserved_term_stat;
+	}
+	tcp = *softc;
+
+	switch (code) {
+	case SC_TE_COLD_INIT:
+		bzero(tcp, sizeof(*tcp));
+		tcp->flags = SCTERM_BUSY;
+		tcp->esc = 0;
+		tcp->saved_xpos = -1;
+		tcp->saved_ypos = -1;
+		tcp->attr_mask = NORMAL_ATTR;
+		/* XXX */
+		tcp->dflt_std_color.fg = SC_NORM_ATTR & 0x0f;
+		tcp->dflt_std_color.bg = (SC_NORM_ATTR >> 4) & 0x0f;
+		tcp->dflt_rev_color.fg = SC_NORM_REV_ATTR & 0x0f;
+		tcp->dflt_rev_color.bg = (SC_NORM_REV_ATTR >> 4) & 0x0f;
+		tcp->std_color = tcp->dflt_std_color;
+		tcp->rev_color = tcp->dflt_rev_color;
+		tcp->cur_color = tcp->std_color;
+		tcp->cur_attr = mask2attr(tcp);
+		++sc_term_sc.te_refcount;
+		break;
+
+	case SC_TE_WARM_INIT:
+		tcp->esc = 0;
+		tcp->saved_xpos = -1;
+		tcp->saved_ypos = -1;
+		tcp->std_color = tcp->dflt_std_color;
+		tcp->rev_color = tcp->dflt_rev_color;
+		tcp->cur_color = tcp->std_color;
+		tcp->cur_attr = mask2attr(tcp);
+		break;
+	}
+
+	return 0;
+}
+
+static int
+scterm_term(scr_stat *scp, void **softc)
+{
+	if (*softc == &reserved_term_stat) {
+		*softc = NULL;
+		bzero(&reserved_term_stat, sizeof(reserved_term_stat));
+	}
+	--sc_term_sc.te_refcount;
+	return 0;
+}
+
+static void
+scterm_scan_esc(scr_stat *scp, term_stat *tcp, u_char c)
+{
+	static u_char ansi_col[16] = {
+		FG_BLACK,     FG_RED,          FG_GREEN,      FG_BROWN,
+		FG_BLUE,      FG_MAGENTA,      FG_CYAN,       FG_LIGHTGREY,
+		FG_DARKGREY,  FG_LIGHTRED,     FG_LIGHTGREEN, FG_YELLOW,
+		FG_LIGHTBLUE, FG_LIGHTMAGENTA, FG_LIGHTCYAN,  FG_WHITE
+	};
+	sc_softc_t *sc;
+	int i, n;
+
+    i = n = 0;
+    sc = scp->sc; 
+    if (tcp->esc == 1) {	/* seen ESC */
+	switch (c) {
+
+	case '7':   /* Save cursor position */
+	    tcp->saved_xpos = scp->xpos;
+	    tcp->saved_ypos = scp->ypos;
+	    break;
+
+	case '8':   /* Restore saved cursor position */
+	    if (tcp->saved_xpos >= 0 && tcp->saved_ypos >= 0)
+		sc_move_cursor(scp, tcp->saved_xpos, tcp->saved_ypos);
+	    break;
+
+	case '[':   /* Start ESC [ sequence */
+	    tcp->esc = 2;
+	    tcp->last_param = -1;
+	    for (i = tcp->num_param; i < MAX_ESC_PAR; i++)
+		tcp->param[i] = 1;
+	    tcp->num_param = 0;
+	    return;
+
+	case 'M':   /* Move cursor up 1 line, scroll if at top */
+	    sc_term_up_scroll(scp, 1, sc->scr_map[0x20], tcp->cur_attr, 0, 0);
+	    break;
+#if notyet
+	case 'Q':
+	    tcp->esc = 4;
+	    return;
+#endif
+	case 'c':   /* Clear screen & home */
+	    sc_clear_screen(scp);
+	    break;
+
+	case '(':   /* iso-2022: designate 94 character set to G0 */
+	    tcp->esc = 5;
+	    return;
+	}
+    }
+    else if (tcp->esc == 2) {	/* seen ESC [ */
+	if (c >= '0' && c <= '9') {
+	    if (tcp->num_param < MAX_ESC_PAR) {
+		if (tcp->last_param != tcp->num_param) {
+		    tcp->last_param = tcp->num_param;
+		    tcp->param[tcp->num_param] = 0;
+		} else {
+		    tcp->param[tcp->num_param] *= 10;
+		}
+		tcp->param[tcp->num_param] += c - '0';
+		return;
+	    }
+	}
+	tcp->num_param = tcp->last_param + 1;
+	switch (c) {
+
+	case ';':
+	    if (tcp->num_param < MAX_ESC_PAR)
+		return;
+	    break;
+
+	case '=':
+	    tcp->esc = 3;
+	    tcp->last_param = -1;
+	    for (i = tcp->num_param; i < MAX_ESC_PAR; i++)
+		tcp->param[i] = 1;
+	    tcp->num_param = 0;
+	    return;
+
+	case 'A':   /* up n rows */
+	    sc_term_up(scp, tcp->param[0], 0);
+	    break;
+
+	case 'B':   /* down n rows */
+	    sc_term_down(scp, tcp->param[0], 0);
+	    break;
+
+	case 'C':   /* right n columns */
+	    sc_term_right(scp, tcp->param[0]);
+	    break;
+
+	case 'D':   /* left n columns */
+	    sc_term_left(scp, tcp->param[0]);
+	    break;
+
+	case 'E':   /* cursor to start of line n lines down */
+	    n = tcp->param[0]; if (n < 1) n = 1;
+	    sc_move_cursor(scp, 0, scp->ypos + n);
+	    break;
+
+	case 'F':   /* cursor to start of line n lines up */
+	    n = tcp->param[0]; if (n < 1) n = 1;
+	    sc_move_cursor(scp, 0, scp->ypos - n);
+	    break;
+
+	case 'f':   /* Cursor move */
+	case 'H':
+	    if (tcp->num_param == 0)
+		sc_move_cursor(scp, 0, 0);
+	    else if (tcp->num_param == 2)
+		sc_move_cursor(scp, tcp->param[1] - 1, tcp->param[0] - 1);
+	    break;
+
+	case 'J':   /* Clear all or part of display */
+	    if (tcp->num_param == 0)
+		n = 0;
+	    else
+		n = tcp->param[0];
+	    sc_term_clr_eos(scp, n, sc->scr_map[0x20], tcp->cur_attr);
+	    break;
+
+	case 'K':   /* Clear all or part of line */
+	    if (tcp->num_param == 0)
+		n = 0;
+	    else
+		n = tcp->param[0];
+	    sc_term_clr_eol(scp, n, sc->scr_map[0x20], tcp->cur_attr);
+	    break;
+
+	case 'L':   /* Insert n lines */
+	    sc_term_ins_line(scp, scp->ypos, tcp->param[0],
+			     sc->scr_map[0x20], tcp->cur_attr, 0);
+	    break;
+
+	case 'M':   /* Delete n lines */
+	    sc_term_del_line(scp, scp->ypos, tcp->param[0],
+			     sc->scr_map[0x20], tcp->cur_attr, 0);
+	    break;
+
+	case 'P':   /* Delete n chars */
+	    sc_term_del_char(scp, tcp->param[0],
+			     sc->scr_map[0x20], tcp->cur_attr);
+	    break;
+
+	case '@':   /* Insert n chars */
+	    sc_term_ins_char(scp, tcp->param[0],
+			     sc->scr_map[0x20], tcp->cur_attr);
+	    break;
+
+	case 'S':   /* scroll up n lines */
+	    sc_term_del_line(scp, 0, tcp->param[0],
+			     sc->scr_map[0x20], tcp->cur_attr, 0);
+	    break;
+
+	case 'T':   /* scroll down n lines */
+	    sc_term_ins_line(scp, 0, tcp->param[0],
+			     sc->scr_map[0x20], tcp->cur_attr, 0);
+	    break;
+
+	case 'X':   /* erase n characters in line */
+	    n = tcp->param[0]; if (n < 1)  n = 1;
+	    if (n > scp->xsize - scp->xpos)
+		n = scp->xsize - scp->xpos;
+	    sc_vtb_erase(&scp->vtb, scp->cursor_pos, n,
+			 sc->scr_map[0x20], tcp->cur_attr);
+	    mark_for_update(scp, scp->cursor_pos);
+	    mark_for_update(scp, scp->cursor_pos + n - 1);
+	    break;
+
+	case 'Z':   /* move n tabs backwards */
+	    sc_term_backtab(scp, tcp->param[0]);
+	    break;
+
+	case '`':   /* move cursor to column n */
+	    sc_term_col(scp, tcp->param[0]);
+	    break;
+
+	case 'a':   /* move cursor n columns to the right */
+	    sc_term_right(scp, tcp->param[0]);
+	    break;
+
+	case 'd':   /* move cursor to row n */
+	    sc_term_row(scp, tcp->param[0]);
+	    break;
+
+	case 'e':   /* move cursor n rows down */
+	    sc_term_down(scp, tcp->param[0], 0);
+	    break;
+
+	case 'm':   /* change attribute */
+	    if (tcp->num_param == 0) {
+		tcp->attr_mask = NORMAL_ATTR;
+		tcp->cur_color = tcp->std_color;
+		tcp->cur_attr = mask2attr(tcp);
+		break;
+	    }
+	    for (i = 0; i < tcp->num_param; i++) {
+		switch (n = tcp->param[i]) {
+		case 0: /* back to normal */
+		    tcp->attr_mask = NORMAL_ATTR;
+		    tcp->cur_color = tcp->std_color;
+		    tcp->cur_attr = mask2attr(tcp);
+		    break;
+		case 1: /* bold */
+		    tcp->attr_mask |= BOLD_ATTR;
+		    tcp->cur_attr = mask2attr(tcp);
+		    break;
+		case 4: /* underline */
+		    tcp->attr_mask |= UNDERLINE_ATTR;
+		    tcp->cur_attr = mask2attr(tcp);
+		    break;
+		case 5: /* blink */
+		    tcp->attr_mask |= BLINK_ATTR;
+		    tcp->cur_attr = mask2attr(tcp);
+		    break;
+		case 7: /* reverse video */
+		    tcp->attr_mask |= REVERSE_ATTR;
+		    tcp->cur_attr = mask2attr(tcp);
+		    break;
+		case 30: case 31: /* set fg color */
+		case 32: case 33: case 34:
+		case 35: case 36: case 37:
+		    tcp->attr_mask |= FG_CHANGED;
+		    tcp->cur_color.fg = ansi_col[n - 30];
+		    tcp->cur_attr = mask2attr(tcp);
+		    break;
+		case 40: case 41: /* set bg color */
+		case 42: case 43: case 44:
+		case 45: case 46: case 47:
+		    tcp->attr_mask |= BG_CHANGED;
+		    tcp->cur_color.bg = ansi_col[n - 40];
+		    tcp->cur_attr = mask2attr(tcp);
+		    break;
+		}
+	    }
+	    break;
+
+	case 's':   /* Save cursor position */
+	    tcp->saved_xpos = scp->xpos;
+	    tcp->saved_ypos = scp->ypos;
+	    break;
+
+	case 'u':   /* Restore saved cursor position */
+	    if (tcp->saved_xpos >= 0 && tcp->saved_ypos >= 0)
+		sc_move_cursor(scp, tcp->saved_xpos, tcp->saved_ypos);
+	    break;
+
+	case 'x':
+	    if (tcp->num_param == 0)
+		n = 0;
+	    else
+		n = tcp->param[0];
+	    switch (n) {
+	    case 0:     /* reset attributes */
+		tcp->attr_mask = NORMAL_ATTR;
+		tcp->cur_color = tcp->std_color = tcp->dflt_std_color;
+		tcp->rev_color = tcp->dflt_rev_color;
+		tcp->cur_attr = mask2attr(tcp);
+		break;
+	    case 1:     /* set ansi background */
+		tcp->attr_mask &= ~BG_CHANGED;
+		tcp->cur_color.bg = tcp->std_color.bg =
+		    ansi_col[tcp->param[1] & 0x0f];
+		tcp->cur_attr = mask2attr(tcp);
+		break;
+	    case 2:     /* set ansi foreground */
+		tcp->attr_mask &= ~FG_CHANGED;
+		tcp->cur_color.fg = tcp->std_color.fg =
+		    ansi_col[tcp->param[1] & 0x0f];
+		tcp->cur_attr = mask2attr(tcp);
+		break;
+	    case 3:     /* set ansi attribute directly */
+		tcp->attr_mask &= ~(FG_CHANGED | BG_CHANGED);
+		tcp->cur_color.fg = tcp->std_color.fg =
+		    tcp->param[1] & 0x0f;
+		tcp->cur_color.bg = tcp->std_color.bg =
+		    (tcp->param[1] >> 4) & 0x0f;
+		tcp->cur_attr = mask2attr(tcp);
+		break;
+	    case 5:     /* set ansi reverse video background */
+		tcp->rev_color.bg = ansi_col[tcp->param[1] & 0x0f];
+		tcp->cur_attr = mask2attr(tcp);
+		break;
+	    case 6:     /* set ansi reverse video foreground */
+		tcp->rev_color.fg = ansi_col[tcp->param[1] & 0x0f];
+		tcp->cur_attr = mask2attr(tcp);
+		break;
+	    case 7:     /* set ansi reverse video directly */
+		tcp->rev_color.fg = tcp->param[1] & 0x0f;
+		tcp->rev_color.bg = (tcp->param[1] >> 4) & 0x0f;
+		tcp->cur_attr = mask2attr(tcp);
+		break;
+	    }
+	    break;
+
+	case 'z':   /* switch to (virtual) console n */
+	    if (tcp->num_param == 1)
+		sc_switch_scr(sc, tcp->param[0]);
+	    break;
+	}
+    }
+    else if (tcp->esc == 3) {	/* seen ESC [0-9]+ = */
+	if (c >= '0' && c <= '9') {
+	    if (tcp->num_param < MAX_ESC_PAR) {
+		if (tcp->last_param != tcp->num_param) {
+		    tcp->last_param = tcp->num_param;
+		    tcp->param[tcp->num_param] = 0;
+		} else {
+		    tcp->param[tcp->num_param] *= 10;
+		}
+		tcp->param[tcp->num_param] += c - '0';
+		return;
+	    }
+	}
+	tcp->num_param = tcp->last_param + 1;
+	switch (c) {
+
+	case ';':
+	    if (tcp->num_param < MAX_ESC_PAR)
+		return;
+	    break;
+
+	case 'A':   /* set display border color */
+	    if (tcp->num_param == 1) {
+		scp->border=tcp->param[0] & 0xff;
+		if (scp == sc->cur_scp)
+		    sc_set_border(scp, scp->border);
+            }
+	    break;
+
+	case 'B':   /* set bell pitch and duration */
+	    if (tcp->num_param == 2) {
+		scp->bell_pitch = tcp->param[0];
+		scp->bell_duration = tcp->param[1];
+	    }
+	    break;
+
+	case 'C':   /* set cursor type & shape */
+	    if (!ISGRAPHSC(sc->cur_scp))
+		sc_remove_cursor_image(sc->cur_scp);
+	    if (tcp->num_param == 1) {
+		if (tcp->param[0] & 0x01)
+		    sc->flags |= SC_BLINK_CURSOR;
+		else
+		    sc->flags &= ~SC_BLINK_CURSOR;
+		if (tcp->param[0] & 0x02) 
+		    sc->flags |= SC_CHAR_CURSOR;
+		else
+		    sc->flags &= ~SC_CHAR_CURSOR;
+	    } else if (tcp->num_param == 2) {
+		sc->cursor_base = scp->font_size 
+					- (tcp->param[1] & 0x1F) - 1;
+		sc->cursor_height = (tcp->param[1] & 0x1F) 
+					- (tcp->param[0] & 0x1F) + 1;
+	    }
+	    /* 
+	     * The cursor shape is global property; all virtual consoles
+	     * are affected. Update the cursor in the current console...
+	     */
+	    if (!ISGRAPHSC(sc->cur_scp)) {
+		i = spltty();
+		sc_set_cursor_image(sc->cur_scp);
+		sc_draw_cursor_image(sc->cur_scp);
+		splx(i);
+	    }
+	    break;
+
+	case 'F':   /* set ansi foreground */
+	    if (tcp->num_param == 1) {
+		tcp->attr_mask &= ~FG_CHANGED;
+		tcp->cur_color.fg = tcp->std_color.fg = tcp->param[0] & 0x0f;
+		tcp->cur_attr = mask2attr(tcp);
+	    }
+	    break;
+
+	case 'G':   /* set ansi background */
+	    if (tcp->num_param == 1) {
+		tcp->attr_mask &= ~BG_CHANGED;
+		tcp->cur_color.bg = tcp->std_color.bg = tcp->param[0] & 0x0f;
+		tcp->cur_attr = mask2attr(tcp);
+	    }
+	    break;
+
+	case 'H':   /* set ansi reverse video foreground */
+	    if (tcp->num_param == 1) {
+		tcp->rev_color.fg = tcp->param[0] & 0x0f;
+		tcp->cur_attr = mask2attr(tcp);
+	    }
+	    break;
+
+	case 'I':   /* set ansi reverse video background */
+	    if (tcp->num_param == 1) {
+		tcp->rev_color.bg = tcp->param[0] & 0x0f;
+		tcp->cur_attr = mask2attr(tcp);
+	    }
+	    break;
+	}
+
+#if notyet
+	} else if (tcp->esc == 4) {	/* seen ESC Q */
+		/* to be filled */
+#endif
+	} else if (tcp->esc == 5) {	/* seen ESC ( */
+		switch (c) {
+		case 'B':   /* iso-2022: desginate ASCII into G0 */
+			break;
+			/* other items to be filled */
+		default:
+			break;
+		}
+	}
+	tcp->esc = 0;
+}
+
+static void
+scterm_puts(scr_stat *scp, u_char *buf, int len)
+{
+	term_stat *tcp;
+
+	tcp = scp->ts;
+outloop:
+	scp->sc->write_in_progress++;
+
+	if (tcp->esc) {
+		scterm_scan_esc(scp, tcp, *buf);
+		buf++;
+		len--;
+	} else {
+		switch (*buf) {
+		case 0x1b:
+			tcp->esc = 1;
+			tcp->num_param = 0;
+			buf++;
+			len--;
+			break;
+		default:
+			sc_term_gen_print(scp, &buf, &len, tcp->cur_attr);
+			break;
+		}
+	}
+
+	sc_term_gen_scroll(scp, scp->sc->scr_map[0x20], tcp->cur_attr);
+
+	scp->sc->write_in_progress--;
+	if (len)
+		goto outloop;
+}
+
+static int
+scterm_ioctl(scr_stat *scp, struct tty *tp, u_long cmd, caddr_t data,
+	     int flag, struct proc *p)
+{
+	term_stat *tcp = scp->ts;
+	vid_info_t *vi;
+
+	switch (cmd) {
+	case GIO_ATTR:      	/* get current attributes */
+		/* FIXME: */
+		*(int*)data = (tcp->cur_attr >> 8) & 0xff;
+		return 0;
+	case CONS_GETINFO:  	/* get current (virtual) console info */
+		vi = (vid_info_t *)data;
+		if (vi->size != sizeof(struct vid_info))
+			return EINVAL;
+		vi->mv_norm.fore = tcp->std_color.fg;
+		vi->mv_norm.back = tcp->std_color.bg;
+		vi->mv_rev.fore = tcp->rev_color.fg;
+		vi->mv_rev.back = tcp->rev_color.bg;
+		/*
+		 * The other fields are filled by the upper routine. XXX
+		 */
+		return ENOIOCTL;
+	}
+	return ENOIOCTL;
+}
+
+static int
+scterm_reset(scr_stat *scp, int code)
+{
+	/* FIXME */
+	return 0;
+}
+
+static void
+scterm_default_attr(scr_stat *scp, int color, int rev_color)
+{
+	term_stat *tcp = scp->ts;
+
+	tcp->dflt_std_color.fg = color & 0x0f;
+	tcp->dflt_std_color.bg = (color >> 4) & 0x0f;
+	tcp->dflt_rev_color.fg = rev_color & 0x0f;
+	tcp->dflt_rev_color.bg = (rev_color >> 4) & 0x0f;
+	tcp->std_color = tcp->dflt_std_color;
+	tcp->rev_color = tcp->dflt_rev_color;
+	tcp->cur_color = tcp->std_color;
+	tcp->cur_attr = mask2attr(tcp);
+}
+
+static void
+scterm_clear(scr_stat *scp)
+{
+	term_stat *tcp = scp->ts;
+
+	sc_move_cursor(scp, 0, 0);
+	sc_vtb_clear(&scp->vtb, scp->sc->scr_map[0x20], tcp->cur_attr);
+	mark_all(scp);
+}
+
+static void
+scterm_notify(scr_stat *scp, int event)
+{
+	switch (event) {
+	case SC_TE_NOTIFY_VTSWITCH_IN:
+		break;
+	case SC_TE_NOTIFY_VTSWITCH_OUT:
+		break;
+	}
+}
+
+static int
+scterm_input(scr_stat *scp, int c, struct tty *tp)
+{
+	return FALSE;
+}
+
+/*
+ * Calculate hardware attributes word using logical attributes mask and
+ * hardware colors
+ */
+
+/* FIXME */
+static int
+mask2attr(term_stat *tcp)
+{
+	int attr, mask = tcp->attr_mask;
+
+	if (mask & REVERSE_ATTR) {
+		attr = ((mask & FG_CHANGED) ?
+			tcp->cur_color.bg : tcp->rev_color.fg) |
+			(((mask & BG_CHANGED) ?
+			tcp->cur_color.fg : tcp->rev_color.bg) << 4);
+	} else
+		attr = tcp->cur_color.fg | (tcp->cur_color.bg << 4);
+
+	/* XXX: underline mapping for Hercules adapter can be better */
+	if (mask & (BOLD_ATTR | UNDERLINE_ATTR))
+		attr ^= 0x08;
+	if (mask & BLINK_ATTR)
+		attr ^= 0x80;
+
+	return (attr << 8);
+}
+
+#endif /* SC_DUMB_TERMINAL */
+
+#endif /* NSC > 0 */
diff --git a/sys/dev/syscons/scterm.c b/sys/dev/syscons/scterm.c
new file mode 100644
index 000000000000..c6359930dad8
--- /dev/null
+++ b/sys/dev/syscons/scterm.c
@@ -0,0 +1,128 @@
+/*-
+ * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include "sc.h"
+#include "opt_syscons.h"
+
+#if NSC > 0
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/consio.h>
+
+#include <dev/syscons/syscons.h>
+#include <dev/syscons/sctermvar.h>
+
+/* exported subroutines */
+
+void
+sc_move_cursor(scr_stat *scp, int x, int y)
+{
+	if (x < 0)
+		x = 0;
+	if (y < 0)
+		y = 0;
+	if (x >= scp->xsize)
+		x = scp->xsize - 1;
+	if (y >= scp->ysize)
+		y = scp->ysize - 1;
+	scp->xpos = x;
+	scp->ypos = y;
+	scp->cursor_pos = scp->ypos*scp->xsize + scp->xpos;
+}
+
+void
+sc_clear_screen(scr_stat *scp)
+{
+	(*scp->tsw->te_clear)(scp);
+	scp->cursor_oldpos = scp->cursor_pos;
+	sc_remove_cutmarking(scp);
+}
+
+/* terminal emulator manager routines */
+
+static LIST_HEAD(, sc_term_sw) sc_term_list = 
+	LIST_HEAD_INITIALIZER(sc_term_list);
+
+int
+sc_term_add(sc_term_sw_t *sw)
+{
+	LIST_INSERT_HEAD(&sc_term_list, sw, link);
+	return 0;
+}
+
+int
+sc_term_remove(sc_term_sw_t *sw)
+{
+	LIST_REMOVE(sw, link);
+	return 0;
+}
+
+sc_term_sw_t
+*sc_term_match(char *name)
+{
+	sc_term_sw_t **list;
+	sc_term_sw_t *p;
+
+	if (!LIST_EMPTY(&sc_term_list)) {
+		LIST_FOREACH(p, &sc_term_list, link) {
+			if ((strcmp(name, p->te_name) == 0)
+			    || (strcmp(name, "*") == 0)) {
+				return p;
+			}
+		}
+	} else {
+		list = (sc_term_sw_t **)scterm_set.ls_items;
+		while ((p = *list++) != NULL) {
+			if ((strcmp(name, p->te_name) == 0)
+			    || (strcmp(name, "*") == 0)) {
+				return p;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+sc_term_sw_t
+*sc_term_match_by_number(int index)
+{
+	sc_term_sw_t *p;
+
+	if (index <= 0)
+		return NULL;
+	LIST_FOREACH(p, &sc_term_list, link) {
+		if (--index <= 0)
+			return p;
+	}
+
+	return NULL;
+}
+
+#endif /* NSC > 0 */
diff --git a/sys/dev/syscons/sctermvar.h b/sys/dev/syscons/sctermvar.h
new file mode 100644
index 000000000000..2ef75f069157
--- /dev/null
+++ b/sys/dev/syscons/sctermvar.h
@@ -0,0 +1,437 @@
+/*-
+ * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _DEV_SYSCONS_SCTERMVAR_H_
+#define _DEV_SYSCONS_SCTERMVAR_H_
+
+/*
+ * building blocks for terminal emulator modules.
+ */
+
+static __inline void	sc_term_ins_line(scr_stat *scp, int y, int n, int ch,
+					 int attr, int tail);
+static __inline void	sc_term_del_line(scr_stat *scp, int y, int n, int ch,
+					 int attr, int tail);
+static __inline void	sc_term_ins_char(scr_stat *scp, int n, int ch,
+					 int attr);
+static __inline void	sc_term_del_char(scr_stat *scp, int n, int ch,
+					 int attr);
+static __inline void	sc_term_col(scr_stat *scp, int n);
+static __inline void	sc_term_row(scr_stat *scp, int n);
+static __inline void	sc_term_up(scr_stat *scp, int n, int head);
+static __inline void	sc_term_down(scr_stat *scp, int n, int tail);
+static __inline void	sc_term_left(scr_stat *scp, int n);
+static __inline void	sc_term_right(scr_stat *scp, int n);
+static __inline void	sc_term_up_scroll(scr_stat *scp, int n, int ch,
+					  int attr, int head, int tail);
+static __inline void	sc_term_down_scroll(scr_stat *scp, int n, int ch,
+					    int attr, int head, int tail);
+static __inline void	sc_term_clr_eos(scr_stat *scp, int n, int ch, int attr);
+static __inline void	sc_term_clr_eol(scr_stat *scp, int n, int ch, int attr);
+static __inline void	sc_term_tab(scr_stat *scp, int n);
+static __inline void	sc_term_backtab(scr_stat *scp, int n);
+static __inline void	sc_term_respond(scr_stat *scp, u_char *s);
+static __inline void	sc_term_gen_print(scr_stat *scp, u_char **buf, int *len,
+					  int attr);
+static __inline void	sc_term_gen_scroll(scr_stat *scp, int ch, int attr);
+
+static __inline void
+sc_term_ins_line(scr_stat *scp, int y, int n, int ch, int attr, int tail)
+{
+	if (tail <= 0)
+		tail = scp->ysize;
+	if (n < 1)
+		n = 1;
+	if (n > tail - y)
+		n = tail - y;
+	sc_vtb_ins(&scp->vtb, y*scp->xsize, n*scp->xsize, ch, attr);
+	mark_for_update(scp, y*scp->xsize);
+	mark_for_update(scp, scp->xsize*tail - 1);
+}
+
+static __inline void
+sc_term_del_line(scr_stat *scp, int y, int n, int ch, int attr, int tail)
+{
+	if (tail <= 0)
+		tail = scp->ysize;
+	if (n < 1)
+		n = 1;
+	if (n > tail - y)
+		n = tail - y;
+	sc_vtb_delete(&scp->vtb, y*scp->xsize, n*scp->xsize, ch, attr);
+	mark_for_update(scp, y*scp->xsize);
+	mark_for_update(scp, scp->xsize*tail - 1);
+}
+
+static __inline void
+sc_term_ins_char(scr_stat *scp, int n, int ch, int attr)
+{
+	int count;
+
+	if (n < 1)
+		n = 1;
+	if (n > scp->xsize - scp->xpos)
+		n = scp->xsize - scp->xpos;
+	count = scp->xsize - (scp->xpos + n);
+	sc_vtb_move(&scp->vtb, scp->cursor_pos, scp->cursor_pos + n, count);
+	sc_vtb_erase(&scp->vtb, scp->cursor_pos, n, ch, attr);
+	mark_for_update(scp, scp->cursor_pos);
+	mark_for_update(scp, scp->cursor_pos + n + count - 1);
+}
+
+static __inline void
+sc_term_del_char(scr_stat *scp, int n, int ch, int attr)
+{
+	int count;
+
+	if (n < 1)
+		n = 1;
+	if (n > scp->xsize - scp->xpos)
+		n = scp->xsize - scp->xpos;
+	count = scp->xsize - (scp->xpos + n);
+	sc_vtb_move(&scp->vtb, scp->cursor_pos + n, scp->cursor_pos, count);
+	sc_vtb_erase(&scp->vtb, scp->cursor_pos + count, n, ch, attr);
+	mark_for_update(scp, scp->cursor_pos);
+	mark_for_update(scp, scp->cursor_pos + n + count - 1);
+}
+
+static __inline void
+sc_term_col(scr_stat *scp, int n)
+{
+	if (n < 1)
+		n = 1;
+	sc_move_cursor(scp, n - 1, scp->ypos);
+}
+
+static __inline void
+sc_term_row(scr_stat *scp, int n)
+{
+	if (n < 1)
+		n = 1;
+	sc_move_cursor(scp, scp->xpos, n - 1);
+}
+
+static __inline void
+sc_term_up(scr_stat *scp, int n, int head)
+{
+	if (n < 1)
+		n = 1;
+	n = imin(n, scp->ypos - head);
+	if (n <= 0)
+		return;
+	sc_move_cursor(scp, scp->xpos, scp->ypos - n);
+}
+
+static __inline void
+sc_term_down(scr_stat *scp, int n, int tail)
+{
+	if (tail <= 0)
+		tail = scp->ysize;
+	if (n < 1)
+		n = 1;
+	n = imin(n, tail - scp->ypos - 1);
+	if (n <= 0)
+		return;
+	sc_move_cursor(scp, scp->xpos, scp->ypos + n);
+}
+
+static __inline void
+sc_term_left(scr_stat *scp, int n)
+{
+	if (n < 1)
+		n = 1;
+	sc_move_cursor(scp, scp->xpos - n, scp->ypos);
+}
+
+static __inline void
+sc_term_right(scr_stat *scp, int n)
+{
+	if (n < 1)
+		n = 1;
+	sc_move_cursor(scp, scp->xpos + n, scp->ypos);
+}
+
+static __inline void
+sc_term_up_scroll(scr_stat *scp, int n, int ch, int attr, int head, int tail)
+{
+	if (tail <= 0)
+		tail = scp->ysize;
+	if (n < 1)
+		n = 1;
+	if (n <= scp->ypos - head) {
+		sc_move_cursor(scp, scp->xpos, scp->ypos - n);
+	} else {
+		sc_term_ins_line(scp, head, n - (scp->ypos - head), 
+				 ch, attr, tail);
+		sc_move_cursor(scp, scp->xpos, head);
+	}
+}
+
+static __inline void
+sc_term_down_scroll(scr_stat *scp, int n, int ch, int attr, int head, int tail)
+{
+	if (tail <= 0)
+		tail = scp->ysize;
+	if (n < 1)
+		n = 1;
+	if (n < tail - scp->ypos) {
+		sc_move_cursor(scp, scp->xpos, scp->ypos + n);
+	} else {
+		sc_term_del_line(scp, head, n - (tail - scp->ypos) + 1, 
+				 ch, attr, tail);
+		sc_move_cursor(scp, scp->xpos, tail - 1);
+	}
+}
+
+static __inline void
+sc_term_clr_eos(scr_stat *scp, int n, int ch, int attr)
+{
+	switch (n) {
+	case 0: /* clear form cursor to end of display */
+		sc_vtb_erase(&scp->vtb, scp->cursor_pos,
+			     scp->xsize*scp->ysize - scp->cursor_pos,
+			     ch, attr);
+		mark_for_update(scp, scp->cursor_pos);
+		mark_for_update(scp, scp->xsize*scp->ysize - 1);
+		sc_remove_cutmarking(scp);
+		break;
+	case 1: /* clear from beginning of display to cursor */
+		sc_vtb_erase(&scp->vtb, 0, scp->cursor_pos, ch, attr);
+		mark_for_update(scp, 0);
+		mark_for_update(scp, scp->cursor_pos);
+		sc_remove_cutmarking(scp);
+		break;
+	case 2: /* clear entire display */
+		sc_vtb_erase(&scp->vtb, 0, scp->xsize*scp->ysize, ch, attr);
+		mark_for_update(scp, 0);
+		mark_for_update(scp, scp->xsize*scp->ysize - 1);
+		sc_remove_cutmarking(scp);
+		break;
+	}
+}
+
+static __inline void
+sc_term_clr_eol(scr_stat *scp, int n, int ch, int attr)
+{
+	switch (n) {
+	case 0: /* clear form cursor to end of line */
+		sc_vtb_erase(&scp->vtb, scp->cursor_pos,
+			     scp->xsize - scp->xpos, ch, attr);
+		mark_for_update(scp, scp->cursor_pos);
+		mark_for_update(scp, scp->cursor_pos +
+				scp->xsize - 1 - scp->xpos);
+		break;
+	case 1: /* clear from beginning of line to cursor */
+		sc_vtb_erase(&scp->vtb, scp->cursor_pos - scp->xpos,
+			     scp->xpos + 1, ch, attr);
+		mark_for_update(scp, scp->ypos*scp->xsize);
+		mark_for_update(scp, scp->cursor_pos);
+		break;
+	case 2: /* clear entire line */
+		sc_vtb_erase(&scp->vtb, scp->cursor_pos - scp->xpos,
+			     scp->xsize, ch, attr);
+		mark_for_update(scp, scp->ypos*scp->xsize);
+		mark_for_update(scp, (scp->ypos + 1)*scp->xsize - 1);
+		break;
+	}
+}
+
+static __inline void
+sc_term_tab(scr_stat *scp, int n)
+{
+	int i;
+
+	if (n < 1)
+		n = 1;
+	i = (scp->xpos & ~7) + 8*n;
+	if (i >= scp->xsize)
+		sc_move_cursor(scp, 0, scp->ypos + 1);
+	else
+		sc_move_cursor(scp, i, scp->ypos);
+}
+
+static __inline void
+sc_term_backtab(scr_stat *scp, int n)
+{
+	int i;
+
+	if (n < 1)
+		n = 1;
+	if ((i = scp->xpos & ~7) == scp->xpos)
+		i -= 8*n;
+	else
+		i -= 8*(n - 1);
+	if (i < 0)
+		i = 0;
+	sc_move_cursor(scp, i, scp->ypos);
+}
+
+static __inline void
+sc_term_respond(scr_stat *scp, u_char *s)
+{
+	sc_paste(scp, s, strlen(s));	/* XXX: not correct, don't use rmap */
+}
+
+static __inline void
+sc_term_gen_print(scr_stat *scp, u_char **buf, int *len, int attr)
+{
+	vm_offset_t p;
+	u_char *ptr;
+	u_char *map;
+ 	int cnt;
+	int l;
+	int i;
+
+	ptr = *buf;
+	l = *len;
+
+	if (PRINTABLE(*ptr)) {
+		p = sc_vtb_pointer(&scp->vtb, scp->cursor_pos);
+		map = scp->sc->scr_map;
+
+		cnt = imin(l, scp->xsize - scp->xpos);
+		i = cnt;
+		do {
+			/*
+			 * gcc-2.6.3 generates poor (un)sign extension code.
+			 * Casting the pointers in the following to volatile 
+			 * should have no effect, but in fact speeds up this 
+			 * inner loop from 26 to 18 cycles (+ cache misses) 
+			 * on i486's.
+			 * XXX: out of date?
+			 */
+#define	UCVP(ucp)	((u_char volatile *)(ucp))
+			p = sc_vtb_putchar(&scp->vtb, p,
+					   UCVP(map)[*UCVP(ptr)], attr);
+			++ptr;
+			--i;
+		} while ((i > 0) && PRINTABLE(*ptr));
+
+		l -= cnt - i;
+		mark_for_update(scp, scp->cursor_pos);
+		scp->cursor_pos += cnt - i;
+		mark_for_update(scp, scp->cursor_pos - 1);
+		scp->xpos += cnt - i;
+
+		if (scp->xpos >= scp->xsize) {
+			scp->xpos = 0;
+			scp->ypos++;
+			/* we may have to scroll the screen */
+		}
+	} else {
+		switch(*ptr) {
+		case 0x07:
+			sc_bell(scp, scp->bell_pitch, scp->bell_duration);
+			break;
+
+		case 0x08:	/* non-destructive backspace */
+			/* XXX */
+			if (scp->cursor_pos > 0) {
+#if 0
+				mark_for_update(scp, scp->cursor_pos);
+				scp->cursor_pos--;
+				mark_for_update(scp, scp->cursor_pos);
+#else
+				scp->cursor_pos--;
+#endif
+				if (scp->xpos > 0) {
+					scp->xpos--;
+				} else {
+					scp->xpos += scp->xsize - 1;
+					scp->ypos--;
+				}
+			}
+			break;
+
+		case 0x09:	/* non-destructive tab */
+			sc_term_tab(scp, 1);
+			/* we may have to scroll the screen */
+#if 0
+			mark_for_update(scp, scp->cursor_pos);
+			scp->cursor_pos += (8 - scp->xpos % 8u);
+			mark_for_update(scp, scp->cursor_pos);
+			scp->xpos += (8 - scp->xpos % 8u);
+			if (scp->xpos >= scp->xsize) {
+				scp->xpos = 0;
+				scp->ypos++;
+			}
+#endif
+			break;
+
+		case 0x0a:	/* newline, same pos */
+#if 0
+			mark_for_update(scp, scp->cursor_pos);
+			scp->cursor_pos += scp->xsize;
+			mark_for_update(scp, scp->cursor_pos);
+#else
+			scp->cursor_pos += scp->xsize;
+			/* we may have to scroll the screen */
+#endif
+			scp->ypos++;
+			break;
+
+		case 0x0c:	/* form feed, clears screen */
+			sc_clear_screen(scp);
+			break;
+
+		case 0x0d:	/* return, return to pos 0 */
+#if 0
+			mark_for_update(scp, scp->cursor_pos);
+			scp->cursor_pos -= scp->xpos;
+			mark_for_update(scp, scp->cursor_pos);
+#else
+			scp->cursor_pos -= scp->xpos;
+#endif
+			scp->xpos = 0;
+			break;
+		}
+		ptr++; l--;
+	}
+
+	*buf = ptr;
+	*len = l;
+}
+
+static __inline void
+sc_term_gen_scroll(scr_stat *scp, int ch, int attr)
+{
+	/* do we have to scroll ?? */
+	if (scp->cursor_pos >= scp->ysize*scp->xsize) {
+		sc_remove_cutmarking(scp);		/* XXX */
+#ifndef SC_NO_HISTORY
+		if (scp->history != NULL)
+			sc_hist_save_one_line(scp, 0);	/* XXX */
+#endif
+		sc_vtb_delete(&scp->vtb, 0, scp->xsize, ch, attr);
+		scp->cursor_pos -= scp->xsize;
+		scp->ypos--;
+		mark_all(scp);
+	}
+}
+
+#endif /* _DEV_SYSCONS_SCTERMVAR_H_ */
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index 7290558f8159..afdd073627a8 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -38,7 +38,6 @@
 #include <sys/kernel.h>
 
 #include <machine/console.h>
-#include <machine/md_var.h>
 
 #include <dev/fb/fbreg.h>
 #include <dev/fb/vgareg.h>
@@ -83,6 +82,8 @@ static vr_draw_border_t		vga_grborder;
 
 static void			vga_nop(scr_stat *scp, ...);
 
+static struct linker_set	vga_set;
+
 static sc_rndr_sw_t txtrndrsw = {
 	vga_txtclear,
 	vga_txtborder,
@@ -93,10 +94,10 @@ static sc_rndr_sw_t txtrndrsw = {
 	(vr_set_mouse_t *)vga_nop,
 	vga_txtmouse,
 };
-RENDERER(mda, 0, txtrndrsw);
-RENDERER(cga, 0, txtrndrsw);
-RENDERER(ega, 0, txtrndrsw);
-RENDERER(vga, 0, txtrndrsw);
+RENDERER(mda, 0, txtrndrsw, vga_set);
+RENDERER(cga, 0, txtrndrsw, vga_set);
+RENDERER(ega, 0, txtrndrsw, vga_set);
+RENDERER(vga, 0, txtrndrsw, vga_set);
 
 #ifdef SC_PIXEL_MODE
 static sc_rndr_sw_t egarndrsw = {
@@ -109,7 +110,7 @@ static sc_rndr_sw_t egarndrsw = {
 	(vr_set_mouse_t *)vga_nop,
 	vga_pxlmouse,
 };
-RENDERER(ega, PIXEL_MODE, egarndrsw);
+RENDERER(ega, PIXEL_MODE, egarndrsw, vga_set);
 
 static sc_rndr_sw_t vgarndrsw = {
 	vga_pxlclear,
@@ -121,7 +122,7 @@ static sc_rndr_sw_t vgarndrsw = {
 	(vr_set_mouse_t *)vga_nop,
 	vga_pxlmouse,
 };
-RENDERER(vga, PIXEL_MODE, vgarndrsw);
+RENDERER(vga, PIXEL_MODE, vgarndrsw, vga_set);
 #endif /* SC_PIXEL_MODE */
 
 #ifndef SC_NO_MODE_CHANGE
@@ -135,11 +136,13 @@ static sc_rndr_sw_t grrndrsw = {
 	(vr_set_mouse_t *)vga_nop,
 	(vr_draw_mouse_t *)vga_nop,
 };
-RENDERER(cga, GRAPHICS_MODE, grrndrsw);
-RENDERER(ega, GRAPHICS_MODE, grrndrsw);
-RENDERER(vga, GRAPHICS_MODE, grrndrsw);
+RENDERER(cga, GRAPHICS_MODE, grrndrsw, vga_set);
+RENDERER(ega, GRAPHICS_MODE, grrndrsw, vga_set);
+RENDERER(vga, GRAPHICS_MODE, grrndrsw, vga_set);
 #endif /* SC_NO_MODE_CHANGE */
 
+RENDERER_MODULE(vga, vga_set);
+
 #ifndef SC_NO_CUTPASTE
 static u_short mouse_and_mask[16] = {
 	0xc000, 0xe000, 0xf000, 0xf800, 0xfc00, 0xfe00, 0xff00, 0xff80,
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 0923a7be4ec1..3c03ee573f86 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -38,9 +38,6 @@
 #include <sys/tty.h>
 #include <sys/kernel.h>
 
-#include <vm/vm.h>
-#include <vm/pmap.h>
-
 #include <machine/console.h>
 
 #include <dev/fb/fbreg.h>
@@ -131,7 +128,6 @@ sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
 		 int fontsize)
 {
     video_info_t info;
-    sc_rndr_sw_t *rndr;
     u_char *font;
     int prev_ysize;
     int error;
@@ -183,8 +179,7 @@ sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
 	return error;
     }
 
-    rndr = sc_render_match(scp, scp->sc->adp, 0);
-    if (rndr == NULL) {
+    if (sc_render_match(scp, scp->sc->adp->va_name, 0) == NULL) {
 	splx(s);
 	return ENODEV;
     }
@@ -213,13 +208,13 @@ sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
 
     /* allocate buffers */
     sc_alloc_scr_buffer(scp, TRUE, TRUE);
+    sc_init_emulator(scp, NULL);
 #ifndef SC_NO_CUTPASTE
     sc_alloc_cut_buffer(scp, FALSE);
 #endif
 #ifndef SC_NO_HISTORY
     sc_alloc_history_buffer(scp, 0, prev_ysize, FALSE);
 #endif
-    scp->rndr = rndr;
     splx(s);
 
     if (scp == scp->sc->cur_scp)
@@ -247,7 +242,6 @@ sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode)
     return ENODEV;
 #else
     video_info_t info;
-    sc_rndr_sw_t *rndr;
     int error;
     int s;
 
@@ -261,8 +255,7 @@ sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode)
 	return error;
     }
 
-    rndr = sc_render_match(scp, scp->sc->adp, GRAPHICS_MODE);
-    if (rndr == NULL) {
+    if (sc_render_match(scp, scp->sc->adp->va_name, GRAPHICS_MODE) == NULL) {
 	splx(s);
 	return ENODEV;
     }
@@ -285,7 +278,7 @@ sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode)
     /* move the mouse cursor at the center of the screen */
     sc_mouse_move(scp, scp->xpixel / 2, scp->ypixel / 2);
 #endif
-    scp->rndr = rndr;
+    sc_init_emulator(scp, NULL);
     splx(s);
 
     if (scp == scp->sc->cur_scp)
@@ -314,7 +307,6 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize,
     return ENODEV;
 #else
     video_info_t info;
-    sc_rndr_sw_t *rndr;
     u_char *font;
     int prev_ysize;
     int error;
@@ -381,12 +373,18 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize,
 	return error;
     }
 
-    rndr = sc_render_match(scp, scp->sc->adp, PIXEL_MODE);
-    if (rndr == NULL) {
+    if (sc_render_match(scp, scp->sc->adp->va_name, PIXEL_MODE) == NULL) {
 	splx(s);
 	return ENODEV;
     }
 
+#if 0
+    if (scp->tsw)
+	(*scp->tsw->te_term)(scp, scp->ts);
+    scp->tsw = NULL;
+    scp->ts = NULL;
+#endif
+
     /* set up scp */
 #ifndef SC_NO_HISTORY
     if (scp->history != NULL)
@@ -404,17 +402,17 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize,
 
     /* allocate buffers */
     sc_alloc_scr_buffer(scp, TRUE, TRUE);
+    sc_init_emulator(scp, NULL);
 #ifndef SC_NO_CUTPASTE
     sc_alloc_cut_buffer(scp, FALSE);
 #endif
 #ifndef SC_NO_HISTORY
     sc_alloc_history_buffer(scp, 0, prev_ysize, FALSE);
 #endif
-    scp->rndr = rndr;
     splx(s);
 
     if (scp == scp->sc->cur_scp) {
-	set_border(scp, scp->border);
+	sc_set_border(scp, scp->border);
 	sc_set_cursor_image(scp);
     }
 
@@ -433,24 +431,6 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize,
 #endif /* SC_PIXEL_MODE */
 }
 
-sc_rndr_sw_t
-*sc_render_match(scr_stat *scp, video_adapter_t *adp, int mode)
-{
-    const sc_renderer_t **list;
-    const sc_renderer_t *p;
-
-    list = (const sc_renderer_t **)scrndr_set.ls_items;
-    while ((p = *list++) != NULL) {
-	if ((strcmp(p->name, adp->va_name) == 0)
-	    && (mode == p->mode)) {
-	    scp->status &= ~(VR_CURSOR_ON | VR_CURSOR_BLINK);
-	    return p->rndrsw;
-	}
-    }
-
-    return NULL;
-}
-
 #define fb_ioctl(a, c, d)		\
 	(((a) == NULL) ? ENODEV : 	\
 			 (*vidsw[(a)->va_index]->ioctl)((a), (c), (caddr_t)(d)))
@@ -666,11 +646,11 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
 		 * Don't load fonts for now... XXX
 		 */
 		if (scp->sc->fonts_loaded & FONT_8)
-		    copy_font(scp, LOAD, 8, scp->sc->font_8);
+		    sc_load_font(scp, 0, 8, scp->sc->font_8, 0, 256);
 		if (scp->sc->fonts_loaded & FONT_14)
-		    copy_font(scp, LOAD, 14, scp->sc->font_14);
+		    sc_load_font(scp, 0, 14, scp->sc->font_14, 0, 256);
 		if (scp->sc->fonts_loaded & FONT_16)
-		    copy_font(scp, LOAD, 16, scp->sc->font_16);
+		    sc_load_font(scp, 0, 16, scp->sc->font_16, 0, 256);
 	    }
 #endif /* SC_NO_FONT_LOADING */
 #endif
@@ -779,11 +759,60 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
     case KDSBORDER:     	/* set border color of this (virtual) console */
 	scp->border = *data;
 	if (scp == scp->sc->cur_scp)
-	    set_border(scp, scp->border);
+	    sc_set_border(scp, scp->border);
 	return 0;
     }
 
     return ENOIOCTL;
 }
 
+static LIST_HEAD(, sc_renderer) sc_rndr_list = 
+	LIST_HEAD_INITIALIZER(sc_rndr_list);
+
+int
+sc_render_add(sc_renderer_t *rndr)
+{
+	LIST_INSERT_HEAD(&sc_rndr_list, rndr, link);
+	return 0;
+}
+
+int
+sc_render_remove(sc_renderer_t *rndr)
+{
+	/*
+	LIST_REMOVE(rndr, link);
+	*/
+	return EBUSY;	/* XXX */
+}
+
+sc_rndr_sw_t
+*sc_render_match(scr_stat *scp, char *name, int mode)
+{
+	const sc_renderer_t **list;
+	const sc_renderer_t *p;
+
+	if (!LIST_EMPTY(&sc_rndr_list)) {
+		LIST_FOREACH(p, &sc_rndr_list, link) {
+			if ((strcmp(p->name, name) == 0)
+				&& (mode == p->mode)) {
+				scp->status &=
+				    ~(VR_CURSOR_ON | VR_CURSOR_BLINK);
+				return p->rndrsw;
+			}
+		}
+	} else {
+		list = (const sc_renderer_t **)scrndr_set.ls_items;
+		while ((p = *list++) != NULL) {
+			if ((strcmp(p->name, name) == 0)
+				&& (mode == p->mode)) {
+				scp->status &=
+				    ~(VR_CURSOR_ON | VR_CURSOR_BLINK);
+				return p->rndrsw;
+			}
+		}
+	}
+
+	return NULL;
+}
+
 #endif /* NSC > 0 */
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index eebeb23182de..aac9024814b5 100644
--- a/sys/dev/syscons/scvtb.c
+++ b/sys/dev/syscons/scvtb.c
@@ -33,7 +33,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 
 #include <machine/console.h>
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index 093e564bef13..e4277e3beee2 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -79,7 +79,7 @@ snake_saver(video_adapter_t *adp, int blank)
 			sc_vtb_clear(&scp->scr, sc->scr_map[0x20],
 				     (FG_LIGHTGREY | BG_BLACK) << 8);
 			(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
-			set_border(scp, 0);
+			sc_set_border(scp, 0);
 			dirx = (scp->xpos ? 1 : -1);
 			diry = (scp->ypos ?
 				scp->xsize : -scp->xsize);
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 645e4fd3c354..27e992133ee7 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -85,7 +85,7 @@ star_saver(video_adapter_t *adp, int blank)
 			sc_vtb_clear(&scp->scr, sc->scr_map[0x20],
 				     (FG_LIGHTGREY | BG_BLACK) << 8);
 			(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
-			set_border(scp, 0);
+			sc_set_border(scp, 0);
 			blanked = TRUE;
 			for(i=0; i<NUM_STARS; i++) {
 				stars[i][0] =
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 64ecd738535f..6d46128a4efb 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -73,24 +73,25 @@
 
 #define KEYCODE_BS		0x0e		/* "<-- Backspace" key, XXX */
 
+typedef struct default_attr {
+	int		std_color;		/* normal hardware color */
+	int		rev_color;		/* reverse hardware color */
+} default_attr;
+
 static default_attr user_default = {
-    SC_NORM_ATTR << 8,
-    SC_NORM_REV_ATTR << 8,
+    SC_NORM_ATTR,
+    SC_NORM_REV_ATTR,
 };
 
 static default_attr kernel_default = {
-    SC_KERNEL_CONS_ATTR << 8,
-    SC_KERNEL_CONS_REV_ATTR << 8,
+    SC_KERNEL_CONS_ATTR,
+    SC_KERNEL_CONS_REV_ATTR,
 };
 
 static	int		sc_console_unit = -1;
 static  scr_stat    	*sc_console;
 static	struct tty	*sc_console_tty;
-#ifndef SC_NO_SYSMOUSE
-static	struct tty	*sc_mouse_tty;
-#endif
-static  term_stat   	kernel_console;
-static  default_attr    *current_default;
+static	void		*kernel_console_ts;
 
 static  char        	init_done = COLD;
 static  char		shutdown_in_progress = FALSE;
@@ -119,7 +120,6 @@ static	int		enable_panic_key;
 SYSCTL_INT(_machdep, OID_AUTO, enable_panic_key, CTLFLAG_RW, &enable_panic_key,
 	   0, "");
 
-#define SC_MOUSE 	128
 #define SC_CONSOLECTL	255
 
 #define VIRTUAL_TTY(sc, x) (SC_DEV((sc), (x))->si_tty)
@@ -134,7 +134,6 @@ static int scdevtounit(dev_t dev);
 static kbd_callback_func_t sckbdevent;
 static int scparam(struct tty *tp, struct termios *t);
 static void scstart(struct tty *tp);
-static void scmousestart(struct tty *tp);
 static void scinit(int unit, int flags);
 #if __i386__
 static void scterm(int unit, int flags);
@@ -165,23 +164,15 @@ static int wait_scrn_saver_stop(sc_softc_t *sc);
 #define scsplash_stick(stick)
 #endif /* NSPLASH */
 
-static int switch_scr(sc_softc_t *sc, u_int next_scr);
 static int do_switch_scr(sc_softc_t *sc, int s);
 static int vt_proc_alive(scr_stat *scp);
 static int signal_vt_rel(scr_stat *scp);
 static int signal_vt_acq(scr_stat *scp);
 static void exchange_scr(sc_softc_t *sc);
-static void scan_esc(scr_stat *scp, u_char c);
-static void ansi_put(scr_stat *scp, u_char *buf, int len);
-static void draw_cursor_image(scr_stat *scp);
-static void remove_cursor_image(scr_stat *scp);
 static void update_cursor_image(scr_stat *scp);
-static void move_crsr(scr_stat *scp, int x, int y);
-static int mask2attr(struct term_stat *term);
 static int save_kbd_state(scr_stat *scp);
 static int update_kbd_state(scr_stat *scp, int state, int mask);
 static int update_kbd_leds(scr_stat *scp, int which);
-static void do_bell(scr_stat *scp, int pitch, int duration);
 static timeout_t blink_screen;
 
 #define	CDEV_MAJOR	12
@@ -300,12 +291,33 @@ sc_attach_unit(int unit, int flags)
     int vc;
     dev_t dev;
 
-    scmeminit(NULL);		/* XXX */
-
     flags &= ~SC_KERNEL_CONSOLE;
-    if (sc_console_unit == unit)
+
+    if (sc_console_unit == unit) {
+	/*
+	 * If this unit is being used as the system console, we need to
+	 * adjust some variables and buffers before and after scinit().
+	 */
+	/* assert(sc_console != NULL) */
 	flags |= SC_KERNEL_CONSOLE;
-    scinit(unit, flags);
+	scmeminit(NULL);
+
+	scinit(unit, flags);
+
+	if (sc_console->tsw->te_size > 0) {
+	    /* assert(sc_console->ts != NULL); */
+	    kernel_console_ts = sc_console->ts;
+	    sc_console->ts = malloc(sc_console->tsw->te_size,
+				    M_DEVBUF, M_WAITOK);
+	    bcopy(kernel_console_ts, sc_console->ts, sc_console->tsw->te_size);
+    	    (*sc_console->tsw->te_default_attr)(sc_console,
+						user_default.std_color,
+						user_default.rev_color);
+	}
+    } else {
+	scinit(unit, flags);
+    }
+
     sc = sc_get_softc(unit, flags & SC_KERNEL_CONSOLE);
     sc->config = flags;
     scp = SC_STAT(sc->dev[0]);
@@ -348,7 +360,10 @@ sc_attach_unit(int unit, int flags)
     	if (sc->adapter >= 0)
 	    printf(" fb%d", sc->adapter);
 	if (sc->keyboard >= 0)
-	    printf(" kbd%d", sc->keyboard);
+	    printf(", kbd%d", sc->keyboard);
+	if (scp->tsw)
+	    printf(", terminal emulator: %s (%s)",
+		   scp->tsw->te_name, scp->tsw->te_desc);
 	printf("\n");
     }
 
@@ -368,12 +383,6 @@ sc_attach_unit(int unit, int flags)
 	 */
     }
 
-#ifndef SC_NO_SYSMOUSE
-    dev = make_dev(&sc_cdevsw, SC_MOUSE,
-		   UID_ROOT, GID_WHEEL, 0600, "sysmouse");
-    dev->si_tty = sc_mouse_tty = ttymalloc(sc_mouse_tty);
-    /* sysmouse doesn't have scr_stat */
-#endif /* SC_NO_SYSMOUSE */
     dev = make_dev(&sc_cdevsw, SC_CONSOLECTL,
 		   UID_ROOT, GID_WHEEL, 0600, "consolectl");
     dev->si_tty = sc_console_tty = ttymalloc(sc_console_tty);
@@ -394,7 +403,7 @@ scmeminit(void *arg)
      * various buffers for the kernel console.
      */
 
-    if (sc_console_unit < 0)
+    if (sc_console_unit < 0)	/* sc_console == NULL */
 	return;
 
     /* copy the temporary buffer to the final buffer */
@@ -434,8 +443,6 @@ scdevtounit(dev_t dev)
 
     if (vty == SC_CONSOLECTL)
 	return ((sc_console != NULL) ? sc_console->sc->unit : -1);
-    else if (vty == SC_MOUSE)
-	return -1;
     else if ((vty < 0) || (vty >= MAXCONS*sc_max_unit()))
 	return -1;
     else
@@ -455,17 +462,12 @@ scopen(dev_t dev, int flag, int mode, struct proc *p)
     DPRINTF(5, ("scopen: dev:%d,%d, unit:%d, vty:%d\n",
 		major(dev), minor(dev), unit, SC_VTY(dev)));
 
-    /* sc == NULL, if SC_VTY(dev) == SC_MOUSE */
     sc = sc_get_softc(unit, (sc_console_unit == unit) ? SC_KERNEL_CONSOLE : 0);
-#ifndef SC_NO_SYSMOUSE
-    if ((SC_VTY(dev) != SC_MOUSE) && (sc == NULL))
-#else
     if (sc == NULL)
-#endif
 	return ENXIO;
 
     tp = dev->si_tty = ttymalloc(dev->si_tty);
-    tp->t_oproc = (SC_VTY(dev) == SC_MOUSE) ? scmousestart : scstart;
+    tp->t_oproc = scstart;
     tp->t_param = scparam;
     tp->t_stop = nottystop;
     tp->t_dev = dev;
@@ -485,10 +487,6 @@ scopen(dev_t dev, int flag, int mode, struct proc *p)
 	tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED;
 	scparam(tp, &tp->t_termios);
 	(*linesw[tp->t_line].l_modem)(tp, 1);
-#ifndef SC_NO_SYSMOUSE
-    	if (SC_VTY(dev) == SC_MOUSE)
-	    sc_mouse_set_level(0);	/* XXX */
-#endif
     }
     else
 	if (tp->t_state & TS_XCLUDE && suser(p))
@@ -496,19 +494,17 @@ scopen(dev_t dev, int flag, int mode, struct proc *p)
 
     error = (*linesw[tp->t_line].l_open)(dev, tp);
 
-    if (SC_VTY(dev) != SC_MOUSE) {
-	/* assert(sc != NULL) */
-	scp = SC_STAT(dev);
-	if (scp == NULL) {
-	    scp = SC_STAT(dev) = alloc_scp(sc, SC_VTY(dev));
-	    if (ISGRAPHSC(scp))
-		sc_set_pixel_mode(scp, NULL, COL, ROW, 16);
-	}
-	if (!tp->t_winsize.ws_col && !tp->t_winsize.ws_row) {
-	    tp->t_winsize.ws_col = scp->xsize;
-	    tp->t_winsize.ws_row = scp->ysize;
-	}
+    scp = SC_STAT(dev);
+    if (scp == NULL) {
+	scp = SC_STAT(dev) = alloc_scp(sc, SC_VTY(dev));
+	if (ISGRAPHSC(scp))
+	    sc_set_pixel_mode(scp, NULL, COL, ROW, 16);
+    }
+    if (!tp->t_winsize.ws_col && !tp->t_winsize.ws_row) {
+	tp->t_winsize.ws_col = scp->xsize;
+	tp->t_winsize.ws_row = scp->ysize;
     }
+
     return error;
 }
 
@@ -516,10 +512,10 @@ int
 scclose(dev_t dev, int flag, int mode, struct proc *p)
 {
     struct tty *tp = dev->si_tty;
-    struct scr_stat *scp;
+    scr_stat *scp;
     int s;
 
-    if ((SC_VTY(dev) != SC_CONSOLECTL) && (SC_VTY(dev) != SC_MOUSE)) {
+    if (SC_VTY(dev) != SC_CONSOLECTL) {
 	scp = SC_STAT(tp->t_dev);
 	/* were we in the middle of the VT switching process? */
 	DPRINTF(5, ("sc%d: scclose(), ", scp->sc->unit));
@@ -548,6 +544,7 @@ scclose(dev_t dev, int flag, int mode, struct proc *p)
 	    sc_vtb_destroy(&scp->vtb);
 	    sc_vtb_destroy(&scp->scr);
 	    sc_free_history_buffer(scp, scp->ysize);
+	    SC_STAT(dev) = NULL;
 	    free(scp, M_DEVBUF);
 	}
 #else
@@ -570,9 +567,8 @@ scclose(dev_t dev, int flag, int mode, struct proc *p)
 int
 scread(dev_t dev, struct uio *uio, int flag)
 {
-
     sc_touch_scrn_saver();
-    return(ttyread(dev, uio, flag));
+    return ttyread(dev, uio, flag);
 }
 
 static int
@@ -613,6 +609,9 @@ sckbdevent(keyboard_t *thiskbd, int event, void *arg)
 	    	|| !(cur_tty->t_state & TS_ISOPEN))
 		continue;
 
+	if ((*sc->cur_scp->tsw->te_input)(sc->cur_scp, c, cur_tty))
+	    continue;
+
 	switch (KEYFLAGS(c)) {
 	case 0x0000: /* normal key */
 	    (*linesw[cur_tty->t_line].l_rint)(KEYCHAR(c), cur_tty);
@@ -688,15 +687,6 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
     error = sc_mouse_ioctl(tp, cmd, data, flag, p);
     if (error != ENOIOCTL)
 	return error;
-    if (SC_VTY(dev) == SC_MOUSE) {
-	error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p);
-	if (error != ENOIOCTL)
-	    return error;
-	error = ttioctl(tp, cmd, data, flag);
-	if (error != ENOIOCTL)
-	    return error;
-	return ENOTTY;
-    }
 #endif
 
     scp = SC_STAT(tp->t_dev);
@@ -704,11 +694,17 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
     /* scp is sc_console, if SC_VTY(dev) == SC_CONSOLECTL. */
     sc = scp->sc;
 
+    if (scp->tsw) {
+	error = (*scp->tsw->te_ioctl)(scp, tp, cmd, data, flag, p);
+	if (error != ENOIOCTL)
+	    return error;
+    }
+
     switch (cmd) {  		/* process console hardware related ioctl's */
 
     case GIO_ATTR:      	/* get current attributes */
-	*(int*)data = (scp->term.cur_attr >> 8) & 0xFF;
-	return 0;
+	/* this ioctl is not processed here, but in the terminal emulator */
+	return ENOTTY;
 
     case GIO_COLOR:     	/* is this a color console ? */
 	*(int *)data = (sc->adp->va_flags & V_ADP_COLOR) ? 1 : 0;
@@ -725,7 +721,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 
     case CONS_CURSORTYPE:   	/* set cursor type blink/noblink */
 	if (!ISGRAPHSC(sc->cur_scp))
-	    remove_cursor_image(sc->cur_scp);
+	    sc_remove_cursor_image(sc->cur_scp);
 	if ((*(int*)data) & 0x01)
 	    sc->flags |= SC_BLINK_CURSOR;
 	else
@@ -741,7 +737,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	if (!ISGRAPHSC(sc->cur_scp)) {
 	    s = spltty();
 	    sc_set_cursor_image(sc->cur_scp);
-	    draw_cursor_image(sc->cur_scp);
+	    sc_draw_cursor_image(sc->cur_scp);
 	    splx(s);
 	}
 	return 0;
@@ -766,10 +762,14 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	    ptr->mv_row = scp->ypos;
 	    ptr->mv_csz = scp->xsize;
 	    ptr->mv_rsz = scp->ysize;
-	    ptr->mv_norm.fore = (scp->term.std_color & 0x0f00)>>8;
-	    ptr->mv_norm.back = (scp->term.std_color & 0xf000)>>12;
-	    ptr->mv_rev.fore = (scp->term.rev_color & 0x0f00)>>8;
-	    ptr->mv_rev.back = (scp->term.rev_color & 0xf000)>>12;
+	    /*
+	     * The following fields are filled by the terminal emulator. XXX
+	     *
+	     * ptr->mv_norm.fore
+	     * ptr->mv_norm.back
+	     * ptr->mv_rev.fore
+	     * ptr->mv_rev.back
+	     */
 	    ptr->mv_grfc.fore = 0;      /* not supported */
 	    ptr->mv_grfc.back = 0;      /* not supported */
 	    ptr->mv_ovscan = scp->border;
@@ -962,7 +962,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	s = spltty();
 	sc_clean_up(sc->cur_scp);
 	splx(s);
-	return switch_scr(sc, *(int *)data - 1);
+	return sc_switch_scr(sc, *(int *)data - 1);
 
     case VT_WAITACTIVE: 	/* wait for switch to occur */
 	if ((*(int *)data >= sc->first_vty + sc->vtys)
@@ -1062,10 +1062,10 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 
     case KDMKTONE:      	/* sound the bell */
 	if (*(int*)data)
-	    do_bell(scp, (*(int*)data)&0xffff,
+	    sc_bell(scp, (*(int*)data)&0xffff,
 		    (((*(int*)data)>>16)&0xffff)*hz/1000);
 	else
-	    do_bell(scp, scp->bell_pitch, scp->bell_duration);
+	    sc_bell(scp, scp->bell_pitch, scp->bell_duration);
 	return 0;
 
     case KIOCSOUND:     	/* make tone (*data) hz */
@@ -1148,6 +1148,37 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	splx(s);
 	return error;
 
+    case CONS_GETTERM:		/* get the current terminal emulator info */
+	{
+	    sc_term_sw_t *sw;
+
+	    if (((term_info_t *)data)->ti_index == 0) {
+		sw = scp->tsw;
+	    } else {
+		sw = sc_term_match_by_number(((term_info_t *)data)->ti_index);
+	    }
+	    if (sw != NULL) {
+		strncpy(((term_info_t *)data)->ti_name, sw->te_name, 
+			sizeof(((term_info_t *)data)->ti_name));
+		strncpy(((term_info_t *)data)->ti_desc, sw->te_desc, 
+			sizeof(((term_info_t *)data)->ti_desc));
+		((term_info_t *)data)->ti_flags = 0;
+		return 0;
+	    } else {
+		((term_info_t *)data)->ti_name[0] = '\0';
+		((term_info_t *)data)->ti_desc[0] = '\0';
+		((term_info_t *)data)->ti_flags = 0;
+		return EINVAL;
+	    }
+	}
+
+    case CONS_SETTERM:		/* set the current terminal emulator */
+	s = spltty();
+	error = sc_init_emulator(scp, ((term_info_t *)data)->ti_name);
+	/* FIXME: what if scp == sc_console! XXX */
+	splx(s);
+	return error;
+
     case GIO_SCRNMAP:   	/* get output translation table */
 	bcopy(&sc->scr_map, data, sizeof(sc->scr_map));
 	return 0;
@@ -1183,7 +1214,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	 * Don't load if the current font size is not 8x8.
 	 */
 	if (ISTEXTSC(sc->cur_scp) && (sc->cur_scp->font_size < 14))
-	    copy_font(sc->cur_scp, LOAD, 8, sc->font_8);
+	    sc_load_font(sc->cur_scp, 0, 8, sc->font_8, 0, 256);
 	return 0;
 
     case GIO_FONT8x8:   	/* get 8x8 dot font */
@@ -1209,7 +1240,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	if (ISTEXTSC(sc->cur_scp)
 	    && (sc->cur_scp->font_size >= 14)
 	    && (sc->cur_scp->font_size < 16))
-	    copy_font(sc->cur_scp, LOAD, 14, sc->font_14);
+	    sc_load_font(sc->cur_scp, 0, 14, sc->font_14, 0, 256);
 	return 0;
 
     case GIO_FONT8x14:  	/* get 8x14 dot font */
@@ -1233,7 +1264,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	 * Don't load if the current font size is not 8x16.
 	 */
 	if (ISTEXTSC(sc->cur_scp) && (sc->cur_scp->font_size >= 16))
-	    copy_font(sc->cur_scp, LOAD, 16, sc->font_16);
+	    sc_load_font(sc->cur_scp, 0, 16, sc->font_16, 0, 256);
 	return 0;
 
     case GIO_FONT8x16:  	/* get 8x16 dot font */
@@ -1278,7 +1309,7 @@ scstart(struct tty *tp)
 	while (rbp->c_cc) {
 	    len = q_to_b(rbp, buf, PCBURST);
 	    splx(s);
-	    ansi_put(scp, buf, len);
+	    sc_puts(scp, buf, len);
 	    s = spltty();
 	}
 	tp->t_state &= ~TS_BUSY;
@@ -1287,26 +1318,6 @@ scstart(struct tty *tp)
     splx(s);
 }
 
-static void
-scmousestart(struct tty *tp)
-{
-    struct clist *rbp;
-    int s;
-    u_char buf[PCBURST];
-
-    s = spltty();
-    if (!(tp->t_state & (TS_TIMEOUT | TS_BUSY | TS_TTSTOP))) {
-	tp->t_state |= TS_BUSY;
-	rbp = &tp->t_outq;
-	while (rbp->c_cc) {
-	    q_to_b(rbp, buf, PCBURST);
-	}
-	tp->t_state &= ~TS_BUSY;
-	ttwwakeup(tp);
-    }
-    splx(s);
-}
-
 static void
 sccnprobe(struct consdev *cp)
 {
@@ -1418,7 +1429,7 @@ sccnputc(dev_t dev, int c)
 {
     u_char buf[1];
     scr_stat *scp = sc_console;
-    term_stat save = scp->term;
+    void *save;
 #ifndef SC_NO_HISTORY
     struct tty *tp;
 #endif /* !SC_NO_HISTORY */
@@ -1435,7 +1446,7 @@ sccnputc(dev_t dev, int c)
 		sc_remove_cutmarking(scp);
 	    scp->status &= ~BUFFER_SAVED;
 	    scp->status |= CURSOR_ENABLED;
-	    draw_cursor_image(scp);
+	    sc_draw_cursor_image(scp);
 	}
 	tp = VIRTUAL_TTY(scp->sc, scp->index);
 	if (tp->t_state & TS_ISOPEN)
@@ -1443,13 +1454,12 @@ sccnputc(dev_t dev, int c)
     }
 #endif /* !SC_NO_HISTORY */
 
-    scp->term = kernel_console;
-    current_default = &kernel_default;
+    save = scp->ts;
+    if (kernel_console_ts != NULL)
+	scp->ts = kernel_console_ts;
     buf[0] = c;
-    ansi_put(scp, buf, 1);
-    kernel_console = scp->term;
-    current_default = &user_default;
-    scp->term = save;
+    sc_puts(scp, buf, 1);
+    scp->ts = save;
 
     s = spltty();	/* block sckbdevent and scrn_timer */
     sccnupdate(scp);
@@ -1482,7 +1492,7 @@ sccndbctl(dev_t dev, int on)
 	if (!cold
 	    && sc_console->sc->cur_scp->smode.mode == VT_AUTO
 	    && sc_console->smode.mode == VT_AUTO)
-	    switch_scr(sc_console->sc, sc_console->index);
+	    sc_switch_scr(sc_console->sc, sc_console->index);
     }
     if (on)
 	++debugger;
@@ -1781,15 +1791,15 @@ scrn_update(scr_stat *scp, int show_cursor)
             /* do we need to remove old cursor image ? */
             if (scp->cursor_oldpos < scp->start ||
                 scp->cursor_oldpos > scp->end) {
-                remove_cursor_image(scp);
+                sc_remove_cursor_image(scp);
             }
             scp->cursor_oldpos = scp->cursor_pos;
-            draw_cursor_image(scp);
+            sc_draw_cursor_image(scp);
         }
         else {
             /* cursor didn't move, has it been overwritten ? */
             if (scp->cursor_pos >= scp->start && scp->cursor_pos <= scp->end) {
-                draw_cursor_image(scp);
+                sc_draw_cursor_image(scp);
             } else {
                 /* if its a blinking cursor, we may have to update it */
 		if (scp->sc->flags & SC_BLINK_CURSOR)
@@ -1957,7 +1967,7 @@ set_scrn_saver_mode(scr_stat *scp, int mode, u_char *pal, int border)
     /* assert(scp == scp->sc->cur_scp) */
     s = spltty();
     if (!ISGRAPHSC(scp))
-	remove_cursor_image(scp);
+	sc_remove_cursor_image(scp);
     scp->splash_save_mode = scp->mode;
     scp->splash_save_status = scp->status & (GRAPHICS_MODE | PIXEL_MODE);
     scp->status &= ~(GRAPHICS_MODE | PIXEL_MODE);
@@ -1975,7 +1985,7 @@ set_scrn_saver_mode(scr_stat *scp, int mode, u_char *pal, int border)
 	if (pal != NULL)
 	    load_palette(scp->sc->adp, pal);
 #endif
-	set_border(scp, border);
+	sc_set_border(scp, border);
 	return 0;
     } else {
 	s = spltty();
@@ -2004,7 +2014,7 @@ restore_scrn_saver_mode(scr_stat *scp, int changemode)
     scp->sc->flags &= ~SC_SCRN_BLANKED;
     if (!changemode) {
 	if (!ISGRAPHSC(scp))
-	    draw_cursor_image(scp);
+	    sc_draw_cursor_image(scp);
 	--scrn_blanked;
 	splx(s);
 	return 0;
@@ -2035,7 +2045,7 @@ stop_scrn_saver(sc_softc_t *sc, void (*saver)(sc_softc_t *, int))
 
     mark_all(sc->cur_scp);
     if (sc->delayed_next_scr)
-	switch_scr(sc, sc->delayed_next_scr - 1);
+	sc_switch_scr(sc, sc->delayed_next_scr - 1);
     wakeup((caddr_t)&scrn_blanked);
 }
 
@@ -2066,23 +2076,13 @@ sc_touch_scrn_saver(void)
     run_scrn_saver = FALSE;
 }
 
-void
-sc_clear_screen(scr_stat *scp)
-{
-    move_crsr(scp, 0, 0);
-    scp->cursor_oldpos = scp->cursor_pos;
-    sc_vtb_clear(&scp->vtb, scp->sc->scr_map[0x20], scp->term.cur_color);
-    mark_all(scp);
-    sc_remove_cutmarking(scp);
-}
-
-static int
-switch_scr(sc_softc_t *sc, u_int next_scr)
+int
+sc_switch_scr(sc_softc_t *sc, u_int next_scr)
 {
     struct tty *tp;
     int s;
 
-    DPRINTF(5, ("sc0: switch_scr() %d ", next_scr + 1));
+    DPRINTF(5, ("sc0: sc_switch_scr() %d ", next_scr + 1));
 
     /* delay switch if the screen is blanked or being updated */
     if ((sc->flags & SC_SCRN_BLANKED) || sc->write_in_progress
@@ -2190,7 +2190,7 @@ switch_scr(sc_softc_t *sc, u_int next_scr)
     if ((next_scr < sc->first_vty) || (next_scr >= sc->first_vty + sc->vtys)
 	|| sc->switch_in_progress) {
 	splx(s);
-	do_bell(sc->cur_scp, bios_value.bell_pitch, BELL_DURATION);
+	sc_bell(sc->cur_scp, bios_value.bell_pitch, BELL_DURATION);
 	DPRINTF(5, ("error 1\n"));
 	return EINVAL;
     }
@@ -2206,7 +2206,7 @@ switch_scr(sc_softc_t *sc, u_int next_scr)
 	&& (sc->cur_scp->smode.mode == VT_AUTO)
 	&& ISGRAPHSC(sc->cur_scp)) {
 	splx(s);
-	do_bell(sc->cur_scp, bios_value.bell_pitch, BELL_DURATION);
+	sc_bell(sc->cur_scp, bios_value.bell_pitch, BELL_DURATION);
 	DPRINTF(5, ("error, graphics mode\n"));
 	return EINVAL;
     }
@@ -2220,7 +2220,7 @@ switch_scr(sc_softc_t *sc, u_int next_scr)
 	tp = VIRTUAL_TTY(sc, next_scr);
 	if ((tp == NULL) || !(tp->t_state & TS_ISOPEN)) {
 	    splx(s);
-	    do_bell(sc->cur_scp, bios_value.bell_pitch, BELL_DURATION);
+	    sc_bell(sc->cur_scp, bios_value.bell_pitch, BELL_DURATION);
 	    DPRINTF(5, ("error 2, requested vty isn't open!\n"));
 	    return EINVAL;
 	}
@@ -2336,7 +2336,7 @@ exchange_scr(sc_softc_t *sc)
     scr_stat *scp;
 
     /* save the current state of video and keyboard */
-    move_crsr(sc->old_scp, sc->old_scp->xpos, sc->old_scp->ypos);
+    sc_move_cursor(sc->old_scp, sc->old_scp->xpos, sc->old_scp->ypos);
     if (sc->old_scp->kbd_mode == K_XLATE)
 	save_kbd_state(sc->old_scp);
 
@@ -2347,14 +2347,14 @@ exchange_scr(sc_softc_t *sc)
     else
 	sc_vtb_init(&scp->scr, VTB_FRAMEBUFFER, scp->xsize, scp->ysize,
 		    (void *)sc->adp->va_window, FALSE);
-    move_crsr(scp, scp->xpos, scp->ypos);
+    sc_move_cursor(scp, scp->xpos, scp->ypos);
     if (!ISGRAPHSC(scp))
 	sc_set_cursor_image(scp);
 #ifndef SC_NO_PALETTE_LOADING
     if (ISGRAPHSC(sc->old_scp))
 	load_palette(sc->adp, sc->palette);
 #endif
-    set_border(scp, scp->border);
+    sc_set_border(scp, scp->border);
 
     /* set up the keyboard for the new screen */
     if (sc->old_scp->kbd_mode != scp->kbd_mode)
@@ -2364,665 +2364,24 @@ exchange_scr(sc_softc_t *sc)
     mark_all(scp);
 }
 
-static void
-scan_esc(scr_stat *scp, u_char c)
-{
-    static u_char ansi_col[16] =
-	{0, 4, 2, 6, 1, 5, 3, 7, 8, 12, 10, 14, 9, 13, 11, 15};
-    sc_softc_t *sc;
-    int i, n;
-    int count;
-
-    i = n = 0;
-    sc = scp->sc; 
-    if (scp->term.esc == 1) {	/* seen ESC */
-	switch (c) {
-
-	case '7':   /* Save cursor position */
-	    scp->saved_xpos = scp->xpos;
-	    scp->saved_ypos = scp->ypos;
-	    break;
-
-	case '8':   /* Restore saved cursor position */
-	    if (scp->saved_xpos >= 0 && scp->saved_ypos >= 0)
-		move_crsr(scp, scp->saved_xpos, scp->saved_ypos);
-	    break;
-
-	case '[':   /* Start ESC [ sequence */
-	    scp->term.esc = 2;
-	    scp->term.last_param = -1;
-	    for (i = scp->term.num_param; i < MAX_ESC_PAR; i++)
-		scp->term.param[i] = 1;
-	    scp->term.num_param = 0;
-	    return;
-
-	case 'M':   /* Move cursor up 1 line, scroll if at top */
-	    if (scp->ypos > 0)
-		move_crsr(scp, scp->xpos, scp->ypos - 1);
-	    else {
-		sc_vtb_ins(&scp->vtb, 0, scp->xsize,
-			   sc->scr_map[0x20], scp->term.cur_color);
-    		mark_all(scp);
-	    }
-	    break;
-#if notyet
-	case 'Q':
-	    scp->term.esc = 4;
-	    return;
-#endif
-	case 'c':   /* Clear screen & home */
-	    sc_clear_screen(scp);
-	    break;
-
-	case '(':   /* iso-2022: designate 94 character set to G0 */
-	    scp->term.esc = 5;
-	    return;
-	}
-    }
-    else if (scp->term.esc == 2) {	/* seen ESC [ */
-	if (c >= '0' && c <= '9') {
-	    if (scp->term.num_param < MAX_ESC_PAR) {
-	    if (scp->term.last_param != scp->term.num_param) {
-		scp->term.last_param = scp->term.num_param;
-		scp->term.param[scp->term.num_param] = 0;
-	    }
-	    else
-		scp->term.param[scp->term.num_param] *= 10;
-	    scp->term.param[scp->term.num_param] += c - '0';
-	    return;
-	    }
-	}
-	scp->term.num_param = scp->term.last_param + 1;
-	switch (c) {
-
-	case ';':
-	    if (scp->term.num_param < MAX_ESC_PAR)
-		return;
-	    break;
-
-	case '=':
-	    scp->term.esc = 3;
-	    scp->term.last_param = -1;
-	    for (i = scp->term.num_param; i < MAX_ESC_PAR; i++)
-		scp->term.param[i] = 1;
-	    scp->term.num_param = 0;
-	    return;
-
-	case 'A':   /* up n rows */
-	    n = scp->term.param[0]; if (n < 1) n = 1;
-	    move_crsr(scp, scp->xpos, scp->ypos - n);
-	    break;
-
-	case 'B':   /* down n rows */
-	    n = scp->term.param[0]; if (n < 1) n = 1;
-	    move_crsr(scp, scp->xpos, scp->ypos + n);
-	    break;
-
-	case 'C':   /* right n columns */
-	    n = scp->term.param[0]; if (n < 1) n = 1;
-	    move_crsr(scp, scp->xpos + n, scp->ypos);
-	    break;
-
-	case 'D':   /* left n columns */
-	    n = scp->term.param[0]; if (n < 1) n = 1;
-	    move_crsr(scp, scp->xpos - n, scp->ypos);
-	    break;
-
-	case 'E':   /* cursor to start of line n lines down */
-	    n = scp->term.param[0]; if (n < 1) n = 1;
-	    move_crsr(scp, 0, scp->ypos + n);
-	    break;
-
-	case 'F':   /* cursor to start of line n lines up */
-	    n = scp->term.param[0]; if (n < 1) n = 1;
-	    move_crsr(scp, 0, scp->ypos - n);
-	    break;
-
-	case 'f':   /* Cursor move */
-	case 'H':
-	    if (scp->term.num_param == 0)
-		move_crsr(scp, 0, 0);
-	    else if (scp->term.num_param == 2)
-		move_crsr(scp, scp->term.param[1] - 1, scp->term.param[0] - 1);
-	    break;
-
-	case 'J':   /* Clear all or part of display */
-	    if (scp->term.num_param == 0)
-		n = 0;
-	    else
-		n = scp->term.param[0];
-	    switch (n) {
-	    case 0: /* clear form cursor to end of display */
-		sc_vtb_erase(&scp->vtb, scp->cursor_pos,
-			     scp->xsize * scp->ysize - scp->cursor_pos,
-			     sc->scr_map[0x20], scp->term.cur_color);
-		mark_for_update(scp, scp->cursor_pos);
-    		mark_for_update(scp, scp->xsize * scp->ysize - 1);
-		sc_remove_cutmarking(scp);
-		break;
-	    case 1: /* clear from beginning of display to cursor */
-		sc_vtb_erase(&scp->vtb, 0, scp->cursor_pos,
-			     sc->scr_map[0x20], scp->term.cur_color);
-		mark_for_update(scp, 0);
-		mark_for_update(scp, scp->cursor_pos);
-		sc_remove_cutmarking(scp);
-		break;
-	    case 2: /* clear entire display */
-		sc_vtb_clear(&scp->vtb, sc->scr_map[0x20], scp->term.cur_color);
-		mark_all(scp);
-		sc_remove_cutmarking(scp);
-		break;
-	    }
-	    break;
-
-	case 'K':   /* Clear all or part of line */
-	    if (scp->term.num_param == 0)
-		n = 0;
-	    else
-		n = scp->term.param[0];
-	    switch (n) {
-	    case 0: /* clear form cursor to end of line */
-		sc_vtb_erase(&scp->vtb, scp->cursor_pos,
-			     scp->xsize - scp->xpos,
-			     sc->scr_map[0x20], scp->term.cur_color);
-    		mark_for_update(scp, scp->cursor_pos);
-    		mark_for_update(scp, scp->cursor_pos +
-				scp->xsize - 1 - scp->xpos);
-		break;
-	    case 1: /* clear from beginning of line to cursor */
-		sc_vtb_erase(&scp->vtb, scp->cursor_pos - scp->xpos,
-			     scp->xpos + 1,
-			     sc->scr_map[0x20], scp->term.cur_color);
-    		mark_for_update(scp, scp->ypos * scp->xsize);
-    		mark_for_update(scp, scp->cursor_pos);
-		break;
-	    case 2: /* clear entire line */
-		sc_vtb_erase(&scp->vtb, scp->cursor_pos - scp->xpos,
-			     scp->xsize,
-			     sc->scr_map[0x20], scp->term.cur_color);
-    		mark_for_update(scp, scp->ypos * scp->xsize);
-    		mark_for_update(scp, (scp->ypos + 1) * scp->xsize - 1);
-		break;
-	    }
-	    break;
-
-	case 'L':   /* Insert n lines */
-	    n = scp->term.param[0]; if (n < 1) n = 1;
-	    if (n > scp->ysize - scp->ypos)
-		n = scp->ysize - scp->ypos;
-	    sc_vtb_ins(&scp->vtb, scp->ypos * scp->xsize, n * scp->xsize,
-		       sc->scr_map[0x20], scp->term.cur_color);
-	    mark_for_update(scp, scp->ypos * scp->xsize);
-	    mark_for_update(scp, scp->xsize * scp->ysize - 1);
-	    break;
-
-	case 'M':   /* Delete n lines */
-	    n = scp->term.param[0]; if (n < 1) n = 1;
-	    if (n > scp->ysize - scp->ypos)
-		n = scp->ysize - scp->ypos;
-	    sc_vtb_delete(&scp->vtb, scp->ypos * scp->xsize, n * scp->xsize,
-			  sc->scr_map[0x20], scp->term.cur_color);
-	    mark_for_update(scp, scp->ypos * scp->xsize);
-	    mark_for_update(scp, scp->xsize * scp->ysize - 1);
-	    break;
-
-	case 'P':   /* Delete n chars */
-	    n = scp->term.param[0]; if (n < 1) n = 1;
-	    if (n > scp->xsize - scp->xpos)
-		n = scp->xsize - scp->xpos;
-	    count = scp->xsize - (scp->xpos + n);
-	    sc_vtb_move(&scp->vtb, scp->cursor_pos + n, scp->cursor_pos, count);
-	    sc_vtb_erase(&scp->vtb, scp->cursor_pos + count, n,
-			 sc->scr_map[0x20], scp->term.cur_color);
-	    mark_for_update(scp, scp->cursor_pos);
-	    mark_for_update(scp, scp->cursor_pos + n + count - 1);
-	    break;
-
-	case '@':   /* Insert n chars */
-	    n = scp->term.param[0]; if (n < 1) n = 1;
-	    if (n > scp->xsize - scp->xpos)
-		n = scp->xsize - scp->xpos;
-	    count = scp->xsize - (scp->xpos + n);
-	    sc_vtb_move(&scp->vtb, scp->cursor_pos, scp->cursor_pos + n, count);
-	    sc_vtb_erase(&scp->vtb, scp->cursor_pos, n,
-			 sc->scr_map[0x20], scp->term.cur_color);
-	    mark_for_update(scp, scp->cursor_pos);
-	    mark_for_update(scp, scp->cursor_pos + n + count - 1);
-	    break;
-
-	case 'S':   /* scroll up n lines */
-	    n = scp->term.param[0]; if (n < 1)  n = 1;
-	    if (n > scp->ysize)
-		n = scp->ysize;
-	    sc_vtb_delete(&scp->vtb, 0, n * scp->xsize,
-			  sc->scr_map[0x20], scp->term.cur_color);
-    	    mark_all(scp);
-	    break;
-
-	case 'T':   /* scroll down n lines */
-	    n = scp->term.param[0]; if (n < 1)  n = 1;
-	    if (n > scp->ysize)
-		n = scp->ysize;
-	    sc_vtb_ins(&scp->vtb, 0, n * scp->xsize,
-		       sc->scr_map[0x20], scp->term.cur_color);
-    	    mark_all(scp);
-	    break;
-
-	case 'X':   /* erase n characters in line */
-	    n = scp->term.param[0]; if (n < 1)  n = 1;
-	    if (n > scp->xsize - scp->xpos)
-		n = scp->xsize - scp->xpos;
-	    sc_vtb_erase(&scp->vtb, scp->cursor_pos, n,
-			 sc->scr_map[0x20], scp->term.cur_color);
-	    mark_for_update(scp, scp->cursor_pos);
-	    mark_for_update(scp, scp->cursor_pos + n - 1);
-	    break;
-
-	case 'Z':   /* move n tabs backwards */
-	    n = scp->term.param[0]; if (n < 1)  n = 1;
-	    if ((i = scp->xpos & 0xf8) == scp->xpos)
-		i -= 8*n;
-	    else
-		i -= 8*(n-1);
-	    if (i < 0)
-		i = 0;
-	    move_crsr(scp, i, scp->ypos);
-	    break;
-
-	case '`':   /* move cursor to column n */
-	    n = scp->term.param[0]; if (n < 1)  n = 1;
-	    move_crsr(scp, n - 1, scp->ypos);
-	    break;
-
-	case 'a':   /* move cursor n columns to the right */
-	    n = scp->term.param[0]; if (n < 1)  n = 1;
-	    move_crsr(scp, scp->xpos + n, scp->ypos);
-	    break;
-
-	case 'd':   /* move cursor to row n */
-	    n = scp->term.param[0]; if (n < 1)  n = 1;
-	    move_crsr(scp, scp->xpos, n - 1);
-	    break;
-
-	case 'e':   /* move cursor n rows down */
-	    n = scp->term.param[0]; if (n < 1)  n = 1;
-	    move_crsr(scp, scp->xpos, scp->ypos + n);
-	    break;
-
-	case 'm':   /* change attribute */
-	    if (scp->term.num_param == 0) {
-		scp->term.attr_mask = NORMAL_ATTR;
-		scp->term.cur_attr =
-		    scp->term.cur_color = scp->term.std_color;
-		break;
-	    }
-	    for (i = 0; i < scp->term.num_param; i++) {
-		switch (n = scp->term.param[i]) {
-		case 0: /* back to normal */
-		    scp->term.attr_mask = NORMAL_ATTR;
-		    scp->term.cur_attr =
-			scp->term.cur_color = scp->term.std_color;
-		    break;
-		case 1: /* bold */
-		    scp->term.attr_mask |= BOLD_ATTR;
-		    scp->term.cur_attr = mask2attr(&scp->term);
-		    break;
-		case 4: /* underline */
-		    scp->term.attr_mask |= UNDERLINE_ATTR;
-		    scp->term.cur_attr = mask2attr(&scp->term);
-		    break;
-		case 5: /* blink */
-		    scp->term.attr_mask |= BLINK_ATTR;
-		    scp->term.cur_attr = mask2attr(&scp->term);
-		    break;
-		case 7: /* reverse video */
-		    scp->term.attr_mask |= REVERSE_ATTR;
-		    scp->term.cur_attr = mask2attr(&scp->term);
-		    break;
-		case 30: case 31: /* set fg color */
-		case 32: case 33: case 34:
-		case 35: case 36: case 37:
-		    scp->term.attr_mask |= FOREGROUND_CHANGED;
-		    scp->term.cur_color =
-			(scp->term.cur_color&0xF000) | (ansi_col[(n-30)&7]<<8);
-		    scp->term.cur_attr = mask2attr(&scp->term);
-		    break;
-		case 40: case 41: /* set bg color */
-		case 42: case 43: case 44:
-		case 45: case 46: case 47:
-		    scp->term.attr_mask |= BACKGROUND_CHANGED;
-		    scp->term.cur_color =
-			(scp->term.cur_color&0x0F00) | (ansi_col[(n-40)&7]<<12);
-		    scp->term.cur_attr = mask2attr(&scp->term);
-		    break;
-		}
-	    }
-	    break;
-
-	case 's':   /* Save cursor position */
-	    scp->saved_xpos = scp->xpos;
-	    scp->saved_ypos = scp->ypos;
-	    break;
-
-	case 'u':   /* Restore saved cursor position */
-	    if (scp->saved_xpos >= 0 && scp->saved_ypos >= 0)
-		move_crsr(scp, scp->saved_xpos, scp->saved_ypos);
-	    break;
-
-	case 'x':
-	    if (scp->term.num_param == 0)
-		n = 0;
-	    else
-		n = scp->term.param[0];
-	    switch (n) {
-	    case 0:     /* reset attributes */
-		scp->term.attr_mask = NORMAL_ATTR;
-		scp->term.cur_attr =
-		    scp->term.cur_color = scp->term.std_color =
-		    current_default->std_color;
-		scp->term.rev_color = current_default->rev_color;
-		break;
-	    case 1:     /* set ansi background */
-		scp->term.attr_mask &= ~BACKGROUND_CHANGED;
-		scp->term.cur_color = scp->term.std_color =
-		    (scp->term.std_color & 0x0F00) |
-		    (ansi_col[(scp->term.param[1])&0x0F]<<12);
-		scp->term.cur_attr = mask2attr(&scp->term);
-		break;
-	    case 2:     /* set ansi foreground */
-		scp->term.attr_mask &= ~FOREGROUND_CHANGED;
-		scp->term.cur_color = scp->term.std_color =
-		    (scp->term.std_color & 0xF000) |
-		    (ansi_col[(scp->term.param[1])&0x0F]<<8);
-		scp->term.cur_attr = mask2attr(&scp->term);
-		break;
-	    case 3:     /* set ansi attribute directly */
-		scp->term.attr_mask &= ~(FOREGROUND_CHANGED|BACKGROUND_CHANGED);
-		scp->term.cur_color = scp->term.std_color =
-		    (scp->term.param[1]&0xFF)<<8;
-		scp->term.cur_attr = mask2attr(&scp->term);
-		break;
-	    case 5:     /* set ansi reverse video background */
-		scp->term.rev_color =
-		    (scp->term.rev_color & 0x0F00) |
-		    (ansi_col[(scp->term.param[1])&0x0F]<<12);
-		scp->term.cur_attr = mask2attr(&scp->term);
-		break;
-	    case 6:     /* set ansi reverse video foreground */
-		scp->term.rev_color =
-		    (scp->term.rev_color & 0xF000) |
-		    (ansi_col[(scp->term.param[1])&0x0F]<<8);
-		scp->term.cur_attr = mask2attr(&scp->term);
-		break;
-	    case 7:     /* set ansi reverse video directly */
-		scp->term.rev_color =
-		    (scp->term.param[1]&0xFF)<<8;
-		scp->term.cur_attr = mask2attr(&scp->term);
-		break;
-	    }
-	    break;
-
-	case 'z':   /* switch to (virtual) console n */
-	    if (scp->term.num_param == 1)
-		switch_scr(sc, scp->term.param[0]);
-	    break;
-	}
-    }
-    else if (scp->term.esc == 3) {	/* seen ESC [0-9]+ = */
-	if (c >= '0' && c <= '9') {
-	    if (scp->term.num_param < MAX_ESC_PAR) {
-	    if (scp->term.last_param != scp->term.num_param) {
-		scp->term.last_param = scp->term.num_param;
-		scp->term.param[scp->term.num_param] = 0;
-	    }
-	    else
-		scp->term.param[scp->term.num_param] *= 10;
-	    scp->term.param[scp->term.num_param] += c - '0';
-	    return;
-	    }
-	}
-	scp->term.num_param = scp->term.last_param + 1;
-	switch (c) {
-
-	case ';':
-	    if (scp->term.num_param < MAX_ESC_PAR)
-		return;
-	    break;
-
-	case 'A':   /* set display border color */
-	    if (scp->term.num_param == 1) {
-		scp->border=scp->term.param[0] & 0xff;
-		if (scp == sc->cur_scp)
-		    set_border(scp, scp->border);
-            }
-	    break;
-
-	case 'B':   /* set bell pitch and duration */
-	    if (scp->term.num_param == 2) {
-		scp->bell_pitch = scp->term.param[0];
-		scp->bell_duration = scp->term.param[1];
-	    }
-	    break;
-
-	case 'C':   /* set cursor type & shape */
-	    if (!ISGRAPHSC(sc->cur_scp))
-		remove_cursor_image(sc->cur_scp);
-	    if (scp->term.num_param == 1) {
-		if (scp->term.param[0] & 0x01)
-		    sc->flags |= SC_BLINK_CURSOR;
-		else
-		    sc->flags &= ~SC_BLINK_CURSOR;
-		if (scp->term.param[0] & 0x02) 
-		    sc->flags |= SC_CHAR_CURSOR;
-		else
-		    sc->flags &= ~SC_CHAR_CURSOR;
-	    }
-	    else if (scp->term.num_param == 2) {
-		sc->cursor_base = scp->font_size 
-					- (scp->term.param[1] & 0x1F) - 1;
-		sc->cursor_height = (scp->term.param[1] & 0x1F) 
-					- (scp->term.param[0] & 0x1F) + 1;
-	    }
-	    /* 
-	     * The cursor shape is global property; all virtual consoles
-	     * are affected. Update the cursor in the current console...
-	     */
-	    if (!ISGRAPHSC(sc->cur_scp)) {
-		i = spltty();
-		sc_set_cursor_image(sc->cur_scp);
-		draw_cursor_image(sc->cur_scp);
-		splx(i);
-	    }
-	    break;
-
-	case 'F':   /* set ansi foreground */
-	    if (scp->term.num_param == 1) {
-		scp->term.attr_mask &= ~FOREGROUND_CHANGED;
-		scp->term.cur_color = scp->term.std_color =
-		    (scp->term.std_color & 0xF000)
-		    | ((scp->term.param[0] & 0x0F) << 8);
-		scp->term.cur_attr = mask2attr(&scp->term);
-	    }
-	    break;
-
-	case 'G':   /* set ansi background */
-	    if (scp->term.num_param == 1) {
-		scp->term.attr_mask &= ~BACKGROUND_CHANGED;
-		scp->term.cur_color = scp->term.std_color =
-		    (scp->term.std_color & 0x0F00)
-		    | ((scp->term.param[0] & 0x0F) << 12);
-		scp->term.cur_attr = mask2attr(&scp->term);
-	    }
-	    break;
-
-	case 'H':   /* set ansi reverse video foreground */
-	    if (scp->term.num_param == 1) {
-		scp->term.rev_color =
-		    (scp->term.rev_color & 0xF000)
-		    | ((scp->term.param[0] & 0x0F) << 8);
-		scp->term.cur_attr = mask2attr(&scp->term);
-	    }
-	    break;
-
-	case 'I':   /* set ansi reverse video background */
-	    if (scp->term.num_param == 1) {
-		scp->term.rev_color =
-		    (scp->term.rev_color & 0x0F00)
-		    | ((scp->term.param[0] & 0x0F) << 12);
-		scp->term.cur_attr = mask2attr(&scp->term);
-	    }
-	    break;
-	}
-    }
-#if notyet
-    else if (scp->term.esc == 4) {	/* seen ESC Q */
-	/* to be filled */
-    }
-#endif
-    else if (scp->term.esc == 5) {	/* seen ESC ( */
-	switch (c) {
-	case 'B':   /* iso-2022: desginate ASCII into G0 */
-	    break;
-	/* other items to be filled */
-	default:
-	    break;
-	}
-    }
-    scp->term.esc = 0;
-}
-
-static void
-ansi_put(scr_stat *scp, u_char *buf, int len)
+void
+sc_puts(scr_stat *scp, u_char *buf, int len)
 {
-    u_char *ptr = buf;
-
 #if NSPLASH > 0
     /* make screensaver happy */
     if (!sticky_splash && scp == scp->sc->cur_scp)
 	run_scrn_saver = FALSE;
 #endif
 
-outloop:
-    scp->sc->write_in_progress++;
-    if (scp->term.esc) {
-	scan_esc(scp, *ptr++);
-	len--;
-    }
-    else if (PRINTABLE(*ptr)) {     /* Print only printables */
-	vm_offset_t p;
-	u_char *map;
- 	int cnt;
-	int attr;
-	int i;
-
-	p = sc_vtb_pointer(&scp->vtb, scp->cursor_pos);
-	map = scp->sc->scr_map;
-	attr = scp->term.cur_attr;
-
-	cnt = (len <= scp->xsize - scp->xpos) ? len : (scp->xsize - scp->xpos);
-	i = cnt;
-	do {
-	    /*
-	     * gcc-2.6.3 generates poor (un)sign extension code.  Casting the
-	     * pointers in the following to volatile should have no effect,
-	     * but in fact speeds up this inner loop from 26 to 18 cycles
-	     * (+ cache misses) on i486's.
-	     */
-#define	UCVP(ucp)	((u_char volatile *)(ucp))
-	    p = sc_vtb_putchar(&scp->vtb, p, UCVP(map)[*UCVP(ptr)], attr);
-	    ++ptr;
-	    --i;
-	} while (i > 0 && PRINTABLE(*ptr));
-
-	len -= cnt - i;
-	mark_for_update(scp, scp->cursor_pos);
-	scp->cursor_pos += cnt - i;
-	mark_for_update(scp, scp->cursor_pos - 1);
-	scp->xpos += cnt - i;
-
-	if (scp->xpos >= scp->xsize) {
-	    scp->xpos = 0;
-	    scp->ypos++;
-	}
-    }
-    else  {
-	switch(*ptr) {
-	case 0x07:
-	    do_bell(scp, scp->bell_pitch, scp->bell_duration);
-	    break;
-
-	case 0x08:      /* non-destructive backspace */
-	    if (scp->cursor_pos > 0) {
-		mark_for_update(scp, scp->cursor_pos);
-		scp->cursor_pos--;
-		mark_for_update(scp, scp->cursor_pos);
-		if (scp->xpos > 0)
-		    scp->xpos--;
-		else {
-		    scp->xpos += scp->xsize - 1;
-		    scp->ypos--;
-		}
-	    }
-	    break;
-
-	case 0x09:  /* non-destructive tab */
-	    mark_for_update(scp, scp->cursor_pos);
-	    scp->cursor_pos += (8 - scp->xpos % 8u);
-	    if ((scp->xpos += (8 - scp->xpos % 8u)) >= scp->xsize) {
-	        scp->xpos = 0;
-	        scp->ypos++;
-		scp->cursor_pos = scp->xsize * scp->ypos;
-	    }
-	    mark_for_update(scp, scp->cursor_pos);
-	    break;
-
-	case 0x0a:  /* newline, same pos */
-	    mark_for_update(scp, scp->cursor_pos);
-	    scp->cursor_pos += scp->xsize;
-	    mark_for_update(scp, scp->cursor_pos);
-	    scp->ypos++;
-	    break;
-
-	case 0x0c:  /* form feed, clears screen */
-	    sc_clear_screen(scp);
-	    break;
-
-	case 0x0d:  /* return, return to pos 0 */
-	    mark_for_update(scp, scp->cursor_pos);
-	    scp->cursor_pos -= scp->xpos;
-	    mark_for_update(scp, scp->cursor_pos);
-	    scp->xpos = 0;
-	    break;
+    if (scp->tsw)
+	(*scp->tsw->te_puts)(scp, buf, len);
 
-	case 0x1b:  /* start escape sequence */
-	    scp->term.esc = 1;
-	    scp->term.num_param = 0;
-	    break;
-	}
-	ptr++; len--;
-    }
-    /* do we have to scroll ?? */
-    if (scp->cursor_pos >= scp->ysize * scp->xsize) {
-	sc_remove_cutmarking(scp);
-#ifndef SC_NO_HISTORY
-	if (scp->history != NULL)
-	    sc_hist_save_one_line(scp, 0);
-#endif
-	sc_vtb_delete(&scp->vtb, 0, scp->xsize,
-		      scp->sc->scr_map[0x20], scp->term.cur_color);
-	scp->cursor_pos -= scp->xsize;
-	scp->ypos--;
-    	mark_all(scp);
-    }
-    scp->sc->write_in_progress--;
-    if (len)
-	goto outloop;
     if (scp->sc->delayed_next_scr)
-	switch_scr(scp->sc, scp->sc->delayed_next_scr - 1);
+	sc_switch_scr(scp->sc, scp->sc->delayed_next_scr - 1);
 }
 
-static void
-draw_cursor_image(scr_stat *scp)
+void
+sc_draw_cursor_image(scr_stat *scp)
 {
     /* assert(scp == scp->sc->cur_scp); */
     ++scp->sc->videoio_in_progress;
@@ -3032,8 +2391,8 @@ draw_cursor_image(scr_stat *scp)
     --scp->sc->videoio_in_progress;
 }
 
-static void
-remove_cursor_image(scr_stat *scp)
+void
+sc_remove_cursor_image(scr_stat *scp)
 {
     /* assert(scp == scp->sc->cur_scp); */
     ++scp->sc->videoio_in_progress;
@@ -3085,22 +2444,6 @@ sc_set_cursor_image(scr_stat *scp)
     --scp->sc->videoio_in_progress;
 }
 
-static void
-move_crsr(scr_stat *scp, int x, int y)
-{
-    if (x < 0)
-	x = 0;
-    if (y < 0)
-	y = 0;
-    if (x >= scp->xsize)
-	x = scp->xsize-1;
-    if (y >= scp->ysize)
-	y = scp->ysize-1;
-    scp->xpos = x;
-    scp->ypos = y;
-    scp->cursor_pos = scp->ypos * scp->xsize + scp->xpos;
-}
-
 static void
 scinit(int unit, int flags)
 {
@@ -3129,17 +2472,8 @@ scinit(int unit, int flags)
     int i;
 
     /* one time initialization */
-    if (init_done == COLD) {
+    if (init_done == COLD)
 	sc_get_bios_values(&bios_value);
-	current_default = &user_default;
-	/* kernel console attributes */
-	kernel_console.esc = 0;
-	kernel_console.attr_mask = NORMAL_ATTR;
-	kernel_console.cur_attr =
-	    kernel_console.cur_color = kernel_console.std_color =
-	    kernel_default.std_color;
-	kernel_console.rev_color = kernel_default.rev_color;
-    }
     init_done = WARM;
 
     /*
@@ -3159,8 +2493,8 @@ scinit(int unit, int flags)
 	i = kbd_release(sc->kbd, (void *)&sc->keyboard);
 	DPRINTF(5, ("sc%d: kbd_release returned %d\n", unit, i));
 	if (sc->kbd != NULL) {
-	    DPRINTF(5, ("sc%d: kbd != NULL!, index:%d, minor:%d, flags:0x%x\n",
-		unit, sc->kbd->kb_index, sc->kbd->kb_minor, sc->kbd->kb_flags));
+	    DPRINTF(5, ("sc%d: kbd != NULL!, index:%d, unit:%d, flags:0x%x\n",
+		unit, sc->kbd->kb_index, sc->kbd->kb_unit, sc->kbd->kb_flags));
 	}
 	sc->kbd = NULL;
     }
@@ -3172,8 +2506,8 @@ scinit(int unit, int flags)
     DPRINTF(1, ("sc%d: keyboard %d\n", unit, sc->keyboard));
     sc->kbd = kbd_get_keyboard(sc->keyboard);
     if (sc->kbd != NULL) {
-	DPRINTF(1, ("sc%d: kbd index:%d, minor:%d, flags:0x%x\n",
-		unit, sc->kbd->kb_index, sc->kbd->kb_minor, sc->kbd->kb_flags));
+	DPRINTF(1, ("sc%d: kbd index:%d, unit:%d, flags:0x%x\n",
+		unit, sc->kbd->kb_index, sc->kbd->kb_unit, sc->kbd->kb_flags));
     }
 
     if (!(sc->flags & SC_INIT_DONE) || (adp != sc->adp)) {
@@ -3199,7 +2533,7 @@ scinit(int unit, int flags)
 
 	/* set up the first console */
 	sc->first_vty = unit*MAXCONS;
-	sc->vtys = MAXCONS;
+	sc->vtys = MAXCONS;		/* XXX: should be configurable */
 	if (flags & SC_KERNEL_CONSOLE) {
 	    sc->dev = main_devs;
 	    sc->dev[0] = makedev(CDEV_MAJOR, unit*MAXCONS);
@@ -3209,6 +2543,11 @@ scinit(int unit, int flags)
 	    init_scp(sc, sc->first_vty, scp);
 	    sc_vtb_init(&scp->vtb, VTB_MEMORY, scp->xsize, scp->ysize,
 			(void *)sc_buffer, FALSE);
+	    if (sc_init_emulator(scp, SC_DFLT_TERM))
+		sc_init_emulator(scp, "*");
+	    (*scp->tsw->te_default_attr)(scp,
+					 kernel_default.std_color,
+					 kernel_default.rev_color);
 	} else {
 	    /* assert(sc_malloc) */
 	    sc->dev = malloc(sizeof(dev_t)*sc->vtys, M_DEVBUF, M_WAITOK);
@@ -3243,7 +2582,7 @@ scinit(int unit, int flags)
 	sc->cursor_height = imin(i, scp->font_size);
 	if (!ISGRAPHSC(scp)) {
     	    sc_set_cursor_image(scp);
-    	    draw_cursor_image(scp);
+    	    sc_draw_cursor_image(scp);
 	}
 
 	/* save font and palette */
@@ -3256,26 +2595,26 @@ scinit(int unit, int flags)
 	    bcopy(dflt_font_16, sc->font_16, sizeof(dflt_font_16));
 	    sc->fonts_loaded = FONT_16 | FONT_14 | FONT_8;
 	    if (scp->font_size < 14) {
-		copy_font(scp, LOAD, 8, sc->font_8);
+		sc_load_font(scp, 0, 8, sc->font_8, 0, 256);
 	    } else if (scp->font_size >= 16) {
-		copy_font(scp, LOAD, 16, sc->font_16);
+		sc_load_font(scp, 0, 16, sc->font_16, 0, 256);
 	    } else {
-		copy_font(scp, LOAD, 14, sc->font_14);
+		sc_load_font(scp, 0, 14, sc->font_14, 0, 256);
 	    }
 #else /* !SC_DFLT_FONT */
 	    if (scp->font_size < 14) {
-		copy_font(scp, SAVE, 8, sc->font_8);
+		sc_save_font(scp, 0, 8, sc->font_8, 0, 256);
 		sc->fonts_loaded = FONT_8;
 	    } else if (scp->font_size >= 16) {
-		copy_font(scp, SAVE, 16, sc->font_16);
+		sc_save_font(scp, 0, 16, sc->font_16, 0, 256);
 		sc->fonts_loaded = FONT_16;
 	    } else {
-		copy_font(scp, SAVE, 14, sc->font_14);
+		sc_save_font(scp, 0, 14, sc->font_14, 0, 256);
 		sc->fonts_loaded = FONT_14;
 	    }
 #endif /* SC_DFLT_FONT */
 	    /* FONT KLUDGE: always use the font page #0. XXX */
-	    (*vidsw[sc->adapter]->show_font)(sc->adp, 0);
+	    sc_show_font(scp, 0);
 	}
 #endif /* !SC_NO_FONT_LOADING */
 
@@ -3308,6 +2647,7 @@ static void
 scterm(int unit, int flags)
 {
     sc_softc_t *sc;
+    scr_stat *scp;
 
     sc = sc_get_softc(unit, flags & SC_KERNEL_CONSOLE);
     if (sc == NULL)
@@ -3332,6 +2672,13 @@ scterm(int unit, int flags)
     if (sc->adapter >= 0)
 	vid_release(sc->adp, &sc->adapter);
 
+    /* stop the terminal emulator, if any */
+    scp = SC_STAT(sc->dev[0]);
+    if (scp->tsw)
+	(*scp->tsw->te_term)(scp, &scp->ts);
+    if (scp->ts != NULL)
+	free(scp->ts, M_DEVBUF);
+
     /* clear the structure */
     if (!(flags & SC_KERNEL_CONSOLE)) {
 	/* XXX: We need delete_dev() for this */
@@ -3362,7 +2709,7 @@ scshutdown(void *arg, int howto)
     if (!cold && sc_console
 	&& sc_console->sc->cur_scp->smode.mode == VT_AUTO 
 	&& sc_console->smode.mode == VT_AUTO)
-	switch_scr(sc_console->sc, sc_console->index);
+	sc_switch_scr(sc_console->sc, sc_console->index);
     shutdown_in_progress = TRUE;
 }
 
@@ -3388,7 +2735,6 @@ sc_alloc_scr_buffer(scr_stat *scp, int wait, int discard)
 {
     sc_vtb_t new;
     sc_vtb_t old;
-    int s;
 
     old = scp->vtb;
     sc_vtb_init(&new, VTB_MEMORY, scp->xsize, scp->ysize, NULL, wait);
@@ -3402,11 +2748,7 @@ sc_alloc_scr_buffer(scr_stat *scp, int wait, int discard)
 	sc_vtb_copy(&old, 0, &new, 0, scp->xsize*scp->ysize);
 	scp->vtb = new;
     } else {
-        /* clear the screen and move the text cursor to the top-left position */
-	s = splhigh();
 	scp->vtb = new;
-	sc_clear_screen(scp);
-	splx(s);
 	sc_vtb_destroy(&old);
     }
 
@@ -3427,6 +2769,8 @@ static scr_stat
     init_scp(sc, vty, scp);
 
     sc_alloc_scr_buffer(scp, TRUE, TRUE);
+    if (sc_init_emulator(scp, SC_DFLT_TERM))
+	sc_init_emulator(scp, "*");
 
 #ifndef SC_NO_SYSMOUSE
     if (ISMOUSEAVAIL(sc->adp->va_flags))
@@ -3437,7 +2781,6 @@ static scr_stat
     sc_alloc_history_buffer(scp, 0, 0, TRUE);
 #endif
 
-    sc_clear_screen(scp);
     return scp;
 }
 
@@ -3446,6 +2789,8 @@ init_scp(sc_softc_t *sc, int vty, scr_stat *scp)
 {
     video_info_t info;
 
+    bzero(scp, sizeof(*scp));
+
     scp->index = vty;
     scp->sc = sc;
     scp->status = 0;
@@ -3491,15 +2836,11 @@ init_scp(sc_softc_t *sc, int vty, scr_stat *scp)
     sc_vtb_init(&scp->scr, VTB_FRAMEBUFFER, 0, 0, NULL, FALSE);
     scp->xoff = scp->yoff = 0;
     scp->xpos = scp->ypos = 0;
-    scp->saved_xpos = scp->saved_ypos = -1;
     scp->start = scp->xsize * scp->ysize - 1;
     scp->end = 0;
-    scp->term.esc = 0;
-    scp->term.attr_mask = NORMAL_ATTR;
-    scp->term.cur_attr =
-	scp->term.cur_color = scp->term.std_color =
-	current_default->std_color;
-    scp->term.rev_color = current_default->rev_color;
+    scp->tsw = NULL;
+    scp->ts = NULL;
+    scp->rndr = NULL;
     scp->border = BG_BLACK;
     scp->cursor_base = sc->cursor_base;
     scp->cursor_height = imin(sc->cursor_height, scp->font_size);
@@ -3521,10 +2862,64 @@ init_scp(sc_softc_t *sc, int vty, scr_stat *scp)
     scp->history = NULL;
     scp->history_pos = 0;
     scp->history_size = 0;
+}
+
+int
+sc_init_emulator(scr_stat *scp, char *name)
+{
+    sc_term_sw_t *sw;
+    sc_rndr_sw_t *rndr;
+    void *p;
+    int error;
+
+    if (name == NULL)	/* if no name is given, use the current emulator */
+	sw = scp->tsw;
+    else		/* ...otherwise find the named emulator */
+	sw = sc_term_match(name);
+    if (sw == NULL)
+	return EINVAL;
 
-    /* what if the following call fails... XXX */
-    scp->rndr = sc_render_match(scp, scp->sc->adp,
-				scp->status & (GRAPHICS_MODE | PIXEL_MODE));
+    rndr = NULL;
+    if (strcmp(sw->te_renderer, "*") != 0) {
+	rndr = sc_render_match(scp, sw->te_renderer,
+			       scp->status & (GRAPHICS_MODE | PIXEL_MODE));
+    }
+    if (rndr == NULL) {
+	rndr = sc_render_match(scp, scp->sc->adp->va_name,
+			       scp->status & (GRAPHICS_MODE | PIXEL_MODE));
+	if (rndr == NULL)
+	    return ENODEV;
+    }
+
+    if (sw == scp->tsw) {
+	error = (*sw->te_init)(scp, &scp->ts, SC_TE_WARM_INIT);
+	scp->rndr = rndr;
+	sc_clear_screen(scp);
+	/* assert(error == 0); */
+	return error;
+    }
+
+    if (sc_malloc && (sw->te_size > 0))
+	p = malloc(sw->te_size, M_DEVBUF, M_NOWAIT);
+    else
+	p = NULL;
+    error = (*sw->te_init)(scp, &p, SC_TE_COLD_INIT);
+    if (error)
+	return error;
+
+    if (scp->tsw)
+	(*scp->tsw->te_term)(scp, &scp->ts);
+    if (scp->ts != NULL)
+	free(scp->ts, M_DEVBUF);
+    scp->tsw = sw;
+    scp->ts = p;
+    scp->rndr = rndr;
+
+    /* XXX */
+    (*sw->te_default_attr)(scp, user_default.std_color, user_default.rev_color);
+    sc_clear_screen(scp);
+
+    return 0;
 }
 
 /*
@@ -3560,7 +2955,7 @@ next_code:
 	c = kbd_read_char(sc->kbd, !(flags & SCGETC_NONBLOCK));
 	if (c == ERRKEY) {
 	    if (!(flags & SCGETC_CN))
-		do_bell(scp, bios_value.bell_pitch, BELL_DURATION);
+		sc_bell(scp, bios_value.bell_pitch, BELL_DURATION);
 	} else if (c == NOKEY)
 	    return c;
 	else
@@ -3584,7 +2979,7 @@ next_code:
     if (!ISGRAPHSC(scp) && scp->history && scp->status & SLKED) {
 
 	scp->status &= ~CURSOR_ENABLED;
-	remove_cursor_image(scp);
+	sc_remove_cursor_image(scp);
 
 #ifndef SC_NO_HISTORY
 	if (!(scp->status & BUFFER_SAVED)) {
@@ -3607,14 +3002,14 @@ next_code:
 	    sc_remove_cutmarking(scp);
 	    if (sc_hist_up_line(scp))
 		if (!(flags & SCGETC_CN))
-		    do_bell(scp, bios_value.bell_pitch, BELL_DURATION);
+		    sc_bell(scp, bios_value.bell_pitch, BELL_DURATION);
 	    goto next_code;
 
 	case SPCLKEY | FKEY | F(58):  /* down arrow key */
 	    sc_remove_cutmarking(scp);
 	    if (sc_hist_down_line(scp))
 		if (!(flags & SCGETC_CN))
-		    do_bell(scp, bios_value.bell_pitch, BELL_DURATION);
+		    sc_bell(scp, bios_value.bell_pitch, BELL_DURATION);
 	    goto next_code;
 
 	case SPCLKEY | FKEY | F(51):  /* page up key */
@@ -3622,7 +3017,7 @@ next_code:
 	    for (i=0; i<scp->ysize; i++)
 	    if (sc_hist_up_line(scp)) {
 		if (!(flags & SCGETC_CN))
-		    do_bell(scp, bios_value.bell_pitch, BELL_DURATION);
+		    sc_bell(scp, bios_value.bell_pitch, BELL_DURATION);
 		break;
 	    }
 	    goto next_code;
@@ -3632,7 +3027,7 @@ next_code:
 	    for (i=0; i<scp->ysize; i++)
 	    if (sc_hist_down_line(scp)) {
 		if (!(flags & SCGETC_CN))
-		    do_bell(scp, bios_value.bell_pitch, BELL_DURATION);
+		    sc_bell(scp, bios_value.bell_pitch, BELL_DURATION);
 		break;
 	    }
 	    goto next_code;
@@ -3668,7 +3063,7 @@ next_code:
 				sc_remove_cutmarking(scp);
 			    scp->status &= ~BUFFER_SAVED;
 			    scp->status |= CURSOR_ENABLED;
-			    draw_cursor_image(scp);
+			    sc_draw_cursor_image(scp);
 			}
 			tp = VIRTUAL_TTY(sc, scp->index);
 			if (tp->t_state & TS_ISOPEN)
@@ -3757,7 +3152,7 @@ next_code:
 			i = (i + 1)%sc->vtys) {
 		    struct tty *tp = VIRTUAL_TTY(sc, sc->first_vty + i);
 		    if (tp && tp->t_state & TS_ISOPEN) {
-			switch_scr(scp->sc, sc->first_vty + i);
+			sc_switch_scr(scp->sc, sc->first_vty + i);
 			break;
 		    }
 		}
@@ -3770,7 +3165,7 @@ next_code:
 			i = (i + sc->vtys - 1)%sc->vtys) {
 		    struct tty *tp = VIRTUAL_TTY(sc, sc->first_vty + i);
 		    if (tp && tp->t_state & TS_ISOPEN) {
-			switch_scr(scp->sc, sc->first_vty + i);
+			sc_switch_scr(scp->sc, sc->first_vty + i);
 			break;
 		    }
 		}
@@ -3778,7 +3173,7 @@ next_code:
 
 	    default:
 		if (KEYCHAR(c) >= F_SCR && KEYCHAR(c) <= L_SCR) {
-		    switch_scr(scp->sc, sc->first_vty + KEYCHAR(c) - F_SCR);
+		    sc_switch_scr(scp->sc, sc->first_vty + KEYCHAR(c) - F_SCR);
 		    break;
 		}
 		/* assert(c & FKEY) */
@@ -3802,43 +3197,12 @@ scmmap(dev_t dev, vm_offset_t offset, int nprot)
 {
     scr_stat *scp;
 
-    if (SC_VTY(dev) == SC_MOUSE)
-	return -1;
     scp = SC_STAT(dev);
     if (scp != scp->sc->cur_scp)
 	return -1;
     return (*vidsw[scp->sc->adapter]->mmap)(scp->sc->adp, offset, nprot);
 }
 
-/*
- * Calculate hardware attributes word using logical attributes mask and
- * hardware colors
- */
-
-static int
-mask2attr(struct term_stat *term)
-{
-    int attr, mask = term->attr_mask;
-
-    if (mask & REVERSE_ATTR) {
-	attr = ((mask & FOREGROUND_CHANGED) ?
-		((term->cur_color & 0xF000) >> 4) :
-		(term->rev_color & 0x0F00)) |
-	       ((mask & BACKGROUND_CHANGED) ?
-		((term->cur_color & 0x0F00) << 4) :
-		(term->rev_color & 0xF000));
-    } else
-	attr = term->cur_color;
-
-    /* XXX: underline mapping for Hercules adapter can be better */
-    if (mask & (BOLD_ATTR | UNDERLINE_ATTR))
-	attr ^= 0x0800;
-    if (mask & BLINK_ATTR)
-	attr ^= 0x8000;
-
-    return attr;
-}
-
 static int
 save_kbd_state(scr_stat *scp)
 {
@@ -3914,13 +3278,13 @@ set_mode(scr_stat *scp)
 	if (!(scp->status & PIXEL_MODE) && ISFONTAVAIL(scp->sc->adp->va_flags)) {
 	    if (scp->font_size < 14) {
 		if (scp->sc->fonts_loaded & FONT_8)
-		    copy_font(scp, LOAD, 8, scp->sc->font_8);
+		    sc_load_font(scp, 0, 8, scp->sc->font_8, 0, 256);
 	    } else if (scp->font_size >= 16) {
 		if (scp->sc->fonts_loaded & FONT_16)
-		    copy_font(scp, LOAD, 16, scp->sc->font_16);
+		    sc_load_font(scp, 0, 16, scp->sc->font_16, 0, 256);
 	    } else {
 		if (scp->sc->fonts_loaded & FONT_14)
-		    copy_font(scp, LOAD, 14, scp->sc->font_14);
+		    sc_load_font(scp, 0, 14, scp->sc->font_14, 0, 256);
 	    }
 	    /*
 	     * FONT KLUDGE:
@@ -3929,20 +3293,20 @@ set_mode(scr_stat *scp)
 	     * Somehow we cannot show the font in other font pages on
 	     * some video cards... XXX
 	     */ 
-	    (*vidsw[scp->sc->adapter]->show_font)(scp->sc->adp, 0);
+	    sc_show_font(scp, 0);
 	}
 	mark_all(scp);
     }
 #endif /* !SC_NO_FONT_LOADING */
 
-    set_border(scp, scp->border);
+    sc_set_border(scp, scp->border);
     sc_set_cursor_image(scp);
 
     return 0;
 }
 
 void
-set_border(scr_stat *scp, int color)
+sc_set_border(scr_stat *scp, int color)
 {
     ++scp->sc->videoio_in_progress;
     (*scp->rndr->draw_border)(scp, color);
@@ -3951,34 +3315,35 @@ set_border(scr_stat *scp, int color)
 
 #ifndef SC_NO_FONT_LOADING
 void
-copy_font(scr_stat *scp, int operation, int font_size, u_char *buf)
+sc_load_font(scr_stat *scp, int page, int size, u_char *buf,
+	     int base, int count)
 {
-    /*
-     * FONT KLUDGE:
-     * This is an interim kludge to display correct font.
-     * Always use the font page #0 on the video plane 2.
-     * Somehow we cannot show the font in other font pages on
-     * some video cards... XXX
-     */ 
-    scp->sc->font_loading_in_progress = TRUE;
-    if (operation == LOAD) {
-	(*vidsw[scp->sc->adapter]->load_font)(scp->sc->adp, 0, font_size,
-					      buf, 0, 256);
-    } else if (operation == SAVE) {
-	(*vidsw[scp->sc->adapter]->save_font)(scp->sc->adp, 0, font_size,
-					      buf, 0, 256);
-    }
-    scp->sc->font_loading_in_progress = FALSE;
+    sc_softc_t *sc;
+
+    sc = scp->sc;
+    sc->font_loading_in_progress = TRUE;
+    (*vidsw[sc->adapter]->load_font)(sc->adp, page, size, buf, base, count);
+    sc->font_loading_in_progress = FALSE;
 }
-#endif /* !SC_NO_FONT_LOADING */
 
-#ifndef SC_NO_SYSMOUSE
-struct tty
-*sc_get_mouse_tty(void)
+void
+sc_save_font(scr_stat *scp, int page, int size, u_char *buf,
+	     int base, int count)
 {
-    return sc_mouse_tty;
+    sc_softc_t *sc;
+
+    sc = scp->sc;
+    sc->font_loading_in_progress = TRUE;
+    (*vidsw[sc->adapter]->save_font)(sc->adp, page, size, buf, base, count);
+    sc->font_loading_in_progress = FALSE;
+}
+
+void
+sc_show_font(scr_stat *scp, int page)
+{
+    (*vidsw[scp->sc->adapter]->show_font)(scp->sc->adp, page);
 }
-#endif /* !SC_NO_SYSMOUSE */
+#endif /* !SC_NO_FONT_LOADING */
 
 #ifndef SC_NO_CUTPASTE
 void
@@ -3998,8 +3363,8 @@ sc_paste(scr_stat *scp, u_char *p, int count)
 }
 #endif /* SC_NO_CUTPASTE */
 
-static void
-do_bell(scr_stat *scp, int pitch, int duration)
+void
+sc_bell(scr_stat *scp, int pitch, int duration)
 {
     if (cold || shutdown_in_progress)
 	return;
@@ -4034,7 +3399,7 @@ blink_screen(void *arg)
 	if (tp->t_state & TS_ISOPEN)
 	    scstart(tp);
 	if (scp->sc->delayed_next_scr)
-	    switch_scr(scp->sc, scp->sc->delayed_next_scr - 1);
+	    sc_switch_scr(scp->sc, scp->sc->delayed_next_scr - 1);
     }
     else {
 	(*scp->rndr->draw)(scp, 0, scp->xsize*scp->ysize, 
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 0f3ae5c03d39..de4c3e15107c 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -102,45 +102,18 @@
 #define VR_CURSOR_BLINK	0x40000
 #define VR_CURSOR_ON	0x80000
 
-/* attribute flags */
-#define NORMAL_ATTR             0x00
-#define BLINK_ATTR              0x01
-#define BOLD_ATTR               0x02
-#define UNDERLINE_ATTR          0x04
-#define REVERSE_ATTR            0x08
-#define FOREGROUND_CHANGED      0x10
-#define BACKGROUND_CHANGED      0x20
-
 /* misc defines */
 #define FALSE		0
 #define TRUE		1
-#define MAX_ESC_PAR 	5
-#define	LOAD		1
-#define SAVE		0
 #define	COL		80
 #define	ROW		25
-#define CONSOLE_BUFSIZE 1024
 #define PCBURST		128
-#define FONT_NONE	1
-#define FONT_8		2
-#define FONT_14		4
-#define FONT_16		8
 
 #ifndef BELL_DURATION
 #define BELL_DURATION	5
 #define BELL_PITCH	800
 #endif
 
-/* special characters */
-#define cntlc		0x03
-#define cntld		0x04
-#define bs		0x08
-#define lf		0x0a
-#define cr		0x0d
-#define del		0x7f
-
-#define DEAD_CHAR 	0x07			/* char used for cursor */
-
 /* virtual terminal buffer */
 typedef struct sc_vtb {
 	int		vtb_flags;
@@ -157,19 +130,6 @@ typedef struct sc_vtb {
 	int		vtb_tail;	/* valid for VTB_RINGBUFFER only */
 } sc_vtb_t;
 
-/* terminal status */
-typedef struct term_stat {
-	int 		esc;			/* processing escape sequence */
-	int 		num_param;		/* # of parameters to ESC */
-	int	 	last_param;		/* last parameter # */
-	int 		param[MAX_ESC_PAR];	/* contains ESC parameters */
-	int             cur_attr;               /* current hardware attr word */
-	int             attr_mask;              /* current logical attr mask */
-	int             cur_color;              /* current hardware color */
-	int             std_color;              /* normal hardware color */
-	int             rev_color;              /* reverse hardware color */
-} term_stat;
-
 /* softc */
 
 struct keyboard;
@@ -236,6 +196,10 @@ typedef struct sc_softc {
 
 #ifndef SC_NO_FONT_LOADING
 	int     	fonts_loaded;
+#define FONT_NONE	1
+#define FONT_8		2
+#define FONT_14		4
+#define FONT_16		8
 	u_char		*font_8;
 	u_char		*font_14;
 	u_char		*font_16;
@@ -252,29 +216,35 @@ typedef struct scr_stat {
 	struct sc_rndr_sw *rndr;		/* renderer */
 	sc_vtb_t	scr;
 	sc_vtb_t	vtb;
+
 	int 		xpos;			/* current X position */
 	int 		ypos;			/* current Y position */
-	int             saved_xpos;             /* saved X position */
-	int             saved_ypos;             /* saved Y position */
 	int 		xsize;			/* X text size */
 	int 		ysize;			/* Y text size */
 	int 		xpixel;			/* X graphics size */
 	int 		ypixel;			/* Y graphics size */
 	int		xoff;			/* X offset in pixel mode */
 	int		yoff;			/* Y offset in pixel mode */
+
 	u_char		*font;			/* current font */
 	int		font_size;		/* fontsize in Y direction */
+
 	int		start;			/* modified area start */
 	int		end;			/* modified area end */
-	term_stat 	term;			/* terminal emulation stuff */
+
+	struct sc_term_sw *tsw;
+	void		*ts;
+
 	int	 	status;			/* status (bitfield) */
 	int		kbd_mode;		/* keyboard I/O mode */
+
 	int		cursor_pos;		/* cursor buffer position */
 	int		cursor_oldpos;		/* cursor old buffer position */
 	u_short		cursor_saveunder_char;	/* saved char under cursor */
 	u_short		cursor_saveunder_attr;	/* saved attr under cursor */
 	char		cursor_base;		/* cursor base line # */
 	char		cursor_height;		/* cursor height */
+
 	int		mouse_pos;		/* mouse buffer position */
 	int		mouse_oldpos;		/* mouse old buffer position */
 	short		mouse_xpos;		/* mouse x coordinate */
@@ -285,16 +255,20 @@ typedef struct scr_stat {
 	struct proc 	*mouse_proc;		/* proc* of controlling proc */
 	pid_t 		mouse_pid;		/* pid of controlling proc */
 	int		mouse_signal;		/* signal # to report with */
+
 	u_short		bell_duration;
 	u_short		bell_pitch;
+
 	u_char		border;			/* border color */
 	int	 	mode;			/* mode */
 	pid_t 		pid;			/* pid of controlling proc */
 	struct proc 	*proc;			/* proc* of controlling proc */
 	struct vt_mode 	smode;			/* switch mode */
+
 	sc_vtb_t	*history;		/* circular history buffer */
 	int		history_pos;		/* position shown on screen */
 	int		history_size;		/* size of history buffer */
+
 	int		splash_save_mode;	/* saved mode for splash screen */
 	int		splash_save_status;	/* saved status for splash screen */
 #ifdef _SCR_MD_STAT_DECLARED_
@@ -302,11 +276,6 @@ typedef struct scr_stat {
 #endif
 } scr_stat;
 
-typedef struct default_attr {
-	int             std_color;              /* normal hardware color */
-	int             rev_color;              /* reverse hardware color */
-} default_attr;
-
 #ifndef SC_NORM_ATTR
 #define SC_NORM_ATTR		(FG_LIGHTGREY | BG_BLACK)
 #endif
@@ -320,6 +289,74 @@ typedef struct default_attr {
 #define SC_KERNEL_CONS_REV_ATTR	(FG_BLACK | BG_LIGHTGREY)
 #endif
 
+/* terminal emulator */
+
+#ifndef SC_DFLT_TERM
+#define SC_DFLT_TERM	"*"			/* any */
+#endif
+
+typedef int	sc_term_init_t(scr_stat *scp, void **tcp, int code);
+#define SC_TE_COLD_INIT	0
+#define SC_TE_WARM_INIT	1
+typedef int	sc_term_term_t(scr_stat *scp, void **tcp);
+typedef void	sc_term_puts_t(scr_stat *scp, u_char *buf, int len);
+typedef int	sc_term_ioctl_t(scr_stat *scp, struct tty *tp, u_long cmd,
+				caddr_t data, int flag, struct proc *p);
+typedef int	sc_term_reset_t(scr_stat *scp, int code);
+#define SC_TE_HARD_RESET 0
+#define SC_TE_SOFT_RESET 1
+typedef void	sc_term_default_attr_t(scr_stat *scp, int norm, int rev);
+typedef void	sc_term_clear_t(scr_stat *scp);
+typedef void	sc_term_notify_t(scr_stat *scp, int event);
+#define SC_TE_NOTIFY_VTSWITCH_IN	0
+#define SC_TE_NOTIFY_VTSWITCH_OUT	1
+typedef int	sc_term_input_t(scr_stat *scp, int c, struct tty *tp);
+
+typedef struct sc_term_sw {
+	LIST_ENTRY(sc_term_sw)	link;
+	char 			*te_name;	/* name of the emulator */
+	char 			*te_desc;	/* description */
+	char 			*te_renderer;	/* matching renderer */
+	size_t			te_size;	/* size of internal buffer */
+	int			te_refcount;	/* reference counter */
+	sc_term_init_t		*te_init;
+	sc_term_term_t		*te_term;
+	sc_term_puts_t		*te_puts;
+	sc_term_ioctl_t		*te_ioctl;
+	sc_term_reset_t		*te_reset;
+	sc_term_default_attr_t	*te_default_attr;
+	sc_term_clear_t		*te_clear;
+	sc_term_notify_t	*te_notify;
+	sc_term_input_t		*te_input;
+} sc_term_sw_t;
+
+extern struct linker_set scterm_set;
+
+#define SCTERM_MODULE(name, sw)					\
+	DATA_SET(scterm_set, sw);				\
+	static int						\
+	scterm_##name##_event(module_t mod, int type, void *data) \
+	{							\
+		switch (type) {					\
+		case MOD_LOAD:					\
+			return sc_term_add(&sw);		\
+		case MOD_UNLOAD:				\
+			if (sw.te_refcount > 0)			\
+				return EBUSY;			\
+			return sc_term_remove(&sw);		\
+		default:					\
+			break;					\
+		}						\
+		return 0;					\
+	}							\
+	static moduledata_t scterm_##name##_mod = {		\
+		"scterm-" #name,				\
+		scterm_##name##_event,				\
+		NULL,						\
+	};							\
+	DECLARE_MODULE(scterm_##name, scterm_##name##_mod,	\
+		       SI_SUB_DRIVERS, SI_ORDER_MIDDLE)
+
 /* renderer function table */
 typedef void	vr_clear_t(scr_stat *scp, int c, int attr);
 typedef void	vr_draw_border_t(scr_stat *scp, int color);
@@ -343,18 +380,57 @@ typedef struct sc_rndr_sw {
 } sc_rndr_sw_t;
 
 typedef struct sc_renderer {
-	char		*name;
-	int		mode;
-	sc_rndr_sw_t	*rndrsw;
+	char			*name;
+	int			mode;
+	sc_rndr_sw_t		*rndrsw;
+	LIST_ENTRY(sc_renderer)	link;
 } sc_renderer_t;
 
-#define RENDERER(name, mode, sw)				\
-	static struct sc_renderer name##_##mode##_renderer = {	\
+extern struct linker_set scrndr_set;
+
+#define RENDERER(name, mode, sw, set)				\
+	static struct sc_renderer scrndr_##name##_##mode## = {	\
 		#name, mode, &sw				\
 	};							\
-	DATA_SET(scrndr_set, name##_##mode##_renderer)
-
-extern struct linker_set scrndr_set;
+	DATA_SET(scrndr_set, scrndr_##name##_##mode##);		\
+	DATA_SET(set, scrndr_##name##_##mode##)
+
+#define RENDERER_MODULE(name, set)				\
+	static int						\
+	scrndr_##name##_event(module_t mod, int type, void *data) \
+	{							\
+		sc_renderer_t **list;				\
+		sc_renderer_t *p;				\
+		int error = 0;					\
+		switch (type) {					\
+		case MOD_LOAD:					\
+			list = (sc_renderer_t **)set.ls_items;	\
+			while ((p = *list++) != NULL) {		\
+				error = sc_render_add(p);	\
+				if (error)			\
+					break;			\
+			}					\
+			break;					\
+		case MOD_UNLOAD:				\
+			list = (sc_renderer_t **)set.ls_items;	\
+			while ((p = *list++) != NULL) {		\
+				error = sc_render_remove(p);	\
+				if (error)			\
+					break;			\
+			}					\
+			break;					\
+		default:					\
+			break;					\
+		}						\
+		return error;					\
+	}							\
+	static moduledata_t scrndr_##name##_mod = {		\
+		"scrndr-" #name,				\
+		scrndr_##name##_event,				\
+		NULL,						\
+	};							\
+	DECLARE_MODULE(scrndr_##name##, scrndr_##name##_mod, 	\
+		       SI_SUB_DRIVERS, SI_ORDER_MIDDLE)
 
 typedef struct {
 	int		cursor_start;
@@ -415,21 +491,26 @@ int		sc_resume_unit(int unit);
 
 int		set_mode(scr_stat *scp);
 
-void		copy_font(scr_stat *scp, int operation, int font_size,
-			  u_char *font_image);
-void		set_border(scr_stat *scp, int color);
+void		sc_set_border(scr_stat *scp, int color);
+void		sc_load_font(scr_stat *scp, int page, int size, u_char *font,
+			     int base, int count);
+void		sc_save_font(scr_stat *scp, int page, int size, u_char *font,
+			     int base, int count);
+void		sc_show_font(scr_stat *scp, int page);
 
 void		sc_touch_scrn_saver(void);
-void		sc_clear_screen(scr_stat *scp);
+void		sc_puts(scr_stat *scp, u_char *buf, int len);
+void		sc_draw_cursor_image(scr_stat *scp);
+void		sc_remove_cursor_image(scr_stat *scp);
 void		sc_set_cursor_image(scr_stat *scp);
 int		sc_clean_up(scr_stat *scp);
+int		sc_switch_scr(sc_softc_t *sc, u_int next_scr);
 void		sc_alloc_scr_buffer(scr_stat *scp, int wait, int discard);
-#ifndef SC_NO_SYSMOUSE
-struct tty	*sc_get_mouse_tty(void);
-#endif /* SC_NO_SYSMOUSE */
+int		sc_init_emulator(scr_stat *scp, char *name);
 #ifndef SC_NO_CUTPASTE
 void		sc_paste(scr_stat *scp, u_char *p, int count);
 #endif /* SC_NO_CUTPASTE */
+void		sc_bell(scr_stat *scp, int pitch, int duration);
 
 /* schistory.c */
 #ifndef SC_NO_HISTORY
@@ -462,7 +543,6 @@ void		sc_remove_all_mouse(sc_softc_t *scp);
 #define		sc_remove_cutmarking(scp)
 #endif /* SC_NO_CUTPASTE */
 #ifndef SC_NO_SYSMOUSE
-void		sc_mouse_set_level(int level);
 void		sc_mouse_move(scr_stat *scp, int x, int y);
 int		sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data,
 			       int flag, struct proc *p);
@@ -474,10 +554,13 @@ int		sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode,
 int		sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode);
 int		sc_set_pixel_mode(scr_stat *scp, struct tty *tp,
 				  int xsize, int ysize, int fontsize);
-sc_rndr_sw_t	*sc_render_match(scr_stat *scp, video_adapter_t *adp, int mode);
 int		sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
 			     struct proc *p);
 
+int		sc_render_add(sc_renderer_t *rndr);
+int		sc_render_remove(sc_renderer_t *rndr);
+sc_rndr_sw_t	*sc_render_match(scr_stat *scp, char *name, int mode);
+
 /* scvtb.c */
 void		sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, 
 			    void *buffer, int wait);
@@ -506,6 +589,17 @@ void		sc_vtb_move(sc_vtb_t *vtb, int from, int to, int count);
 void		sc_vtb_delete(sc_vtb_t *vtb, int at, int count, int c, int attr);
 void		sc_vtb_ins(sc_vtb_t *vtb, int at, int count, int c, int attr);
 
+/* sysmouse.c */
+int		sysmouse_event(mouse_info_t *info);
+
+/* scterm.c */
+void		sc_move_cursor(scr_stat *scp, int x, int y);
+void		sc_clear_screen(scr_stat *scp);
+int		sc_term_add(sc_term_sw_t *sw);
+int		sc_term_remove(sc_term_sw_t *sw);
+sc_term_sw_t	*sc_term_match(char *name);
+sc_term_sw_t	*sc_term_match_by_number(int index);
+
 /* machine dependent functions */
 int		sc_max_unit(void);
 sc_softc_t	*sc_get_softc(int unit, int flags);
diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c
new file mode 100644
index 000000000000..8c28ab725119
--- /dev/null
+++ b/sys/dev/syscons/sysmouse.c
@@ -0,0 +1,344 @@
+/*-
+ * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include "sc.h"
+#include "opt_syscons.h"
+
+#if NSC > 0
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/kernel.h>
+
+#include <machine/console.h>
+#include <machine/mouse.h>
+
+#include <dev/syscons/syscons.h>
+
+#ifndef SC_NO_SYSMOUSE
+
+#define	CDEV_MAJOR	12		/* major number, shared with syscons */
+#define SC_MOUSE 	128		/* minor number */
+
+static d_open_t		smopen;
+static d_close_t	smclose;
+static d_ioctl_t	smioctl;
+
+static struct cdevsw sm_cdevsw = {
+	/* open */	smopen,
+	/* close */	smclose,
+	/* read */	ttyread,
+	/* write */	nowrite,
+	/* ioctl */	smioctl,
+	/* poll */	ttypoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"sysmouse",
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* bmaj */	-1
+};
+
+/* local variables */
+static struct tty	*sysmouse_tty;
+static int		mouse_level;	/* sysmouse protocol level */
+static mousestatus_t	mouse_status;
+
+static void		smstart(struct tty *tp);
+static int		smparam(struct tty *tp, struct termios *t);
+
+static int
+smopen(dev_t dev, int flag, int mode, struct proc *p)
+{
+	struct tty *tp;
+
+	DPRINTF(5, ("smopen: dev:%d,%d, vty:%d\n",
+		major(dev), minor(dev), SC_VTY(dev)));
+
+#if 0
+	if (SC_VTY(dev) != SC_MOUSE)
+		return ENXIO;
+#endif
+
+	tp = dev->si_tty = ttymalloc(dev->si_tty);
+	if (!(tp->t_state & TS_ISOPEN)) {
+		tp->t_oproc = smstart;
+		tp->t_param = smparam;
+		tp->t_stop = nottystop;
+		tp->t_dev = dev;
+		ttychars(tp);
+		tp->t_iflag = TTYDEF_IFLAG;
+		tp->t_oflag = TTYDEF_OFLAG;
+		tp->t_cflag = TTYDEF_CFLAG;
+		tp->t_lflag = TTYDEF_LFLAG;
+		tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED;
+		smparam(tp, &tp->t_termios);
+		(*linesw[tp->t_line].l_modem)(tp, 1);
+	} else if (tp->t_state & TS_XCLUDE && suser(p)) {
+		return EBUSY;
+	}
+
+	return (*linesw[tp->t_line].l_open)(dev, tp);
+}
+
+static int
+smclose(dev_t dev, int flag, int mode, struct proc *p)
+{
+	struct tty *tp;
+	int s;
+
+	tp = dev->si_tty;
+	s = spltty();
+	mouse_level = 0;
+	(*linesw[tp->t_line].l_close)(tp, flag);
+	ttyclose(tp);
+	splx(s);
+
+	return 0;
+}
+
+static void
+smstart(struct tty *tp)
+{
+	struct clist *rbp;
+	u_char buf[PCBURST];
+	int s;
+
+	s = spltty();
+	if (!(tp->t_state & (TS_TIMEOUT | TS_BUSY | TS_TTSTOP))) {
+		tp->t_state |= TS_BUSY;
+		rbp = &tp->t_outq;
+		while (rbp->c_cc)
+			q_to_b(rbp, buf, PCBURST);
+		tp->t_state &= ~TS_BUSY;
+		ttwwakeup(tp);
+	}
+	splx(s);
+}
+
+static int
+smparam(struct tty *tp, struct termios *t)
+{
+	tp->t_ispeed = t->c_ispeed;
+	tp->t_ospeed = t->c_ospeed;
+	tp->t_cflag = t->c_cflag;
+	return 0;
+}
+
+static int
+smioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+{
+	struct tty *tp;
+	mousehw_t *hw;
+	mousemode_t *mode;
+	int error;
+	int s;
+
+	tp = dev->si_tty;
+	switch (cmd) {
+
+	case MOUSE_GETHWINFO:	/* get device information */
+		hw = (mousehw_t *)data;
+		hw->buttons = 10;		/* XXX unknown */
+		hw->iftype = MOUSE_IF_SYSMOUSE;
+		hw->type = MOUSE_MOUSE;
+		hw->model = MOUSE_MODEL_GENERIC;
+		hw->hwid = 0;
+		return 0;
+
+	case MOUSE_GETMODE:	/* get protocol/mode */
+		mode = (mousemode_t *)data;
+		mode->level = mouse_level;
+		switch (mode->level) {
+		case 0: /* emulate MouseSystems protocol */
+			mode->protocol = MOUSE_PROTO_MSC;
+			mode->rate = -1;		/* unknown */
+			mode->resolution = -1;	/* unknown */
+			mode->accelfactor = 0;	/* disabled */
+			mode->packetsize = MOUSE_MSC_PACKETSIZE;
+			mode->syncmask[0] = MOUSE_MSC_SYNCMASK;
+			mode->syncmask[1] = MOUSE_MSC_SYNC;
+			break;
+
+		case 1: /* sysmouse protocol */
+			mode->protocol = MOUSE_PROTO_SYSMOUSE;
+			mode->rate = -1;
+			mode->resolution = -1;
+			mode->accelfactor = 0;
+			mode->packetsize = MOUSE_SYS_PACKETSIZE;
+			mode->syncmask[0] = MOUSE_SYS_SYNCMASK;
+			mode->syncmask[1] = MOUSE_SYS_SYNC;
+			break;
+		}
+		return 0;
+
+	case MOUSE_SETMODE:	/* set protocol/mode */
+		mode = (mousemode_t *)data;
+		if ((mode->level < 0) || (mode->level > 1))
+			return EINVAL;
+		mouse_level = mode->level;
+		return 0;
+
+	case MOUSE_GETLEVEL:	/* get operation level */
+		*(int *)data = mouse_level;
+		return 0;
+
+	case MOUSE_SETLEVEL:	/* set operation level */
+		if ((*(int *)data  < 0) || (*(int *)data > 1))
+			return EINVAL;
+		mouse_level = *(int *)data;
+		return 0;
+
+	case MOUSE_GETSTATUS:	/* get accumulated mouse events */
+		s = spltty();
+		*(mousestatus_t *)data = mouse_status;
+		mouse_status.flags = 0;
+		mouse_status.obutton = mouse_status.button;
+		mouse_status.dx = 0;
+		mouse_status.dy = 0;
+		mouse_status.dz = 0;
+		splx(s);
+		return 0;
+
+#if notyet
+	case MOUSE_GETVARS:	/* get internal mouse variables */
+	case MOUSE_SETVARS:	/* set internal mouse variables */
+		return ENODEV;
+#endif
+
+	case MOUSE_READSTATE:	/* read status from the device */
+	case MOUSE_READDATA:	/* read data from the device */
+		return ENODEV;
+	}
+
+	error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p);
+	if (error != ENOIOCTL)
+		return error;
+	error = ttioctl(tp, cmd, data, flag);
+	if (error != ENOIOCTL)
+		return error;
+	return ENOTTY;
+}
+
+static void
+sm_attach_mouse(void *unused)
+{
+	dev_t dev;
+
+	dev = make_dev(&sm_cdevsw, SC_MOUSE, UID_ROOT, GID_WHEEL, 0600,
+		       "sysmouse");
+	dev->si_tty = sysmouse_tty = ttymalloc(sysmouse_tty);
+	/* sysmouse doesn't have scr_stat */
+}
+
+SYSINIT(sysmouse, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR,
+	sm_attach_mouse, NULL)
+
+int
+sysmouse_event(mouse_info_t *info)
+{
+	/* MOUSE_BUTTON?DOWN -> MOUSE_MSC_BUTTON?UP */
+	static int butmap[8] = {
+	    MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON2UP | MOUSE_MSC_BUTTON3UP,
+	    MOUSE_MSC_BUTTON2UP | MOUSE_MSC_BUTTON3UP,
+	    MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON3UP,
+	    MOUSE_MSC_BUTTON3UP,
+	    MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON2UP,
+	    MOUSE_MSC_BUTTON2UP,
+	    MOUSE_MSC_BUTTON1UP,
+	    0,
+	};
+	u_char buf[8];
+	int x, y, z;
+	int i;
+
+	switch (info->operation) {
+	case MOUSE_ACTION:
+        	mouse_status.button = info->u.data.buttons;
+		/* FALL THROUGH */
+	case MOUSE_MOTION_EVENT:
+		x = info->u.data.x;
+		y = info->u.data.y;
+		z = info->u.data.z;
+		break;
+	case MOUSE_BUTTON_EVENT:
+		x = y = z = 0;
+		if (info->u.event.value > 0)
+			mouse_status.button |= info->u.event.id;
+		else
+			mouse_status.button &= ~info->u.event.id;
+		break;
+	default:
+		return 0;
+	}
+
+	mouse_status.dx += x;
+	mouse_status.dy += y;
+	mouse_status.dz += z;
+	mouse_status.flags |= ((x || y || z) ? MOUSE_POSCHANGED : 0)
+			      | (mouse_status.obutton ^ mouse_status.button);
+	if (mouse_status.flags == 0)
+		return 0;
+
+	if ((sysmouse_tty == NULL) || !(sysmouse_tty->t_state & TS_ISOPEN))
+		return mouse_status.flags;
+
+	/* the first five bytes are compatible with MouseSystems' */
+	buf[0] = MOUSE_MSC_SYNC
+		 | butmap[mouse_status.button & MOUSE_STDBUTTONS];
+	x = imax(imin(x, 255), -256);
+	buf[1] = x >> 1;
+	buf[3] = x - buf[1];
+	y = -imax(imin(y, 255), -256);
+	buf[2] = y >> 1;
+	buf[4] = y - buf[2];
+	for (i = 0; i < MOUSE_MSC_PACKETSIZE; ++i)
+		(*linesw[sysmouse_tty->t_line].l_rint)(buf[i], sysmouse_tty);
+	if (mouse_level >= 1) {
+		/* extended part */
+        	z = imax(imin(z, 127), -128);
+        	buf[5] = (z >> 1) & 0x7f;
+        	buf[6] = (z - (z >> 1)) & 0x7f;
+        	/* buttons 4-10 */
+        	buf[7] = (~mouse_status.button >> 3) & 0x7f;
+        	for (i = MOUSE_MSC_PACKETSIZE; i < MOUSE_SYS_PACKETSIZE; ++i)
+			(*linesw[sysmouse_tty->t_line].l_rint)(buf[i],
+							       sysmouse_tty);
+	}
+
+	return mouse_status.flags;
+}
+
+#endif /* !SC_NO_SYSMOUSE */
+
+#endif /* NSC */
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index bc03f6446401..b056b486a039 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -240,7 +240,7 @@ daemon_saver(video_adapter_t *adp, int blank)
 			sc_vtb_clear(&scp->scr, sc->scr_map[0x20],
 				     (FG_LIGHTGREY | BG_BLACK) << 8);
 			(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
-			set_border(scp, 0);
+			sc_set_border(scp, 0);
 			xlen = ylen = tlen = 0;
 		}
 		if (blanked++ < 2)
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index 093e564bef13..e4277e3beee2 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -79,7 +79,7 @@ snake_saver(video_adapter_t *adp, int blank)
 			sc_vtb_clear(&scp->scr, sc->scr_map[0x20],
 				     (FG_LIGHTGREY | BG_BLACK) << 8);
 			(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
-			set_border(scp, 0);
+			sc_set_border(scp, 0);
 			dirx = (scp->xpos ? 1 : -1);
 			diry = (scp->ypos ?
 				scp->xsize : -scp->xsize);
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 645e4fd3c354..27e992133ee7 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -85,7 +85,7 @@ star_saver(video_adapter_t *adp, int blank)
 			sc_vtb_clear(&scp->scr, sc->scr_map[0x20],
 				     (FG_LIGHTGREY | BG_BLACK) << 8);
 			(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
-			set_border(scp, 0);
+			sc_set_border(scp, 0);
 			blanked = TRUE;
 			for(i=0; i<NUM_STARS; i++) {
 				stars[i][0] =
diff --git a/sys/sys/consio.h b/sys/sys/consio.h
index d3e9780241a1..2f5ae3de7d43 100644
--- a/sys/sys/consio.h
+++ b/sys/sys/consio.h
@@ -239,6 +239,21 @@ typedef struct vid_info vid_info_t;
 /* release the current keyboard */
 #define CONS_RELKBD	_IO('c', 111)
 
+/* get/set the current terminal emulator info. */
+#define TI_NAME_LEN	32
+#define TI_DESC_LEN	64
+
+struct term_info {
+	int		ti_index;
+	int		ti_flags;
+	u_char		ti_name[TI_NAME_LEN];
+	u_char		ti_desc[TI_DESC_LEN];
+};
+typedef struct term_info term_info_t;
+
+#define CONS_GETTERM	_IOWR('c', 112, term_info_t)
+#define CONS_SETTERM	_IOW('c', 113, term_info_t)
+
 #ifdef PC98
 #define ADJUST_CLOCK	_IO('t',100)		/* for 98note resume */
 #endif
-- 
cgit v1.3


From b95b56c7a06bd268299c6d3b1104e09831e600dc Mon Sep 17 00:00:00 2001
From: Yoshihiro Takahashi <nyan@FreeBSD.org>
Date: Mon, 8 May 2000 14:55:21 +0000
Subject: Added PC-98 supports.

Obtained from:	FreeBSD(98) 4.0R-Rev01
---
 sys/dev/syscons/daemon/daemon_saver.c     | 10 ++++++++++
 sys/dev/syscons/snake/snake_saver.c       |  4 ++++
 sys/dev/syscons/star/star_saver.c         |  4 ++++
 sys/modules/syscons/daemon/Makefile       |  4 ++++
 sys/modules/syscons/daemon/daemon_saver.c | 10 ++++++++++
 sys/modules/syscons/snake/Makefile        |  4 ++++
 sys/modules/syscons/snake/snake_saver.c   |  4 ++++
 sys/modules/syscons/star/Makefile         |  4 ++++
 sys/modules/syscons/star/star_saver.c     |  4 ++++
 9 files changed, 48 insertions(+)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index b056b486a039..5d5c5393b1fd 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -43,6 +43,10 @@
 #include <dev/fb/splashreg.h>
 #include <dev/syscons/syscons.h>
 
+#ifdef PC98
+#include <pc98/pc98/pc98_machdep.h>
+#endif
+
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
@@ -200,9 +204,15 @@ draw_string(sc_softc_t *sc, int xpos, int ypos, int xoff, char *s, int len)
 	int x;
 
 	for (x = xoff; x < len; x++) {
+#ifdef PC98
+		sc_vtb_putc(&sc->cur_scp->scr,
+			    ypos*sc->cur_scp->xsize + xpos + x,
+			    sc->scr_map[s[x]], (FG_GREEN | BG_BLACK) << 8);
+#else
 		sc_vtb_putc(&sc->cur_scp->scr,
 			    ypos*sc->cur_scp->xsize + xpos + x,
 			    sc->scr_map[s[x]], (FG_LIGHTGREEN | BG_BLACK) << 8);
+#endif
 	}
 }
 
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index e4277e3beee2..a9a067ac4ee7 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -43,6 +43,10 @@
 #include <dev/fb/splashreg.h>
 #include <dev/syscons/syscons.h>
 
+#ifdef PC98
+#include <pc98/pc98/pc98_machdep.h>
+#endif
+
 static char	*message;
 static int	*messagep;
 static int	messagelen;
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 27e992133ee7..00088528c8c3 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -41,6 +41,10 @@
 #include <dev/fb/splashreg.h>
 #include <dev/syscons/syscons.h>
 
+#ifdef PC98
+#include <pc98/pc98/pc98_machdep.h>
+#endif
+
 #define NUM_STARS	50
 
 static int blanked;
diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile
index 9f7744697038..8e9a47100219 100644
--- a/sys/modules/syscons/daemon/Makefile
+++ b/sys/modules/syscons/daemon/Makefile
@@ -6,4 +6,8 @@ SRCS= 	daemon_saver.c
 NOMAN=
 CFLAGS+= -I${.CURDIR}/..
 
+.if ${MACHINE} == "pc98"
+CFLAGS+= -DPC98
+.endif
+
 .include "${.CURDIR}/../../../conf/kmod.mk"
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index b056b486a039..5d5c5393b1fd 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -43,6 +43,10 @@
 #include <dev/fb/splashreg.h>
 #include <dev/syscons/syscons.h>
 
+#ifdef PC98
+#include <pc98/pc98/pc98_machdep.h>
+#endif
+
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
@@ -200,9 +204,15 @@ draw_string(sc_softc_t *sc, int xpos, int ypos, int xoff, char *s, int len)
 	int x;
 
 	for (x = xoff; x < len; x++) {
+#ifdef PC98
+		sc_vtb_putc(&sc->cur_scp->scr,
+			    ypos*sc->cur_scp->xsize + xpos + x,
+			    sc->scr_map[s[x]], (FG_GREEN | BG_BLACK) << 8);
+#else
 		sc_vtb_putc(&sc->cur_scp->scr,
 			    ypos*sc->cur_scp->xsize + xpos + x,
 			    sc->scr_map[s[x]], (FG_LIGHTGREEN | BG_BLACK) << 8);
+#endif
 	}
 }
 
diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile
index 4b62a4cfc2eb..986479a6832d 100644
--- a/sys/modules/syscons/snake/Makefile
+++ b/sys/modules/syscons/snake/Makefile
@@ -6,4 +6,8 @@ SRCS= 	snake_saver.c
 NOMAN=
 CFLAGS+= -I${.CURDIR}/..
 
+.if ${MACHINE} == "pc98"
+CFLAGS+= -DPC98
+.endif
+
 .include "${.CURDIR}/../../../conf/kmod.mk"
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index e4277e3beee2..a9a067ac4ee7 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -43,6 +43,10 @@
 #include <dev/fb/splashreg.h>
 #include <dev/syscons/syscons.h>
 
+#ifdef PC98
+#include <pc98/pc98/pc98_machdep.h>
+#endif
+
 static char	*message;
 static int	*messagep;
 static int	messagelen;
diff --git a/sys/modules/syscons/star/Makefile b/sys/modules/syscons/star/Makefile
index 65ecbfa788ac..985b7ab296ea 100644
--- a/sys/modules/syscons/star/Makefile
+++ b/sys/modules/syscons/star/Makefile
@@ -6,4 +6,8 @@ SRCS= 	star_saver.c
 NOMAN=
 CFLAGS+= -I${.CURDIR}/..
 
+.if ${MACHINE} == "pc98"
+CFLAGS+= -DPC98
+.endif
+
 .include "${.CURDIR}/../../../conf/kmod.mk"
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 27e992133ee7..00088528c8c3 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -41,6 +41,10 @@
 #include <dev/fb/splashreg.h>
 #include <dev/syscons/syscons.h>
 
+#ifdef PC98
+#include <pc98/pc98/pc98_machdep.h>
+#endif
+
 #define NUM_STARS	50
 
 static int blanked;
-- 
cgit v1.3


From 2eb8169a1ad3bd8c7960767a5bc471c8d8bc677e Mon Sep 17 00:00:00 2001
From: Yoshihiro Takahashi <nyan@FreeBSD.org>
Date: Wed, 21 Feb 2001 11:28:02 +0000
Subject: Fixed warnings.

---
 sys/dev/syscons/daemon/daemon_saver.c     | 20 ++++++++++----------
 sys/dev/syscons/snake/snake_saver.c       |  2 +-
 sys/dev/syscons/star/star_saver.c         |  6 +++---
 sys/modules/syscons/daemon/daemon_saver.c | 20 ++++++++++----------
 sys/modules/syscons/snake/snake_saver.c   |  2 +-
 sys/modules/syscons/star/star_saver.c     |  6 +++---
 6 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 5d5c5393b1fd..3cd58305cde5 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -50,13 +50,13 @@
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
-static char *message;
+static u_char *message;
 static int messagelen;
 static int blanked;
 
 /* Who is the author of this ASCII pic? */
 
-static char *daemon_pic[] = {
+static u_char *daemon_pic[] = {
         "             ,        ,",
 	"            /(        )`",
 	"            \\ \\___   / |",
@@ -79,7 +79,7 @@ static char *daemon_pic[] = {
 	NULL
 };
 
-static char *daemon_attr[] = {
+static u_char *daemon_attr[] = {
         "             R        R",
 	"            RR        RR",
 	"            R RRRR   R R",
@@ -107,11 +107,11 @@ static char *daemon_attr[] = {
  * should do alphanumerics too, but I'm too lazy. <cshenton@it.hq.nasa.gov>
  */
 
-static char
-xflip_symbol(char symbol)
+static u_char
+xflip_symbol(u_char symbol)
 {
-	static const char lchars[] = "`'(){}[]\\/<>";
-	static const char rchars[] = "'`)(}{][/\\><";
+	static const u_char lchars[] = "`'(){}[]\\/<>";
+	static const u_char rchars[] = "'`)(}{][/\\><";
 	int pos;
 
 	for (pos = 0; lchars[pos] != '\0'; pos++)
@@ -199,7 +199,7 @@ clear_string(sc_softc_t *sc, int xpos, int ypos, int xoff, char *s, int len)
 }
 
 static void
-draw_string(sc_softc_t *sc, int xpos, int ypos, int xoff, char *s, int len)
+draw_string(sc_softc_t *sc, int xpos, int ypos, int xoff, u_char *s, int len)
 {
 	int x;
 
@@ -258,7 +258,7 @@ daemon_saver(video_adapter_t *adp, int blank)
 		blanked = 1;
 
  		clear_daemon(sc, dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
-		clear_string(sc, txpos, typos, toff, (char *)message, tlen);
+		clear_string(sc, txpos, typos, toff, message, tlen);
 
 		if (++moved_daemon) {
 			/*
@@ -364,7 +364,7 @@ daemon_saver(video_adapter_t *adp, int blank)
 			tlen = scp->xsize - txpos;
 
  		draw_daemon(sc, dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
-		draw_string(sc, txpos, typos, toff, (char *)message, tlen);
+		draw_string(sc, txpos, typos, toff, message, tlen);
 	} else {
 #ifdef PC98
 		if (epson_machine_id == 0x20) {
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index a9a067ac4ee7..ea5651fee2f6 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -47,7 +47,7 @@
 #include <pc98/pc98/pc98_machdep.h>
 #endif
 
-static char	*message;
+static u_char	*message;
 static int	*messagep;
 static int	messagelen;
 static int	blanked;
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 00088528c8c3..a1f24b89fcc1 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -59,12 +59,12 @@ star_saver(video_adapter_t *adp, int blank)
 	sc_softc_t	*sc;
 	scr_stat	*scp;
 	int		cell, i;
-	char 		pattern[] = {"...........++++***   "};
+	static u_char	pattern[] = {"...........++++***   "};
 #ifndef PC98
-	char		colors[] = {FG_DARKGREY, FG_LIGHTGREY,
+	static char	colors[] = {FG_DARKGREY, FG_LIGHTGREY,
 				    FG_WHITE, FG_LIGHTCYAN};
 #else
-	char		colors[] = {FG_BLUE, FG_LIGHTGREY,
+	static char	colors[] = {FG_BLUE, FG_LIGHTGREY,
 				    FG_LIGHTGREY, FG_CYAN};
 #endif /* PC98 */
 	static u_short 	stars[NUM_STARS][2];
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index 5d5c5393b1fd..3cd58305cde5 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -50,13 +50,13 @@
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
-static char *message;
+static u_char *message;
 static int messagelen;
 static int blanked;
 
 /* Who is the author of this ASCII pic? */
 
-static char *daemon_pic[] = {
+static u_char *daemon_pic[] = {
         "             ,        ,",
 	"            /(        )`",
 	"            \\ \\___   / |",
@@ -79,7 +79,7 @@ static char *daemon_pic[] = {
 	NULL
 };
 
-static char *daemon_attr[] = {
+static u_char *daemon_attr[] = {
         "             R        R",
 	"            RR        RR",
 	"            R RRRR   R R",
@@ -107,11 +107,11 @@ static char *daemon_attr[] = {
  * should do alphanumerics too, but I'm too lazy. <cshenton@it.hq.nasa.gov>
  */
 
-static char
-xflip_symbol(char symbol)
+static u_char
+xflip_symbol(u_char symbol)
 {
-	static const char lchars[] = "`'(){}[]\\/<>";
-	static const char rchars[] = "'`)(}{][/\\><";
+	static const u_char lchars[] = "`'(){}[]\\/<>";
+	static const u_char rchars[] = "'`)(}{][/\\><";
 	int pos;
 
 	for (pos = 0; lchars[pos] != '\0'; pos++)
@@ -199,7 +199,7 @@ clear_string(sc_softc_t *sc, int xpos, int ypos, int xoff, char *s, int len)
 }
 
 static void
-draw_string(sc_softc_t *sc, int xpos, int ypos, int xoff, char *s, int len)
+draw_string(sc_softc_t *sc, int xpos, int ypos, int xoff, u_char *s, int len)
 {
 	int x;
 
@@ -258,7 +258,7 @@ daemon_saver(video_adapter_t *adp, int blank)
 		blanked = 1;
 
  		clear_daemon(sc, dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
-		clear_string(sc, txpos, typos, toff, (char *)message, tlen);
+		clear_string(sc, txpos, typos, toff, message, tlen);
 
 		if (++moved_daemon) {
 			/*
@@ -364,7 +364,7 @@ daemon_saver(video_adapter_t *adp, int blank)
 			tlen = scp->xsize - txpos;
 
  		draw_daemon(sc, dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
-		draw_string(sc, txpos, typos, toff, (char *)message, tlen);
+		draw_string(sc, txpos, typos, toff, message, tlen);
 	} else {
 #ifdef PC98
 		if (epson_machine_id == 0x20) {
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index a9a067ac4ee7..ea5651fee2f6 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -47,7 +47,7 @@
 #include <pc98/pc98/pc98_machdep.h>
 #endif
 
-static char	*message;
+static u_char	*message;
 static int	*messagep;
 static int	messagelen;
 static int	blanked;
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 00088528c8c3..a1f24b89fcc1 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -59,12 +59,12 @@ star_saver(video_adapter_t *adp, int blank)
 	sc_softc_t	*sc;
 	scr_stat	*scp;
 	int		cell, i;
-	char 		pattern[] = {"...........++++***   "};
+	static u_char	pattern[] = {"...........++++***   "};
 #ifndef PC98
-	char		colors[] = {FG_DARKGREY, FG_LIGHTGREY,
+	static char	colors[] = {FG_DARKGREY, FG_LIGHTGREY,
 				    FG_WHITE, FG_LIGHTCYAN};
 #else
-	char		colors[] = {FG_BLUE, FG_LIGHTGREY,
+	static char	colors[] = {FG_BLUE, FG_LIGHTGREY,
 				    FG_LIGHTGREY, FG_CYAN};
 #endif /* PC98 */
 	static u_short 	stars[NUM_STARS][2];
-- 
cgit v1.3


From 44956c9863dc03344b03bdf6a83acf4e743f8e50 Mon Sep 17 00:00:00 2001
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Tue, 21 Jan 2003 08:56:16 +0000
Subject: Remove M_TRYWAIT/M_WAITOK/M_WAIT.  Callers should use 0. Merge
 M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.

---
 sys/alpha/alpha/busdma_machdep.c                   |  4 +-
 sys/alpha/osf1/imgact_osf1.c                       |  6 +-
 sys/alpha/osf1/osf1_misc.c                         | 10 ++--
 sys/amd64/amd64/amd64_mem.c                        |  2 +-
 sys/amd64/amd64/bios.c                             |  2 +-
 sys/amd64/amd64/busdma_machdep.c                   |  4 +-
 sys/amd64/amd64/mem.c                              |  4 +-
 sys/amd64/amd64/mp_machdep.c                       |  8 +--
 sys/amd64/amd64/mptable.c                          |  8 +--
 sys/amd64/amd64/sys_machdep.c                      |  2 +-
 sys/amd64/ia32/ia32_misc.c                         | 10 ++--
 sys/amd64/include/mptable.h                        |  8 +--
 sys/cam/cam_periph.c                               |  2 +-
 sys/cam/cam_sim.c                                  |  2 +-
 sys/cam/cam_xpt.c                                  |  4 +-
 sys/cam/scsi/scsi_cd.c                             | 44 +++++++-------
 sys/cam/scsi/scsi_ch.c                             |  6 +-
 sys/cam/scsi/scsi_da.c                             |  2 +-
 sys/cam/scsi/scsi_low.c                            |  2 +-
 sys/cam/scsi/scsi_sa.c                             |  8 +--
 sys/cam/scsi/scsi_target.c                         |  6 +-
 sys/coda/cnode.h                                   |  2 +-
 sys/compat/freebsd32/freebsd32_misc.c              | 10 ++--
 sys/compat/linux/linux_file.c                      |  2 +-
 sys/compat/linux/linux_getcwd.c                    |  4 +-
 sys/compat/linux/linux_ioctl.c                     |  2 +-
 sys/compat/linux/linux_mib.c                       |  2 +-
 sys/compat/linux/linux_sysctl.c                    |  2 +-
 sys/compat/linux/linux_util.c                      |  2 +-
 sys/compat/pecoff/imgact_pecoff.c                  | 12 ++--
 sys/compat/svr4/svr4_filio.c                       |  2 +-
 sys/compat/svr4/svr4_misc.c                        |  4 +-
 sys/compat/svr4/svr4_socket.c                      |  2 +-
 sys/compat/svr4/svr4_stream.c                      |  8 +--
 sys/compat/svr4/svr4_sysvec.c                      |  2 +-
 sys/contrib/dev/fla/fla.c                          |  2 +-
 sys/contrib/dev/oltr/if_oltr.c                     |  8 +--
 sys/contrib/ipfilter/netinet/fil.c                 |  6 +-
 sys/contrib/ipfilter/netinet/ip_fil.c              | 18 +++---
 sys/dev/agp/agp.c                                  |  2 +-
 sys/dev/agp/agp_i810.c                             |  2 +-
 sys/dev/amr/amr.c                                  |  4 +-
 sys/dev/an/if_an.c                                 | 10 ++--
 sys/dev/ar/if_ar.c                                 |  6 +-
 sys/dev/asr/asr.c                                  | 38 ++++++------
 sys/dev/ata/atapi-cam.c                            |  2 +-
 sys/dev/awi/awi.c                                  | 20 +++----
 sys/dev/awi/awi_wep.c                              | 10 ++--
 sys/dev/bge/if_bge.c                               |  6 +-
 sys/dev/cardbus/cardbus.c                          |  2 +-
 sys/dev/cardbus/cardbus_cis.c                      |  6 +-
 sys/dev/ccd/ccd.c                                  | 20 +++----
 sys/dev/ciss/ciss.c                                |  4 +-
 sys/dev/cm/smc90cx6.c                              |  4 +-
 sys/dev/cnw/if_cnw.c                               |  6 +-
 sys/dev/cs/if_cs.c                                 |  4 +-
 sys/dev/dc/if_dc.c                                 |  8 +--
 sys/dev/de/if_de.c                                 | 16 ++---
 sys/dev/digi/digi.c                                | 14 ++---
 sys/dev/dpt/dpt_scsi.c                             |  4 +-
 sys/dev/drm/drm_drv.h                              |  2 +-
 sys/dev/drm/drm_memory.h                           |  2 +-
 sys/dev/ed/if_ed.c                                 |  4 +-
 sys/dev/em/if_em.c                                 |  4 +-
 sys/dev/en/midway.c                                | 14 ++---
 sys/dev/ep/if_ep.c                                 |  8 +--
 sys/dev/ex/if_ex.c                                 |  6 +-
 sys/dev/fb/fb.c                                    |  6 +-
 sys/dev/fb/vga.c                                   |  4 +-
 sys/dev/fe/if_fe.c                                 |  4 +-
 sys/dev/firewire/if_fwe.c                          |  4 +-
 sys/dev/firewire/sbp.c                             |  6 +-
 sys/dev/fxp/if_fxp.c                               |  6 +-
 sys/dev/gem/if_gem.c                               |  2 +-
 sys/dev/gx/if_gx.c                                 |  4 +-
 sys/dev/hifn/hifn7751.c                            | 12 ++--
 sys/dev/hme/if_hme.c                               |  2 +-
 sys/dev/idt/idt.c                                  |  8 +--
 sys/dev/ie/if_ie.c                                 |  6 +-
 sys/dev/iicbus/if_ic.c                             |  4 +-
 sys/dev/isp/isp_pci.c                              |  6 +-
 sys/dev/isp/isp_sbus.c                             |  4 +-
 sys/dev/kbd/kbd.c                                  |  2 +-
 sys/dev/lge/if_lge.c                               |  2 +-
 sys/dev/lmc/if_lmc.c                               | 14 ++---
 sys/dev/lnc/if_lnc.c                               | 14 ++---
 sys/dev/md/md.c                                    |  4 +-
 sys/dev/mlx/mlx.c                                  |  2 +-
 sys/dev/mly/mly.c                                  |  2 +-
 sys/dev/mpt/mpt_pci.c                              |  4 +-
 sys/dev/musycc/musycc.c                            | 20 +++----
 sys/dev/my/if_my.c                                 |  8 +--
 sys/dev/nge/if_nge.c                               |  2 +-
 sys/dev/nmdm/nmdm.c                                |  2 +-
 sys/dev/null/null.c                                |  2 +-
 sys/dev/ofw/openfirm.c                             |  4 +-
 sys/dev/ofw/openfirmio.c                           |  4 +-
 sys/dev/pccard/pccard.c                            |  2 +-
 sys/dev/pci/pci.c                                  |  2 +-
 sys/dev/pci/pci_user.c                             |  2 +-
 sys/dev/pdq/pdq_freebsd.h                          |  4 +-
 sys/dev/pdq/pdq_ifsubr.c                           |  4 +-
 sys/dev/pdq/pdqvar.h                               |  4 +-
 sys/dev/ppbus/if_plip.c                            |  2 +-
 sys/dev/ppbus/lpt.c                                |  4 +-
 sys/dev/ppbus/vpo.c                                |  2 +-
 sys/dev/puc/puc.c                                  |  2 +-
 sys/dev/raidframe/rf_freebsdkintf.c                | 14 ++---
 sys/dev/raidframe/rf_shutdown.c                    |  2 +-
 sys/dev/random/randomdev.c                         |  4 +-
 sys/dev/ray/if_ray.c                               |  6 +-
 sys/dev/sbni/if_sbni.c                             |  4 +-
 sys/dev/sf/if_sf.c                                 |  8 +--
 sys/dev/sk/if_sk.c                                 |  2 +-
 sys/dev/sn/if_sn.c                                 |  4 +-
 sys/dev/snc/dp83932.c                              |  6 +-
 sys/dev/snp/snp.c                                  |  8 +--
 sys/dev/sound/midi/midi.c                          |  6 +-
 sys/dev/sound/midi/midibuf.c                       |  2 +-
 sys/dev/sound/midi/sequencer.c                     |  6 +-
 sys/dev/sound/midi/timer.c                         |  4 +-
 sys/dev/sound/pci/ds1.c                            |  2 +-
 sys/dev/sound/pci/emu10k1.c                        |  2 +-
 sys/dev/sound/pcm/ac97.c                           |  2 +-
 sys/dev/sound/pcm/buffer.c                         |  2 +-
 sys/dev/sound/pcm/fake.c                           |  4 +-
 sys/dev/sound/pcm/feeder.c                         |  4 +-
 sys/dev/sound/pcm/mixer.c                          |  2 +-
 sys/dev/sound/pcm/sndstat.c                        |  2 +-
 sys/dev/sound/pcm/sound.c                          |  8 +--
 sys/dev/sound/pcm/vchan.c                          |  4 +-
 sys/dev/speaker/spkr.c                             |  2 +-
 sys/dev/sr/if_sr.c                                 |  6 +-
 sys/dev/streams/streams.c                          |  2 +-
 sys/dev/syscons/daemon/daemon_saver.c              |  2 +-
 sys/dev/syscons/schistory.c                        |  2 +-
 sys/dev/syscons/scmouse.c                          |  2 +-
 sys/dev/syscons/scvtb.c                            |  2 +-
 sys/dev/syscons/snake/snake_saver.c                |  4 +-
 sys/dev/syscons/syscons.c                          | 12 ++--
 sys/dev/ti/if_ti.c                                 | 16 ++---
 sys/dev/trm/trm.c                                  |  4 +-
 sys/dev/twe/twe.c                                  |  4 +-
 sys/dev/tx/if_tx.c                                 |  8 +--
 sys/dev/tx/if_txvar.h                              |  4 +-
 sys/dev/txp/if_txp.c                               | 12 ++--
 sys/dev/ubsec/ubsec.c                              | 12 ++--
 sys/dev/usb/hid.c                                  |  4 +-
 sys/dev/usb/if_aue.c                               |  4 +-
 sys/dev/usb/if_cue.c                               |  4 +-
 sys/dev/usb/if_kue.c                               |  4 +-
 sys/dev/usb/ubsa.c                                 |  4 +-
 sys/dev/usb/udbp.c                                 |  4 +-
 sys/dev/usb/uftdi.c                                |  2 +-
 sys/dev/usb/ugen.c                                 | 10 ++--
 sys/dev/usb/uhci.c                                 |  4 +-
 sys/dev/usb/uhid.c                                 |  4 +-
 sys/dev/usb/umass.c                                |  2 +-
 sys/dev/usb/umodem.c                               |  2 +-
 sys/dev/usb/uplcom.c                               |  4 +-
 sys/dev/usb/urio.c                                 |  2 +-
 sys/dev/usb/usb.c                                  |  4 +-
 sys/dev/usb/uscanner.c                             |  4 +-
 sys/dev/usb/uvisor.c                               |  2 +-
 sys/dev/usb/uvscom.c                               |  4 +-
 sys/dev/vinum/vinumext.h                           |  2 +-
 sys/dev/vinum/vinummemory.c                        |  2 +-
 sys/dev/vr/if_vr.c                                 |  8 +--
 sys/dev/vx/if_vx.c                                 |  8 +--
 sys/dev/wi/if_wi.c                                 | 12 ++--
 sys/dev/wl/if_wl.c                                 |  2 +-
 sys/dev/xe/if_xe.c                                 |  4 +-
 sys/fs/cd9660/cd9660_vfsops.c                      |  4 +-
 sys/fs/cd9660/cd9660_vnops.c                       |  8 +--
 sys/fs/coda/cnode.h                                |  2 +-
 sys/fs/devfs/devfs_devs.c                          | 10 ++--
 sys/fs/devfs/devfs_rule.c                          |  6 +-
 sys/fs/devfs/devfs_vfsops.c                        |  4 +-
 sys/fs/devfs/devfs_vnops.c                         |  4 +-
 sys/fs/fdescfs/fdesc_vfsops.c                      |  2 +-
 sys/fs/fdescfs/fdesc_vnops.c                       |  2 +-
 sys/fs/fifofs/fifo_vnops.c                         |  2 +-
 sys/fs/hpfs/hpfs_subr.c                            |  6 +-
 sys/fs/hpfs/hpfs_vfsops.c                          |  4 +-
 sys/fs/hpfs/hpfs_vnops.c                           |  2 +-
 sys/fs/msdosfs/msdosfs_denode.c                    |  2 +-
 sys/fs/msdosfs/msdosfs_vfsops.c                    |  4 +-
 sys/fs/msdosfs/msdosfs_vnops.c                     |  2 +-
 sys/fs/ntfs/ntfs_subr.c                            | 38 ++++++------
 sys/fs/ntfs/ntfs_vfsops.c                          |  6 +-
 sys/fs/ntfs/ntfs_vnops.c                           |  2 +-
 sys/fs/nullfs/null_subr.c                          |  2 +-
 sys/fs/nullfs/null_vfsops.c                        |  2 +-
 sys/fs/nwfs/nwfs_node.c                            |  2 +-
 sys/fs/nwfs/nwfs_vfsops.c                          |  2 +-
 sys/fs/portalfs/portal_vfsops.c                    |  4 +-
 sys/fs/portalfs/portal_vnops.c                     |  4 +-
 sys/fs/pseudofs/pseudofs.c                         | 10 ++--
 sys/fs/pseudofs/pseudofs_fileno.c                  |  4 +-
 sys/fs/pseudofs/pseudofs_vncache.c                 |  2 +-
 sys/fs/smbfs/smbfs_node.c                          |  6 +-
 sys/fs/smbfs/smbfs_smb.c                           |  6 +-
 sys/fs/udf/udf_vfsops.c                            |  2 +-
 sys/fs/udf/udf_vnops.c                             | 10 ++--
 sys/fs/umapfs/umap_subr.c                          |  2 +-
 sys/fs/umapfs/umap_vfsops.c                        |  2 +-
 sys/fs/unionfs/union_subr.c                        | 14 ++---
 sys/fs/unionfs/union_vfsops.c                      |  2 +-
 sys/geom/bde/g_bde.c                               |  2 +-
 sys/geom/geom_aes.c                                |  6 +-
 sys/geom/geom_ccd.c                                | 20 +++----
 sys/geom/geom_ctl.c                                |  2 +-
 sys/geom/geom_dev.c                                |  2 +-
 sys/geom/geom_disk.c                               |  2 +-
 sys/geom/geom_event.c                              |  2 +-
 sys/geom/geom_gpt.c                                |  2 +-
 sys/geom/geom_io.c                                 |  2 +-
 sys/geom/geom_mirror.c                             |  2 +-
 sys/geom/geom_slice.c                              |  8 +--
 sys/geom/geom_subr.c                               | 14 ++---
 sys/gnu/ext2fs/ext2_inode.c                        |  2 +-
 sys/gnu/ext2fs/ext2_lookup.c                       |  4 +-
 sys/gnu/ext2fs/ext2_vfsops.c                       | 12 ++--
 sys/gnu/fs/ext2fs/ext2_inode.c                     |  2 +-
 sys/gnu/fs/ext2fs/ext2_lookup.c                    |  4 +-
 sys/gnu/fs/ext2fs/ext2_vfsops.c                    | 12 ++--
 sys/i386/i386/bios.c                               |  2 +-
 sys/i386/i386/busdma_machdep.c                     |  4 +-
 sys/i386/i386/elan-mmcr.c                          |  2 +-
 sys/i386/i386/i686_mem.c                           |  2 +-
 sys/i386/i386/mem.c                                |  4 +-
 sys/i386/i386/mp_machdep.c                         |  8 +--
 sys/i386/i386/mptable.c                            |  8 +--
 sys/i386/i386/sys_machdep.c                        |  2 +-
 sys/i386/i386/vm86.c                               |  2 +-
 sys/i386/ibcs2/ibcs2_misc.c                        |  4 +-
 sys/i386/ibcs2/ibcs2_util.c                        |  2 +-
 sys/i386/ibcs2/imgact_coff.c                       |  2 +-
 sys/i386/include/mptable.h                         |  8 +--
 sys/i386/isa/ctx.c                                 |  2 +-
 sys/i386/isa/gpib.c                                |  2 +-
 sys/i386/isa/if_cx.c                               |  8 +--
 sys/i386/isa/if_el.c                               |  6 +-
 sys/i386/isa/if_le.c                               |  6 +-
 sys/i386/isa/if_rdp.c                              |  4 +-
 sys/i386/isa/loran.c                               |  2 +-
 sys/i386/isa/pcvt/pcvt_kbd.c                       |  2 +-
 sys/i386/isa/pcvt/pcvt_out.c                       |  2 +-
 sys/i386/isa/pcvt/pcvt_sup.c                       |  2 +-
 sys/i386/isa/spkr.c                                |  2 +-
 sys/i386/isa/vesa.c                                |  6 +-
 sys/i386/isa/wt.c                                  |  2 +-
 sys/i386/linux/linux_sysvec.c                      |  2 +-
 sys/i4b/driver/i4b_ipr.c                           |  2 +-
 sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c                |  2 +-
 sys/i4b/layer2/i4b_mbuf.c                          |  8 +--
 sys/i4b/layer4/i4b_i4bdrv.c                        | 10 ++--
 sys/ia64/ia32/ia32_misc.c                          | 10 ++--
 sys/ia64/ia64/busdma_machdep.c                     |  4 +-
 sys/ia64/ia64/mca.c                                |  4 +-
 sys/ia64/ia64/mp_machdep.c                         |  2 +-
 sys/ia64/ia64/pmap.c                               |  4 +-
 sys/ia64/ia64/sscdisk.c                            |  2 +-
 sys/isofs/cd9660/cd9660_vfsops.c                   |  4 +-
 sys/isofs/cd9660/cd9660_vnops.c                    |  8 +--
 sys/kern/imgact_aout.c                             |  2 +-
 sys/kern/imgact_elf.c                              | 10 ++--
 sys/kern/inflate.c                                 |  4 +-
 sys/kern/kern_alq.c                                |  6 +-
 sys/kern/kern_descrip.c                            | 12 ++--
 sys/kern/kern_environment.c                        | 12 ++--
 sys/kern/kern_event.c                              |  8 +--
 sys/kern/kern_exec.c                               |  6 +-
 sys/kern/kern_exit.c                               |  2 +-
 sys/kern/kern_fork.c                               |  6 +-
 sys/kern/kern_intr.c                               |  4 +-
 sys/kern/kern_jail.c                               |  2 +-
 sys/kern/kern_kse.c                                |  6 +-
 sys/kern/kern_ktrace.c                             | 12 ++--
 sys/kern/kern_linker.c                             | 22 +++----
 sys/kern/kern_lockf.c                              |  4 +-
 sys/kern/kern_mac.c                                | 68 +++++++++++-----------
 sys/kern/kern_malloc.c                             |  8 +--
 sys/kern/kern_module.c                             |  2 +-
 sys/kern/kern_proc.c                               |  2 +-
 sys/kern/kern_prot.c                               |  8 +--
 sys/kern/kern_resource.c                           |  4 +-
 sys/kern/kern_subr.c                               |  4 +-
 sys/kern/kern_sysctl.c                             | 16 ++---
 sys/kern/kern_thread.c                             |  6 +-
 sys/kern/link_elf.c                                | 14 ++---
 sys/kern/link_elf_obj.c                            | 14 ++---
 sys/kern/subr_blist.c                              |  4 +-
 sys/kern/subr_clist.c                              |  4 +-
 sys/kern/subr_disk.c                               |  2 +-
 sys/kern/subr_diskslice.c                          | 10 ++--
 sys/kern/subr_mbuf.c                               | 44 +++++++-------
 sys/kern/subr_mchain.c                             | 10 ++--
 sys/kern/subr_prf.c                                |  4 +-
 sys/kern/subr_prof.c                               |  4 +-
 sys/kern/subr_sbuf.c                               |  2 +-
 sys/kern/sys_generic.c                             | 14 ++---
 sys/kern/sys_pipe.c                                |  4 +-
 sys/kern/sysv_msg.c                                |  8 +--
 sys/kern/sysv_sem.c                                | 14 ++---
 sys/kern/sysv_shm.c                                | 10 ++--
 sys/kern/tty.c                                     |  2 +-
 sys/kern/tty_cons.c                                |  2 +-
 sys/kern/tty_pty.c                                 |  2 +-
 sys/kern/tty_subr.c                                |  4 +-
 sys/kern/uipc_accf.c                               |  2 +-
 sys/kern/uipc_mbuf.c                               | 14 ++---
 sys/kern/uipc_mbuf2.c                              |  6 +-
 sys/kern/uipc_sem.c                                |  6 +-
 sys/kern/uipc_sockbuf.c                            | 10 ++--
 sys/kern/uipc_socket.c                             | 32 +++++-----
 sys/kern/uipc_socket2.c                            | 10 ++--
 sys/kern/uipc_syscalls.c                           | 22 +++----
 sys/kern/uipc_usrreq.c                             | 12 ++--
 sys/kern/vfs_aio.c                                 | 16 ++---
 sys/kern/vfs_bio.c                                 |  2 +-
 sys/kern/vfs_cache.c                               |  6 +-
 sys/kern/vfs_cluster.c                             |  2 +-
 sys/kern/vfs_export.c                              |  6 +-
 sys/kern/vfs_extattr.c                             |  4 +-
 sys/kern/vfs_init.c                                | 16 ++---
 sys/kern/vfs_lookup.c                              |  4 +-
 sys/kern/vfs_mount.c                               | 34 +++++------
 sys/kern/vfs_subr.c                                |  8 +--
 sys/kern/vfs_syscalls.c                            |  4 +-
 sys/libkern/iconv.c                                |  4 +-
 sys/libkern/iconv_xlat.c                           |  2 +-
 sys/net/bpf.c                                      | 12 ++--
 sys/net/bpf_compat.h                               |  2 +-
 sys/net/bridge.c                                   | 12 ++--
 sys/net/bsd_comp.c                                 | 16 ++---
 sys/net/if.c                                       | 14 ++---
 sys/net/if_arcsubr.c                               | 10 ++--
 sys/net/if_atmsubr.c                               |  2 +-
 sys/net/if_disc.c                                  |  2 +-
 sys/net/if_ef.c                                    | 10 ++--
 sys/net/if_ethersubr.c                             | 16 ++---
 sys/net/if_faith.c                                 |  2 +-
 sys/net/if_fddisubr.c                              | 10 ++--
 sys/net/if_gif.c                                   |  6 +-
 sys/net/if_gre.c                                   |  6 +-
 sys/net/if_ieee80211subr.c                         | 36 ++++++------
 sys/net/if_iso88025subr.c                          |  6 +-
 sys/net/if_loop.c                                  |  6 +-
 sys/net/if_ppp.c                                   | 12 ++--
 sys/net/if_sl.c                                    | 10 ++--
 sys/net/if_spppsubr.c                              | 12 ++--
 sys/net/if_stf.c                                   |  4 +-
 sys/net/if_tap.c                                   |  6 +-
 sys/net/if_tun.c                                   | 10 ++--
 sys/net/if_vlan.c                                  |  8 +--
 sys/net/if_vlan_var.h                              |  2 +-
 sys/net/pfil.c                                     |  4 +-
 sys/net/ppp_deflate.c                              | 16 ++---
 sys/net/ppp_tty.c                                  |  8 +--
 sys/net/raw_cb.c                                   |  2 +-
 sys/net/route.c                                    |  2 +-
 sys/net/rtsock.c                                   |  6 +-
 sys/netatalk/aarp.c                                | 10 ++--
 sys/netatalk/at_control.c                          |  2 +-
 sys/netatalk/ddp_output.c                          |  4 +-
 sys/netatalk/ddp_pcb.c                             |  2 +-
 sys/netatalk/ddp_usrreq.c                          |  2 +-
 sys/netatm/atm_cm.c                                | 14 ++---
 sys/netatm/atm_device.c                            |  2 +-
 sys/netatm/atm_if.c                                |  2 +-
 sys/netatm/atm_socket.c                            |  4 +-
 sys/netatm/ipatm/ipatm_if.c                        |  2 +-
 sys/netatm/ipatm/ipatm_vcm.c                       |  6 +-
 sys/netatm/port.h                                  |  4 +-
 sys/netatm/sigpvc/sigpvc_subr.c                    |  2 +-
 sys/netatm/spans/spans_arp.c                       |  6 +-
 sys/netatm/spans/spans_cls.c                       |  2 +-
 sys/netatm/spans/spans_msg.c                       | 26 ++++-----
 sys/netatm/spans/spans_proto.c                     |  2 +-
 sys/netatm/spans/spans_subr.c                      |  2 +-
 sys/netatm/uni/sscf_uni.c                          |  2 +-
 sys/netatm/uni/sscop.c                             |  2 +-
 sys/netatm/uni/uniarp.c                            |  2 +-
 sys/netatm/uni/uniarp_cache.c                      |  2 +-
 sys/netatm/uni/uniarp_vcm.c                        |  6 +-
 sys/netatm/uni/uniip.c                             |  2 +-
 sys/netatm/uni/unisig_decode.c                     |  2 +-
 sys/netatm/uni/unisig_msg.c                        | 24 ++++----
 sys/netatm/uni/unisig_subr.c                       | 26 ++++-----
 sys/netatm/uni/unisig_vc_state.c                   | 24 ++++----
 .../bluetooth/drivers/bt3c/ng_bt3c_pccard.c        |  4 +-
 sys/netgraph/bluetooth/drivers/h4/ng_h4.c          |  4 +-
 sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c        |  6 +-
 sys/netgraph/bluetooth/hci/ng_hci_cmds.c           |  2 +-
 sys/netgraph/bluetooth/hci/ng_hci_evnt.c           |  2 +-
 sys/netgraph/bluetooth/hci/ng_hci_misc.c           |  2 +-
 sys/netgraph/bluetooth/hci/ng_hci_ulpi.c           | 12 ++--
 sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h       | 22 +++----
 sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c       |  2 +-
 sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c       |  2 +-
 sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c       |  2 +-
 .../bluetooth/socket/ng_btsocket_hci_raw.c         | 16 ++---
 sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c  |  4 +-
 .../bluetooth/socket/ng_btsocket_l2cap_raw.c       | 16 ++---
 sys/netgraph/ng_UI.c                               |  2 +-
 sys/netgraph/ng_bridge.c                           |  2 +-
 sys/netgraph/ng_cisco.c                            |  4 +-
 sys/netgraph/ng_eiface.c                           |  2 +-
 sys/netgraph/ng_frame_relay.c                      |  2 +-
 sys/netgraph/ng_gif.c                              |  2 +-
 sys/netgraph/ng_gif_demux.c                        |  2 +-
 sys/netgraph/ng_l2tp.c                             | 14 ++---
 sys/netgraph/ng_lmi.c                              |  2 +-
 sys/netgraph/ng_one2many.c                         |  2 +-
 sys/netgraph/ng_ppp.c                              |  4 +-
 sys/netgraph/ng_pppoe.c                            | 18 +++---
 sys/netgraph/ng_pptpgre.c                          |  4 +-
 sys/netgraph/ng_rfc1490.c                          |  4 +-
 sys/netgraph/ng_socket.c                           | 10 ++--
 sys/netgraph/ng_source.c                           |  2 +-
 sys/netgraph/ng_tee.c                              |  2 +-
 sys/netgraph/ng_tty.c                              |  4 +-
 sys/netgraph/ng_vjc.c                              |  4 +-
 sys/netinet/if_ether.c                             |  2 +-
 sys/netinet/igmp.c                                 |  4 +-
 sys/netinet/in.c                                   |  4 +-
 sys/netinet/in_gif.c                               |  2 +-
 sys/netinet/in_pcb.c                               |  2 +-
 sys/netinet/ip_divert.c                            |  2 +-
 sys/netinet/ip_encap.c                             |  2 +-
 sys/netinet/ip_fw.c                                |  4 +-
 sys/netinet/ip_fw2.c                               |  4 +-
 sys/netinet/ip_icmp.c                              |  4 +-
 sys/netinet/ip_input.c                             | 10 ++--
 sys/netinet/ip_mroute.c                            |  2 +-
 sys/netinet/ip_output.c                            | 10 ++--
 sys/netinet/raw_ip.c                               |  4 +-
 sys/netinet/tcp_output.c                           |  6 +-
 sys/netinet/tcp_subr.c                             |  8 +--
 sys/netinet/tcp_syncache.c                         |  4 +-
 sys/netinet/tcp_timewait.c                         |  8 +--
 sys/netinet/udp_usrreq.c                           |  4 +-
 sys/netinet6/ah_core.c                             | 16 ++---
 sys/netinet6/ah_input.c                            |  4 +-
 sys/netinet6/ah_output.c                           |  6 +-
 sys/netinet6/esp_core.c                            |  8 +--
 sys/netinet6/esp_input.c                           |  6 +-
 sys/netinet6/esp_output.c                          |  6 +-
 sys/netinet6/frag6.c                               |  6 +-
 sys/netinet6/icmp6.c                               | 36 ++++++------
 sys/netinet6/in6.c                                 |  4 +-
 sys/netinet6/in6_gif.c                             |  2 +-
 sys/netinet6/in6_ifattach.c                        |  8 +--
 sys/netinet6/in6_pcb.c                             |  4 +-
 sys/netinet6/ip6_fw.c                              |  8 +--
 sys/netinet6/ip6_input.c                           | 10 ++--
 sys/netinet6/ip6_mroute.c                          |  2 +-
 sys/netinet6/ip6_output.c                          | 40 ++++++-------
 sys/netinet6/ipcomp_core.c                         |  4 +-
 sys/netinet6/ipcomp_output.c                       |  6 +-
 sys/netinet6/ipsec.c                               | 18 +++---
 sys/netinet6/mld6.c                                |  4 +-
 sys/netinet6/nd6.c                                 |  2 +-
 sys/netinet6/nd6_nbr.c                             |  8 +--
 sys/netinet6/raw_ip6.c                             |  2 +-
 sys/netinet6/scope6.c                              |  2 +-
 sys/netinet6/udp6_output.c                         |  2 +-
 sys/netipsec/ipsec_mbuf.c                          | 14 ++---
 sys/netipsec/ipsec_output.c                        |  4 +-
 sys/netipsec/key.c                                 | 44 +++++++-------
 sys/netipsec/keysock.c                             | 10 ++--
 sys/netipsec/xform_esp.c                           |  2 +-
 sys/netipsec/xform_ipip.c                          |  4 +-
 sys/netipx/ipx.c                                   |  2 +-
 sys/netipx/ipx_input.c                             |  2 +-
 sys/netipx/ipx_ip.c                                |  6 +-
 sys/netipx/ipx_outputfl.c                          |  2 +-
 sys/netipx/ipx_usrreq.c                            |  4 +-
 sys/netipx/spx_usrreq.c                            | 12 ++--
 sys/netkey/key.c                                   | 44 +++++++-------
 sys/netkey/keysock.c                               | 10 ++--
 sys/netnatm/natm.c                                 |  8 +--
 sys/netnatm/natm_pcb.c                             |  2 +-
 sys/netncp/ncp_conn.c                              |  4 +-
 sys/netncp/ncp_rq.c                                |  2 +-
 sys/netncp/ncp_sock.c                              |  2 +-
 sys/netncp/ncp_subr.c                              |  2 +-
 sys/netns/idp_usrreq.c                             |  6 +-
 sys/netns/ns.c                                     |  2 +-
 sys/netns/ns_error.c                               |  2 +-
 sys/netns/ns_input.c                               |  2 +-
 sys/netns/ns_ip.c                                  |  6 +-
 sys/netns/ns_pcb.c                                 |  2 +-
 sys/netns/spp_usrreq.c                             | 18 +++---
 sys/netsmb/smb_conn.c                              |  4 +-
 sys/netsmb/smb_crypt.c                             |  8 +--
 sys/netsmb/smb_dev.c                               |  2 +-
 sys/netsmb/smb_iod.c                               |  6 +-
 sys/netsmb/smb_rq.c                                |  6 +-
 sys/netsmb/smb_smb.c                               | 12 ++--
 sys/netsmb/smb_subr.c                              |  8 +--
 sys/netsmb/smb_trantcp.c                           |  4 +-
 sys/nfs/nfs_common.c                               |  4 +-
 sys/nfsclient/bootp_subr.c                         |  6 +-
 sys/nfsclient/krpc_subr.c                          | 10 ++--
 sys/nfsclient/nfs_lock.c                           |  2 +-
 sys/nfsclient/nfs_node.c                           |  4 +-
 sys/nfsclient/nfs_socket.c                         | 14 ++---
 sys/nfsclient/nfs_subs.c                           | 22 +++----
 sys/nfsclient/nfs_vfsops.c                         |  2 +-
 sys/nfsclient/nfs_vnops.c                          |  6 +-
 sys/nfsserver/nfs_serv.c                           | 20 +++----
 sys/nfsserver/nfs_srvcache.c                       |  6 +-
 sys/nfsserver/nfs_srvsock.c                        | 18 +++---
 sys/nfsserver/nfs_srvsubs.c                        | 10 ++--
 sys/nfsserver/nfs_syscalls.c                       | 12 ++--
 sys/opencrypto/cryptodev.c                         | 12 ++--
 sys/pc98/cbus/scvtb.c                              |  2 +-
 sys/pc98/pc98/scvtbpc98.c                          |  2 +-
 sys/pc98/pc98/spkr.c                               |  2 +-
 sys/pc98/pc98/syscons.c                            | 12 ++--
 sys/pccard/pccard.c                                |  2 +-
 sys/pci/agp.c                                      |  2 +-
 sys/pci/agp_i810.c                                 |  2 +-
 sys/pci/if_dc.c                                    |  8 +--
 sys/pci/if_de.c                                    | 16 ++---
 sys/pci/if_mn.c                                    | 18 +++---
 sys/pci/if_pcn.c                                   |  4 +-
 sys/pci/if_rl.c                                    |  4 +-
 sys/pci/if_sf.c                                    |  8 +--
 sys/pci/if_sis.c                                   |  2 +-
 sys/pci/if_sk.c                                    |  2 +-
 sys/pci/if_ste.c                                   |  8 +--
 sys/pci/if_ti.c                                    | 16 ++---
 sys/pci/if_tl.c                                    |  8 +--
 sys/pci/if_vr.c                                    |  8 +--
 sys/pci/if_wb.c                                    |  6 +-
 sys/pci/if_xl.c                                    | 10 ++--
 sys/pci/ncr.c                                      |  4 +-
 sys/pci/simos.c                                    |  2 +-
 sys/pci/xrpu.c                                     |  2 +-
 sys/posix4/posix4.h                                |  2 +-
 sys/powerpc/aim/nexus.c                            |  2 +-
 sys/powerpc/powermac/macio.c                       |  2 +-
 sys/powerpc/powerpc/busdma_machdep.c               |  4 +-
 sys/powerpc/powerpc/extintr.c                      |  2 +-
 sys/powerpc/powerpc/nexus.c                        |  2 +-
 sys/powerpc/psim/iobus.c                           |  2 +-
 sys/security/mac/mac_framework.c                   | 68 +++++++++++-----------
 sys/security/mac/mac_internal.h                    | 68 +++++++++++-----------
 sys/security/mac/mac_net.c                         | 68 +++++++++++-----------
 sys/security/mac/mac_pipe.c                        | 68 +++++++++++-----------
 sys/security/mac/mac_process.c                     | 68 +++++++++++-----------
 sys/security/mac/mac_syscalls.c                    | 68 +++++++++++-----------
 sys/security/mac/mac_system.c                      | 68 +++++++++++-----------
 sys/security/mac/mac_vfs.c                         | 68 +++++++++++-----------
 sys/security/mac_biba/mac_biba.c                   |  2 +-
 sys/security/mac_bsdextended/mac_bsdextended.c     |  2 +-
 sys/security/mac_lomac/mac_lomac.c                 |  4 +-
 sys/security/mac_mls/mac_mls.c                     |  2 +-
 sys/sparc64/ebus/ebus.c                            |  2 +-
 sys/sparc64/pci/ofw_pci.c                          |  4 +-
 sys/sparc64/pci/psycho.c                           |  2 +-
 sys/sparc64/sbus/sbus.c                            |  2 +-
 sys/sparc64/sparc64/bus_machdep.c                  |  4 +-
 sys/sparc64/sparc64/counter.c                      |  4 +-
 sys/sparc64/sparc64/iommu.c                        |  2 +-
 sys/sparc64/sparc64/mem.c                          |  2 +-
 sys/sparc64/sparc64/nexus.c                        |  2 +-
 sys/sparc64/sparc64/ofw_bus.c                      |  6 +-
 sys/sparc64/sparc64/sys_machdep.c                  |  2 +-
 sys/sys/malloc.h                                   |  3 +-
 sys/sys/mbuf.h                                     | 12 ++--
 sys/sys/posix4.h                                   |  2 +-
 sys/sys/socketvar.h                                |  2 +-
 sys/ufs/ffs/ffs_inode.c                            |  2 +-
 sys/ufs/ffs/ffs_snapshot.c                         | 16 ++---
 sys/ufs/ffs/ffs_softdep.c                          |  2 +-
 sys/ufs/ffs/ffs_vfsops.c                           | 12 ++--
 sys/ufs/ffs/ffs_vnops.c                            |  4 +-
 sys/ufs/ufs/ufs_dirhash.c                          |  2 +-
 sys/ufs/ufs/ufs_extattr.c                          |  6 +-
 sys/ufs/ufs/ufs_quota.c                            |  2 +-
 sys/ufs/ufs/ufs_vnops.c                            | 12 ++--
 sys/vm/device_pager.c                              |  2 +-
 sys/vm/swap_pager.c                                |  2 +-
 sys/vm/uma.h                                       |  2 +-
 sys/vm/uma_core.c                                  | 12 ++--
 sys/vm/vm_map.c                                    |  6 +-
 sys/vm/vm_object.c                                 |  2 +-
 591 files changed, 2123 insertions(+), 2122 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c
index 22b39a459946..9de33420bc66 100644
--- a/sys/alpha/alpha/busdma_machdep.c
+++ b/sys/alpha/alpha/busdma_machdep.c
@@ -358,7 +358,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 
 	if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
 		*vaddr = malloc(dmat->maxsize, M_DEVBUF,
-				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
+				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0);
 	} else {
 		/*
 		 * XXX Use Contigmalloc until it is merged into this facility
@@ -366,7 +366,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 		 *     multi-seg allocations yet though.
 		 */
 		*vaddr = contigmalloc(dmat->maxsize, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
 		    0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
 		    dmat->boundary);
 	}
diff --git a/sys/alpha/osf1/imgact_osf1.c b/sys/alpha/osf1/imgact_osf1.c
index d6331823a8e2..5db50d0fc374 100644
--- a/sys/alpha/osf1/imgact_osf1.c
+++ b/sys/alpha/osf1/imgact_osf1.c
@@ -112,7 +112,7 @@ exec_osf1_imgact(struct image_params *imgp)
 		printf("unknown ecoff magic %x\n", eap->magic);
 		return ENOEXEC;
 	}
-	osf_auxargs = malloc(sizeof(Osf_Auxargs), M_TEMP, M_WAITOK | M_ZERO);
+	osf_auxargs = malloc(sizeof(Osf_Auxargs), M_TEMP, M_ZERO);
 	imgp->auxargs = osf_auxargs;
 	osf_auxargs->executable = osf_auxargs->exec_path;
 	path_not_saved = copyinstr(imgp->fname, osf_auxargs->executable,
@@ -135,7 +135,7 @@ exec_osf1_imgact(struct image_params *imgp)
 		 * page of the loader.
 		 */
 		ndp = (struct nameidata *)malloc(sizeof(struct nameidata),
-		    M_TEMP, M_WAITOK);
+		    M_TEMP, 0);
 		NDINIT(ndp, LOOKUP, LOCKLEAF | FOLLOW | SAVENAME, UIO_SYSSPACE,
 		    "/compat/osf1/sbin/loader",
 		    FIRST_THREAD_IN_PROC(imgp->proc));
@@ -218,7 +218,7 @@ exec_osf1_imgact(struct image_params *imgp)
 	raw_dend = (eap->data_start + eap->dsize);
 	if (dend > raw_dend) {
 		caddr_t zeros;
-		zeros = malloc(dend-raw_dend,M_TEMP,M_WAITOK|M_ZERO);
+		zeros = malloc(dend-raw_dend, M_TEMP, M_ZERO);
 		if ((error = copyout(zeros, (caddr_t)raw_dend,
 		    dend-raw_dend))) {
 			uprintf("Can't zero start of bss, error %d\n",error);
diff --git a/sys/alpha/osf1/osf1_misc.c b/sys/alpha/osf1/osf1_misc.c
index dc75d55adbee..686d220657fa 100644
--- a/sys/alpha/osf1/osf1_misc.c
+++ b/sys/alpha/osf1/osf1_misc.c
@@ -121,7 +121,7 @@ osf1_emul_find(td, sgp, prefix, path, pbuf, cflag)
         struct vattr		vat;
         struct vattr		vatroot;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
 	*pbuf = path;
 
 	for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
@@ -1181,8 +1181,8 @@ osf1_readv(td, uap)
 	osize = uap->iovcnt * sizeof (struct osf1_iovec);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, M_WAITOK);
-	nio = malloc(nsize, M_TEMP, M_WAITOK);
+	oio = malloc(osize, M_TEMP, 0);
+	nio = malloc(nsize, M_TEMP, 0);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
@@ -1230,8 +1230,8 @@ osf1_writev(td, uap)
 	osize = uap->iovcnt * sizeof (struct osf1_iovec);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, M_WAITOK);
-	nio = malloc(nsize, M_TEMP, M_WAITOK);
+	oio = malloc(osize, M_TEMP, 0);
+	nio = malloc(nsize, M_TEMP, 0);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
diff --git a/sys/amd64/amd64/amd64_mem.c b/sys/amd64/amd64/amd64_mem.c
index 589fc64721cb..f3fc4e89db25 100644
--- a/sys/amd64/amd64/amd64_mem.c
+++ b/sys/amd64/amd64/amd64_mem.c
@@ -557,7 +557,7 @@ i686_mrinit(struct mem_range_softc *sc)
 
     sc->mr_desc = 
 	(struct mem_range_desc *)malloc(nmdesc * sizeof(struct mem_range_desc), 
-					M_MEMDESC, M_WAITOK | M_ZERO);
+					M_MEMDESC, M_ZERO);
     sc->mr_ndesc = nmdesc;
 
     mrd = sc->mr_desc;
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index 747a3a14394f..ae14099f93be 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -388,7 +388,7 @@ bios16(struct bios_args *args, char *fmt, ...)
 	/*
 	 * no page table, so create one and install it.
 	 */
-	pte = (pt_entry_t *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
+	pte = (pt_entry_t *)malloc(PAGE_SIZE, M_TEMP, 0);
 	ptd = (pd_entry_t *)((u_int)ptd + KERNBASE);
 	*ptd = vtophys(pte) | PG_RW | PG_V;
     } else {
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index 315872643de0..eb6cc9dc29d4 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -339,7 +339,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 
 	if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
 		*vaddr = malloc(dmat->maxsize, M_DEVBUF,
-				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
+				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0);
 	} else {
 		/*
 		 * XXX Use Contigmalloc until it is merged into this facility
@@ -347,7 +347,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 		 *     multi-seg allocations yet though.
 		 */
 		*vaddr = contigmalloc(dmat->maxsize, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
 		    0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
 		    dmat->boundary);
 	}
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index 41fa63640b60..4905d3c8158c 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -265,7 +265,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
 		if (nd > 0) {
 			md = (struct mem_range_desc *)
 				malloc(nd * sizeof(struct mem_range_desc),
-				       M_MEMDESC, M_WAITOK);
+				       M_MEMDESC, 0);
 			error = mem_range_attr_get(md, &nd);
 			if (!error)
 				error = copyout(md, mo->mo_desc, 
@@ -279,7 +279,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
 		
 	case MEMRANGE_SET:
 		md = (struct mem_range_desc *)malloc(sizeof(struct mem_range_desc),
-						    M_MEMDESC, M_WAITOK);
+						    M_MEMDESC, 0);
 		error = copyin(mo->mo_desc, md, sizeof(struct mem_range_desc));
 		/* clamp description string */
 		md->mr_owner[sizeof(md->mr_owner) - 1] = 0;
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 00da6fa57dec..9b24c6f56962 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
 
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 00da6fa57dec..9b24c6f56962 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
 
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index e1347da53a54..4d98979c43a9 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -298,7 +298,7 @@ user_ldt_alloc(struct mdproc *mdp, int len)
 		mtx_unlock_spin(&sched_lock);
 	mtx_assert(&sched_lock, MA_NOTOWNED);
 	MALLOC(new_ldt, struct proc_ldt *, sizeof(struct proc_ldt),
-		M_SUBPROC, M_WAITOK);
+		M_SUBPROC, 0);
 
 	new_ldt->ldt_len = len = NEW_MAX_LD(len);
 	new_ldt->ldt_base = (caddr_t)kmem_alloc(kernel_map,
diff --git a/sys/amd64/ia32/ia32_misc.c b/sys/amd64/ia32/ia32_misc.c
index 10eb642a1881..8b707b43ce8a 100644
--- a/sys/amd64/ia32/ia32_misc.c
+++ b/sys/amd64/ia32/ia32_misc.c
@@ -106,7 +106,7 @@ ia32_emul_find(td, sgp, prefix, path, pbuf, cflag)
 	struct vattr		vat;
 	struct vattr		vatroot;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
 	*pbuf = path;
 
 	for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
@@ -769,8 +769,8 @@ ia32_readv(struct thread *td, struct ia32_readv_args *uap)
 	osize = uap->iovcnt * sizeof (struct iovec32);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, M_WAITOK);
-	nio = malloc(nsize, M_TEMP, M_WAITOK);
+	oio = malloc(osize, M_TEMP, 0);
+	nio = malloc(nsize, M_TEMP, 0);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
@@ -815,8 +815,8 @@ ia32_writev(struct thread *td, struct ia32_writev_args *uap)
 	osize = uap->iovcnt * sizeof (struct iovec32);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, M_WAITOK);
-	nio = malloc(nsize, M_TEMP, M_WAITOK);
+	oio = malloc(osize, M_TEMP, 0);
+	nio = malloc(nsize, M_TEMP, 0);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 00da6fa57dec..9b24c6f56962 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
 
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index 247ebb87a24e..591d765ed068 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -89,7 +89,7 @@ periphdriver_register(void *data)
 	int ndrivers;
 
 	ndrivers = nperiph_drivers + 2;
-	newdrivers = malloc(sizeof(*newdrivers) * ndrivers, M_TEMP, M_WAITOK);
+	newdrivers = malloc(sizeof(*newdrivers) * ndrivers, M_TEMP, 0);
 	if (periph_drivers)
 		bcopy(periph_drivers, newdrivers,
 		      sizeof(*newdrivers) * nperiph_drivers);
diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c
index b7e0ec5bdf56..35b18f7e0b48 100644
--- a/sys/cam/cam_sim.c
+++ b/sys/cam/cam_sim.c
@@ -67,7 +67,7 @@ cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll,
 	 */
 	if (strcmp(sim_name, "xpt") == 0)
 		sim = (struct cam_sim *)malloc(sizeof(struct cam_sim),
-					       M_DEVBUF, M_WAITOK);
+					       M_DEVBUF, 0);
 	else
 		sim = (struct cam_sim *)malloc(sizeof(struct cam_sim),
 					       M_DEVBUF, M_NOWAIT);
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index e22357b4e636..96af6d74af43 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -4804,7 +4804,7 @@ xpt_alloc_ccb()
 {
 	union ccb *new_ccb;
 
-	new_ccb = malloc(sizeof(*new_ccb), M_DEVBUF, M_WAITOK);
+	new_ccb = malloc(sizeof(*new_ccb), M_DEVBUF, 0);
 	return (new_ccb);
 }
 
@@ -5169,7 +5169,7 @@ xpt_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 
 		/* Save some state for use while we probe for devices */
 		scan_info = (xpt_scan_bus_info *)
-		    malloc(sizeof(xpt_scan_bus_info), M_TEMP, M_WAITOK);
+		    malloc(sizeof(xpt_scan_bus_info), M_TEMP, 0);
 		scan_info->request_ccb = request_ccb;
 		scan_info->cpi = &work_ccb->cpi;
 
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index c5be698300b0..a187c796a18f 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -1788,7 +1788,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 			struct cd_mode_data *data;
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP, 
-				      M_WAITOK);
+				      0);
 
 			CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, 
 				  ("trying to do CDIOCPLAYTRACKS\n"));
@@ -1822,7 +1822,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 			struct cd_mode_data *data;
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP,
-				      M_WAITOK);
+				      0);
 
 			CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, 
 				  ("trying to do CDIOCPLAYMSF\n"));
@@ -1857,7 +1857,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCPLAYBLOCKS\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP,
-				      M_WAITOK);
+				      0);
 
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
@@ -1884,7 +1884,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCREADSUBCHANNEL\n"));
 
 			data = malloc(sizeof(struct cd_sub_channel_info), 
-				      M_TEMP, M_WAITOK);
+				      M_TEMP, 0);
 
 			if ((len > sizeof(struct cd_sub_channel_info)) ||
 			    (len < sizeof(struct cd_sub_channel_header))) {
@@ -1928,7 +1928,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOREADTOCHEADER\n"));
 
 			th = malloc(sizeof(struct ioc_toc_header), M_TEMP,
-				    M_WAITOK);
+				    0);
 			error = cdreadtoc(periph, 0, 0, 
 					  (struct cd_toc_entry *)th, 
 				          sizeof (*th));
@@ -1971,8 +1971,8 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 			CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, 
 				  ("trying to do CDIOREADTOCENTRYS\n"));
 
-			data = malloc(sizeof(data_t), M_TEMP, M_WAITOK);
-			lead = malloc(sizeof(lead_t), M_TEMP, M_WAITOK);
+			data = malloc(sizeof(data_t), M_TEMP, 0);
+			lead = malloc(sizeof(lead_t), M_TEMP, 0);
 
 			if (te->data_len < sizeof(struct cd_toc_entry)
 			 || (te->data_len % sizeof(struct cd_toc_entry)) != 0
@@ -2098,7 +2098,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 			CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, 
 				  ("trying to do CDIOREADTOCENTRY\n"));
 
-			data = malloc(sizeof(data_t), M_TEMP, M_WAITOK);
+			data = malloc(sizeof(data_t), M_TEMP, 0);
 
 			if (te->address_format != CD_MSF_FORMAT
 			    && te->address_format != CD_LBA_FORMAT) {
@@ -2164,7 +2164,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCSETPATCH\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP, 
-				      M_WAITOK);
+				      0);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2189,7 +2189,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCGETVOL\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP, 
-				      M_WAITOK);
+				      0);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2213,7 +2213,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCSETVOL\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP, 
-				      M_WAITOK);
+				      0);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2239,7 +2239,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCSETMONO\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), 
-				      M_TEMP, M_WAITOK);
+				      M_TEMP, 0);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2263,7 +2263,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCSETSTEREO\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP,
-				      M_WAITOK);
+				      0);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2287,7 +2287,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCSETMUTE\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP,
-				      M_WAITOK);
+				      0);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2309,7 +2309,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCSETLEFT\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP,
-				      M_WAITOK);
+				      0);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2333,7 +2333,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCSETRIGHT\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP,
-				      M_WAITOK);
+				      0);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2485,7 +2485,7 @@ cdsize(dev_t dev, u_int32_t *size)
 	ccb = cdgetccb(periph, /* priority */ 1);
 
 	rcap_buf = malloc(sizeof(struct scsi_read_capacity_data), 
-			  M_TEMP, M_WAITOK);
+			  M_TEMP, 0);
 
 	scsi_read_capacity(&ccb->csio, 
 			   /*retries*/ 1,
@@ -3054,7 +3054,7 @@ cdreportkey(struct cam_periph *periph, struct dvd_authinfo *authinfo)
 	}
 
 	if (length != 0) {
-		databuf = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO);
+		databuf = malloc(length, M_DEVBUF, M_ZERO);
 	} else
 		databuf = NULL;
 
@@ -3187,7 +3187,7 @@ cdsendkey(struct cam_periph *periph, struct dvd_authinfo *authinfo)
 
 		length = sizeof(*challenge_data);
 
-		challenge_data = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO);
+		challenge_data = malloc(length, M_DEVBUF, M_ZERO);
 
 		databuf = (u_int8_t *)challenge_data;
 
@@ -3204,7 +3204,7 @@ cdsendkey(struct cam_periph *periph, struct dvd_authinfo *authinfo)
 
 		length = sizeof(*key2_data);
 
-		key2_data = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO);
+		key2_data = malloc(length, M_DEVBUF, M_ZERO);
 
 		databuf = (u_int8_t *)key2_data;
 
@@ -3221,7 +3221,7 @@ cdsendkey(struct cam_periph *periph, struct dvd_authinfo *authinfo)
 
 		length = sizeof(*rpc_data);
 
-		rpc_data = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO);
+		rpc_data = malloc(length, M_DEVBUF, M_ZERO);
 
 		databuf = (u_int8_t *)rpc_data;
 
@@ -3363,7 +3363,7 @@ cdreaddvdstructure(struct cam_periph *periph, struct dvd_struct *dvdstruct)
 	}
 
 	if (length != 0) {
-		databuf = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO);
+		databuf = malloc(length, M_DEVBUF, M_ZERO);
 	} else
 		databuf = NULL;
 
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index fcbb53bac37b..51f694679b8c 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -1100,7 +1100,7 @@ chgetelemstatus(struct cam_periph *periph,
 	 * we can allocate enough storage for all of them.  We assume
 	 * that the first one can fit into 1k.
 	 */
-	data = (caddr_t)malloc(1024, M_DEVBUF, M_WAITOK);
+	data = (caddr_t)malloc(1024, M_DEVBUF, 0);
 
 	ccb = cam_periph_getccb(periph, /*priority*/ 1);
 
@@ -1137,7 +1137,7 @@ chgetelemstatus(struct cam_periph *periph,
 	 * device.
 	 */
 	free(data, M_DEVBUF);
-	data = (caddr_t)malloc(size, M_DEVBUF, M_WAITOK);
+	data = (caddr_t)malloc(size, M_DEVBUF, 0);
 
 	scsi_read_element_status(&ccb->csio,
 				 /* retries */ 1,
@@ -1172,7 +1172,7 @@ chgetelemstatus(struct cam_periph *periph,
 
 	user_data = (struct changer_element_status *)
 		malloc(avail * sizeof(struct changer_element_status),
-		       M_DEVBUF, M_WAITOK | M_ZERO);
+		       M_DEVBUF, M_ZERO);
 
 	desc = (struct read_element_status_descriptor *)((uintptr_t)data +
 		sizeof(struct read_element_status_header) +
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 950d2b892ec8..df68134ca97b 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -575,7 +575,7 @@ daopen(dev_t dev, int flags __unused, int fmt __unused, struct thread *td __unus
 	/* Do a read capacity */
 	rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcap),
 							M_TEMP,
-							M_WAITOK);
+							0);
 		
 	ccb = cam_periph_getccb(periph, /*priority*/1);
 	scsi_read_capacity(&ccb->csio,
diff --git a/sys/cam/scsi/scsi_low.c b/sys/cam/scsi/scsi_low.c
index afda1138e293..753560a72763 100644
--- a/sys/cam/scsi/scsi_low.c
+++ b/sys/cam/scsi/scsi_low.c
@@ -961,7 +961,7 @@ scsi_low_rescan_bus_cam(slp)
 	struct scsi_low_softc *slp;
 {
   	struct cam_path *path;
-	union ccb *ccb = malloc(sizeof(union ccb), M_DEVBUF, M_WAITOK);
+	union ccb *ccb = malloc(sizeof(union ccb), M_DEVBUF, 0);
 	cam_status status;
 
 	bzero(ccb, sizeof(union ccb));
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index ce077c58c1f4..b920b0009a67 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -1895,7 +1895,7 @@ samount(struct cam_periph *periph, int oflags, dev_t dev)
 		 * read a full record.
 		 */
 		rblim = (struct  scsi_read_block_limits_data *)
-		    malloc(8192, M_TEMP, M_WAITOK);
+		    malloc(8192, M_TEMP, 0);
 		if (rblim == NULL) {
 			xpt_print_path(ccb->ccb_h.path);
 			printf("no memory for test read\n");
@@ -2520,7 +2520,7 @@ retry:
 			mode_buffer_len += sizeof (sa_comp_t);
 	}
 
-	mode_buffer = malloc(mode_buffer_len, M_TEMP, M_WAITOK | M_ZERO);
+	mode_buffer = malloc(mode_buffer_len, M_TEMP, M_ZERO);
 	mode_hdr = (struct scsi_mode_header_6 *)mode_buffer;
 	mode_blk = (struct scsi_mode_blk_desc *)&mode_hdr[1];
 
@@ -2700,7 +2700,7 @@ sasetparams(struct cam_periph *periph, sa_params params_to_set,
 
 	softc = (struct sa_softc *)periph->softc;
 
-	ccomp = malloc(sizeof (sa_comp_t), M_TEMP, M_WAITOK);
+	ccomp = malloc(sizeof (sa_comp_t), M_TEMP, 0);
 
 	/*
 	 * Since it doesn't make sense to set the number of blocks, or
@@ -2723,7 +2723,7 @@ sasetparams(struct cam_periph *periph, sa_params params_to_set,
 	if (params_to_set & SA_PARAM_COMPRESSION)
 		mode_buffer_len += sizeof (sa_comp_t);
 
-	mode_buffer = malloc(mode_buffer_len, M_TEMP, M_WAITOK | M_ZERO);
+	mode_buffer = malloc(mode_buffer_len, M_TEMP, M_ZERO);
 
 	mode_hdr = (struct scsi_mode_header_6 *)mode_buffer;
 	mode_blk = (struct scsi_mode_blk_desc *)&mode_hdr[1];
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index 9db2604dce38..25001efafc0e 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -189,7 +189,7 @@ targopen(dev_t dev, int flags, int fmt, struct thread *td)
 			 "targ%d", dev2unit(dev));
 	}
 	MALLOC(softc, struct targ_softc *, sizeof(*softc), M_TARG,
-	       M_WAITOK | M_ZERO);
+	       M_ZERO);
 	dev->si_drv1 = softc;
 	softc->state = TARG_STATE_OPENED;
 	softc->periph = NULL;
@@ -977,7 +977,7 @@ targgetccb(struct targ_softc *softc, xpt_opcode type, int priority)
 	int ccb_len;
 
 	ccb_len = targccblen(type);
-	MALLOC(ccb, union ccb *, ccb_len, M_TARG, M_WAITOK);
+	MALLOC(ccb, union ccb *, ccb_len, M_TARG, 0);
 	CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("getccb %p\n", ccb));
 
 	xpt_setup_ccb(&ccb->ccb_h, softc->path, priority);
@@ -1021,7 +1021,7 @@ targgetdescr(struct targ_softc *softc)
 	struct targ_cmd_descr *descr;
 
 	MALLOC(descr, struct targ_cmd_descr *, sizeof(*descr), M_TARG,
-	       M_WAITOK);
+	       0);
 	descr->mapinfo.num_bufs_used = 0;
 	return (descr);
 }
diff --git a/sys/coda/cnode.h b/sys/coda/cnode.h
index 962d329580e4..8d0cebe3d131 100644
--- a/sys/coda/cnode.h
+++ b/sys/coda/cnode.h
@@ -66,7 +66,7 @@ MALLOC_DECLARE(M_CODA);
 
 #define CODA_ALLOC(ptr, cast, size)                                        \
 do {                                                                      \
-    ptr = (cast)malloc((unsigned long) size, M_CODA, M_WAITOK);            \
+    ptr = (cast)malloc((unsigned long) size, M_CODA, 0);                   \
     if (ptr == 0) {                                                       \
 	panic("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__);  \
     }                                                                     \
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
index 10eb642a1881..8b707b43ce8a 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -106,7 +106,7 @@ ia32_emul_find(td, sgp, prefix, path, pbuf, cflag)
 	struct vattr		vat;
 	struct vattr		vatroot;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
 	*pbuf = path;
 
 	for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
@@ -769,8 +769,8 @@ ia32_readv(struct thread *td, struct ia32_readv_args *uap)
 	osize = uap->iovcnt * sizeof (struct iovec32);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, M_WAITOK);
-	nio = malloc(nsize, M_TEMP, M_WAITOK);
+	oio = malloc(osize, M_TEMP, 0);
+	nio = malloc(nsize, M_TEMP, 0);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
@@ -815,8 +815,8 @@ ia32_writev(struct thread *td, struct ia32_writev_args *uap)
 	osize = uap->iovcnt * sizeof (struct iovec32);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, M_WAITOK);
-	nio = malloc(nsize, M_TEMP, M_WAITOK);
+	oio = malloc(osize, M_TEMP, 0);
+	nio = malloc(nsize, M_TEMP, 0);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index 2b37dcdaf40c..160b2a9f90ce 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -297,7 +297,7 @@ getdents_common(struct thread *td, struct linux_getdents64_args *args,
 
 	buflen = max(LINUX_DIRBLKSIZ, nbytes);
 	buflen = min(buflen, MAXBSIZE);
-	buf = malloc(buflen, M_TEMP, M_WAITOK);
+	buf = malloc(buflen, M_TEMP, 0);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 
 again:
diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c
index bb1c28fb3260..81e84a303154 100644
--- a/sys/compat/linux/linux_getcwd.c
+++ b/sys/compat/linux/linux_getcwd.c
@@ -181,7 +181,7 @@ linux_getcwd_scandir(lvpp, uvpp, bpp, bufp, td)
 	dirbuflen = DIRBLKSIZ;
 	if (dirbuflen < va.va_blocksize)
 		dirbuflen = va.va_blocksize;
-	dirbuf = (char *)malloc(dirbuflen, M_TEMP, M_WAITOK);
+	dirbuf = (char *)malloc(dirbuflen, M_TEMP, 0);
 
 #if 0
 unionread:
@@ -429,7 +429,7 @@ linux_getcwd(struct thread *td, struct linux_getcwd_args *args)
 	else if (len < 2)
 		return ERANGE;
 
-	path = (char *)malloc(len, M_TEMP, M_WAITOK);
+	path = (char *)malloc(len, M_TEMP, 0);
 
 	error = kern___getcwd(td, path, UIO_SYSSPACE, len);
 	if (!error) {
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 9f10ba5152fe..eb1b9749aa7d 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -2420,7 +2420,7 @@ linux_ioctl_register_handler(struct linux_ioctl_handler *h)
 	}
 	if (he == NULL) {
 		MALLOC(he, struct handler_element *, sizeof(*he),
-		    M_LINUX, M_WAITOK);
+		    M_LINUX, 0);
 		he->func = h->func;
 	} else
 		TAILQ_REMOVE(&handlers, he, list);
diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c
index d9cdd076124c..4f7f199b320b 100644
--- a/sys/compat/linux/linux_mib.c
+++ b/sys/compat/linux/linux_mib.c
@@ -139,7 +139,7 @@ linux_get_prison(struct proc *p)
 	if (pr->pr_linux == NULL) {
 		mtx_unlock(&pr->pr_mtx);
 		MALLOC(lpr, struct linux_prison *, sizeof *lpr,
-		    M_PRISON, M_WAITOK|M_ZERO);
+		    M_PRISON, M_ZERO);
 		mtx_lock(&pr->pr_mtx);
 		if (pr->pr_linux == NULL) {
 			pr->pr_linux = lpr;
diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c
index 699b5d6f01fb..d737f559df20 100644
--- a/sys/compat/linux/linux_sysctl.c
+++ b/sys/compat/linux/linux_sysctl.c
@@ -92,7 +92,7 @@ linux_sysctl(struct thread *td, struct linux_sysctl_args *args)
 	if (la.nlen <= 0 || la.nlen > LINUX_CTL_MAXNAME)
 		return (ENOTDIR);
 
-	mib = malloc(la.nlen * sizeof(l_int), M_TEMP, M_WAITOK);
+	mib = malloc(la.nlen * sizeof(l_int), M_TEMP, 0);
 	error = copyin(la.name, mib, la.nlen * sizeof(l_int));
 	if (error) {
 		free(mib, M_TEMP);
diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c
index 5bd8c15fa359..bd2c81d8ede1 100644
--- a/sys/compat/linux/linux_util.c
+++ b/sys/compat/linux/linux_util.c
@@ -101,7 +101,7 @@ linux_emul_convpath(td, path, pathseg, pbuf, cflag)
 	char			*ptr, *buf, *cp;
 	size_t			 len, sz;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
 	*pbuf = buf;
 
 	prefix = linux_emul_path;
diff --git a/sys/compat/pecoff/imgact_pecoff.c b/sys/compat/pecoff/imgact_pecoff.c
index fd9ab262a1db..b15e5c690c82 100644
--- a/sys/compat/pecoff/imgact_pecoff.c
+++ b/sys/compat/pecoff/imgact_pecoff.c
@@ -184,7 +184,7 @@ pecoff_coredump(register struct thread * td, register struct vnode * vp,
 	    limit)
 		return (EFAULT);
 	tempuser = malloc(ctob(uarea_pages + kstack_pages), M_TEMP,
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 	if (tempuser == NULL)
 		return (ENOMEM);
 	PROC_LOCK(p);
@@ -393,7 +393,7 @@ pecoff_load_file(struct thread * td, const char *file, u_long * addr, u_long * e
 		goto fail;
 	if ((error = pecoff_signature(td, imgp->vp, &dh) != 0))
 		goto fail;
-	fp = malloc(PECOFF_HDR_SIZE, M_TEMP, M_WAITOK);
+	fp = malloc(PECOFF_HDR_SIZE, M_TEMP, 0);
 	peofs = dh.d_peofs + sizeof(signature) - 1;
 	if ((error = pecoff_read_from(td, imgp->vp, peofs, (caddr_t) fp, PECOFF_HDR_SIZE) != 0))
 		goto fail;
@@ -405,7 +405,7 @@ pecoff_load_file(struct thread * td, const char *file, u_long * addr, u_long * e
 	wp = (void *) ((char *) ap + sizeof(struct coff_aouthdr));
 	/* read section header */
 	scnsiz = sizeof(struct coff_scnhdr) * fp->f_nscns;
-	sh = malloc(scnsiz, M_TEMP, M_WAITOK);
+	sh = malloc(scnsiz, M_TEMP, 0);
 	if ((error = pecoff_read_from(td, imgp->vp, peofs + PECOFF_HDR_SIZE,
 				      (caddr_t) sh, scnsiz)) != 0)
 		goto fail;
@@ -481,7 +481,7 @@ exec_pecoff_coff_prep_zmagic(struct image_params * imgp,
 	struct vmspace *vmspace;
 	struct pecoff_args *argp = NULL;
 
-	sh = malloc(scnsiz, M_TEMP, M_WAITOK);
+	sh = malloc(scnsiz, M_TEMP, 0);
 
 	wp = (void *) ((char *) ap + sizeof(struct coff_aouthdr));
 	error = pecoff_read_from(FIRST_THREAD_IN_PROC(imgp->proc), imgp->vp,
@@ -529,7 +529,7 @@ exec_pecoff_coff_prep_zmagic(struct image_params * imgp,
 	vmspace->vm_taddr = (caddr_t) (uintptr_t) text_addr;
 	vmspace->vm_dsize = data_size >> PAGE_SHIFT;
 	vmspace->vm_daddr = (caddr_t) (uintptr_t) data_addr;
-	argp = malloc(sizeof(struct pecoff_args), M_TEMP, M_WAITOK);
+	argp = malloc(sizeof(struct pecoff_args), M_TEMP, 0);
 	if (argp == NULL) {
 		error = ENOMEM;
 		goto fail;
@@ -659,7 +659,7 @@ imgact_pecoff(struct image_params * imgp)
 	VOP_UNLOCK(imgp->vp, 0, td);
 
 	peofs = dp->d_peofs + sizeof(signature) - 1;
-	fp = malloc(PECOFF_HDR_SIZE, M_TEMP, M_WAITOK);
+	fp = malloc(PECOFF_HDR_SIZE, M_TEMP, 0);
 	error = pecoff_read_from(FIRST_THREAD_IN_PROC(imgp->proc),
 	     imgp->vp, peofs, (caddr_t) fp, PECOFF_HDR_SIZE);
 	if (error)
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c
index ca1b8db0aeaf..ab98dced59bd 100644
--- a/sys/compat/svr4/svr4_filio.c
+++ b/sys/compat/svr4/svr4_filio.c
@@ -68,7 +68,7 @@ svr4_sys_poll(td, uap)
      pa.timeout = uap->timeout;
 
      siz = uap->nfds * sizeof(struct pollfd);
-     pfd = (struct pollfd *)malloc(siz, M_TEMP, M_WAITOK);
+     pfd = (struct pollfd *)malloc(siz, M_TEMP, 0);
 
      error = poll(td, (struct poll_args *)uap);
 
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 2db3c960ffed..5938993f9498 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -296,7 +296,7 @@ svr4_sys_getdents64(td, uap)
 #define	DIRBLKSIZ	512		/* XXX we used to use ufs's DIRBLKSIZ */
 	buflen = max(DIRBLKSIZ, nbytes);
 	buflen = min(buflen, MAXBSIZE);
-	buf = malloc(buflen, M_TEMP, M_WAITOK);
+	buf = malloc(buflen, M_TEMP, 0);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 again:
 	aiov.iov_base = buf;
@@ -459,7 +459,7 @@ svr4_sys_getdents(td, uap)
 	}
 
 	buflen = min(MAXBSIZE, uap->nbytes);
-	buf = malloc(buflen, M_TEMP, M_WAITOK);
+	buf = malloc(buflen, M_TEMP, 0);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 	off = fp->f_offset;
 again:
diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c
index b5da396c92bf..54274f9db7a9 100644
--- a/sys/compat/svr4/svr4_socket.c
+++ b/sys/compat/svr4/svr4_socket.c
@@ -138,7 +138,7 @@ svr4_add_socket(td, path, st)
 			atomic_store_rel_int(&svr4_str_initialized, 2);
 		}
 
-	e = malloc(sizeof(*e), M_TEMP, M_WAITOK);
+	e = malloc(sizeof(*e), M_TEMP, 0);
 	e->cookie = NULL;
 	e->dev = st->st_dev;
 	e->ino = st->st_ino;
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index 9a5c465d135a..674200948939 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -212,7 +212,7 @@ svr4_sendit(td, s, mp, flags)
 	if (KTRPOINT(td, KTR_GENIO)) {
 		int iovlen = auio.uio_iovcnt * sizeof (struct iovec);
 
-		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, 0);
 		bcopy((caddr_t)auio.uio_iov, (caddr_t)ktriov, iovlen);
 		ktruio = auio;
 	}
@@ -297,7 +297,7 @@ svr4_recvit(td, s, mp, namelenp)
 	if (KTRPOINT(td, KTR_GENIO)) {
 		int iovlen = auio.uio_iovcnt * sizeof (struct iovec);
 
-		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, 0);
 		bcopy((caddr_t)auio.uio_iov, (caddr_t)ktriov, iovlen);
 		ktruio = auio;
 	}
@@ -408,7 +408,7 @@ show_ioc(str, ioc)
 	const char		*str;
 	struct svr4_strioctl	*ioc;
 {
-	u_char *ptr = (u_char *) malloc(ioc->len, M_TEMP, M_WAITOK);
+	u_char *ptr = (u_char *) malloc(ioc->len, M_TEMP, 0);
 	int error;
 
 	uprintf("%s cmd = %ld, timeout = %d, len = %d, buf = %p { ",
@@ -444,7 +444,7 @@ show_strbuf(str)
 		len = maxlen;
 
 	if (len > 0) {
-	    ptr = (u_char *) malloc(len, M_TEMP, M_WAITOK);
+	    ptr = (u_char *) malloc(len, M_TEMP, 0);
 
 	    if ((error = copyin(str->buf, ptr, len)) != 0) {
 		    free((char *) ptr, M_TEMP);
diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c
index 1d4ad6e5cfad..508e9dc7f801 100644
--- a/sys/compat/svr4/svr4_sysvec.c
+++ b/sys/compat/svr4/svr4_sysvec.c
@@ -267,7 +267,7 @@ svr4_emul_find(td, sgp, prefix, path, pbuf, cflag)
 	char			*ptr, *buf, *cp;
 	size_t			 sz, len;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
 	*pbuf = path;
 
 	for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
diff --git a/sys/contrib/dev/fla/fla.c b/sys/contrib/dev/fla/fla.c
index ac2a8abffbf3..3ed9f714b872 100644
--- a/sys/contrib/dev/fla/fla.c
+++ b/sys/contrib/dev/fla/fla.c
@@ -65,7 +65,7 @@ static struct cdevsw fladisk_cdevsw;
 void *
 doc2k_malloc(int bytes) 
 {
-	return malloc(bytes, M_FLA, M_WAITOK);
+	return malloc(bytes, M_FLA, 0);
 }
 
 void
diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c
index a4b1a826a306..ea4dcc3aabe5 100644
--- a/sys/contrib/dev/oltr/if_oltr.c
+++ b/sys/contrib/dev/oltr/if_oltr.c
@@ -1405,14 +1405,14 @@ DriverReceiveFrameCompleted(void *DriverHandle, int ByteCount, int FragmentCount
 	
 	if (sc->state > OL_CLOSED) {
 		if (ReceiveStatus == TRLLD_RCV_OK) {
-			MGETHDR(m0, M_DONTWAIT, MT_DATA);
+			MGETHDR(m0, M_NOWAIT, MT_DATA);
 			mbuf_size = MHLEN - 2;
 			if (!m0) {
 				ifp->if_ierrors++;
 				goto dropped;
 			}
 			if (ByteCount + 2 > MHLEN) {
-				MCLGET(m0, M_DONTWAIT);
+				MCLGET(m0, M_NOWAIT);
 				mbuf_size = MCLBYTES - 2;
 				if (!(m0->m_flags & M_EXT)) {
 					m_freem(m0);
@@ -1447,7 +1447,7 @@ DriverReceiveFrameCompleted(void *DriverHandle, int ByteCount, int FragmentCount
 					frag_offset = 0;
 				}
 				if ((mbuf_offset == mbuf_size) && (frame_len > 0)) {
-					MGET(m1, M_DONTWAIT, MT_DATA);
+					MGET(m1, M_NOWAIT, MT_DATA);
 					mbuf_size = MHLEN;
 					if (!m1) {
 						ifp->if_ierrors++;
@@ -1455,7 +1455,7 @@ DriverReceiveFrameCompleted(void *DriverHandle, int ByteCount, int FragmentCount
 						goto dropped;
 					}
 					if (frame_len > MHLEN) {
-						MCLGET(m1, M_DONTWAIT);
+						MCLGET(m1, M_NOWAIT);
 						mbuf_size = MCLBYTES;
 						if (!(m1->m_flags & M_EXT)) {
 							m_freem(m0);
diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c
index 434e9e63b527..96432a18909d 100644
--- a/sys/contrib/ipfilter/netinet/fil.c
+++ b/sys/contrib/ipfilter/netinet/fil.c
@@ -1188,7 +1188,7 @@ logit:
 		mc = dupmsg(m);
 # else
 #  if defined(__OpenBSD__) && (OpenBSD >= 199905)
-		mc = m_copym2(m, 0, M_COPYALL, M_DONTWAIT);
+		mc = m_copym2(m, 0, M_COPYALL, M_NOWAIT);
 #  else
 		mc = m_copy(m, 0, M_COPYALL);
 #  endif
@@ -1587,7 +1587,7 @@ m_copyback(m0, off, len, cp)
 		off -= mlen;
 		totlen += mlen;
 		if (m->m_next == 0) {
-			n = m_getclr(M_DONTWAIT, m->m_type);
+			n = m_getclr(M_NOWAIT, m->m_type);
 			if (n == 0)
 				goto out;
 			n->m_len = min(MLEN, len + off);
@@ -1606,7 +1606,7 @@ m_copyback(m0, off, len, cp)
 		if (len == 0)
 			break;
 		if (m->m_next == 0) {
-			n = m_get(M_DONTWAIT, m->m_type);
+			n = m_get(M_NOWAIT, m->m_type);
 			if (n == 0)
 				break;
 			n->m_len = min(MLEN, len);
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.c b/sys/contrib/ipfilter/netinet/ip_fil.c
index f7f6352614d9..da64a4980ecb 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.c
+++ b/sys/contrib/ipfilter/netinet/ip_fil.c
@@ -1160,9 +1160,9 @@ fr_info_t *fin;
 	if (tcp->th_flags & TH_RST)
 		return -1;		/* feedback loop */
 # if	(BSD < 199306) || defined(__sgi)
-	m = m_get(M_DONTWAIT, MT_HEADER);
+	m = m_get(M_NOWAIT, MT_HEADER);
 # else
-	m = m_gethdr(M_DONTWAIT, MT_HEADER);
+	m = m_gethdr(M_NOWAIT, MT_HEADER);
 # endif
 	if (m == NULL)
 		return ENOBUFS;
@@ -1337,10 +1337,10 @@ int dst;
 
 # if	(BSD < 199306) || defined(__sgi)
 		avail = MLEN;
-		m = m_get(M_DONTWAIT, MT_HEADER);
+		m = m_get(M_NOWAIT, MT_HEADER);
 # else
 		avail = MHLEN;
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(M_NOWAIT, MT_HEADER);
 # endif
 		if (m == NULL)
 			return ENOBUFS;
@@ -1364,11 +1364,11 @@ int dst;
 		if (type == ICMP6_DST_UNREACH)
 			code = icmptoicmp6unreach[code];
 
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
+		MGETHDR(m, M_NOWAIT, MT_HEADER);
 		if (!m)
 			return ENOBUFS;
 
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_freem(m);
 			return ENOBUFS;
@@ -1564,7 +1564,7 @@ frdest_t *fdp;
 	 * problem.
 	 */
 	if (M_WRITABLE(m) == 0) {
-		if ((m0 = m_dup(m, M_DONTWAIT)) != NULL) {
+		if ((m0 = m_dup(m, M_NOWAIT)) != NULL) {
 			m_freem(*mpp);
 			*mpp = m0;
 			m = m0;
@@ -1747,9 +1747,9 @@ frdest_t *fdp;
 	mhlen = sizeof (struct ip);
 	for (off = hlen + len; off < ip->ip_len; off += len) {
 # ifdef	MGETHDR
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
+		MGETHDR(m, M_NOWAIT, MT_HEADER);
 # else
-		MGET(m, M_DONTWAIT, MT_HEADER);
+		MGET(m, M_NOWAIT, MT_HEADER);
 # endif
 		if (m == 0) {
 			error = ENOBUFS;
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c
index 22813343aeff..ddd29b96daa5 100644
--- a/sys/dev/agp/agp.c
+++ b/sys/dev/agp/agp.c
@@ -351,7 +351,7 @@ agp_generic_alloc_memory(device_t dev, int type, vm_size_t size)
 		return 0;
 	}
 
-	mem = malloc(sizeof *mem, M_AGP, M_WAITOK);
+	mem = malloc(sizeof *mem, M_AGP, 0);
 	mem->am_id = sc->as_nextid++;
 	mem->am_size = size;
 	mem->am_type = 0;
diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index dba76a9a5c21..d7c42f49ef97 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -500,7 +500,7 @@ agp_i810_alloc_memory(device_t dev, int type, vm_size_t size)
 			return 0;
 	}
 
-	mem = malloc(sizeof *mem, M_AGP, M_WAITOK);
+	mem = malloc(sizeof *mem, M_AGP, 0);
 	mem->am_id = sc->agp.as_nextid++;
 	mem->am_size = size;
 	mem->am_type = type;
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index e75c2afc1429..e763c6c71890 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -433,7 +433,7 @@ amr_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, d_thread_t *td)
 	debug(1, "AMR_IO_COMMAND  0x%x", au->au_cmd[0]);
 	/* handle inbound data buffer */
 	if (au->au_length != 0) {
-	    if ((dp = malloc(au->au_length, M_DEVBUF, M_WAITOK)) == NULL) {
+	    if ((dp = malloc(au->au_length, M_DEVBUF, 0)) == NULL) {
 		error = ENOMEM;
 		break;
 	    }
@@ -449,7 +449,7 @@ amr_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, d_thread_t *td)
 
 	/* handle SCSI passthrough command */
 	if (au->au_cmd[0] == AMR_CMD_PASS) {
-	    if ((ap = malloc(sizeof(*ap), M_DEVBUF, M_WAITOK | M_ZERO)) == NULL) {
+	    if ((ap = malloc(sizeof(*ap), M_DEVBUF, M_ZERO)) == NULL) {
 		error = ENOMEM;
 		break;
 	    }
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index 0a87b3cc8bfb..70fb414f518d 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -922,12 +922,12 @@ an_rxeof(sc)
 			/* dump raw 802.11 packet to bpf and skip ip stack */
 			BPF_TAP(ifp, bpf_buf, len);
 		} else {
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m == NULL) {
 				ifp->if_ierrors++;
 				return;
 			}
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, M_NOWAIT);
 			if (!(m->m_flags & M_EXT)) {
 				m_freem(m);
 				ifp->if_ierrors++;
@@ -1007,12 +1007,12 @@ an_rxeof(sc)
 			if (an_rx_desc.an_done && !an_rx_desc.an_valid) {
 				buf = sc->an_rx_buffer[count].an_dma_vaddr;
 
-				MGETHDR(m, M_DONTWAIT, MT_DATA);
+				MGETHDR(m, M_NOWAIT, MT_DATA);
 				if (m == NULL) {
 					ifp->if_ierrors++;
 					return;
 				}
-				MCLGET(m, M_DONTWAIT);
+				MCLGET(m, M_NOWAIT);
 				if (!(m->m_flags & M_EXT)) {
 					m_freem(m);
 					ifp->if_ierrors++;
@@ -3580,7 +3580,7 @@ flashcard(ifp, l_ioctl)
 			free(sc->an_flash_buffer, M_DEVBUF);
 			sc->an_flash_buffer = NULL;
 		}
-		sc->an_flash_buffer = malloc(FLASH_SIZE, M_DEVBUF, M_WAITOK);
+		sc->an_flash_buffer = malloc(FLASH_SIZE, M_DEVBUF, 0);
 		if (sc->an_flash_buffer)
 			return setflashmode(ifp);
 		else
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 0c09885c6d83..14561f774388 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -1078,7 +1078,7 @@ arc_init(struct ar_hardc *hc)
 	u_char isr, mar;
 
 	MALLOC(sc, struct ar_softc *, hc->numports * sizeof(struct ar_softc),
-		M_DEVBUF, M_WAITOK | M_ZERO);
+		M_DEVBUF, M_ZERO);
 	if (sc == NULL)
 		return;
 	hc->sc = sc;
@@ -1678,7 +1678,7 @@ ar_get_packets(struct ar_softc *sc)
 	while(ar_packet_avail(sc, &len, &rxstat)) {
 		TRC(printf("apa: len %d, rxstat %x\n", len, rxstat));
 		if(((rxstat & SCA_DESC_ERRORS) == 0) && (len < MCLBYTES)) {
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if(m == NULL) {
 				/* eat packet if get mbuf fail!! */
 				ar_eat_packet(sc, 1);
@@ -1693,7 +1693,7 @@ ar_get_packets(struct ar_softc *sc)
 #endif	/* NETGRAPH */
 			m->m_pkthdr.len = m->m_len = len;
 			if(len > MHLEN) {
-				MCLGET(m, M_DONTWAIT);
+				MCLGET(m, M_NOWAIT);
 				if((m->m_flags & M_EXT) == 0) {
 					m_freem(m);
 					ar_eat_packet(sc, 1);
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index 4e1c28415579..c377c9d48a1a 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -911,7 +911,7 @@ asr_alloc_ccb (
 	OUT union asr_ccb * new_ccb;
 
 	if ((new_ccb = (union asr_ccb *)malloc(sizeof(*new_ccb),
-	  M_DEVBUF, M_WAITOK | M_ZERO)) != (union asr_ccb *)NULL) {
+	  M_DEVBUF, M_ZERO)) != (union asr_ccb *)NULL) {
 		new_ccb->ccb_h.pinfo.priority = 1;
 		new_ccb->ccb_h.pinfo.index = CAM_UNQUEUED_INDEX;
 		new_ccb->ccb_h.spriv_ptr0 = sc;
@@ -1205,7 +1205,7 @@ ASR_getTidAddress(
 		if ((new_entry == FALSE)
 		 || ((sc->ha_targets[bus] = bus_ptr = (target2lun_t *)malloc (
 		    sizeof(*bus_ptr) + (sizeof(bus_ptr->LUN) * new_size),
-		    M_TEMP, M_WAITOK | M_ZERO))
+		    M_TEMP, M_ZERO))
 		   == (target2lun_t *)NULL)) {
 			debug_asr_printf("failed to allocate bus list\n");
 			return ((tid_t *)NULL);
@@ -1222,7 +1222,7 @@ ASR_getTidAddress(
 		if ((new_entry == FALSE)
 		 || ((new_bus_ptr = (target2lun_t *)malloc (
 		    sizeof(*bus_ptr) + (sizeof(bus_ptr->LUN) * new_size),
-		    M_TEMP, M_WAITOK | M_ZERO))
+		    M_TEMP, M_ZERO))
 		   == (target2lun_t *)NULL)) {
 			debug_asr_printf("failed to reallocate bus list\n");
 			return ((tid_t *)NULL);
@@ -1258,7 +1258,7 @@ ASR_getTidAddress(
 		if ((new_entry == FALSE)
 		 || ((bus_ptr->LUN[target] = target_ptr = (lun2tid_t *)malloc (
 		    sizeof(*target_ptr) + (sizeof(target_ptr->TID) * new_size),
-		    M_TEMP, M_WAITOK | M_ZERO))
+		    M_TEMP, M_ZERO))
 		   == (lun2tid_t *)NULL)) {
 			debug_asr_printf("failed to allocate target list\n");
 			return ((tid_t *)NULL);
@@ -1275,7 +1275,7 @@ ASR_getTidAddress(
 		if ((new_entry == FALSE)
 		 || ((new_target_ptr = (lun2tid_t *)malloc (
 		    sizeof(*target_ptr) + (sizeof(target_ptr->TID) * new_size),
-		    M_TEMP, M_WAITOK | M_ZERO))
+		    M_TEMP, M_ZERO))
 		   == (lun2tid_t *)NULL)) {
 			debug_asr_printf("failed to reallocate target list\n");
 			return ((tid_t *)NULL);
@@ -1808,7 +1808,7 @@ ASR_acquireLct (
 	MessageSizeInBytes = sizeof(I2O_EXEC_LCT_NOTIFY_MESSAGE)
 	  - sizeof(I2O_SG_ELEMENT) + sizeof(I2O_SGE_SIMPLE_ELEMENT);
 	if ((Message_Ptr = (PI2O_EXEC_LCT_NOTIFY_MESSAGE)malloc (
-	  MessageSizeInBytes, M_TEMP, M_WAITOK))
+	  MessageSizeInBytes, M_TEMP, 0))
 	  == (PI2O_EXEC_LCT_NOTIFY_MESSAGE)NULL) {
 		return (ENOMEM);
 	}
@@ -1852,7 +1852,7 @@ ASR_acquireLct (
 		free (Message_Ptr, M_TEMP);
 		return (EINVAL);
 	}
-	if ((sc->ha_LCT = (PI2O_LCT)malloc (len, M_TEMP, M_WAITOK))
+	if ((sc->ha_LCT = (PI2O_LCT)malloc (len, M_TEMP, 0))
 	  == (PI2O_LCT)NULL) {
 		free (Message_Ptr, M_TEMP);
 		return (ENOMEM);
@@ -1921,7 +1921,7 @@ ASR_acquireLct (
 			PI2O_EXEC_LCT_NOTIFY_MESSAGE NewMessage_Ptr;
 
 			if ((NewMessage_Ptr = (PI2O_EXEC_LCT_NOTIFY_MESSAGE)
-			    malloc (MessageSizeInBytes, M_TEMP, M_WAITOK))
+			    malloc (MessageSizeInBytes, M_TEMP, 0))
 			    == (PI2O_EXEC_LCT_NOTIFY_MESSAGE)NULL) {
 				free (sc->ha_LCT, M_TEMP);
 				sc->ha_LCT = (PI2O_LCT)NULL;
@@ -2262,7 +2262,7 @@ ASR_initOutBound (
 			 * initialization time.
 			 */
 			if ((sc->ha_Msgs = (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)
-			  contigmalloc (size, M_DEVBUF, M_WAITOK, 0ul,
+			  contigmalloc (size, M_DEVBUF, 0, 0ul,
 			    0xFFFFFFFFul, (u_long)sizeof(U32), 0ul))
 			  != (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)NULL) {
 				(void)bzero ((char *)sc->ha_Msgs, size);
@@ -2296,7 +2296,7 @@ ASR_setSysTab(
 	int			      retVal;
 
 	if ((SystemTable = (PI2O_SET_SYSTAB_HEADER)malloc (
-	  sizeof(I2O_SET_SYSTAB_HEADER), M_TEMP, M_WAITOK | M_ZERO))
+	  sizeof(I2O_SET_SYSTAB_HEADER), M_TEMP, M_ZERO))
 	  == (PI2O_SET_SYSTAB_HEADER)NULL) {
 		return (ENOMEM);
 	}
@@ -2306,7 +2306,7 @@ ASR_setSysTab(
 	if ((Message_Ptr = (PI2O_EXEC_SYS_TAB_SET_MESSAGE)malloc (
 	  sizeof(I2O_EXEC_SYS_TAB_SET_MESSAGE) - sizeof(I2O_SG_ELEMENT)
 	   + ((3+SystemTable->NumberEntries) * sizeof(I2O_SGE_SIMPLE_ELEMENT)),
-	  M_TEMP, M_WAITOK)) == (PI2O_EXEC_SYS_TAB_SET_MESSAGE)NULL) {
+	  M_TEMP, 0)) == (PI2O_EXEC_SYS_TAB_SET_MESSAGE)NULL) {
 		free (SystemTable, M_TEMP);
 		return (ENOMEM);
 	}
@@ -2918,7 +2918,7 @@ asr_attach (ATTACH_ARGS)
 		/* Check if the device is there? */
 		if ((ASR_resetIOP(sc->ha_Virt, sc->ha_Fvirt) == 0)
 		 || ((status = (PI2O_EXEC_STATUS_GET_REPLY)malloc (
-		  sizeof(I2O_EXEC_STATUS_GET_REPLY), M_TEMP, M_WAITOK))
+		  sizeof(I2O_EXEC_STATUS_GET_REPLY), M_TEMP, 0))
 		  == (PI2O_EXEC_STATUS_GET_REPLY)NULL)
 		 || (ASR_getStatus(sc->ha_Virt, sc->ha_Fvirt, status) == NULL)) {
 			printf ("asr%d: could not initialize hardware\n", unit);
@@ -3037,7 +3037,7 @@ asr_attach (ATTACH_ARGS)
 	printf ("asr%d:", unit);
 
 	if ((iq = (struct scsi_inquiry_data *)malloc (
-	    sizeof(struct scsi_inquiry_data), M_TEMP, M_WAITOK | M_ZERO))
+	    sizeof(struct scsi_inquiry_data), M_TEMP, M_ZERO))
 	  != (struct scsi_inquiry_data *)NULL) {
 		defAlignLong(PRIVATE_SCSI_SCB_EXECUTE_MESSAGE,Message);
 		PPRIVATE_SCSI_SCB_EXECUTE_MESSAGE	      Message_Ptr;
@@ -3947,7 +3947,7 @@ ASR_queue_i(
 	}
 	/* Copy in the message into a local allocation */
 	if ((Message_Ptr = (PI2O_MESSAGE_FRAME)malloc (
-	  sizeof(I2O_MESSAGE_FRAME), M_TEMP, M_WAITOK))
+	  sizeof(I2O_MESSAGE_FRAME), M_TEMP, 0))
 	 == (PI2O_MESSAGE_FRAME)NULL) {
 		debug_usr_cmd_printf (
 		  "Failed to acquire I2O_MESSAGE_FRAME memory\n");
@@ -4014,7 +4014,7 @@ ASR_queue_i(
 	}
 
 	if ((Message_Ptr = (PI2O_MESSAGE_FRAME)malloc (MessageSizeInBytes,
-	  M_TEMP, M_WAITOK)) == (PI2O_MESSAGE_FRAME)NULL) {
+	  M_TEMP, 0)) == (PI2O_MESSAGE_FRAME)NULL) {
 		debug_usr_cmd_printf ("Failed to acquire frame[%d] memory\n",
 		  MessageSizeInBytes);
 		return (ENOMEM);
@@ -4030,7 +4030,7 @@ ASR_queue_i(
 	/* Check the size of the reply frame, and start constructing */
 
 	if ((Reply_Ptr = (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)malloc (
-	  sizeof(I2O_MESSAGE_FRAME), M_TEMP, M_WAITOK))
+	  sizeof(I2O_MESSAGE_FRAME), M_TEMP, 0))
 	  == (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)NULL) {
 		free (Message_Ptr, M_TEMP);
 		debug_usr_cmd_printf (
@@ -4061,7 +4061,7 @@ ASR_queue_i(
 	  ((ReplySizeInBytes > sizeof(I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME))
 	    ? ReplySizeInBytes
 	    : sizeof(I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)),
-	  M_TEMP, M_WAITOK)) == (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)NULL) {
+	  M_TEMP, 0)) == (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)NULL) {
 		free (Message_Ptr, M_TEMP);
 		debug_usr_cmd_printf ("Failed to acquire frame[%d] memory\n",
 		  ReplySizeInBytes);
@@ -4130,7 +4130,7 @@ ASR_queue_i(
 
 			if ((elm = (struct ioctlSgList_S *)malloc (
 			  sizeof(*elm) - sizeof(elm->KernelSpace) + len,
-			  M_TEMP, M_WAITOK))
+			  M_TEMP, 0))
 			  == (struct ioctlSgList_S *)NULL) {
 				debug_usr_cmd_printf (
 				  "Failed to allocate SG[%d]\n", len);
@@ -4219,7 +4219,7 @@ ASR_queue_i(
 					if ((NewMessage_Ptr
 					  = (PI2O_MESSAGE_FRAME)
 					    malloc (MessageSizeInBytes,
-					     M_TEMP, M_WAITOK))
+					     M_TEMP, 0))
 					    == (PI2O_MESSAGE_FRAME)NULL) {
 						debug_usr_cmd_printf (
 						  "Failed to acquire frame[%d] memory\n",
diff --git a/sys/dev/ata/atapi-cam.c b/sys/dev/ata/atapi-cam.c
index 02e234b70502..b6329a65d3d3 100644
--- a/sys/dev/ata/atapi-cam.c
+++ b/sys/dev/ata/atapi-cam.c
@@ -624,7 +624,7 @@ static void
 cam_rescan(struct cam_sim *sim)
 {
     struct cam_path *path;
-    union ccb *ccb = malloc(sizeof(union ccb), M_ATACAM, M_WAITOK | M_ZERO);
+    union ccb *ccb = malloc(sizeof(union ccb), M_ATACAM, M_ZERO);
     
     if (xpt_create_path(&path, xpt_periph, cam_sim_path(sim),
 			CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP)
diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c
index e77fae6d601a..1eeaf78476e9 100644
--- a/sys/dev/awi/awi.c
+++ b/sys/dev/awi/awi.c
@@ -1243,7 +1243,7 @@ awi_fix_txhdr(sc, m0)
 		    llc->llc_snap.org_code[2] = 0;
 		llc->llc_snap.ether_type = eh.ether_type;
 	}
-	M_PREPEND(m0, sizeof(struct ieee80211_frame), M_DONTWAIT);
+	M_PREPEND(m0, sizeof(struct ieee80211_frame), M_NOWAIT);
 	if (m0 == NULL)
 		return NULL;
 	wh = mtod(m0, struct ieee80211_frame *);
@@ -1321,7 +1321,7 @@ awi_fix_rxhdr(sc, m0)
 		off = 0;
 		while (m0->m_pkthdr.len > off) {
 			if (n0 == NULL) {
-				MGETHDR(n, M_DONTWAIT, MT_DATA);
+				MGETHDR(n, M_NOWAIT, MT_DATA);
 				if (n == NULL) {
 					m_freem(m0);
 					return NULL;
@@ -1329,7 +1329,7 @@ awi_fix_rxhdr(sc, m0)
 				M_MOVE_PKTHDR(n, m0);
 				n->m_len = MHLEN;
 			} else {
-				MGET(n, M_DONTWAIT, MT_DATA);
+				MGET(n, M_NOWAIT, MT_DATA);
 				if (n == NULL) {
 					m_freem(m0);
 					m_freem(n0);
@@ -1338,7 +1338,7 @@ awi_fix_rxhdr(sc, m0)
 				n->m_len = MLEN;
 			}
 			if (m0->m_pkthdr.len - off >= MINCLSIZE) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, M_NOWAIT);
 				if (n->m_flags & M_EXT)
 					n->m_len = n->m_ext.ext_size;
 			}
@@ -1549,14 +1549,14 @@ awi_devget(sc, off, len)
 
 	while (len > 0) {
 		if (top == NULL) {
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m == NULL)
 				return NULL;
 			m->m_pkthdr.rcvif = sc->sc_ifp;
 			m->m_pkthdr.len = len;
 			m->m_len = MHLEN;
 		} else {
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m == NULL) {
 				m_freem(top);
 				return NULL;
@@ -1564,7 +1564,7 @@ awi_devget(sc, off, len)
 			m->m_len = MLEN;
 		}
 		if (len >= MINCLSIZE) {
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, M_NOWAIT);
 			if (m->m_flags & M_EXT)
 				m->m_len = m->m_ext.ext_size;
 		}
@@ -2232,7 +2232,7 @@ awi_send_deauth(sc)
 	struct ieee80211_frame *wh;
 	u_int8_t *deauth;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	if (ifp->if_flags & IFF_DEBUG)
@@ -2269,7 +2269,7 @@ awi_send_auth(sc, seq)
 	struct ieee80211_frame *wh;
 	u_int8_t *auth;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	sc->sc_status = AWI_ST_AUTH;
@@ -2370,7 +2370,7 @@ awi_send_asreq(sc, reassoc)
 	u_int16_t capinfo, lintval;
 	u_int8_t *asreq;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	sc->sc_status = AWI_ST_ASSOC;
diff --git a/sys/dev/awi/awi_wep.c b/sys/dev/awi/awi_wep.c
index ecaf548b4ce0..1eec0233bfb4 100644
--- a/sys/dev/awi/awi_wep.c
+++ b/sys/dev/awi/awi_wep.c
@@ -319,7 +319,7 @@ awi_wep_encrypt(sc, m0, txflag)
 	ctx = sc->sc_wep_ctx;
 	m = m0;
 	left = m->m_pkthdr.len;
-	MGET(n, M_DONTWAIT, m->m_type);
+	MGET(n, M_NOWAIT, m->m_type);
 	n0 = n;
 	if (n == NULL)
 		goto fail;
@@ -333,7 +333,7 @@ awi_wep_encrypt(sc, m0, txflag)
 	}
 	n->m_len = MHLEN;
 	if (n->m_pkthdr.len >= MINCLSIZE) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, M_NOWAIT);
 		if (n->m_flags & M_EXT)
 			n->m_len = n->m_ext.ext_size;
 	}
@@ -382,13 +382,13 @@ awi_wep_encrypt(sc, m0, txflag)
 		if (len > n->m_len - noff) {
 			len = n->m_len - noff;
 			if (len == 0) {
-				MGET(n->m_next, M_DONTWAIT, n->m_type);
+				MGET(n->m_next, M_NOWAIT, n->m_type);
 				if (n->m_next == NULL)
 					goto fail;
 				n = n->m_next;
 				n->m_len = MLEN;
 				if (left >= MINCLSIZE) {
-					MCLGET(n, M_DONTWAIT);
+					MCLGET(n, M_NOWAIT);
 					if (n->m_flags & M_EXT)
 						n->m_len = n->m_ext.ext_size;
 				}
@@ -418,7 +418,7 @@ awi_wep_encrypt(sc, m0, txflag)
 			n->m_len = noff + sizeof(crcbuf);
 		else {
 			n->m_len = noff;
-			MGET(n->m_next, M_DONTWAIT, n->m_type);
+			MGET(n->m_next, M_NOWAIT, n->m_type);
 			if (n->m_next == NULL)
 				goto fail;
 			n = n->m_next;
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 99523c361a32..da701fca4976 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -719,12 +719,12 @@ bge_newbuf_std(sc, i, m)
 	struct bge_rx_bd	*r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -765,7 +765,7 @@ bge_newbuf_jumbo(sc, i, m)
 		caddr_t			*buf = NULL;
 
 		/* Allocate the mbuf. */
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index ff162ddd9b1a..b87e7a8680ce 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -424,7 +424,7 @@ cardbus_read_device(device_t brdev, int b, int s, int f)
 
 	if (REG(PCIR_DEVVENDOR, 4) != 0xffffffff) {
 		devlist_entry = malloc(sizeof(struct cardbus_devinfo),
-		    M_DEVBUF, M_WAITOK | M_ZERO);
+		    M_DEVBUF, M_ZERO);
 		if (devlist_entry == NULL)
 			return (NULL);
 
diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c
index 7c7712a11f1d..9bee0968f5a7 100644
--- a/sys/dev/cardbus/cardbus_cis.c
+++ b/sys/dev/cardbus/cardbus_cis.c
@@ -168,7 +168,7 @@ DECODE_PROTOTYPE(copy)
 	struct cis_tupleinfo *tmpbuf;
 
 	tmpbuf = malloc(sizeof(struct cis_tupleinfo) * (ncisread_buf+1),
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	if (ncisread_buf > 0) {
 		memcpy(tmpbuf, cisread_buf,
 		    sizeof(struct cis_tupleinfo) * ncisread_buf);
@@ -178,7 +178,7 @@ DECODE_PROTOTYPE(copy)
 
 	cisread_buf[ncisread_buf].id = id;
 	cisread_buf[ncisread_buf].len = len;
-	cisread_buf[ncisread_buf].data = malloc(len, M_DEVBUF, M_WAITOK);
+	cisread_buf[ncisread_buf].data = malloc(len, M_DEVBUF, 0);
 	memcpy(cisread_buf[ncisread_buf].data, tupledata, len);
 	ncisread_buf++;
 	return (0);
@@ -705,7 +705,7 @@ cardbus_alloc_resources(device_t cbdev, device_t child)
 	if (count == 0)
 		return (0);
 	barlist = malloc(sizeof(struct resource_list_entry*) * count, M_DEVBUF,
-	    M_WAITOK);
+	    0);
 	count = 0;
 	SLIST_FOREACH(rle, &dinfo->pci.resources, link) {
 		barlist[count] = rle;
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 103a54b13068..75694202d50d 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -206,7 +206,7 @@ ccdnew(int unit)
 	if (IS_ALLOCATED(unit) || unit > 32)
 		return (NULL);
 
-	MALLOC(sc, struct ccd_s *, sizeof(*sc), M_CCD, M_WAITOK | M_ZERO);
+	MALLOC(sc, struct ccd_s *, sizeof(*sc), M_CCD, M_ZERO);
 	sc->sc_unit = unit;
 	LIST_INSERT_HEAD(&ccd_softc_list, sc, list);
 	/* XXX: UNLOCK(unique unit numbers) */
@@ -283,7 +283,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 
 	/* Allocate space for the component info. */
 	cs->sc_cinfo = malloc(cs->sc_nccdisks * sizeof(struct ccdcinfo),
-	    M_CCD, M_WAITOK);
+	    M_CCD, 0);
 
 	/*
 	 * Verify that each component piece exists and record
@@ -291,7 +291,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 	 */
 	maxsecsize = 0;
 	minsize = 0;
-	tmppath = malloc(MAXPATHLEN, M_CCD, M_WAITOK);
+	tmppath = malloc(MAXPATHLEN, M_CCD, 0);
 	for (ix = 0; ix < cs->sc_nccdisks; ix++) {
 		vp = cs->sc_vpp[ix];
 		ci = &cs->sc_cinfo[ix];
@@ -304,7 +304,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 		    MAXPATHLEN, &ci->ci_pathlen)) != 0) {
 			goto fail;
 		}
-		ci->ci_path = malloc(ci->ci_pathlen, M_CCD, M_WAITOK);
+		ci->ci_path = malloc(ci->ci_pathlen, M_CCD, 0);
 		bcopy(tmppath, ci->ci_path, ci->ci_pathlen);
 
 		ci->ci_dev = vn_todev(vp);
@@ -459,7 +459,7 @@ ccdinterleave(struct ccd_s *cs, int unit)
 	 */
 	size = (cs->sc_nccdisks + 1) * sizeof(struct ccdiinfo);
 	cs->sc_itable = (struct ccdiinfo *)malloc(size, M_CCD,
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 
 	/*
 	 * Trivial case: no interleave (actually interleave of disk size).
@@ -473,7 +473,7 @@ ccdinterleave(struct ccd_s *cs, int unit)
 
 		for (ix = 0; ix < cs->sc_nccdisks; ix++) {
 			/* Allocate space for ii_index. */
-			ii->ii_index = malloc(sizeof(int), M_CCD, M_WAITOK);
+			ii->ii_index = malloc(sizeof(int), M_CCD, 0);
 			ii->ii_ndisk = 1;
 			ii->ii_startblk = bn;
 			ii->ii_startoff = 0;
@@ -496,7 +496,7 @@ ccdinterleave(struct ccd_s *cs, int unit)
 		 * we use.
 		 */
 		ii->ii_index = malloc((sizeof(int) * cs->sc_nccdisks),
-		    M_CCD, M_WAITOK);
+		    M_CCD, 0);
 
 		/*
 		 * Locate the smallest of the remaining components
@@ -1107,9 +1107,9 @@ ccdioctltoo(int unit, u_long cmd, caddr_t data, int flag, struct thread *td)
 		 * componet pathnames and device numbers.
 		 */
 		cpp = malloc(ccio->ccio_ndisks * sizeof(char *),
-		    M_CCD, M_WAITOK);
+		    M_CCD, 0);
 		vpp = malloc(ccio->ccio_ndisks * sizeof(struct vnode *),
-		    M_CCD, M_WAITOK);
+		    M_CCD, 0);
 
 		error = copyin((caddr_t)ccio->ccio_disks, (caddr_t)cpp,
 		    ccio->ccio_ndisks * sizeof(char **));
@@ -1164,7 +1164,7 @@ ccdioctltoo(int unit, u_long cmd, caddr_t data, int flag, struct thread *td)
 		 */
 		ccio->ccio_unit = unit;
 		ccio->ccio_size = cs->sc_size;
-		cs->sc_disk = malloc(sizeof(struct disk), M_CCD, M_WAITOK);
+		cs->sc_disk = malloc(sizeof(struct disk), M_CCD, 0);
 		cs->sc_dev = disk_create(unit, cs->sc_disk, 0,
 		    &ccd_cdevsw, &ccddisk_cdevsw);
 		cs->sc_dev->si_drv1 = cs;
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index 6479929d4e99..dbf025b1209b 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -1859,7 +1859,7 @@ ciss_user_command(struct ciss_softc *sc, IOCTL_Command_struct *ioc)
      */
     cr->cr_length = ioc->buf_size;
     if (ioc->buf_size > 0) {
-	if ((cr->cr_data = malloc(ioc->buf_size, CISS_MALLOC_CLASS, M_WAITOK)) == NULL) {
+	if ((cr->cr_data = malloc(ioc->buf_size, CISS_MALLOC_CLASS, 0)) == NULL) {
 	    error = ENOMEM;
 	    goto out;
 	}
@@ -2038,7 +2038,7 @@ ciss_cam_rescan_target(struct ciss_softc *sc, int target)
 
     debug_called(1);
 
-    if ((ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO)) == NULL) {
+    if ((ccb = malloc(sizeof(union ccb), M_TEMP, M_ZERO)) == NULL) {
 	ciss_printf(sc, "rescan failed (can't allocate CCB)\n");
 	return;
     }
diff --git a/sys/dev/cm/smc90cx6.c b/sys/dev/cm/smc90cx6.c
index 73f0523debdd..56f10b20e1fc 100644
--- a/sys/dev/cm/smc90cx6.c
+++ b/sys/dev/cm/smc90cx6.c
@@ -644,7 +644,7 @@ cm_srint(vsc)
 	splx(s);
 
 	/* Allocate header mbuf */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 
 	if (m == 0) {
 		/*
@@ -681,7 +681,7 @@ cm_srint(vsc)
 	 */
 	if ((len + 2 + 2) > MHLEN) {
 		/* attach an mbuf cluster */
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 
 		/* Insist on getting a cluster */
 		if ((m->m_flags & M_EXT) == 0) {
diff --git a/sys/dev/cnw/if_cnw.c b/sys/dev/cnw/if_cnw.c
index 84bdcedcd5cf..7043fff0c87b 100644
--- a/sys/dev/cnw/if_cnw.c
+++ b/sys/dev/cnw/if_cnw.c
@@ -941,7 +941,7 @@ cnw_read(sc)
 	bufbytes = 0;
 	bufptr = 0; /* XXX make gcc happy */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == 0)
 		return (0);
 #if !defined(__FreeBSD__)
@@ -956,7 +956,7 @@ cnw_read(sc)
 
 	while (totbytes > 0) {
 		if (top) {
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m == 0) {
 				m_freem(top);
 				return (0);
@@ -964,7 +964,7 @@ cnw_read(sc)
 			mbytes = MLEN;
 		}
 		if (totbytes >= MINCLSIZE) {
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, M_NOWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_free(m);
 				m_freem(top);
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index bffccf909b23..94643f0a1892 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -780,12 +780,12 @@ cs_get_packet(struct cs_softc *sc)
 		return -1;
 	}
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m==NULL)
 		return -1;
 
 	if (length > MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if (!(m->m_flags & M_EXT)) {
 			m_freem(m);
 			return -1;
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index a9e599ee9e39..2aa4e3337a57 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -2423,11 +2423,11 @@ dc_newbuf(sc, i, m)
 	c = &sc->dc_ldata->dc_rx_list[i];
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -3186,11 +3186,11 @@ dc_coal(sc, m_head)
 	struct mbuf		*m_new, *m;
 
 	m = *m_head;
-	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, M_NOWAIT, MT_DATA);
 	if (m_new == NULL)
 		return(ENOBUFS);
 	if (m->m_pkthdr.len > MHLEN) {
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index d1865865a099..9e1e319b2f2b 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -195,7 +195,7 @@ tulip_txprobe(
      * either is connected so the transmit is the only way
      * to verify the connectivity.
      */
-    MGETHDR(m, M_DONTWAIT, MT_DATA);
+    MGETHDR(m, M_NOWAIT, MT_DATA);
     if (m == NULL)
 	return 0;
     /*
@@ -3545,12 +3545,12 @@ tulip_rx_intr(
 	 */
 	if (accept || ms == NULL) {
 	    struct mbuf *m0;
-	    MGETHDR(m0, M_DONTWAIT, MT_DATA);
+	    MGETHDR(m0, M_NOWAIT, MT_DATA);
 	    if (m0 != NULL) {
 #if defined(TULIP_COPY_RXDATA)
 		if (!accept || total_len >= (MHLEN - 2)) {
 #endif
-		    MCLGET(m0, M_DONTWAIT);
+		    MCLGET(m0, M_NOWAIT);
 		    if ((m0->m_flags & M_EXT) == 0) {
 			m_freem(m0);
 			m0 = NULL;
@@ -4061,10 +4061,10 @@ tulip_mbuf_compress(
 {
     struct mbuf *m0;
 #if MCLBYTES >= ETHERMTU + 18 && !defined(BIG_PACKET)
-    MGETHDR(m0, M_DONTWAIT, MT_DATA);
+    MGETHDR(m0, M_NOWAIT, MT_DATA);
     if (m0 != NULL) {
 	if (m->m_pkthdr.len > MHLEN) {
-	    MCLGET(m0, M_DONTWAIT);
+	    MCLGET(m0, M_NOWAIT);
 	    if ((m0->m_flags & M_EXT) == 0) {
 		m_freem(m);
 		m_freem(m0);
@@ -4081,9 +4081,9 @@ tulip_mbuf_compress(
 
     while (len > 0) {
 	if (mlen == MHLEN) {
-	    MGETHDR(*mp, M_DONTWAIT, MT_DATA);
+	    MGETHDR(*mp, M_NOWAIT, MT_DATA);
 	} else {
-	    MGET(*mp, M_DONTWAIT, MT_DATA);
+	    MGET(*mp, M_NOWAIT, MT_DATA);
 	}
 	if (*mp == NULL) {
 	    m_freem(m0);
@@ -4091,7 +4091,7 @@ tulip_mbuf_compress(
 	    break;
 	}
 	if (len > MLEN) {
-	    MCLGET(*mp, M_DONTWAIT);
+	    MCLGET(*mp, M_NOWAIT);
 	    if (((*mp)->m_flags & M_EXT) == 0) {
 		m_freem(m0);
 		m0 = NULL;
diff --git a/sys/dev/digi/digi.c b/sys/dev/digi/digi.c
index 57f60222dc24..cde3b98734a2 100644
--- a/sys/dev/digi/digi.c
+++ b/sys/dev/digi/digi.c
@@ -546,12 +546,12 @@ digi_init(struct digi_softc *sc)
 	if (sc->ports)
 		free(sc->ports, M_TTYS);
 	sc->ports = malloc(sizeof(struct digi_p) * sc->numports,
-	    M_TTYS, M_WAITOK | M_ZERO);
+	    M_TTYS, M_ZERO);
 
 	if (sc->ttys)
 		free(sc->ttys, M_TTYS);
 	sc->ttys = malloc(sizeof(struct tty) * sc->numports,
-	    M_TTYS, M_WAITOK | M_ZERO);
+	    M_TTYS, M_ZERO);
 
 	/*
 	 * XXX Should read port 0xc90 for an array of 2byte values, 1 per
@@ -1035,7 +1035,7 @@ digi_loadmoduledata(struct digi_softc *sc)
 	KASSERT(sc->module != NULL, ("Uninitialised module name"));
 
 	modlen = strlen(sc->module);
-	modfile = malloc(modlen + 6, M_TEMP, M_WAITOK);
+	modfile = malloc(modlen + 6, M_TEMP, 0);
 	snprintf(modfile, modlen + 6, "digi_%s", sc->module);
 	if ((res = linker_reference_module(modfile, NULL, &lf)) != 0) {
 		if (res == ENOENT && rootdev == NODEV)
@@ -1049,7 +1049,7 @@ digi_loadmoduledata(struct digi_softc *sc)
 	if (res != 0)
 		return (res);
 
-	sym = malloc(modlen + 10, M_TEMP, M_WAITOK);
+	sym = malloc(modlen + 10, M_TEMP, 0);
 	snprintf(sym, modlen + 10, "digi_mod_%s", sc->module);
 	if ((symptr = linker_file_lookup_symbol(lf, sym, 0)) == NULL)
 		printf("digi_%s.ko: Symbol `%s' not found\n", sc->module, sym);
@@ -1065,19 +1065,19 @@ digi_loadmoduledata(struct digi_softc *sc)
 
 	sc->bios.size = digi_mod->dm_bios.size;
 	if (sc->bios.size != 0 && digi_mod->dm_bios.data != NULL) {
-		sc->bios.data = malloc(sc->bios.size, M_TTYS, M_WAITOK);
+		sc->bios.data = malloc(sc->bios.size, M_TTYS, 0);
 		bcopy(digi_mod->dm_bios.data, sc->bios.data, sc->bios.size);
 	}
 
 	sc->fep.size = digi_mod->dm_fep.size;
 	if (sc->fep.size != 0 && digi_mod->dm_fep.data != NULL) {
-		sc->fep.data = malloc(sc->fep.size, M_TTYS, M_WAITOK);
+		sc->fep.data = malloc(sc->fep.size, M_TTYS, 0);
 		bcopy(digi_mod->dm_fep.data, sc->fep.data, sc->fep.size);
 	}
 
 	sc->link.size = digi_mod->dm_link.size;
 	if (sc->link.size != 0 && digi_mod->dm_link.data != NULL) {
-		sc->link.data = malloc(sc->link.size, M_TTYS, M_WAITOK);
+		sc->link.data = malloc(sc->link.size, M_TTYS, 0);
 		bcopy(digi_mod->dm_link.data, sc->link.data, sc->link.size);
 	}
 
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index f035a8c249a3..9186c9615bfe 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -2321,12 +2321,12 @@ dpt_user_cmd(dpt_softc_t * dpt, eata_pt_t * user_cmd,
 		/* Data I/O is involved in this command.  Alocate buffer */
 		if (ccb->eata_ccb.cp_datalen > PAGE_SIZE) {
 			data = contigmalloc(ccb->eata_ccb.cp_datalen,
-					    M_TEMP, M_WAITOK, 0, ~0,
+					    M_TEMP, 0, 0, ~0,
 					    ccb->eata_ccb.cp_datalen,
 					    0x10000);
 		} else {
 			data = malloc(ccb->eata_ccb.cp_datalen, M_TEMP,
-				      M_WAITOK);
+				      0);
 		}
 
 		if (data == NULL) {
diff --git a/sys/dev/drm/drm_drv.h b/sys/dev/drm/drm_drv.h
index 729b2f960c04..1425859b7cc3 100644
--- a/sys/dev/drm/drm_drv.h
+++ b/sys/dev/drm/drm_drv.h
@@ -1451,7 +1451,7 @@ DRM(linux_ioctl)(DRM_OS_STRUCTPROC *p, struct linux_ioctl_args* args)
 	if ( size > STK_PARAMS ) {
 		if ( size > IOCPARM_MAX )
 			return EINVAL;
-		memp = malloc( (u_long)size, DRM(M_DRM), M_WAITOK );
+		memp = malloc( (u_long)size, DRM(M_DRM), 0 );
 		data = memp;
 	} else {
 		data = ubuf.stkbuf;
diff --git a/sys/dev/drm/drm_memory.h b/sys/dev/drm/drm_memory.h
index 81fa561a4186..c6f319c84ba8 100644
--- a/sys/dev/drm/drm_memory.h
+++ b/sys/dev/drm/drm_memory.h
@@ -288,7 +288,7 @@ unsigned long DRM(alloc_pages)(int order, int area)
 	address = __get_free_pages(GFP_KERNEL, order);
 #endif /* __linux__ */
 #ifdef __FreeBSD__
-	address = (vm_offset_t) contigmalloc(bytes, DRM(M_DRM), M_WAITOK, 0, ~0, 1, 0);
+	address = (vm_offset_t) contigmalloc(bytes, DRM(M_DRM), 0, 0, ~0, 1, 0);
 #endif /* __FreeBSD__ */
 	if (!address) {
 		DRM_OS_SPINLOCK(&DRM(mem_lock));
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 8d1c84996fd1..e5040a553051 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -2679,7 +2679,7 @@ ed_get_packet(sc, buf, len)
 	struct mbuf *m;
 
 	/* Allocate a header mbuf */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	m->m_pkthdr.rcvif = ifp;
@@ -2693,7 +2693,7 @@ ed_get_packet(sc, buf, len)
 	 */
 	if ((len + 2) > MHLEN) {
 		/* Attach an mbuf cluster */
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 
 		/* Insist on getting a cluster */
 		if ((m->m_flags & M_EXT) == 0) {
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c
index 1503ea2779c6..9f8b609e8ef9 100644
--- a/sys/dev/em/if_em.c
+++ b/sys/dev/em/if_em.c
@@ -1802,12 +1802,12 @@ em_get_buf(int i, struct adapter *adapter,
 	ifp = &adapter->interface_data.ac_if;
 
 	if (mp == NULL) {
-		MGETHDR(mp, M_DONTWAIT, MT_DATA);
+		MGETHDR(mp, M_NOWAIT, MT_DATA);
 		if (mp == NULL) {
 			adapter->mbuf_alloc_failed++;
 			return(ENOBUFS);
 		}
-		MCLGET(mp, M_DONTWAIT);
+		MCLGET(mp, M_NOWAIT);
 		if ((mp->m_flags & M_EXT) == 0) {
 			m_freem(mp);
 			adapter->mbuf_cluster_failed++;
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index ffcc6c96dfda..3e5d3f30059d 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -601,7 +601,7 @@ u_int totlen, *drqneed;
   struct mbuf *top, **mp;
   *drqneed = 0;
 
-  MGETHDR(m, M_DONTWAIT, MT_DATA);
+  MGETHDR(m, M_NOWAIT, MT_DATA);
   if (m == NULL)
     return(NULL);
   m->m_pkthdr.rcvif = &sc->enif;
@@ -613,7 +613,7 @@ u_int totlen, *drqneed;
   /* if (top != NULL) then we've already got 1 mbuf on the chain */
   while (totlen > 0) {
     if (top) {
-      MGET(m, M_DONTWAIT, MT_DATA);
+      MGET(m, M_NOWAIT, MT_DATA);
       if (!m) {
 	m_freem(top);	
 	return(NULL);	/* out of mbufs */
@@ -621,7 +621,7 @@ u_int totlen, *drqneed;
       m->m_len = MLEN;
     }
     if (totlen >= MINCLSIZE) {
-      MCLGET(m, M_DONTWAIT);
+      MCLGET(m, M_NOWAIT);
       if ((m->m_flags & M_EXT) == 0) {
 	m_free(m);
 	m_freem(top);
@@ -1770,12 +1770,12 @@ struct mbuf **mm, *prev;
       m->m_data = (caddr_t)d;
     } else {
       /* can't write to an M_EXT mbuf since it may be shared */
-      MGET(new, M_DONTWAIT, MT_DATA);
+      MGET(new, M_NOWAIT, MT_DATA);
       if (!new) {
         EN_COUNT(sc->mfixfail);
         return(0);
       }
-      MCLGET(new, M_DONTWAIT);
+      MCLGET(new, M_NOWAIT);
       if ((new->m_flags & M_EXT) == 0) {
         m_free(new);
         EN_COUNT(sc->mfixfail);
@@ -1837,14 +1837,14 @@ STATIC int en_makeexclusive(sc, mm, prev)
 	
 	if (MEXT_IS_REF(m)) {
 	    /* make a real copy of the M_EXT mbuf since it is shared */
-	    MGET(new, M_DONTWAIT, MT_DATA);
+	    MGET(new, M_NOWAIT, MT_DATA);
 	    if (!new) {
 		EN_COUNT(sc->mfixfail);
 		return(0);
 	    }
 	    if (m->m_flags & M_PKTHDR)
 		M_MOVE_PKTHDR(new, m);
-	    MCLGET(new, M_DONTWAIT);
+	    MCLGET(new, M_NOWAIT);
 	    if ((new->m_flags & M_EXT) == 0) {
 		m_free(new);
 		EN_COUNT(sc->mfixfail);
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 749fa580b001..5e0dc5de7528 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -686,11 +686,11 @@ read_again:
     rx_fifo = rx_fifo2 = status & RX_BYTES_MASK;
 
     if (EP_FTST(sc, F_RX_FIRST)) {
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (!m)
 	    goto out;
 	if (rx_fifo >= MINCLSIZE)
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
 	sc->top = sc->mcur = top = m;
 #define EROUND  ((sizeof(struct ether_header) + 3) & ~3)
 #define EOFF    (EROUND - sizeof(struct ether_header))
@@ -714,11 +714,11 @@ read_again:
 	lenthisone = min(rx_fifo, M_TRAILINGSPACE(m));
 	if (lenthisone == 0) {	/* no room in this one */
 	    mcur = m;
-	    MGET(m, M_DONTWAIT, MT_DATA);
+	    MGET(m, M_NOWAIT, MT_DATA);
 	    if (!m)
 		goto out;
 	    if (rx_fifo >= MINCLSIZE)
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 	    m->m_len = 0;
 	    mcur->m_next = m;
 	    lenthisone = min(rx_fifo, M_TRAILINGSPACE(m));
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index f7458afe73c6..d948af229b39 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -695,7 +695,7 @@ ex_rx_intr(struct ex_softc *sc)
 		QQQ = pkt_len = inw(iobase + IO_PORT_REG);
 
 		if (rx_status & RCV_OK_bit) {
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			ipkt = m;
 			if (ipkt == NULL) {
 				ifp->if_iqdrops++;
@@ -706,7 +706,7 @@ ex_rx_intr(struct ex_softc *sc)
 
 				while (pkt_len > 0) {
 					if (pkt_len > MINCLSIZE) {
-						MCLGET(m, M_DONTWAIT);
+						MCLGET(m, M_NOWAIT);
 						if (m->m_flags & M_EXT) {
 							m->m_len = MCLBYTES;
 						} else {
@@ -731,7 +731,7 @@ ex_rx_intr(struct ex_softc *sc)
 					pkt_len -= m->m_len;
 
 					if (pkt_len > 0) {
-						MGET(m->m_next, M_DONTWAIT, MT_DATA);
+						MGET(m->m_next, M_NOWAIT, MT_DATA);
 						if (m->m_next == NULL) {
 							m_freem(ipkt);
 							ifp->if_iqdrops++;
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index 0dbb73bac830..edfc64eef5b1 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -86,12 +86,12 @@ vid_realloc_array(void)
 
 	s = spltty();
 	newsize = ((adapters + ARRAY_DELTA)/ARRAY_DELTA)*ARRAY_DELTA;
-	new_adp = malloc(sizeof(*new_adp)*newsize, M_DEVBUF, M_WAITOK | M_ZERO);
+	new_adp = malloc(sizeof(*new_adp)*newsize, M_DEVBUF, M_ZERO);
 	new_vidsw = malloc(sizeof(*new_vidsw)*newsize, M_DEVBUF,
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 #ifdef FB_INSTALL_CDEV
 	new_cdevsw = malloc(sizeof(*new_cdevsw)*newsize, M_DEVBUF,
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 #endif
 	bcopy(adapter, new_adp, sizeof(*adapter)*adapters);
 	bcopy(vidsw, new_vidsw, sizeof(*vidsw)*adapters);
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index 56e015ba1399..0f3cda117dda 100644
--- a/sys/dev/fb/vga.c
+++ b/sys/dev/fb/vga.c
@@ -2848,7 +2848,7 @@ get_palette(video_adapter_t *adp, int base, int count,
     if ((base < 0) || (base >= 256) || (base + count > 256))
 	return EINVAL;
 
-    r = malloc(count*3, M_DEVBUF, M_WAITOK);
+    r = malloc(count*3, M_DEVBUF, 0);
     g = r + count;
     b = g + count;
     if (vga_save_palette2(adp, base, count, r, g, b)) {
@@ -2879,7 +2879,7 @@ set_palette(video_adapter_t *adp, int base, int count,
     if ((base < 0) || (base >= 256) || (base + count > 256))
 	return EINVAL;
 
-    r = malloc(count*3, M_DEVBUF, M_WAITOK);
+    r = malloc(count*3, M_DEVBUF, 0);
     g = r + count;
     b = g + count;
     copyin(red, r, count);
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index b6ad14cef775..81e4865d176f 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -1847,13 +1847,13 @@ fe_get_packet (struct fe_softc * sc, u_short len)
 	 */
 
 	/* Allocate an mbuf with packet header info.  */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return -1;
 
 	/* Attach a cluster if this packet doesn't fit in a normal mbuf.  */
 	if (len > MHLEN - NFS_MAGIC_OFFSET) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if (!(m->m_flags & M_EXT)) {
 			m_freem(m);
 			return -1;
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index 49722fee36a9..5c777053163d 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -466,7 +466,7 @@ fwe_as_output(struct fwe_softc *fwe, struct ifnet *ifp)
 		xfer->act.hand = fwe_output_callback;
 
 		/* keep ip packet alignment for alpha */
-		M_PREPEND(m, ALIGN_PAD, M_DONTWAIT);
+		M_PREPEND(m, ALIGN_PAD, M_NOWAIT);
 		fp = (struct fw_pkt *)&xfer->dst; /* XXX */
 		xfer->dst = *((int32_t *)&fwe->pkt_hdr);
 		fp->mode.stream.len = htons(m->m_pkthdr.len);
@@ -544,7 +544,7 @@ fwe_as_input(struct fw_xferq *xferq)
 	while ((xfer = STAILQ_FIRST(&xferq->q)) != NULL) {
 		STAILQ_REMOVE_HEAD(&xferq->q, link);
 		xferq->queued --;
-		MGETHDR(m, M_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			printf("MGETHDR failed\n");
 			fw_xfer_free(xfer);
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index a8ed4945aa89..43da1cd4110b 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -763,7 +763,7 @@ END_DEBUG
 static void
 sbp_cam_scan_lun(struct sbp_dev *sdev)
 {
-	union ccb *ccb = malloc(sizeof(union ccb), M_SBP, M_WAITOK | M_ZERO);
+	union ccb *ccb = malloc(sizeof(union ccb), M_SBP, M_ZERO);
 
 SBP_DEBUG(0)
 	sbp_show_sdev_info(sdev, 2);
@@ -822,9 +822,9 @@ sbp_ping_unit(struct sbp_dev *sdev)
 	union ccb *ccb;
 	struct scsi_inquiry_data *inq_buf;
 
-	ccb = malloc(sizeof(union ccb), M_SBP, M_WAITOK | M_ZERO);
+	ccb = malloc(sizeof(union ccb), M_SBP, M_ZERO);
 	inq_buf = (struct scsi_inquiry_data *)
-			malloc(sizeof(*inq_buf), M_SBP, M_WAITOK);
+			malloc(sizeof(*inq_buf), M_SBP, 0);
 
 SBP_DEBUG(1)
 	sbp_show_sdev_info(sdev, 2);
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 5b7e249f7f75..34f1e989e752 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -1068,13 +1068,13 @@ tbdinit:
 			 * mbuf chain first. Bail out if we can't get the
 			 * new buffers.
 			 */
-			MGETHDR(mn, M_DONTWAIT, MT_DATA);
+			MGETHDR(mn, M_NOWAIT, MT_DATA);
 			if (mn == NULL) {
 				m_freem(mb_head);
 				break;
 			}
 			if (mb_head->m_pkthdr.len > MHLEN) {
-				MCLGET(mn, M_DONTWAIT);
+				MCLGET(mn, M_NOWAIT);
 				if ((mn->m_flags & M_EXT) == 0) {
 					m_freem(mn);
 					m_freem(mb_head);
@@ -1872,7 +1872,7 @@ fxp_add_rfabuf(struct fxp_softc *sc, struct mbuf *oldm)
 	struct mbuf *m;
 	struct fxp_rfa *rfa, *p_rfa;
 
-	m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) { /* try to recycle the old mbuf instead */
 		if (oldm == NULL)
 			return 1;
diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c
index 635bd2753a87..b6fc4a7f842f 100644
--- a/sys/dev/gem/if_gem.c
+++ b/sys/dev/gem/if_gem.c
@@ -1425,7 +1425,7 @@ gem_add_rxbuf(sc, idx)
 	struct mbuf *m;
 	int error;
 
-	m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
diff --git a/sys/dev/gx/if_gx.c b/sys/dev/gx/if_gx.c
index 8d59cd682705..8dec6b213f76 100644
--- a/sys/dev/gx/if_gx.c
+++ b/sys/dev/gx/if_gx.c
@@ -1068,13 +1068,13 @@ gx_newbuf(struct gx_softc *gx, int idx, struct mbuf *m)
 	struct gx_rx_desc *r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			device_printf(gx->gx_dev, 
 			    "mbuf allocation failed -- packet dropped\n");
 			return (ENOBUFS);
 		}
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if ((m_new->m_flags & M_EXT) == 0) {
 			device_printf(gx->gx_dev, 
 			    "cluster allocation failed -- packet dropped\n");
diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c
index 723f19fe85f5..81762a8fef8b 100644
--- a/sys/dev/hifn/hifn7751.c
+++ b/sys/dev/hifn/hifn7751.c
@@ -1669,14 +1669,14 @@ hifn_crypto(
 			totlen = cmd->src_mapsize;
 			if (cmd->src_m->m_flags & M_PKTHDR) {
 				len = MHLEN;
-				MGETHDR(m0, M_DONTWAIT, MT_DATA);
-				if (m0 && !m_dup_pkthdr(m0, cmd->src_m, M_DONTWAIT)) {
+				MGETHDR(m0, M_NOWAIT, MT_DATA);
+				if (m0 && !m_dup_pkthdr(m0, cmd->src_m, M_NOWAIT)) {
 					m_free(m0);
 					m0 = NULL;
 				}
 			} else {
 				len = MLEN;
-				MGET(m0, M_DONTWAIT, MT_DATA);
+				MGET(m0, M_NOWAIT, MT_DATA);
 			}
 			if (m0 == NULL) {
 				hifnstats.hst_nomem_mbuf++;
@@ -1684,7 +1684,7 @@ hifn_crypto(
 				goto err_srcmap;
 			}
 			if (totlen >= MINCLSIZE) {
-				MCLGET(m0, M_DONTWAIT);
+				MCLGET(m0, M_NOWAIT);
 				if ((m0->m_flags & M_EXT) == 0) {
 					hifnstats.hst_nomem_mcl++;
 					err = dma->cmdu ? ERESTART : ENOMEM;
@@ -1698,7 +1698,7 @@ hifn_crypto(
 			mlast = m0;
 
 			while (totlen > 0) {
-				MGET(m, M_DONTWAIT, MT_DATA);
+				MGET(m, M_NOWAIT, MT_DATA);
 				if (m == NULL) {
 					hifnstats.hst_nomem_mbuf++;
 					err = dma->cmdu ? ERESTART : ENOMEM;
@@ -1707,7 +1707,7 @@ hifn_crypto(
 				}
 				len = MLEN;
 				if (totlen >= MINCLSIZE) {
-					MCLGET(m, M_DONTWAIT);
+					MCLGET(m, M_NOWAIT);
 					if ((m->m_flags & M_EXT) == 0) {
 						hifnstats.hst_nomem_mcl++;
 						err = dma->cmdu ? ERESTART : ENOMEM;
diff --git a/sys/dev/hme/if_hme.c b/sys/dev/hme/if_hme.c
index 779141b6ede9..9db08566703f 100644
--- a/sys/dev/hme/if_hme.c
+++ b/sys/dev/hme/if_hme.c
@@ -493,7 +493,7 @@ hme_add_rxbuf(struct hme_softc *sc, unsigned int ri, int keepold)
 		hme_discard_rxbuf(sc, ri, 0);
 		return (0);
 	}
-	if ((m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR)) == NULL)
+	if ((m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR)) == NULL)
 		return (ENOBUFS);
 	m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
 	b = mtod(m, uintptr_t);
diff --git a/sys/dev/idt/idt.c b/sys/dev/idt/idt.c
index dd08b75a6e84..3971e081ff6c 100644
--- a/sys/dev/idt/idt.c
+++ b/sys/dev/idt/idt.c
@@ -1171,10 +1171,10 @@ nicstar_ld_rcv_buf(IDT * idt)
 		idt_sysctl_buflarge = 10;
 
 	while (card_small < idt_sysctl_bufsmall) {	/* 05/25/2001 from fixed */
-		MGETHDR(m1, M_DONTWAIT, MT_DATA);
+		MGETHDR(m1, M_NOWAIT, MT_DATA);
 		if (m1 == NULL)
 			break;
-		MGETHDR(m2, M_DONTWAIT, MT_DATA);
+		MGETHDR(m2, M_NOWAIT, MT_DATA);
 		if (m2 == NULL) {
 			m_free(m1);
 			break;
@@ -2006,11 +2006,11 @@ idt_mbufcl_get(void)
 {
 	struct mbuf *m;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return (NULL);
 
-	MCLGET(m, M_DONTWAIT);
+	MCLGET(m, M_NOWAIT);
 	if (m->m_flags & M_EXT)
 		return (m);
 
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index b3e844c61827..088f12268827 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -1133,7 +1133,7 @@ ieget(int unit, struct ie_softc *ie, struct mbuf **mp)
 	if (totlen <= 0)
 		return (-1);
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (!m) {
 		ie_drop_packet_buffer(unit, ie);
 		/* XXXX if_ierrors++; */
@@ -1188,7 +1188,7 @@ ieget(int unit, struct ie_softc *ie, struct mbuf **mp)
 		 * single mbuf which may or may not be big enough. Got that?
 		 */
 		if (top) {
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (!m) {
 				m_freem(top);
 				ie_drop_packet_buffer(unit, ie);
@@ -1197,7 +1197,7 @@ ieget(int unit, struct ie_softc *ie, struct mbuf **mp)
 			m->m_len = MLEN;
 		}
 		if (resid >= MINCLSIZE) {
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, M_NOWAIT);
 			if (m->m_flags & M_EXT)
 				m->m_len = min(resid, MCLBYTES);
 		} else {
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index a6660b744d31..84d7b2fbeeff 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -192,14 +192,14 @@ icioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		return (error);
 
 	    sc->ic_obuf = malloc(sc->ic_if.if_mtu + ICHDRLEN,
-				  M_DEVBUF, M_WAITOK);
+				  M_DEVBUF, 0);
 	    if (!sc->ic_obuf) {
 		iicbus_release_bus(parent, icdev);
 		return ENOBUFS;
 	    }
 
 	    sc->ic_ifbuf = malloc(sc->ic_if.if_mtu + ICHDRLEN,
-				  M_DEVBUF, M_WAITOK);
+				  M_DEVBUF, 0);
 	    if (!sc->ic_ifbuf) {
 		iicbus_release_bus(parent, icdev);
 		return ENOBUFS;
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 9636a7ff4831..449fa141d593 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -624,7 +624,7 @@ isp_pci_attach(device_t dev)
 		}
 		if (amt) {
 			FCPARAM(isp)->isp_dump_data =
-			    malloc(amt, M_DEVBUF, M_WAITOK | M_ZERO);
+			    malloc(amt, M_DEVBUF, M_ZERO);
 		} else {
 			device_printf(dev,
 			    "f/w crash dumps not supported for this model\n");
@@ -1105,14 +1105,14 @@ isp_pci_mbxdma(struct ispsoftc *isp)
 
 
 	len = sizeof (XS_T **) * isp->isp_maxcmds;
-	isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
+	isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_ZERO);
 	if (isp->isp_xflist == NULL) {
 		isp_prt(isp, ISP_LOGERR, "cannot alloc xflist array");
 		ISP_LOCK(isp);
 		return (1);
 	}
 	len = sizeof (bus_dmamap_t) * isp->isp_maxcmds;
-	pcs->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF,  M_WAITOK);
+	pcs->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF,  0);
 	if (pcs->dmaps == NULL) {
 		isp_prt(isp, ISP_LOGERR, "can't alloc dma map storage");
 		free(isp->isp_xflist, M_DEVBUF);
diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c
index d2af1a5ef3d6..829ee8e2852f 100644
--- a/sys/dev/isp/isp_sbus.c
+++ b/sys/dev/isp/isp_sbus.c
@@ -498,14 +498,14 @@ isp_sbus_mbxdma(struct ispsoftc *isp)
 	}
 
 	len = sizeof (XS_T **) * isp->isp_maxcmds;
-	isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
+	isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_ZERO);
 	if (isp->isp_xflist == NULL) {
 		isp_prt(isp, ISP_LOGERR, "cannot alloc xflist array");
 		ISP_LOCK(isp);
 		return (1);
 	}
 	len = sizeof (bus_dmamap_t) * isp->isp_maxcmds;
-	sbs->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF,  M_WAITOK);
+	sbs->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF, 0);
 	if (sbs->dmaps == NULL) {
 		isp_prt(isp, ISP_LOGERR, "can't alloc dma map storage");
 		free(isp->isp_xflist, M_DEVBUF);
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 6eef728733bc..035813aed91d 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -454,7 +454,7 @@ kbd_attach(keyboard_t *kbd)
 		       "kbd%r", kbd->kb_index);
 	if (dev->si_drv1 == NULL)
 		dev->si_drv1 = malloc(sizeof(genkbd_softc_t), M_DEVBUF,
-				      M_WAITOK);
+				      0);
 	bzero(dev->si_drv1, sizeof(genkbd_softc_t));
 
 	printf("kbd%d at %s%d\n", kbd->kb_index, kbd->kb_name, kbd->kb_unit);
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 9efa94da6485..81d10419e682 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -784,7 +784,7 @@ lge_newbuf(sc, c, m)
 	caddr_t			*buf = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("lge%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->lge_unit);
diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c
index 83250cfc86c2..68fce9045f2e 100644
--- a/sys/dev/lmc/if_lmc.c
+++ b/sys/dev/lmc/if_lmc.c
@@ -621,9 +621,9 @@ lmc_rx_intr(lmc_softc_t * const sc)
 		 */
 		if (accept || ms == NULL) {
 			struct mbuf *m0;
-			MGETHDR(m0, M_DONTWAIT, MT_DATA);
+			MGETHDR(m0, M_NOWAIT, MT_DATA);
 			if (m0 != NULL) {
-				MCLGET(m0, M_DONTWAIT);
+				MCLGET(m0, M_NOWAIT);
 				if ((m0->m_flags & M_EXT) == 0) {
 					m_freem(m0);
 					m0 = NULL;
@@ -830,10 +830,10 @@ lmc_mbuf_compress(struct mbuf *m)
 {
 	struct mbuf *m0;
 #if MCLBYTES >= LMC_MTU + PPP_HEADER_LEN && !defined(BIG_PACKET)
-	MGETHDR(m0, M_DONTWAIT, MT_DATA);
+	MGETHDR(m0, M_NOWAIT, MT_DATA);
 	if (m0 != NULL) {
 		if (m->m_pkthdr.len > MHLEN) {
-			MCLGET(m0, M_DONTWAIT);
+			MCLGET(m0, M_NOWAIT);
 			if ((m0->m_flags & M_EXT) == 0) {
 				m_freem(m);
 				m_freem(m0);
@@ -850,9 +850,9 @@ lmc_mbuf_compress(struct mbuf *m)
 
 	while (len > 0) {
 		if (mlen == MHLEN) {
-			MGETHDR(*mp, M_DONTWAIT, MT_DATA);
+			MGETHDR(*mp, M_NOWAIT, MT_DATA);
 		} else {
-			MGET(*mp, M_DONTWAIT, MT_DATA);
+			MGET(*mp, M_NOWAIT, MT_DATA);
 		}
 		if (*mp == NULL) {
 			m_freem(m0);
@@ -860,7 +860,7 @@ lmc_mbuf_compress(struct mbuf *m)
 			break;
 		}
 		if (len > MLEN) {
-			MCLGET(*mp, M_DONTWAIT);
+			MCLGET(*mp, M_NOWAIT);
 			if (((*mp)->m_flags & M_EXT) == 0) {
 				m_freem(m0);
 				m0 = NULL;
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index eeb678abbe27..c1d63f191f6e 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -314,10 +314,10 @@ alloc_mbuf_cluster(struct lnc_softc *sc, struct host_ring_entry *desc)
 		sc->mbufs = m->m_next;
 		/* XXX m->m_data = m->m_ext.ext_buf;*/
 	} else {
-		MGET(m, M_DONTWAIT, MT_DATA);
+		MGET(m, M_NOWAIT, MT_DATA);
    	if (!m)
 			return(1);
-        MCLGET(m, M_DONTWAIT);
+        MCLGET(m, M_NOWAIT);
    	if (!m->m_ext.ext_buf) {
 			m_free(m);
 			return(1);
@@ -379,7 +379,7 @@ mbuf_packet(struct lnc_softc *sc, int start_of_packet, int pkt_len)
 	int amount;
 
 	/* Get a pkthdr mbuf for the start of packet */
-	MGETHDR(head, M_DONTWAIT, MT_DATA);
+	MGETHDR(head, M_NOWAIT, MT_DATA);
 	if (!head) {
 		LNCSTATS(drop_packet)
 		return(0);
@@ -409,13 +409,13 @@ mbuf_packet(struct lnc_softc *sc, int start_of_packet, int pkt_len)
 		if (amount == 0) {
 			/* mbuf must be empty */
 			m_prev = m;
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (!m) {
 				m_freem(head);
 				return(0);
 			}
 			if (pkt_len >= MINCLSIZE)
-				MCLGET(m, M_DONTWAIT);
+				MCLGET(m, M_NOWAIT);
 			m->m_len = 0;
 			m_prev->m_next = m;
 			amount = min(blen, M_TRAILINGSPACE(m));
@@ -1218,9 +1218,9 @@ chain_to_cluster(struct mbuf *m)
 {
 	struct mbuf *new;
 
-	MGET(new, M_DONTWAIT, MT_DATA);
+	MGET(new, M_NOWAIT, MT_DATA);
 	if (new) {
-		MCLGET(new, M_DONTWAIT);
+		MCLGET(new, M_NOWAIT);
 		if (new->m_ext.ext_buf) {
 			new->m_len = mbuf_to_buffer(m, new->m_data);
 			m_freem(m);
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index b9f3c520ef9f..4befee3d84a8 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -759,7 +759,7 @@ mdnew(int unit)
 		unit = max + 1;
 	if (unit > 255)
 		return (NULL);
-	sc = (struct md_s *)malloc(sizeof *sc, M_MD, M_WAITOK | M_ZERO);
+	sc = (struct md_s *)malloc(sizeof *sc, M_MD, M_ZERO);
 	sc->unit = unit;
 	bioq_init(&sc->bio_queue);
 	mtx_init(&sc->queue_mtx, "md bio queue", NULL, MTX_DEF);
@@ -918,7 +918,7 @@ mdsetcred(struct md_s *sc, struct ucred *cred)
 		struct uio auio;
 		struct iovec aiov;
 
-		tmpbuf = malloc(sc->secsize, M_TEMP, M_WAITOK);
+		tmpbuf = malloc(sc->secsize, M_TEMP, 0);
 		bzero(&auio, sizeof(auio));
 
 		aiov.iov_base = tmpbuf;
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index aecd9dc34b80..61e1c8beeeb3 100644
--- a/sys/dev/mlx/mlx.c
+++ b/sys/dev/mlx/mlx.c
@@ -1880,7 +1880,7 @@ mlx_user_command(struct mlx_softc *sc, struct mlx_usercommand *mu)
     if (mu->mu_datasize > 0) {
 	if (mu->mu_datasize > MAXPHYS)
 	    return (EINVAL);
-	if (((kbuf = malloc(mu->mu_datasize, M_DEVBUF, M_WAITOK)) == NULL) ||
+	if (((kbuf = malloc(mu->mu_datasize, M_DEVBUF, 0)) == NULL) ||
 	    (error = copyin(mu->mu_buf, kbuf, mu->mu_datasize)))
 	    goto out;
 	debug(0, "got kernel buffer");
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index 65f1a5d03d98..50b81ac30cb2 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.c
@@ -2008,7 +2008,7 @@ mly_cam_rescan_btl(struct mly_softc *sc, int bus, int target)
 
     debug_called(1);
 
-    if ((ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO)) == NULL) {
+    if ((ccb = malloc(sizeof(union ccb), M_TEMP, M_ZERO)) == NULL) {
 	mly_printf(sc, "rescan failed (can't allocate CCB)\n");
 	return;
     }
diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c
index 9a0a5ba9493d..7f9a14571142 100644
--- a/sys/dev/mpt/mpt_pci.c
+++ b/sys/dev/mpt/mpt_pci.c
@@ -478,7 +478,7 @@ mpt_dma_mem_alloc(mpt_softc_t *mpt)
 
 	len = sizeof (request_t *) * MPT_REQ_MEM_SIZE(mpt);
 #ifdef	RELENG_4
-	mpt->request_pool = (request_t *) malloc(len, M_DEVBUF, M_WAITOK);
+	mpt->request_pool = (request_t *) malloc(len, M_DEVBUF, 0);
 	if (mpt->request_pool == NULL) {
 		device_printf(dev, "cannot allocate request pool\n");
 		return (1);
@@ -486,7 +486,7 @@ mpt_dma_mem_alloc(mpt_softc_t *mpt)
 	bzero(mpt->request_pool, len);
 #else
 	mpt->request_pool = (request_t *)
-	    malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
+	    malloc(len, M_DEVBUF, M_ZERO);
 	if (mpt->request_pool == NULL) {
 		device_printf(dev, "cannot allocate request pool\n");
 		return (1);
diff --git a/sys/dev/musycc/musycc.c b/sys/dev/musycc/musycc.c
index 3fb7834b1e32..48504db17f37 100644
--- a/sys/dev/musycc/musycc.c
+++ b/sys/dev/musycc/musycc.c
@@ -696,9 +696,9 @@ musycc_intr0_rx_eom(struct softc *sc, int ch)
 		m->m_len = m->m_pkthdr.len = status & 0x3fff;
 		error = (status >> 16) & 0xf;
 		if (error == 0) {
-			MGETHDR(m2, M_DONTWAIT, MT_DATA);
+			MGETHDR(m2, M_NOWAIT, MT_DATA);
 			if (m2 != NULL) {
-				MCLGET(m2, M_DONTWAIT);
+				MCLGET(m2, M_NOWAIT);
 				if((m2->m_flags & M_EXT) != 0) {
 					/* Substitute the mbuf+cluster. */
 					md->m = m2;
@@ -1069,7 +1069,7 @@ musycc_newhook(node_p node, hook_p hook, const char *name)
 		return (EINVAL);
 		
 	if (sc->chan[chan] == NULL) {
-		MALLOC(sch, struct schan *, sizeof(*sch), M_MUSYCC, M_WAITOK | M_ZERO);
+		MALLOC(sch, struct schan *, sizeof(*sch), M_MUSYCC, M_ZERO);
 		sch->sc = sc;
 		sch->state = DOWN;
 		sch->chan = chan;
@@ -1268,9 +1268,9 @@ musycc_connect(hook_p hook)
 	sch->nmd = nmd = 200 + nts * 4;
 	sch->rx_last_md = 0;
 	MALLOC(sc->mdt[ch], struct mdesc *, 
-	    sizeof(struct mdesc) * nmd, M_MUSYCC, M_WAITOK);
+	    sizeof(struct mdesc) * nmd, M_MUSYCC, 0);
 	MALLOC(sc->mdr[ch], struct mdesc *, 
-	    sizeof(struct mdesc) * nmd, M_MUSYCC, M_WAITOK);
+	    sizeof(struct mdesc) * nmd, M_MUSYCC, 0);
 	for (i = 0; i < nmd; i++) {
 		if (i == nmd - 1) {
 			sc->mdt[ch][i].snext = &sc->mdt[ch][0];
@@ -1287,13 +1287,13 @@ musycc_connect(hook_p hook)
 		sc->mdt[ch][i].m = NULL;
 		sc->mdt[ch][i].data = 0;
 
-		MGETHDR(m, M_TRYWAIT, MT_DATA);
+		MGETHDR(m, 0, MT_DATA);
 		if (m == NULL)
 			goto errfree;
-		MCLGET(m, M_TRYWAIT);
+		MCLGET(m, 0);
 		if ((m->m_flags & M_EXT) == 0) {
 			/* We've waited mbuf_wait and still got nothing.
-			   We're calling with M_TRYWAIT anyway - a little
+			   We're calling with 0 anyway - a little
 			   defensive programming costs us very little - if
 			   anything at all in the case of error. */
 			m_free(m);
@@ -1455,7 +1455,7 @@ musycc_attach(device_t self)
 	f = pci_get_function(self);
 	/* For function zero allocate a csoftc */
 	if (f == 0) {
-		MALLOC(csc, struct csoftc *, sizeof(*csc), M_MUSYCC, M_WAITOK | M_ZERO);
+		MALLOC(csc, struct csoftc *, sizeof(*csc), M_MUSYCC, M_ZERO);
 		csc->bus = pci_get_bus(self);
 		csc->slot = pci_get_slot(self);
 		LIST_INSERT_HEAD(&sc_list, csc, list);
@@ -1529,7 +1529,7 @@ musycc_attach(device_t self)
 		sc->reg = (struct globalr *)
 		    (csc->virbase[0] + i * 0x800);
 		MALLOC(sc->mycg, struct mycg *, 
-		    sizeof(struct mycg), M_MUSYCC, M_WAITOK | M_ZERO);
+		    sizeof(struct mycg), M_MUSYCC, M_ZERO);
 		sc->ram = &sc->mycg->cg;
 
 		error = ng_make_node_common(&ngtypestruct, &sc->node);
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index 9f7a930186c7..70ac9508a8e0 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -1179,14 +1179,14 @@ my_newbuf(struct my_softc * sc, struct my_chain_onefrag * c)
 	struct mbuf    *m_new = NULL;
 
 	MY_LOCK(sc);
-	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, M_NOWAIT, MT_DATA);
 	if (m_new == NULL) {
 		printf("my%d: no memory for rx list -- packet dropped!\n",
 		       sc->my_unit);
 		MY_UNLOCK(sc);
 		return (ENOBUFS);
 	}
-	MCLGET(m_new, M_DONTWAIT);
+	MCLGET(m_new, M_NOWAIT);
 	if (!(m_new->m_flags & M_EXT)) {
 		printf("my%d: no memory for rx list -- packet dropped!\n",
 		       sc->my_unit);
@@ -1451,14 +1451,14 @@ my_encap(struct my_softc * sc, struct my_chain * c, struct mbuf * m_head)
 	 * chain.
 	 */
 	m = m_head;
-	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, M_NOWAIT, MT_DATA);
 	if (m_new == NULL) {
 		printf("my%d: no memory for tx list", sc->my_unit);
 		MY_UNLOCK(sc);
 		return (1);
 	}
 	if (m_head->m_pkthdr.len > MHLEN) {
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			printf("my%d: no memory for tx list", sc->my_unit);
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index d498ebb07ba2..e591ea75a2fc 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -1162,7 +1162,7 @@ nge_newbuf(sc, c, m)
 	caddr_t			*buf = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("nge%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->nge_unit);
diff --git a/sys/dev/nmdm/nmdm.c b/sys/dev/nmdm/nmdm.c
index 6037451eeb67..2c69998e527d 100644
--- a/sys/dev/nmdm/nmdm.c
+++ b/sys/dev/nmdm/nmdm.c
@@ -133,7 +133,7 @@ nmdminit(n)
 	if (n & ~0xff)
 		return;
 
-	pt = malloc(sizeof(*pt), M_NLMDM, M_WAITOK);
+	pt = malloc(sizeof(*pt), M_NLMDM, 0);
 	bzero(pt, sizeof(*pt));
 	pt->part1.dev = dev1 = make_dev(&nmdm_cdevsw, n+n,
 	    0, 0, 0666, "nmdm%dA", n);
diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c
index 908e533a9287..7a3ae8b108bf 100644
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
@@ -127,7 +127,7 @@ null_modevent(module_t mod, int type, void *data)
 	case MOD_LOAD:
 		if (bootverbose)
 			printf("null: <null device, zero device>\n");
-		zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK | M_ZERO);
+		zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_ZERO);
 		zero_dev = make_dev(&zero_cdevsw, ZERO_MINOR, UID_ROOT,
 			GID_WHEEL, 0666, "zero");
 		null_dev = make_dev(&null_cdevsw, NULL_MINOR, UID_ROOT,
diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c
index 7704109b44a3..9ea97d3ad970 100644
--- a/sys/dev/ofw/openfirm.c
+++ b/sys/dev/ofw/openfirm.c
@@ -292,7 +292,7 @@ OF_getprop(phandle_t package, char *propname, void *buf, int buflen)
 
 /*
  * Store the value of a property of a package into newly allocated memory (using
- * the M_OFWPROP malloc pool and M_WAITOK). elsz is the size of a single element,
+ * the M_OFWPROP malloc pool and 0). elsz is the size of a single element,
  * the number of elements is return in number.
  */
 int
@@ -305,7 +305,7 @@ OF_getprop_alloc(phandle_t package, char *propname, int elsz, void **buf)
 	    len % elsz != 0)
 		return (-1);
 
-	*buf = malloc(len, M_OFWPROP, M_WAITOK);
+	*buf = malloc(len, M_OFWPROP, 0);
 	if (OF_getprop(package, propname, *buf, len) == -1) {
 		free(*buf, M_OFWPROP);
 		*buf = NULL;
diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c
index 6f4061961818..8bd5c0474a1d 100644
--- a/sys/dev/ofw/openfirmio.c
+++ b/sys/dev/ofw/openfirmio.c
@@ -115,7 +115,7 @@ openfirm_getstr(int len, const char *user, char **cpp)
 	if ((u_int)len > OFW_NAME_MAX)
 		return (ENAMETOOLONG);
 
-	*cpp = cp = malloc(len + 1, M_TEMP, M_WAITOK);
+	*cpp = cp = malloc(len + 1, M_TEMP, 0);
 	if (cp == NULL)
 		return (ENOMEM);
 	error = copyin(user, cp, len);
@@ -183,7 +183,7 @@ openfirm_ioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
 		/* -1 means no entry; 0 means no value */
 		if (len <= 0)
 			break;
-		value = malloc(len, M_TEMP, M_WAITOK);
+		value = malloc(len, M_TEMP, 0);
 		if (value == NULL) {
 			error = ENOMEM;
 			break;
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index 6c8263283727..2cf04a207142 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -224,7 +224,7 @@ pccard_attach_card(device_t dev)
 		 * can be on at a time.
 		 */
 		ivar = malloc(sizeof(struct pccard_ivar), M_DEVBUF,
-		    M_WAITOK | M_ZERO);
+		    M_ZERO);
 		child = device_add_child(dev, NULL, -1);
 		device_set_ivars(child, ivar);
 		ivar->fcn = pf;
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 2c5e7a4f9ef3..ecdcba0a231a 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -333,7 +333,7 @@ pci_read_device(device_t pcib, int b, int s, int f, size_t size)
 	devlist_entry = NULL;
 
 	if (PCIB_READ_CONFIG(pcib, b, s, f, PCIR_DEVVENDOR, 4) != -1) {
-		devlist_entry = malloc(size, M_DEVBUF, M_WAITOK | M_ZERO);
+		devlist_entry = malloc(size, M_DEVBUF, M_ZERO);
 		if (devlist_entry == NULL)
 			return (NULL);
 
diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c
index 83b63b3ed692..d39b026e2ae1 100644
--- a/sys/dev/pci/pci_user.c
+++ b/sys/dev/pci/pci_user.c
@@ -307,7 +307,7 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 			 * Allocate a buffer to hold the patterns.
 			 */
 			pattern_buf = malloc(cio->pat_buf_len, M_TEMP,
-					     M_WAITOK);
+					     0);
 			error = copyin(cio->patterns, pattern_buf,
 				       cio->pat_buf_len);
 			if (error != 0)
diff --git a/sys/dev/pdq/pdq_freebsd.h b/sys/dev/pdq/pdq_freebsd.h
index bd949005072b..5db50c800097 100644
--- a/sys/dev/pdq/pdq_freebsd.h
+++ b/sys/dev/pdq/pdq_freebsd.h
@@ -186,9 +186,9 @@ typedef struct _pdq_os_ctx_t {
 
 #define	PDQ_OS_DATABUF_ALLOC(pdq, b) do { \
     PDQ_OS_DATABUF_T *x_m0; \
-    MGETHDR(x_m0, M_DONTWAIT, MT_DATA); \
+    MGETHDR(x_m0, M_NOWAIT, MT_DATA); \
     if (x_m0 != NULL) { \
-	MCLGET(x_m0, M_DONTWAIT);	\
+	MCLGET(x_m0, M_NOWAIT);	\
 	if ((x_m0->m_flags & M_EXT) == 0) { \
 	    m_free(x_m0); \
 	    (b) = NULL; \
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 064bb688af04..5af78841d9a0 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -703,12 +703,12 @@ pdq_os_databuf_alloc(
     struct mbuf *m;
     bus_dmamap_t map;
 
-    MGETHDR(m, M_DONTWAIT, MT_DATA);
+    MGETHDR(m, M_NOWAIT, MT_DATA);
     if (m == NULL) {
 	printf("%s: can't alloc small buf\n", sc->sc_dev.dv_xname);
 	return NULL;
     }
-    MCLGET(m, M_DONTWAIT);
+    MCLGET(m, M_NOWAIT);
     if ((m->m_flags & M_EXT) == 0) {
 	printf("%s: can't alloc cluster\n", sc->sc_dev.dv_xname);
         m_free(m);
diff --git a/sys/dev/pdq/pdqvar.h b/sys/dev/pdq/pdqvar.h
index 09358d86995c..825a2b9a177f 100644
--- a/sys/dev/pdq/pdqvar.h
+++ b/sys/dev/pdq/pdqvar.h
@@ -401,9 +401,9 @@ typedef struct mbuf PDQ_OS_DATABUF_T;
 #ifndef PDQ_OS_DATABUF_ALLOC
 #define	PDQ_OS_DATABUF_ALLOC(pdq, b) do { \
     PDQ_OS_DATABUF_T *x_m0; \
-    MGETHDR(x_m0, M_DONTWAIT, MT_DATA); \
+    MGETHDR(x_m0, M_NOWAIT, MT_DATA); \
     if (x_m0 != NULL) { \
-	MCLGET(x_m0, M_DONTWAIT);	\
+	MCLGET(x_m0, M_NOWAIT);	\
 	if ((x_m0->m_flags & M_EXT) == 0) { \
 	    m_free(x_m0); \
 	    (b) = NULL; \
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 5ba4dc3a6099..24a18ecd0021 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -343,7 +343,7 @@ lpioctl (struct ifnet *ifp, u_long cmd, caddr_t data)
 	    }
 
 	    sc->sc_ifbuf = malloc(sc->sc_if.if_mtu + MLPIPHDRLEN,
-				  M_DEVBUF, M_WAITOK);
+				  M_DEVBUF, 0);
 	    if (!sc->sc_ifbuf) {
 		ppb_release_bus(ppbus, dev);
 		return ENOBUFS;
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 9364c5033659..abc9e95c5d76 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -548,8 +548,8 @@ lptopen(dev_t dev, int flags, int fmt, struct thread *td)
 	ppb_wctr(ppbus, sc->sc_control);
 
 	sc->sc_state = OPEN;
-	sc->sc_inbuf = malloc(BUFSIZE, M_DEVBUF, M_WAITOK);
-	sc->sc_statbuf = malloc(BUFSTATSIZE, M_DEVBUF, M_WAITOK);
+	sc->sc_inbuf = malloc(BUFSIZE, M_DEVBUF, 0);
+	sc->sc_statbuf = malloc(BUFSTATSIZE, M_DEVBUF, 0);
 	sc->sc_xfercnt = 0;
 	splx(s);
 
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index ad83e2f83270..09208b6e9d56 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -186,7 +186,7 @@ static void
 vpo_cam_rescan(struct vpo_data *vpo)
 {
         struct cam_path *path;
-        union ccb *ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO);
+        union ccb *ccb = malloc(sizeof(union ccb), M_TEMP, M_ZERO);
 
         if (xpt_create_path(&path, xpt_periph, cam_sim_path(vpo->sim), 0, 0)
             != CAM_REQ_CMP) {
diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c
index 18d2fbabc0f5..4cba354222dd 100644
--- a/sys/dev/puc/puc.c
+++ b/sys/dev/puc/puc.c
@@ -248,7 +248,7 @@ puc_attach(device_t dev, const struct puc_device_description *desc)
 			rle->res = sc->sc_bar_mappings[bidx].res;
 		} else {
 			rle->res = malloc(sizeof(struct resource), M_DEVBUF,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (rle->res == NULL) {
 				free(pdev, M_DEVBUF);
 				return (ENOMEM);
diff --git a/sys/dev/raidframe/rf_freebsdkintf.c b/sys/dev/raidframe/rf_freebsdkintf.c
index e2b2508349d4..144cda693ea7 100644
--- a/sys/dev/raidframe/rf_freebsdkintf.c
+++ b/sys/dev/raidframe/rf_freebsdkintf.c
@@ -917,7 +917,7 @@ raidioctl(dev, cmd, data, flag, td)
 	case RAIDFRAME_INIT_LABELS:
 		MALLOC(ci_label, RF_ComponentLabel_t *,
 		    sizeof(RF_ComponentLabel_t), M_RAIDFRAME,
-		    M_WAITOK | M_ZERO);
+		    M_ZERO);
 		clabel = (RF_ComponentLabel_t *) data;
 		/* 
 		   we only want the serial number from
@@ -984,7 +984,7 @@ raidioctl(dev, cmd, data, flag, td)
 	case RAIDFRAME_ADD_HOT_SPARE:
 		MALLOC(hot_spare, RF_SingleComponent_t *,
 		    sizeof(RF_SingleComponent_t), M_RAIDFRAME,
-		     M_WAITOK | M_ZERO);
+		     M_ZERO);
 		sparePtr = (RF_SingleComponent_t *) data;
 		memcpy( hot_spare, sparePtr, sizeof(RF_SingleComponent_t));
 		retcode = rf_add_hot_spare(raidPtr, hot_spare);
@@ -997,7 +997,7 @@ raidioctl(dev, cmd, data, flag, td)
 	case RAIDFRAME_DELETE_COMPONENT:
 		MALLOC(component, RF_SingleComponent_t *,
 		    sizeof(RF_SingleComponent_t), M_RAIDFRAME,
-		     M_WAITOK | M_ZERO);
+		     M_ZERO);
 		componentPtr = (RF_SingleComponent_t *)data;
 		memcpy( component, componentPtr, 
 			sizeof(RF_SingleComponent_t));
@@ -1008,7 +1008,7 @@ raidioctl(dev, cmd, data, flag, td)
 	case RAIDFRAME_INCORPORATE_HOT_SPARE:
 		MALLOC(component, RF_SingleComponent_t *,
 		    sizeof(RF_SingleComponent_t), M_RAIDFRAME,
-		     M_WAITOK | M_ZERO);
+		     M_ZERO);
 		componentPtr = (RF_SingleComponent_t *)data;
 		memcpy( component, componentPtr, 
 			sizeof(RF_SingleComponent_t));
@@ -1020,7 +1020,7 @@ raidioctl(dev, cmd, data, flag, td)
 
 		MALLOC(component, RF_SingleComponent_t *,
 		    sizeof(RF_SingleComponent_t), M_RAIDFRAME,
-		     M_WAITOK | M_ZERO);
+		     M_ZERO);
 		if (raidPtr->Layout.map->faultsTolerated == 0) {
 			/* Can't do this on a RAID 0!! */
 			FREE(component, M_RAIDFRAME);
@@ -2894,7 +2894,7 @@ rf_set_autoconfig(raidPtr, new_value)
 	int row, column;
 
 	MALLOC(clabel, RF_ComponentLabel_t *, sizeof(RF_ComponentLabel_t),
-	    M_RAIDFRAME, M_WAITOK | M_ZERO);
+	    M_RAIDFRAME, M_ZERO);
 
 	raidPtr->autoconfigure = new_value;
 	for(row=0; row<raidPtr->numRow; row++) {
@@ -2924,7 +2924,7 @@ rf_set_rootpartition(raidPtr, new_value)
 	int row, column;
 
 	MALLOC(clabel, RF_ComponentLabel_t *, sizeof(RF_ComponentLabel_t),
-	    M_RAIDFRAME, M_WAITOK | M_ZERO);
+	    M_RAIDFRAME, M_ZERO);
 
 	raidPtr->root_partition = new_value;
 	for(row=0; row<raidPtr->numRow; row++) {
diff --git a/sys/dev/raidframe/rf_shutdown.c b/sys/dev/raidframe/rf_shutdown.c
index 7db93e9ce895..9dc62558946e 100644
--- a/sys/dev/raidframe/rf_shutdown.c
+++ b/sys/dev/raidframe/rf_shutdown.c
@@ -61,7 +61,7 @@ _rf_ShutdownCreate(
          * and shutdown after RAIDframe internal allocation system.
          */
 	/* 	ent = (RF_ShutdownList_t *) malloc(sizeof(RF_ShutdownList_t), 
-		M_RAIDFRAME, M_WAITOK); */
+		M_RAIDFRAME, 0); */
 	ent = (RF_ShutdownList_t *) malloc(sizeof(RF_ShutdownList_t), 
 					   M_RAIDFRAME, M_NOWAIT);
 	if (ent == NULL)
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index d965cbc8d366..6256ae217d31 100644
--- a/sys/dev/random/randomdev.c
+++ b/sys/dev/random/randomdev.c
@@ -187,7 +187,7 @@ random_read(dev_t dev __unused, struct uio *uio, int flag)
 			return error;
 	}
 	c = uio->uio_resid < PAGE_SIZE ? uio->uio_resid : PAGE_SIZE;
-	random_buf = (void *)malloc((u_long)c, M_TEMP, M_WAITOK);
+	random_buf = (void *)malloc((u_long)c, M_TEMP, 0);
 	while (uio->uio_resid > 0 && error == 0) {
 		ret = read_random_real(random_buf, c);
 		error = uiomove(random_buf, ret, uio);
@@ -205,7 +205,7 @@ random_write(dev_t dev __unused, struct uio *uio, int flag __unused)
 	void	*random_buf;
 
 	error = 0;
-	random_buf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
+	random_buf = (void *)malloc(PAGE_SIZE, M_TEMP, 0);
 	while (uio->uio_resid > 0) {
 		c = (int)(uio->uio_resid < PAGE_SIZE
 		    ? uio->uio_resid
diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c
index 1c92d50bd9ee..7cd9b8758694 100644
--- a/sys/dev/ray/if_ray.c
+++ b/sys/dev/ray/if_ray.c
@@ -1782,14 +1782,14 @@ ray_rx(struct ray_softc *sc, size_t rcs)
 		goto skip_read;
 	}
 
-	MGETHDR(m0, M_DONTWAIT, MT_DATA);
+	MGETHDR(m0, M_NOWAIT, MT_DATA);
 	if (m0 == NULL) {
 		RAY_RECERR(sc, "MGETHDR failed");
 		ifp->if_ierrors++;
 		goto skip_read;
 	}
 	if (pktlen > MHLEN) {
-		MCLGET(m0, M_DONTWAIT);
+		MCLGET(m0, M_NOWAIT);
 		if (!(m0->m_flags & M_EXT)) {
 			RAY_RECERR(sc, "MCLGET failed");
 			ifp->if_ierrors++;
@@ -3155,7 +3155,7 @@ ray_com_malloc(ray_comqfn_t function, int flags, char *mesg)
 	struct ray_comq_entry *com;
 
 	MALLOC(com, struct ray_comq_entry *,
-	    sizeof(struct ray_comq_entry), M_RAYCOM, M_WAITOK);
+	    sizeof(struct ray_comq_entry), M_RAYCOM, 0);
     
 	return (ray_com_init(com, function, flags, mesg));
 }
diff --git a/sys/dev/sbni/if_sbni.c b/sys/dev/sbni/if_sbni.c
index e5d54172a8eb..d99882f10c4d 100644
--- a/sys/dev/sbni/if_sbni.c
+++ b/sys/dev/sbni/if_sbni.c
@@ -814,7 +814,7 @@ get_rx_buf(struct sbni_softc *sc)
 {
 	struct mbuf *m;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		if_printf(&sc->arpcom.ac_if, "cannot allocate header mbuf\n");
 		return (0);
@@ -828,7 +828,7 @@ get_rx_buf(struct sbni_softc *sc)
 	 */
 	if (ETHER_MAX_LEN + 2 > MHLEN) {
 		/* Attach an mbuf cluster */
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_freem(m);
 			return (0);
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index a148ba575862..7b63a0120518 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -924,11 +924,11 @@ sf_newbuf(sc, c, m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1304,14 +1304,14 @@ sf_encap(sc, c, m_head)
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("sf%d: no memory for tx list\n", sc->sf_unit);
 			return(1);
 		}
 
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_DONTWAIT);
+			MCLGET(m_new, M_NOWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				printf("sf%d: no memory for tx list\n",
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index e58d1c4f2803..3aa40e797070 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -688,7 +688,7 @@ sk_newbuf(sc_if, c, m)
 	if (m == NULL) {
 		caddr_t			*buf = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index 46011cb18393..18ca1cc82fe2 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -1057,7 +1057,7 @@ read_another:
 	/*
 	 * Allocate a header mbuf from the kernel.
 	 */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		goto out;
 
@@ -1067,7 +1067,7 @@ read_another:
 	/*
 	 * Attach an mbuf cluster
 	 */
-	MCLGET(m, M_DONTWAIT);
+	MCLGET(m, M_NOWAIT);
 
 	/*
 	 * Insist on getting a cluster
diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c
index 991bb99a46a6..07218535535a 100644
--- a/sys/dev/snc/dp83932.c
+++ b/sys/dev/snc/dp83932.c
@@ -1121,7 +1121,7 @@ sonic_get(sc, pkt, datalen)
 	 * Our sonic_read() and sonic_get() require it.
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == 0)
 		return (0);
 	m->m_pkthdr.rcvif = &sc->sc_if;
@@ -1132,7 +1132,7 @@ sonic_get(sc, pkt, datalen)
 
 	while (datalen > 0) {
 		if (top) {
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m == 0) {
 				m_freem(top);
 				return (0);
@@ -1140,7 +1140,7 @@ sonic_get(sc, pkt, datalen)
 			len = MLEN;
 		}
 		if (datalen >= MINCLSIZE) {
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, M_NOWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				if (top) m_freem(top);
 				return (0);
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 34e3e29d030d..81583431a1c8 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -150,7 +150,7 @@ snplwrite(tp, uio, flag)
 	snp = tp->t_sc;
 	while (uio->uio_resid > 0) {
 		ilen = imin(512, uio->uio_resid);
-		ibuf = malloc(ilen, M_SNP, M_WAITOK);
+		ibuf = malloc(ilen, M_SNP, 0);
 		error = uiomove(ibuf, ilen, uio);
 		if (error != 0)
 			break;
@@ -391,7 +391,7 @@ snpopen(dev, flag, mode, td)
 			make_dev(&snp_cdevsw, minor(dev), UID_ROOT, GID_WHEEL,
 			    0600, "snp%d", dev2unit(dev));
 		dev->si_drv1 = snp = malloc(sizeof(*snp), M_SNP,
-		    M_WAITOK | M_ZERO);
+		    M_ZERO);
 		snp->snp_unit = dev2unit(dev);
 	} else
 		return (EBUSY);
@@ -402,7 +402,7 @@ snpopen(dev, flag, mode, td)
 	 */
 	snp->snp_flags = SNOOP_OPEN;
 
-	snp->snp_buf = malloc(SNOOP_MINLEN, M_SNP, M_WAITOK);
+	snp->snp_buf = malloc(SNOOP_MINLEN, M_SNP, 0);
 	snp->snp_blen = SNOOP_MINLEN;
 	snp->snp_base = 0;
 	snp->snp_len = 0;
@@ -480,7 +480,7 @@ snp_down(snp)
 
 	if (snp->snp_blen != SNOOP_MINLEN) {
 		free(snp->snp_buf, M_SNP);
-		snp->snp_buf = malloc(SNOOP_MINLEN, M_SNP, M_WAITOK);
+		snp->snp_buf = malloc(SNOOP_MINLEN, M_SNP, 0);
 		snp->snp_blen = SNOOP_MINLEN;
 	}
 	snp->snp_flags |= SNOOP_DOWN;
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index 07d26608fcb7..6e2de523830c 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -282,7 +282,7 @@ create_mididev_info_unit(int type, mididev_info *mdinf, synthdev_info *syninf)
 	}
 
 	/* As malloc(9) might block, allocate mididev_info now. */
-	mdnew = malloc(sizeof(mididev_info), M_DEVBUF, M_WAITOK | M_ZERO);
+	mdnew = malloc(sizeof(mididev_info), M_DEVBUF, M_ZERO);
 	if (mdnew == NULL)
 		return NULL;
 	bcopy(mdinf, mdnew, sizeof(mididev_info));
@@ -607,7 +607,7 @@ midi_read(dev_t i_dev, struct uio * buf, int flag)
 	len = buf->uio_resid;
 	lenr = 0;
 
-	uiobuf = (u_char *)malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
+	uiobuf = (u_char *)malloc(len, M_DEVBUF, M_ZERO);
 	if (uiobuf == NULL)
 		return (ENOMEM);
 
@@ -659,7 +659,7 @@ midi_write(dev_t i_dev, struct uio * buf, int flag)
 	len = buf->uio_resid;
 	lenw = 0;
 
-	uiobuf = (u_char *)malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
+	uiobuf = (u_char *)malloc(len, M_DEVBUF, M_ZERO);
 	if (uiobuf == NULL)
 		return (ENOMEM);
 
diff --git a/sys/dev/sound/midi/midibuf.c b/sys/dev/sound/midi/midibuf.c
index 8b4eda7dbc00..41ea4dd2a385 100644
--- a/sys/dev/sound/midi/midibuf.c
+++ b/sys/dev/sound/midi/midibuf.c
@@ -55,7 +55,7 @@ int
 midibuf_init(midi_dbuf *dbuf)
 {
 	if (dbuf->buf == NULL) {
-		dbuf->buf = malloc(MIDI_BUFFSIZE, M_DEVBUF, M_WAITOK | M_ZERO);
+		dbuf->buf = malloc(MIDI_BUFFSIZE, M_DEVBUF, M_ZERO);
 		cv_init(&dbuf->cv_in, "midi queue in");
 		cv_init(&dbuf->cv_out, "midi queue out");
 	}
diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c
index 5115cc9b6fc2..7d0b6e2aadca 100644
--- a/sys/dev/sound/midi/sequencer.c
+++ b/sys/dev/sound/midi/sequencer.c
@@ -322,7 +322,7 @@ seq_initunit(int unit)
 	dev_t seqdev, musicdev;
 
 	/* Allocate the softc. */
-	scp = malloc(sizeof(*scp), M_DEVBUF, M_WAITOK | M_ZERO);
+	scp = malloc(sizeof(*scp), M_DEVBUF, M_ZERO);
 	if (scp == (sc_p)NULL) {
 		printf("seq_initunit: unit %d, softc allocation failed.\n", unit);
 		return (1);
@@ -544,7 +544,7 @@ seq_read(dev_t i_dev, struct uio *buf, int flag)
 	len = buf->uio_resid;
 	lenr = 0;
 
-	uiobuf = (u_char *)malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
+	uiobuf = (u_char *)malloc(len, M_DEVBUF, M_ZERO);
 	if (uiobuf == NULL)
 		return (ENOMEM);
 
@@ -2364,7 +2364,7 @@ create_seqdev_info_unit(int unit, seqdev_info *seq)
 	seqdev_info *sd, *sdnew;
 
 	/* As malloc(9) might block, allocate seqdev_info now. */
-	sdnew = malloc(sizeof(seqdev_info), M_DEVBUF, M_WAITOK | M_ZERO);
+	sdnew = malloc(sizeof(seqdev_info), M_DEVBUF, M_ZERO);
 	if (sdnew == NULL)
 		return NULL;
 	bcopy(seq, sdnew, sizeof(seqdev_info));
diff --git a/sys/dev/sound/midi/timer.c b/sys/dev/sound/midi/timer.c
index ba4bce0d5828..b5c75cf4a64d 100644
--- a/sys/dev/sound/midi/timer.c
+++ b/sys/dev/sound/midi/timer.c
@@ -97,7 +97,7 @@ timerdev_install(void)
 	tmd = NULL;
 	scp = NULL;
 
-	scp = malloc(sizeof(*scp), M_DEVBUF, M_WAITOK | M_ZERO);
+	scp = malloc(sizeof(*scp), M_DEVBUF, M_ZERO);
 	if (scp == NULL) {
 		ret = ENOMEM;
 		goto fail;
@@ -146,7 +146,7 @@ create_timerdev_info_unit(timerdev_info *tmdinf)
 	}
 
 	/* As malloc(9) might block, allocate timerdev_info now. */
-	tmdnew = malloc(sizeof(timerdev_info), M_DEVBUF, M_WAITOK | M_ZERO);
+	tmdnew = malloc(sizeof(timerdev_info), M_DEVBUF, M_ZERO);
 	if (tmdnew == NULL)
 		return NULL;
 	bcopy(tmdinf, tmdnew, sizeof(timerdev_info));
diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c
index 896a8af0e7ac..dfffd8d23b4d 100644
--- a/sys/dev/sound/pci/ds1.c
+++ b/sys/dev/sound/pci/ds1.c
@@ -934,7 +934,7 @@ ds_pci_attach(device_t dev)
 	struct ac97_info *codec = NULL;
 	char 		status[SND_STATUSLEN];
 
-	if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO)) == NULL) {
+	if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_ZERO)) == NULL) {
 		device_printf(dev, "cannot allocate softc\n");
 		return ENXIO;
 	}
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index e9c99cb41b13..52e16bff27cb 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -1455,7 +1455,7 @@ emu_pci_attach(device_t dev)
 	int i, gotmic;
 	char status[SND_STATUSLEN];
 
-	if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO)) == NULL) {
+	if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_ZERO)) == NULL) {
 		device_printf(dev, "cannot allocate softc\n");
 		return ENXIO;
 	}
diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
index 0f3c9056e9b1..c0f88842c47a 100644
--- a/sys/dev/sound/pcm/ac97.c
+++ b/sys/dev/sound/pcm/ac97.c
@@ -540,7 +540,7 @@ ac97_create(device_t dev, void *devinfo, kobj_class_t cls)
 
 	snprintf(codec->name, AC97_NAMELEN, "%s:ac97", device_get_nameunit(dev));
 	codec->lock = snd_mtxcreate(codec->name, "ac97 codec");
-	codec->methods = kobj_create(cls, M_AC97, M_WAITOK);
+	codec->methods = kobj_create(cls, M_AC97, 0);
 	if (codec->methods == NULL) {
 		snd_mtxlock(codec->lock);
 		snd_mtxfree(codec->lock);
diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c
index d498591c5ce8..9a49e28cbcf7 100644
--- a/sys/dev/sound/pcm/buffer.c
+++ b/sys/dev/sound/pcm/buffer.c
@@ -58,7 +58,7 @@ sndbuf_create(device_t dev, char *drv, char *desc)
 {
 	struct snd_dbuf *b;
 
-	b = malloc(sizeof(*b), M_DEVBUF, M_WAITOK | M_ZERO);
+	b = malloc(sizeof(*b), M_DEVBUF, M_ZERO);
 	snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", drv, desc);
 	b->dev = dev;
 
diff --git a/sys/dev/sound/pcm/fake.c b/sys/dev/sound/pcm/fake.c
index 8c4ba7781400..f1bd33cc70f5 100644
--- a/sys/dev/sound/pcm/fake.c
+++ b/sys/dev/sound/pcm/fake.c
@@ -117,8 +117,8 @@ fkchan_setup(device_t dev)
     	struct snddev_info *d = device_get_softc(dev);
 	struct pcm_channel *c;
 
-	c = malloc(sizeof(*c), M_DEVBUF, M_WAITOK);
-	c->methods = kobj_create(&fkchan_class, M_DEVBUF, M_WAITOK);
+	c = malloc(sizeof(*c), M_DEVBUF, 0);
+	c->methods = kobj_create(&fkchan_class, M_DEVBUF, 0);
 	c->parentsnddev = d;
 	snprintf(c->name, CHN_NAMELEN, "%s:fake", device_get_nameunit(dev));
 
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 424da4de926a..0edb34fb6e5f 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -59,7 +59,7 @@ feeder_register(void *p)
 		KASSERT(fc->desc == NULL, ("first feeder not root: %s", fc->name));
 
 		SLIST_INIT(&feedertab);
-		fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO);
+		fte = malloc(sizeof(*fte), M_FEEDER, M_ZERO);
 		if (fte == NULL) {
 			printf("can't allocate memory for root feeder: %s\n",
 			    fc->name);
@@ -84,7 +84,7 @@ feeder_register(void *p)
 	i = 0;
 	while ((feedercnt < MAXFEEDERS) && (fc->desc[i].type > 0)) {
 		/* printf("adding feeder %s, %x -> %x\n", fc->name, fc->desc[i].in, fc->desc[i].out); */
-		fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO);
+		fte = malloc(sizeof(*fte), M_FEEDER, M_ZERO);
 		if (fte == NULL) {
 			printf("can't allocate memory for feeder '%s', %x -> %x\n", fc->name, fc->desc[i].in, fc->desc[i].out);
 
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index 182d2902385f..2c3c3f4d230b 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -200,7 +200,7 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo)
 	dev_t pdev;
 	int i, unit;
 
-	m = (struct snd_mixer *)kobj_create(cls, M_MIXER, M_WAITOK | M_ZERO);
+	m = (struct snd_mixer *)kobj_create(cls, M_MIXER, M_ZERO);
 	snprintf(m->name, MIXER_NAMELEN, "%s:mixer", device_get_nameunit(dev));
 	m->lock = snd_mtxcreate(m->name, "pcm mixer");
 	m->type = cls->name;
diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
index bdaff2bc9968..6d2a27a8a4cd 100644
--- a/sys/dev/sound/pcm/sndstat.c
+++ b/sys/dev/sound/pcm/sndstat.c
@@ -222,7 +222,7 @@ sndstat_register(device_t dev, char *str, sndstat_handler handler)
 		unit = -1;
 	}
 
-	ent = malloc(sizeof *ent, M_DEVBUF, M_ZERO | M_WAITOK);
+	ent = malloc(sizeof *ent, M_DEVBUF, M_ZERO | 0);
 	if (!ent)
 		return ENOSPC;
 
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index c184a69e13e9..f6d852fc4255 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -91,7 +91,7 @@ snd_mtxcreate(const char *desc, const char *type)
 #ifdef USING_MUTEX
 	struct mtx *m;
 
-	m = malloc(sizeof(*m), M_DEVBUF, M_WAITOK | M_ZERO);
+	m = malloc(sizeof(*m), M_DEVBUF, M_ZERO);
 	if (m == NULL)
 		return NULL;
 	mtx_init(m, desc, type, MTX_RECURSE);
@@ -364,11 +364,11 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c
 		return NULL;
 	}
 
-	ch = malloc(sizeof(*ch), M_DEVBUF, M_WAITOK | M_ZERO);
+	ch = malloc(sizeof(*ch), M_DEVBUF, M_ZERO);
 	if (!ch)
 		return NULL;
 
-	ch->methods = kobj_create(cls, M_DEVBUF, M_WAITOK);
+	ch->methods = kobj_create(cls, M_DEVBUF, 0);
 	if (!ch->methods) {
 		free(ch, M_DEVBUF);
 
@@ -426,7 +426,7 @@ pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch, int mkdev)
     	int unit = device_get_unit(d->dev);
 	int x = -1;
 
-	sce = malloc(sizeof(*sce), M_DEVBUF, M_WAITOK | M_ZERO);
+	sce = malloc(sizeof(*sce), M_DEVBUF, M_ZERO);
 	if (!sce) {
 		return ENOMEM;
 	}
diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c
index 8da3c3e24e1e..ab04ac3b04fe 100644
--- a/sys/dev/sound/pcm/vchan.c
+++ b/sys/dev/sound/pcm/vchan.c
@@ -124,7 +124,7 @@ vchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channel *c,
 	struct pcm_channel *parent = devinfo;
 
 	KASSERT(dir == PCMDIR_PLAY, ("vchan_init: bad direction"));
-	ch = malloc(sizeof(*ch), M_DEVBUF, M_WAITOK | M_ZERO);
+	ch = malloc(sizeof(*ch), M_DEVBUF, M_ZERO);
 	ch->parent = parent;
 	ch->channel = c;
 	ch->fmt = AFMT_U8;
@@ -237,7 +237,7 @@ vchan_create(struct pcm_channel *parent)
 	struct pcm_channel *child;
 	int err, first;
 
-	pce = malloc(sizeof(*pce), M_DEVBUF, M_WAITOK | M_ZERO);
+	pce = malloc(sizeof(*pce), M_DEVBUF, M_ZERO);
 	if (!pce) {
 		return ENOMEM;
 	}
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index de4c5cab33eb..e6487c1acb1b 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -495,7 +495,7 @@ spkropen(dev, flags, fmt, td)
 	(void) printf("spkropen: about to perform play initialization\n");
 #endif /* DEBUG */
 	playinit();
-	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, M_WAITOK);
+	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, 0);
 	spkr_active = TRUE;
 	return(0);
     }
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 18b5511f6741..dfde40e9693e 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -311,7 +311,7 @@ sr_attach(device_t device)
 	hc = (struct sr_hardc *)device_get_softc(device);
 	MALLOC(sc, struct sr_softc *,
 		hc->numports * sizeof(struct sr_softc),
-		M_DEVBUF, M_WAITOK | M_ZERO);
+		M_DEVBUF, M_ZERO);
 	if (sc == NULL)
 		goto errexit;
 	hc->sc = sc;
@@ -2088,7 +2088,7 @@ sr_get_packets(struct sr_softc *sc)
 			       sc->unit, rxstat, len);
 #endif
 
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m == NULL) {
 				/*
 				 * eat (flush) packet if get mbuf fail!!
@@ -2106,7 +2106,7 @@ sr_get_packets(struct sr_softc *sc)
 #endif /* NETGRAPH */
 			m->m_pkthdr.len = m->m_len = len;
 			if (len > MHLEN) {
-				MCLGET(m, M_DONTWAIT);
+				MCLGET(m, M_NOWAIT);
 				if ((m->m_flags & M_EXT) == 0) {
 					/*
 					 * We couldn't get a big enough
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index 4347d99b402d..4ee45a2f3114 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -367,7 +367,7 @@ svr4_stream_get(fp)
 	}
 
 	/* Allocate a new one. */
-	st = malloc(sizeof(struct svr4_strm), M_TEMP, M_WAITOK);
+	st = malloc(sizeof(struct svr4_strm), M_TEMP, 0);
 	st->s_family = so->so_proto->pr_domain->dom_family;
 	st->s_cmd = ~0;
 	st->s_afd = -1;
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 3cd58305cde5..aebeab2545ab 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -383,7 +383,7 @@ daemon_init(video_adapter_t *adp)
 {
 	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
 	    strlen(osrelease);
-	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
+	message = malloc(messagelen + 1, M_DEVBUF, 0);
 	sprintf(message, "%s - %s %s", hostname, ostype, osrelease);
 	blanked = 0;
 	return 0;
diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c
index 30cbdfd0af41..479add933025 100644
--- a/sys/dev/syscons/schistory.c
+++ b/sys/dev/syscons/schistory.c
@@ -124,7 +124,7 @@ sc_alloc_history_buffer(scr_stat *scp, int lines, int prev_ysize, int wait)
 	/* allocate a new buffer */
 	history = (sc_vtb_t *)malloc(sizeof(*history),
 				     M_DEVBUF,
-				     (wait) ? M_WAITOK : M_NOWAIT);
+				     (wait) ? 0 : M_NOWAIT);
 	if (history != NULL) {
 		if (lines > min_lines)
 			extra_history_size -= lines - min_lines;
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index 0c4ba2cdb457..6db469aeef91 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -106,7 +106,7 @@ sc_alloc_cut_buffer(scr_stat *scp, int wait)
 	    free(p, M_DEVBUF);
 	cut_buffer_size = scp->xsize * scp->ysize + 1;
 	p = (u_char *)malloc(cut_buffer_size, 
-			     M_DEVBUF, (wait) ? M_WAITOK : M_NOWAIT);
+			     M_DEVBUF, (wait) ? 0 : M_NOWAIT);
 	if (p != NULL)
 	    p[0] = '\0';
 	cut_buffer = p;
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index 6712e9b4c643..8a0a24f6f4ac 100644
--- a/sys/dev/syscons/scvtb.c
+++ b/sys/dev/syscons/scvtb.c
@@ -61,7 +61,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait)
 			vtb->vtb_buffer =
 				(vm_offset_t)malloc(cols*rows*sizeof(u_int16_t),
 						    M_DEVBUF, 
-						    (wait) ? M_WAITOK : M_NOWAIT);
+						    (wait) ? 0 : M_NOWAIT);
 			if (vtb->vtb_buffer != 0) {
 				bzero((void *)sc_vtb_pointer(vtb, 0),
 				      cols*rows*sizeof(u_int16_t));
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index ea5651fee2f6..5741eea0e8b1 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -131,9 +131,9 @@ static int
 snake_init(video_adapter_t *adp)
 {
 	messagelen = strlen(ostype) + 1 + strlen(osrelease);
-	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
+	message = malloc(messagelen + 1, M_DEVBUF, 0);
 	sprintf(message, "%s %s", ostype, osrelease);
-	messagep = malloc(messagelen * sizeof *messagep, M_DEVBUF, M_WAITOK);
+	messagep = malloc(messagelen * sizeof *messagep, M_DEVBUF, 0);
 	return 0;
 }
 
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 6a885c459761..38465abab7fe 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -318,7 +318,7 @@ sc_attach_unit(int unit, int flags)
 	    /* assert(sc_console->ts != NULL); */
 	    kernel_console_ts = sc_console->ts;
 	    sc_console->ts = malloc(sc_console->tsw->te_size,
-				    M_DEVBUF, M_WAITOK);
+				    M_DEVBUF, 0);
 	    bcopy(kernel_console_ts, sc_console->ts, sc_console->tsw->te_size);
     	    (*sc_console->tsw->te_default_attr)(sc_console,
 						user_default.std_color,
@@ -2674,9 +2674,9 @@ scinit(int unit, int flags)
 	    sc->font_16 = font_16;
 	} else if (sc->font_8 == NULL) {
 	    /* assert(sc_malloc) */
-	    sc->font_8 = malloc(sizeof(font_8), M_DEVBUF, M_WAITOK);
-	    sc->font_14 = malloc(sizeof(font_14), M_DEVBUF, M_WAITOK);
-	    sc->font_16 = malloc(sizeof(font_16), M_DEVBUF, M_WAITOK);
+	    sc->font_8 = malloc(sizeof(font_8), M_DEVBUF, 0);
+	    sc->font_14 = malloc(sizeof(font_14), M_DEVBUF, 0);
+	    sc->font_16 = malloc(sizeof(font_16), M_DEVBUF, 0);
 	}
 #endif
 
@@ -2703,7 +2703,7 @@ scinit(int unit, int flags)
 					 kernel_default.rev_color);
 	} else {
 	    /* assert(sc_malloc) */
-	    sc->dev = malloc(sizeof(dev_t)*sc->vtys, M_DEVBUF, M_WAITOK|M_ZERO);
+	    sc->dev = malloc(sizeof(dev_t)*sc->vtys, M_DEVBUF, M_ZERO);
 	    sc->dev[0] = makedev(CDEV_MAJOR, unit*MAXCONS);
 	    sc->dev[0]->si_tty = ttymalloc(sc->dev[0]->si_tty);
 	    scp = alloc_scp(sc, sc->first_vty);
@@ -2928,7 +2928,7 @@ static scr_stat
 
     /* assert(sc_malloc) */
 
-    scp = (scr_stat *)malloc(sizeof(scr_stat), M_DEVBUF, M_WAITOK);
+    scp = (scr_stat *)malloc(sizeof(scr_stat), M_DEVBUF, 0);
     init_scp(sc, vty, scp);
 
     sc_alloc_scr_buffer(scp, TRUE, TRUE);
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index a3843223270e..894ac43559a5 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -1130,11 +1130,11 @@ ti_newbuf_std(sc, i, m)
 	struct ti_rx_desc	*r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1174,7 +1174,7 @@ ti_newbuf_mini(sc, i, m)
 	struct ti_rx_desc	*r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
@@ -1218,7 +1218,7 @@ ti_newbuf_jumbo(sc, i, m)
 		caddr_t			*buf = NULL;
 
 		/* Allocate the mbuf. */
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
@@ -1300,19 +1300,19 @@ ti_newbuf_jumbo(sc, idx, m_old)
 		}
 	} else {
 		/* Allocate the mbufs. */
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("ti%d: mbuf allocation failed "
    			       "-- packet dropped!\n", sc->ti_unit);
 			goto nobufs;
 		}
-		MGET(m[NPAYLOAD], M_DONTWAIT, MT_DATA);
+		MGET(m[NPAYLOAD], M_NOWAIT, MT_DATA);
 		if (m[NPAYLOAD] == NULL) {
 			printf("ti%d: cluster mbuf allocation failed "
 			       "-- packet dropped!\n", sc->ti_unit);
 			goto nobufs;
 		}
-		MCLGET(m[NPAYLOAD], M_DONTWAIT);
+		MCLGET(m[NPAYLOAD], M_NOWAIT);
 		if ((m[NPAYLOAD]->m_flags & M_EXT) == 0) {
 			printf("ti%d: mbuf allocation failed "
 			       "-- packet dropped!\n", sc->ti_unit);
@@ -1321,7 +1321,7 @@ ti_newbuf_jumbo(sc, idx, m_old)
 		m[NPAYLOAD]->m_len = MCLBYTES;
 
 		for (i = 0; i < NPAYLOAD; i++){
-			MGET(m[i], M_DONTWAIT, MT_DATA);
+			MGET(m[i], M_NOWAIT, MT_DATA);
 			if (m[i] == NULL) {
 				printf("ti%d: mbuf allocation failed "
 				       "-- packet dropped!\n", sc->ti_unit);
diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c
index e157cb1141ea..839112353cea 100644
--- a/sys/dev/trm/trm.c
+++ b/sys/dev/trm/trm.c
@@ -2887,7 +2887,7 @@ trm_initACB(PACB pACB, u_int16_t unit)
 			for (j = 0; j < (pACB->max_lun +1); j++) {
 				pACB->scan_devices[i][j] = 1;
 				pACB->pDCB[i][j]= (PDCB) malloc (
-				    sizeof (struct _DCB), M_DEVBUF, M_WAITOK);
+				    sizeof (struct _DCB), M_DEVBUF, 0);
 				trm_initDCB(pACB,
 				    pACB->pDCB[i][j], unit, i, j);
 				TRM_DPRINTF("pDCB= %8x \n",
@@ -3292,7 +3292,7 @@ trm_attach(device_t pci_config_id)
 	 * of the multi-channel controller.
 	 * trm_action     : sim_action_func
 	 * trm_poll       : sim_poll_func
-	 * "trm"        : sim_name ,if sim_name =  "xpt" ..M_DEVBUF,M_WAITOK
+	 * "trm"        : sim_name ,if sim_name =  "xpt" ..M_DEVBUF,0
 	 * pACB         : *softc    if sim_name <> "xpt" ..M_DEVBUF,M_NOWAIT
 	 * pACB->unit   : unit
 	 * 1            : max_dev_transactions
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c
index 43df8e98760b..4284942db37c 100644
--- a/sys/dev/twe/twe.c
+++ b/sys/dev/twe/twe.c
@@ -476,7 +476,7 @@ twe_ioctl(struct twe_softc *sc, int cmd, void *addr)
 	/* if there's a data buffer, allocate and copy it in */
 	tr->tr_length = tu->tu_size;
 	if (tr->tr_length > 0) {
-	    if ((tr->tr_data = malloc(tr->tr_length, M_DEVBUF, M_WAITOK)) == NULL) {
+	    if ((tr->tr_data = malloc(tr->tr_length, M_DEVBUF, 0)) == NULL) {
 		error = ENOMEM;
 		goto cmd_done;
 	    }
@@ -559,7 +559,7 @@ twe_ioctl(struct twe_softc *sc, int cmd, void *addr)
 	break;
 
     case TWEIO_SET_PARAM:
-	if ((data = malloc(tp->tp_size, M_DEVBUF, M_WAITOK)) == NULL) {
+	if ((data = malloc(tp->tp_size, M_DEVBUF, 0)) == NULL) {
 	    error = ENOMEM;
 	} else {
 	    error = copyin(tp->tp_data, data, tp->tp_size);
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 189a69ef8906..5a6871934a78 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -577,7 +577,7 @@ epic_ifstart(ifp)
 		/* If packet was more than EPIC_MAX_FRAGS parts, */
 		/* recopy packet to new allocated mbuf cluster */
 		if( NULL != m ){
-			m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+			m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 			if( NULL == m ){
 				m_freem(m0);
 				ifp->if_oerrors++;
@@ -652,7 +652,7 @@ epic_rx_done(sc)
 		m = buf->mbuf;
 
 		/* Try to get mbuf cluster */
-		buf->mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+		buf->mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if( NULL == buf->mbuf ) { 
 			buf->mbuf = m;
 			desc->status = 0x8000;
@@ -1415,7 +1415,7 @@ epic_queue_last_packet(sc)
 	if ((desc->status & 0x8000) || (buf->mbuf != NULL))
 		return (EBUSY);
 
-	MGETHDR(m0, M_DONTWAIT, MT_DATA);
+	MGETHDR(m0, M_NOWAIT, MT_DATA);
 	if (NULL == m0)
 		return (ENOBUFS);
 
@@ -1556,7 +1556,7 @@ epic_init_rings(sc)
 			return EFAULT;
 		}
 
-		buf->mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+		buf->mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if( NULL == buf->mbuf ) {
 			epic_free_rings(sc);
 			return ENOBUFS;
diff --git a/sys/dev/tx/if_txvar.h b/sys/dev/tx/if_txvar.h
index 16dc36d9f5b7..465727fc7075 100644
--- a/sys/dev/tx/if_txvar.h
+++ b/sys/dev/tx/if_txvar.h
@@ -134,9 +134,9 @@ struct epic_type {
 
 /* Macro to get either mbuf cluster or nothing */
 #define EPIC_MGETCLUSTER(m)						\
-	{ MGETHDR((m),M_DONTWAIT,MT_DATA);				\
+	{ MGETHDR((m),M_NOWAIT,MT_DATA);				\
 	  if (m) {							\
-	    MCLGET((m),M_DONTWAIT);					\
+	    MCLGET((m),M_NOWAIT);					\
 	    if( 0 == ((m)->m_flags & M_EXT) ) {				\
 	      m_freem(m);						\
 	      (m) = NULL;						\
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index 7c4d74d25ec3..385c91d0a62d 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -768,13 +768,13 @@ txp_rx_reclaim(sc, r)
 			 */
 			struct mbuf *mnew;
 
-			MGETHDR(mnew, M_DONTWAIT, MT_DATA);
+			MGETHDR(mnew, M_NOWAIT, MT_DATA);
 			if (mnew == NULL) {
 				m_freem(m);
 				goto next;
 			}
 			if (m->m_len > (MHLEN - 2)) {
-				MCLGET(mnew, M_DONTWAIT);
+				MCLGET(mnew, M_NOWAIT);
 				if (!(mnew->m_flags & M_EXT)) {
 					m_freem(mnew);
 					m_freem(m);
@@ -847,11 +847,11 @@ txp_rxbuf_reclaim(sc)
 		if (sd->sd_mbuf != NULL)
 			break;
 
-		MGETHDR(sd->sd_mbuf, M_DONTWAIT, MT_DATA);
+		MGETHDR(sd->sd_mbuf, M_NOWAIT, MT_DATA);
 		if (sd->sd_mbuf == NULL)
 			goto err_sd;
 
-		MCLGET(sd->sd_mbuf, M_DONTWAIT);
+		MCLGET(sd->sd_mbuf, M_NOWAIT);
 		if ((sd->sd_mbuf->m_flags & M_EXT) == 0)
 			goto err_mbuf;
 		sd->sd_mbuf->m_pkthdr.rcvif = ifp;
@@ -1142,11 +1142,11 @@ txp_rxring_fill(sc)
 
 	for (i = 0; i < RXBUF_ENTRIES; i++) {
 		sd = sc->sc_rxbufs[i].rb_sd;
-		MGETHDR(sd->sd_mbuf, M_DONTWAIT, MT_DATA);
+		MGETHDR(sd->sd_mbuf, M_NOWAIT, MT_DATA);
 		if (sd->sd_mbuf == NULL)
 			return(ENOBUFS);
 
-		MCLGET(sd->sd_mbuf, M_DONTWAIT);
+		MCLGET(sd->sd_mbuf, M_NOWAIT);
 		if ((sd->sd_mbuf->m_flags & M_EXT) == 0) {
 			m_freem(sd->sd_mbuf);
 			return(ENOBUFS);
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index 06600ed6e85a..b18acfd915bc 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -1328,14 +1328,14 @@ ubsec_process(void *arg, struct cryptop *crp, int hint)
 				totlen = q->q_src_mapsize;
 				if (q->q_src_m->m_flags & M_PKTHDR) {
 					len = MHLEN;
-					MGETHDR(m, M_DONTWAIT, MT_DATA);
-					if (m && !m_dup_pkthdr(m, q->q_src_m, M_DONTWAIT)) {
+					MGETHDR(m, M_NOWAIT, MT_DATA);
+					if (m && !m_dup_pkthdr(m, q->q_src_m, M_NOWAIT)) {
 						m_free(m);
 						m = NULL;
 					}
 				} else {
 					len = MLEN;
-					MGET(m, M_DONTWAIT, MT_DATA);
+					MGET(m, M_NOWAIT, MT_DATA);
 				}
 				if (m == NULL) {
 					ubsecstats.hst_nombuf++;
@@ -1343,7 +1343,7 @@ ubsec_process(void *arg, struct cryptop *crp, int hint)
 					goto errout;
 				}
 				if (totlen >= MINCLSIZE) {
-					MCLGET(m, M_DONTWAIT);
+					MCLGET(m, M_NOWAIT);
 					if ((m->m_flags & M_EXT) == 0) {
 						m_free(m);
 						ubsecstats.hst_nomcl++;
@@ -1358,7 +1358,7 @@ ubsec_process(void *arg, struct cryptop *crp, int hint)
 
 				while (totlen > 0) {
 					if (top) {
-						MGET(m, M_DONTWAIT, MT_DATA);
+						MGET(m, M_NOWAIT, MT_DATA);
 						if (m == NULL) {
 							m_freem(top);
 							ubsecstats.hst_nombuf++;
@@ -1368,7 +1368,7 @@ ubsec_process(void *arg, struct cryptop *crp, int hint)
 						len = MLEN;
 					}
 					if (top && totlen >= MINCLSIZE) {
-						MCLGET(m, M_DONTWAIT);
+						MCLGET(m, M_NOWAIT);
 						if ((m->m_flags & M_EXT) == 0) {
 							*mp = m;
 							m_freem(top);
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c
index b37a5d06d517..d5484a8ecd63 100644
--- a/sys/dev/usb/hid.c
+++ b/sys/dev/usb/hid.c
@@ -96,7 +96,7 @@ hid_start_parse(void *d, int len, int kindset)
 {
 	struct hid_data *s;
 
-	s = malloc(sizeof *s, M_TEMP, M_WAITOK|M_ZERO);
+	s = malloc(sizeof *s, M_TEMP, M_ZERO);
 	s->start = s->p = d;
 	s->end = (char *)d + len;
 	s->kindset = kindset;
@@ -288,7 +288,7 @@ hid_get_item(struct hid_data *s, struct hid_item *h)
 				c->loc.count = dval;
 				break;
 			case 10: /* Push */
-				hi = malloc(sizeof *hi, M_TEMP, M_WAITOK);
+				hi = malloc(sizeof *hi, M_TEMP, 0);
 				*hi = s->cur;
 				c->next = hi;
 				break;
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index fa80dd6ec08b..94903c40eecf 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -812,14 +812,14 @@ aue_newbuf(struct aue_softc *sc, struct aue_chain *c, struct mbuf *m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("aue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->aue_unit);
 			return (ENOBUFS);
 		}
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			printf("aue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->aue_unit);
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 8748a83558c6..a669e97ccd53 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -568,14 +568,14 @@ cue_newbuf(struct cue_softc *sc, struct cue_chain *c, struct mbuf *m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("cue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->cue_unit);
 			return(ENOBUFS);
 		}
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			printf("cue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->cue_unit);
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 767d6fab845f..3f51b5ae1f22 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -542,14 +542,14 @@ kue_newbuf(struct kue_softc *sc, struct kue_chain *c, struct mbuf *m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("kue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->kue_unit);
 			return(ENOBUFS);
 		}
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			printf("kue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->kue_unit);
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 60ebd4ca95ba..81915d3b30ba 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -278,7 +278,7 @@ USB_ATTACH(ubsa)
 	int i;
 
 	dev = uaa->device;
-	devinfo = malloc(1024, M_USBDEV, M_WAITOK);
+	devinfo = malloc(1024, M_USBDEV, 0);
 	ucom = &sc->sc_ucom;
 
 	bzero(sc, sizeof (struct ubsa_softc));
@@ -643,7 +643,7 @@ ubsa_open(void *addr, int portno)
 	DPRINTF(("ubsa_open: sc = %p\n", sc));
 
 	if (sc->sc_intr_number != -1 && sc->sc_intr_pipe == NULL) {
-		sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, M_WAITOK);
+		sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, 0);
 		err = usbd_open_pipe_intr(sc->sc_intr_iface,
 		    sc->sc_intr_number,
 		    USBD_SHORT_XFER_OK,
diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c
index a0519da07d0a..77f4b1d076b0 100644
--- a/sys/dev/usb/udbp.c
+++ b/sys/dev/usb/udbp.c
@@ -326,11 +326,11 @@ USB_ATTACH(udbp)
 	if (!sc->sc_bulkout_xfer) {
 		goto bad;
 	}
-	sc->sc_bulkin_buffer = malloc(UDBP_BUFFERSIZE, M_USBDEV, M_WAITOK);
+	sc->sc_bulkin_buffer = malloc(UDBP_BUFFERSIZE, M_USBDEV, 0);
 	if (!sc->sc_bulkin_buffer) {
 		goto bad;
 	}
-	sc->sc_bulkout_buffer = malloc(UDBP_BUFFERSIZE, M_USBDEV, M_WAITOK);
+	sc->sc_bulkout_buffer = malloc(UDBP_BUFFERSIZE, M_USBDEV, 0);
 	if (!sc->sc_bulkout_xfer || !sc->sc_bulkout_buffer) {
 		goto bad;
 	}
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index d400ff8122de..fb2445989092 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -171,7 +171,7 @@ USB_ATTACH(uftdi)
 	usbd_status err;
 	struct ucom_softc *ucom = &sc->sc_ucom;
 	DPRINTFN(10,("\nuftdi_attach: sc=%p\n", sc));
-	devinfo = malloc(1024, M_USBDEV, M_WAITOK);
+	devinfo = malloc(1024, M_USBDEV, 0);
 
 	ucom->sc_dev = self;
 	ucom->sc_udev = dev;
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index fb2b46af8221..06bbaddd9807 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -422,7 +422,7 @@ ugenopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 			isize = UGETW(edesc->wMaxPacketSize);
 			if (isize == 0)	/* shouldn't happen */
 				return (EINVAL);
-			sce->ibuf = malloc(isize, M_USBDEV, M_WAITOK);
+			sce->ibuf = malloc(isize, M_USBDEV, 0);
 			DPRINTFN(5, ("ugenopen: intr endpt=%d,isize=%d\n", 
 				     endpt, isize));
 			if (clalloc(&sce->q, UGEN_IBSIZE, 0) == -1)
@@ -452,7 +452,7 @@ ugenopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 			if (isize == 0)	/* shouldn't happen */
 				return (EINVAL);
 			sce->ibuf = malloc(isize * UGEN_NISOFRAMES,
-				M_USBDEV, M_WAITOK);
+				M_USBDEV, 0);
 			sce->cur = sce->fill = sce->ibuf;
 			sce->limit = sce->ibuf + isize * UGEN_NISOFRAMES;
 			DPRINTFN(5, ("ugenopen: isoc endpt=%d, isize=%d\n", 
@@ -1042,7 +1042,7 @@ ugen_get_cdesc(struct ugen_softc *sc, int index, int *lenp)
 		len = UGETW(tdesc->wTotalLength);
 		if (lenp)
 			*lenp = len;
-		cdesc = malloc(len, M_TEMP, M_WAITOK);
+		cdesc = malloc(len, M_TEMP, 0);
 		memcpy(cdesc, tdesc, len);
 		DPRINTFN(5,("ugen_get_cdesc: current, len=%d\n", len));
 	} else {
@@ -1053,7 +1053,7 @@ ugen_get_cdesc(struct ugen_softc *sc, int index, int *lenp)
 		DPRINTFN(5,("ugen_get_cdesc: index=%d, len=%d\n", index, len));
 		if (lenp)
 			*lenp = len;
-		cdesc = malloc(len, M_TEMP, M_WAITOK);
+		cdesc = malloc(len, M_TEMP, 0);
 		err = usbd_get_config_desc_full(sc->sc_udev, index, cdesc, len);
 		if (err) {
 			free(cdesc, M_TEMP);
@@ -1307,7 +1307,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
 				ur->ucr_request.bmRequestType & UT_READ ? 
 				UIO_READ : UIO_WRITE;
 			uio.uio_procp = p;
-			ptr = malloc(len, M_TEMP, M_WAITOK);
+			ptr = malloc(len, M_TEMP, 0);
 			if (uio.uio_rw == UIO_WRITE) {
 				error = uiomove(ptr, len, &uio);
 				if (error)
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 68a80700e7ed..228b352f2ef0 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -2529,7 +2529,7 @@ uhci_setup_isoc(usbd_pipe_handle pipe)
 
 	iso = &upipe->u.iso;
 	iso->stds = malloc(UHCI_VFRAMELIST_COUNT * sizeof (uhci_soft_td_t *),
-			   M_USBHC, M_WAITOK);
+			   M_USBHC, 0);
 
 	token = rd ? UHCI_TD_IN (0, endpt, addr, 0) :
 		     UHCI_TD_OUT(0, endpt, addr, 0);
@@ -2775,7 +2775,7 @@ uhci_device_setintr(uhci_softc_t *sc, struct uhci_pipe *upipe, int ival)
 
 	upipe->u.intr.npoll = npoll;
 	upipe->u.intr.qhs =
-		malloc(npoll * sizeof(uhci_soft_qh_t *), M_USBHC, M_WAITOK);
+		malloc(npoll * sizeof(uhci_soft_qh_t *), M_USBHC, 0);
 
 	/*
 	 * Figure out which offset in the schedule that has most
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 2570aa19a8d4..ad8862ea8cc2 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -418,8 +418,8 @@ uhidopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 		return (ENOMEM);
 	}
 
-	sc->sc_ibuf = malloc(sc->sc_isize, M_USBDEV, M_WAITOK);
-	sc->sc_obuf = malloc(sc->sc_osize, M_USBDEV, M_WAITOK);
+	sc->sc_ibuf = malloc(sc->sc_isize, M_USBDEV, 0);
+	sc->sc_obuf = malloc(sc->sc_osize, M_USBDEV, 0);
 
 	/* Set up interrupt pipe. */
 	err = usbd_open_pipe_intr(sc->sc_iface, sc->sc_ep_addr, 
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 4fce1906604a..1e4d51b5b0f0 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -2113,7 +2113,7 @@ umass_cam_rescan(void *addr)
 	struct umass_softc *sc = (struct umass_softc *) addr;
 #endif
 	struct cam_path *path;
-	union ccb *ccb = malloc(sizeof(union ccb), M_USBDEV, M_WAITOK);
+	union ccb *ccb = malloc(sizeof(union ccb), M_USBDEV, 0);
 
 	memset(ccb, 0, sizeof(union ccb));
 
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 30e337d83696..d6bbfc58224b 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -247,7 +247,7 @@ USB_ATTACH(umodem)
 	int i;
 	struct ucom_softc *ucom;
 
-	devinfo = malloc(1024, M_USBDEV, M_WAITOK);
+	devinfo = malloc(1024, M_USBDEV, 0);
 	usbd_devinfo(dev, 0, devinfo);
 	ucom = &sc->sc_ucom;
 	ucom->sc_dev = self;
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index cc017c807658..e576f9cbc243 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -260,7 +260,7 @@ USB_ATTACH(uplcom)
 	usbd_status err;
 	int i;
 
-	devinfo = malloc(1024, M_USBDEV, M_WAITOK);
+	devinfo = malloc(1024, M_USBDEV, 0);
 	ucom = &sc->sc_ucom;
 
 	bzero(sc, sizeof (struct uplcom_softc));
@@ -685,7 +685,7 @@ uplcom_open(void *addr, int portno)
 
 	if (sc->sc_intr_number != -1 && sc->sc_intr_pipe == NULL) {
 		sc->sc_status = 0; /* clear status bit */
-		sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, M_WAITOK);
+		sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, 0);
 		err = usbd_open_pipe_intr(sc->sc_intr_iface,
 					  sc->sc_intr_number,
 					  USBD_SHORT_XFER_OK,
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index ba9ca84b96d2..d0eb1fab5550 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -552,7 +552,7 @@ urioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
 			req.bmRequestType & UT_READ ? 
 			UIO_READ : UIO_WRITE;
 		uio.uio_procp = p;
-		ptr = malloc(len, M_TEMP, M_WAITOK);
+		ptr = malloc(len, M_TEMP, 0);
 		if (uio.uio_rw == UIO_WRITE) {
 			error = uiomove(ptr, len, &uio);
 			if (error)
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 21127d698383..4e9483cb2400 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -596,7 +596,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 				ur->ucr_request.bmRequestType & UT_READ ?
 				UIO_READ : UIO_WRITE;
 			uio.uio_procp = p;
-			ptr = malloc(len, M_TEMP, M_WAITOK);
+			ptr = malloc(len, M_TEMP, 0);
 			if (uio.uio_rw == UIO_WRITE) {
 				error = uiomove(ptr, len, &uio);
 				if (error)
@@ -774,7 +774,7 @@ usb_add_event(int type, struct usb_event *uep)
 	struct timeval thetime;
 	int s;
 
-	ueq = malloc(sizeof *ueq, M_USBDEV, M_WAITOK);
+	ueq = malloc(sizeof *ueq, M_USBDEV, 0);
 	ueq->ue = *uep;
 	ueq->ue.ue_type = type;
 	microtime(&thetime);
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 98e2177e87da..545f6738959b 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -383,8 +383,8 @@ uscanneropen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 
 	sc->sc_state |= USCANNER_OPEN;
 
-	sc->sc_bulkin_buffer = malloc(USCANNER_BUFFERSIZE, M_USBDEV, M_WAITOK);
-	sc->sc_bulkout_buffer = malloc(USCANNER_BUFFERSIZE, M_USBDEV, M_WAITOK);
+	sc->sc_bulkin_buffer = malloc(USCANNER_BUFFERSIZE, M_USBDEV, 0);
+	sc->sc_bulkout_buffer = malloc(USCANNER_BUFFERSIZE, M_USBDEV, 0);
 	/* No need to check buffers for NULL since we have WAITOK */
 
 	sc->sc_bulkin_bufferlen = USCANNER_BUFFERSIZE;
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index 0cffd8684d5d..1ea97d9a9953 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -233,7 +233,7 @@ USB_ATTACH(uvisor)
 	usbd_status err;
 	struct ucom_softc *ucom;
 
-	devinfo = malloc(1024, M_USBDEV, M_WAITOK);
+	devinfo = malloc(1024, M_USBDEV, 0);
 	ucom = &sc->sc_ucom;
 
 	bzero(sc, sizeof (struct uvisor_softc));
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index 2db196aaaa5b..0c0acd20252e 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -261,7 +261,7 @@ USB_ATTACH(uvscom)
 	usbd_status err;
 	int i;
 
-	devinfo = malloc(1024, M_USBDEV, M_WAITOK);
+	devinfo = malloc(1024, M_USBDEV, 0);
 	ucom = &sc->sc_ucom;
 
 	bzero(sc, sizeof (struct uvscom_softc));
@@ -724,7 +724,7 @@ uvscom_open(void *addr, int portno)
 			return (ENXIO);
 		}
 
-		sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, M_WAITOK);
+		sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, 0);
 		err = usbd_open_pipe_intr(sc->sc_ucom.sc_iface,
 					  sc->sc_intr_number,
 					  USBD_SHORT_XFER_OK,
diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h
index 3c6bbad1e16c..a8af0cddf460 100644
--- a/sys/dev/vinum/vinumext.h
+++ b/sys/dev/vinum/vinumext.h
@@ -245,7 +245,7 @@ void FFree(void *mem, char *, int);
 #define LOCKDRIVE(d) lockdrive (d, __FILE__, __LINE__)
 #else
 #define Malloc(x)  malloc((x), M_DEVBUF, \
-	curthread->td_proc->p_intr_nesting_level == 0? M_WAITOK: M_NOWAIT)
+	curthread->td_proc->p_intr_nesting_level == 0? 0: M_NOWAIT)
 #define Free(x)    free((x), M_DEVBUF)
 #define LOCKDRIVE(d) lockdrive (d)
 #endif
diff --git a/sys/dev/vinum/vinummemory.c b/sys/dev/vinum/vinummemory.c
index 6936e481e0f1..cedcbfb51459 100644
--- a/sys/dev/vinum/vinummemory.c
+++ b/sys/dev/vinum/vinummemory.c
@@ -152,7 +152,7 @@ MMalloc(int size, char *file, int line)
     /* Wait for malloc if we can */
     result = malloc(size,
 	M_DEVBUF,
-	curthread->td_intr_nesting_level == 0 ? M_WAITOK : M_NOWAIT);
+	curthread->td_intr_nesting_level == 0 ? 0 : M_NOWAIT);
     if (result == NULL)
 	log(LOG_ERR, "vinum: can't allocate %d bytes from %s:%d\n", size, file, line);
     else {
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 407abf136d49..01b1992f7e04 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -948,11 +948,11 @@ vr_newbuf(sc, c, m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1292,13 +1292,13 @@ vr_encap(sc, c, m_head)
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("vr%d: no memory for tx list\n", sc->vr_unit);
 			return(1);
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_DONTWAIT);
+			MCLGET(m_new, M_NOWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				printf("vr%d: no memory for tx list\n",
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 143a821e57dd..d86fab8f8c82 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -761,7 +761,7 @@ vxget(sc, totlen)
     m = sc->mb[sc->next_mb];
     sc->mb[sc->next_mb] = 0;
     if (m == 0) {
-        MGETHDR(m, M_DONTWAIT, MT_DATA);
+        MGETHDR(m, M_NOWAIT, MT_DATA);
         if (m == 0)
             return 0;
     } else {
@@ -800,7 +800,7 @@ vxget(sc, totlen)
             m = sc->mb[sc->next_mb];
             sc->mb[sc->next_mb] = 0;
             if (m == 0) {
-                MGET(m, M_DONTWAIT, MT_DATA);
+                MGET(m, M_NOWAIT, MT_DATA);
                 if (m == 0) {
                     splx(sh);
                     m_freem(top);
@@ -812,7 +812,7 @@ vxget(sc, totlen)
             len = MLEN;
         }
         if (totlen >= MINCLSIZE) {
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
 	    if (m->m_flags & M_EXT)
 		len = MCLBYTES;
         }
@@ -993,7 +993,7 @@ vxmbuffill(sp)
     i = sc->last_mb;
     do {
 	if (sc->mb[i] == NULL)
-	    MGET(sc->mb[i], M_DONTWAIT, MT_DATA);
+	    MGET(sc->mb[i], M_NOWAIT, MT_DATA);
 	if (sc->mb[i] == NULL)
 	    break;
 	i = (i + 1) % MAX_MBS;
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 5d469a193392..fb2a214682ae 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -915,9 +915,9 @@ wi_start(struct ifnet *ifp)
 		if (sc->sc_drvbpf) {
 			struct mbuf *mb;
 
-			MGETHDR(mb, M_DONTWAIT, m0->m_type);
+			MGETHDR(mb, M_NOWAIT, m0->m_type);
 			if (mb != NULL) {
-				(void) m_dup_pkthdr(mb, m0, M_DONTWAIT);
+				(void) m_dup_pkthdr(mb, m0, M_NOWAIT);
 				mb->m_next = m0;
 				mb->m_data = (caddr_t)&frmhdr;
 				mb->m_len = sizeof(frmhdr);
@@ -1344,7 +1344,7 @@ wi_rx_intr(struct wi_softc *sc)
 	len = le16toh(frmhdr.wi_dat_len);
 	off = ALIGN(sizeof(struct ieee80211_frame));
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX);
 		ifp->if_ierrors++;
@@ -1352,7 +1352,7 @@ wi_rx_intr(struct wi_softc *sc)
 		return;
 	}
 	if (off + len > MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX);
 			m_freem(m);
@@ -1375,9 +1375,9 @@ wi_rx_intr(struct wi_softc *sc)
 	if (sc->sc_drvbpf) {
 		struct mbuf *mb;
 
-		MGETHDR(mb, M_DONTWAIT, m->m_type);
+		MGETHDR(mb, M_NOWAIT, m->m_type);
 		if (mb != NULL) {
-			(void) m_dup_pkthdr(mb, m, M_DONTWAIT);
+			(void) m_dup_pkthdr(mb, m, M_NOWAIT);
 			mb->m_next = m;
 			mb->m_data = (caddr_t)&frmhdr;
 			mb->m_len = sizeof(frmhdr);
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index dfaca89135c9..4b44fa37b830 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -966,7 +966,7 @@ wlread(int unit, u_short fd_p)
     /*
      * Allocate a cluster'd mbuf to receive the packet.
      */
-    m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+    m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
     if (m == NULL) {
 	if (wlhwrst(unit) != TRUE) {
 	    sc->hacr &= ~HACR_INTRON;
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index 6ba4de4284a7..8cd29d11ab4d 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -643,7 +643,7 @@ xe_intr(void *xscp)
 	if (len & 0x01)
 	  len++;
 
-	MGETHDR(mbp, M_DONTWAIT, MT_DATA);	/* Allocate a header mbuf */
+	MGETHDR(mbp, M_NOWAIT, MT_DATA);	/* Allocate a header mbuf */
 	if (mbp != NULL) {
 	  mbp->m_pkthdr.rcvif = ifp;
 	  mbp->m_pkthdr.len = mbp->m_len = len;
@@ -654,7 +654,7 @@ xe_intr(void *xscp)
 	   * alignment hack below.
 	   */
 	  if (len + 2 > MHLEN) {
-	    MCLGET(mbp, M_DONTWAIT);
+	    MCLGET(mbp, M_NOWAIT);
 	    if ((mbp->m_flags & M_EXT) == 0) {
 	      m_freem(mbp);
 	      mbp = NULL;
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index a44df4caa371..f9161176bc53 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -411,7 +411,7 @@ iso_mountfs(devvp, mp, td, argp)
 		 pri_sierra->root_directory_record:
 		 pri->root_directory_record);
 
-	isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_WAITOK | M_ZERO);
+	isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_ZERO);
 	isomp->logical_block_size = logical_block_size;
 	isomp->volume_space_size =
 		isonum_733 (high_sierra?
@@ -712,7 +712,7 @@ cd9660_vget_internal(mp, ino, flags, vpp, relocated, isodir)
 		return (error);
 	}
 	MALLOC(ip, struct iso_node *, sizeof(struct iso_node), M_ISOFSNODE,
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 	vp->v_data = ip;
 	ip->i_vnode = vp;
 	ip->i_dev = dev;
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 0b892e6e8012..062c22aa27c1 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -194,7 +194,7 @@ cd9660_getattr(ap)
 		struct uio auio;
 		char *cp;
 
-		MALLOC(cp, char *, MAXPATHLEN, M_TEMP, M_WAITOK);
+		MALLOC(cp, char *, MAXPATHLEN, M_TEMP, 0);
 		aiov.iov_base = cp;
 		aiov.iov_len = MAXPATHLEN;
 		auio.uio_iov = &aiov;
@@ -451,7 +451,7 @@ cd9660_readdir(ap)
 	imp = dp->i_mnt;
 	bmask = imp->im_bmask;
 
-	MALLOC(idp, struct isoreaddir *, sizeof(*idp), M_TEMP, M_WAITOK);
+	MALLOC(idp, struct isoreaddir *, sizeof(*idp), M_TEMP, 0);
 	idp->saveent.d_namlen = idp->assocent.d_namlen = 0;
 	/*
 	 * XXX
@@ -468,7 +468,7 @@ cd9660_readdir(ap)
 		 */
 		ncookies = uio->uio_resid / 16;
 		MALLOC(cookies, u_long *, ncookies * sizeof(u_int), M_TEMP,
-		    M_WAITOK);
+		    0);
 		idp->cookies = cookies;
 		idp->ncookies = ncookies;
 	}
@@ -671,7 +671,7 @@ cd9660_readlink(ap)
 	if (uio->uio_segflg == UIO_SYSSPACE)
 		symname = uio->uio_iov->iov_base;
 	else
-		symname = uma_zalloc(namei_zone, M_WAITOK);
+		symname = uma_zalloc(namei_zone, 0);
 	
 	/*
 	 * Ok, we just gathering a symbolic name in SL record.
diff --git a/sys/fs/coda/cnode.h b/sys/fs/coda/cnode.h
index 962d329580e4..8d0cebe3d131 100644
--- a/sys/fs/coda/cnode.h
+++ b/sys/fs/coda/cnode.h
@@ -66,7 +66,7 @@ MALLOC_DECLARE(M_CODA);
 
 #define CODA_ALLOC(ptr, cast, size)                                        \
 do {                                                                      \
-    ptr = (cast)malloc((unsigned long) size, M_CODA, M_WAITOK);            \
+    ptr = (cast)malloc((unsigned long) size, M_CODA, 0);                   \
     if (ptr == 0) {                                                       \
 	panic("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__);  \
     }                                                                     \
diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c
index 3b9a1bbe3d08..dfd712063c8f 100644
--- a/sys/fs/devfs/devfs_devs.c
+++ b/sys/fs/devfs/devfs_devs.c
@@ -153,11 +153,11 @@ devfs_attemptoverflow(int insist)
 	or = NULL;
 	n = devfs_noverflowwant;
 	nb = sizeof (dev_t *) * n;
-	MALLOC(ot, dev_t **, nb, M_DEVFS, (insist ? M_WAITOK : M_NOWAIT) | M_ZERO);
+	MALLOC(ot, dev_t **, nb, M_DEVFS, (insist ? 0 : M_NOWAIT) | M_ZERO);
 	if (ot == NULL)
 		goto bail;
 	nb = sizeof (int) * n;
-	MALLOC(or, int *, nb, M_DEVFS, (insist ? M_WAITOK : M_NOWAIT) | M_ZERO);
+	MALLOC(or, int *, nb, M_DEVFS, (insist ? 0 : M_NOWAIT) | M_ZERO);
 	if (or == NULL)
 		goto bail;
 	if (!atomic_cmpset_ptr(&devfs_overflow, NULL, ot))
@@ -200,7 +200,7 @@ devfs_newdirent(char *name, int namelen)
 
 	d.d_namlen = namelen;
 	i = sizeof (*de) + GENERIC_DIRSIZ(&d);
-	MALLOC(de, struct devfs_dirent *, i, M_DEVFS, M_WAITOK | M_ZERO);
+	MALLOC(de, struct devfs_dirent *, i, M_DEVFS, M_ZERO);
 	de->de_dirent = (struct dirent *)(de + 1);
 	de->de_dirent->d_namlen = namelen;
 	de->de_dirent->d_reclen = GENERIC_DIRSIZ(&d);
@@ -295,7 +295,7 @@ devfs_populate(struct devfs_mount *dm)
 	if (devfs_noverflow && dm->dm_overflow == NULL) {
 		i = devfs_noverflow * sizeof (struct devfs_dirent *);
 		MALLOC(dm->dm_overflow, struct devfs_dirent **, i,
-			M_DEVFS, M_WAITOK | M_ZERO);
+			M_DEVFS, M_ZERO);
 	}
 	while (dm->dm_generation != devfs_generation) {
 		dm->dm_generation = devfs_generation;
@@ -353,7 +353,7 @@ devfs_populate(struct devfs_mount *dm)
 				de->de_dirent->d_type = DT_LNK;
 				pdev = dev->si_parent;
 				j = strlen(pdev->si_name) + 1;
-				MALLOC(de->de_symlink, char *, j, M_DEVFS, M_WAITOK);
+				MALLOC(de->de_symlink, char *, j, M_DEVFS, 0);
 				bcopy(pdev->si_name, de->de_symlink, j);
 			} else {
 				de->de_inode = i;
diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c
index f9787d50116e..34dd32717a90 100644
--- a/sys/fs/devfs/devfs_rule.c
+++ b/sys/fs/devfs/devfs_rule.c
@@ -223,7 +223,7 @@ devfs_rules_ioctl(struct mount *mp, u_long cmd, caddr_t data, struct thread *td)
 			error = ESRCH;
 			goto out;
 		}
-		dk = malloc(sizeof(*dk), M_TEMP, M_WAITOK | M_ZERO);
+		dk = malloc(sizeof(*dk), M_TEMP, M_ZERO);
 		memcpy(&dk->dk_rule, dr, sizeof(*dr));
 		lockmgr(&dm->dm_lock, LK_UPGRADE, 0, td);
 		devfs_rule_applydm(dk, dm);
@@ -557,7 +557,7 @@ devfs_rule_insert(struct devfs_rule *dr)
 			return (error);
 	}
 
-	dk = malloc(sizeof(*dk), M_DEVFS, M_WAITOK);
+	dk = malloc(sizeof(*dk), M_DEVFS, 0);
 	dk->dk_ruleset = ds;
 	if (dsi != NULL)
 		++dsi->ds_refcount;
@@ -750,7 +750,7 @@ devfs_ruleset_create(devfs_rsnum rsnum)
 	KASSERT(devfs_ruleset_bynum(rsnum) == NULL,
 	    ("creating already existent ruleset %d", rsnum));
 
-	ds = malloc(sizeof(*ds), M_DEVFS, M_WAITOK | M_ZERO);
+	ds = malloc(sizeof(*ds), M_DEVFS, M_ZERO);
 	ds->ds_number = rsnum;
 	ds->ds_refcount = ds->ds_flags = 0;
 	SLIST_INIT(&ds->ds_rules);
diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c
index e74b4e9a217b..4c32ffaff9a0 100644
--- a/sys/fs/devfs/devfs_vfsops.c
+++ b/sys/fs/devfs/devfs_vfsops.c
@@ -78,10 +78,10 @@ devfs_nmount(mp, ndp, td)
 		return (EOPNOTSUPP);
 
 	MALLOC(fmp, struct devfs_mount *, sizeof(struct devfs_mount),
-	    M_DEVFS, M_WAITOK | M_ZERO);
+	    M_DEVFS, M_ZERO);
 	MALLOC(fmp->dm_dirent, struct devfs_dirent **,
 	    sizeof(struct devfs_dirent *) * NDEVFSINO,
-	    M_DEVFS, M_WAITOK | M_ZERO);
+	    M_DEVFS, M_ZERO);
 	lockinit(&fmp->dm_lock, PVFS, "devfs", 0, LK_NOPAUSE);
 
 	mp->mnt_flag |= MNT_LOCAL;
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index 6f466ad88428..16d40a36ede5 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -608,7 +608,7 @@ devfs_readdir(ap)
 	}
 	if( !error && ap->a_ncookies != NULL && ap->a_cookies != NULL ) {
 		MALLOC(cookiebuf, u_long *, ncookies * sizeof(u_long),
-                       M_TEMP, M_WAITOK);
+                       M_TEMP, 0);
 		cookiep = cookiebuf;
 		dps = (struct dirent *)((char *)uio->uio_iov->iov_base -
 		    (uio->uio_offset - oldoff));
@@ -859,7 +859,7 @@ devfs_symlink(ap)
 	de->de_inode = dmp->dm_inode++;
 	de->de_dirent->d_type = DT_LNK;
 	i = strlen(ap->a_target) + 1;
-	MALLOC(de->de_symlink, char *, i, M_DEVFS, M_WAITOK);
+	MALLOC(de->de_symlink, char *, i, M_DEVFS, 0);
 	bcopy(ap->a_target, de->de_symlink, i);
 	lockmgr(&dmp->dm_lock, LK_EXCLUSIVE, 0, curthread);
 #ifdef MAC
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index a4741bc3760c..18bff45d8c5a 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -89,7 +89,7 @@ fdesc_mount(mp, ndp, td)
 		return (error);
 
 	MALLOC(fmp, struct fdescmount *, sizeof(struct fdescmount),
-				M_FDESCMNT, M_WAITOK);	/* XXX */
+				M_FDESCMNT, 0);	/* XXX */
 	rvp->v_type = VDIR;
 	rvp->v_vflag |= VV_ROOT;
 	fmp->f_root = rvp;
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 2225220cfe1d..467066ba8067 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -132,7 +132,7 @@ loop:
 	 * might cause a bogus v_data pointer to get dereferenced
 	 * elsewhere if MALLOC should block.
 	 */
-	MALLOC(fd, struct fdescnode *, sizeof(struct fdescnode), M_TEMP, M_WAITOK);
+	MALLOC(fd, struct fdescnode *, sizeof(struct fdescnode), M_TEMP, 0);
 
 	error = getnewvnode("fdesc", mp, fdesc_vnodeop_p, vpp);
 	if (error) {
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 64fee388c93c..bb58afb637e0 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -174,7 +174,7 @@ fifo_open(ap)
 	int error;
 
 	if ((fip = vp->v_fifoinfo) == NULL) {
-		MALLOC(fip, struct fifoinfo *, sizeof(*fip), M_VNODE, M_WAITOK);
+		MALLOC(fip, struct fifoinfo *, sizeof(*fip), M_VNODE, 0);
 		vp->v_fifoinfo = fip;
 		error = socreate(AF_LOCAL, &rso, SOCK_STREAM, 0,
 		    ap->a_td->td_ucred, ap->a_td);
diff --git a/sys/fs/hpfs/hpfs_subr.c b/sys/fs/hpfs/hpfs_subr.c
index b45ebbd0a869..6d020cde1269 100644
--- a/sys/fs/hpfs/hpfs_subr.c
+++ b/sys/fs/hpfs/hpfs_subr.c
@@ -110,10 +110,10 @@ hpfs_bminit(
 	dprintf(("0x%lx data bands, ", hpmp->hpm_dbnum));
 
 	MALLOC(hpmp->hpm_bmind, lsn_t *, hpmp->hpm_dbnum * sizeof(lsn_t),
-		M_HPFSMNT, M_WAITOK);
+		M_HPFSMNT, 0);
 
 	MALLOC(hpmp->hpm_bitmap, u_int8_t *, hpmp->hpm_dbnum * BMSIZE,
-		M_HPFSMNT, M_WAITOK);
+		M_HPFSMNT, 0);
 
 	error = bread(hpmp->hpm_devvp, hpmp->hpm_su.su_bitmap.lsn1,
 		((hpmp->hpm_dbnum + 0x7F) & ~(0x7F)) << 2, NOCRED, &bp);
@@ -273,7 +273,7 @@ hpfs_cpinit (
 	cpicnt = hpmp->hpm_sp.sp_cpinum;
 
 	MALLOC(hpmp->hpm_cpdblk, struct cpdblk *,	
-		cpicnt * sizeof(struct cpdblk), M_HPFSMNT, M_WAITOK);
+		cpicnt * sizeof(struct cpdblk), M_HPFSMNT, 0);
 
 	cpdbp = hpmp->hpm_cpdblk;
 	lsn = hpmp->hpm_sp.sp_cpi;
diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c
index 1242e8419ce2..7244936607a7 100644
--- a/sys/fs/hpfs/hpfs_vfsops.c
+++ b/sys/fs/hpfs/hpfs_vfsops.c
@@ -252,7 +252,7 @@ hpfs_mountfs(devvp, mp, argsp, td)
 	/*
 	 * Do actual mount
 	 */
-	hpmp = malloc(sizeof(struct hpfsmount), M_HPFSMNT, M_WAITOK | M_ZERO);
+	hpmp = malloc(sizeof(struct hpfsmount), M_HPFSMNT, M_ZERO);
 
 	/* Read in SuperBlock */
 	error = bread(devvp, SUBLOCK, SUSIZE, NOCRED, &bp);
@@ -494,7 +494,7 @@ hpfs_vget(
 	 * check for it).
 	 */
 	MALLOC(hp, struct hpfsnode *, sizeof(struct hpfsnode), 
-		M_HPFSNO, M_WAITOK);
+		M_HPFSNO, 0);
 
 	error = getnewvnode("hpfs", hpmp->hpm_mp, hpfs_vnodeop_p, &vp);
 	if (error) {
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index 7d10096fce1a..d207c526021f 100644
--- a/sys/fs/hpfs/hpfs_vnops.c
+++ b/sys/fs/hpfs/hpfs_vnops.c
@@ -1038,7 +1038,7 @@ readdone:
 		     ((caddr_t)uio->uio_iov->iov_base -
 			 (uio->uio_offset - off));
 		MALLOC(cookies, u_long *, ncookies * sizeof(u_long),
-		       M_TEMP, M_WAITOK);
+		       M_TEMP, 0);
 		for (dp = dpStart, cookiep = cookies, i=0;
 		     i < ncookies;
 		     dp = (struct dirent *)((caddr_t) dp + dp->d_reclen), i++) {
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index 735e7dfebd57..a0da2c7bf878 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -246,7 +246,7 @@ deget(pmp, dirclust, diroffset, depp)
 	 * might cause a bogus v_data pointer to get dereferenced
 	 * elsewhere if MALLOC should block.
 	 */
-	MALLOC(ldep, struct denode *, sizeof(struct denode), M_MSDOSFSNODE, M_WAITOK);
+	MALLOC(ldep, struct denode *, sizeof(struct denode), M_MSDOSFSNODE, 0);
 
 	/*
 	 * Directory entry was not in cache, have to create a vnode and
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index b6ea5143c710..82b80434430b 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -349,7 +349,7 @@ mountmsdosfs(devvp, mp, td, argp)
 	}
 #endif
 
-	pmp = malloc(sizeof *pmp, M_MSDOSFSMNT, M_WAITOK | M_ZERO);
+	pmp = malloc(sizeof *pmp, M_MSDOSFSMNT, M_ZERO);
 	pmp->pm_mountp = mp;
 
 	/*
@@ -560,7 +560,7 @@ mountmsdosfs(devvp, mp, td, argp)
 	pmp->pm_inusemap = malloc(((pmp->pm_maxcluster + N_INUSEBITS - 1)
 				   / N_INUSEBITS)
 				  * sizeof(*pmp->pm_inusemap),
-				  M_MSDOSFSFAT, M_WAITOK);
+				  M_MSDOSFSFAT, 0);
 
 	/*
 	 * fillinusemap() needs pm_devvp.
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index a32692984cc1..0137920332eb 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1534,7 +1534,7 @@ msdosfs_readdir(ap)
 	if (ap->a_ncookies) {
 		ncookies = uio->uio_resid / 16;
 		MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP,
-		       M_WAITOK);
+		       0);
 		*ap->a_cookies = cookies;
 		*ap->a_ncookies = ncookies;
 	}
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c
index 20b98a540123..919fcff42a4b 100644
--- a/sys/fs/ntfs/ntfs_subr.c
+++ b/sys/fs/ntfs/ntfs_subr.c
@@ -187,7 +187,7 @@ ntfs_ntvattrget(
 	}
 	/* Scan $ATTRIBUTE_LIST for requested attribute */
 	len = lvap->va_datalen;
-	MALLOC(alpool, caddr_t, len, M_TEMP, M_WAITOK);
+	MALLOC(alpool, caddr_t, len, M_TEMP, 0);
 	error = ntfs_readntvattr_plain(ntmp, ip, lvap, 0, len, alpool, &len,
 			NULL);
 	if (error)
@@ -266,7 +266,7 @@ ntfs_loadntnode(
 	dprintf(("ntfs_loadntnode: loading ino: %d\n",ip->i_number));
 
 	MALLOC(mfrp, struct filerec *, ntfs_bntob(ntmp->ntm_bpmftrec),
-	       M_TEMP, M_WAITOK);
+	       M_TEMP, 0);
 
 	if (ip->i_number < NTFS_SYSNODESNUM) {
 		struct buf     *bp;
@@ -390,7 +390,7 @@ ntfs_ntlookup(
 	    NULL));
 
 	MALLOC(ip, struct ntnode *, sizeof(struct ntnode), M_NTFSNTNODE,
-		M_WAITOK | M_ZERO);
+		M_ZERO);
 	ddprintf(("ntfs_ntlookup: allocating ntnode: %d: %p\n", ino, ip));
 
 	/* Generic initialization */
@@ -539,7 +539,7 @@ ntfs_attrtontvattr(
 	*rvapp = NULL;
 
 	MALLOC(vap, struct ntvattr *, sizeof(struct ntvattr),
-		M_NTFSNTVATTR, M_WAITOK | M_ZERO);
+		M_NTFSNTVATTR, M_ZERO);
 	vap->va_ip = NULL;
 	vap->va_flag = rap->a_hdr.a_flag;
 	vap->va_type = rap->a_hdr.a_type;
@@ -576,7 +576,7 @@ ntfs_attrtontvattr(
 		vap->va_vcnstart = 0;
 		vap->va_vcnend = ntfs_btocn(vap->va_allocated);
 		MALLOC(vap->va_datap, caddr_t, vap->va_datalen,
-		       M_NTFSRDATA, M_WAITOK);
+		       M_NTFSRDATA, 0);
 		memcpy(vap->va_datap, (caddr_t) rap + rap->a_r.a_dataoff,
 		       rap->a_r.a_datalen);
 	}
@@ -617,8 +617,8 @@ ntfs_runtovrun(
 		off += (run[off] & 0xF) + ((run[off] >> 4) & 0xF) + 1;
 		cnt++;
 	}
-	MALLOC(cn, cn_t *, cnt * sizeof(cn_t), M_NTFSRUN, M_WAITOK);
-	MALLOC(cl, cn_t *, cnt * sizeof(cn_t), M_NTFSRUN, M_WAITOK);
+	MALLOC(cn, cn_t *, cnt * sizeof(cn_t), M_NTFSRUN, 0);
+	MALLOC(cl, cn_t *, cnt * sizeof(cn_t), M_NTFSRUN, 0);
 
 	off = 0;
 	cnt = 0;
@@ -738,13 +738,13 @@ ntfs_fget(
 		return (0);
 
 	MALLOC(fp, struct fnode *, sizeof(struct fnode), M_NTFSFNODE,
-		M_WAITOK | M_ZERO);
+		M_ZERO);
 	dprintf(("ntfs_fget: allocating fnode: %p\n",fp));
 
 	fp->f_ip = ip;
 	if (attrname) {
 		fp->f_flag |= FN_AATTRNAME;
-		MALLOC(fp->f_attrname, char *, strlen(attrname)+1, M_TEMP, M_WAITOK);
+		MALLOC(fp->f_attrname, char *, strlen(attrname)+1, M_TEMP, 0);
 		strcpy(fp->f_attrname, attrname);
 	} else
 		fp->f_attrname = NULL;
@@ -829,7 +829,7 @@ ntfs_ntlookupattr(
 
     out:
 	if (namelen) {
-		MALLOC((*attrname), char *, namelen, M_TEMP, M_WAITOK);
+		MALLOC((*attrname), char *, namelen, M_TEMP, 0);
 		memcpy((*attrname), name, namelen);
 		(*attrname)[namelen] = '\0';
 	}
@@ -894,7 +894,7 @@ ntfs_ntlookupfile(
 
 	dprintf(("ntfs_ntlookupfile: blksz: %d, rdsz: %d\n", blsize, rdsize));
 
-	MALLOC(rdbuf, caddr_t, blsize, M_TEMP, M_WAITOK);
+	MALLOC(rdbuf, caddr_t, blsize, M_TEMP, 0);
 
 	error = ntfs_readattr(ntmp, ip, NTFS_A_INDXROOT, "$I30",
 			       0, rdsize, rdbuf, NULL);
@@ -1112,7 +1112,7 @@ ntfs_ntreaddir(
 	if (fp->f_dirblbuf == NULL) {
 		fp->f_dirblsz = vap->va_a_iroot->ir_size;
 		MALLOC(fp->f_dirblbuf, caddr_t,
-		       max(vap->va_datalen,fp->f_dirblsz), M_NTFSDIR, M_WAITOK);
+		       max(vap->va_datalen,fp->f_dirblsz), M_NTFSDIR, 0);
 	}
 
 	blsize = fp->f_dirblsz;
@@ -1127,7 +1127,7 @@ ntfs_ntreaddir(
 			error = ENOTDIR;
 			goto fail;
 		}
-		MALLOC(bmp, u_char *, bmvap->va_datalen, M_TEMP, M_WAITOK);
+		MALLOC(bmp, u_char *, bmvap->va_datalen, M_TEMP, 0);
 		error = ntfs_readattr(ntmp, ip, NTFS_A_INDXBITMAP, "$I30", 0,
 				       bmvap->va_datalen, bmp, NULL);
 		if (error)
@@ -1708,9 +1708,9 @@ ntfs_readattr(
 			 vap->va_compressalg));
 
 		MALLOC(cup, u_int8_t *, ntfs_cntob(NTFS_COMPUNIT_CL),
-		       M_NTFSDECOMP, M_WAITOK);
+		       M_NTFSDECOMP, 0);
 		MALLOC(uup, u_int8_t *, ntfs_cntob(NTFS_COMPUNIT_CL),
-		       M_NTFSDECOMP, M_WAITOK);
+		       M_NTFSDECOMP, 0);
 
 		cn = (ntfs_btocn(roff)) & (~(NTFS_COMPUNIT_CL - 1));
 		off = roff - ntfs_cntob(cn);
@@ -1943,7 +1943,7 @@ ntfs_toupper_use(mp, ntmp)
 	 * so don't bother reading more
 	 */
 	MALLOC(ntfs_toupper_tab, wchar *, 65536 * sizeof(wchar),
-		M_NTFSRDATA, M_WAITOK);
+		M_NTFSRDATA, 0);
 
 	if ((error = VFS_VGET(mp, NTFS_UPCASEINO, LK_EXCLUSIVE, &vp)))
 		goto out;
@@ -1991,14 +1991,14 @@ ntfs_u28_init(
 	char ** u28;
 	int i, j, h, l;
 
-	MALLOC(u28, char **, 256 * sizeof(char*), M_TEMP, M_WAITOK | M_ZERO);
+	MALLOC(u28, char **, 256 * sizeof(char*), M_TEMP, M_ZERO);
 
 	for (i=0; i<256; i++) {
 		h = (u2w[i] >> 8) & 0xFF;
 		l = (u2w[i]) &0xFF;
 
 		if (u28[h] == NULL) {
-			MALLOC(u28[h], char *, 256 * sizeof(char), M_TEMP, M_WAITOK);
+			MALLOC(u28[h], char *, 256 * sizeof(char), M_TEMP, 0);
 			for (j=0; j<256; j++)
 				u28[h][j] = '_';
 		}
@@ -2039,7 +2039,7 @@ ntfs_82u_init(
 	wchar * _82u;
 	int i;
 
-	MALLOC(_82u, wchar *, 256 * sizeof(wchar), M_TEMP, M_WAITOK);
+	MALLOC(_82u, wchar *, 256 * sizeof(wchar), M_TEMP, 0);
 
 	if (u2w == NULL) {
 		for (i=0; i<256; i++)
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index 1e267a990ec9..7221e0b6b4bc 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -309,7 +309,7 @@ ntfs_mountfs(devvp, mp, argsp, td)
 	error = bread(devvp, BBLOCK, BBSIZE, NOCRED, &bp);
 	if (error)
 		goto out;
-	ntmp = malloc( sizeof *ntmp, M_NTFSMNT, M_WAITOK | M_ZERO);
+	ntmp = malloc( sizeof *ntmp, M_NTFSMNT, M_ZERO);
 	bcopy( bp->b_data, &ntmp->ntm_bootfile, sizeof(struct bootfile) );
 	brelse( bp );
 	bp = NULL;
@@ -415,7 +415,7 @@ ntfs_mountfs(devvp, mp, argsp, td)
 		/* Alloc memory for attribute definitions */
 		MALLOC(ntmp->ntm_ad, struct ntvattrdef *,
 			num * sizeof(struct ntvattrdef),
-			M_NTFSMNT, M_WAITOK);
+			M_NTFSMNT, 0);
 
 		ntmp->ntm_adnum = num;
 
@@ -562,7 +562,7 @@ ntfs_calccfree(
 
 	bmsize = VTOF(vp)->f_size;
 
-	MALLOC(tmp, u_int8_t *, bmsize, M_TEMP, M_WAITOK);
+	MALLOC(tmp, u_int8_t *, bmsize, M_TEMP, 0);
 
 	error = ntfs_readattr(ntmp, VTONT(vp), NTFS_A_DATA, NULL,
 			       0, bmsize, tmp, NULL);
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index 90ca4f1a8fa4..b39f0cb5a751 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -590,7 +590,7 @@ ntfs_readdir(ap)
 		     ((caddr_t)uio->uio_iov->iov_base -
 			 (uio->uio_offset - off));
 		MALLOC(cookies, u_long *, ncookies * sizeof(u_long),
-		       M_TEMP, M_WAITOK);
+		       M_TEMP, 0);
 		for (dp = dpStart, cookiep = cookies, i=0;
 		     i < ncookies;
 		     dp = (struct dirent *)((caddr_t) dp + dp->d_reclen), i++) {
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index f2a43e026264..0285add67787 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -212,7 +212,7 @@ null_nodeget(mp, lowervp, vpp)
 	 * elsewhere if MALLOC should block.
 	 */
 	MALLOC(xp, struct null_node *, sizeof(struct null_node),
-	    M_NULLFSNODE, M_WAITOK);
+	    M_NULLFSNODE, 0);
 
 	error = getnewvnode("null", mp, null_vnodeop_p, &vp);
 	if (error) {
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index d6ca21115f6d..20b187767d35 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -158,7 +158,7 @@ nullfs_mount(mp, ndp, td)
 	}
 
 	xmp = (struct null_mount *) malloc(sizeof(struct null_mount),
-				M_NULLFSMNT, M_WAITOK);	/* XXX */
+				M_NULLFSMNT, 0);	/* XXX */
 
 	/*
 	 * Save reference to underlying FS
diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c
index b92dd4c977cc..d8bdbc456cf3 100644
--- a/sys/fs/nwfs/nwfs_node.c
+++ b/sys/fs/nwfs/nwfs_node.c
@@ -169,7 +169,7 @@ rescan:
 	 * might cause a bogus v_data pointer to get dereferenced
 	 * elsewhere if MALLOC should block.
 	 */
-	MALLOC(np, struct nwnode *, sizeof *np, M_NWNODE, M_WAITOK | M_ZERO);
+	MALLOC(np, struct nwnode *, sizeof *np, M_NWNODE, M_ZERO);
 	error = getnewvnode("nwfs", mp, nwfs_vnodeop_p, &vp);
 	if (error) {
 		*vpp = NULL;
diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c
index f097b3e0173f..c033b1152e1c 100644
--- a/sys/fs/nwfs/nwfs_vfsops.c
+++ b/sys/fs/nwfs/nwfs_vfsops.c
@@ -125,7 +125,7 @@ nwfs_initnls(struct nwmount *nmp) {
 		nmp->m.nls.u2n = ncp_defnls.u2n;
 		return 0;
 	}
-	MALLOC(pe, char *, 256 * 4, M_NWFSDATA, M_WAITOK);
+	MALLOC(pe, char *, 256 * 4, M_NWFSDATA, 0);
 	pc = pe;
 	do {
 		COPY_TABLE(nmp->m.nls.to_lower, ncp_defnls.to_lower);
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 66e516d4ff0b..4c8c3f9472ec 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -113,10 +113,10 @@ portal_mount(mp, path, data, ndp, td)
 	}
 
 	MALLOC(pn, struct portalnode *, sizeof(struct portalnode),
-		M_TEMP, M_WAITOK);
+		M_TEMP, 0);
 
 	MALLOC(fmp, struct portalmount *, sizeof(struct portalmount),
-		M_PORTALFSMNT, M_WAITOK);	/* XXX */
+		M_PORTALFSMNT, 0);	/* XXX */
 
 	error = getnewvnode("portal", mp, portal_vnodeop_p, &rvp); /* XXX */
 	if (error) {
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index 0d8c06d3a0f1..f272e141fb0b 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -132,7 +132,7 @@ portal_lookup(ap)
 	 * elsewhere if MALLOC should block.
 	 */
 	MALLOC(pt, struct portalnode *, sizeof(struct portalnode),
-		M_TEMP, M_WAITOK);
+		M_TEMP, 0);
 
 	error = getnewvnode("portal", dvp->v_mount, portal_vnodeop_p, &fvp);
 	if (error) {
@@ -150,7 +150,7 @@ portal_lookup(ap)
 		size++;
 	cnp->cn_consume = size - cnp->cn_namelen;
 
-	pt->pt_arg = malloc(size+1, M_TEMP, M_WAITOK);
+	pt->pt_arg = malloc(size+1, M_TEMP, 0);
 	pt->pt_size = size+1;
 	bcopy(pname, pt->pt_arg, pt->pt_size);
 	pt->pt_fileid = portal_fileid++;
diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c
index 8297ef6af3f9..67b3fae96722 100644
--- a/sys/fs/pseudofs/pseudofs.c
+++ b/sys/fs/pseudofs/pseudofs.c
@@ -92,7 +92,7 @@ _pfs_fixup_dir(struct pfs_node *parent)
 	struct pfs_node *dir;
 
 	MALLOC(dir, struct pfs_node *, sizeof *dir,
-	    M_PFSNODES, M_WAITOK|M_ZERO);
+	    M_PFSNODES, M_ZERO);
 	dir->pn_name[0] = '.';
 	dir->pn_type = pfstype_this;
 
@@ -102,7 +102,7 @@ _pfs_fixup_dir(struct pfs_node *parent)
 	}
 
 	MALLOC(dir, struct pfs_node *, sizeof *dir,
-	    M_PFSNODES, M_WAITOK|M_ZERO);
+	    M_PFSNODES, M_ZERO);
 	dir->pn_name[0] = dir->pn_name[1] = '.';
 	dir->pn_type = pfstype_parent;
 
@@ -127,7 +127,7 @@ pfs_create_dir(struct pfs_node *parent, char *name,
 	    ("%s(): node name is too long", __func__));
 
 	MALLOC(dir, struct pfs_node *, sizeof *dir,
-	    M_PFSNODES, M_WAITOK|M_ZERO);
+	    M_PFSNODES, M_ZERO);
 	strcpy(dir->pn_name, name);
 	dir->pn_type = (flags & PFS_PROCDEP) ? pfstype_procdir : pfstype_dir;
 	dir->pn_attr = attr;
@@ -160,7 +160,7 @@ pfs_create_file(struct pfs_node *parent, char *name, pfs_fill_t fill,
 	    ("%s(): node name is too long", __func__));
 
 	MALLOC(node, struct pfs_node *, sizeof *node,
-	    M_PFSNODES, M_WAITOK|M_ZERO);
+	    M_PFSNODES, M_ZERO);
 	strcpy(node->pn_name, name);
 	node->pn_type = pfstype_file;
 	node->pn_func = fill;
@@ -320,7 +320,7 @@ pfs_init(struct pfs_info *pi, struct vfsconf *vfc)
 
 	/* set up the root diretory */
 	MALLOC(root, struct pfs_node *, sizeof *root,
-	    M_PFSNODES, M_WAITOK|M_ZERO);
+	    M_PFSNODES, M_ZERO);
 	root->pn_type = pfstype_root;
 	root->pn_name[0] = '/';
 	root->pn_info = pi;
diff --git a/sys/fs/pseudofs/pseudofs_fileno.c b/sys/fs/pseudofs/pseudofs_fileno.c
index 4341e236fa9a..0ca164027e48 100644
--- a/sys/fs/pseudofs/pseudofs_fileno.c
+++ b/sys/fs/pseudofs/pseudofs_fileno.c
@@ -82,7 +82,7 @@ pfs_fileno_init(struct pfs_info *pi)
 	struct pfs_bitmap *pb;
 
 	MALLOC(pb, struct pfs_bitmap *, sizeof *pb,
-	    M_PFSFILENO, M_WAITOK|M_ZERO);
+	    M_PFSFILENO, M_ZERO);
 
 	mtx_lock(&pi->pi_mutex);
 
@@ -144,7 +144,7 @@ pfs_get_fileno(struct pfs_info *pi)
 	if (pb == NULL) {
 		mtx_unlock(&pi->pi_mutex);
 		MALLOC(pb, struct pfs_bitmap *, sizeof *pb,
-		    M_PFSFILENO, M_WAITOK|M_ZERO);
+		    M_PFSFILENO, M_ZERO);
 		mtx_lock(&pi->pi_mutex);
 		/* protect against possible race */
 		while (ppb->pb_next)
diff --git a/sys/fs/pseudofs/pseudofs_vncache.c b/sys/fs/pseudofs/pseudofs_vncache.c
index 76fdf3ee8cf8..a1be1f1d174c 100644
--- a/sys/fs/pseudofs/pseudofs_vncache.c
+++ b/sys/fs/pseudofs/pseudofs_vncache.c
@@ -132,7 +132,7 @@ pfs_vncache_alloc(struct mount *mp, struct vnode **vpp,
 	++pfs_vncache_misses;
 
 	/* nope, get a new one */
-	MALLOC(pvd, struct pfs_vdata *, sizeof *pvd, M_PFSVNCACHE, M_WAITOK);
+	MALLOC(pvd, struct pfs_vdata *, sizeof *pvd, M_PFSVNCACHE, 0);
 	if (++pfs_vncache_entries > pfs_vncache_maxentries)
 		pfs_vncache_maxentries = pfs_vncache_entries;
 	error = getnewvnode("pseudofs", mp, pfs_vnodeop_p, vpp);
diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c
index 093e7ca423d8..f4c3c039b0f8 100644
--- a/sys/fs/smbfs/smbfs_node.c
+++ b/sys/fs/smbfs/smbfs_node.c
@@ -114,7 +114,7 @@ smbfs_name_alloc(const u_char *name, int nmlen)
 
 	nmlen++;
 #ifdef SMBFS_NAME_DEBUG
-	cp = malloc(nmlen + 2 + sizeof(int), M_SMBNODENAME, M_WAITOK);
+	cp = malloc(nmlen + 2 + sizeof(int), M_SMBNODENAME, 0);
 	*(int*)cp = nmlen;
 	cp += sizeof(int);
 	cp[0] = 0xfc;
@@ -122,7 +122,7 @@ smbfs_name_alloc(const u_char *name, int nmlen)
 	bcopy(name, cp, nmlen - 1);
 	cp[nmlen] = 0xfe;
 #else
-	cp = malloc(nmlen, M_SMBNODENAME, M_WAITOK);
+	cp = malloc(nmlen, M_SMBNODENAME, 0);
 	bcopy(name, cp, nmlen - 1);
 #endif
 	cp[nmlen - 1] = 0;
@@ -219,7 +219,7 @@ loop:
 	if (fap == NULL)
 		return ENOENT;
 
-	MALLOC(np, struct smbnode *, sizeof *np, M_SMBNODE, M_WAITOK);
+	MALLOC(np, struct smbnode *, sizeof *np, M_SMBNODE, 0);
 	error = getnewvnode("smbfs", mp, smbfs_vnodeop_p, &vp);
 	if (error) {
 		FREE(np, M_SMBNODE);
diff --git a/sys/fs/smbfs/smbfs_smb.c b/sys/fs/smbfs/smbfs_smb.c
index 034fc7725b7f..59a5691f7a4b 100644
--- a/sys/fs/smbfs/smbfs_smb.c
+++ b/sys/fs/smbfs/smbfs_smb.c
@@ -1264,7 +1264,7 @@ static int
 smbfs_findopenLM2(struct smbfs_fctx *ctx, struct smbnode *dnp,
 	const char *wildcard, int wclen, int attr, struct smb_cred *scred)
 {
-	ctx->f_name = malloc(SMB_MAXFNAMELEN, M_SMBFSDATA, M_WAITOK);
+	ctx->f_name = malloc(SMB_MAXFNAMELEN, M_SMBFSDATA, 0);
 	if (ctx->f_name == NULL)
 		return ENOMEM;
 	ctx->f_infolevel = SMB_DIALECT(SSTOVC(ctx->f_ssp)) < SMB_DIALECT_NTLM0_12 ?
@@ -1371,7 +1371,7 @@ smbfs_findnextLM2(struct smbfs_fctx *ctx, int limit)
 		if (ctx->f_rnamelen <= nmlen) {
 			if (ctx->f_rname)
 				free(ctx->f_rname, M_SMBFSDATA);
-			ctx->f_rname = malloc(nmlen + 1, M_SMBFSDATA, M_WAITOK);
+			ctx->f_rname = malloc(nmlen + 1, M_SMBFSDATA, 0);
 			ctx->f_rnamelen = nmlen;
 		}
 		bcopy(ctx->f_name, ctx->f_rname, nmlen);
@@ -1404,7 +1404,7 @@ smbfs_findopen(struct smbnode *dnp, const char *wildcard, int wclen, int attr,
 	struct smbfs_fctx *ctx;
 	int error;
 
-	ctx = malloc(sizeof(*ctx), M_SMBFSDATA, M_WAITOK);
+	ctx = malloc(sizeof(*ctx), M_SMBFSDATA, 0);
 	if (ctx == NULL)
 		return ENOMEM;
 	bzero(ctx, sizeof(*ctx));
diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c
index b41b86bfc24b..2e7df0a1ee23 100644
--- a/sys/fs/udf/udf_vfsops.c
+++ b/sys/fs/udf/udf_vfsops.c
@@ -562,7 +562,7 @@ udf_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp)
 	 * Allocate memory and check the tag id's before grabbing a new
 	 * vnode, since it's hard to roll back if there is a problem.
 	 */
-	unode = uma_zalloc(udf_zone_node, M_WAITOK);
+	unode = uma_zalloc(udf_zone_node, 0);
 	if (unode == NULL) {
 		printf("Cannot allocate udf node\n");
 		return (ENOMEM);
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index 8d9be5790aa3..f6d5fd220828 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -449,7 +449,7 @@ udf_transname(char *cs0string, char *destname, int len)
 	int i, unilen = 0;
 
 	/* allocate a buffer big enough to hold an 8->16 bit expansion */
-	transname = uma_zalloc(udf_zone_trans, M_WAITOK);
+	transname = uma_zalloc(udf_zone_trans, 0);
 
 	if ((unilen = udf_UncompressUnicode(len, cs0string, transname)) == -1) {
 		printf("udf: Unicode translation failed\n");
@@ -486,7 +486,7 @@ udf_cmpname(char *cs0string, char *cmpname, int cs0len, int cmplen)
 	int error = 0;
 
 	/* This is overkill, but not worth creating a new zone */
-	transname = uma_zalloc(udf_zone_trans, M_WAITOK);
+	transname = uma_zalloc(udf_zone_trans, 0);
 
 	cs0len = udf_transname(cs0string, transname, cs0len);
 
@@ -532,7 +532,7 @@ udf_opendir(struct udf_node *node, int offset, int fsize, struct udf_mnt *udfmp)
 {
 	struct udf_dirstream *ds;
 
-	ds = uma_zalloc(udf_zone_ds, M_WAITOK | M_ZERO);
+	ds = uma_zalloc(udf_zone_ds, M_ZERO);
 
 	ds->node = node;
 	ds->offset = offset;
@@ -597,7 +597,7 @@ udf_getfid(struct udf_dirstream *ds)
 		 * logical sector in size.
 		 */
 		MALLOC(ds->buf, uint8_t*, ds->udfmp->bsize, M_UDFFID,
-		     M_WAITOK | M_ZERO);
+		     M_ZERO);
 		bcopy(fid, ds->buf, frag_size);
 
 		/* Reduce all of the casting magic */
@@ -697,7 +697,7 @@ udf_readdir(struct vop_readdir_args *a)
 		 */
 		ncookies = uio->uio_resid / 8;
 		MALLOC(cookies, u_long *, sizeof(u_long) * ncookies,
-		    M_TEMP, M_WAITOK);
+		    M_TEMP, 0);
 		if (cookies == NULL)
 			return (ENOMEM);
 		uiodir.ncookies = ncookies;
diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index d3fed34602e6..e33adb61f80a 100644
--- a/sys/fs/umapfs/umap_subr.c
+++ b/sys/fs/umapfs/umap_subr.c
@@ -210,7 +210,7 @@ umap_node_alloc(mp, lowervp, vpp)
 	 * elsewhere if MALLOC should block.
 	 */
 	MALLOC(xp, struct umap_node *, sizeof(struct umap_node),
-	    M_TEMP, M_WAITOK);
+	    M_TEMP, 0);
 
 	error = getnewvnode("umap", mp, umap_vnodeop_p, vpp);
 	if (error) {
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index c1ed75108e37..b148c73bdd56 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -155,7 +155,7 @@ umapfs_mount(mp, path, data, ndp, td)
 #endif
 
 	amp = (struct umap_mount *) malloc(sizeof(struct umap_mount),
-				M_UMAPFSMNT, M_WAITOK);	/* XXX */
+				M_UMAPFSMNT, 0);	/* XXX */
 
 	/*
 	 * Save reference to underlying FS
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index e08b70a1ee96..b645265b671b 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -509,7 +509,7 @@ loop:
 			union_newlower(un, lowervp);
 			if (cnp && (lowervp != NULLVP)) {
 				un->un_path = malloc(cnp->cn_namelen+1,
-						M_TEMP, M_WAITOK);
+						M_TEMP, 0);
 				bcopy(cnp->cn_nameptr, un->un_path,
 						cnp->cn_namelen);
 				un->un_path[cnp->cn_namelen] = '\0';
@@ -564,7 +564,7 @@ loop:
 	}
 
 	MALLOC((*vpp)->v_data, void *, sizeof(struct union_node),
-		M_TEMP, M_WAITOK);
+		M_TEMP, 0);
 
 	ASSERT_VOP_LOCKED(*vpp, "union_allocvp");
 	(*vpp)->v_vflag |= vflag;
@@ -591,7 +591,7 @@ loop:
 	un->un_openl = 0;
 
 	if (cnp && (lowervp != NULLVP)) {
-		un->un_path = malloc(cnp->cn_namelen+1, M_TEMP, M_WAITOK);
+		un->un_path = malloc(cnp->cn_namelen+1, M_TEMP, 0);
 		bcopy(cnp->cn_nameptr, un->un_path, cnp->cn_namelen);
 		un->un_path[cnp->cn_namelen] = '\0';
 	} else {
@@ -686,7 +686,7 @@ union_copyfile(fvp, tvp, cred, td)
 	VOP_LEASE(fvp, td, cred, LEASE_READ);
 	VOP_LEASE(tvp, td, cred, LEASE_WRITE);
 
-	buf = malloc(MAXBSIZE, M_TEMP, M_WAITOK);
+	buf = malloc(MAXBSIZE, M_TEMP, 0);
 
 	/* ugly loop follows... */
 	do {
@@ -858,7 +858,7 @@ union_relookup(um, dvp, vpp, cnp, cn, path, pathlen)
 	 * Conclusion: Horrible.
 	 */
 	cn->cn_namelen = pathlen;
-	cn->cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
+	cn->cn_pnbuf = uma_zalloc(namei_zone, 0);
 	bcopy(path, cn->cn_pnbuf, cn->cn_namelen);
 	cn->cn_pnbuf[cn->cn_namelen] = '\0';
 
@@ -1068,7 +1068,7 @@ union_vn_create(vpp, un, td)
 	 * copied in the first place).
 	 */
 	cn.cn_namelen = strlen(un->un_path);
-	cn.cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
+	cn.cn_pnbuf = uma_zalloc(namei_zone, 0);
 	bcopy(un->un_path, cn.cn_pnbuf, cn.cn_namelen+1);
 	cn.cn_nameiop = CREATE;
 	cn.cn_flags = (LOCKPARENT|LOCKLEAF|HASBUF|SAVENAME|ISLASTCN);
@@ -1260,7 +1260,7 @@ union_dircache(vp, td)
 		union_dircache_r(vp, 0, &cnt);
 		cnt++;
 		dircache = malloc(cnt * sizeof(struct vnode *),
-				M_TEMP, M_WAITOK);
+				M_TEMP, 0);
 		vpp = dircache;
 		union_dircache_r(vp, &vpp, &cnt);
 		*vpp = NULLVP;
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 637b35077f0d..505c5da32594 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -194,7 +194,7 @@ union_mount(mp, ndp, td)
 	 */
 
 	um = (struct union_mount *) malloc(sizeof(struct union_mount),
-				M_UNIONFSMNT, M_WAITOK | M_ZERO);
+				M_UNIONFSMNT, M_ZERO);
 
 	um->um_op = op;
 
diff --git a/sys/geom/bde/g_bde.c b/sys/geom/bde/g_bde.c
index a3ae631a015e..b147a9cae564 100644
--- a/sys/geom/bde/g_bde.c
+++ b/sys/geom/bde/g_bde.c
@@ -212,7 +212,7 @@ g_bde_config(struct g_configargs *ga)
 	while (1) {
 		sectorsize = cp->provider->sectorsize;
 		mediasize = cp->provider->mediasize;
-		sc = g_malloc(sizeof(struct g_bde_softc), M_WAITOK | M_ZERO);
+		sc = g_malloc(sizeof(struct g_bde_softc), M_ZERO);
 		gp->softc = sc;
 		sc->geom = gp;
 		sc->consumer = cp;
diff --git a/sys/geom/geom_aes.c b/sys/geom/geom_aes.c
index 72f0d3dcc56f..5471cbf6c142 100644
--- a/sys/geom/geom_aes.c
+++ b/sys/geom/geom_aes.c
@@ -148,7 +148,7 @@ g_aes_read_done(struct bio *bp)
 
 	gp = bp->bio_from->geom;
 	sc = gp->softc;
-	sb = g_malloc(sc->sectorsize, M_WAITOK);
+	sb = g_malloc(sc->sectorsize, 0);
 	b = bp->bio_data;
 	e = bp->bio_data;
 	e += bp->bio_length;
@@ -211,7 +211,7 @@ g_aes_start(struct bio *bp)
 		}
 		bp2->bio_done = g_aes_write_done;
 		bp2->bio_offset += sc->sectorsize;
-		bp2->bio_data = g_malloc(bp->bio_length, M_WAITOK);
+		bp2->bio_data = g_malloc(bp->bio_length, 0);
 		b = bp->bio_data;
 		e = bp->bio_data;
 		e += bp->bio_length;
@@ -322,7 +322,7 @@ g_aes_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 		if (buf == NULL || error != 0) {
 			break;
 		}
-		sc = g_malloc(sizeof(struct g_aes_softc), M_WAITOK | M_ZERO);
+		sc = g_malloc(sizeof(struct g_aes_softc), M_ZERO);
 		if (!memcmp(buf, aes_magic, strlen(aes_magic))) {
 			sc->keying = KEY_ZERO;
 		} else if (!memcmp(buf, aes_magic_random, 
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index 103a54b13068..75694202d50d 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -206,7 +206,7 @@ ccdnew(int unit)
 	if (IS_ALLOCATED(unit) || unit > 32)
 		return (NULL);
 
-	MALLOC(sc, struct ccd_s *, sizeof(*sc), M_CCD, M_WAITOK | M_ZERO);
+	MALLOC(sc, struct ccd_s *, sizeof(*sc), M_CCD, M_ZERO);
 	sc->sc_unit = unit;
 	LIST_INSERT_HEAD(&ccd_softc_list, sc, list);
 	/* XXX: UNLOCK(unique unit numbers) */
@@ -283,7 +283,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 
 	/* Allocate space for the component info. */
 	cs->sc_cinfo = malloc(cs->sc_nccdisks * sizeof(struct ccdcinfo),
-	    M_CCD, M_WAITOK);
+	    M_CCD, 0);
 
 	/*
 	 * Verify that each component piece exists and record
@@ -291,7 +291,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 	 */
 	maxsecsize = 0;
 	minsize = 0;
-	tmppath = malloc(MAXPATHLEN, M_CCD, M_WAITOK);
+	tmppath = malloc(MAXPATHLEN, M_CCD, 0);
 	for (ix = 0; ix < cs->sc_nccdisks; ix++) {
 		vp = cs->sc_vpp[ix];
 		ci = &cs->sc_cinfo[ix];
@@ -304,7 +304,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 		    MAXPATHLEN, &ci->ci_pathlen)) != 0) {
 			goto fail;
 		}
-		ci->ci_path = malloc(ci->ci_pathlen, M_CCD, M_WAITOK);
+		ci->ci_path = malloc(ci->ci_pathlen, M_CCD, 0);
 		bcopy(tmppath, ci->ci_path, ci->ci_pathlen);
 
 		ci->ci_dev = vn_todev(vp);
@@ -459,7 +459,7 @@ ccdinterleave(struct ccd_s *cs, int unit)
 	 */
 	size = (cs->sc_nccdisks + 1) * sizeof(struct ccdiinfo);
 	cs->sc_itable = (struct ccdiinfo *)malloc(size, M_CCD,
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 
 	/*
 	 * Trivial case: no interleave (actually interleave of disk size).
@@ -473,7 +473,7 @@ ccdinterleave(struct ccd_s *cs, int unit)
 
 		for (ix = 0; ix < cs->sc_nccdisks; ix++) {
 			/* Allocate space for ii_index. */
-			ii->ii_index = malloc(sizeof(int), M_CCD, M_WAITOK);
+			ii->ii_index = malloc(sizeof(int), M_CCD, 0);
 			ii->ii_ndisk = 1;
 			ii->ii_startblk = bn;
 			ii->ii_startoff = 0;
@@ -496,7 +496,7 @@ ccdinterleave(struct ccd_s *cs, int unit)
 		 * we use.
 		 */
 		ii->ii_index = malloc((sizeof(int) * cs->sc_nccdisks),
-		    M_CCD, M_WAITOK);
+		    M_CCD, 0);
 
 		/*
 		 * Locate the smallest of the remaining components
@@ -1107,9 +1107,9 @@ ccdioctltoo(int unit, u_long cmd, caddr_t data, int flag, struct thread *td)
 		 * componet pathnames and device numbers.
 		 */
 		cpp = malloc(ccio->ccio_ndisks * sizeof(char *),
-		    M_CCD, M_WAITOK);
+		    M_CCD, 0);
 		vpp = malloc(ccio->ccio_ndisks * sizeof(struct vnode *),
-		    M_CCD, M_WAITOK);
+		    M_CCD, 0);
 
 		error = copyin((caddr_t)ccio->ccio_disks, (caddr_t)cpp,
 		    ccio->ccio_ndisks * sizeof(char **));
@@ -1164,7 +1164,7 @@ ccdioctltoo(int unit, u_long cmd, caddr_t data, int flag, struct thread *td)
 		 */
 		ccio->ccio_unit = unit;
 		ccio->ccio_size = cs->sc_size;
-		cs->sc_disk = malloc(sizeof(struct disk), M_CCD, M_WAITOK);
+		cs->sc_disk = malloc(sizeof(struct disk), M_CCD, 0);
 		cs->sc_dev = disk_create(unit, cs->sc_disk, 0,
 		    &ccd_cdevsw, &ccddisk_cdevsw);
 		cs->sc_dev->si_drv1 = cs;
diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c
index 48bac226f5ad..b3cd33185fcf 100644
--- a/sys/geom/geom_ctl.c
+++ b/sys/geom/geom_ctl.c
@@ -174,7 +174,7 @@ g_ctl_ioctl_configgeom(dev_t dev, u_long cmd, caddr_t data, int fflag, struct th
 	else if (gcp->len == 0) {
 		ga.ptr = NULL;
 	} else {
-		ga.ptr = g_malloc(gcp->len, M_WAITOK);
+		ga.ptr = g_malloc(gcp->len, 0);
 		error = copyin(gcp->ptr, ga.ptr, gcp->len);
 		if (error) {
 			g_free(ga.ptr);
diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c
index fd2b44dd3d35..36634e206638 100644
--- a/sys/geom/geom_dev.c
+++ b/sys/geom/geom_dev.c
@@ -302,7 +302,7 @@ g_dev_ioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct thread *td)
 		break;
 
 	default:
-		gio = g_malloc(sizeof *gio, M_WAITOK | M_ZERO);
+		gio = g_malloc(sizeof *gio, M_ZERO);
 		gio->cmd = cmd;
 		gio->data = data;
 		gio->fflag = fflag;
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 4c219a1825c1..05a052f0a67e 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -250,7 +250,7 @@ disk_create(int unit, struct disk *dp, int flags, struct cdevsw *cdevsw, struct
 {
 	dev_t dev;
 
-	dev = g_malloc(sizeof *dev, M_WAITOK | M_ZERO);
+	dev = g_malloc(sizeof *dev, M_ZERO);
 	dp->d_dev = dev;
 	dp->d_devsw = cdevsw;
 	dev->si_devsw = cdevsw;
diff --git a/sys/geom/geom_event.c b/sys/geom/geom_event.c
index 1b657e91a1c0..228bc065fcb2 100644
--- a/sys/geom/geom_event.c
+++ b/sys/geom/geom_event.c
@@ -266,7 +266,7 @@ g_post_event(enum g_events ev, struct g_class *mp, struct g_geom *gp, struct g_p
 	g_trace(G_T_TOPOLOGY, "g_post_event(%d, %p, %p, %p, %p)",
 	    ev, mp, gp, pp, cp);
 	g_topology_assert();
-	ep = g_malloc(sizeof *ep, M_WAITOK | M_ZERO);
+	ep = g_malloc(sizeof *ep, M_ZERO);
 	ep->event = ev;
 	if (mp != NULL) {
 		ep->class = mp;
diff --git a/sys/geom/geom_gpt.c b/sys/geom/geom_gpt.c
index 6b046c449809..a54d9a28439b 100644
--- a/sys/geom/geom_gpt.c
+++ b/sys/geom/geom_gpt.c
@@ -220,7 +220,7 @@ g_gpt_taste(struct g_class *mp, struct g_provider *pp, int insist)
 			ent = (void*)(buf + i * hdr->hdr_entsz);
 			if (!memcmp(&ent->ent_type, &unused, sizeof(unused)))
 				continue;
-			gs->part[i] = g_malloc(hdr->hdr_entsz, M_WAITOK);
+			gs->part[i] = g_malloc(hdr->hdr_entsz, 0);
 			if (gs->part[i] == NULL)
 				break;
 			bcopy(ent, gs->part[i], hdr->hdr_entsz);
diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c
index dfc490c263c6..8309a24829c4 100644
--- a/sys/geom/geom_io.c
+++ b/sys/geom/geom_io.c
@@ -390,7 +390,7 @@ g_read_data(struct g_consumer *cp, off_t offset, off_t length, int *error)
 	bp->bio_done = NULL;
 	bp->bio_offset = offset;
 	bp->bio_length = length;
-	ptr = g_malloc(length, M_WAITOK);
+	ptr = g_malloc(length, 0);
 	bp->bio_data = ptr;
 	g_io_request(bp, cp);
 	errorc = biowait(bp, "gread");
diff --git a/sys/geom/geom_mirror.c b/sys/geom/geom_mirror.c
index 23e2f5244023..db426cda2a8c 100644
--- a/sys/geom/geom_mirror.c
+++ b/sys/geom/geom_mirror.c
@@ -214,7 +214,7 @@ g_mirror_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 			g_topology_unlock();
 			break;
 		}
-		gp->softc = g_malloc(sizeof(struct g_mirror_softc), M_WAITOK);
+		gp->softc = g_malloc(sizeof(struct g_mirror_softc), 0);
 		sc = gp->softc;
 		memcpy(sc->magic, buf + 16, sizeof sc->magic);
 		g_topology_lock();
diff --git a/sys/geom/geom_slice.c b/sys/geom/geom_slice.c
index c097e7f0a694..e5aaf0f5fa5f 100644
--- a/sys/geom/geom_slice.c
+++ b/sys/geom/geom_slice.c
@@ -71,10 +71,10 @@ g_slice_init(unsigned nslice, unsigned scsize)
 {
 	struct g_slicer *gsp;
 
-	gsp = g_malloc(sizeof *gsp, M_WAITOK | M_ZERO);
-	gsp->softc = g_malloc(scsize, M_WAITOK | M_ZERO);
+	gsp = g_malloc(sizeof *gsp, M_ZERO);
+	gsp->softc = g_malloc(scsize, M_ZERO);
 	gsp->slices = g_malloc(nslice * sizeof(struct g_slice),
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 	gsp->nslice = nslice;
 	return (gsp);
 }
@@ -371,7 +371,7 @@ g_slice_conf_hot(struct g_geom *gp, u_int idx, off_t offset, off_t length)
 	gsp = gp->softc;
 	gsl = gsp->hot;
 	if(idx >= gsp->nhot) {
-		gsl2 = g_malloc((idx + 1) * sizeof *gsl2, M_WAITOK | M_ZERO);
+		gsl2 = g_malloc((idx + 1) * sizeof *gsl2, M_ZERO);
 		if (gsp->hot != NULL)
 			bcopy(gsp->hot, gsl2, gsp->nhot * sizeof *gsl2);
 		gsp->hot = gsl2;
diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c
index 954c616b4b82..7c1c4c1a5640 100644
--- a/sys/geom/geom_subr.c
+++ b/sys/geom/geom_subr.c
@@ -99,9 +99,9 @@ g_new_geomf(struct g_class *mp, const char *fmt, ...)
 	sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
 	sbuf_vprintf(sb, fmt, ap);
 	sbuf_finish(sb);
-	gp = g_malloc(sizeof *gp, M_WAITOK | M_ZERO);
+	gp = g_malloc(sizeof *gp, M_ZERO);
 	gp->protect = 0x020016601;
-	gp->name = g_malloc(sbuf_len(sb) + 1, M_WAITOK | M_ZERO);
+	gp->name = g_malloc(sbuf_len(sb) + 1, M_ZERO);
 	gp->class = mp;
 	gp->rank = 1;
 	LIST_INIT(&gp->consumer);
@@ -142,7 +142,7 @@ g_new_consumer(struct g_geom *gp)
 	    ("g_new_consumer on geom(%s) (class %s) without orphan",
 	    gp->name, gp->class->name));
 
-	cp = g_malloc(sizeof *cp, M_WAITOK | M_ZERO);
+	cp = g_malloc(sizeof *cp, M_ZERO);
 	cp->protect = 0x020016602;
 	cp->geom = gp;
 	LIST_INSERT_HEAD(&gp->consumer, cp, consumer);
@@ -176,7 +176,7 @@ g_new_providerf(struct g_geom *gp, const char *fmt, ...)
 	sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
 	sbuf_vprintf(sb, fmt, ap);
 	sbuf_finish(sb);
-	pp = g_malloc(sizeof *pp + sbuf_len(sb) + 1, M_WAITOK | M_ZERO);
+	pp = g_malloc(sizeof *pp + sbuf_len(sb) + 1, M_ZERO);
 	pp->protect = 0x020016603;
 	pp->name = (char *)(pp + 1);
 	strcpy(pp->name, sbuf_data(sb));
@@ -675,7 +675,7 @@ g_idclass(struct geomidorname *p)
 				return (mp);
 		return (NULL);
 	}
-	n = g_malloc(p->len + 1, M_WAITOK);
+	n = g_malloc(p->len + 1, 0);
 	if (copyin(p->u.name, n, p->len) == 0) {
 		n[p->len] = '\0';
 		LIST_FOREACH(mp, &g_classes, class)
@@ -702,7 +702,7 @@ g_idgeom(struct geomidorname *p)
 					return (gp);
 		return (NULL);
 	}
-	n = g_malloc(p->len + 1, M_WAITOK);
+	n = g_malloc(p->len + 1, 0);
 	if (copyin(p->u.name, n, p->len) == 0) {
 		n[p->len] = '\0';
 		LIST_FOREACH(mp, &g_classes, class)
@@ -732,7 +732,7 @@ g_idprovider(struct geomidorname *p)
 						return (pp);
 		return (NULL);
 	}
-	n = g_malloc(p->len + 1, M_WAITOK);
+	n = g_malloc(p->len + 1, 0);
 	if (copyin(p->u.name, n, p->len) == 0) {
 		n[p->len] = '\0';
 		LIST_FOREACH(mp, &g_classes, class)
diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c
index fc14dba51817..66737619b96b 100644
--- a/sys/gnu/ext2fs/ext2_inode.c
+++ b/sys/gnu/ext2fs/ext2_inode.c
@@ -414,7 +414,7 @@ ext2_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
 	}
 
 	bap = (int32_t *)bp->b_data;
-	MALLOC(copy, int32_t *, fs->s_blocksize, M_TEMP, M_WAITOK);
+	MALLOC(copy, int32_t *, fs->s_blocksize, M_TEMP, 0);
 	bcopy((caddr_t)bap, (caddr_t)copy, (u_int)fs->s_blocksize);
 	bzero((caddr_t)&bap[last + 1],
 	  (u_int)(NINDIR(fs) - (last + 1)) * sizeof (int32_t));
diff --git a/sys/gnu/ext2fs/ext2_lookup.c b/sys/gnu/ext2fs/ext2_lookup.c
index 49caccfb8684..c11aa5af4d23 100644
--- a/sys/gnu/ext2fs/ext2_lookup.c
+++ b/sys/gnu/ext2fs/ext2_lookup.c
@@ -181,7 +181,7 @@ ext2_readdir(ap)
 	auio.uio_resid = count;
 	auio.uio_segflg = UIO_SYSSPACE;
 	aiov.iov_len = count;
-	MALLOC(dirbuf, caddr_t, count, M_TEMP, M_WAITOK);
+	MALLOC(dirbuf, caddr_t, count, M_TEMP, 0);
 	aiov.iov_base = dirbuf;
 	error = VOP_READ(ap->a_vp, &auio, 0, ap->a_cred);
 	if (error == 0) {
@@ -243,7 +243,7 @@ ext2_readdir(ap)
 			if (uio->uio_segflg != UIO_SYSSPACE || uio->uio_iovcnt != 1)
 				panic("ext2fs_readdir: unexpected uio from NFS server");
 			MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP,
-			       M_WAITOK);
+			       0);
 			off = startoffset;
 			for (dp = (struct ext2_dir_entry_2 *)dirbuf,
 			     cookiep = cookies, ecookies = cookies + ncookies;
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index d91a92ea0d8f..d281ddb9a279 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -135,7 +135,7 @@ ext2_mountroot()
 		printf("ext2_mountroot: can't find rootvp\n");
 		return (error);
 	}
-	mp = bsd_malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK);
+	mp = bsd_malloc((u_long)sizeof(struct mount), M_MOUNT, 0);
 	bzero((char *)mp, (u_long)sizeof(struct mount));
 	TAILQ_INIT(&mp->mnt_nvnodelist);
 	TAILQ_INIT(&mp->mnt_reservedvnlist);
@@ -473,7 +473,7 @@ static int compute_sb_data(devvp, es, fs)
     V(s_db_per_group)
 
     fs->s_group_desc = bsd_malloc(db_count * sizeof (struct buf *),
-		M_EXT2MNT, M_WAITOK);
+		M_EXT2MNT, 0);
 
     /* adjust logic_sb_block */
     if(fs->s_blocksize > SBSIZE) 
@@ -683,16 +683,16 @@ ext2_mountfs(devvp, mp, td)
 			goto out;
 		}
 	}
-	ump = bsd_malloc(sizeof *ump, M_EXT2MNT, M_WAITOK);
+	ump = bsd_malloc(sizeof *ump, M_EXT2MNT, 0);
 	bzero((caddr_t)ump, sizeof *ump);
 	/* I don't know whether this is the right strategy. Note that
 	   we dynamically allocate both an ext2_sb_info and an ext2_super_block
 	   while Linux keeps the super block in a locked buffer
 	 */
 	ump->um_e2fs = bsd_malloc(sizeof(struct ext2_sb_info), 
-		M_EXT2MNT, M_WAITOK);
+		M_EXT2MNT, 0);
 	ump->um_e2fs->s_es = bsd_malloc(sizeof(struct ext2_super_block), 
-		M_EXT2MNT, M_WAITOK);
+		M_EXT2MNT, 0);
 	bcopy(es, ump->um_e2fs->s_es, (u_int)sizeof(struct ext2_super_block));
 	if ((error = compute_sb_data(devvp, ump->um_e2fs->s_es, ump->um_e2fs)))
 		goto out;
@@ -1005,7 +1005,7 @@ restart:
 	 * which will cause a panic because ext2_sync() blindly
 	 * dereferences vp->v_data (as well it should).
 	 */
-	MALLOC(ip, struct inode *, sizeof(struct inode), M_EXT2NODE, M_WAITOK);
+	MALLOC(ip, struct inode *, sizeof(struct inode), M_EXT2NODE, 0);
 
 	/* Allocate a new vnode/inode. */
 	if ((error = getnewvnode("ext2fs", mp, ext2_vnodeop_p, &vp)) != 0) {
diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c
index fc14dba51817..66737619b96b 100644
--- a/sys/gnu/fs/ext2fs/ext2_inode.c
+++ b/sys/gnu/fs/ext2fs/ext2_inode.c
@@ -414,7 +414,7 @@ ext2_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
 	}
 
 	bap = (int32_t *)bp->b_data;
-	MALLOC(copy, int32_t *, fs->s_blocksize, M_TEMP, M_WAITOK);
+	MALLOC(copy, int32_t *, fs->s_blocksize, M_TEMP, 0);
 	bcopy((caddr_t)bap, (caddr_t)copy, (u_int)fs->s_blocksize);
 	bzero((caddr_t)&bap[last + 1],
 	  (u_int)(NINDIR(fs) - (last + 1)) * sizeof (int32_t));
diff --git a/sys/gnu/fs/ext2fs/ext2_lookup.c b/sys/gnu/fs/ext2fs/ext2_lookup.c
index 49caccfb8684..c11aa5af4d23 100644
--- a/sys/gnu/fs/ext2fs/ext2_lookup.c
+++ b/sys/gnu/fs/ext2fs/ext2_lookup.c
@@ -181,7 +181,7 @@ ext2_readdir(ap)
 	auio.uio_resid = count;
 	auio.uio_segflg = UIO_SYSSPACE;
 	aiov.iov_len = count;
-	MALLOC(dirbuf, caddr_t, count, M_TEMP, M_WAITOK);
+	MALLOC(dirbuf, caddr_t, count, M_TEMP, 0);
 	aiov.iov_base = dirbuf;
 	error = VOP_READ(ap->a_vp, &auio, 0, ap->a_cred);
 	if (error == 0) {
@@ -243,7 +243,7 @@ ext2_readdir(ap)
 			if (uio->uio_segflg != UIO_SYSSPACE || uio->uio_iovcnt != 1)
 				panic("ext2fs_readdir: unexpected uio from NFS server");
 			MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP,
-			       M_WAITOK);
+			       0);
 			off = startoffset;
 			for (dp = (struct ext2_dir_entry_2 *)dirbuf,
 			     cookiep = cookies, ecookies = cookies + ncookies;
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index d91a92ea0d8f..d281ddb9a279 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -135,7 +135,7 @@ ext2_mountroot()
 		printf("ext2_mountroot: can't find rootvp\n");
 		return (error);
 	}
-	mp = bsd_malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK);
+	mp = bsd_malloc((u_long)sizeof(struct mount), M_MOUNT, 0);
 	bzero((char *)mp, (u_long)sizeof(struct mount));
 	TAILQ_INIT(&mp->mnt_nvnodelist);
 	TAILQ_INIT(&mp->mnt_reservedvnlist);
@@ -473,7 +473,7 @@ static int compute_sb_data(devvp, es, fs)
     V(s_db_per_group)
 
     fs->s_group_desc = bsd_malloc(db_count * sizeof (struct buf *),
-		M_EXT2MNT, M_WAITOK);
+		M_EXT2MNT, 0);
 
     /* adjust logic_sb_block */
     if(fs->s_blocksize > SBSIZE) 
@@ -683,16 +683,16 @@ ext2_mountfs(devvp, mp, td)
 			goto out;
 		}
 	}
-	ump = bsd_malloc(sizeof *ump, M_EXT2MNT, M_WAITOK);
+	ump = bsd_malloc(sizeof *ump, M_EXT2MNT, 0);
 	bzero((caddr_t)ump, sizeof *ump);
 	/* I don't know whether this is the right strategy. Note that
 	   we dynamically allocate both an ext2_sb_info and an ext2_super_block
 	   while Linux keeps the super block in a locked buffer
 	 */
 	ump->um_e2fs = bsd_malloc(sizeof(struct ext2_sb_info), 
-		M_EXT2MNT, M_WAITOK);
+		M_EXT2MNT, 0);
 	ump->um_e2fs->s_es = bsd_malloc(sizeof(struct ext2_super_block), 
-		M_EXT2MNT, M_WAITOK);
+		M_EXT2MNT, 0);
 	bcopy(es, ump->um_e2fs->s_es, (u_int)sizeof(struct ext2_super_block));
 	if ((error = compute_sb_data(devvp, ump->um_e2fs->s_es, ump->um_e2fs)))
 		goto out;
@@ -1005,7 +1005,7 @@ restart:
 	 * which will cause a panic because ext2_sync() blindly
 	 * dereferences vp->v_data (as well it should).
 	 */
-	MALLOC(ip, struct inode *, sizeof(struct inode), M_EXT2NODE, M_WAITOK);
+	MALLOC(ip, struct inode *, sizeof(struct inode), M_EXT2NODE, 0);
 
 	/* Allocate a new vnode/inode. */
 	if ((error = getnewvnode("ext2fs", mp, ext2_vnodeop_p, &vp)) != 0) {
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index 747a3a14394f..ae14099f93be 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -388,7 +388,7 @@ bios16(struct bios_args *args, char *fmt, ...)
 	/*
 	 * no page table, so create one and install it.
 	 */
-	pte = (pt_entry_t *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
+	pte = (pt_entry_t *)malloc(PAGE_SIZE, M_TEMP, 0);
 	ptd = (pd_entry_t *)((u_int)ptd + KERNBASE);
 	*ptd = vtophys(pte) | PG_RW | PG_V;
     } else {
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index 315872643de0..eb6cc9dc29d4 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -339,7 +339,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 
 	if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
 		*vaddr = malloc(dmat->maxsize, M_DEVBUF,
-				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
+				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0);
 	} else {
 		/*
 		 * XXX Use Contigmalloc until it is merged into this facility
@@ -347,7 +347,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 		 *     multi-seg allocations yet though.
 		 */
 		*vaddr = contigmalloc(dmat->maxsize, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
 		    0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
 		    dmat->boundary);
 	}
diff --git a/sys/i386/i386/elan-mmcr.c b/sys/i386/i386/elan-mmcr.c
index 7ddd90cbda44..ca6476828dea 100644
--- a/sys/i386/i386/elan-mmcr.c
+++ b/sys/i386/i386/elan-mmcr.c
@@ -286,7 +286,7 @@ elan_write(dev_t dev, struct uio *uio, int ioflag)
 
 	if (uio->uio_resid > 512)
 		return (EINVAL);
-	s = malloc(uio->uio_resid + 1, M_DEVBUF, M_WAITOK);
+	s = malloc(uio->uio_resid + 1, M_DEVBUF, 0);
 	if (s == NULL)
 		return (ENOMEM);
 	untimeout(timeout_errled, NULL, errled_h);
diff --git a/sys/i386/i386/i686_mem.c b/sys/i386/i386/i686_mem.c
index 589fc64721cb..f3fc4e89db25 100644
--- a/sys/i386/i386/i686_mem.c
+++ b/sys/i386/i386/i686_mem.c
@@ -557,7 +557,7 @@ i686_mrinit(struct mem_range_softc *sc)
 
     sc->mr_desc = 
 	(struct mem_range_desc *)malloc(nmdesc * sizeof(struct mem_range_desc), 
-					M_MEMDESC, M_WAITOK | M_ZERO);
+					M_MEMDESC, M_ZERO);
     sc->mr_ndesc = nmdesc;
 
     mrd = sc->mr_desc;
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 41fa63640b60..4905d3c8158c 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -265,7 +265,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
 		if (nd > 0) {
 			md = (struct mem_range_desc *)
 				malloc(nd * sizeof(struct mem_range_desc),
-				       M_MEMDESC, M_WAITOK);
+				       M_MEMDESC, 0);
 			error = mem_range_attr_get(md, &nd);
 			if (!error)
 				error = copyout(md, mo->mo_desc, 
@@ -279,7 +279,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
 		
 	case MEMRANGE_SET:
 		md = (struct mem_range_desc *)malloc(sizeof(struct mem_range_desc),
-						    M_MEMDESC, M_WAITOK);
+						    M_MEMDESC, 0);
 		error = copyin(mo->mo_desc, md, sizeof(struct mem_range_desc));
 		/* clamp description string */
 		md->mr_owner[sizeof(md->mr_owner) - 1] = 0;
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 00da6fa57dec..9b24c6f56962 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
 
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 00da6fa57dec..9b24c6f56962 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
 
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index e1347da53a54..4d98979c43a9 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -298,7 +298,7 @@ user_ldt_alloc(struct mdproc *mdp, int len)
 		mtx_unlock_spin(&sched_lock);
 	mtx_assert(&sched_lock, MA_NOTOWNED);
 	MALLOC(new_ldt, struct proc_ldt *, sizeof(struct proc_ldt),
-		M_SUBPROC, M_WAITOK);
+		M_SUBPROC, 0);
 
 	new_ldt->ldt_len = len = NEW_MAX_LD(len);
 	new_ldt->ldt_base = (caddr_t)kmem_alloc(kernel_map,
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index dd7624f7bb9a..6126ddac51f7 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -490,7 +490,7 @@ vm86_addpage(struct vm86context *vmc, int pagenum, vm_offset_t kva)
 		goto full;			/* XXX grow map? */
 
 	if (kva == 0) {
-		kva = (vm_offset_t)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
+		kva = (vm_offset_t)malloc(PAGE_SIZE, M_TEMP, 0);
 		flags = VMAP_MALLOC;
 	}
 
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index 295be86b1df7..abebf2a34a72 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -333,7 +333,7 @@ ibcs2_getdents(td, uap)
 #define	DIRBLKSIZ	512		/* XXX we used to use ufs's DIRBLKSIZ */
 	buflen = max(DIRBLKSIZ, uap->nbytes);
 	buflen = min(buflen, MAXBSIZE);
-	buf = malloc(buflen, M_TEMP, M_WAITOK);
+	buf = malloc(buflen, M_TEMP, 0);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 again:
 	aiov.iov_base = buf;
@@ -494,7 +494,7 @@ ibcs2_read(td, uap)
 
 	buflen = max(DIRBLKSIZ, uap->nbytes);
 	buflen = min(buflen, MAXBSIZE);
-	buf = malloc(buflen, M_TEMP, M_WAITOK);
+	buf = malloc(buflen, M_TEMP, 0);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 again:
 	aiov.iov_base = buf;
diff --git a/sys/i386/ibcs2/ibcs2_util.c b/sys/i386/ibcs2/ibcs2_util.c
index 217243300822..55ff6abff0db 100644
--- a/sys/i386/ibcs2/ibcs2_util.c
+++ b/sys/i386/ibcs2/ibcs2_util.c
@@ -66,7 +66,7 @@ ibcs2_emul_find(td, sgp, prefix, path, pbuf, cflag)
 	char			*ptr, *buf, *cp;
 	size_t			 sz, len;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
 	*pbuf = path;
 
 	for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index fb5f537566f7..b19cb56d74cc 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -386,7 +386,7 @@ exec_coff_imgact(imgp)
 			int emul_path_len = strlen(ibcs2_emul_path);
 
 			libbuf = malloc(MAXPATHLEN + emul_path_len,
-					M_TEMP, M_WAITOK);
+					M_TEMP, 0);
 			strcpy(libbuf, ibcs2_emul_path);
 
 		    	for (j = off; j < scns[i].s_size + off;) {
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 00da6fa57dec..9b24c6f56962 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
 
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index e70c40ee5840..6b5a2caf742b 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -234,7 +234,7 @@ ctxopen(dev_t dev, int flags, int fmt, struct thread *td)
 
 	/* get space for the LUT buffer */
 
-	sr->lutp = malloc(LUTSIZE, M_DEVBUF, M_WAITOK);
+	sr->lutp = malloc(LUTSIZE, M_DEVBUF, 0);
 	if (sr->lutp == NULL)
 		return (ENOMEM);
 
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index 0bd0fce2338f..184c5069144c 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -186,7 +186,7 @@ gpopen(dev, flags, fmt, td)
 		return (EBUSY);
 
 	/* Have memory for buffer? */
-	sc->sc_inbuf = malloc(BUFSIZE, M_DEVBUF, M_WAITOK);
+	sc->sc_inbuf = malloc(BUFSIZE, M_DEVBUF, 0);
 	if (sc->sc_inbuf == 0)
 		return (ENOMEM);
 
diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c
index b64f9787ddaa..a96d5fa280cc 100644
--- a/sys/i386/isa/if_cx.c
+++ b/sys/i386/isa/if_cx.c
@@ -136,11 +136,11 @@ static struct mbuf *makembuf (void *buf, unsigned len)
 {
 	struct mbuf *m, *o, *p;
 
-	MGETHDR (m, M_DONTWAIT, MT_DATA);
+	MGETHDR (m, M_NOWAIT, MT_DATA);
 	if (! m)
 		return (0);
 	if (len >= MINCLSIZE)
-		MCLGET (m, M_DONTWAIT);
+		MCLGET (m, M_NOWAIT);
 	m->m_pkthdr.len = len;
 	m->m_len = 0;
 
@@ -153,13 +153,13 @@ static struct mbuf *makembuf (void *buf, unsigned len)
 		if (! n) {
 			/* Allocate new mbuf. */
 			o = p;
-			MGET (p, M_DONTWAIT, MT_DATA);
+			MGET (p, M_NOWAIT, MT_DATA);
 			if (! p) {
 				m_freem (m);
 				return (0);
 			}
 			if (len >= MINCLSIZE)
-				MCLGET (p, M_DONTWAIT);
+				MCLGET (p, M_NOWAIT);
 			p->m_len = 0;
 			o->m_next = p;
 
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index dd6236526d04..60abe60dbe5e 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -671,7 +671,7 @@ elget(buf, totlen, ifp)
         cp = buf;
         epkt = cp + totlen;
 
-        MGETHDR(m, M_DONTWAIT, MT_DATA);
+        MGETHDR(m, M_NOWAIT, MT_DATA);
         if (m == 0)
                 return (0);
         m->m_pkthdr.rcvif = ifp;
@@ -681,7 +681,7 @@ elget(buf, totlen, ifp)
         mp = &top;
         while (totlen > 0) {
                 if (top) {
-                        MGET(m, M_DONTWAIT, MT_DATA);
+                        MGET(m, M_NOWAIT, MT_DATA);
                         if (m == 0) {
                                 m_freem(top);
                                 return (0);
@@ -690,7 +690,7 @@ elget(buf, totlen, ifp)
                 }
                 len = min(totlen, epkt - cp);
                 if (len >= MINCLSIZE) {
-                        MCLGET(m, M_DONTWAIT);
+                        MCLGET(m, M_NOWAIT);
                         if (m->m_flags & M_EXT)
                                 m->m_len = len = min(len, MCLBYTES);
                         else
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 3ed6a96c1701..d3dd2f13b690 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -386,7 +386,7 @@ le_input(
     struct ifnet *ifp = &sc->le_if;
     struct mbuf *m;
 
-    MGETHDR(m, M_DONTWAIT, MT_DATA);
+    MGETHDR(m, M_NOWAIT, MT_DATA);
     if (m == NULL) {
 	ifp->if_ierrors++;
 	return;
@@ -394,14 +394,14 @@ le_input(
     m->m_pkthdr.len = total_len;
     m->m_pkthdr.rcvif = ifp;
     if (total_len + LE_XTRA > MHLEN /* >= MINCLSIZE */) {
-	MCLGET(m, M_DONTWAIT);
+	MCLGET(m, M_NOWAIT);
 	if ((m->m_flags & M_EXT) == 0) {
 	    m_free(m);
 	    ifp->if_ierrors++;
 	    return;
 	}
     } else if (total_len + LE_XTRA > MHLEN && MINCLSIZE == (MHLEN+MLEN)) {
-	MGET(m->m_next, M_DONTWAIT, MT_DATA);
+	MGET(m->m_next, M_NOWAIT, MT_DATA);
 	if (m->m_next == NULL) {
 	    m_free(m);
 	    ifp->if_ierrors++;
diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c
index 574d3e76a9fa..84cd17490d86 100644
--- a/sys/i386/isa/if_rdp.c
+++ b/sys/i386/isa/if_rdp.c
@@ -1095,7 +1095,7 @@ rdp_get_packet(struct rdp_softc *sc, unsigned len)
 	size_t s;
 
 	/* Allocate a header mbuf */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	m->m_pkthdr.rcvif = ifp;
@@ -1109,7 +1109,7 @@ rdp_get_packet(struct rdp_softc *sc, unsigned len)
 	 */
 	if ((len + ETHER_ALIGN) > MHLEN) {
 		/* Attach an mbuf cluster */
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 
 		/* Insist on getting a cluster */
 		if ((m->m_flags & M_EXT) == 0) {
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index 59c4b6e8b7bb..9e32538d24a1 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -402,7 +402,7 @@ loranwrite(dev_t dev, struct uio * uio, int ioflag)
 
 	idx = minor(dev);
 
-	MALLOC(this, struct datapoint *, sizeof *this, M_LORAN, M_WAITOK);
+	MALLOC(this, struct datapoint *, sizeof *this, M_LORAN, 0);
 	c = imin(uio->uio_resid, (int)sizeof *this);
 	err = uiomove((caddr_t)this, c, uio);        
 	if (err) {
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c
index d1041964390f..d3362e3462d9 100644
--- a/sys/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/i386/isa/pcvt/pcvt_kbd.c
@@ -330,7 +330,7 @@ void ovlinit(int force)
 	{
 		if(ovlinitflag == 0 &&
 		   (ovltbl = (Ovl_tbl *)malloc(sizeof(Ovl_tbl) * OVLTBL_SIZE,
-					       M_DEVBUF, M_WAITOK)) == NULL)
+					       M_DEVBUF, 0)) == NULL)
 			panic("pcvt_kbd: malloc of Ovl_tbl failed");
 
 		for(i=0; i<OVLTBL_SIZE; i++)
diff --git a/sys/i386/isa/pcvt/pcvt_out.c b/sys/i386/isa/pcvt/pcvt_out.c
index 8c7793385add..d908c7bc95eb 100644
--- a/sys/i386/isa/pcvt/pcvt_out.c
+++ b/sys/i386/isa/pcvt/pcvt_out.c
@@ -1305,7 +1305,7 @@ vt_coldmalloc(void)
 	for(nscr = 0; nscr < PCVT_NSCREENS; nscr++)
 	{
 		if((vs[nscr].Memory = (u_short *)malloc(screen_max_size * 2,
-			 M_DEVBUF, M_WAITOK)) == NULL)
+			 M_DEVBUF, 0)) == NULL)
 		{
 			printf("pcvt: screen memory malloc failed, "
 			       "NSCREEN=%d, nscr=%d\n",
diff --git a/sys/i386/isa/pcvt/pcvt_sup.c b/sys/i386/isa/pcvt/pcvt_sup.c
index 4df2971b69bd..5f08f40c3ecd 100644
--- a/sys/i386/isa/pcvt/pcvt_sup.c
+++ b/sys/i386/isa/pcvt/pcvt_sup.c
@@ -1409,7 +1409,7 @@ loadchar(int fontset, int character, int char_scanlines, u_char *char_table)
 
 	if(saved_charsets[fontset] == 0)
 		saved_charsets[fontset] =
-			(u_char *)malloc(32 * 256, M_DEVBUF, M_WAITOK);
+			(u_char *)malloc(32 * 256, M_DEVBUF, 0);
 
 	if((bak = saved_charsets[fontset]))
 	{
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index de4c5cab33eb..e6487c1acb1b 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -495,7 +495,7 @@ spkropen(dev, flags, fmt, td)
 	(void) printf("spkropen: about to perform play initialization\n");
 #endif /* DEBUG */
 	playinit();
-	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, M_WAITOK);
+	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, 0);
 	spkr_active = TRUE;
 	return(0);
     }
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index 5284cece0154..c368e4deae74 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -694,7 +694,7 @@ vesa_bios_init(void)
 		if (modes >= vesa_vmode_max) {
 			vesa_vmode_max += MODE_TABLE_DELTA;
 			p = malloc(sizeof(*vesa_vmode)*(vesa_vmode_max + 1),
-				   M_DEVBUF, M_WAITOK);
+				   M_DEVBUF, 0);
 #if VESA_DEBUG > 1
 			printf("vesa_bios_init(): modes:%d, vesa_mode_max:%d\n",
 			       modes, vesa_vmode_max);
@@ -1341,7 +1341,7 @@ get_palette(video_adapter_t *adp, int base, int count,
 	if (bits <= 6)
 		return 1;
 
-	r = malloc(count*3, M_DEVBUF, M_WAITOK);
+	r = malloc(count*3, M_DEVBUF, 0);
 	g = r + count;
 	b = g + count;
 	error = vesa_bios_save_palette2(base, count, r, g, b, bits);
@@ -1378,7 +1378,7 @@ set_palette(video_adapter_t *adp, int base, int count,
 		|| ((bits = vesa_bios_set_dac(8)) <= 6))
 		return 1;
 
-	r = malloc(count*3, M_DEVBUF, M_WAITOK);
+	r = malloc(count*3, M_DEVBUF, 0);
 	g = r + count;
 	b = g + count;
 	copyin(red, r, count);
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index ab5d4c3e1a57..37627d25b486 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -343,7 +343,7 @@ wtopen (dev_t dev, int flag, int fmt, struct thread *td)
 		return (ENXIO);
 
 	t->bsize = (minor (dev) & WT_BSIZE) ? 1024 : 512;
-	t->buf = malloc (t->bsize, M_TEMP, M_WAITOK);
+	t->buf = malloc (t->bsize, M_TEMP, 0);
 	if (! t->buf)
 		return (EAGAIN);
 
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 63ff5d701f1b..70fe108e90c9 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -731,7 +731,7 @@ linux_aout_coredump(struct thread *td, struct vnode *vp, off_t limit)
 	    vm->vm_dsize + vm->vm_ssize) >= limit)
 		return (EFAULT);
 	tempuser = malloc(ctob(uarea_pages + kstack_pages), M_TEMP,
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 	if (tempuser == NULL)
 		return (ENOMEM);
 	PROC_LOCK(p);
diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index 33033d221a85..e35b4e51857b 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -255,7 +255,7 @@ i4biprattach(void *dummy)
 
 #ifdef IPR_VJ_USEBUFFER
 		if(!((sc->sc_cbuf =
-		   (u_char *)malloc(I4BIPRMAXMTU+128, M_DEVBUF, M_WAITOK))))
+		   (u_char *)malloc(I4BIPRMAXMTU+128, M_DEVBUF, 0))))
 		{
 			panic("if_ipr.c, ipr_attach: VJ malloc failed");
 		}
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
index c5c3d4714eef..ee698c7603c1 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
@@ -121,7 +121,7 @@ ihfc_ph_data_req(int unit, struct mbuf *m, int freeflag)
 
 	/* "Allow" I-frames (-hp) */
 
-	if (freeflag == MBUF_DONTFREE)	m = m_copypacket(m, M_DONTWAIT);
+	if (freeflag == MBUF_DONTFREE)	m = m_copypacket(m, M_NOWAIT);
 
 	if (!_IF_QFULL(&S_IFQUEUE) && m)
 	{
diff --git a/sys/i4b/layer2/i4b_mbuf.c b/sys/i4b/layer2/i4b_mbuf.c
index 95f234ce43f3..c12a9ae97bd9 100644
--- a/sys/i4b/layer2/i4b_mbuf.c
+++ b/sys/i4b/layer2/i4b_mbuf.c
@@ -78,7 +78,7 @@ i4b_Dgetmbuf(int len)
 		return(NULL);
 	}
 
-	MGETHDR(m, M_DONTWAIT, MT_I4B_D);	/* get mbuf with pkthdr */
+	MGETHDR(m, M_NOWAIT, MT_I4B_D);	/* get mbuf with pkthdr */
 
 	/* did we actually get the mbuf ? */
 
@@ -94,7 +94,7 @@ i4b_Dgetmbuf(int len)
 
 	if(len >= MHLEN)
 	{
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 
 		if(!(m->m_flags & M_EXT))
 		{
@@ -155,7 +155,7 @@ i4b_Bgetmbuf(int len)
 		return(NULL);
 	}
 
-	MGETHDR(m, M_DONTWAIT, MT_I4B_B);	/* get mbuf with pkthdr */
+	MGETHDR(m, M_NOWAIT, MT_I4B_B);	/* get mbuf with pkthdr */
 
 	/* did we actually get the mbuf ? */
 
@@ -171,7 +171,7 @@ i4b_Bgetmbuf(int len)
 
 	if(len >= MHLEN)
 	{
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 
 		if(!(m->m_flags & M_EXT))
 		{
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index 1dffc0f4625d..95afcc99a892 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -646,10 +646,10 @@ i4bioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 			}
 
 			prots = malloc(r->numprotos * sizeof(struct isdn_dr_prot),
-					M_DEVBUF, M_WAITOK);
+					M_DEVBUF, 0);
 
 			prots2 = malloc(r->numprotos * sizeof(struct isdn_dr_prot),
-					M_DEVBUF, M_WAITOK);
+					M_DEVBUF, 0);
 
 			if(!prots || !prots2)
 			{
@@ -661,7 +661,7 @@ i4bioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 
 			for(i = 0; i < r->numprotos; i++)
 			{
-				prots2[i].microcode = malloc(prots[i].bytecount, M_DEVBUF, M_WAITOK);
+				prots2[i].microcode = malloc(prots[i].bytecount, M_DEVBUF, 0);
 				copyin(prots[i].microcode, prots2[i].microcode, prots[i].bytecount);
 				prots2[i].bytecount = prots[i].bytecount; 
 			}
@@ -721,7 +721,7 @@ download_done:
 				    	goto diag_done;
 				}	
 
-				req.in_param = malloc(r->in_param_len, M_DEVBUF, M_WAITOK);
+				req.in_param = malloc(r->in_param_len, M_DEVBUF, 0);
 
 				if(!req.in_param)
 				{
@@ -735,7 +735,7 @@ download_done:
 
 			if(req.out_param_len)
 			{
-				req.out_param = malloc(r->out_param_len, M_DEVBUF, M_WAITOK);
+				req.out_param = malloc(r->out_param_len, M_DEVBUF, 0);
 
 				if(!req.out_param)
 				{
diff --git a/sys/ia64/ia32/ia32_misc.c b/sys/ia64/ia32/ia32_misc.c
index 10eb642a1881..8b707b43ce8a 100644
--- a/sys/ia64/ia32/ia32_misc.c
+++ b/sys/ia64/ia32/ia32_misc.c
@@ -106,7 +106,7 @@ ia32_emul_find(td, sgp, prefix, path, pbuf, cflag)
 	struct vattr		vat;
 	struct vattr		vatroot;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
 	*pbuf = path;
 
 	for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
@@ -769,8 +769,8 @@ ia32_readv(struct thread *td, struct ia32_readv_args *uap)
 	osize = uap->iovcnt * sizeof (struct iovec32);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, M_WAITOK);
-	nio = malloc(nsize, M_TEMP, M_WAITOK);
+	oio = malloc(osize, M_TEMP, 0);
+	nio = malloc(nsize, M_TEMP, 0);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
@@ -815,8 +815,8 @@ ia32_writev(struct thread *td, struct ia32_writev_args *uap)
 	osize = uap->iovcnt * sizeof (struct iovec32);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, M_WAITOK);
-	nio = malloc(nsize, M_TEMP, M_WAITOK);
+	oio = malloc(osize, M_TEMP, 0);
+	nio = malloc(nsize, M_TEMP, 0);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
diff --git a/sys/ia64/ia64/busdma_machdep.c b/sys/ia64/ia64/busdma_machdep.c
index 6496c9b07e81..4bf52d53e1b7 100644
--- a/sys/ia64/ia64/busdma_machdep.c
+++ b/sys/ia64/ia64/busdma_machdep.c
@@ -349,7 +349,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 
 	if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
 		*vaddr = malloc(dmat->maxsize, M_DEVBUF,
-				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
+				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0);
 	} else {
 		/*
 		 * XXX Use Contigmalloc until it is merged into this facility
@@ -357,7 +357,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 		 *     multi-seg allocations yet though.
 		 */
 		*vaddr = contigmalloc(dmat->maxsize, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
 		    0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
 		    dmat->boundary);
 	}
diff --git a/sys/ia64/ia64/mca.c b/sys/ia64/ia64/mca.c
index 064e6f5f6314..ca24cabf02fe 100644
--- a/sys/ia64/ia64/mca.c
+++ b/sys/ia64/ia64/mca.c
@@ -109,7 +109,7 @@ ia64_mca_save_state(int type)
 		mtx_unlock_spin(&mca_info_block_lock);
 
 		totsz = sizeof(struct sysctl_oid) + recsz + 32;
-		oidp = malloc(totsz, M_MCA, M_WAITOK|M_ZERO);
+		oidp = malloc(totsz, M_MCA, M_ZERO);
 		state = (char*)(oidp + 1);
 		name = state + recsz;
 		sprintf(name, "%lld", (long long)seqnr);
@@ -198,7 +198,7 @@ ia64_mca_init(void)
 	}
 	max_size = round_page(max_size);
 
-	p = contigmalloc(max_size, M_TEMP, M_WAITOK, 0ul, 256*1024*1024 - 1,
+	p = contigmalloc(max_size, M_TEMP, 0, 0ul, 256*1024*1024 - 1,
 	    PAGE_SIZE, 256*1024*1024);
 
 	mca_info_block = IA64_PHYS_TO_RR7(ia64_tpa((u_int64_t)p));
diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c
index 4ef629bdcbe6..2a7ff9f95f9c 100644
--- a/sys/ia64/ia64/mp_machdep.c
+++ b/sys/ia64/ia64/mp_machdep.c
@@ -222,7 +222,7 @@ cpu_mp_start()
 			 * recording a trapframe.
 			 */
 			ks = contigmalloc(KSTACK_PAGES * PAGE_SIZE, M_TEMP,
-					  M_WAITOK,
+					  0,
 					  0ul,
 					  256*1024*1024 - 1,
 					  PAGE_SIZE,
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c
index 13a42b66aa54..cc522ba4264b 100644
--- a/sys/ia64/ia64/pmap.c
+++ b/sys/ia64/ia64/pmap.c
@@ -756,7 +756,7 @@ pmap_new_thread(struct thread *td, int pages)
 	 * 7 address for it which makes it impossible to accidentally
 	 * lose when recording a trapframe.
 	 */
-	ks = contigmalloc(pages * PAGE_SIZE, M_PMAP, M_WAITOK, 0ul,
+	ks = contigmalloc(pages * PAGE_SIZE, M_PMAP, 0, 0ul,
 	    256*1024*1024 - 1, PAGE_SIZE, 256*1024*1024);
 	if (ks == NULL)
 		panic("pmap_new_thread: could not contigmalloc %d pages\n",
@@ -1215,7 +1215,7 @@ pmap_find_pte(vm_offset_t va)
 
 	pte = pmap_find_vhpt(va);
 	if (!pte) {
-		pte = uma_zalloc(ptezone, M_WAITOK);
+		pte = uma_zalloc(ptezone, 0);
 		pte->pte_p = 0;
 	}
 	return pte;
diff --git a/sys/ia64/ia64/sscdisk.c b/sys/ia64/ia64/sscdisk.c
index 17553008e008..74f10f61a884 100644
--- a/sys/ia64/ia64/sscdisk.c
+++ b/sys/ia64/ia64/sscdisk.c
@@ -247,7 +247,7 @@ ssccreate(int unit)
 		if (sc->unit == unit)
 			return (NULL);
 	}
-	MALLOC(sc, struct ssc_s *,sizeof(*sc), M_SSC, M_WAITOK | M_ZERO);
+	MALLOC(sc, struct ssc_s *,sizeof(*sc), M_SSC, M_ZERO);
 	LIST_INSERT_HEAD(&ssc_softc_list, sc, list);
 	sc->unit = unit;
 	bioq_init(&sc->bio_queue);
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index a44df4caa371..f9161176bc53 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -411,7 +411,7 @@ iso_mountfs(devvp, mp, td, argp)
 		 pri_sierra->root_directory_record:
 		 pri->root_directory_record);
 
-	isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_WAITOK | M_ZERO);
+	isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_ZERO);
 	isomp->logical_block_size = logical_block_size;
 	isomp->volume_space_size =
 		isonum_733 (high_sierra?
@@ -712,7 +712,7 @@ cd9660_vget_internal(mp, ino, flags, vpp, relocated, isodir)
 		return (error);
 	}
 	MALLOC(ip, struct iso_node *, sizeof(struct iso_node), M_ISOFSNODE,
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 	vp->v_data = ip;
 	ip->i_vnode = vp;
 	ip->i_dev = dev;
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 0b892e6e8012..062c22aa27c1 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -194,7 +194,7 @@ cd9660_getattr(ap)
 		struct uio auio;
 		char *cp;
 
-		MALLOC(cp, char *, MAXPATHLEN, M_TEMP, M_WAITOK);
+		MALLOC(cp, char *, MAXPATHLEN, M_TEMP, 0);
 		aiov.iov_base = cp;
 		aiov.iov_len = MAXPATHLEN;
 		auio.uio_iov = &aiov;
@@ -451,7 +451,7 @@ cd9660_readdir(ap)
 	imp = dp->i_mnt;
 	bmask = imp->im_bmask;
 
-	MALLOC(idp, struct isoreaddir *, sizeof(*idp), M_TEMP, M_WAITOK);
+	MALLOC(idp, struct isoreaddir *, sizeof(*idp), M_TEMP, 0);
 	idp->saveent.d_namlen = idp->assocent.d_namlen = 0;
 	/*
 	 * XXX
@@ -468,7 +468,7 @@ cd9660_readdir(ap)
 		 */
 		ncookies = uio->uio_resid / 16;
 		MALLOC(cookies, u_long *, ncookies * sizeof(u_int), M_TEMP,
-		    M_WAITOK);
+		    0);
 		idp->cookies = cookies;
 		idp->ncookies = ncookies;
 	}
@@ -671,7 +671,7 @@ cd9660_readlink(ap)
 	if (uio->uio_segflg == UIO_SYSSPACE)
 		symname = uio->uio_iov->iov_base;
 	else
-		symname = uma_zalloc(namei_zone, M_WAITOK);
+		symname = uma_zalloc(namei_zone, 0);
 	
 	/*
 	 * Ok, we just gathering a symbolic name in SL record.
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index e96054a19bed..a11c17dc8676 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -276,7 +276,7 @@ aout_coredump(td, vp, limit)
 	    + vm->vm_dsize + vm->vm_ssize) >= limit)
 		return (EFAULT);
 	tempuser = malloc(ctob(uarea_pages + kstack_pages), M_TEMP,
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 	if (tempuser == NULL)
 		return (ENOMEM);
 	PROC_LOCK(p);
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index f6b0cb2175b4..e0d49d4a92f5 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -516,7 +516,7 @@ __elfN(load_file)(struct proc *p, const char *file, u_long *addr,
 	if (curthread->td_proc != p)
 		panic("elf_load_file - thread");	/* XXXKSE DIAGNOSTIC */
 
-	tempdata = malloc(sizeof(*tempdata), M_TEMP, M_WAITOK);
+	tempdata = malloc(sizeof(*tempdata), M_TEMP, 0);
 	nd = &tempdata->nd;
 	attr = &tempdata->attr;
 	imgp = &tempdata->image_params;
@@ -812,7 +812,7 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)
 
 	imgp->proc->p_sysent = sv;
 	if (interp != NULL) {
-		path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+		path = malloc(MAXPATHLEN, M_TEMP, 0);
 		snprintf(path, MAXPATHLEN, "%s%s", brand_info->emul_path,
 		    interp);
 		if ((error = __elfN(load_file)(imgp->proc, path, &addr,
@@ -831,7 +831,7 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)
 	/*
 	 * Construct auxargs table (used by the fixup routine)
 	 */
-	elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, M_WAITOK);
+	elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, 0);
 	elf_auxargs->execfd = -1;
 	elf_auxargs->phdr = proghdr;
 	elf_auxargs->phent = hdr->e_phentsize;
@@ -951,7 +951,7 @@ __elfN(coredump)(td, vp, limit)
 	 * Allocate memory for building the header, fill it up,
 	 * and write it out.
 	 */
-	hdr = malloc(hdrsize, M_TEMP, M_WAITOK);
+	hdr = malloc(hdrsize, M_TEMP, 0);
 	if (hdr == NULL) {
 		return (EINVAL);
 	}
@@ -1113,7 +1113,7 @@ __elfN(corehdr)(td, vp, cred, numsegs, hdr, hdrsize)
 	prfpregset_t *fpregset;
 	prpsinfo_t *psinfo;
 
-	tempdata = malloc(sizeof(*tempdata), M_TEMP, M_ZERO | M_WAITOK);
+	tempdata = malloc(sizeof(*tempdata), M_TEMP, M_ZERO | 0);
 	status = &tempdata->status;
 	fpregset = &tempdata->fpregset;
 	psinfo = &tempdata->psinfo;
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index 2a16ba2c2d08..e8142944b009 100644
--- a/sys/kern/inflate.c
+++ b/sys/kern/inflate.c
@@ -551,7 +551,7 @@ huft_build(glbl, b, n, s, d, e, t, m)
 				l[h] = j;	/* set table size in stack */
 
 				/* allocate and link in new table */
-				if ((q = (struct huft *) malloc((z + 1) * sizeof(struct huft), M_GZIP, M_WAITOK)) ==
+				if ((q = (struct huft *) malloc((z + 1) * sizeof(struct huft), M_GZIP, 0)) ==
 				    (struct huft *) NULL) {
 					if (h)
 						huft_free(glbl, u[0]);
@@ -1049,7 +1049,7 @@ inflate(glbl)
 	u_char		*p = NULL;
 
 	if (!glbl->gz_slide)
-		p = glbl->gz_slide = malloc(GZ_WSIZE, M_GZIP, M_WAITOK);
+		p = glbl->gz_slide = malloc(GZ_WSIZE, M_GZIP, 0);
 #endif
 	if (!glbl->gz_slide)
 #ifdef _KERNEL
diff --git a/sys/kern/kern_alq.c b/sys/kern/kern_alq.c
index 7ddacc811b15..7e86b55be861 100644
--- a/sys/kern/kern_alq.c
+++ b/sys/kern/kern_alq.c
@@ -352,9 +352,9 @@ alq_open(struct alq **alqp, const char *file, int size, int count)
 	/* We just unlock so we hold a reference */
 	VOP_UNLOCK(nd.ni_vp, 0, td);
 
-	alq = malloc(sizeof(*alq), M_ALD, M_WAITOK|M_ZERO);
-	alq->aq_entbuf = malloc(count * size, M_ALD, M_WAITOK|M_ZERO);
-	alq->aq_first = malloc(sizeof(*ale) * count, M_ALD, M_WAITOK|M_ZERO);
+	alq = malloc(sizeof(*alq), M_ALD, M_ZERO);
+	alq->aq_entbuf = malloc(count * size, M_ALD, M_ZERO);
+	alq->aq_first = malloc(sizeof(*ale) * count, M_ALD, M_ZERO);
 	alq->aq_vp = nd.ni_vp;
 	alq->aq_cred = crhold(td->td_ucred);
 	alq->aq_entmax = count;
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 835ec39e9642..a05eb2529f24 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -667,7 +667,7 @@ fsetown(pgid, sigiop)
 	ret = 0;
 
 	/* Allocate and fill in the new sigio out of locks. */
-	MALLOC(sigio, struct sigio *, sizeof(struct sigio), M_SIGIO, M_WAITOK);
+	MALLOC(sigio, struct sigio *, sizeof(struct sigio), M_SIGIO, 0);
 	sigio->sio_pgid = pgid;
 	sigio->sio_ucred = crhold(curthread->td_ucred);
 	sigio->sio_myref = sigiop;
@@ -1052,7 +1052,7 @@ fdalloc(td, want, result)
 		 * than KMEM_ZMAX bytes. uma_large_malloc() requires Giant.
 		 */
 		mtx_lock(&Giant);
-		newofile = malloc(nfiles * OFILESIZE, M_FILEDESC, M_WAITOK);
+		newofile = malloc(nfiles * OFILESIZE, M_FILEDESC, 0);
 		mtx_unlock(&Giant);
 
 		/*
@@ -1143,7 +1143,7 @@ falloc(td, resultfp, resultfd)
 	struct file *fp, *fq;
 	int error, i;
 
-	fp = uma_zalloc(file_zone, M_WAITOK | M_ZERO);
+	fp = uma_zalloc(file_zone, M_ZERO);
 	sx_xlock(&filelist_lock);
 	if (nfiles >= maxfiles) {
 		sx_xunlock(&filelist_lock);
@@ -1213,7 +1213,7 @@ fdinit(fdp)
 	struct filedesc0 *newfdp;
 
 	MALLOC(newfdp, struct filedesc0 *, sizeof(struct filedesc0),
-	    M_FILEDESC, M_WAITOK | M_ZERO);
+	    M_FILEDESC, M_ZERO);
 	mtx_init(&newfdp->fd_fd.fd_mtx, FILEDESC_LOCK_DESC, NULL, MTX_DEF);
 	newfdp->fd_fd.fd_cdir = fdp->fd_cdir;
 	if (newfdp->fd_fd.fd_cdir)
@@ -1269,7 +1269,7 @@ fdcopy(fdp)
 
 	FILEDESC_UNLOCK(fdp);
 	MALLOC(newfdp, struct filedesc *, sizeof(struct filedesc0),
-	    M_FILEDESC, M_WAITOK);
+	    M_FILEDESC, 0);
 	FILEDESC_LOCK(fdp);
 	bcopy(fdp, newfdp, sizeof(struct filedesc));
 	FILEDESC_UNLOCK(fdp);
@@ -1309,7 +1309,7 @@ retry:
 			i /= 2;
 		FILEDESC_UNLOCK(fdp);
 		MALLOC(newfdp->fd_ofiles, struct file **, i * OFILESIZE,
-		    M_FILEDESC, M_WAITOK);
+		    M_FILEDESC, 0);
 		FILEDESC_LOCK(fdp);
 		newfdp->fd_lastfile = fdp->fd_lastfile;
 		newfdp->fd_nfiles = fdp->fd_nfiles;
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index 98f5fc64a807..70ba635c5375 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -131,7 +131,7 @@ kenv(td, uap)
 			return (error);
 	}
 
-	name = malloc(KENV_MNAMELEN, M_TEMP, M_WAITOK);
+	name = malloc(KENV_MNAMELEN, M_TEMP, 0);
 
 	error = copyinstr(uap->name, name, KENV_MNAMELEN, NULL);
 	if (error)
@@ -166,7 +166,7 @@ kenv(td, uap)
 		}
 		if (len > KENV_MVALLEN)
 			len = KENV_MVALLEN;
-		value = malloc(len, M_TEMP, M_WAITOK);
+		value = malloc(len, M_TEMP, 0);
 		error = copyinstr(uap->value, value, len, NULL);
 		if (error) {
 			free(value, M_TEMP);
@@ -207,11 +207,11 @@ init_dynamic_kenv(void *data __unused)
 	char *cp;
 	int len, i;
 
-	kenvp = malloc(KENV_SIZE * sizeof(char *), M_KENV, M_WAITOK | M_ZERO);
+	kenvp = malloc(KENV_SIZE * sizeof(char *), M_KENV, M_ZERO);
 	i = 0;
 	for (cp = kern_envp; cp != NULL; cp = kernenv_next(cp)) {
 		len = strlen(cp) + 1;
-		kenvp[i] = malloc(len, M_KENV, M_WAITOK);
+		kenvp[i] = malloc(len, M_KENV, 0);
 		strcpy(kenvp[i++], cp);
 	}
 	kenvp[i] = NULL;
@@ -290,7 +290,7 @@ getenv(const char *name)
 			strcpy(buf, cp);
 			sx_sunlock(&kenv_lock);
 			len = strlen(buf) + 1;
-			ret = malloc(len, M_KENV, M_WAITOK);
+			ret = malloc(len, M_KENV, 0);
 			strcpy(ret, buf);
 		} else {
 			sx_sunlock(&kenv_lock);
@@ -337,7 +337,7 @@ setenv(const char *name, const char *value)
 	vallen = strlen(value) + 1;
 	if (vallen > KENV_MVALLEN)
 		return (-1);
-	buf = malloc(namelen + vallen, M_KENV, M_WAITOK);
+	buf = malloc(namelen + vallen, M_KENV, 0);
 	sprintf(buf, "%s=%s", name, value);
 
 	sx_xlock(&kenv_lock);
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index d360c5c35f0c..aecb9f9fe039 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -329,7 +329,7 @@ filt_timerattach(struct knote *kn)
 
 	kn->kn_flags |= EV_CLEAR;		/* automatically set */
 	MALLOC(calloutp, struct callout *, sizeof(*calloutp),
-	    M_KQUEUE, M_WAITOK);
+	    M_KQUEUE, 0);
 	callout_init(calloutp, 0);
 	callout_reset(calloutp, tticks, filt_timerexpire, kn);
 	kn->kn_hook = calloutp;
@@ -371,7 +371,7 @@ kqueue(struct thread *td, struct kqueue_args *uap)
 	error = falloc(td, &fp, &fd);
 	if (error)
 		goto done2;
-	kq = malloc(sizeof(struct kqueue), M_KQUEUE, M_WAITOK | M_ZERO);
+	kq = malloc(sizeof(struct kqueue), M_KQUEUE, M_ZERO);
 	TAILQ_INIT(&kq->kq_head);
 	FILE_LOCK(fp);
 	fp->f_flag = FREAD | FWRITE;
@@ -979,7 +979,7 @@ knote_attach(struct knote *kn, struct filedesc *fdp)
 			size += KQEXTENT;
 		FILEDESC_UNLOCK(fdp);
 		MALLOC(list, struct klist *,
-		    size * sizeof(struct klist *), M_KQUEUE, M_WAITOK);
+		    size * sizeof(struct klist *), M_KQUEUE, 0);
 		FILEDESC_LOCK(fdp);
 		if (fdp->fd_knlistsize > kn->kn_id) {
 			FREE(list, M_KQUEUE);
@@ -1073,7 +1073,7 @@ SYSINIT(knote, SI_SUB_PSEUDO, SI_ORDER_ANY, knote_init, NULL)
 static struct knote *
 knote_alloc(void)
 {
-	return ((struct knote *)uma_zalloc(knote_zone, M_WAITOK));
+	return ((struct knote *)uma_zalloc(knote_zone, 0));
 }
 
 static void
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 17e18b2ad2f4..33a0764fc503 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -428,7 +428,7 @@ interpret:
 		oldprocsig = p->p_procsig;
 		PROC_UNLOCK(p);
 		MALLOC(newprocsig, struct procsig *, sizeof(struct procsig),
-		    M_SUBPROC, M_WAITOK);
+		    M_SUBPROC, 0);
 		bcopy(oldprocsig, newprocsig, sizeof(*newprocsig));
 		newprocsig->ps_refcnt = 1;
 		oldprocsig->ps_refcnt--;
@@ -1174,7 +1174,7 @@ exec_register(execsw_arg)
 	if (execsw)
 		for (es = execsw; *es; es++)
 			count++;
-	newexecsw = malloc(count * sizeof(*es), M_TEMP, M_WAITOK);
+	newexecsw = malloc(count * sizeof(*es), M_TEMP, 0);
 	if (newexecsw == NULL)
 		return (ENOMEM);
 	xs = newexecsw;
@@ -1208,7 +1208,7 @@ exec_unregister(execsw_arg)
 	for (es = execsw; *es; es++)
 		if (*es != execsw_arg)
 			count++;
-	newexecsw = malloc(count * sizeof(*es), M_TEMP, M_WAITOK);
+	newexecsw = malloc(count * sizeof(*es), M_TEMP, 0);
 	if (newexecsw == NULL)
 		return (ENOMEM);
 	xs = newexecsw;
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index c34f26fe646b..0b2c2e80f060 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -241,7 +241,7 @@ exit1(td, rv)
 	stopprofclock(p);
 
 	MALLOC(p->p_ru, struct rusage *, sizeof(struct rusage),
-		M_ZOMBIE, M_WAITOK);
+		M_ZOMBIE, 0);
 	/*
 	 * If parent is waiting for us to exit or exec,
 	 * P_PPWAIT is set; we will wakeup the parent below.
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 73617572dce8..f84afa89ef4b 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -306,7 +306,7 @@ fork1(td, flags, pages, procp)
 	}
 
 	/* Allocate new proc. */
-	newproc = uma_zalloc(proc_zone, M_WAITOK);
+	newproc = uma_zalloc(proc_zone, 0);
 #ifdef MAC
 	mac_init_proc(newproc);
 #endif
@@ -431,12 +431,12 @@ again:
 	 */
 	if (flags & RFSIGSHARE) {
 		MALLOC(newsigacts, struct sigacts *,
-		    sizeof(struct sigacts), M_SUBPROC, M_WAITOK);
+		    sizeof(struct sigacts), M_SUBPROC, 0);
 		newprocsig = NULL;
 	} else {
 		newsigacts = NULL;
 		MALLOC(newprocsig, struct procsig *, sizeof(struct procsig),
-		    M_SUBPROC, M_WAITOK);
+		    M_SUBPROC, 0);
 	}
 
 	/*
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index cf5916989e77..75b0627adc55 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -176,7 +176,7 @@ ithread_create(struct ithd **ithread, int vector, int flags,
 	if ((flags & ~IT_SOFT) != 0)
 		return (EINVAL);
 
-	ithd = malloc(sizeof(struct ithd), M_ITHREAD, M_WAITOK | M_ZERO);
+	ithd = malloc(sizeof(struct ithd), M_ITHREAD, M_ZERO);
 	ithd->it_vector = vector;
 	ithd->it_disable = disable;
 	ithd->it_enable = enable;
@@ -248,7 +248,7 @@ ithread_add_handler(struct ithd* ithread, const char *name,
 	if ((flags & INTR_FAST) !=0)
 		flags |= INTR_EXCL;
 
-	ih = malloc(sizeof(struct intrhand), M_ITHREAD, M_WAITOK | M_ZERO);
+	ih = malloc(sizeof(struct intrhand), M_ITHREAD, M_ZERO);
 	ih->ih_handler = handler;
 	ih->ih_argument = arg;
 	ih->ih_name = name;
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index 15f4b36450d8..f367d4f56e05 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -72,7 +72,7 @@ jail(td, uap)
 	if (j.version != 0)
 		return (EINVAL);
 
-	MALLOC(pr, struct prison *, sizeof *pr , M_PRISON, M_WAITOK | M_ZERO);
+	MALLOC(pr, struct prison *, sizeof *pr , M_PRISON, M_ZERO);
 	mtx_init(&pr->pr_mtx, "jail mutex", NULL, MTX_DEF);
 	pr->pr_securelevel = securelevel;
 	error = copyinstr(j.hostname, &pr->pr_host, sizeof pr->pr_host, 0);
diff --git a/sys/kern/kern_kse.c b/sys/kern/kern_kse.c
index 31ed03edaa23..78bce30d776c 100644
--- a/sys/kern/kern_kse.c
+++ b/sys/kern/kern_kse.c
@@ -729,7 +729,7 @@ thread_reap(void)
 struct ksegrp *
 ksegrp_alloc(void)
 {
-	return (uma_zalloc(ksegrp_zone, M_WAITOK));
+	return (uma_zalloc(ksegrp_zone, 0));
 }
 
 /*
@@ -738,7 +738,7 @@ ksegrp_alloc(void)
 struct kse *
 kse_alloc(void)
 {
-	return (uma_zalloc(kse_zone, M_WAITOK));
+	return (uma_zalloc(kse_zone, 0));
 }
 
 /*
@@ -748,7 +748,7 @@ struct thread *
 thread_alloc(void)
 {
 	thread_reap(); /* check if any zombies to get */
-	return (uma_zalloc(thread_zone, M_WAITOK));
+	return (uma_zalloc(thread_zone, 0));
 }
 
 /*
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index bb4642c5acb3..23f6f7ba7515 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -131,7 +131,7 @@ ktrace_init(void *dummy)
 	STAILQ_INIT(&ktr_todo);
 	STAILQ_INIT(&ktr_free);
 	for (i = 0; i < ktr_requestpool; i++) {
-		req = malloc(sizeof(struct ktr_request), M_KTRACE, M_WAITOK);
+		req = malloc(sizeof(struct ktr_request), M_KTRACE, 0);
 		STAILQ_INSERT_HEAD(&ktr_free, req, ktr_list);
 	}
 	kthread_create(ktr_loop, NULL, NULL, RFHIGHPID, 0, "ktrace");
@@ -199,7 +199,7 @@ ktrace_resize_pool(uint newsize)
 		while (ktr_requestpool < newsize) {
 			mtx_unlock(&ktrace_mtx);
 			req = malloc(sizeof(struct ktr_request), M_KTRACE,
-			    M_WAITOK);
+			    0);
 			mtx_lock(&ktrace_mtx);
 			STAILQ_INSERT_HEAD(&ktr_free, req, ktr_list);
 			ktr_requestpool++;
@@ -321,7 +321,7 @@ ktrsyscall(code, narg, args)
 
 	buflen = sizeof(register_t) * narg;
 	if (buflen > 0) {
-		buf = malloc(buflen, M_KTRACE, M_WAITOK);
+		buf = malloc(buflen, M_KTRACE, 0);
 		bcopy(args, buf, buflen);
 	}
 	req = ktr_getrequest(KTR_SYSCALL);
@@ -371,7 +371,7 @@ ktrnamei(path)
 
 	namelen = strlen(path);
 	if (namelen > 0) {
-		buf = malloc(namelen, M_KTRACE, M_WAITOK);
+		buf = malloc(namelen, M_KTRACE, 0);
 		bcopy(path, buf, namelen);
 	}
 	req = ktr_getrequest(KTR_NAMEI);
@@ -413,7 +413,7 @@ ktrgenio(fd, rw, uio, error)
 	uio->uio_offset = 0;
 	uio->uio_rw = UIO_WRITE;
 	datalen = imin(uio->uio_resid, ktr_geniosize);
-	buf = malloc(datalen, M_KTRACE, M_WAITOK);
+	buf = malloc(datalen, M_KTRACE, 0);
 	if (uiomove(buf, datalen, uio)) {
 		free(buf, M_KTRACE);
 		return;
@@ -625,7 +625,7 @@ utrace(td, uap)
 		return (0);
 	if (uap->len > KTR_USER_MAXLEN)
 		return (EINVAL);
-	cp = malloc(uap->len, M_KTRACE, M_WAITOK);
+	cp = malloc(uap->len, M_KTRACE, 0);
 	error = copyin(uap->addr, cp, uap->len);
 	if (error) {
 		free(cp, M_KTRACE);
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 3c38baca614a..fcecdd954f5b 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -110,7 +110,7 @@ linker_strdup(const char *str)
 {
 	char *result;
 
-	if ((result = malloc((strlen(str) + 1), M_LINKER, M_WAITOK)) != NULL)
+	if ((result = malloc((strlen(str) + 1), M_LINKER, 0)) != NULL)
 		strcpy(result, str);
 	return (result);
 }
@@ -402,7 +402,7 @@ linker_find_file_by_name(const char *filename)
 	linker_file_t lf = 0;
 	char *koname;
 
-	koname = malloc(strlen(filename) + 4, M_LINKER, M_WAITOK);
+	koname = malloc(strlen(filename) + 4, M_LINKER, 0);
 	if (koname == NULL)
 		goto out;
 	sprintf(koname, "%s.ko", filename);
@@ -444,7 +444,7 @@ linker_make_file(const char *pathname, linker_class_t lc)
 	filename = linker_basename(pathname);
 
 	KLD_DPF(FILE, ("linker_make_file: new file, filename=%s\n", filename));
-	lf = (linker_file_t)kobj_create((kobj_class_t)lc, M_LINKER, M_WAITOK);
+	lf = (linker_file_t)kobj_create((kobj_class_t)lc, M_LINKER, 0);
 	if (lf == NULL)
 		goto out;
 	lf->refs = 1;
@@ -558,7 +558,7 @@ linker_file_add_dependency(linker_file_t file, linker_file_t dep)
 	linker_file_t *newdeps;
 
 	newdeps = malloc((file->ndeps + 1) * sizeof(linker_file_t *),
-	    M_LINKER, M_WAITOK | M_ZERO);
+	    M_LINKER, M_ZERO);
 	if (newdeps == NULL)
 		return (ENOMEM);
 
@@ -644,7 +644,7 @@ linker_file_lookup_symbol(linker_file_t file, const char *name, int deps)
 		common_size = (common_size + sizeof(int) - 1) & -sizeof(int);
 		cp = malloc(sizeof(struct common_symbol)
 		    + common_size + strlen(name) + 1, M_LINKER,
-		    M_WAITOK | M_ZERO);
+		    M_ZERO);
 		if (cp == NULL) {
 			KLD_DPF(SYM, ("linker_file_lookup_symbol: nomem\n"));
 			return (0);
@@ -753,7 +753,7 @@ kldload(struct thread *td, struct kldload_args *uap)
 	if ((error = suser(td)) != 0)
 		goto out;
 
-	pathname = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+	pathname = malloc(MAXPATHLEN, M_TEMP, 0);
 	if ((error = copyinstr(uap->file, pathname, MAXPATHLEN, NULL)) != 0)
 		goto out;
 
@@ -839,7 +839,7 @@ kldfind(struct thread *td, struct kldfind_args *uap)
 	mtx_lock(&Giant);
 	td->td_retval[0] = -1;
 
-	pathname = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+	pathname = malloc(MAXPATHLEN, M_TEMP, 0);
 	if ((error = copyinstr(uap->file, pathname, MAXPATHLEN, NULL)) != 0)
 		goto out;
 
@@ -1011,7 +1011,7 @@ kldsym(struct thread *td, struct kldsym_args *uap)
 		error = EINVAL;
 		goto out;
 	}
-	symstr = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+	symstr = malloc(MAXPATHLEN, M_TEMP, 0);
 	if ((error = copyinstr(lookup.symname, symstr, MAXPATHLEN, NULL)) != 0)
 		goto out;
 	if (uap->fileid != 0) {
@@ -1381,7 +1381,7 @@ linker_lookup_file(const char *path, int pathlen, const char *name,
 	sep = (path[pathlen - 1] != '/') ? "/" : "";
 
 	reclen = pathlen + strlen(sep) + namelen + extlen + 1;
-	result = malloc(reclen, M_LINKER, M_WAITOK);
+	result = malloc(reclen, M_LINKER, 0);
 	for (cpp = linker_ext_list; *cpp; cpp++) {
 		snprintf(result, reclen, "%.*s%s%.*s%s", pathlen, path, sep,
 		    namelen, name, *cpp);
@@ -1433,7 +1433,7 @@ linker_hints_lookup(const char *path, int pathlen, const char *modname,
 	sep = (path[pathlen - 1] != '/') ? "/" : "";
 	reclen = imax(modnamelen, strlen(linker_hintfile)) + pathlen +
 	    strlen(sep) + 1;
-	pathbuf = malloc(reclen, M_LINKER, M_WAITOK);
+	pathbuf = malloc(reclen, M_LINKER, 0);
 	snprintf(pathbuf, reclen, "%.*s%s%s", pathlen, path, sep,
 	    linker_hintfile);
 
@@ -1456,7 +1456,7 @@ linker_hints_lookup(const char *path, int pathlen, const char *modname,
 		printf("hints file too large %ld\n", (long)vattr.va_size);
 		goto bad;
 	}
-	hints = malloc(vattr.va_size, M_TEMP, M_WAITOK);
+	hints = malloc(vattr.va_size, M_TEMP, 0);
 	if (hints == NULL)
 		goto bad;
 	error = vn_rdwr(UIO_READ, nd.ni_vp, (caddr_t)hints, vattr.va_size, 0,
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index cb1fad413389..b5d420453f4d 100644
--- a/sys/kern/kern_lockf.c
+++ b/sys/kern/kern_lockf.c
@@ -160,7 +160,7 @@ lf_advlock(ap, head, size)
 	/*
 	 * Create the lockf structure
 	 */
-	MALLOC(lock, struct lockf *, sizeof *lock, M_LOCKF, M_WAITOK);
+	MALLOC(lock, struct lockf *, sizeof *lock, M_LOCKF, 0);
 	lock->lf_start = start;
 	lock->lf_end = end;
 	lock->lf_id = ap->a_id;
@@ -726,7 +726,7 @@ lf_split(lock1, lock2)
 	 * Make a new lock consisting of the last part of
 	 * the encompassing lock
 	 */
-	MALLOC(splitlock, struct lockf *, sizeof *splitlock, M_LOCKF, M_WAITOK);
+	MALLOC(splitlock, struct lockf *, sizeof *splitlock, M_LOCKF, 0);
 	bcopy(lock1, splitlock, sizeof *splitlock);
 	splitlock->lf_start = lock2->lf_end + 1;
 	TAILQ_INIT(&splitlock->lf_blkhd);
diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c
index e9d9eeb3b51a..b4df06f8964f 100644
--- a/sys/kern/kern_mac.c
+++ b/sys/kern/kern_mac.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, M_WAITOK);
+	mac_init_socket_label(&intlabel, 0);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, M_WAITOK);
+	    buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, M_WAITOK);
+	    elements, buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, M_WAITOK);
+	    elements, buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, M_WAITOK);
+			    elements, buffer, mac.m_buflen, 0);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, M_WAITOK);
+		    buffer, mac.m_buflen, 0);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 577b5da6dfdc..6122a52764a1 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -170,7 +170,7 @@ malloc(size, type, flags)
 #endif
 	if (!(flags & M_NOWAIT))
 		KASSERT(curthread->td_intr_nesting_level == 0,
-		   ("malloc(M_WAITOK) in interrupt context"));
+		   ("malloc() without M_NOWAIT in interrupt context"));
 	if (size <= KMEM_ZMAX) {
 		if (size & KMEM_ZMASK)
 			size = (size & ~KMEM_ZMASK) + KMEM_ZBASE;
@@ -203,7 +203,7 @@ out:
 
 	mtx_unlock(&ksp->ks_mtx);
 	if (!(flags & M_NOWAIT))
-		KASSERT(va != NULL, ("malloc(M_WAITOK) returned NULL"));
+		KASSERT(va != NULL, ("malloc() without M_NOWAIT returned NULL"));
 	if (va == NULL) {
 		t_malloc_fail = time_uptime;
 	}
@@ -493,7 +493,7 @@ sysctl_kern_malloc(SYSCTL_HANDLER_ARGS)
 
 	mtx_unlock(&malloc_mtx);
 	bufsize = linesize * (cnt + 1);
-	p = buf = (char *)malloc(bufsize, M_TEMP, M_WAITOK|M_ZERO);
+	p = buf = (char *)malloc(bufsize, M_TEMP, M_ZERO);
 	mtx_lock(&malloc_mtx);
 
 	len = snprintf(p, linesize,
@@ -573,7 +573,7 @@ sysctl_kern_mprof(SYSCTL_HANDLER_ARGS)
 	waste = 0;
 	mem = 0;
 
-	p = buf = (char *)malloc(bufsize, M_TEMP, M_WAITOK|M_ZERO);
+	p = buf = (char *)malloc(bufsize, M_TEMP, M_ZERO);
 	len = snprintf(p, bufsize,
 	    "\n  Size                    Requests  Real Size\n");
 	bufsize -= len;
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index 677d9f15fe4c..84ad1c62a143 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -132,7 +132,7 @@ module_register(const moduledata_t *data, linker_file_t container)
 	}
 	MOD_SUNLOCK;
 	namelen = strlen(data->name) + 1;
-	newmod = malloc(sizeof(struct module) + namelen, M_MODULE, M_WAITOK);
+	newmod = malloc(sizeof(struct module) + namelen, M_MODULE, 0);
 	if (newmod == NULL)
 		return (ENOMEM);
 	MOD_XLOCK;
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 00f61866deb7..73062c2f23ea 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -975,7 +975,7 @@ pargs_alloc(int len)
 	struct pargs *pa;
 
 	MALLOC(pa, struct pargs *, sizeof(struct pargs) + len, M_PARGS,
-		M_WAITOK);
+		0);
 	pa->ar_ref = 1;
 	pa->ar_length = len;
 	return (pa);
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 1e21b9e19176..0d8865a9a5cc 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -345,8 +345,8 @@ setsid(register struct thread *td, struct setsid_args *uap)
 	error = 0;
 	pgrp = NULL;
 
-	MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, M_WAITOK | M_ZERO);
-	MALLOC(newsess, struct session *, sizeof(struct session), M_SESSION, M_WAITOK | M_ZERO);
+	MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, M_ZERO);
+	MALLOC(newsess, struct session *, sizeof(struct session), M_SESSION, M_ZERO);
 
 	sx_xlock(&proctree_lock);
 
@@ -408,7 +408,7 @@ setpgid(struct thread *td, register struct setpgid_args *uap)
 
 	error = 0;
 
-	MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, M_WAITOK | M_ZERO);
+	MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, M_ZERO);
 
 	sx_xlock(&proctree_lock);
 	if (uap->pid != 0 && uap->pid != curp->p_pid) {
@@ -1687,7 +1687,7 @@ crget(void)
 {
 	register struct ucred *cr;
 
-	MALLOC(cr, struct ucred *, sizeof(*cr), M_CRED, M_WAITOK | M_ZERO);
+	MALLOC(cr, struct ucred *, sizeof(*cr), M_CRED, M_ZERO);
 	cr->cr_ref = 1;
 	cr->cr_mtxp = mtx_pool_find(cr);
 #ifdef MAC
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index a0f263df87ab..4ade8903fd1b 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -839,7 +839,7 @@ limcopy(lim)
 	register struct plimit *copy;
 
 	MALLOC(copy, struct plimit *, sizeof(struct plimit),
-	    M_SUBPROC, M_WAITOK);
+	    M_SUBPROC, 0);
 	bcopy(lim->pl_rlimit, copy->pl_rlimit, sizeof(struct plimit));
 	copy->p_lflags = 0;
 	copy->p_refcnt = 1;
@@ -896,7 +896,7 @@ uifind(uid)
 		struct  uidinfo *old_uip;
 
 		mtx_unlock(&uihashtbl_mtx);
-		uip = malloc(sizeof(*uip), M_UIDINFO, M_WAITOK | M_ZERO);
+		uip = malloc(sizeof(*uip), M_UIDINFO, M_ZERO);
 		mtx_lock(&uihashtbl_mtx);
 		/*
 		 * There's a chance someone created our uidinfo while we
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 154b6e03ab4f..dca389fa65f3 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -490,7 +490,7 @@ hashinit(elements, type, hashmask)
 	for (hashsize = 1; hashsize <= elements; hashsize <<= 1)
 		continue;
 	hashsize >>= 1;
-	hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, M_WAITOK);
+	hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, 0);
 	for (i = 0; i < hashsize; i++)
 		LIST_INIT(&hashtbl[i]);
 	*hashmask = hashsize - 1;
@@ -539,7 +539,7 @@ phashinit(elements, type, nentries)
 		hashsize = primes[i];
 	}
 	hashsize = primes[i - 1];
-	hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, M_WAITOK);
+	hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, 0);
 	for (i = 0; i < hashsize; i++)
 		LIST_INIT(&hashtbl[i]);
 	*nentries = hashsize;
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 08d1f80ec99d..0a0d94cb021e 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -224,7 +224,7 @@ sysctl_ctx_entry_add(struct sysctl_ctx_list *clist, struct sysctl_oid *oidp)
 
 	if (clist == NULL || oidp == NULL)
 		return(NULL);
-	e = malloc(sizeof(struct sysctl_ctx_entry), M_SYSCTLOID, M_WAITOK);
+	e = malloc(sizeof(struct sysctl_ctx_entry), M_SYSCTLOID, 0);
 	e->entry = oidp;
 	TAILQ_INSERT_HEAD(clist, e, link);
 	return (e);
@@ -354,13 +354,13 @@ sysctl_add_oid(struct sysctl_ctx_list *clist, struct sysctl_oid_list *parent,
 			return (NULL);
 		}
 	}
-	oidp = malloc(sizeof(struct sysctl_oid), M_SYSCTLOID, M_WAITOK|M_ZERO);
+	oidp = malloc(sizeof(struct sysctl_oid), M_SYSCTLOID, M_ZERO);
 	oidp->oid_parent = parent;
 	SLIST_NEXT(oidp, oid_link) = NULL;
 	oidp->oid_number = number;
 	oidp->oid_refcnt = 1;
 	len = strlen(name);
-	newname = malloc(len + 1, M_SYSCTLOID, M_WAITOK);
+	newname = malloc(len + 1, M_SYSCTLOID, 0);
 	bcopy(name, newname, len + 1);
 	newname[len] = '\0';
 	oidp->oid_name = newname;
@@ -369,7 +369,7 @@ sysctl_add_oid(struct sysctl_ctx_list *clist, struct sysctl_oid_list *parent,
 	if ((kind & CTLTYPE) == CTLTYPE_NODE) {
 		/* Allocate space for children */
 		SYSCTL_CHILDREN(oidp) = malloc(sizeof(struct sysctl_oid_list),
-		    M_SYSCTLOID, M_WAITOK);
+		    M_SYSCTLOID, 0);
 		SLIST_INIT(SYSCTL_CHILDREN(oidp));
 	} else {
 		oidp->oid_arg1 = arg1;
@@ -378,7 +378,7 @@ sysctl_add_oid(struct sysctl_ctx_list *clist, struct sysctl_oid_list *parent,
 	oidp->oid_fmt = fmt;
 	if (descr) {
 		int len = strlen(descr) + 1;
-		oidp->descr = malloc(len, M_SYSCTLOID, M_WAITOK);
+		oidp->descr = malloc(len, M_SYSCTLOID, 0);
 		if (oidp->descr)
 			strcpy((char *)(uintptr_t)(const void *)oidp->descr, descr);
 	}
@@ -679,7 +679,7 @@ sysctl_sysctl_name2oid(SYSCTL_HANDLER_ARGS)
 	if (req->newlen >= MAXPATHLEN)	/* XXX arbitrary, undocumented */
 		return (ENAMETOOLONG);
 
-	p = malloc(req->newlen+1, M_SYSCTL, M_WAITOK);
+	p = malloc(req->newlen+1, M_SYSCTL, 0);
 
 	error = SYSCTL_IN(req, p, req->newlen);
 	if (error) {
@@ -823,7 +823,7 @@ sysctl_handle_string(SYSCTL_HANDLER_ARGS)
 	 */
 retry:
 	outlen = strlen((char *)arg1)+1;
-	tmparg = malloc(outlen, M_SYSCTLTMP, M_WAITOK);
+	tmparg = malloc(outlen, M_SYSCTLTMP, 0);
 
 	if (strlcpy(tmparg, (char *)arg1, outlen) >= outlen) {
 		free(tmparg, M_SYSCTLTMP);
@@ -867,7 +867,7 @@ sysctl_handle_opaque(SYSCTL_HANDLER_ARGS)
 		sysctl_wire_old_buffer(req, arg2);
 		error = SYSCTL_OUT(req, arg1, arg2);
 	} else {
-		tmparg = malloc(arg2, M_SYSCTLTMP, M_WAITOK);
+		tmparg = malloc(arg2, M_SYSCTLTMP, 0);
 		bcopy(arg1, tmparg, arg2);
 		error = SYSCTL_OUT(req, tmparg, arg2);
 		free(tmparg, M_SYSCTLTMP);
diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c
index 31ed03edaa23..78bce30d776c 100644
--- a/sys/kern/kern_thread.c
+++ b/sys/kern/kern_thread.c
@@ -729,7 +729,7 @@ thread_reap(void)
 struct ksegrp *
 ksegrp_alloc(void)
 {
-	return (uma_zalloc(ksegrp_zone, M_WAITOK));
+	return (uma_zalloc(ksegrp_zone, 0));
 }
 
 /*
@@ -738,7 +738,7 @@ ksegrp_alloc(void)
 struct kse *
 kse_alloc(void)
 {
-	return (uma_zalloc(kse_zone, M_WAITOK));
+	return (uma_zalloc(kse_zone, 0));
 }
 
 /*
@@ -748,7 +748,7 @@ struct thread *
 thread_alloc(void)
 {
 	thread_reap(); /* check if any zombies to get */
-	return (uma_zalloc(thread_zone, M_WAITOK));
+	return (uma_zalloc(thread_zone, 0));
 }
 
 /*
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index f15803fa8435..6c3e4d4fd268 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -235,7 +235,7 @@ link_elf_link_common_finish(linker_file_t lf)
 #ifdef DDB
     GDB_STATE(RT_ADD);
     ef->gdb.l_addr = lf->address;
-    newfilename = malloc(strlen(lf->filename) + 1, M_LINKER, M_WAITOK);
+    newfilename = malloc(strlen(lf->filename) + 1, M_LINKER, 0);
     strcpy(newfilename, lf->filename);
     ef->gdb.l_name = newfilename;
     ef->gdb.l_ld = ef->dynamic;
@@ -571,7 +571,7 @@ link_elf_load_file(linker_class_t cls, const char* filename,
     /*
      * Read the elf header from the file.
      */
-    firstpage = malloc(PAGE_SIZE, M_LINKER, M_WAITOK);
+    firstpage = malloc(PAGE_SIZE, M_LINKER, 0);
     if (firstpage == NULL) {
 	error = ENOMEM;
 	goto out;
@@ -702,7 +702,7 @@ link_elf_load_file(linker_class_t cls, const char* filename,
 	goto out;
     }
 #else
-    ef->address = malloc(mapsize, M_LINKER, M_WAITOK);
+    ef->address = malloc(mapsize, M_LINKER, 0);
     if (!ef->address) {
 	error = ENOMEM;
 	goto out;
@@ -773,7 +773,7 @@ link_elf_load_file(linker_class_t cls, const char* filename,
     nbytes = hdr->e_shnum * hdr->e_shentsize;
     if (nbytes == 0 || hdr->e_shoff == 0)
 	goto nosyms;
-    shdr = malloc(nbytes, M_LINKER, M_WAITOK | M_ZERO);
+    shdr = malloc(nbytes, M_LINKER, M_ZERO);
     if (shdr == NULL) {
 	error = ENOMEM;
 	goto out;
@@ -796,9 +796,9 @@ link_elf_load_file(linker_class_t cls, const char* filename,
 	goto nosyms;
 
     symcnt = shdr[symtabindex].sh_size;
-    ef->symbase = malloc(symcnt, M_LINKER, M_WAITOK);
+    ef->symbase = malloc(symcnt, M_LINKER, 0);
     strcnt = shdr[symstrindex].sh_size;
-    ef->strbase = malloc(strcnt, M_LINKER, M_WAITOK);
+    ef->strbase = malloc(strcnt, M_LINKER, 0);
 
     if (ef->symbase == NULL || ef->strbase == NULL) {
 	error = ENOMEM;
@@ -1124,7 +1124,7 @@ link_elf_lookup_set(linker_file_t lf, const char *name,
 	int len, error = 0, count;
 
 	len = strlen(name) + sizeof("__start_set_"); /* sizeof includes \0 */
-	setsym = malloc(len, M_LINKER, M_WAITOK);
+	setsym = malloc(len, M_LINKER, 0);
 	if (setsym == NULL)
 		return ENOMEM;
 
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index f15803fa8435..6c3e4d4fd268 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -235,7 +235,7 @@ link_elf_link_common_finish(linker_file_t lf)
 #ifdef DDB
     GDB_STATE(RT_ADD);
     ef->gdb.l_addr = lf->address;
-    newfilename = malloc(strlen(lf->filename) + 1, M_LINKER, M_WAITOK);
+    newfilename = malloc(strlen(lf->filename) + 1, M_LINKER, 0);
     strcpy(newfilename, lf->filename);
     ef->gdb.l_name = newfilename;
     ef->gdb.l_ld = ef->dynamic;
@@ -571,7 +571,7 @@ link_elf_load_file(linker_class_t cls, const char* filename,
     /*
      * Read the elf header from the file.
      */
-    firstpage = malloc(PAGE_SIZE, M_LINKER, M_WAITOK);
+    firstpage = malloc(PAGE_SIZE, M_LINKER, 0);
     if (firstpage == NULL) {
 	error = ENOMEM;
 	goto out;
@@ -702,7 +702,7 @@ link_elf_load_file(linker_class_t cls, const char* filename,
 	goto out;
     }
 #else
-    ef->address = malloc(mapsize, M_LINKER, M_WAITOK);
+    ef->address = malloc(mapsize, M_LINKER, 0);
     if (!ef->address) {
 	error = ENOMEM;
 	goto out;
@@ -773,7 +773,7 @@ link_elf_load_file(linker_class_t cls, const char* filename,
     nbytes = hdr->e_shnum * hdr->e_shentsize;
     if (nbytes == 0 || hdr->e_shoff == 0)
 	goto nosyms;
-    shdr = malloc(nbytes, M_LINKER, M_WAITOK | M_ZERO);
+    shdr = malloc(nbytes, M_LINKER, M_ZERO);
     if (shdr == NULL) {
 	error = ENOMEM;
 	goto out;
@@ -796,9 +796,9 @@ link_elf_load_file(linker_class_t cls, const char* filename,
 	goto nosyms;
 
     symcnt = shdr[symtabindex].sh_size;
-    ef->symbase = malloc(symcnt, M_LINKER, M_WAITOK);
+    ef->symbase = malloc(symcnt, M_LINKER, 0);
     strcnt = shdr[symstrindex].sh_size;
-    ef->strbase = malloc(strcnt, M_LINKER, M_WAITOK);
+    ef->strbase = malloc(strcnt, M_LINKER, 0);
 
     if (ef->symbase == NULL || ef->strbase == NULL) {
 	error = ENOMEM;
@@ -1124,7 +1124,7 @@ link_elf_lookup_set(linker_file_t lf, const char *name,
 	int len, error = 0, count;
 
 	len = strlen(name) + sizeof("__start_set_"); /* sizeof includes \0 */
-	setsym = malloc(len, M_LINKER, M_WAITOK);
+	setsym = malloc(len, M_LINKER, 0);
 	if (setsym == NULL)
 		return ENOMEM;
 
diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c
index a58e548401fe..8acf5f53f1d6 100644
--- a/sys/kern/subr_blist.c
+++ b/sys/kern/subr_blist.c
@@ -157,14 +157,14 @@ blist_create(daddr_t blocks)
 		skip = (skip + 1) * BLIST_META_RADIX;
 	}
 
-	bl = malloc(sizeof(struct blist), M_SWAP, M_WAITOK | M_ZERO);
+	bl = malloc(sizeof(struct blist), M_SWAP, M_ZERO);
 
 	bl->bl_blocks = blocks;
 	bl->bl_radix = radix;
 	bl->bl_skip = skip;
 	bl->bl_rootblks = 1 +
 	    blst_radix_init(NULL, bl->bl_radix, bl->bl_skip, blocks);
-	bl->bl_root = malloc(sizeof(blmeta_t) * bl->bl_rootblks, M_SWAP, M_WAITOK);
+	bl->bl_root = malloc(sizeof(blmeta_t) * bl->bl_rootblks, M_SWAP, 0);
 
 #if defined(BLIST_DEBUG)
 	printf(
diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c
index 165f628e256f..e4da151d2cc8 100644
--- a/sys/kern/subr_clist.c
+++ b/sys/kern/subr_clist.c
@@ -135,8 +135,8 @@ cblock_alloc_cblocks(number)
 		cbp = malloc(sizeof *cbp, M_TTYS, M_NOWAIT);
 		if (cbp == NULL) {
 			printf(
-"cblock_alloc_cblocks: M_NOWAIT malloc failed, trying M_WAITOK\n");
-			cbp = malloc(sizeof *cbp, M_TTYS, M_WAITOK);
+"cblock_alloc_cblocks: M_NOWAIT malloc failed, trying blocking malloc\n");
+			cbp = malloc(sizeof *cbp, M_TTYS, 0);
 		}
 		/*
 		 * Freed cblocks have zero quotes and garbage elsewhere.
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 4d2a02d364b9..8eb6f1af0d27 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -176,7 +176,7 @@ disk_create(int unit, struct disk *dp, int flags, struct cdevsw *cdevsw, struct
 	}
 
 	bzero(dp, sizeof(*dp));
-	dp->d_label = malloc(sizeof *dp->d_label, M_DEVBUF, M_WAITOK|M_ZERO);
+	dp->d_label = malloc(sizeof *dp->d_label, M_DEVBUF, M_ZERO);
 
 	if (proto->d_open != diskopen) {
 		*proto = *cdevsw;
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index ee2f236c3447..f674c372db48 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -97,7 +97,7 @@ clone_label(lp)
 {
 	struct disklabel *lp1;
 
-	lp1 = malloc(sizeof *lp1, M_DEVBUF, M_WAITOK);
+	lp1 = malloc(sizeof *lp1, M_DEVBUF, 0);
 	*lp1 = *lp;
 	lp = NULL;
 	if (lp1->d_typename[0] == '\0')
@@ -254,7 +254,7 @@ dscheck(bp, ssp)
 	    && sp->ds_offset != 0) {
 		struct iodone_chain *ic;
 
-		ic = malloc(sizeof *ic , M_DEVBUF, M_WAITOK);
+		ic = malloc(sizeof *ic , M_DEVBUF, 0);
 		ic->ic_prev_flags = bp->bio_flags;
 		ic->ic_prev_iodone = bp->bio_done;
 		ic->ic_prev_iodone_chain = bp->bio_done_chain;
@@ -394,7 +394,7 @@ dsioctl(dev, cmd, data, flags, sspp)
 			return (ENODEV);
 		if (!(flags & FWRITE))
 			return (EBADF);
-		lp = malloc(sizeof *lp, M_DEVBUF, M_WAITOK);
+		lp = malloc(sizeof *lp, M_DEVBUF, 0);
 		if (sp->ds_label == NULL)
 			bzero(lp, sizeof *lp);
 		else
@@ -450,7 +450,7 @@ dsioctl(dev, cmd, data, flags, sspp)
 		 * complete, then lock out future accesses and opens.
 		 */
 		*sspp = NULL;
-		lp = malloc(sizeof *lp, M_DEVBUF, M_WAITOK);
+		lp = malloc(sizeof *lp, M_DEVBUF, 0);
 		*lp = *ssp->dss_slices[WHOLE_DISK_SLICE].ds_label;
 		error = dsopen(dev, S_IFCHR, ssp->dss_oflags, sspp, lp);
 		if (error != 0) {
@@ -567,7 +567,7 @@ dsmakeslicestruct(nslices, lp)
 	struct diskslices *ssp;
 
 	ssp = malloc(offsetof(struct diskslices, dss_slices) +
-		     nslices * sizeof *sp, M_DEVBUF, M_WAITOK);
+		     nslices * sizeof *sp, M_DEVBUF, 0);
 	ssp->dss_first_bsd_slice = COMPATIBILITY_SLICE;
 	ssp->dss_nslices = nslices;
 	ssp->dss_oflags = 0;
diff --git a/sys/kern/subr_mbuf.c b/sys/kern/subr_mbuf.c
index 21e1a401a5b1..7f3f9600f4be 100644
--- a/sys/kern/subr_mbuf.c
+++ b/sys/kern/subr_mbuf.c
@@ -478,7 +478,7 @@ mbuf_init(void *dummy)
 		pcpu_cnt = MB_GET_PCPU_LIST_NUM(&mb_list_mbuf, i);
 		MB_LOCK_CONT(pcpu_cnt);
 		for (j = 0; j < NMB_MBUF_INIT; j++) {
-			if (mb_pop_cont(&mb_list_mbuf, M_DONTWAIT, pcpu_cnt)
+			if (mb_pop_cont(&mb_list_mbuf, M_NOWAIT, pcpu_cnt)
 			    == NULL)
 				goto bad;
 		}
@@ -487,7 +487,7 @@ mbuf_init(void *dummy)
 		pcpu_cnt = MB_GET_PCPU_LIST_NUM(&mb_list_clust, i);
 		MB_LOCK_CONT(pcpu_cnt);
 		for (j = 0; j < NMB_CLUST_INIT; j++) {
-			if (mb_pop_cont(&mb_list_clust, M_DONTWAIT, pcpu_cnt)
+			if (mb_pop_cont(&mb_list_clust, M_NOWAIT, pcpu_cnt)
 			    == NULL)
 				goto bad;
 		}
@@ -528,15 +528,15 @@ mb_pop_cont(struct mb_lstmngr *mb_list, int how, struct mb_pcpu_list *cnt_lst)
 
 	bucket = malloc(sizeof(struct mb_bucket) +
 	    PAGE_SIZE / mb_list->ml_objsize * sizeof(void *), M_MBUF,
-	    how == M_TRYWAIT ? M_WAITOK : M_NOWAIT);
+	    how == 0 ? 0 : M_NOWAIT);
 	if (bucket == NULL)
 		return (NULL);
 
 	p = (caddr_t)kmem_malloc(mb_list->ml_map, PAGE_SIZE,
-	    how == M_TRYWAIT ? M_WAITOK : M_NOWAIT);
+	    how == 0 ? 0 : M_NOWAIT);
 	if (p == NULL) {
 		free(bucket, M_MBUF);
-		if (how == M_TRYWAIT)
+		if (how == 0)
 			mb_list->ml_mapfull = 1;
 		return (NULL);
 	}
@@ -563,7 +563,7 @@ mb_pop_cont(struct mb_lstmngr *mb_list, int how, struct mb_pcpu_list *cnt_lst)
  * The general case is very easy.  Complications only arise if our PCPU
  * container is empty.  Things get worse if the PCPU container is empty,
  * the general container is empty, and we've run out of address space
- * in our map; then we try to block if we're willing to (M_TRYWAIT).
+ * in our map; then we try to block if we're willing to wait.
  */
 static __inline
 void *
@@ -667,7 +667,7 @@ mb_alloc(struct mb_lstmngr *mb_list, int how, short type, short persist,
 				else
 					*pers_list=cnt_lst->mb_cont.mc_numowner;
 			} else {
-				if (how == M_TRYWAIT) {
+				if (how == 0) {
 					/*
 				 	 * Absolute worst-case scenario.
 					 * We block if we're willing to, but
@@ -701,7 +701,7 @@ mb_alloc(struct mb_lstmngr *mb_list, int how, short type, short persist,
 
 /*
  * This is the worst-case scenario called only if we're allocating with
- * M_TRYWAIT.  We first drain all the protocols, then try to find an mbuf
+ * 0.  We first drain all the protocols, then try to find an mbuf
  * by looking in every PCPU container.  If we're still unsuccesful, we
  * try the general container one last time and possibly block on our
  * starved cv.
@@ -1128,8 +1128,8 @@ _mgetm_internal(int how, short type, short persist, int cchnum)
  * Allocate and return a single (normal) mbuf.  NULL is returned on failure.
  *
  * Arguments:
- *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_DONTWAIT to never block.
+ *  - how: 0 to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  M_NOWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1156,8 +1156,8 @@ m_get(int how, short type)
  *  - m: existing chain to which to append new chain (optional).
  *  - len: total length of data to append, either in mbufs or clusters
  *    (we allocate whatever combination yields the best fit).
- *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_DONTWAIT to never block.
+ *  - how: 0 to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  M_NOWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1248,8 +1248,8 @@ failed:
  * Allocate and return a single M_PKTHDR mbuf.  NULL is returned on failure.
  *
  * Arguments:
- *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_DONTWAIT to never block.
+ *  - how: 0 to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  M_NOWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1275,8 +1275,8 @@ m_gethdr(int how, short type)
  * returned on failure.
  *
  * Arguments:
- *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_DONTWAIT to never block.
+ *  - how: 0 to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  M_NOWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1297,8 +1297,8 @@ m_get_clrd(int how, short type)
  * returned on failure.
  *
  * Arguments:
- *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_DONTWAIT to never block.
+ *  - how: 0 to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  M_NOWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1421,8 +1421,8 @@ m_freem(struct mbuf *mb)
  * NULL on failure. 
  *
  * Arguments:
- *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_DONTWAIT to never block.
+ *  - how: 0 to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  M_NOWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  *  - flags: any flags to pass to the mbuf being allocated; if this includes
  *    the M_PKTHDR bit, then the mbuf is configured as a M_PKTHDR mbuf.
@@ -1473,8 +1473,8 @@ m_getcl(int how, short type, int flags)
  *
  * Arguments:
  *  - mb: the existing mbuf to which to attach the allocated cluster.
- *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_DONTWAIT to never block.
+ *  - how: 0 to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  M_NOWAIT to never block.
  */
 void
 m_clget(struct mbuf *mb, int how)
diff --git a/sys/kern/subr_mchain.c b/sys/kern/subr_mchain.c
index b0aef5c6d400..851bc7a8277b 100644
--- a/sys/kern/subr_mchain.c
+++ b/sys/kern/subr_mchain.c
@@ -58,7 +58,7 @@ mb_init(struct mbchain *mbp)
 {
 	struct mbuf *m;
 
-	m = m_gethdr(M_TRYWAIT, MT_DATA);
+	m = m_gethdr(0, MT_DATA);
 	if (m == NULL) 
 		return ENOBUFS;
 	m->m_len = 0;
@@ -115,7 +115,7 @@ mb_reserve(struct mbchain *mbp, int size)
 		panic("mb_reserve: size = %d\n", size);
 	m = mbp->mb_cur;
 	if (mbp->mb_mleft < size) {
-		mn = m_get(M_TRYWAIT, MT_DATA);
+		mn = m_get(0, MT_DATA);
 		if (mn == NULL)
 			return NULL;
 		mbp->mb_cur = m->m_next = mn;
@@ -192,7 +192,7 @@ mb_put_mem(struct mbchain *mbp, c_caddr_t source, int size, int type)
 	while (size > 0) {
 		if (mleft == 0) {
 			if (m->m_next == NULL) {
-				m = m_getm(m, size, M_TRYWAIT, MT_DATA);
+				m = m_getm(m, size, 0, MT_DATA);
 				if (m == NULL)
 					return ENOBUFS;
 			}
@@ -293,7 +293,7 @@ md_init(struct mdchain *mdp)
 {
 	struct mbuf *m;
 
-	m = m_gethdr(M_TRYWAIT, MT_DATA);
+	m = m_gethdr(0, MT_DATA);
 	if (m == NULL) 
 		return ENOBUFS;
 	m->m_len = 0;
@@ -501,7 +501,7 @@ md_get_mbuf(struct mdchain *mdp, int size, struct mbuf **ret)
 {
 	struct mbuf *m = mdp->md_cur, *rm;
 
-	rm = m_copym(m, mdp->md_pos - mtod(m, u_char*), size, M_TRYWAIT);
+	rm = m_copym(m, mdp->md_pos - mtod(m, u_char*), size, 0);
 	if (rm == NULL)
 		return EBADRPC;
 	md_get_mem(mdp, NULL, size, MB_MZERO);
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 5f299f95b771..56f0c2e76905 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -260,8 +260,8 @@ log_console(struct uio *uio)
 	pri = LOG_INFO | LOG_CONSOLE;
 	muio = *uio;
 	iovlen = uio->uio_iovcnt * sizeof (struct iovec);
-	MALLOC(miov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
-	MALLOC(consbuffer, char *, CONSCHUNK, M_TEMP, M_WAITOK);
+	MALLOC(miov, struct iovec *, iovlen, M_TEMP, 0);
+	MALLOC(consbuffer, char *, CONSCHUNK, M_TEMP, 0);
 	bcopy(muio.uio_iov, miov, iovlen);
 	muio.uio_iov = miov;
 	uio = &muio;
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 495959592cb0..2c22a92fbe7e 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -107,7 +107,7 @@ kmupetext(uintfptr_t nhighpc)
 		np.tolimit = MAXARCS;
 	np.tossize = np.tolimit * sizeof(struct tostruct);
 	cp = malloc(np.kcountsize + np.fromssize + np.tossize,
-	    M_GPROF, M_WAITOK);
+	    M_GPROF, 0);
 	/*
 	 * Check for something else extending highpc while we slept.
 	 */
@@ -176,7 +176,7 @@ kmstartup(dummy)
 		p->tolimit = MAXARCS;
 	p->tossize = p->tolimit * sizeof(struct tostruct);
 	cp = (char *)malloc(p->kcountsize + p->fromssize + p->tossize,
-	    M_GPROF, M_WAITOK | M_ZERO);
+	    M_GPROF, M_ZERO);
 	p->tos = (struct tostruct *)cp;
 	cp += p->tossize;
 	p->kcount = (HISTCOUNTER *)cp;
diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c
index 9e63e8e7aaf5..f4ec519f0b74 100644
--- a/sys/kern/subr_sbuf.c
+++ b/sys/kern/subr_sbuf.c
@@ -49,7 +49,7 @@
 
 #ifdef _KERNEL
 MALLOC_DEFINE(M_SBUF, "sbuf", "string buffers");
-#define	SBMALLOC(size)		malloc(size, M_SBUF, M_WAITOK)
+#define	SBMALLOC(size)		malloc(size, M_SBUF, 0)
 #define	SBFREE(buf)		free(buf, M_SBUF)
 #else /* _KERNEL */
 #define	KASSERT(e, m)
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index c26cf47dcee1..9e3ccff82be2 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -248,7 +248,7 @@ readv(td, uap)
 			error = EINVAL;
 			goto done;
 		}
-		MALLOC(iov, struct iovec *, iovlen, M_IOV, M_WAITOK);
+		MALLOC(iov, struct iovec *, iovlen, M_IOV, 0);
 		needfree = iov;
 	} else
 		iov = aiov;
@@ -274,7 +274,7 @@ readv(td, uap)
 	 * if tracing, save a copy of iovec
 	 */
 	if (KTRPOINT(td, KTR_GENIO))  {
-		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, 0);
 		bcopy(auio.uio_iov, ktriov, iovlen);
 		ktruio = auio;
 	}
@@ -480,7 +480,7 @@ writev(td, uap)
 			error = EINVAL;
 			goto done;
 		}
-		MALLOC(iov, struct iovec *, iovlen, M_IOV, M_WAITOK);
+		MALLOC(iov, struct iovec *, iovlen, M_IOV, 0);
 		needfree = iov;
 	} else {
 		iov = aiov;
@@ -508,7 +508,7 @@ writev(td, uap)
 	 * if tracing, save a copy of iovec and uio
 	 */
 	if (KTRPOINT(td, KTR_GENIO))  {
-		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, 0);
 		bcopy(auio.uio_iov, ktriov, iovlen);
 		ktruio = auio;
 	}
@@ -618,7 +618,7 @@ ioctl(td, uap)
 
 	memp = NULL;
 	if (size > sizeof (ubuf.stkbuf)) {
-		memp = malloc((u_long)size, M_IOCTLOPS, M_WAITOK);
+		memp = malloc((u_long)size, M_IOCTLOPS, 0);
 		data = memp;
 	} else {
 		data = ubuf.stkbuf;
@@ -768,7 +768,7 @@ kern_select(struct thread *td, int nd, fd_set *fd_in, fd_set *fd_ou,
 	if (nbufbytes <= sizeof s_selbits)
 		selbits = &s_selbits[0];
 	else
-		selbits = malloc(nbufbytes, M_SELECT, M_WAITOK);
+		selbits = malloc(nbufbytes, M_SELECT, 0);
 
 	/*
 	 * Assign pointers into the bit buffers and fetch the input bits.
@@ -968,7 +968,7 @@ poll(td, uap)
 	}
 	ni = nfds * sizeof(struct pollfd);
 	if (ni > sizeof(smallbits))
-		bits = malloc(ni, M_TEMP, M_WAITOK);
+		bits = malloc(ni, M_TEMP, 0);
 	else
 		bits = smallbits;
 	error = copyin(uap->fds, bits, ni);
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 915ee3ee0b90..937e9091ad6c 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -206,7 +206,7 @@ pipe(td, uap)
 	
 	KASSERT(pipe_zone != NULL, ("pipe_zone not initialized"));
 
-	pmtx = malloc(sizeof(*pmtx), M_TEMP, M_WAITOK | M_ZERO);
+	pmtx = malloc(sizeof(*pmtx), M_TEMP, M_ZERO);
 	
 	rpipe = wpipe = NULL;
 	if (pipe_create(&rpipe) || pipe_create(&wpipe)) {
@@ -346,7 +346,7 @@ pipe_create(cpipep)
 	struct pipe *cpipe;
 	int error;
 
-	*cpipep = uma_zalloc(pipe_zone, M_WAITOK);
+	*cpipep = uma_zalloc(pipe_zone, 0);
 	if (*cpipep == NULL)
 		return (ENOMEM);
 
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index d85cf29d6372..00d0fbb872af 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -141,16 +141,16 @@ msginit()
 	msginfo.msgmax = msginfo.msgseg * msginfo.msgssz;
 	TUNABLE_INT_FETCH("kern.ipc.msgmni", &msginfo.msgmni);
 
-	msgpool = malloc(msginfo.msgmax, M_MSG, M_WAITOK);
+	msgpool = malloc(msginfo.msgmax, M_MSG, 0);
 	if (msgpool == NULL)
 		panic("msgpool is NULL");
-	msgmaps = malloc(sizeof(struct msgmap) * msginfo.msgseg, M_MSG, M_WAITOK);
+	msgmaps = malloc(sizeof(struct msgmap) * msginfo.msgseg, M_MSG, 0);
 	if (msgmaps == NULL)
 		panic("msgmaps is NULL");
-	msghdrs = malloc(sizeof(struct msg) * msginfo.msgtql, M_MSG, M_WAITOK);
+	msghdrs = malloc(sizeof(struct msg) * msginfo.msgtql, M_MSG, 0);
 	if (msghdrs == NULL)
 		panic("msghdrs is NULL");
-	msqids = malloc(sizeof(struct msqid_ds) * msginfo.msgmni, M_MSG, M_WAITOK);
+	msqids = malloc(sizeof(struct msqid_ds) * msginfo.msgmni, M_MSG, 0);
 	if (msqids == NULL)
 		panic("msqids is NULL");
 
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 737ddba8d5b8..f27d1675dbbc 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -185,12 +185,12 @@ seminit(void)
 	TUNABLE_INT_FETCH("kern.ipc.semvmx", &seminfo.semvmx);
 	TUNABLE_INT_FETCH("kern.ipc.semaem", &seminfo.semaem);
 
-	sem = malloc(sizeof(struct sem) * seminfo.semmns, M_SEM, M_WAITOK);
+	sem = malloc(sizeof(struct sem) * seminfo.semmns, M_SEM, 0);
 	sema = malloc(sizeof(struct semid_ds) * seminfo.semmni, M_SEM,
-	    M_WAITOK);
+	    0);
 	sema_mtx = malloc(sizeof(struct mtx) * seminfo.semmni, M_SEM,
-	    M_WAITOK | M_ZERO);
-	semu = malloc(seminfo.semmnu * seminfo.semusz, M_SEM, M_WAITOK);
+	    M_ZERO);
+	semu = malloc(seminfo.semmnu * seminfo.semusz, M_SEM, 0);
 
 	for (i = 0; i < seminfo.semmni; i++) {
 		sema[i].sem_base = 0;
@@ -644,7 +644,7 @@ __semctl(td, uap)
 		if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
 			goto done2;
 		array = malloc(sizeof(*array) * semaptr->sem_nsems, M_TEMP,
-		    M_WAITOK);
+		    0);
 		mtx_lock(sema_mtxp);
 		if ((error = semvalid(uap->semid, semaptr)) != 0)
 			goto done2;
@@ -702,7 +702,7 @@ raced:
 		mtx_unlock(sema_mtxp);
 		if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
 			goto done2;
-		array = malloc(sizeof(*array) * count, M_TEMP, M_WAITOK);
+		array = malloc(sizeof(*array) * count, M_TEMP, 0);
 		copyin(real_arg.array, array, count * sizeof(*array));
 		if (error)
 			break;
@@ -897,7 +897,7 @@ semop(td, uap)
 		    nsops));
 		return (E2BIG);
 	}
-	sops = malloc(nsops * sizeof(sops[0]), M_SEM, M_WAITOK);
+	sops = malloc(nsops * sizeof(sops[0]), M_SEM, 0);
 	if ((error = copyin(uap->sops, sops, nsops * sizeof(sops[0]))) != 0) {
 		DPRINTF(("error = %d from copyin(%08x, %08x, %d)\n", error,
 		    uap->sops, sops, nsops * sizeof(sops[0])));
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 04c9b2a04842..e04531094075 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -314,7 +314,7 @@ shmat(td, uap)
 	shmmap_s = p->p_vmspace->vm_shm;
 	if (shmmap_s == NULL) {
 		size = shminfo.shmseg * sizeof(struct shmmap_state);
-		shmmap_s = malloc(size, M_SHM, M_WAITOK);
+		shmmap_s = malloc(size, M_SHM, 0);
 		for (i = 0; i < shminfo.shmseg; i++)
 			shmmap_s[i].shmid = -1;
 		p->p_vmspace->vm_shm = shmmap_s;
@@ -643,7 +643,7 @@ shmget_allocate_segment(td, uap, mode)
 	shmseg->shm_perm.key = uap->key;
 	shmseg->shm_perm.seq = (shmseg->shm_perm.seq + 1) & 0x7fff;
 	shm_handle = (struct shm_handle *)
-	    malloc(sizeof(struct shm_handle), M_SHM, M_WAITOK);
+	    malloc(sizeof(struct shm_handle), M_SHM, 0);
 	shmid = IXSEQ_TO_IPCID(segnum, shmseg->shm_perm);
 	
 	/*
@@ -756,7 +756,7 @@ shmfork_myhook(p1, p2)
 	int i;
 
 	size = shminfo.shmseg * sizeof(struct shmmap_state);
-	shmmap_s = malloc(size, M_SHM, M_WAITOK);
+	shmmap_s = malloc(size, M_SHM, 0);
 	bcopy(p1->p_vmspace->vm_shm, shmmap_s, size);
 	p2->p_vmspace->vm_shm = shmmap_s;
 	for (i = 0; i < shminfo.shmseg; i++, shmmap_s++)
@@ -791,7 +791,7 @@ shmrealloc(void)
 	if (shmalloced >= shminfo.shmmni)
 		return;
 
-	newsegs = malloc(shminfo.shmmni * sizeof(*newsegs), M_SHM, M_WAITOK);
+	newsegs = malloc(shminfo.shmmni * sizeof(*newsegs), M_SHM, 0);
 	if (newsegs == NULL)
 		return;
 	for (i = 0; i < shmalloced; i++)
@@ -818,7 +818,7 @@ shminit()
 	TUNABLE_INT_FETCH("kern.ipc.shm_use_phys", &shm_use_phys);
 
 	shmalloced = shminfo.shmmni;
-	shmsegs = malloc(shmalloced * sizeof(shmsegs[0]), M_SHM, M_WAITOK);
+	shmsegs = malloc(shmalloced * sizeof(shmsegs[0]), M_SHM, 0);
 	if (shmsegs == NULL)
 		panic("cannot allocate initial memory for sysvshm");
 	for (i = 0; i < shmalloced; i++) {
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index e74902036be9..4a223ffc5ec4 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -2594,7 +2594,7 @@ ttymalloc(struct tty *tp)
 
 	if (tp)
 		return(tp);
-	tp = malloc(sizeof *tp, M_TTYS, M_WAITOK | M_ZERO);
+	tp = malloc(sizeof *tp, M_TTYS, M_ZERO);
 	ttyregister(tp);
 	return (tp);
 }
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 361a5ddedaa2..9d487b7737e0 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -277,7 +277,7 @@ sysctl_kern_console(SYSCTL_HANDLER_ARGS)
 	STAILQ_FOREACH(cnd, &cn_devlist, cnd_next)
 		len += strlen(devtoname(cnd->cnd_cn->cn_dev)) + 1;
 	len = len > CNDEVPATHMAX ? len : CNDEVPATHMAX;
-	MALLOC(name, char *, len, M_TEMP, M_WAITOK | M_ZERO);
+	MALLOC(name, char *, len, M_TEMP, M_ZERO);
 	p = name;
 	STAILQ_FOREACH(cnd, &cn_devlist, cnd_next)
 		p += sprintf(p, "%s,", devtoname(cnd->cnd_cn->cn_dev));
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 098108cc80ab..d954ac757083 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -153,7 +153,7 @@ ptyinit(dev_t devc)
 
 	devc->si_flags &= ~SI_CHEAPCLONE;
 
-	pt = malloc(sizeof(*pt), M_PTY, M_WAITOK | M_ZERO);
+	pt = malloc(sizeof(*pt), M_PTY, M_ZERO);
 	pt->devs = devs = make_dev(&pts_cdevsw, n,
 	    UID_ROOT, GID_WHEEL, 0666, "tty%c%r", names[n / 32], n % 32);
 	pt->devc = devc;
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index 165f628e256f..e4da151d2cc8 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -135,8 +135,8 @@ cblock_alloc_cblocks(number)
 		cbp = malloc(sizeof *cbp, M_TTYS, M_NOWAIT);
 		if (cbp == NULL) {
 			printf(
-"cblock_alloc_cblocks: M_NOWAIT malloc failed, trying M_WAITOK\n");
-			cbp = malloc(sizeof *cbp, M_TTYS, M_WAITOK);
+"cblock_alloc_cblocks: M_NOWAIT malloc failed, trying blocking malloc\n");
+			cbp = malloc(sizeof *cbp, M_TTYS, 0);
 		}
 		/*
 		 * Freed cblocks have zero quotes and garbage elsewhere.
diff --git a/sys/kern/uipc_accf.c b/sys/kern/uipc_accf.c
index b31026af3b68..6580e1d72024 100644
--- a/sys/kern/uipc_accf.c
+++ b/sys/kern/uipc_accf.c
@@ -115,7 +115,7 @@ accept_filt_generic_mod_event(module_t mod, int event, void *data)
 
 	switch (event) {
 	case MOD_LOAD:
-		MALLOC(p, struct accept_filter *, sizeof(*p), M_ACCF, M_WAITOK);
+		MALLOC(p, struct accept_filter *, sizeof(*p), M_ACCF, 0);
 		bcopy(accfp, p, sizeof(*p));
 		s = splnet();
 		error = accept_filt_add(p);
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index bc6aa71e683c..4ea316c5aa0d 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -164,7 +164,7 @@ m_prepend(struct mbuf *m, int len, int how)
 /*
  * Make a copy of an mbuf chain starting "off0" bytes from the beginning,
  * continuing for "len" bytes.  If len is M_COPYALL, copy to end of mbuf.
- * The wait parameter is a choice of M_TRYWAIT/M_DONTWAIT from caller.
+ * The wait parameter is a choice of 0/M_NOWAIT from caller.
  * Note that the copy is read-only, because clusters are not copied,
  * only their reference counts are incremented.
  */
@@ -522,7 +522,7 @@ m_pullup(struct mbuf *n, int len)
 	} else {
 		if (len > MHLEN)
 			goto bad;
-		MGET(m, M_DONTWAIT, n->m_type);
+		MGET(m, M_NOWAIT, n->m_type);
 		if (m == NULL)
 			goto bad;
 		m->m_len = 0;
@@ -639,7 +639,7 @@ m_devget(char *buf, int totlen, int off, struct ifnet *ifp,
 	if (off < 0 || off > MHLEN)
 		return (NULL);
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return (NULL);
 	m->m_pkthdr.rcvif = ifp;
@@ -648,7 +648,7 @@ m_devget(char *buf, int totlen, int off, struct ifnet *ifp,
 
 	while (totlen > 0) {
 		if (top) {
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m == NULL) {
 				m_freem(top);
 				return (NULL);
@@ -656,7 +656,7 @@ m_devget(char *buf, int totlen, int off, struct ifnet *ifp,
 			len = MLEN;
 		}
 		if (totlen + off >= MINCLSIZE) {
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, M_NOWAIT);
 			if (m->m_flags & M_EXT)
 				len = MCLBYTES;
 		} else {
@@ -704,7 +704,7 @@ m_copyback(struct mbuf *m0, int off, int len, caddr_t cp)
 		off -= mlen;
 		totlen += mlen;
 		if (m->m_next == NULL) {
-			n = m_get_clrd(M_DONTWAIT, m->m_type);
+			n = m_get_clrd(M_NOWAIT, m->m_type);
 			if (n == NULL)
 				goto out;
 			n->m_len = min(MLEN, len + off);
@@ -723,7 +723,7 @@ m_copyback(struct mbuf *m0, int off, int len, caddr_t cp)
 		if (len == 0)
 			break;
 		if (m->m_next == NULL) {
-			n = m_get(M_DONTWAIT, m->m_type);
+			n = m_get(M_NOWAIT, m->m_type);
 			if (n == NULL)
 				break;
 			n->m_len = min(MLEN, len);
diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c
index 50b37f54ec44..336ffa5e27de 100644
--- a/sys/kern/uipc_mbuf2.c
+++ b/sys/kern/uipc_mbuf2.c
@@ -171,7 +171,7 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp)
 	 * chop the current mbuf into two pieces, set off to 0.
 	 */
 	if (len <= n->m_len - off) {
-		o = m_dup1(n, off, n->m_len - off, M_DONTWAIT);
+		o = m_dup1(n, off, n->m_len - off, M_NOWAIT);
 		if (o == NULL) {
 			m_freem(m);
 			return NULL;	/* ENOBUFS */
@@ -230,9 +230,9 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp)
 	 * now, we need to do the hard way.  don't m_copy as there's no room
 	 * on both end.
 	 */
-	MGET(o, M_DONTWAIT, m->m_type);
+	MGET(o, M_NOWAIT, m->m_type);
 	if (o && len > MLEN) {
-		MCLGET(o, M_DONTWAIT);
+		MCLGET(o, M_NOWAIT);
 		if ((o->m_flags & M_EXT) == 0) {
 			m_free(o);
 			o = NULL;
diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c
index e3912e1b1cb9..3d9d5b551d00 100644
--- a/sys/kern/uipc_sem.c
+++ b/sys/kern/uipc_sem.c
@@ -188,7 +188,7 @@ sem_create(td, name, ksret, mode, value)
 	uc = p->p_ucred;
 	if (value > SEM_VALUE_MAX)
 		return (EINVAL);
-	ret = malloc(sizeof(*ret), M_SEM, M_WAITOK | M_ZERO);
+	ret = malloc(sizeof(*ret), M_SEM, M_ZERO);
 	if (name != NULL) {
 		len = strlen(name);
 		if (len > SEM_MAX_NAMELEN) {
@@ -200,7 +200,7 @@ sem_create(td, name, ksret, mode, value)
 			free(ret, M_SEM);
 			return (EINVAL);
 		}
-		ret->ks_name = malloc(len + 1, M_SEM, M_WAITOK);
+		ret->ks_name = malloc(len + 1, M_SEM, 0);
 		strcpy(ret->ks_name, name);
 	} else {
 		ret->ks_name = NULL;
@@ -504,7 +504,7 @@ sem_enter(p, ks)
 {
 	struct kuser *ku, *k;
 
-	ku = malloc(sizeof(*ku), M_SEM, M_WAITOK);
+	ku = malloc(sizeof(*ku), M_SEM, 0);
 	ku->ku_pid = p->p_pid;
 	mtx_lock(&sem_lock);
 	k = sem_getuser(p, ks);
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index 3283b58df1dd..d2f1d51637a8 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -315,7 +315,7 @@ sowakeup(so, sb)
 	if ((so->so_state & SS_ASYNC) && so->so_sigio != NULL)
 		pgsigio(&so->so_sigio, SIGIO, 0);
 	if (sb->sb_flags & SB_UPCALL)
-		(*so->so_upcall)(so, so->so_upcallarg, M_DONTWAIT);
+		(*so->so_upcall)(so, so->so_upcallarg, M_NOWAIT);
 	if (sb->sb_flags & SB_AIO)
 		aio_swake(so, sb);
 	KNOTE(&sb->sb_sel.si_note, 0);
@@ -626,7 +626,7 @@ sbappendaddr(sb, asa, m0, control)
 		return (0);
 	if (asa->sa_len > MLEN)
 		return (0);
-	MGET(m, M_DONTWAIT, MT_SONAME);
+	MGET(m, M_NOWAIT, MT_SONAME);
 	if (m == 0)
 		return (0);
 	m->m_len = asa->sa_len;
@@ -833,10 +833,10 @@ sbcreatecontrol(p, size, type, level)
 
 	if (CMSG_SPACE((u_int)size) > MCLBYTES)
 		return ((struct mbuf *) NULL);
-	if ((m = m_get(M_DONTWAIT, MT_CONTROL)) == NULL)
+	if ((m = m_get(M_NOWAIT, MT_CONTROL)) == NULL)
 		return ((struct mbuf *) NULL);
 	if (CMSG_SPACE((u_int)size) > MLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return ((struct mbuf *) NULL);
@@ -924,7 +924,7 @@ dup_sockaddr(sa, canwait)
 	struct sockaddr *sa2;
 
 	MALLOC(sa2, struct sockaddr *, sa->sa_len, M_SONAME, 
-	       canwait ? M_WAITOK : M_NOWAIT);
+	       canwait ? 0 : M_NOWAIT);
 	if (sa2)
 		bcopy(sa, sa2, sa->sa_len);
 	return sa2;
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 4163f2e1d495..1ab28851f83d 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -137,7 +137,7 @@ soalloc(waitok)
 	int flag;
 
 	if (waitok == 1)
-		flag = M_WAITOK;
+		flag = 0;
 	else
 		flag = M_NOWAIT;
 	flag |= M_ZERO;
@@ -482,7 +482,7 @@ bad:
 	return (error);
 }
 
-#define	SBLOCKWAIT(f)	(((f) & MSG_DONTWAIT) ? M_NOWAIT : M_WAITOK)
+#define	SBLOCKWAIT(f)	(((f) & MSG_DONTWAIT) ? M_NOWAIT : 0)
 /*
  * Send on a socket.
  * If send must go all at once and message is larger than
@@ -626,7 +626,7 @@ restart:
 			cow_send = 0;
 #endif /* ZERO_COPY_SOCKETS */
 			if (top == 0) {
-				MGETHDR(m, M_TRYWAIT, MT_DATA);
+				MGETHDR(m, 0, MT_DATA);
 				if (m == NULL) {
 					error = ENOBUFS;
 					goto release;
@@ -635,7 +635,7 @@ restart:
 				m->m_pkthdr.len = 0;
 				m->m_pkthdr.rcvif = (struct ifnet *)0;
 			} else {
-				MGET(m, M_TRYWAIT, MT_DATA);
+				MGET(m, 0, MT_DATA);
 				if (m == NULL) {
 					error = ENOBUFS;
 					goto release;
@@ -657,7 +657,7 @@ restart:
 				} 
 				if (!cow_send){
 #endif /* ZERO_COPY_SOCKETS */
-				MCLGET(m, M_TRYWAIT);
+				MCLGET(m, 0);
 				if ((m->m_flags & M_EXT) == 0)
 					goto nopages;
 				mlen = MCLBYTES;
@@ -788,7 +788,7 @@ soreceive(so, psa, uio, mp0, controlp, flagsp)
 	else
 		flags = 0;
 	if (flags & MSG_OOB) {
-		m = m_get(M_TRYWAIT, MT_DATA);
+		m = m_get(0, MT_DATA);
 		if (m == NULL)
 			return (ENOBUFS);
 		error = (*pr->pr_usrreqs->pru_rcvoob)(so, m, flags & MSG_PEEK);
@@ -1025,7 +1025,7 @@ dontblock:
 				moff += len;
 			else {
 				if (mp)
-					*mp = m_copym(m, 0, len, M_TRYWAIT);
+					*mp = m_copym(m, 0, len, 0);
 				m->m_data += len;
 				m->m_len -= len;
 				so->so_rcv.sb_cc -= len;
@@ -1128,7 +1128,7 @@ sorflush(so)
 	struct sockbuf asb;
 
 	sb->sb_flags |= SB_NOINTR;
-	(void) sblock(sb, M_WAITOK);
+	(void) sblock(sb, 0);
 	s = splimp();
 	socantrcvmore(so);
 	sbunlock(sb);
@@ -1180,7 +1180,7 @@ do_setopt_accept_filter(so, sopt)
 		goto out;
 	}
 	/* don't put large objects on the kernel stack */
-	MALLOC(afap, struct accept_filter_arg *, sizeof(*afap), M_TEMP, M_WAITOK);
+	MALLOC(afap, struct accept_filter_arg *, sizeof(*afap), M_TEMP, 0);
 	error = sooptcopyin(sopt, afap, sizeof *afap, sizeof *afap);
 	afap->af_name[sizeof(afap->af_name)-1] = '\0';
 	afap->af_arg[sizeof(afap->af_arg)-1] = '\0';
@@ -1191,12 +1191,12 @@ do_setopt_accept_filter(so, sopt)
 		error = ENOENT;
 		goto out;
 	}
-	MALLOC(af, struct so_accf *, sizeof(*af), M_ACCF, M_WAITOK | M_ZERO);
+	MALLOC(af, struct so_accf *, sizeof(*af), M_ACCF, M_ZERO);
 	if (afp->accf_create != NULL) {
 		if (afap->af_name[0] != '\0') {
 			int len = strlen(afap->af_name) + 1;
 
-			MALLOC(af->so_accept_filter_str, char *, len, M_ACCF, M_WAITOK);
+			MALLOC(af->so_accept_filter_str, char *, len, M_ACCF, 0);
 			strcpy(af->so_accept_filter_str, afap->af_name);
 		}
 		af->so_accept_filter_arg = afp->accf_create(so, afap->af_arg);
@@ -1478,7 +1478,7 @@ sogetopt(so, sopt)
 			if ((so->so_options & SO_ACCEPTCONN) == 0)
 				return (EINVAL);
 			MALLOC(afap, struct accept_filter_arg *, sizeof(*afap),
-				M_TEMP, M_WAITOK | M_ZERO);
+				M_TEMP, M_ZERO);
 			if ((so->so_options & SO_ACCEPTFILTER) != 0) {
 				strcpy(afap->af_name, so->so_accf->so_accept_filter->accf_name);
 				if (so->so_accf->so_accept_filter_str != NULL)
@@ -1581,11 +1581,11 @@ soopt_getm(struct sockopt *sopt, struct mbuf **mp)
 	struct mbuf *m, *m_prev;
 	int sopt_size = sopt->sopt_valsize;
 
-	MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_DATA);
+	MGET(m, sopt->sopt_td ? 0 : M_NOWAIT, MT_DATA);
 	if (m == 0)
 		return ENOBUFS;
 	if (sopt_size > MLEN) {
-		MCLGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT);
+		MCLGET(m, sopt->sopt_td ? 0 : M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return ENOBUFS;
@@ -1599,13 +1599,13 @@ soopt_getm(struct sockopt *sopt, struct mbuf **mp)
 	m_prev = m;
 
 	while (sopt_size) {
-		MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_DATA);
+		MGET(m, sopt->sopt_td ? 0 : M_NOWAIT, MT_DATA);
 		if (m == 0) {
 			m_freem(*mp);
 			return ENOBUFS;
 		}
 		if (sopt_size > MLEN) {
-			MCLGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT);
+			MCLGET(m, sopt->sopt_td ? 0 : M_NOWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_freem(*mp);
 				return ENOBUFS;
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 3283b58df1dd..d2f1d51637a8 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -315,7 +315,7 @@ sowakeup(so, sb)
 	if ((so->so_state & SS_ASYNC) && so->so_sigio != NULL)
 		pgsigio(&so->so_sigio, SIGIO, 0);
 	if (sb->sb_flags & SB_UPCALL)
-		(*so->so_upcall)(so, so->so_upcallarg, M_DONTWAIT);
+		(*so->so_upcall)(so, so->so_upcallarg, M_NOWAIT);
 	if (sb->sb_flags & SB_AIO)
 		aio_swake(so, sb);
 	KNOTE(&sb->sb_sel.si_note, 0);
@@ -626,7 +626,7 @@ sbappendaddr(sb, asa, m0, control)
 		return (0);
 	if (asa->sa_len > MLEN)
 		return (0);
-	MGET(m, M_DONTWAIT, MT_SONAME);
+	MGET(m, M_NOWAIT, MT_SONAME);
 	if (m == 0)
 		return (0);
 	m->m_len = asa->sa_len;
@@ -833,10 +833,10 @@ sbcreatecontrol(p, size, type, level)
 
 	if (CMSG_SPACE((u_int)size) > MCLBYTES)
 		return ((struct mbuf *) NULL);
-	if ((m = m_get(M_DONTWAIT, MT_CONTROL)) == NULL)
+	if ((m = m_get(M_NOWAIT, MT_CONTROL)) == NULL)
 		return ((struct mbuf *) NULL);
 	if (CMSG_SPACE((u_int)size) > MLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return ((struct mbuf *) NULL);
@@ -924,7 +924,7 @@ dup_sockaddr(sa, canwait)
 	struct sockaddr *sa2;
 
 	MALLOC(sa2, struct sockaddr *, sa->sa_len, M_SONAME, 
-	       canwait ? M_WAITOK : M_NOWAIT);
+	       canwait ? 0 : M_NOWAIT);
 	if (sa2)
 		bcopy(sa, sa2, sa->sa_len);
 	return sa2;
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 2bd0c9f04665..8fd69e7ff49d 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -648,7 +648,7 @@ sendit(td, s, mp, flags)
 		if (mp->msg_flags == MSG_COMPAT) {
 			register struct cmsghdr *cm;
 
-			M_PREPEND(control, sizeof(*cm), M_TRYWAIT);
+			M_PREPEND(control, sizeof(*cm), 0);
 			if (control == 0) {
 				error = ENOBUFS;
 				goto bad;
@@ -666,7 +666,7 @@ sendit(td, s, mp, flags)
 #ifdef KTRACE
 	if (KTRPOINT(td, KTR_GENIO)) {
 		iovlen = auio.uio_iovcnt * sizeof (struct iovec);
-		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, 0);
 		bcopy(auio.uio_iov, ktriov, iovlen);
 		ktruio = auio;
 	}
@@ -798,7 +798,7 @@ osendmsg(td, uap)
 		}
 		MALLOC(iov, struct iovec *,
 		      sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV,
-		      M_WAITOK);
+		      0);
 	} else {
 		iov = aiov;
 	}
@@ -845,7 +845,7 @@ sendmsg(td, uap)
 		}
 		MALLOC(iov, struct iovec *,
 		       sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV,
-		       M_WAITOK);
+		       0);
 	} else {
 		iov = aiov;
 	}
@@ -915,7 +915,7 @@ recvit(td, s, mp, namelenp)
 #ifdef KTRACE
 	if (KTRPOINT(td, KTR_GENIO)) {
 		iovlen = auio.uio_iovcnt * sizeof (struct iovec);
-		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, 0);
 		bcopy(auio.uio_iov, ktriov, iovlen);
 		ktruio = auio;
 	}
@@ -1148,7 +1148,7 @@ orecvmsg(td, uap)
 		}
 		MALLOC(iov, struct iovec *,
 		      sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV,
-		      M_WAITOK);
+		      0);
 	} else {
 		iov = aiov;
 	}
@@ -1199,7 +1199,7 @@ recvmsg(td, uap)
 		}
 		MALLOC(iov, struct iovec *,
 		       sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV,
-		       M_WAITOK);
+		       0);
 	} else {
 		iov = aiov;
 	}
@@ -1535,7 +1535,7 @@ sockargs(mp, buf, buflen, type)
 #endif
 		return (EINVAL);
 	}
-	m = m_get(M_TRYWAIT, type);
+	m = m_get(0, type);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_len = buflen;
@@ -1568,7 +1568,7 @@ getsockaddr(namp, uaddr, len)
 
 	if (len > SOCK_MAXADDRLEN)
 		return ENAMETOOLONG;
-	MALLOC(sa, struct sockaddr *, len, M_SONAME, M_WAITOK);
+	MALLOC(sa, struct sockaddr *, len, M_SONAME, 0);
 	error = copyin(uaddr, sa, len);
 	if (error) {
 		FREE(sa, M_SONAME);
@@ -1782,7 +1782,7 @@ do_sendfile(struct thread *td, struct sendfile_args *uap, int compat)
 	/*
 	 * Protect against multiple writers to the socket.
 	 */
-	(void) sblock(&so->so_snd, M_WAITOK);
+	(void) sblock(&so->so_snd, 0);
 
 	/*
 	 * Loop through the pages in the file, starting with the requested
@@ -1926,7 +1926,7 @@ retry_lookup:
 		/*
 		 * Get an mbuf header and set it up as having external storage.
 		 */
-		MGETHDR(m, M_TRYWAIT, MT_DATA);
+		MGETHDR(m, 0, MT_DATA);
 		if (m == NULL) {
 			error = ENOBUFS;
 			sf_buf_free((void *)sf->kva, NULL);
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 04b4c6d1a551..2907cf2d046a 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -533,7 +533,7 @@ unp_attach(so)
 		if (error)
 			return (error);
 	}
-	unp = uma_zalloc(unp_zone, M_WAITOK);
+	unp = uma_zalloc(unp_zone, 0);
 	if (unp == NULL)
 		return (ENOBUFS);
 	bzero(unp, sizeof *unp);
@@ -605,7 +605,7 @@ unp_bind(unp, nam, td)
 	if (namelen <= 0)
 		return EINVAL;
 
-	buf = malloc(namelen + 1, M_TEMP, M_WAITOK);
+	buf = malloc(namelen + 1, M_TEMP, 0);
 	strlcpy(buf, soun->sun_path, namelen + 1);
 
 restart:
@@ -848,7 +848,7 @@ unp_pcblist(SYSCTL_HANDLER_ARGS)
 	/*
 	 * OK, now we're committed to doing something.
 	 */
-	xug = malloc(sizeof(*xug), M_TEMP, M_WAITOK);
+	xug = malloc(sizeof(*xug), M_TEMP, 0);
 	gencnt = unp_gencnt;
 	n = unp_count;
 
@@ -862,7 +862,7 @@ unp_pcblist(SYSCTL_HANDLER_ARGS)
 		return error;
 	}
 
-	unp_list = malloc(n * sizeof *unp_list, M_TEMP, M_WAITOK);
+	unp_list = malloc(n * sizeof *unp_list, M_TEMP, 0);
 	
 	for (unp = LIST_FIRST(head), i = 0; unp && i < n;
 	     unp = LIST_NEXT(unp, unp_link)) {
@@ -876,7 +876,7 @@ unp_pcblist(SYSCTL_HANDLER_ARGS)
 	n = i;			/* in case we lost some during malloc */
 
 	error = 0;
-	xu = malloc(sizeof(*xu), M_TEMP, M_WAITOK);
+	xu = malloc(sizeof(*xu), M_TEMP, 0);
 	for (i = 0; i < n; i++) {
 		unp = unp_list[i];
 		if (unp->unp_gencnt <= gencnt) {
@@ -1379,7 +1379,7 @@ unp_gc()
 	 *
 	 * 91/09/19, bsy@cs.cmu.edu
 	 */
-	extra_ref = malloc(nfiles * sizeof(struct file *), M_TEMP, M_WAITOK);
+	extra_ref = malloc(nfiles * sizeof(struct file *), M_TEMP, 0);
 	sx_slock(&filelist_lock);
 	for (nunref = 0, fp = LIST_FIRST(&filehead), fpp = extra_ref; fp != 0;
 	    fp = nextfp) {
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 9532ff21bf2e..5cee627cff24 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -392,7 +392,7 @@ aio_init_aioinfo(struct proc *p)
 	struct kaioinfo *ki;
 
 	if (p->p_aioinfo == NULL) {
-		ki = uma_zalloc(kaio_zone, M_WAITOK);
+		ki = uma_zalloc(kaio_zone, 0);
 		p->p_aioinfo = ki;
 		ki->kaio_flags = 0;
 		ki->kaio_maxactive_count = max_aio_per_proc;
@@ -777,7 +777,7 @@ aio_daemon(void *uproc)
 	 * Allocate and ready the aio control info.  There is one aiop structure
 	 * per daemon.
 	 */
-	aiop = uma_zalloc(aiop_zone, M_WAITOK);
+	aiop = uma_zalloc(aiop_zone, 0);
 	aiop->aiothread = td;
 	aiop->aiothreadflags |= AIOP_FREE;
 
@@ -801,9 +801,9 @@ aio_daemon(void *uproc)
 	mtx_unlock(&Giant);
 	/* The daemon resides in its own pgrp. */
 	MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP,
-		M_WAITOK | M_ZERO);
+		M_ZERO);
 	MALLOC(newsess, struct session *, sizeof(struct session), M_SESSION,
-		M_WAITOK | M_ZERO);
+		M_ZERO);
 
 	sx_xlock(&proctree_lock);
 	enterpgrp(mycp, mycp->p_pid, newpgrp, newsess);
@@ -1301,7 +1301,7 @@ _aio_aqueue(struct thread *td, struct aiocb *job, struct aio_liojob *lj, int typ
 	struct kqueue *kq;
 	struct file *kq_fp;
 
-	aiocbe = uma_zalloc(aiocb_zone, M_WAITOK);
+	aiocbe = uma_zalloc(aiocb_zone, 0);
 	aiocbe->inputcharge = 0;
 	aiocbe->outputcharge = 0;
 	callout_handle_init(&aiocbe->timeouthandle);
@@ -1647,8 +1647,8 @@ aio_suspend(struct thread *td, struct aio_suspend_args *uap)
 		return (EAGAIN);
 
 	njoblist = 0;
-	ijoblist = uma_zalloc(aiol_zone, M_WAITOK);
-	ujoblist = uma_zalloc(aiol_zone, M_WAITOK);
+	ijoblist = uma_zalloc(aiol_zone, 0);
+	ujoblist = uma_zalloc(aiol_zone, 0);
 	cbptr = uap->aiocbp;
 
 	for (i = 0; i < uap->nent; i++) {
@@ -1971,7 +1971,7 @@ lio_listio(struct thread *td, struct lio_listio_args *uap)
 	if ((nent + ki->kaio_queue_count) > ki->kaio_qallowed_count)
 		return (EAGAIN);
 
-	lj = uma_zalloc(aiolio_zone, M_WAITOK);
+	lj = uma_zalloc(aiolio_zone, 0);
 	if (!lj)
 		return (EAGAIN);
 
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 9de4fd137ae6..0f8830a66fbc 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -2641,7 +2641,7 @@ allocbuf(struct buf *bp, int size)
 				(bp->b_bufsize == 0) &&
 				(mbsize <= PAGE_SIZE/2)) {
 
-				bp->b_data = malloc(mbsize, M_BIOBUF, M_WAITOK);
+				bp->b_data = malloc(mbsize, M_BIOBUF, 0);
 				bp->b_bufsize = mbsize;
 				bp->b_bcount = size;
 				bp->b_flags |= B_MALLOC;
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 80ea2f05dc7c..c74f4ee98709 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -413,7 +413,7 @@ cache_enter(dvp, vp, cnp)
 	}
 	 
 	ncp = (struct namecache *)
-		malloc(sizeof *ncp + cnp->cn_namelen, M_VFSCACHE, M_WAITOK);
+		malloc(sizeof *ncp + cnp->cn_namelen, M_VFSCACHE, 0);
 	bzero((char *)ncp, sizeof *ncp);
 	numcache++;
 	if (!vp) {
@@ -729,7 +729,7 @@ kern___getcwd(struct thread *td, u_char *buf, enum uio_seg bufseg, u_int buflen)
 	if (buflen > MAXPATHLEN)
 		buflen = MAXPATHLEN;
 	error = 0;
-	tmpbuf = bp = malloc(buflen, M_TEMP, M_WAITOK);
+	tmpbuf = bp = malloc(buflen, M_TEMP, 0);
 	bp += buflen - 1;
 	*bp = '\0';
 	fdp = td->td_proc->p_fd;
@@ -840,7 +840,7 @@ vn_fullpath(struct thread *td, struct vnode *vn, char **retbuf, char **freebuf)
 		return (ENODEV);
 	if (vn == NULL)
 		return (EINVAL);
-	buf = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+	buf = malloc(MAXPATHLEN, M_TEMP, 0);
 	bp = buf + MAXPATHLEN - 1;
 	*bp = '\0';
 	fdp = td->td_proc->p_fd;
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 7fd04023a8f0..da8441978fb1 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -1001,7 +1001,7 @@ cluster_collectbufs(vp, last_bp)
 
 	len = vp->v_lastw - vp->v_cstart + 1;
 	buflist = malloc(sizeof(struct buf *) * (len + 1) + sizeof(*buflist),
-	    M_SEGMENT, M_WAITOK);
+	    M_SEGMENT, 0);
 	buflist->bs_nchildren = 0;
 	buflist->bs_children = (struct buf **) (buflist + 1);
 	for (lbn = vp->v_cstart, i = 0; i < len; lbn++, i++) {
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index b909b8304246..80158a34f1e2 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -122,7 +122,7 @@ vfs_hang_addrlist(mp, nep, argp)
 		return (EINVAL);
 
 	i = sizeof(struct netcred) + argp->ex_addrlen + argp->ex_masklen;
-	np = (struct netcred *) malloc(i, M_NETADDR, M_WAITOK | M_ZERO);
+	np = (struct netcred *) malloc(i, M_NETADDR, M_ZERO);
 	saddr = (struct sockaddr *) (np + 1);
 	if ((error = copyin(argp->ex_addr, saddr, argp->ex_addrlen)))
 		goto out;
@@ -236,7 +236,7 @@ vfs_export(mp, argp)
 	}
 	if (argp->ex_flags & MNT_EXPORTED) {
 		if (nep == NULL) {
-			nep = malloc(sizeof(struct netexport), M_MOUNT, M_WAITOK | M_ZERO);
+			nep = malloc(sizeof(struct netexport), M_MOUNT, M_ZERO);
 			mp->mnt_export = nep;
 		}
 		if (argp->ex_flags & MNT_EXPUBLIC) {
@@ -306,7 +306,7 @@ vfs_setpublicfs(mp, nep, argp)
 	 */
 	if (argp->ex_indexfile != NULL) {
 		MALLOC(nfs_pub.np_index, char *, MAXNAMLEN + 1, M_TEMP,
-		    M_WAITOK);
+		    0);
 		error = copyinstr(argp->ex_indexfile, nfs_pub.np_index,
 		    MAXNAMLEN, (size_t *)0);
 		if (!error) {
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 432ebede6d4b..2fbdcfea9531 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -1104,7 +1104,7 @@ kern_symlink(struct thread *td, char *path, char *link, enum uio_seg segflg)
 	if (segflg == UIO_SYSSPACE) {
 		syspath = path;
 	} else {
-		syspath = uma_zalloc(namei_zone, M_WAITOK);
+		syspath = uma_zalloc(namei_zone, 0);
 		if ((error = copyinstr(path, syspath, MAXPATHLEN, NULL)) != 0)
 			goto out;
 	}
@@ -3110,7 +3110,7 @@ unionread:
 		kuio.uio_iov = &kiov;
 		kuio.uio_segflg = UIO_SYSSPACE;
 		kiov.iov_len = uap->count;
-		MALLOC(dirbuf, caddr_t, uap->count, M_TEMP, M_WAITOK);
+		MALLOC(dirbuf, caddr_t, uap->count, M_TEMP, 0);
 		kiov.iov_base = dirbuf;
 		error = VOP_READDIR(vp, &kuio, fp->f_cred, &eofflag,
 			    NULL, NULL);
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index b221cd3aa3cb..24ae27acc1e4 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -133,7 +133,7 @@ vfs_opv_recalc(void)
 	 * detectable.
 	 */
 	MALLOC(vfs_op_offsets, int *,
-		num_op_descs * sizeof(int), M_TEMP, M_WAITOK);
+		num_op_descs * sizeof(int), M_TEMP, 0);
 	if (vfs_op_offsets == NULL)
 		panic("vfs_opv_recalc: no memory");
 	for (i = 0; i < num_op_descs; i++)
@@ -186,7 +186,7 @@ vfs_opv_recalc(void)
 		if (*opv_desc_vector_p == NULL)
 			MALLOC(*opv_desc_vector_p, vop_t **,
 				vfs_opv_numops * sizeof(vop_t *), M_VNODE,
-				M_WAITOK | M_ZERO);
+				M_ZERO);
 
 		/* Fill in, with slot 0 being to return EOPNOTSUPP */
 		opv_desc_vector = *opv_desc_vector_p;
@@ -221,7 +221,7 @@ vfs_add_vnodeops(const void *data)
 
 	opv = (const struct vnodeopv_desc *)data;
 	MALLOC(newopv, const struct vnodeopv_desc **,
-	       (vnodeopv_num + 1) * sizeof(*newopv), M_VNODE, M_WAITOK);
+	       (vnodeopv_num + 1) * sizeof(*newopv), M_VNODE, 0);
 	if (vnodeopv_descs) {
 		bcopy(vnodeopv_descs, newopv, vnodeopv_num * sizeof(*newopv));
 		FREE(vnodeopv_descs, M_VNODE);
@@ -244,11 +244,11 @@ vfs_add_vnodeops(const void *data)
 			/* not found, new entry */
 			MALLOC(newop, struct vnodeop_desc **,
 			       (num_op_descs + 1) * sizeof(*newop),
-			       M_VNODE, M_WAITOK);
+			       M_VNODE, 0);
 			/* new reference count (for unload) */
 			MALLOC(newref, int *,
 				(num_op_descs + 1) * sizeof(*newref),
-				M_VNODE, M_WAITOK);
+				M_VNODE, 0);
 			if (vfs_op_descs) {
 				bcopy(vfs_op_descs, newop,
 					num_op_descs * sizeof(*newop));
@@ -306,11 +306,11 @@ vfs_rm_vnodeops(const void *data)
 			}
 			MALLOC(newop, struct vnodeop_desc **,
 			       (num_op_descs - 1) * sizeof(*newop),
-			       M_VNODE, M_WAITOK);
+			       M_VNODE, 0);
 			/* new reference count (for unload) */
 			MALLOC(newref, int *,
 				(num_op_descs - 1) * sizeof(*newref),
-				M_VNODE, M_WAITOK);
+				M_VNODE, 0);
 			for (k = j; k < (num_op_descs - 1); k++) {
 				vfs_op_descs[k] = vfs_op_descs[k + 1];
 				vfs_op_desc_refs[k] = vfs_op_desc_refs[k + 1];
@@ -340,7 +340,7 @@ vfs_rm_vnodeops(const void *data)
 	if (opv_desc_vector != NULL)
 		FREE(opv_desc_vector, M_VNODE);
 	MALLOC(newopv, const struct vnodeopv_desc **,
-	       (vnodeopv_num - 1) * sizeof(*newopv), M_VNODE, M_WAITOK);
+	       (vnodeopv_num - 1) * sizeof(*newopv), M_VNODE, 0);
 	bcopy(vnodeopv_descs, newopv, (vnodeopv_num - 1) * sizeof(*newopv));
 	FREE(vnodeopv_descs, M_VNODE);
 	vnodeopv_descs = newopv;
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index f064b6460ad9..e33e2c650b6a 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -120,7 +120,7 @@ namei(ndp)
 	 * name into the buffer.
 	 */
 	if ((cnp->cn_flags & HASBUF) == 0)
-		cnp->cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
+		cnp->cn_pnbuf = uma_zalloc(namei_zone, 0);
 	if (ndp->ni_segflg == UIO_SYSSPACE)
 		error = copystr(ndp->ni_dirp, cnp->cn_pnbuf,
 			    MAXPATHLEN, (size_t *)&ndp->ni_pathlen);
@@ -224,7 +224,7 @@ namei(ndp)
 		}
 #endif
 		if (ndp->ni_pathlen > 1)
-			cp = uma_zalloc(namei_zone, M_WAITOK);
+			cp = uma_zalloc(namei_zone, 0);
 		else
 			cp = cnp->cn_pnbuf;
 		aiov.iov_base = cp;
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index a5e5989e320e..52937c923931 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -224,13 +224,13 @@ vfs_buildopts(struct uio *auio, struct vfsoptlist **options)
 	int error, namelen, optlen;
 
 	iovcnt = auio->uio_iovcnt;
-	opts = malloc(sizeof(struct vfsoptlist), M_MOUNT, M_WAITOK);
+	opts = malloc(sizeof(struct vfsoptlist), M_MOUNT, 0);
 	TAILQ_INIT(opts);
 	for (i = 0; i < iovcnt; i += 2) {
-		opt = malloc(sizeof(struct vfsopt), M_MOUNT, M_WAITOK);
+		opt = malloc(sizeof(struct vfsopt), M_MOUNT, 0);
 		namelen = auio->uio_iov[i].iov_len;
 		optlen = auio->uio_iov[i + 1].iov_len;
-		opt->name = malloc(namelen, M_MOUNT, M_WAITOK);
+		opt->name = malloc(namelen, M_MOUNT, 0);
 		opt->value = NULL;
 		if (auio->uio_segflg == UIO_SYSSPACE) {
 			bcopy(auio->uio_iov[i].iov_base, opt->name, namelen);
@@ -242,7 +242,7 @@ vfs_buildopts(struct uio *auio, struct vfsoptlist **options)
 		}
 		opt->len = optlen;
 		if (optlen != 0) {
-			opt->value = malloc(optlen, M_MOUNT, M_WAITOK);
+			opt->value = malloc(optlen, M_MOUNT, 0);
 			if (auio->uio_segflg == UIO_SYSSPACE) {
 				bcopy(auio->uio_iov[i + 1].iov_base, opt->value,
 				    optlen);
@@ -289,11 +289,11 @@ vfs_mergeopts(struct vfsoptlist *toopts, struct vfsoptlist *opts)
 			opt2 = TAILQ_NEXT(opt2, link);
 		}
 		/* We want this option, duplicate it. */
-		new = malloc(sizeof(struct vfsopt), M_MOUNT, M_WAITOK);
-		new->name = malloc(strlen(opt->name) + 1, M_MOUNT, M_WAITOK);
+		new = malloc(sizeof(struct vfsopt), M_MOUNT, 0);
+		new->name = malloc(strlen(opt->name) + 1, M_MOUNT, 0);
 		strcpy(new->name, opt->name);
 		if (opt->len != 0) {
-			new->value = malloc(opt->len, M_MOUNT, M_WAITOK);
+			new->value = malloc(opt->len, M_MOUNT, 0);
 			bcopy(opt->value, new->value, opt->len);
 		} else {
 			new->value = NULL;
@@ -334,7 +334,7 @@ nmount(td, uap)
 		return (EINVAL);
 
 	if (iovcnt > UIO_SMALLIOV) {
-		MALLOC(iov, struct iovec *, iovlen, M_IOV, M_WAITOK);
+		MALLOC(iov, struct iovec *, iovlen, M_IOV, 0);
 		needfree = iov;
 	} else {
 		iov = aiov;
@@ -406,8 +406,8 @@ kernel_vmount(int flags, ...)
 		return (EINVAL);
 
 	iovlen = iovcnt * sizeof (struct iovec);
-	MALLOC(iovp, struct iovec *, iovlen, M_MOUNT, M_WAITOK);
-	MALLOC(buf, char *, len, M_MOUNT, M_WAITOK);
+	MALLOC(iovp, struct iovec *, iovlen, M_MOUNT, 0);
+	MALLOC(buf, char *, len, M_MOUNT, 0);
 	pos = buf;
 	va_start(ap, flags);
 	for (i = 0; i < iovcnt; i++) {
@@ -634,7 +634,7 @@ vfs_nmount(td, fsflags, fsoptions)
 	/*
 	 * Allocate and initialize the filesystem.
 	 */
-	mp = malloc(sizeof(struct mount), M_MOUNT, M_WAITOK | M_ZERO);
+	mp = malloc(sizeof(struct mount), M_MOUNT, M_ZERO);
 	TAILQ_INIT(&mp->mnt_nvnodelist);
 	TAILQ_INIT(&mp->mnt_reservedvnlist);
 	lockinit(&mp->mnt_lock, PVFS, "vfslock", 0, LK_NOPAUSE);
@@ -805,8 +805,8 @@ mount(td, uap)
 	char *fspath;
 	int error;
 
-	fstype = malloc(MFSNAMELEN, M_TEMP, M_WAITOK);
-	fspath = malloc(MNAMELEN, M_TEMP, M_WAITOK);
+	fstype = malloc(MFSNAMELEN, M_TEMP, 0);
+	fspath = malloc(MNAMELEN, M_TEMP, 0);
 
 	/*
 	 * vfs_mount() actually takes a kernel string for `type' and
@@ -998,7 +998,7 @@ vfs_mount(td, fstype, fspath, fsflags, fsdata)
 	/*
 	 * Allocate and initialize the filesystem.
 	 */
-	mp = malloc(sizeof(struct mount), M_MOUNT, M_WAITOK | M_ZERO);
+	mp = malloc(sizeof(struct mount), M_MOUNT, M_ZERO);
 	TAILQ_INIT(&mp->mnt_nvnodelist);
 	TAILQ_INIT(&mp->mnt_reservedvnlist);
 	lockinit(&mp->mnt_lock, PVFS, "vfslock", 0, LK_NOPAUSE);
@@ -1361,7 +1361,7 @@ vfs_rootmountalloc(fstypename, devname, mpp)
 			break;
 	if (vfsp == NULL)
 		return (ENODEV);
-	mp = malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK | M_ZERO);
+	mp = malloc((u_long)sizeof(struct mount), M_MOUNT, M_ZERO);
 	lockinit(&mp->mnt_lock, PVFS, "vfslock", 0, LK_NOPAUSE);
 	(void)vfs_busy(mp, LK_NOWAIT, 0, td);
 	TAILQ_INIT(&mp->mnt_nvnodelist);
@@ -1494,8 +1494,8 @@ vfs_mountroot_try(char *mountfrom)
 	splx(s);
 
 	/* parse vfs name and path */
-	vfsname = malloc(MFSNAMELEN, M_MOUNT, M_WAITOK);
-	path = malloc(MNAMELEN, M_MOUNT, M_WAITOK);
+	vfsname = malloc(MFSNAMELEN, M_MOUNT, 0);
+	path = malloc(MNAMELEN, M_MOUNT, 0);
 	vfsname[0] = path[0] = 0;
 	sprintf(patt, "%%%d[a-z0-9]:%%%zds", MFSNAMELEN, MNAMELEN);
 	if (sscanf(mountfrom, patt, vfsname, path) < 1)
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 8e954eb6a48d..7f3af03eac91 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -452,7 +452,7 @@ vop_lock_post(void *ap, int rc)
 void
 v_addpollinfo(struct vnode *vp)
 {
-	vp->v_pollinfo = uma_zalloc(vnodepoll_zone, M_WAITOK);
+	vp->v_pollinfo = uma_zalloc(vnodepoll_zone, 0);
 	mtx_init(&vp->v_pollinfo->vpi_lock, "vnode pollinfo", NULL, MTX_DEF);
 }
 
@@ -996,7 +996,7 @@ getnewvnode(tag, mp, vops, vpp)
 		numvnodes++;
 		mtx_unlock(&vnode_free_list_mtx);
 
-		vp = (struct vnode *) uma_zalloc(vnode_zone, M_WAITOK|M_ZERO);
+		vp = (struct vnode *) uma_zalloc(vnode_zone, M_ZERO);
 		mtx_init(&vp->v_interlock, "vnode interlock", NULL, MTX_DEF);
 		VI_LOCK(vp);
 		vp->v_dd = vp;
@@ -2938,7 +2938,7 @@ sysctl_vfs_conflist(SYSCTL_HANDLER_ARGS)
 	cnt = 0;
 	for (vfsp = vfsconf; vfsp != NULL; vfsp = vfsp->vfc_next)
 		cnt++;
-	xvfsp = malloc(sizeof(struct xvfsconf) * cnt, M_TEMP, M_WAITOK);
+	xvfsp = malloc(sizeof(struct xvfsconf) * cnt, M_TEMP, 0);
 	/*
 	 * Handle the race that we will have here when struct vfsconf
 	 * will be locked down by using both cnt and checking vfc_next
@@ -3051,7 +3051,7 @@ sysctl_vnode(SYSCTL_HANDLER_ARGS)
 		return (SYSCTL_OUT(req, 0, len));
 
 	sysctl_wire_old_buffer(req, 0);
-	xvn = malloc(len, M_TEMP, M_ZERO | M_WAITOK);
+	xvn = malloc(len, M_TEMP, M_ZERO | 0);
 	n = 0;
 	mtx_lock(&mountlist_mtx);
 	TAILQ_FOREACH(mp, &mountlist, mnt_list) {
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 432ebede6d4b..2fbdcfea9531 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1104,7 +1104,7 @@ kern_symlink(struct thread *td, char *path, char *link, enum uio_seg segflg)
 	if (segflg == UIO_SYSSPACE) {
 		syspath = path;
 	} else {
-		syspath = uma_zalloc(namei_zone, M_WAITOK);
+		syspath = uma_zalloc(namei_zone, 0);
 		if ((error = copyinstr(path, syspath, MAXPATHLEN, NULL)) != 0)
 			goto out;
 	}
@@ -3110,7 +3110,7 @@ unionread:
 		kuio.uio_iov = &kiov;
 		kuio.uio_segflg = UIO_SYSSPACE;
 		kiov.iov_len = uap->count;
-		MALLOC(dirbuf, caddr_t, uap->count, M_TEMP, M_WAITOK);
+		MALLOC(dirbuf, caddr_t, uap->count, M_TEMP, 0);
 		kiov.iov_base = dirbuf;
 		error = VOP_READDIR(vp, &kuio, fp->f_cred, &eofflag,
 			    NULL, NULL);
diff --git a/sys/libkern/iconv.c b/sys/libkern/iconv.c
index 8bc03c1e7a1f..8352fcd1f832 100644
--- a/sys/libkern/iconv.c
+++ b/sys/libkern/iconv.c
@@ -186,7 +186,7 @@ iconv_register_cspair(const char *to, const char *from,
 	ucsfrom = strcmp(from, iconv_unicode_string) == 0;
 	if (!ucsfrom)
 		csize += strlen(from) + 1;
-	csp = malloc(csize, M_ICONV, M_WAITOK);
+	csp = malloc(csize, M_ICONV, 0);
 	bzero(csp, csize);
 	csp->cp_id = iconv_csid++;
 	csp->cp_dcp = dcp;
@@ -360,7 +360,7 @@ iconv_sysctl_add(SYSCTL_HANDLER_ARGS)
 	if (error)
 		return error;
 	if (din.ia_datalen) {
-		csp->cp_data = malloc(din.ia_datalen, M_ICONVDATA, M_WAITOK);
+		csp->cp_data = malloc(din.ia_datalen, M_ICONVDATA, 0);
 		error = copyin(din.ia_data, csp->cp_data, din.ia_datalen);
 		if (error)
 			goto bad;
diff --git a/sys/libkern/iconv_xlat.c b/sys/libkern/iconv_xlat.c
index 6dd2800a535f..e355c6b42194 100644
--- a/sys/libkern/iconv_xlat.c
+++ b/sys/libkern/iconv_xlat.c
@@ -62,7 +62,7 @@ iconv_xlat_open(struct iconv_converter_class *dcp,
 {
 	struct iconv_xlat *dp;
 
-	dp = (struct iconv_xlat *)kobj_create((struct kobj_class*)dcp, M_ICONV, M_WAITOK);
+	dp = (struct iconv_xlat *)kobj_create((struct kobj_class*)dcp, M_ICONV, 0);
 	dp->d_table = csp->cp_data;
 	dp->d_csp = csp;
 	csp->cp_refcount++;
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index df210e203939..e5a567df3a27 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -207,9 +207,9 @@ bpf_movein(uio, linktype, mp, sockp, datlen)
 		return (EIO);
 
 	if (len > MHLEN) {
-		m = m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR);
+		m = m_getcl(0, MT_DATA, M_PKTHDR);
 	} else {
-		MGETHDR(m, M_TRYWAIT, MT_DATA);
+		MGETHDR(m, 0, MT_DATA);
 	}
 	if (m == NULL)
 		return (ENOBUFS);
@@ -340,7 +340,7 @@ bpfopen(dev, flags, fmt, td)
 	if ((dev->si_flags & SI_NAMED) == 0)
 		make_dev(&bpf_cdevsw, minor(dev), UID_ROOT, GID_WHEEL, 0600,
 		    "bpf%d", dev2unit(dev));
-	MALLOC(d, struct bpf_d *, sizeof(*d), M_BPF, M_WAITOK | M_ZERO);
+	MALLOC(d, struct bpf_d *, sizeof(*d), M_BPF, M_ZERO);
 	dev->si_drv1 = d;
 	d->bd_bufsize = bpf_bufsize;
 	d->bd_sig = SIGIO;
@@ -947,7 +947,7 @@ bpf_setf(d, fp)
 		return (EINVAL);
 
 	size = flen * sizeof(*fp->bf_insns);
-	fcode = (struct bpf_insn *)malloc(size, M_BPF, M_WAITOK);
+	fcode = (struct bpf_insn *)malloc(size, M_BPF, 0);
 	if (copyin((caddr_t)fp->bf_insns, (caddr_t)fcode, size) == 0 &&
 	    bpf_validate(fcode, (int)flen)) {
 		BPFD_LOCK(d);
@@ -1247,11 +1247,11 @@ static int
 bpf_allocbufs(d)
 	register struct bpf_d *d;
 {
-	d->bd_fbuf = (caddr_t)malloc(d->bd_bufsize, M_BPF, M_WAITOK);
+	d->bd_fbuf = (caddr_t)malloc(d->bd_bufsize, M_BPF, 0);
 	if (d->bd_fbuf == 0)
 		return (ENOBUFS);
 
-	d->bd_sbuf = (caddr_t)malloc(d->bd_bufsize, M_BPF, M_WAITOK);
+	d->bd_sbuf = (caddr_t)malloc(d->bd_bufsize, M_BPF, 0);
 	if (d->bd_sbuf == 0) {
 		free(d->bd_fbuf, M_BPF);
 		return (ENOBUFS);
diff --git a/sys/net/bpf_compat.h b/sys/net/bpf_compat.h
index 212ac5ff2808..16fae349b488 100644
--- a/sys/net/bpf_compat.h
+++ b/sys/net/bpf_compat.h
@@ -45,7 +45,7 @@
  * a fixed offset from the associated mbuf.  Sorry for this kludge.
  */
 #define malloc(size, type, canwait)				\
-bpf_alloc(size, (canwait & M_NOWAIT) ? M_DONTWAIT : M_TRYWAIT)
+bpf_alloc(size, (canwait & M_NOWAIT) ? M_NOWAIT : 0)
 
 #define free(cp, type) m_free(*(struct mbuf **)(cp - 8))
 
diff --git a/sys/net/bridge.c b/sys/net/bridge.c
index 16e338f9e4bd..fef1b98056d9 100644
--- a/sys/net/bridge.c
+++ b/sys/net/bridge.c
@@ -246,7 +246,7 @@ add_cluster(u_int16_t cluster_id, struct arpcom *ac)
     }
     c[n_clusters].ht = (struct hash_table *)
 	    malloc(HASH_SIZE * sizeof(struct hash_table),
-		M_IFADDR, M_WAITOK | M_ZERO);
+		M_IFADDR, M_ZERO);
     if (c[n_clusters].ht == NULL) {
 	printf("-- bridge: cannot allocate hash table for new cluster\n");
 	free(c, M_IFADDR);
@@ -254,7 +254,7 @@ add_cluster(u_int16_t cluster_id, struct arpcom *ac)
     }
     c[n_clusters].my_macs = (struct bdg_addr *)
 	    malloc(BDG_MAX_PORTS * sizeof(struct bdg_addr),
-		M_IFADDR, M_WAITOK | M_ZERO);
+		M_IFADDR, M_ZERO);
     if (c[n_clusters].my_macs == NULL) {
         printf("-- bridge: cannot allocate mac addr table for new cluster\n");
 	free(c[n_clusters].ht, M_IFADDR);
@@ -799,7 +799,7 @@ static struct mbuf *
 bdg_forward(struct mbuf *m0, struct ifnet *dst)
 {
 #define	EH_RESTORE(_m) do {						   \
-    M_PREPEND((_m), ETHER_HDR_LEN, M_DONTWAIT);			   	   \
+    M_PREPEND((_m), ETHER_HDR_LEN, M_NOWAIT);			   	   \
     if ((_m) == NULL) {							   \
 	bdg_dropped++;							   \
 	return NULL;							   \
@@ -975,7 +975,7 @@ bdg_forward(struct mbuf *m0, struct ifnet *dst)
 	    struct mbuf *m ;
 
 	    if (shared) {
-		m = m_copypacket(m0, M_DONTWAIT);
+		m = m_copypacket(m0, M_NOWAIT);
 		if (m == NULL) {	/* copy failed, give up */
 		    bdg_dropped++;
 		    return NULL;
@@ -1041,7 +1041,7 @@ forward:
 		m = m0 ;
 		m0 = NULL ; /* original is gone */
 	    } else {
-		m = m_copypacket(m0, M_DONTWAIT);
+		m = m_copypacket(m0, M_NOWAIT);
 		if (m == NULL) {
 		    IFNET_RUNLOCK();
 		    printf("bdg_forward: sorry, m_copypacket failed!\n");
@@ -1090,7 +1090,7 @@ bdginit(void)
     printf("BRIDGE 020214 loaded\n");
 
     ifp2sc = malloc(BDG_MAX_PORTS * sizeof(struct bdg_softc),
-		M_IFADDR, M_WAITOK | M_ZERO );
+		M_IFADDR, M_ZERO );
     if (ifp2sc == NULL)
 	return ENOMEM ;
 
diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c
index dd6ab5617933..89c5e293b8fd 100644
--- a/sys/net/bsd_comp.c
+++ b/sys/net/bsd_comp.c
@@ -496,12 +496,12 @@ bsd_compress(state, mret, mp, slen, maxolen)
 	*wptr++ = (v);					\
 	if (wptr >= cp_end) {				\
 	    m->m_len = wptr - mtod(m, u_char *);	\
-	    MGET(m->m_next, M_DONTWAIT, MT_DATA);	\
+	    MGET(m->m_next, M_NOWAIT, MT_DATA);	\
 	    m = m->m_next;				\
 	    if (m) {					\
 		m->m_len = 0;				\
 		if (maxolen - olen > MLEN)		\
-		    MCLGET(m, M_DONTWAIT);		\
+		    MCLGET(m, M_NOWAIT);		\
 		wptr = mtod(m, u_char *);		\
 		cp_end = wptr + M_TRAILINGSPACE(m);	\
 	    } else					\
@@ -538,12 +538,12 @@ bsd_compress(state, mret, mp, slen, maxolen)
 	maxolen = slen;
 
     /* Allocate one mbuf to start with. */
-    MGET(m, M_DONTWAIT, MT_DATA);
+    MGET(m, M_NOWAIT, MT_DATA);
     *mret = m;
     if (m != NULL) {
 	m->m_len = 0;
 	if (maxolen + db->hdrlen > MLEN)
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
 	m->m_data += db->hdrlen;
 	wptr = mtod(m, u_char *);
 	cp_end = wptr + M_TRAILINGSPACE(m);
@@ -872,13 +872,13 @@ bsd_decompress(state, cmp, dmpp)
     /*
      * Allocate one mbuf to start with.
      */
-    MGETHDR(dmp, M_DONTWAIT, MT_DATA);
+    MGETHDR(dmp, M_NOWAIT, MT_DATA);
     if (dmp == NULL)
 	return DECOMP_ERROR;
     mret = dmp;
     dmp->m_len = 0;
     dmp->m_next = NULL;
-    MCLGET(dmp, M_DONTWAIT);
+    MCLGET(dmp, M_NOWAIT);
     dmp->m_data += db->hdrlen;
     wptr = mtod(dmp, u_char *);
     space = M_TRAILINGSPACE(dmp) - PPP_HDRLEN + 1;
@@ -987,7 +987,7 @@ bsd_decompress(state, cmp, dmpp)
 	 */
 	if ((space -= codelen + extra) < 0) {
 	    dmp->m_len = wptr - mtod(dmp, u_char *);
-	    MGET(m, M_DONTWAIT, MT_DATA);
+	    MGET(m, M_NOWAIT, MT_DATA);
 	    if (m == NULL) {
 		m_freem(mret);
 		return DECOMP_ERROR;
@@ -995,7 +995,7 @@ bsd_decompress(state, cmp, dmpp)
 	    m->m_len = 0;
 	    m->m_next = NULL;
 	    dmp->m_next = m;
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
 	    space = M_TRAILINGSPACE(m) - (codelen + extra);
 	    if (space < 0) {
 		/* now that's what I call *compression*. */
diff --git a/sys/net/if.c b/sys/net/if.c
index 1f5860535ff9..04f8f759e78c 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -280,7 +280,7 @@ if_grow(void)
 
 	if_indexlim <<= 1;
 	n = if_indexlim * sizeof(*e);
-	e = malloc(n, M_IFADDR, M_WAITOK | M_ZERO);
+	e = malloc(n, M_IFADDR, M_ZERO);
 	if (ifindex_table != NULL) {
 		memcpy((caddr_t)e, (caddr_t)ifindex_table, n/2);
 		free((caddr_t)ifindex_table, M_IFADDR);
@@ -429,7 +429,7 @@ if_attach(ifp)
 		socksize = sizeof(*sdl);
 	socksize = ROUNDUP(socksize);
 	ifasize = sizeof(*ifa) + 2 * socksize;
-	ifa = (struct ifaddr *)malloc(ifasize, M_IFADDR, M_WAITOK | M_ZERO);
+	ifa = (struct ifaddr *)malloc(ifasize, M_IFADDR, M_ZERO);
 	if (ifa) {
 		IFA_LOCK_INIT(ifa);
 		sdl = (struct sockaddr_dl *)(ifa + 1);
@@ -775,7 +775,7 @@ if_clone_attach(ifc)
 	len = maxclone >> 3;
 	if ((len << 3) < maxclone)
 		len++;
-	ifc->ifc_units = malloc(len, M_CLONE, M_WAITOK | M_ZERO);
+	ifc->ifc_units = malloc(len, M_CLONE, M_ZERO);
 	ifc->ifc_bmlen = len;
 
 	LIST_INSERT_HEAD(&if_cloners, ifc, ifc_list);
@@ -1797,8 +1797,8 @@ if_addmulti(ifp, sa, retifma)
 		llsa = 0;
 	}
 
-	MALLOC(ifma, struct ifmultiaddr *, sizeof *ifma, M_IFMADDR, M_WAITOK);
-	MALLOC(dupsa, struct sockaddr *, sa->sa_len, M_IFMADDR, M_WAITOK);
+	MALLOC(ifma, struct ifmultiaddr *, sizeof *ifma, M_IFMADDR, 0);
+	MALLOC(dupsa, struct sockaddr *, sa->sa_len, M_IFMADDR, 0);
 	bcopy(sa, dupsa, sa->sa_len);
 
 	ifma->ifma_addr = dupsa;
@@ -1827,9 +1827,9 @@ if_addmulti(ifp, sa, retifma)
 			ifma->ifma_refcount++;
 		} else {
 			MALLOC(ifma, struct ifmultiaddr *, sizeof *ifma,
-			       M_IFMADDR, M_WAITOK);
+			       M_IFMADDR, 0);
 			MALLOC(dupsa, struct sockaddr *, llsa->sa_len,
-			       M_IFMADDR, M_WAITOK);
+			       M_IFMADDR, 0);
 			bcopy(llsa, dupsa, llsa->sa_len);
 			ifma->ifma_addr = dupsa;
 			ifma->ifma_ifp = ifp;
diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c
index df01b749ef52..0fffe8d42563 100644
--- a/sys/net/if_arcsubr.c
+++ b/sys/net/if_arcsubr.c
@@ -203,7 +203,7 @@ arc_output(ifp, m, dst, rt0)
 	if (mcopy)
 		(void) if_simloop(ifp, mcopy, dst->sa_family, 0);
 
-	M_PREPEND(m, ARC_HDRLEN, M_DONTWAIT);
+	M_PREPEND(m, ARC_HDRLEN, M_NOWAIT);
 	if (m == 0)
 		senderr(ENOBUFS);
 	ah = mtod(m, struct arc_header *);
@@ -292,13 +292,13 @@ arc_frag_next(ifp)
 	/* split out next fragment and return it */
 	if (ac->sflag < ac->fsflag) {
 		/* we CAN'T have short packets here */
-		ac->curr_frag = m_split(m, 504, M_DONTWAIT);
+		ac->curr_frag = m_split(m, 504, M_NOWAIT);
 		if (ac->curr_frag == 0) {
 			m_freem(m);
 			return 0;
 		}
 
-		M_PREPEND(m, ARC_HDRNEWLEN, M_DONTWAIT);
+		M_PREPEND(m, ARC_HDRNEWLEN, M_NOWAIT);
 		if (m == 0) {
 			m_freem(ac->curr_frag);
 			ac->curr_frag = 0;
@@ -317,7 +317,7 @@ arc_frag_next(ifp)
 	    ARC_MAX_FORBID_LEN - ARC_HDRNEWLEN + 2)) {
 		ac->curr_frag = 0;
 
-		M_PREPEND(m, ARC_HDRNEWLEN_EXC, M_DONTWAIT);
+		M_PREPEND(m, ARC_HDRNEWLEN_EXC, M_NOWAIT);
 		if (m == 0)
 			return 0;
 
@@ -330,7 +330,7 @@ arc_frag_next(ifp)
 	} else {
 		ac->curr_frag = 0;
 
-		M_PREPEND(m, ARC_HDRNEWLEN, M_DONTWAIT);
+		M_PREPEND(m, ARC_HDRNEWLEN, M_NOWAIT);
 		if (m == 0)
 			return 0;
 
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index 3ec389443ee9..21b9f07c4482 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -189,7 +189,7 @@ atm_output(ifp, m0, dst, rt0)
 		sz = sizeof(atmdst);
 		atm_flags = ATM_PH_FLAGS(&atmdst);
 		if (atm_flags & ATM_PH_LLCSNAP) sz += 8; /* sizeof snap == 8 */
-		M_PREPEND(m, sz, M_DONTWAIT);
+		M_PREPEND(m, sz, M_NOWAIT);
 		if (m == 0)
 			senderr(ENOBUFS);
 		ad = mtod(m, struct atm_pseudohdr *);
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index 79775f1ac3a5..4bad63764767 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -87,7 +87,7 @@ disc_clone_create(struct if_clone *ifc, int unit)
 	struct ifnet		*ifp;
 	struct disc_softc	*sc;
 
-	sc = malloc(sizeof(struct disc_softc), M_DISC, M_WAITOK);
+	sc = malloc(sizeof(struct disc_softc), M_DISC, 0);
 	bzero(sc, sizeof(struct disc_softc));
 
 	ifp = &sc->sc_if;
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index b064d381045b..e7362ae7ce42 100644
--- a/sys/net/if_ef.c
+++ b/sys/net/if_ef.c
@@ -430,7 +430,7 @@ ef_output(struct ifnet *ifp, struct mbuf **mp, struct sockaddr *dst, short *tp,
 		type = htons(m->m_pkthdr.len);
 		break;
 	    case ETHER_FT_8022:
-		M_PREPEND(m, ETHER_HDR_LEN + 3, M_TRYWAIT);
+		M_PREPEND(m, ETHER_HDR_LEN + 3, 0);
 		if (m == NULL) {
 			*mp = NULL;
 			return ENOBUFS;
@@ -453,7 +453,7 @@ ef_output(struct ifnet *ifp, struct mbuf **mp, struct sockaddr *dst, short *tp,
 		*hlen += 3;
 		break;
 	    case ETHER_FT_SNAP:
-		M_PREPEND(m, 8, M_TRYWAIT);
+		M_PREPEND(m, 8, 0);
 		if (m == NULL) {
 			*mp = NULL;
 			return ENOBUFS;
@@ -484,14 +484,14 @@ ef_clone(struct ef_link *efl, int ft)
 	int ifnlen;
 
 	efp = (struct efnet*)malloc(sizeof(struct efnet), M_IFADDR,
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 	if (efp == NULL)
 		return ENOMEM;
 	efp->ef_ifp = ifp;
 	eifp = &efp->ef_ac.ac_if;
 	ifnlen = 1 + snprintf(cbuf, sizeof(cbuf), "%s%df", ifp->if_name,
 	    ifp->if_unit);
-	ifname = (char*)malloc(ifnlen, M_IFADDR, M_WAITOK);
+	ifname = (char*)malloc(ifnlen, M_IFADDR, 0);
 	eifp->if_name = strcpy(ifname, cbuf);
 	eifp->if_unit = ft;
 	eifp->if_softc = efp;
@@ -514,7 +514,7 @@ ef_load(void)
 		if (ifp->if_type != IFT_ETHER) continue;
 		EFDEBUG("Found interface %s%d\n", ifp->if_name, ifp->if_unit);
 		efl = (struct ef_link*)malloc(sizeof(struct ef_link), 
-		    M_IFADDR, M_WAITOK | M_ZERO);
+		    M_IFADDR, M_ZERO);
 		if (efl == NULL) {
 			error = ENOMEM;
 			break;
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index c40c4d668197..cb5a0399ed45 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -236,7 +236,7 @@ ether_output(ifp, m, dst, rt0)
 	    if ( aa->aa_flags & AFA_PHASE2 ) {
 		struct llc llc;
 
-		M_PREPEND(m, sizeof(struct llc), M_TRYWAIT);
+		M_PREPEND(m, sizeof(struct llc), 0);
 		llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
 		llc.llc_control = LLC_UI;
 		bcopy(at_org_code, llc.llc_snap_org_code, sizeof(at_org_code));
@@ -261,7 +261,7 @@ ether_output(ifp, m, dst, rt0)
 			type = htons( m->m_pkthdr.len);
 			break;
 		case 0xe0e0: /* Novell 802.2 and Token-Ring */
-			M_PREPEND(m, 3, M_TRYWAIT);
+			M_PREPEND(m, 3, 0);
 			type = htons( m->m_pkthdr.len);
 			cp = mtod(m, u_char *);
 			*cp++ = 0xE0;
@@ -312,7 +312,7 @@ ether_output(ifp, m, dst, rt0)
 	 * Add local net header.  If no space in first mbuf,
 	 * allocate another.
 	 */
-	M_PREPEND(m, sizeof (struct ether_header), M_DONTWAIT);
+	M_PREPEND(m, sizeof (struct ether_header), M_NOWAIT);
 	if (m == 0)
 		senderr(ENOBUFS);
 	eh = mtod(m, struct ether_header *);
@@ -470,7 +470,7 @@ ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst,
 		 * Restore Ethernet header, as needed, in case the
 		 * mbuf chain was replaced by ipfw.
 		 */
-		M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT);
+		M_PREPEND(m, ETHER_HDR_LEN, M_NOWAIT);
 		if (m == NULL) {
 			*m0 = m;
 			return 0;
@@ -494,7 +494,7 @@ ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst,
 		 * If shared, make a copy and keep the original.
 		 */
 		if (shared) {
-			m = m_copypacket(m, M_DONTWAIT);
+			m = m_copypacket(m, M_NOWAIT);
 			if (m == NULL)
 				return 0;
 		} else {
@@ -894,7 +894,7 @@ discard:
 		 * Put back the ethernet header so netgraph has a
 		 * consistent view of inbound packets.
 		 */
-		M_PREPEND(m, sizeof (struct ether_header), M_DONTWAIT);
+		M_PREPEND(m, sizeof (struct ether_header), M_NOWAIT);
 		(*ng_ether_input_orphan_p)(ifp, m);
 		return;
 	}
@@ -1113,7 +1113,7 @@ ether_resolvemulti(ifp, llsa, sa)
 		if (!IN_MULTICAST(ntohl(sin->sin_addr.s_addr)))
 			return EADDRNOTAVAIL;
 		MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR,
-		       M_WAITOK|M_ZERO);
+		       M_ZERO);
 		sdl->sdl_len = sizeof *sdl;
 		sdl->sdl_family = AF_LINK;
 		sdl->sdl_index = ifp->if_index;
@@ -1140,7 +1140,7 @@ ether_resolvemulti(ifp, llsa, sa)
 		if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
 			return EADDRNOTAVAIL;
 		MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR,
-		       M_WAITOK|M_ZERO);
+		       M_ZERO);
 		sdl->sdl_len = sizeof *sdl;
 		sdl->sdl_family = AF_LINK;
 		sdl->sdl_index = ifp->if_index;
diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c
index 280a0417da62..08a5ca3d25e8 100644
--- a/sys/net/if_faith.c
+++ b/sys/net/if_faith.c
@@ -159,7 +159,7 @@ faith_clone_create(ifc, unit)
 {
 	struct faith_softc *sc;
 
-	sc = malloc(sizeof(struct faith_softc), M_FAITH, M_WAITOK);
+	sc = malloc(sizeof(struct faith_softc), M_FAITH, 0);
 	bzero(sc, sizeof(struct faith_softc));
 
 	sc->sc_if.if_softc = sc;
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 49a5f21811d1..05ff6ae4e56e 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -203,7 +203,7 @@ fddi_output(ifp, m, dst, rt0)
 	    if (aa->aa_flags & AFA_PHASE2) {
 		struct llc llc;
 
-		M_PREPEND(m, LLC_SNAPFRAMELEN, M_TRYWAIT);
+		M_PREPEND(m, LLC_SNAPFRAMELEN, 0);
 		if (m == 0)
 			senderr(ENOBUFS);
 		llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
@@ -290,7 +290,7 @@ fddi_output(ifp, m, dst, rt0)
 	 */
 	if (type != 0) {
 		struct llc *l;
-		M_PREPEND(m, LLC_SNAPFRAMELEN, M_DONTWAIT);
+		M_PREPEND(m, LLC_SNAPFRAMELEN, M_NOWAIT);
 		if (m == 0)
 			senderr(ENOBUFS);
 		l = mtod(m, struct llc *);
@@ -305,7 +305,7 @@ fddi_output(ifp, m, dst, rt0)
 	 * Add local net header.  If no space in first mbuf,
 	 * allocate another.
 	 */
-	M_PREPEND(m, FDDI_HDR_LEN, M_DONTWAIT);
+	M_PREPEND(m, FDDI_HDR_LEN, M_NOWAIT);
 	if (m == 0)
 		senderr(ENOBUFS);
 	fh = mtod(m, struct fddi_header *);
@@ -706,7 +706,7 @@ fddi_resolvemulti(ifp, llsa, sa)
 		if (!IN_MULTICAST(ntohl(sin->sin_addr.s_addr)))
 			return (EADDRNOTAVAIL);
 		MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR,
-		       M_WAITOK);
+		       0);
 		sdl->sdl_len = sizeof *sdl;
 		sdl->sdl_family = AF_LINK;
 		sdl->sdl_index = ifp->if_index;
@@ -735,7 +735,7 @@ fddi_resolvemulti(ifp, llsa, sa)
 		if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
 			return (EADDRNOTAVAIL);
 		MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR,
-		       M_WAITOK);
+		       0);
 		sdl->sdl_len = sizeof *sdl;
 		sdl->sdl_family = AF_LINK;
 		sdl->sdl_index = ifp->if_index;
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index 1cb4463abd63..fce294df3934 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -137,7 +137,7 @@ gif_clone_create(ifc, unit)
 {
 	struct gif_softc *sc;
 
-	sc = malloc (sizeof(struct gif_softc), M_GIF, M_WAITOK);
+	sc = malloc (sizeof(struct gif_softc), M_GIF, 0);
 	bzero(sc, sizeof(struct gif_softc));
 
 	sc->gif_if.if_softc = sc;
@@ -777,12 +777,12 @@ gif_set_tunnel(ifp, src, dst)
 		}
 
 	osrc = sc->gif_psrc;
-	sa = (struct sockaddr *)malloc(src->sa_len, M_IFADDR, M_WAITOK);
+	sa = (struct sockaddr *)malloc(src->sa_len, M_IFADDR, 0);
 	bcopy((caddr_t)src, (caddr_t)sa, src->sa_len);
 	sc->gif_psrc = sa;
 
 	odst = sc->gif_pdst;
-	sa = (struct sockaddr *)malloc(dst->sa_len, M_IFADDR, M_WAITOK);
+	sa = (struct sockaddr *)malloc(dst->sa_len, M_IFADDR, 0);
 	bcopy((caddr_t)dst, (caddr_t)sa, dst->sa_len);
 	sc->gif_pdst = sa;
 
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 658539687205..33a4eff9cca3 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -160,7 +160,7 @@ gre_clone_create(ifc, unit)
 {
 	struct gre_softc *sc;
 
-	sc = malloc(sizeof(struct gre_softc), M_GRE, M_WAITOK);
+	sc = malloc(sizeof(struct gre_softc), M_GRE, 0);
 	memset(sc, 0, sizeof(struct gre_softc));
 
 	sc->sc_if.if_name = GRENAME;
@@ -294,7 +294,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 
 			if ((m->m_data - msiz) < m->m_pktdat) {
 				/* need new mbuf */
-				MGETHDR(m0, M_DONTWAIT, MT_HEADER);
+				MGETHDR(m0, M_NOWAIT, MT_HEADER);
 				if (m0 == NULL) {
 					_IF_DROP(&ifp->if_snd);
 					m_freem(m);
@@ -348,7 +348,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 			error = EAFNOSUPPORT;
 			goto end;
 		}
-		M_PREPEND(m, sizeof(struct greip), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct greip), M_NOWAIT);
 	} else {
 		_IF_DROP(&ifp->if_snd);
 		m_freem(m);
diff --git a/sys/net/if_ieee80211subr.c b/sys/net/if_ieee80211subr.c
index b088e26169c7..e67243580278 100644
--- a/sys/net/if_ieee80211subr.c
+++ b/sys/net/if_ieee80211subr.c
@@ -406,7 +406,7 @@ ieee80211_input(struct ifnet *ifp, struct mbuf *m, int rssi, u_int32_t rstamp)
 		if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
 			eh = mtod(m, struct ether_header *);
 			if (ETHER_IS_MULTICAST(eh->ether_dhost)) {
-				m1 = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
+				m1 = m_copym(m, 0, M_COPYALL, M_NOWAIT);
 				if (m1 == NULL)
 					ifp->if_oerrors++;
 				else
@@ -517,7 +517,7 @@ ieee80211_mgmt_output(struct ifnet *ifp, struct ieee80211_node *ni,
 	if (ni == NULL)
 		ni = &ic->ic_bss;
 	ni->ni_inact = 0;
-	M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ieee80211_frame), M_NOWAIT);
 	if (m == NULL)
 		return ENOMEM;
 	wh = mtod(m, struct ieee80211_frame *);
@@ -585,7 +585,7 @@ ieee80211_encap(struct ifnet *ifp, struct mbuf *m)
 	llc->llc_snap.org_code[1] = 0;
 	llc->llc_snap.org_code[2] = 0;
 	llc->llc_snap.ether_type = eh.ether_type;
-	M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ieee80211_frame), M_NOWAIT);
 	if (m == NULL)
 		return NULL;
 	wh = mtod(m, struct ieee80211_frame *);
@@ -671,7 +671,7 @@ ieee80211_decap(struct ifnet *ifp, struct mbuf *m)
 		pktlen = m->m_pkthdr.len;
 		while (pktlen > off) {
 			if (n0 == NULL) {
-				MGETHDR(n, M_DONTWAIT, MT_DATA);
+				MGETHDR(n, M_NOWAIT, MT_DATA);
 				if (n == NULL) {
 					m_freem(m);
 					return NULL;
@@ -679,7 +679,7 @@ ieee80211_decap(struct ifnet *ifp, struct mbuf *m)
 				M_MOVE_PKTHDR(n, m);
 				n->m_len = MHLEN;
 			} else {
-				MGET(n, M_DONTWAIT, MT_DATA);
+				MGET(n, M_NOWAIT, MT_DATA);
 				if (n == NULL) {
 					m_freem(m);
 					m_freem(n0);
@@ -688,7 +688,7 @@ ieee80211_decap(struct ifnet *ifp, struct mbuf *m)
 				n->m_len = MLEN;
 			}
 			if (pktlen - off >= MINCLSIZE) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, M_NOWAIT);
 				if (n->m_flags & M_EXT)
 					n->m_len = n->m_ext.ext_size;
 			}
@@ -1407,7 +1407,7 @@ ieee80211_send_prreq(struct ieee80211com *ic, struct ieee80211_node *ni,
 	 *	[tlv] ssid
 	 *	[tlv] supported rates
 	 */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	m->m_data += sizeof(struct ieee80211_frame);
@@ -1450,7 +1450,7 @@ ieee80211_send_prresp(struct ieee80211com *ic, struct ieee80211_node *bs0,
 	 *	[tlv] supported rates
 	 *	[tlv] parameter set (IBSS)
 	 */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	m->m_data += sizeof(struct ieee80211_frame);
@@ -1503,7 +1503,7 @@ ieee80211_send_auth(struct ieee80211com *ic, struct ieee80211_node *ni,
 	u_int16_t *frm;
 	int ret;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	MH_ALIGN(m, 2 * 3);
@@ -1529,7 +1529,7 @@ ieee80211_send_deauth(struct ieee80211com *ic, struct ieee80211_node *ni,
 	if (ifp->if_flags & IFF_DEBUG)
 		if_printf(ifp, "station %s deauthenticate (reason %d)\n",
 		    ether_sprintf(ni->ni_macaddr), reason);
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	MH_ALIGN(m, 2);
@@ -1555,7 +1555,7 @@ ieee80211_send_asreq(struct ieee80211com *ic, struct ieee80211_node *ni,
 	 *	[tlv] ssid
 	 *	[tlv] supported rates
 	 */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	m->m_data += sizeof(struct ieee80211_frame);
@@ -1613,7 +1613,7 @@ ieee80211_send_asresp(struct ieee80211com *ic, struct ieee80211_node *ni,
 	 *	[2] association ID
 	 *	[tlv] supported rates
 	 */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	m->m_data += sizeof(struct ieee80211_frame);
@@ -1659,7 +1659,7 @@ ieee80211_send_disassoc(struct ieee80211com *ic, struct ieee80211_node *ni,
 	if (ifp->if_flags & IFF_DEBUG)
 		if_printf(ifp, "station %s disassociate (reason %d)\n",
 		    ether_sprintf(ni->ni_macaddr), reason);
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	MH_ALIGN(m, 2);
@@ -2476,7 +2476,7 @@ ieee80211_wep_crypt(struct ifnet *ifp, struct mbuf *m0, int txflag)
 	}
 	m = m0;
 	left = m->m_pkthdr.len;
-	MGET(n, M_DONTWAIT, m->m_type);
+	MGET(n, M_NOWAIT, m->m_type);
 	n0 = n;
 	if (n == NULL)
 		goto fail;
@@ -2490,7 +2490,7 @@ ieee80211_wep_crypt(struct ifnet *ifp, struct mbuf *m0, int txflag)
 	}
 	n->m_len = MHLEN;
 	if (n->m_pkthdr.len >= MINCLSIZE) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, M_NOWAIT);
 		if (n->m_flags & M_EXT)
 			n->m_len = n->m_ext.ext_size;
 	}
@@ -2544,13 +2544,13 @@ ieee80211_wep_crypt(struct ifnet *ifp, struct mbuf *m0, int txflag)
 		if (len > n->m_len - noff) {
 			len = n->m_len - noff;
 			if (len == 0) {
-				MGET(n->m_next, M_DONTWAIT, n->m_type);
+				MGET(n->m_next, M_NOWAIT, n->m_type);
 				if (n->m_next == NULL)
 					goto fail;
 				n = n->m_next;
 				n->m_len = MLEN;
 				if (left >= MINCLSIZE) {
-					MCLGET(n, M_DONTWAIT);
+					MCLGET(n, M_NOWAIT);
 					if (n->m_flags & M_EXT)
 						n->m_len = n->m_ext.ext_size;
 				}
@@ -2579,7 +2579,7 @@ ieee80211_wep_crypt(struct ifnet *ifp, struct mbuf *m0, int txflag)
 			n->m_len = noff + sizeof(crcbuf);
 		else {
 			n->m_len = noff;
-			MGET(n->m_next, M_DONTWAIT, n->m_type);
+			MGET(n->m_next, M_NOWAIT, n->m_type);
 			if (n->m_next == NULL)
 				goto fail;
 			n = n->m_next;
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index acb11471aac4..4fa3e36d0a5c 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -299,7 +299,7 @@ iso88025_output(ifp, m, dst, rt0)
 		bcopy((caddr_t)&(satoipx_addr(dst).x_host), (caddr_t)edst,
 			sizeof (edst));
 
-		M_PREPEND(m, 3, M_TRYWAIT);
+		M_PREPEND(m, 3, 0);
 		if (m == 0)
 			senderr(ENOBUFS);
 		m = m_pullup(m, 3);
@@ -342,7 +342,7 @@ iso88025_output(ifp, m, dst, rt0)
 
 	if (snap_type != 0) {
         	struct llc *l;
-		M_PREPEND(m, sizeof (struct llc), M_DONTWAIT);
+		M_PREPEND(m, sizeof (struct llc), M_NOWAIT);
 		if (m == 0)
 			senderr(ENOBUFS);
 		l = mtod(m, struct llc *);
@@ -358,7 +358,7 @@ iso88025_output(ifp, m, dst, rt0)
 	 * Add local net header.  If no space in first mbuf,
 	 * allocate another.
 	 */
-	M_PREPEND(m, ISO88025_HDR_LEN + rif_len, M_DONTWAIT);
+	M_PREPEND(m, ISO88025_HDR_LEN + rif_len, M_NOWAIT);
 	if (m == 0)
 		senderr(ENOBUFS);
 
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index c753fdc2b05c..deeecab0e287 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -147,7 +147,7 @@ lo_clone_create(ifc, unit)
 {
 	struct lo_softc *sc;
 
-	MALLOC(sc, struct lo_softc *, sizeof(*sc), M_LO, M_WAITOK | M_ZERO);
+	MALLOC(sc, struct lo_softc *, sizeof(*sc), M_LO, M_ZERO);
 
 	sc->sc_if.if_name = LONAME;
 	sc->sc_if.if_unit = unit;
@@ -215,7 +215,7 @@ looutput(ifp, m, dst, rt)
 		struct mbuf *n;
 
 		/* XXX MT_HEADER should be m->m_type */
-		MGETHDR(n, M_DONTWAIT, MT_HEADER);
+		MGETHDR(n, M_NOWAIT, MT_HEADER);
 		if (!n)
 			goto contiguousfail;
 		M_MOVE_PKTHDR(n, m);
@@ -227,7 +227,7 @@ looutput(ifp, m, dst, rt)
 		 */
 		m->m_pkthdr.label.l_flags &= ~MAC_FLAG_INITIALIZED;
 #endif
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, M_NOWAIT);
 		if (! (n->m_flags & M_EXT)) {
 			m_freem(n);
 			goto contiguousfail;
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index aab5377f600e..82c5c1eee3de 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -199,7 +199,7 @@ ppp_clone_create(struct if_clone *ifc, int unit)
 {
 	struct ppp_softc	*sc;
 
-	sc = malloc(sizeof(struct ppp_softc), M_PPP, M_WAITOK | M_ZERO);
+	sc = malloc(sizeof(struct ppp_softc), M_PPP, M_ZERO);
 	sc->sc_if.if_softc = sc;
 	sc->sc_if.if_name = PPPNAME;
 	sc->sc_if.if_unit = unit;
@@ -572,7 +572,7 @@ pppioctl(sc, cmd, data, flag, td)
 	}
 	newcodelen = nbp->bf_len * sizeof(struct bpf_insn);
 	if (newcodelen != 0) {
-	    MALLOC(newcode, struct bpf_insn *, newcodelen, M_DEVBUF, M_WAITOK);
+	    MALLOC(newcode, struct bpf_insn *, newcodelen, M_DEVBUF, 0);
 	    if (newcode == 0) {
 		error = EINVAL;		/* or sumpin */
 		break;
@@ -831,7 +831,7 @@ pppoutput(ifp, m0, dst, rtp)
      * (This assumes M_LEADINGSPACE is always 0 for a cluster mbuf.)
      */
     if (M_LEADINGSPACE(m0) < PPP_HDRLEN) {
-	m0 = m_prepend(m0, PPP_HDRLEN, M_DONTWAIT);
+	m0 = m_prepend(m0, PPP_HDRLEN, M_NOWAIT);
 	if (m0 == 0) {
 	    error = ENOBUFS;
 	    goto bad;
@@ -1411,13 +1411,13 @@ ppp_inproc(sc, m)
 	}
 
 	/* Copy the PPP and IP headers into a new mbuf. */
-	MGETHDR(mp, M_DONTWAIT, MT_DATA);
+	MGETHDR(mp, M_NOWAIT, MT_DATA);
 	if (mp == NULL)
 	    goto bad;
 	mp->m_len = 0;
 	mp->m_next = NULL;
 	if (hlen + PPP_HDRLEN > MHLEN) {
-	    MCLGET(mp, M_DONTWAIT);
+	    MCLGET(mp, M_NOWAIT);
 	    if (M_TRAILINGSPACE(mp) < hlen + PPP_HDRLEN) {
 		m_freem(mp);
 		goto bad;	/* lose if big headers and no clusters */
@@ -1475,7 +1475,7 @@ ppp_inproc(sc, m)
      * whole cluster on it.
      */
     if (ilen <= MHLEN && M_IS_CLUSTER(m)) {
-	MGETHDR(mp, M_DONTWAIT, MT_DATA);
+	MGETHDR(mp, M_NOWAIT, MT_DATA);
 	if (mp != NULL) {
 #ifdef MAC
 	    mac_create_mbuf_from_mbuf(m, mp);
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index b57eb93e8ba9..2c3a22295a32 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -265,11 +265,11 @@ slcreate()
 	int unit;
 	struct mbuf *m;
 
-	MALLOC(sc, struct sl_softc *, sizeof(*sc), M_SL, M_WAITOK | M_ZERO);
+	MALLOC(sc, struct sl_softc *, sizeof(*sc), M_SL, M_ZERO);
 
-	m = m_gethdr(M_TRYWAIT, MT_DATA);
+	m = m_gethdr(0, MT_DATA);
 	if (m != NULL) {
-		MCLGET(m, M_TRYWAIT);
+		MCLGET(m, 0);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			m = NULL;
@@ -792,7 +792,7 @@ sl_btom(sc, len)
 {
 	struct mbuf *m, *newm;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return (NULL);
 
@@ -804,7 +804,7 @@ sl_btom(sc, len)
 	 * guarantees that packet will fit in a cluster.
 	 */
 	if (len >= MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			/*
 			 * we couldn't get a cluster - if memory's this
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 61dbb6faf5a9..7014a89b95d0 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -618,7 +618,7 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
 				 * enough leading space in the existing mbuf).
 				 */
 				m_adj(m, vjlen);
-				M_PREPEND(m, hlen, M_DONTWAIT);
+				M_PREPEND(m, hlen, M_NOWAIT);
 				if (m == NULL)
 					goto drop2;
 				bcopy(iphdr, mtod(m, u_char *), hlen);
@@ -892,7 +892,7 @@ sppp_output(struct ifnet *ifp, struct mbuf *m,
 	/*
 	 * Prepend general data packet PPP header. For now, IP only.
 	 */
-	M_PREPEND (m, PPP_HEADER_LEN, M_DONTWAIT);
+	M_PREPEND (m, PPP_HEADER_LEN, M_NOWAIT);
 	if (! m) {
 		if (debug)
 			log(LOG_DEBUG, SPP_FMT "no memory for transmit header\n",
@@ -1034,7 +1034,7 @@ sppp_attach(struct ifnet *ifp)
 #ifdef INET6
 	sp->confflags |= CONF_ENABLE_IPV6;
 #endif
-	sp->pp_comp = malloc(sizeof(struct slcompress), M_TEMP, M_WAIT);
+	sp->pp_comp = malloc(sizeof(struct slcompress), M_TEMP, 0);
 	sl_compress_init(sp->pp_comp, -1);
 	sppp_lcp_init(sp);
 	sppp_ipcp_init(sp);
@@ -1355,7 +1355,7 @@ sppp_cisco_send(struct sppp *sp, int type, long par1, long par2)
 	getmicrouptime(&tv);
 #endif
 
-	MGETHDR (m, M_DONTWAIT, MT_DATA);
+	MGETHDR (m, M_NOWAIT, MT_DATA);
 	if (! m)
 		return;
 	m->m_pkthdr.len = m->m_len = PPP_HEADER_LEN + CISCO_PACKET_LEN;
@@ -1408,7 +1408,7 @@ sppp_cp_send(struct sppp *sp, u_short proto, u_char type,
 
 	if (len > MHLEN - PPP_HEADER_LEN - LCP_HEADER_LEN)
 		len = MHLEN - PPP_HEADER_LEN - LCP_HEADER_LEN;
-	MGETHDR (m, M_DONTWAIT, MT_DATA);
+	MGETHDR (m, M_NOWAIT, MT_DATA);
 	if (! m)
 		return;
 	m->m_pkthdr.len = m->m_len = PPP_HEADER_LEN + LCP_HEADER_LEN + len;
@@ -4614,7 +4614,7 @@ sppp_auth_send(const struct cp *cp, struct sppp *sp,
 	const char *msg;
 	va_list ap;
 
-	MGETHDR (m, M_DONTWAIT, MT_DATA);
+	MGETHDR (m, M_NOWAIT, MT_DATA);
 	if (! m)
 		return;
 	m->m_pkthdr.rcvif = 0;
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index 1d84836eb879..b96883cf83f4 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -179,7 +179,7 @@ stf_clone_create(ifc, unit)
 {
 	struct stf_softc *sc;
 
-	sc = malloc(sizeof(struct stf_softc), M_STF, M_WAITOK | M_ZERO);
+	sc = malloc(sizeof(struct stf_softc), M_STF, M_ZERO);
 	sc->sc_if.if_name = STFNAME;
 	sc->sc_if.if_unit = unit;
 
@@ -446,7 +446,7 @@ stf_output(ifp, m, dst, rt)
 	}
 #endif /*NBPFILTER > 0*/
 
-	M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ip), M_NOWAIT);
 	if (m && m->m_len < sizeof(struct ip))
 		m = m_pullup(m, sizeof(struct ip));
 	if (m == NULL) {
diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c
index 064820000394..385d6c72a36d 100644
--- a/sys/net/if_tap.c
+++ b/sys/net/if_tap.c
@@ -334,7 +334,7 @@ tapcreate(dev)
 	char			*name = NULL;
 
 	/* allocate driver storage and create device */
-	MALLOC(tp, struct tap_softc *, sizeof(*tp), M_TAP, M_WAITOK | M_ZERO);
+	MALLOC(tp, struct tap_softc *, sizeof(*tp), M_TAP, M_ZERO);
 	SLIST_INSERT_HEAD(&taphead, tp, tap_next);
 
 	unit = dev2unit(dev) & TAPMAXUNIT;
@@ -849,7 +849,7 @@ tapwrite(dev, uio, flag)
 	tlen = uio->uio_resid;
 
 	/* get a header mbuf */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return (ENOBUFS);
 	mlen = MHLEN;
@@ -862,7 +862,7 @@ tapwrite(dev, uio, flag)
 		*mp = m;
 		mp = &m->m_next;
 		if (uio->uio_resid > 0) {
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m == NULL) {
 				error = ENOBUFS;
 				break;
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index ce39d1f7a46a..3bb5a8c89d82 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -240,7 +240,7 @@ tuncreate(dev_t dev)
 		dev = make_dev(&tun_cdevsw, minor(dev),
 		    UID_UUCP, GID_DIALER, 0600, "tun%d", dev2unit(dev));
 
-	MALLOC(sc, struct tun_softc *, sizeof(*sc), M_TUN, M_WAITOK | M_ZERO);
+	MALLOC(sc, struct tun_softc *, sizeof(*sc), M_TUN, M_ZERO);
 	sc->tun_flags = TUN_INITED;
 	sc->next = tunhead;
 	tunhead = sc;
@@ -494,7 +494,7 @@ tunoutput(
 	/* prepend sockaddr? this may abort if the mbuf allocation fails */
 	if (tp->tun_flags & TUN_LMODE) {
 		/* allocate space for sockaddr */
-		M_PREPEND(m0, dst->sa_len, M_DONTWAIT);
+		M_PREPEND(m0, dst->sa_len, M_NOWAIT);
 
 		/* if allocation failed drop packet */
 		if (m0 == NULL) {
@@ -508,7 +508,7 @@ tunoutput(
 
 	if (tp->tun_flags & TUN_IFHEAD) {
 		/* Prepend the address family */
-		M_PREPEND(m0, 4, M_DONTWAIT);
+		M_PREPEND(m0, 4, M_NOWAIT);
 
 		/* if allocation failed drop packet */
 		if (m0 == NULL) {
@@ -728,7 +728,7 @@ tunwrite(dev_t dev, struct uio *uio, int flag)
 	tlen = uio->uio_resid;
 
 	/* get a header mbuf */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return (ENOBUFS);
 	mlen = MHLEN;
@@ -741,7 +741,7 @@ tunwrite(dev_t dev, struct uio *uio, int flag)
 		*mp = m;
 		mp = &m->m_next;
 		if (uio->uio_resid > 0) {
-			MGET (m, M_DONTWAIT, MT_DATA);
+			MGET (m, M_NOWAIT, MT_DATA);
 			if (m == 0) {
 				error = ENOBUFS;
 				break;
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 1850e8d94653..56712924f4b3 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -168,7 +168,7 @@ vlan_setmulti(struct ifnet *ifp)
 	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
-		mc = malloc(sizeof(struct vlan_mc_entry), M_VLAN, M_WAITOK);
+		mc = malloc(sizeof(struct vlan_mc_entry), M_VLAN, 0);
 		bcopy(LLADDR((struct sockaddr_dl *)ifma->ifma_addr),
 		    (char *)&mc->mc_addr, ETHER_ADDR_LEN);
 		SLIST_INSERT_HEAD(&sc->vlan_mc_listhead, mc, mc_entries);
@@ -232,7 +232,7 @@ vlan_clone_create(struct if_clone *ifc, int unit)
 	struct ifnet *ifp;
 	int s;
 
-	ifv = malloc(sizeof(struct ifvlan), M_VLAN, M_WAITOK | M_ZERO);
+	ifv = malloc(sizeof(struct ifvlan), M_VLAN, M_ZERO);
 	ifp = &ifv->ifv_if;
 	SLIST_INIT(&ifv->vlan_mc_listhead);
 
@@ -323,7 +323,7 @@ vlan_start(struct ifnet *ifp)
 			struct m_tag *mtag = m_tag_alloc(MTAG_VLAN,
 							 MTAG_VLAN_TAG,
 							 sizeof (u_int),
-							 M_DONTWAIT);
+							 M_NOWAIT);
 			if (mtag == NULL) {
 				ifp->if_oerrors++;
 				m_freem(m);
@@ -332,7 +332,7 @@ vlan_start(struct ifnet *ifp)
 			*(u_int*)(mtag+1) = ifv->ifv_tag;
 			m_tag_prepend(m, mtag);
 		} else {
-			M_PREPEND(m, ifv->ifv_encaplen, M_DONTWAIT);
+			M_PREPEND(m, ifv->ifv_encaplen, M_NOWAIT);
 			if (m == NULL) {
 				if_printf(ifp, "unable to prepend VLAN header");
 				ifp->if_ierrors++;
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index 42f2dcc92002..ff656a62a169 100644
--- a/sys/net/if_vlan_var.h
+++ b/sys/net/if_vlan_var.h
@@ -98,7 +98,7 @@ struct	vlanreq {
 #define	VLAN_INPUT_TAG(_ifp, _m, _t, _errcase) do {		\
 	struct m_tag *mtag;					\
 	mtag = m_tag_alloc(MTAG_VLAN, MTAG_VLAN_TAG,		\
-			   sizeof (u_int), M_DONTWAIT);		\
+			   sizeof (u_int), M_NOWAIT);		\
 	if (mtag == NULL) {					\
 		(_ifp)->if_ierrors++;				\
 		m_freem(_m);					\
diff --git a/sys/net/pfil.c b/sys/net/pfil.c
index 2ed40b2f0f4c..a53051b917b8 100644
--- a/sys/net/pfil.c
+++ b/sys/net/pfil.c
@@ -61,7 +61,7 @@ pfil_init(ph)
  *	PFIL_IN		call me on incoming packets
  *	PFIL_OUT	call me on outgoing packets
  *	PFIL_ALL	call me on all of the above
- *	PFIL_WAITOK	OK to call malloc with M_WAITOK.
+ *	PFIL_WAITOK	OK to call malloc with 0.
  */
 int
 pfil_add_hook(func, flags, ph)
@@ -97,7 +97,7 @@ pfil_list_add(list, func, flags)
 	struct packet_filter_hook *pfh;
 
 	pfh = (struct packet_filter_hook *)malloc(sizeof(*pfh), M_IFADDR,
-	    flags & PFIL_WAITOK ? M_WAITOK : M_NOWAIT);
+	    flags & PFIL_WAITOK ? 0 : M_NOWAIT);
 	if (pfh == NULL)
 		return ENOMEM;
 	pfh->pfil_func = func;
diff --git a/sys/net/ppp_deflate.c b/sys/net/ppp_deflate.c
index 3c7884e033d7..96fb810341e2 100644
--- a/sys/net/ppp_deflate.c
+++ b/sys/net/ppp_deflate.c
@@ -248,12 +248,12 @@ z_compress(arg, mret, mp, orig_len, maxolen)
     /* Allocate one mbuf initially. */
     if (maxolen > orig_len)
 	maxolen = orig_len;
-    MGET(m, M_DONTWAIT, MT_DATA);
+    MGET(m, M_NOWAIT, MT_DATA);
     *mret = m;
     if (m != NULL) {
 	m->m_len = 0;
 	if (maxolen + state->hdrlen > MLEN)
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
 	wspace = M_TRAILINGSPACE(m);
 	if (state->hdrlen + PPP_HDRLEN + 2 < wspace) {
 	    m->m_data += state->hdrlen;
@@ -308,12 +308,12 @@ z_compress(arg, mret, mp, orig_len, maxolen)
 	    if (m != NULL) {
 		m->m_len = wspace;
 		olen += wspace;
-		MGET(m->m_next, M_DONTWAIT, MT_DATA);
+		MGET(m->m_next, M_NOWAIT, MT_DATA);
 		m = m->m_next;
 		if (m != NULL) {
 		    m->m_len = 0;
 		    if (maxolen - olen > MLEN)
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, M_NOWAIT);
 		    state->strm.next_out = mtod(m, u_char *);
 		    state->strm.avail_out = wspace = M_TRAILINGSPACE(m);
 		}
@@ -507,13 +507,13 @@ z_decompress(arg, mi, mop)
     ++state->seqno;
 
     /* Allocate an output mbuf. */
-    MGETHDR(mo, M_DONTWAIT, MT_DATA);
+    MGETHDR(mo, M_NOWAIT, MT_DATA);
     if (mo == NULL)
 	return DECOMP_ERROR;
     mo_head = mo;
     mo->m_len = 0;
     mo->m_next = NULL;
-    MCLGET(mo, M_DONTWAIT);
+    MCLGET(mo, M_NOWAIT);
     ospace = M_TRAILINGSPACE(mo);
     if (state->hdrlen + PPP_HDRLEN < ospace) {
 	mo->m_data += state->hdrlen;
@@ -582,13 +582,13 @@ z_decompress(arg, mi, mop)
 	    } else {
 		mo->m_len = ospace;
 		olen += ospace;
-		MGET(mo->m_next, M_DONTWAIT, MT_DATA);
+		MGET(mo->m_next, M_NOWAIT, MT_DATA);
 		mo = mo->m_next;
 		if (mo == NULL) {
 		    m_freem(mo_head);
 		    return DECOMP_ERROR;
 		}
-		MCLGET(mo, M_DONTWAIT);
+		MCLGET(mo, M_NOWAIT);
 		state->strm.next_out = mtod(mo, u_char *);
 		state->strm.avail_out = ospace = M_TRAILINGSPACE(mo);
 	    }
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index ce05012e95d0..92215f1bd3dd 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -397,7 +397,7 @@ pppwrite(tp, uio, flag)
 
     s = spltty();
     for (mp = &m0; uio->uio_resid; mp = &m->m_next) {
-	MGET(m, M_TRYWAIT, MT_DATA);
+	MGET(m, 0, MT_DATA);
 	if ((*mp = m) == NULL) {
 	    m_freem(m0);
 	    splx(s);
@@ -405,7 +405,7 @@ pppwrite(tp, uio, flag)
 	}
 	m->m_len = 0;
 	if (uio->uio_resid >= MCLBYTES / 2)
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
 	len = M_TRAILINGSPACE(m);
 	if (len > uio->uio_resid)
 	    len = uio->uio_resid;
@@ -809,11 +809,11 @@ pppgetm(sc)
     mp = &sc->sc_m;
     for (len = sc->sc_mru + PPP_HDRLEN + PPP_FCSLEN; len > 0; ){
 	if ((m = *mp) == NULL) {
-	    MGETHDR(m, M_DONTWAIT, MT_DATA);
+	    MGETHDR(m, M_NOWAIT, MT_DATA);
 	    if (m == NULL)
 		break;
 	    *mp = m;
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
 	}
 	len -= M_DATASIZE(m);
 	mp = &m->m_next;
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 6f3f8b5bb158..66abcd0368f5 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -139,7 +139,7 @@ raw_bind(so, nam)
 	if (ifnet == 0)
 		return (EADDRNOTAVAIL);
 	rp = sotorawcb(so);
-	nam = m_copym(nam, 0, M_COPYALL, M_TRYWAIT);
+	nam = m_copym(nam, 0, M_COPYALL, 0);
 	rp->rcb_laddr = mtod(nam, struct sockaddr *);
 	return (0);
 }
diff --git a/sys/net/route.c b/sys/net/route.c
index 7847466e6430..ee0b7d3096ef 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1071,7 +1071,7 @@ rtinit(ifa, cmd, flags)
 		 * (Assuming we have a mask)
 		 */
 		if (netmask != NULL) {
-			m = m_get(M_DONTWAIT, MT_SONAME);
+			m = m_get(M_NOWAIT, MT_SONAME);
 			if (m == NULL)
 				return(ENOBUFS);
 			deldst = mtod(m, struct sockaddr *);
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 4780cc5a8b8d..3b5457d678f5 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -110,7 +110,7 @@ rts_attach(struct socket *so, int proto, struct thread *td)
 	if (sotorawcb(so) != 0)
 		return EISCONN;	/* XXX panic? */
 	/* XXX */
-	MALLOC(rp, struct rawcb *, sizeof *rp, M_PCB, M_WAITOK | M_ZERO);
+	MALLOC(rp, struct rawcb *, sizeof *rp, M_PCB, M_ZERO);
 	if (rp == 0)
 		return ENOBUFS;
 
@@ -608,9 +608,9 @@ rt_msg1(type, rtinfo)
 	}
 	if (len > MCLBYTES)
 		panic("rt_msg1");
-	m = m_gethdr(M_DONTWAIT, MT_DATA);
+	m = m_gethdr(M_NOWAIT, MT_DATA);
 	if (m && len > MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			m = NULL;
diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c
index a22488acf257..b89dfdc2edab 100644
--- a/sys/netatalk/aarp.c
+++ b/sys/netatalk/aarp.c
@@ -127,7 +127,7 @@ aarpwhohas( struct arpcom *ac, struct sockaddr_at *sat )
     struct llc		*llc;
     struct sockaddr	sa;
 
-    if (( m = m_gethdr( M_DONTWAIT, MT_DATA )) == NULL ) {
+    if (( m = m_gethdr( M_NOWAIT, MT_DATA )) == NULL ) {
 	return;
     }
 #ifdef MAC
@@ -166,7 +166,7 @@ aarpwhohas( struct arpcom *ac, struct sockaddr_at *sat )
 	bcopy((caddr_t)atmulticastaddr, (caddr_t)eh->ether_dhost,
 		sizeof( eh->ether_dhost ));
 	eh->ether_type = htons(sizeof(struct llc) + sizeof(struct ether_aarp));
-	M_PREPEND( m, sizeof( struct llc ), M_TRYWAIT );
+	M_PREPEND( m, sizeof( struct llc ), 0 );
 	llc = mtod( m, struct llc *);
 	llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP;
 	llc->llc_control = LLC_UI;
@@ -440,7 +440,7 @@ at_aarpinput( struct arpcom *ac, struct mbuf *m)
     if ( aa->aa_flags & AFA_PHASE2 ) {
 	eh->ether_type = htons( sizeof( struct llc ) +
 		sizeof( struct ether_aarp ));
-	M_PREPEND( m, sizeof( struct llc ), M_DONTWAIT );
+	M_PREPEND( m, sizeof( struct llc ), M_NOWAIT );
 	if ( m == NULL ) {
 	    return;
 	}
@@ -551,7 +551,7 @@ aarpprobe( void *arg )
 	aa->aa_ch = timeout( aarpprobe, (caddr_t)ac, hz / 5 );
     }
 
-    if (( m = m_gethdr( M_DONTWAIT, MT_DATA )) == NULL ) {
+    if (( m = m_gethdr( M_NOWAIT, MT_DATA )) == NULL ) {
 	return;
     }
 #ifdef MAC
@@ -579,7 +579,7 @@ aarpprobe( void *arg )
 		sizeof( eh->ether_dhost ));
 	eh->ether_type = htons( sizeof( struct llc ) +
 		sizeof( struct ether_aarp ));
-	M_PREPEND( m, sizeof( struct llc ), M_TRYWAIT );
+	M_PREPEND( m, sizeof( struct llc ), 0 );
 	llc = mtod( m, struct llc *);
 	llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP;
 	llc->llc_control = LLC_UI;
diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c
index d7e7586b648a..8f9091163956 100644
--- a/sys/netatalk/at_control.c
+++ b/sys/netatalk/at_control.c
@@ -138,7 +138,7 @@ at_control(struct socket *so, u_long cmd, caddr_t data,
 	 * allocate a fresh one. 
 	 */
 	if ( aa == (struct at_ifaddr *) 0 ) {
-	    aa0 = malloc(sizeof(struct at_ifaddr), M_IFADDR, M_WAITOK | M_ZERO);
+	    aa0 = malloc(sizeof(struct at_ifaddr), M_IFADDR, M_ZERO);
 	    if (( aa = at_ifaddr ) != NULL ) {
 		/*
 		 * Don't let the loopback be first, since the first
diff --git a/sys/netatalk/ddp_output.c b/sys/netatalk/ddp_output.c
index f15914be2bba..e3fb38453f5f 100644
--- a/sys/netatalk/ddp_output.c
+++ b/sys/netatalk/ddp_output.c
@@ -55,7 +55,7 @@ ddp_output( struct mbuf *m, struct socket *so)
     mac_create_mbuf_from_socket(so, m);
 #endif
 
-    M_PREPEND( m, sizeof( struct ddpehdr ), M_TRYWAIT );
+    M_PREPEND( m, sizeof( struct ddpehdr ), 0 );
 
     deh = mtod( m, struct ddpehdr *);
     deh->deh_pad = 0;
@@ -196,7 +196,7 @@ ddp_route( struct mbuf *m, struct route *ro)
      * packets end up poorly aligned due to the three byte elap header.
      */
     if ( !(aa->aa_flags & AFA_PHASE2) ) {
-	MGET( m0, M_TRYWAIT, MT_HEADER );
+	MGET( m0, 0, MT_HEADER );
 	if ( m0 == 0 ) {
 	    m_freem( m );
 	    printf("ddp_route: no buffers\n");
diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c
index fa79cec9de4a..0bd2e6d1c4f5 100644
--- a/sys/netatalk/ddp_pcb.c
+++ b/sys/netatalk/ddp_pcb.c
@@ -420,7 +420,7 @@ at_pcballoc( struct socket *so )
 {
 	struct ddpcb	*ddp;
 
-	MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_WAITOK | M_ZERO);
+	MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_ZERO);
 	ddp->ddp_lsat.sat_port = ATADDR_ANYPORT;
 
 	ddp->ddp_next = ddpcb;
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index fa79cec9de4a..0bd2e6d1c4f5 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -420,7 +420,7 @@ at_pcballoc( struct socket *so )
 {
 	struct ddpcb	*ddp;
 
-	MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_WAITOK | M_ZERO);
+	MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_ZERO);
 	ddp->ddp_lsat.sat_port = ATADDR_ANYPORT;
 
 	ddp->ddp_next = ddpcb;
diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index b101abf55039..c5e317289388 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -174,7 +174,7 @@ atm_cm_connect(epp, token, ap, copp)
 	/*
 	 * Get a connection block
 	 */
-	cop = uma_zalloc(atm_connection_zone, M_WAITOK);
+	cop = uma_zalloc(atm_connection_zone, 0);
 	if (cop == NULL)
 		return (ENOMEM);
 
@@ -405,7 +405,7 @@ atm_cm_connect(epp, token, ap, copp)
 	/*
 	 * Get a connection VCC block
 	 */
-	cvp = uma_zalloc(atm_connvc_zone, M_WAITOK);
+	cvp = uma_zalloc(atm_connvc_zone, 0);
 	if (cvp == NULL) {
 		err = ENOMEM;
 		goto donex;
@@ -551,7 +551,7 @@ atm_cm_listen(epp, token, ap, copp)
 	/*
 	 * Get a connection block
 	 */
-	cop = uma_zalloc(atm_connection_zone, M_WAITOK);
+	cop = uma_zalloc(atm_connection_zone, 0);
 	if (cop == NULL)
 		return (ENOMEM);
 
@@ -710,7 +710,7 @@ atm_cm_listen(epp, token, ap, copp)
 	/*
 	 * Get an attribute block and save listening attributes
 	 */
-	cop->co_lattr = uma_zalloc(atm_attributes_zone, M_WAITOK | M_ZERO);
+	cop->co_lattr = uma_zalloc(atm_attributes_zone, M_ZERO);
 	if (cop->co_lattr == NULL) {
 		err = ENOMEM;
 		goto done;
@@ -815,7 +815,7 @@ atm_cm_addllc(epp, token, llc, ecop, copp)
 	/*
 	 * Get a connection block
 	 */
-	cop = uma_zalloc(atm_connection_zone, M_WAITOK);
+	cop = uma_zalloc(atm_connection_zone, 0);
 	if (cop == NULL)
 		return (ENOMEM);
 
@@ -1266,7 +1266,7 @@ atm_cm_incoming(vcp, ap)
 	/*
 	 * Get a connection VCC block
 	 */
-	cvp = uma_zalloc(atm_connvc_zone, M_WAITOK);
+	cvp = uma_zalloc(atm_connvc_zone, 0);
 	if (cvp == NULL) {
 		err = ENOMEM;
 		goto fail;
@@ -1584,7 +1584,7 @@ atm_cm_incall(cvp)
 			/*
 			 * Need a new connection block
 			 */
-			cop = uma_zalloc(atm_connection_zone, M_WAITOK);
+			cop = uma_zalloc(atm_connection_zone, 0);
 			if (cop == NULL) {
 				cvp->cvc_attr.cause = atm_cause_tmpl;
 				cvp->cvc_attr.cause.v.cause_value =
diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c
index c85303e93604..959c61ca340b 100644
--- a/sys/netatm/atm_device.c
+++ b/sys/netatm/atm_device.c
@@ -170,7 +170,7 @@ atm_dev_inst(ssp, cvcp)
 	/*
 	 * Allocate a VCC control block
 	 */
-	cvp = uma_zalloc(cup->cu_vcc_zone, M_WAITOK);
+	cvp = uma_zalloc(cup->cu_vcc_zone, 0);
 	if (cvp == NULL)
 		return (ENOMEM);
 	
diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c
index 69c90820263a..a93d566679f1 100644
--- a/sys/netatm/atm_if.c
+++ b/sys/netatm/atm_if.c
@@ -496,7 +496,7 @@ atm_physif_ioctl(code, data, arg)
 		 */
 		for ( count = 0; count < asr->asr_nif_cnt; count++ )
 		{
-			nip = uma_zalloc(cup->cu_nif_zone, M_WAITOK | M_ZERO);
+			nip = uma_zalloc(cup->cu_nif_zone, M_ZERO);
 			if ( nip == NULL )
 			{
 				/*
diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c
index 6ff6abcc4018..3c0b806ef318 100644
--- a/sys/netatm/atm_socket.c
+++ b/sys/netatm/atm_socket.c
@@ -596,7 +596,7 @@ atm_sock_sockaddr(so, addr)
 	/*
 	 * Return local interface address, if known
 	 */
-	satm = malloc(sizeof(*satm), M_SONAME, M_WAITOK | M_ZERO);
+	satm = malloc(sizeof(*satm), M_SONAME, M_ZERO);
 	if (satm == NULL)
 		return (ENOMEM);
 
@@ -654,7 +654,7 @@ atm_sock_peeraddr(so, addr)
 	/*
 	 * Return remote address, if known
 	 */
-	satm = malloc(sizeof(*satm), M_SONAME, M_WAITOK | M_ZERO);
+	satm = malloc(sizeof(*satm), M_SONAME, M_ZERO);
 	if (satm == NULL)
 		return (ENOMEM);
 
diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index 49dbf48c4a88..5dca9710587a 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -124,7 +124,7 @@ ipatm_nifstat(cmd, nip, arg)
 		/*
 		 * Get a new interface block
 		 */
-		inp = uma_zalloc(ipatm_nif_zone, M_WAITOK);
+		inp = uma_zalloc(ipatm_nif_zone, 0);
 		if (inp == NULL) {
 			err = ENOMEM;
 			break;
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index 14cf7cc1f986..76c8a551a567 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -382,7 +382,7 @@ ipatm_openpvc(pvp, sivp)
 	/*
 	 * Allocate IP VCC block
 	 */
-	ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK);
+	ivp = uma_zalloc(ipatm_vc_zone, 0);
 	if (ivp == NULL) {
 		err = ENOMEM;
 		goto done;
@@ -585,7 +585,7 @@ ipatm_createsvc(ifp, daf, dst, sivp)
 	/*
 	 * Allocate IP VCC
 	 */
-	ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK);
+	ivp = uma_zalloc(ipatm_vc_zone, 0);
 	if (ivp == NULL) {
 		err = ENOMEM;
 		goto done;
@@ -937,7 +937,7 @@ ipatm_incoming(tok, cop, ap, tokp)
 	/*
 	 * Allocate IP VCC
 	 */
-	ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK);
+	ivp = uma_zalloc(ipatm_vc_zone, 0);
 	if (ivp == NULL) {
 		err = ENOMEM;
 		cause = T_ATM_CAUSE_UNSPECIFIED_RESOURCE_UNAVAILABLE;
diff --git a/sys/netatm/port.h b/sys/netatm/port.h
index df599adf1cbc..d11bd40327d4 100644
--- a/sys/netatm/port.h
+++ b/sys/netatm/port.h
@@ -126,8 +126,8 @@
 #include <sys/mbuf.h>
 typedef struct mbuf	KBuffer;
 
-#define	KB_F_WAIT	M_TRYWAIT
-#define	KB_F_NOWAIT	M_DONTWAIT
+#define	KB_F_WAIT	0
+#define	KB_F_NOWAIT	M_NOWAIT
 
 #define	KB_T_HEADER	MT_HEADER
 #define	KB_T_DATA	MT_DATA
diff --git a/sys/netatm/sigpvc/sigpvc_subr.c b/sys/netatm/sigpvc/sigpvc_subr.c
index 4c3196e4f840..b0a4da533e12 100644
--- a/sys/netatm/sigpvc/sigpvc_subr.c
+++ b/sys/netatm/sigpvc/sigpvc_subr.c
@@ -122,7 +122,7 @@ sigpvc_create_pvc(pvp, cvp, errp)
 	/*
 	 * Allocate control block for PVC
 	 */
-	vcp = uma_zalloc(sigpvc_vc_zone, M_WAITOK | M_ZERO);
+	vcp = uma_zalloc(sigpvc_vc_zone, M_ZERO);
 	if (vcp == NULL) {
 		*errp = ENOMEM;
 		return (CALL_FAILED);
diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index e0c83f97ed38..7fb5a10483e5 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -172,7 +172,7 @@ spansarp_svcout(ivp, dst)
 	/*
 	 * Now get the new arp entry
 	 */
-	sap = uma_zalloc(spansarp_zone, M_WAITOK);
+	sap = uma_zalloc(spansarp_zone, 0);
 	if (sap == NULL) {
 		(void) splx(s);
 		return (MAP_FAILED);
@@ -720,7 +720,7 @@ spansarp_input(clp, m)
 		/*
 		 * Source unknown and we're the target - add new entry
 		 */
-		sap = uma_zalloc(spansarp_zone, M_WAITOK);
+		sap = uma_zalloc(spansarp_zone, 0);
 		if (sap) {
 			sap->sa_dstip.s_addr = in_src.s_addr;
 			sap->sa_dstatm.address_format = T_ATM_SPANS_ADDR;
@@ -961,7 +961,7 @@ spansarp_ioctl(code, data, arg1)
 			/*
 			 * No, get a new arp entry
 			 */
-			sap = uma_zalloc(spansarp_zone, M_WAITOK);
+			sap = uma_zalloc(spansarp_zone, 0);
 			if (sap == NULL) {
 				err = ENOMEM;
 				break;
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index 5b938923c796..a71967884038 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -348,7 +348,7 @@ spanscls_attach(spp)
 	/*
 	 * Get a new cls control block
 	 */
-	clp = uma_zalloc(spanscls_zone, M_WAITOK);
+	clp = uma_zalloc(spanscls_zone, 0);
 	if (clp == NULL)
 		return (ENOMEM);
 
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index c59708081995..89185bd4149f 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -232,7 +232,7 @@ spans_send_open_req(spp, svp)
 	/*
 	 * Get memory for a request message
 	 */
-	req = uma_zalloc(spans_msg_zone, M_WAITOK);
+	req = uma_zalloc(spans_msg_zone, 0);
 	if (req == NULL) {
 		err = ENOBUFS;
 		goto done;
@@ -290,7 +290,7 @@ spans_send_open_rsp(spp, svp, result)
 	/*
 	 * Get memory for a response message
 	 */
-	rsp = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp = uma_zalloc(spans_msg_zone, 0);
 	if (rsp == NULL)
 		return(ENOBUFS);
 
@@ -340,7 +340,7 @@ spans_send_close_req(spp, svp)
 	/*
 	 * Get memory for a close request
 	 */
-	req = uma_zalloc(spans_msg_zone, M_WAITOK);
+	req = uma_zalloc(spans_msg_zone, 0);
 	if (req == NULL) {
 		err = ENOBUFS;
 		goto done;
@@ -468,7 +468,7 @@ spans_status_ind(spp, msg)
 	 * Respond to the status request or indication with a
 	 * status response
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 	rsp_msg->sm_vers = SPANS_VERS_1_0;
@@ -658,7 +658,7 @@ spans_open_req(spp, msg)
 	/*
 	 * Get a new VCCB for the connection
 	 */
-	svp = uma_zalloc(spans_vc_zone, M_WAITOK);
+	svp = uma_zalloc(spans_vc_zone, 0);
 	if (svp == NULL) {
 		ATM_DEBUG0("spans_open_req: VCCB pool empty\n");
 		result = SPANS_NORSC;
@@ -808,7 +808,7 @@ response:
 	 * Some problem was detected with the request.  Send a SPANS
 	 * message rejecting the connection.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1034,7 +1034,7 @@ response:
 	/*
 	 * Respond to the SPANS_CLOSE_IND with a SPANS_CLOSE_RSP
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 	rsp_msg->sm_vers = SPANS_VERS_1_0;
@@ -1169,7 +1169,7 @@ spans_multi_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_MULTI_RSP message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1215,7 +1215,7 @@ spans_add_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_ADD_RSP message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1262,7 +1262,7 @@ spans_join_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_JOIN_CNF message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1307,7 +1307,7 @@ spans_leave_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_LEAVE_CNF message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1401,7 +1401,7 @@ spans_query_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_QUERY_RSP message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1489,7 +1489,7 @@ spans_rcv_msg(spp, m)
 	/*
 	 * Get storage for the message
 	 */
-	msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	msg = uma_zalloc(spans_msg_zone, 0);
 	if (msg == NULL)
 		return;
 
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index 75628200c1e2..8f96374553cc 100644
--- a/sys/netatm/spans/spans_proto.c
+++ b/sys/netatm/spans/spans_proto.c
@@ -279,7 +279,7 @@ spans_timer(tip)
 		/*
 		 * Send out SPANS_STAT_REQ message
 		 */
-		msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+		msg = uma_zalloc(spans_msg_zone, 0);
 		if (msg == NULL) {
 			/* XXX arr: This is bogus and will go away RSN */
 			/* Retry later if no memory */
diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c
index 93ea6d44aba8..24edec234e01 100644
--- a/sys/netatm/spans/spans_subr.c
+++ b/sys/netatm/spans/spans_subr.c
@@ -192,7 +192,7 @@ spans_open_vcc(spp, cvp)
 	/*
 	 * Allocate control block for VCC
 	 */
-	svp = uma_zalloc(spans_vc_zone, M_WAITOK);
+	svp = uma_zalloc(spans_vc_zone, 0);
 	if (svp == NULL) {
 		return(ENOMEM);
 	}
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c
index b5ff7d0e1cf9..a0c3d6750011 100644
--- a/sys/netatm/uni/sscf_uni.c
+++ b/sys/netatm/uni/sscf_uni.c
@@ -213,7 +213,7 @@ sscf_uni_inst(ssp, cvp)
 	/*
 	 * Allocate our control block
 	 */
-	uvp = uma_zalloc(sscf_uni_zone, M_WAITOK);
+	uvp = uma_zalloc(sscf_uni_zone, 0);
 	if (uvp == NULL)
 		return (ENOMEM);
 	uvp->uv_ustate = UVU_INST;
diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c
index 6374f30caf0d..e5553077c1b4 100644
--- a/sys/netatm/uni/sscop.c
+++ b/sys/netatm/uni/sscop.c
@@ -258,7 +258,7 @@ sscop_inst(ssp, cvp)
 	/*
 	 * Allocate our control block
 	 */
-	sop = uma_zalloc(sscop_zone, M_WAITOK);
+	sop = uma_zalloc(sscop_zone, 0);
 	if (sop == NULL)
 		return (ENOMEM);
 
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c
index 0de56b8df535..e9469374eca5 100644
--- a/sys/netatm/uni/uniarp.c
+++ b/sys/netatm/uni/uniarp.c
@@ -713,7 +713,7 @@ uniarp_client_mode(uip, aap)
 	 * Now, get an arp entry for the server connection
 	 */
 	uip->uip_arpstate = UIAS_CLIENT_POPEN;
-	uap = uma_zalloc(uniarp_zone, M_WAITOK | M_ZERO);
+	uap = uma_zalloc(uniarp_zone, M_ZERO);
 	if (uap == NULL) {
 		UNIIP_ARP_TIMER(uip, 1 * ATM_HZ);
 		return;
diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c
index dbfe40241b94..10c780a05e1b 100644
--- a/sys/netatm/uni/uniarp_cache.c
+++ b/sys/netatm/uni/uniarp_cache.c
@@ -126,7 +126,7 @@ uniarp_cache_svc(uip, ip, atm, atmsub, origin)
 	 * If there aren't any entries yet, create one
 	 */
 	if ((ipuap == NULL) && (nouap == NULL)) {
-		ipuap = uma_zalloc(uniarp_zone, M_WAITOK);
+		ipuap = uma_zalloc(uniarp_zone, 0);
 		if (ipuap == NULL)
 			return (ENOMEM);
 		ipuap->ua_dstip.s_addr = ip->s_addr;
diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c
index ac1c1675f7ba..cfc081cd9583 100644
--- a/sys/netatm/uni/uniarp_vcm.c
+++ b/sys/netatm/uni/uniarp_vcm.c
@@ -133,7 +133,7 @@ uniarp_pvcopen(ivp)
 	/*
 	 * Get an arp map entry
 	 */
-	uap = uma_zalloc(uniarp_zone, M_WAITOK | M_ZERO);
+	uap = uma_zalloc(uniarp_zone, M_ZERO);
 	if (uap == NULL)
 		return (MAP_FAILED);
 
@@ -279,7 +279,7 @@ uniarp_svcout(ivp, dst)
 	/*
 	 * We're a client with an open VCC to the server, get a new arp entry
 	 */
-	uap = uma_zalloc(uniarp_zone, M_WAITOK);
+	uap = uma_zalloc(uniarp_zone, 0);
 	if (uap == NULL) {
 		(void) splx(s);
 		return (MAP_FAILED);
@@ -440,7 +440,7 @@ uniarp_svcin(ivp, dst, dstsub)
 	/*
 	 * No info in the cache - get a new arp entry
 	 */
-	uap = uma_zalloc(uniarp_zone, M_WAITOK | M_ZERO);
+	uap = uma_zalloc(uniarp_zone, M_ZERO);
 	if (uap == NULL) {
 		(void) splx(s);
 		return (MAP_FAILED);
diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c
index 3635523df396..7bdb1007fbd8 100644
--- a/sys/netatm/uni/uniip.c
+++ b/sys/netatm/uni/uniip.c
@@ -188,7 +188,7 @@ uniip_ipact(inp)
 	/*
 	 * Get a new interface control block
 	 */
-	uip = uma_zalloc(uniip_zone, M_WAITOK | M_ZERO);
+	uip = uma_zalloc(uniip_zone, M_ZERO);
 	if (uip == NULL)
 		return (ENOMEM);
 
diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c
index aa49fdaca7f9..c15d02e2a7c2 100644
--- a/sys/netatm/uni/unisig_decode.c
+++ b/sys/netatm/uni/unisig_decode.c
@@ -67,7 +67,7 @@ __RCSID("@(#) $FreeBSD$");
 #endif
 
 #define	ALLOC_IE(ie) do {						\
-	(ie) = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);		\
+	(ie) = uma_zalloc(unisig_ie_zone, M_ZERO);			\
 	if ((ie) == NULL)						\
 		return (ENOMEM);					\
 } while (0)
diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c
index a002426f6f3b..a193d008c2e9 100644
--- a/sys/netatm/uni/unisig_msg.c
+++ b/sys/netatm/uni/unisig_msg.c
@@ -294,7 +294,7 @@ unisig_send_setup(usp, uvp)
 	/*
 	 * Get memory for a SETUP message
 	 */
-	setup = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	setup = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (setup == NULL) {
 		err = ENOMEM;
 		goto done;
@@ -320,7 +320,7 @@ unisig_send_setup(usp, uvp)
 	 * specify one in the attribute block
 	 */
 	if (ap->calling.tag != T_ATM_PRESENT) {
-		setup->msg_ie_cgad = uma_zalloc(unisig_ie_zone, M_WAITOK); 
+		setup->msg_ie_cgad = uma_zalloc(unisig_ie_zone, 0);
 		if (setup->msg_ie_cgad == NULL) {
 			err = ENOMEM;
 			goto done;
@@ -379,11 +379,11 @@ unisig_send_release(usp, uvp, msg, cause)
 	/*
 	 * Get memory for a RELEASE message
 	 */
-	rls_msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	rls_msg = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (rls_msg == NULL) {
 		return(ENOMEM);
 	}
-	cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);
+	cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
 	if (cause_ie == NULL) {
 		uma_zfree(unisig_msg_zone, rls_msg);
 		return(ENOMEM);
@@ -455,11 +455,11 @@ unisig_send_release_complete(usp, uvp, msg, cause)
 	/*
 	 * Get memory for a RELEASE COMPLETE message
 	 */
-	rls_cmp = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	rls_cmp = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (rls_cmp == NULL) {
 		return(ENOMEM);
 	}
-	cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);
+	cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
 	if (cause_ie == NULL) {
 		uma_zfree(unisig_msg_zone, rls_cmp);
 		return(ENOMEM);
@@ -534,16 +534,16 @@ unisig_send_status(usp, uvp, msg, cause)
 	/*
 	 * Get memory for a STATUS message
 	 */
-	stat_msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	stat_msg = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (stat_msg == NULL) {
 		return(ENOMEM);
 	}
-	cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);
+	cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
 	if (cause_ie == NULL) {
 		uma_zfree(unisig_msg_zone, stat_msg);
 		return(ENOMEM);
 	}
-	clst_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO); 
+	clst_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
 	if (clst_ie == NULL) {
 		uma_zfree(unisig_msg_zone, stat_msg);
 		uma_zfree(unisig_ie_zone, cause_ie);
@@ -679,7 +679,7 @@ unisig_rcv_restart(usp, msg)
 	/*
 	 * Get memory for a RESTART ACKNOWLEDGE message
 	 */
-	rsta_msg = uma_zalloc(unisig_msg_zone, M_WAITOK);
+	rsta_msg = uma_zalloc(unisig_msg_zone, 0);
 	if (rsta_msg == NULL) {
 		return;
 	}
@@ -772,7 +772,7 @@ unisig_rcv_setup(usp, msg)
 	/*
 	 * Get a new VCCB for the connection
 	 */
-	uvp = uma_zalloc(unisig_vc_zone, M_WAITOK | M_ZERO);
+	uvp = uma_zalloc(unisig_vc_zone, M_ZERO);
 	if (uvp == NULL) {
 		return;
 	}
@@ -842,7 +842,7 @@ unisig_rcv_msg(usp, m)
 	/*
 	 * Get storage for the message
 	 */
-	msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	msg = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (msg == NULL) {
 		err = ENOMEM;
 		goto done;
diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c
index 31cd1a4fc2fd..8a91fb6e2245 100644
--- a/sys/netatm/uni/unisig_subr.c
+++ b/sys/netatm/uni/unisig_subr.c
@@ -275,7 +275,7 @@ unisig_open_vcc(usp, cvp)
 	/*
 	 * Allocate control block for VCC
 	 */
-	uvp = uma_zalloc(unisig_vc_zone, M_WAITOK | M_ZERO);
+	uvp = uma_zalloc(unisig_vc_zone, M_ZERO);
 	if (uvp == NULL) {
 		return(ENOMEM);
 	}
@@ -897,7 +897,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->aal.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_aalp) {
 			msg->msg_ie_aalp = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_aalp == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -955,7 +955,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->traffic.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_clrt) {
 			msg->msg_ie_clrt = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_clrt == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1012,7 +1012,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->bearer.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_bbcp) {
 			msg->msg_ie_bbcp = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_bbcp == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1040,7 +1040,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->bhli.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_bhli) {
 			msg->msg_ie_bhli = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_bhli == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1080,7 +1080,7 @@ unisig_set_attrs(usp, msg, ap)
 			ap->blli.tag_l3 == T_ATM_PRESENT) {
 		if (!msg->msg_ie_blli) {
 			msg->msg_ie_blli = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_blli == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1165,7 +1165,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->called.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_cdad) {
 			msg->msg_ie_cdad = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_cdad == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1181,7 +1181,7 @@ unisig_set_attrs(usp, msg, ap)
 		if (ap->called.subaddr.address_format != T_ATM_ABSENT) {
 			if (!msg->msg_ie_cdsa) {
 				msg->msg_ie_cdsa = uma_zalloc(unisig_ie_zone,
-				    M_WAITOK | M_ZERO);
+				    M_ZERO);
 				if (msg->msg_ie_cdsa == NULL) {
 					err = ENOMEM;
 					goto done;
@@ -1203,7 +1203,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->calling.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_cgad) {
 			msg->msg_ie_cgad = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_cgad == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1220,7 +1220,7 @@ unisig_set_attrs(usp, msg, ap)
 				T_ATM_ABSENT) {
 			if (!msg->msg_ie_cgsa) {
 				msg->msg_ie_cgsa = uma_zalloc(unisig_ie_zone,
-				    M_WAITOK | M_ZERO);
+				    M_ZERO);
 				if (msg->msg_ie_cgsa == NULL) {
 					err = ENOMEM;
 					goto done;
@@ -1241,7 +1241,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->qos.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_qosp) {
 			msg->msg_ie_qosp = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_qosp == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1273,7 +1273,7 @@ unisig_set_attrs(usp, msg, ap)
 				ap->transit.v.length != 0) {
 		if (!msg->msg_ie_trnt) {
 			msg->msg_ie_trnt = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_trnt == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1298,7 +1298,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->cause.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_caus) {
 			msg->msg_ie_caus = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_caus == NULL) {
 				err = ENOMEM;
 				goto done;
diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c
index 3c88cba80101..6c5bc369650f 100644
--- a/sys/netatm/uni/unisig_vc_state.c
+++ b/sys/netatm/uni/unisig_vc_state.c
@@ -456,7 +456,7 @@ unisig_vc_act04(usp, uvp, msg)
 		vpi = msg->msg_ie_cnid->ie_cnid_vpci;
 		vci = msg->msg_ie_cnid->ie_cnid_vci;
 	} else {
-		iep = uma_zalloc(unisig_ie_zone, M_WAITOK);
+		iep = uma_zalloc(unisig_ie_zone, 0);
 		if (iep == NULL)
 			return (ENOMEM);
 		iep->ie_ident = UNI_IE_CNID;
@@ -548,10 +548,10 @@ unisig_vc_act05(usp, uvp, msg)
 	/*
 	 * Send a RELEASE message
 	 */
-	rls_msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	rls_msg = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (rls_msg == NULL)
 		return(ENOMEM);
-	cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);
+	cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
 	if (cause_ie == NULL) {
 		uma_zfree(unisig_msg_zone, rls_msg);
 		return(ENOMEM);
@@ -668,7 +668,7 @@ unisig_vc_act06(usp, uvp, msg)
 		 * No--VCI must have been specified earlier
 		 */
 		if (!uvp->uv_vci) {
-			iep = uma_zalloc(unisig_ie_zone, M_WAITOK);
+			iep = uma_zalloc(unisig_ie_zone, 0);
 			if (iep == NULL)
 				return(ENOMEM);
 			iep->ie_ident = UNI_IE_CNID;
@@ -742,7 +742,7 @@ unisig_vc_act06(usp, uvp, msg)
 	/*
 	 * Get memory for a CONNECT ACK message
 	 */
-	cack_msg = uma_zalloc(unisig_msg_zone, M_WAITOK);
+	cack_msg = uma_zalloc(unisig_msg_zone, 0);
 	if (cack_msg == NULL)
 		return(ENOMEM);
 
@@ -1058,7 +1058,7 @@ unisig_vc_act09(usp, uvp, msg)
 	int			rc;
 	struct unisig_msg	*conn_msg;
 
-	conn_msg = uma_zalloc(unisig_msg_zone, M_WAITOK);
+	conn_msg = uma_zalloc(unisig_msg_zone, 0);
 	if (conn_msg == NULL)
 		return(ENOMEM);
 
@@ -1389,7 +1389,7 @@ unisig_vc_act15(usp, uvp, msg)
 			}
 		}
 		if (cause == UNI_IE_CAUS_MISSING) {
-			iep = uma_zalloc(unisig_ie_zone, M_WAITOK);
+			iep = uma_zalloc(unisig_ie_zone, 0);
 			if (iep == NULL)
 				return(ENOMEM);
 			iep->ie_ident = UNI_IE_CNID;
@@ -1611,7 +1611,7 @@ unisig_vc_act20(usp, uvp, msg)
 	/*
 	 * Get memory for a STATUS ENQUIRY message
 	 */
-	stat_msg = uma_zalloc(unisig_msg_zone, M_WAITOK);
+	stat_msg = uma_zalloc(unisig_msg_zone, 0);
 	if (stat_msg == NULL)
 		return(ENOMEM);
 
@@ -1757,15 +1757,15 @@ unisig_vc_act22(usp, uvp, msg)
 	/*
 	 * Get memory for a STATUS message
 	 */
-	status = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	status = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (status == NULL)
 		return(ENOMEM);
-	callst_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);
+	callst_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
 	if (callst_ie == NULL) {
 		uma_zfree(unisig_msg_zone, status);
 		return(ENOMEM);
 	}
-	cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO); 
+	cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
 	if (cause_ie == NULL) {
 		uma_zfree(unisig_msg_zone, status);
 		uma_zfree(unisig_ie_zone, callst_ie);
@@ -1859,7 +1859,7 @@ unisig_vc_act23(usp, uvp, msg)
 	/*
 	 * Get memory for the ADD PARTY REJECT message
 	 */
-	apr_msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	apr_msg = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (apr_msg == NULL)
 		return(ENOMEM);
 
diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
index 443c18acb784..2b008bf206b2 100644
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
@@ -832,7 +832,7 @@ bt3c_receive(bt3c_softc_p sc)
 			sc->state = NG_BT3C_W4_PKT_IND;
 			sc->want = 1;
 
-			MGETHDR(sc->m, M_DONTWAIT, MT_DATA);
+			MGETHDR(sc->m, M_NOWAIT, MT_DATA);
 			if (sc->m == NULL) {
 				NG_BT3C_ERR(sc->dev, "Could not get mbuf\n");
 				NG_BT3C_STAT_IERROR(sc->stat);
@@ -996,7 +996,7 @@ bt3c_append(struct mbuf *m0, int c)
 	}
 
 	if (m->m_len >= len) {
-		MGET(m->m_next, M_DONTWAIT, m0->m_type);
+		MGET(m->m_next, M_NOWAIT, m0->m_type);
 		if (m->m_next == NULL)
 			return (ENOBUFS);
  
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
index 650c6f4d2c06..d793c04f43d6 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
@@ -170,7 +170,7 @@ ng_h4_open(dev_t dev, struct tty *tp)
 	}
 
 	/* Initialize private struct */
-	MALLOC(sc, ng_h4_info_p, sizeof(*sc), M_NETGRAPH_H4, M_WAITOK | M_ZERO);
+	MALLOC(sc, ng_h4_info_p, sizeof(*sc), M_NETGRAPH_H4, M_ZERO);
 	if (sc == NULL) {
 		error = ENOMEM;
 		goto out;
@@ -516,7 +516,7 @@ ng_h4_input(int c, struct tty *tp)
 		if (sc->hook != NULL && NG_HOOK_IS_VALID(sc->hook)) {
 			struct mbuf	*m = NULL;
 
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m != NULL) {
 				m->m_pkthdr.len = 0;
 
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index 603d72228bb6..71cb2dff11f4 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -1012,7 +1012,7 @@ ubt_intr_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s)
 
 	/* Copy HCI event frame to mbuf */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		NG_UBT_ALERT(
 "%s: %s - Could not allocate mbuf\n", __func__, USBDEVNAME(sc->sc_dev));
@@ -1148,7 +1148,7 @@ ubt_bulk_in_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s)
 	if (h->actlen < sizeof(*hdr))
 		goto done;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		NG_UBT_ALERT(
 "%s: %s - Could not allocate mbuf\n", __func__, USBDEVNAME(sc->sc_dev));
@@ -1426,7 +1426,7 @@ ubt_isoc_in_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s)
 
 	/* Copy SCO data frame to mbuf */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		NG_UBT_ALERT(
 "%s: %s - Could not allocate mbuf\n",
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
index 5769ee586cec..3e3e501adf1d 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
@@ -116,7 +116,7 @@ ng_hci_send_command(ng_hci_unit_p unit)
 
 	ng_hci_mtap(unit, m0);
 
-	m = m_dup(m0, M_DONTWAIT);
+	m = m_dup(m0, M_NOWAIT);
 	if (m != NULL)
 		NG_SEND_DATA_ONLY(error, unit->drv, m);
 	else
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
index 9d81380e019c..cd199db08a3d 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
@@ -504,7 +504,7 @@ con_compl(ng_hci_unit_p unit, struct mbuf *event)
 			} __attribute__ ((packed))			*lp;
 			struct mbuf					*m;
 
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m != NULL) {
 				m->m_pkthdr.len = m->m_len = sizeof(*lp);
 				lp = mtod(m, struct __link_policy *);
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.c b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
index ba92f8987ae2..c4f1f85c6c1d 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
@@ -67,7 +67,7 @@ ng_hci_mtap(ng_hci_unit_p unit, struct mbuf *m0)
 	int		 error = 0;
 
 	if (unit->raw != NULL && NG_HOOK_IS_VALID(unit->raw)) {
-		m = m_dup(m0, M_DONTWAIT);
+		m = m_dup(m0, M_NOWAIT);
 		if (m != NULL)
 			NG_SEND_DATA_ONLY(error, unit->raw, m);
 
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
index 97a0ea8ec2f3..0a2c48b99659 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
@@ -232,7 +232,7 @@ ng_hci_lp_acl_con_req(ng_hci_unit_p unit, item_p item, hook_p hook)
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		ng_hci_free_con(con);
 		error = ENOBUFS;
@@ -427,7 +427,7 @@ ng_hci_lp_sco_con_req(ng_hci_unit_p unit, item_p item, hook_p hook)
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		ng_hci_free_con(sco_con);
 		error = ENOBUFS;
@@ -545,7 +545,7 @@ ng_hci_lp_discon_req(ng_hci_unit_p unit, item_p item, hook_p hook)
 	 * Create HCI command
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto out;
@@ -794,7 +794,7 @@ ng_hci_lp_con_rsp(ng_hci_unit_p unit, item_p item, hook_p hook)
 		 * Create HCI command 
 		 */
 
-		MGETHDR(m, M_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
@@ -1017,7 +1017,7 @@ ng_hci_lp_qos_req(ng_hci_unit_p unit, item_p item, hook_p hook)
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto out;
@@ -1247,7 +1247,7 @@ ng_hci_process_con_watchdog_timeout(node_p node, hook_p hook,
 	 * Create HCI command
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return; /* XXX this is bad */
 
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
index d107ad687ff7..42f53aacef9c 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
@@ -54,7 +54,7 @@ do {									\
 		ng_l2cap_cmd_rej_data_t	 data;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -88,7 +88,7 @@ do {									\
 		ng_l2cap_con_req_cp	 param;				\
 	} __attribute__ ((packed)) 	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -111,7 +111,7 @@ do {									\
 		ng_l2cap_con_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -136,7 +136,7 @@ do {									\
 		ng_l2cap_cfg_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) { 						\
 		NG_FREE_M((_data));					\
 		break;							\
@@ -168,7 +168,7 @@ do {									\
 		ng_l2cap_cfg_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) { 						\
 		NG_FREE_M((_data));					\
 		break;							\
@@ -198,7 +198,7 @@ do {									\
 do {									\
 	u_int8_t	*p = NULL;					\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -275,7 +275,7 @@ do {									\
 		ng_l2cap_discon_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -298,7 +298,7 @@ do {									\
 		ng_l2cap_discon_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -318,7 +318,7 @@ do {									\
 do {									\
 	ng_l2cap_cmd_hdr_t	*c = NULL;				\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -345,7 +345,7 @@ do {									\
 		ng_l2cap_info_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -368,7 +368,7 @@ do {									\
 		ng_l2cap_info_rsp_data_t data;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
index 3779b91a433f..e4a644d60b02 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
@@ -190,7 +190,7 @@ ng_l2cap_process_signal_cmd(ng_l2cap_con_p con)
 
 		/* Get the command, save the rest (if any) */
 		if (con->rx_pkt->m_pkthdr.len > hdr->length)
-			m = m_split(con->rx_pkt, hdr->length, M_DONTWAIT);
+			m = m_split(con->rx_pkt, hdr->length, M_NOWAIT);
 		else
 			m = NULL;
 
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
index f505158564d3..39979be90c50 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
@@ -502,7 +502,7 @@ ng_l2cap_lp_send(ng_l2cap_con_p con, u_int16_t dcid, struct mbuf *m0)
 		/* Check length of the packet against HCI MTU */
 		len = m0->m_pkthdr.len;
 		if (len > l2cap->pkt_size) {
-			m = m_split(m0, l2cap->pkt_size, M_DONTWAIT);
+			m = m_split(m0, l2cap->pkt_size, M_NOWAIT);
 			if (m == NULL) {
 				NG_L2CAP_ALERT(
 "%s: %s - m_split(%d) failed\n",	__func__, NG_NODE_NAME(l2cap->node),
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
index 9fcbc6ee5d4a..affa98e5f4a5 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
@@ -432,7 +432,7 @@ ng_l2cap_queue_command_timeout(void *context)
 struct mbuf *
 ng_l2cap_prepend(struct mbuf *m, int size)
 {
-	M_PREPEND(m, size, M_DONTWAIT);
+	M_PREPEND(m, size, M_NOWAIT);
 	if (m == NULL || (m->m_len < size && (m = m_pullup(m, size)) == NULL))
 		return (NULL);
 
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
index 8fa8a08e5ce3..9bc24388a7de 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
@@ -275,7 +275,7 @@ ng_btsocket_hci_raw_node_rcvdata(hook_p hook, item_p item)
 	struct mbuf	*nam = NULL;
 	int		 error;
 
-	MGET(nam, M_DONTWAIT, MT_SONAME);
+	MGET(nam, M_NOWAIT, MT_SONAME);
 	if (nam != NULL) {
 		struct sockaddr_hci	*sa = mtod(nam, struct sockaddr_hci *);
 
@@ -348,7 +348,7 @@ ng_btsocket_raw_send_ngmsg(char *path, int cmd, void *arg, int arglen)
 	struct ng_mesg	*msg = NULL;
 	int		 error = 0;
 
-	NG_MKMESSAGE(msg, NGM_HCI_COOKIE, cmd, arglen, M_WAITOK);
+	NG_MKMESSAGE(msg, NGM_HCI_COOKIE, cmd, arglen, 0);
 	if (msg == NULL)
 		return (ENOMEM);
 
@@ -374,7 +374,7 @@ ng_btsocket_raw_send_sync_ngmsg(ng_btsocket_hci_raw_pcb_p pcb, char *path,
 	ng_btsocket_hci_raw_get_token(&pcb->token);
 	pcb->msg = NULL;
 
-	NG_MKMESSAGE(msg, NGM_HCI_COOKIE, cmd, 0, M_WAITOK);
+	NG_MKMESSAGE(msg, NGM_HCI_COOKIE, cmd, 0, 0);
 	if (msg == NULL) {
 		pcb->token = 0;
 		return (ENOMEM);
@@ -504,7 +504,7 @@ ng_btsocket_hci_raw_data_input(struct mbuf *nam)
 		 * will check if socket has enough buffer space.
 		 */
 
-		m = m_dup(m0, M_DONTWAIT);
+		m = m_dup(m0, M_NOWAIT);
 		if (m != NULL) {
 			struct mbuf	*ctl = NULL;
 
@@ -743,7 +743,7 @@ ng_btsocket_hci_raw_attach(struct socket *so, int proto, struct thread *td)
 		return (error);
 
 	MALLOC(pcb, ng_btsocket_hci_raw_pcb_p, sizeof(*pcb), 
-		M_NETGRAPH_BTSOCKET_HCI_RAW, M_WAITOK | M_ZERO);
+		M_NETGRAPH_BTSOCKET_HCI_RAW, M_ZERO);
 	if (pcb == NULL)
 		return (ENOMEM);
 
@@ -956,7 +956,7 @@ ng_btsocket_hci_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_HCI_COOKIE,
-			NGM_HCI_NODE_GET_NEIGHBOR_CACHE, 0, M_WAITOK);
+			NGM_HCI_NODE_GET_NEIGHBOR_CACHE, 0, 0);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -1014,7 +1014,7 @@ ng_btsocket_hci_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_HCI_COOKIE, NGM_HCI_NODE_GET_CON_LIST,
-			0, M_WAITOK);
+			0, 0);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -1271,7 +1271,7 @@ ng_btsocket_hci_raw_send(struct socket *so, int flags, struct mbuf *m,
 		sa = (struct sockaddr *) &pcb->addr;
 	}
 
-	MGET(nam, M_TRYWAIT, MT_SONAME);
+	MGET(nam, 0, MT_SONAME);
 	if (nam == NULL) {
 		error = ENOBUFS;
 		goto drop;
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
index dec7a3c2e62e..8360038d8bc7 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -1464,7 +1464,7 @@ ng_btsocket_l2cap_data_input(struct mbuf *m, hook_p hook)
 			 * it is a broadcast traffic after all
 			 */
 
-			copy = m_dup(m, M_DONTWAIT);
+			copy = m_dup(m, M_NOWAIT);
 			if (copy != NULL) {
 				sbappendrecord(&pcb->so->so_rcv, copy);
 				sorwakeup(pcb->so);
@@ -2384,7 +2384,7 @@ ng_btsocket_l2cap_send2(ng_btsocket_l2cap_pcb_p pcb)
 	if (pcb->so->so_snd.sb_cc == 0)
 		return (EINVAL); /* XXX */
 
-	m = m_dup(pcb->so->so_snd.sb_mb, M_DONTWAIT);
+	m = m_dup(pcb->so->so_snd.sb_mb, M_NOWAIT);
 	if (m == NULL)
 		return (ENOBUFS);
 
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
index 3b24afd73a9f..44e3be10ee61 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
@@ -571,7 +571,7 @@ ng_btsocket_l2cap_raw_attach(struct socket *so, int proto, struct thread *td)
 
 	/* Allocate the PCB */
         MALLOC(pcb, ng_btsocket_l2cap_raw_pcb_p, sizeof(*pcb),
-		M_NETGRAPH_BTSOCKET_L2CAP_RAW, M_WAITOK | M_ZERO);
+		M_NETGRAPH_BTSOCKET_L2CAP_RAW, M_ZERO);
         if (pcb == NULL)
                 return (ENOMEM);
 
@@ -758,7 +758,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE, NGM_L2CAP_NODE_GET_FLAGS,
-			0, M_WAITOK);
+			0, 0);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -799,7 +799,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE, NGM_L2CAP_NODE_GET_DEBUG,
-			0, M_WAITOK);
+			0, 0);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -837,7 +837,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 			(struct ng_btsocket_l2cap_raw_node_debug *) data;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE, NGM_L2CAP_NODE_SET_DEBUG,
-			sizeof(ng_l2cap_node_debug_ep), M_WAITOK);
+			sizeof(ng_l2cap_node_debug_ep), 0);
 		if (msg == NULL) {
 			error = ENOMEM;
 			break;
@@ -865,7 +865,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE, NGM_L2CAP_NODE_GET_CON_LIST,
-			0, M_WAITOK);
+			0, 0);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -923,7 +923,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE,
-			NGM_L2CAP_NODE_GET_CHAN_LIST, 0, M_WAITOK);
+			NGM_L2CAP_NODE_GET_CHAN_LIST, 0, 0);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -987,7 +987,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE,
 			NGM_L2CAP_L2CA_PING, sizeof(*ip) + p->echo_size,
-			M_WAITOK);
+			0);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -1056,7 +1056,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE,
 			NGM_L2CAP_L2CA_GET_INFO, sizeof(*ip) + p->info_size,
-			M_WAITOK);
+			0);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
diff --git a/sys/netgraph/ng_UI.c b/sys/netgraph/ng_UI.c
index e0733bce2fbe..8751105deb63 100644
--- a/sys/netgraph/ng_UI.c
+++ b/sys/netgraph/ng_UI.c
@@ -194,7 +194,7 @@ ng_UI_rcvdata(hook_p hook, item_p item)
 		m_adj(m, ptr - start);
 		NG_FWD_NEW_DATA(error, item, priv->uplink, m);	/* m -> NULL */
 	} else if (hook == priv->uplink) {
-		M_PREPEND(m, 1, M_DONTWAIT);	/* Prepend IP NLPID */
+		M_PREPEND(m, 1, M_NOWAIT);	/* Prepend IP NLPID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c
index f552a503ee5a..1e1ff1c70e1b 100644
--- a/sys/netgraph/ng_bridge.c
+++ b/sys/netgraph/ng_bridge.c
@@ -713,7 +713,7 @@ ng_bridge_rcvdata(hook_p hook, item_p item)
 			 * It's usable link but not the reserved (first) one.
 			 * Copy mbuf and meta info for sending.
 			 */
-			m2 = m_dup(m, M_DONTWAIT);	/* XXX m_copypacket() */
+			m2 = m_dup(m, M_NOWAIT);	/* XXX m_copypacket() */
 			if (m2 == NULL) {
 				link->stats.memoryFailures++;
 				NG_FREE_ITEM(item);
diff --git a/sys/netgraph/ng_cisco.c b/sys/netgraph/ng_cisco.c
index f263f3569399..70ef5d7eb406 100644
--- a/sys/netgraph/ng_cisco.c
+++ b/sys/netgraph/ng_cisco.c
@@ -360,7 +360,7 @@ cisco_rcvdata(hook_p hook, item_p item)
 	/* OK so it came from a protocol, heading out. Prepend general data
 	   packet header. For now, IP,IPX only  */
 	m = NGI_M(item); /* still associated with item */
-	M_PREPEND(m, CISCO_HEADER_LEN, M_DONTWAIT);
+	M_PREPEND(m, CISCO_HEADER_LEN, M_NOWAIT);
 	if (!m) {
 		error = ENOBUFS;
 		goto out;
@@ -606,7 +606,7 @@ cisco_send(sc_p sc, int type, long par1, long par2)
 
 	getmicrotime(&time);
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (!m)
 		return (ENOBUFS);
 
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index 7588c92fe8a1..1bead1a0f9b4 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -417,7 +417,7 @@ ng_eiface_constructor(node_p node)
 	int		error = 0;
 
 	/* Allocate node and interface private structures */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK);
+	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, 0);
 	if (priv == NULL) {
 		return (ENOMEM);
 	}
diff --git a/sys/netgraph/ng_frame_relay.c b/sys/netgraph/ng_frame_relay.c
index dc555922be09..e2dc2996c3ef 100644
--- a/sys/netgraph/ng_frame_relay.c
+++ b/sys/netgraph/ng_frame_relay.c
@@ -366,7 +366,7 @@ ngfrm_rcvdata(hook_p hook, item_p item)
 	alen = sc->addrlen;
 	if (alen == 0)
 		alen = 2;	/* default value for transmit */
-	M_PREPEND(m, alen, M_DONTWAIT);
+	M_PREPEND(m, alen, M_NOWAIT);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto bad;
diff --git a/sys/netgraph/ng_gif.c b/sys/netgraph/ng_gif.c
index 2d999590f412..985cf315c0af 100644
--- a/sys/netgraph/ng_gif.c
+++ b/sys/netgraph/ng_gif.c
@@ -309,7 +309,7 @@ ng_gif_glue_af(struct mbuf **mp, int af)
 	 * hopefully everything after that will not
 	 * need one. So let's just use M_PREPEND.
 	 */
-	M_PREPEND(m, sizeof (tmp_af), M_DONTWAIT);
+	M_PREPEND(m, sizeof (tmp_af), M_NOWAIT);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto done;
diff --git a/sys/netgraph/ng_gif_demux.c b/sys/netgraph/ng_gif_demux.c
index 066bea6e4e29..9f6495a880b4 100644
--- a/sys/netgraph/ng_gif_demux.c
+++ b/sys/netgraph/ng_gif_demux.c
@@ -346,7 +346,7 @@ ng_gif_demux_rcvdata(hook_p hook, item_p item)
 		 * Add address family header and set the output hook.
 		 */
 		iffam = get_iffam_from_hook(priv, hook);
-		M_PREPEND(m, sizeof (iffam->family), M_DONTWAIT);
+		M_PREPEND(m, sizeof (iffam->family), M_NOWAIT);
 		if (m == NULL) {
 			NG_FREE_M(m);
 			NG_FREE_ITEM(item);
diff --git a/sys/netgraph/ng_l2tp.c b/sys/netgraph/ng_l2tp.c
index ebc6a4186360..69a7cf96ec02 100644
--- a/sys/netgraph/ng_l2tp.c
+++ b/sys/netgraph/ng_l2tp.c
@@ -851,7 +851,7 @@ ng_l2tp_recv_lower(node_p node, item_p item)
 		 * later because of a memory error, because then the upper
 		 * layer would never get the packet.
 		 */
-		M_PREPEND(m, 2, M_DONTWAIT);
+		M_PREPEND(m, 2, M_NOWAIT);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			NG_FREE_ITEM(item);
@@ -955,7 +955,7 @@ ng_l2tp_recv_ctrl(node_p node, item_p item)
 	}
 
 	/* Copy packet */
-	if ((m = L2TP_COPY_MBUF(seq->xwin[i], M_DONTWAIT)) == NULL) {
+	if ((m = L2TP_COPY_MBUF(seq->xwin[i], M_NOWAIT)) == NULL) {
 		priv->stats.memoryFailures++;
 		return (ENOBUFS);
 	}
@@ -991,7 +991,7 @@ ng_l2tp_recv_data(node_p node, item_p item, hookpriv_p hpriv)
 	M_PREPEND(m, 6
 	    + (2 * (hpriv->conf.include_length != 0))
 	    + (4 * (hpriv->conf.enable_dseq != 0)),
-	    M_DONTWAIT);
+	    M_NOWAIT);
 	if (m == NULL) {
 		priv->stats.memoryFailures++;
 		NG_FREE_ITEM(item);
@@ -1219,7 +1219,7 @@ ng_l2tp_seq_recv_nr(priv_p priv, u_int16_t nr)
 	 */
 	while ((i = L2TP_SEQ_DIFF(seq->ns, seq->rack)) < seq->cwnd
 	    && seq->xwin[i] != NULL) {
-		if ((m = L2TP_COPY_MBUF(seq->xwin[i], M_DONTWAIT)) == NULL)
+		if ((m = L2TP_COPY_MBUF(seq->xwin[i], M_NOWAIT)) == NULL)
 			priv->stats.memoryFailures++;
 		else
 			ng_l2tp_xmit_ctrl(priv, m, seq->ns);
@@ -1361,7 +1361,7 @@ ng_l2tp_seq_rack_timeout(void *arg)
 	seq->acks = 0;
 
 	/* Retransmit oldest unack'd packet */
-	if ((m = L2TP_COPY_MBUF(seq->xwin[0], M_DONTWAIT)) == NULL)
+	if ((m = L2TP_COPY_MBUF(seq->xwin[0], M_NOWAIT)) == NULL)
 		priv->stats.memoryFailures++;
 	else
 		ng_l2tp_xmit_ctrl(priv, m, seq->rack);
@@ -1388,7 +1388,7 @@ ng_l2tp_xmit_ctrl(priv_p priv, struct mbuf *m, u_int16_t ns)
 	if (m == NULL) {
 
 		/* Create a new mbuf for ZLB packet */
-		MGETHDR(m, M_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			return (ENOBUFS);
@@ -1407,7 +1407,7 @@ ng_l2tp_xmit_ctrl(priv_p priv, struct mbuf *m, u_int16_t ns)
 		m_adj(m, 2);
 
 		/* Make room for L2TP header */
-		M_PREPEND(m, 12, M_DONTWAIT);
+		M_PREPEND(m, 12, M_NOWAIT);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			return (ENOBUFS);
diff --git a/sys/netgraph/ng_lmi.c b/sys/netgraph/ng_lmi.c
index 87f35675ac36..f098aa8caf37 100644
--- a/sys/netgraph/ng_lmi.c
+++ b/sys/netgraph/ng_lmi.c
@@ -321,7 +321,7 @@ nglmi_inquire(sc_p sc, int full)
 
 	if (sc->lmi_channel == NULL)
 		return;
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		log(LOG_ERR, "nglmi: unable to start up LMI processing\n");
 		return;
diff --git a/sys/netgraph/ng_one2many.c b/sys/netgraph/ng_one2many.c
index 927bb77a99c1..5332049f4353 100644
--- a/sys/netgraph/ng_one2many.c
+++ b/sys/netgraph/ng_one2many.c
@@ -427,7 +427,7 @@ ng_one2many_rcvdata(hook_p hook, item_p item)
 				struct ng_one2many_link *mdst;
 
 				mdst = &priv->many[priv->activeMany[i]];
-				m2 = m_dup(m, M_DONTWAIT);        /* XXX m_copypacket() */
+				m2 = m_dup(m, M_NOWAIT);        /* XXX m_copypacket() */
 				if (m2 == NULL) {
 					mdst->stats.memoryFailures++;
 					NG_FREE_ITEM(item);
diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index 6ffb0829d65b..16373e3f4b57 100644
--- a/sys/netgraph/ng_ppp.c
+++ b/sys/netgraph/ng_ppp.c
@@ -1595,7 +1595,7 @@ deliver:
 			/* Split off next fragment as "m2" */
 			m2 = m;
 			if (!lastFragment) {
-				struct mbuf *n = m_split(m, len, M_DONTWAIT);
+				struct mbuf *n = m_split(m, len, M_NOWAIT);
 
 				if (n == NULL) {
 					NG_FREE_M(m);
@@ -1916,7 +1916,7 @@ ng_ppp_addproto(struct mbuf *m, int proto, int compOK)
 static struct mbuf *
 ng_ppp_prepend(struct mbuf *m, const void *buf, int len)
 {
-	M_PREPEND(m, len, M_DONTWAIT);
+	M_PREPEND(m, len, M_NOWAIT);
 	if (m == NULL || (m->m_len < len && (m = m_pullup(m, len)) == NULL))
 		return (NULL);
 	bcopy(buf, mtod(m, u_char *), len);
diff --git a/sys/netgraph/ng_pppoe.c b/sys/netgraph/ng_pppoe.c
index 886747e65695..521d708e190b 100644
--- a/sys/netgraph/ng_pppoe.c
+++ b/sys/netgraph/ng_pppoe.c
@@ -723,14 +723,14 @@ AAA
 				printf("pppoe: Session out of memory\n");
 				LEAVE(ENOMEM);
 			}
-			MGETHDR(neg->m, M_DONTWAIT, MT_DATA);
+			MGETHDR(neg->m, M_NOWAIT, MT_DATA);
 			if(neg->m == NULL) {
 				printf("pppoe: Session out of mbufs\n");
 				FREE(neg, M_NETGRAPH_PPPOE);
 				LEAVE(ENOBUFS);
 			}
 			neg->m->m_pkthdr.rcvif = NULL;
-			MCLGET(neg->m, M_DONTWAIT);
+			MCLGET(neg->m, M_NOWAIT);
 			if ((neg->m->m_flags & M_EXT) == 0) {
 				printf("pppoe: Session out of mcls\n");
 				m_freem(neg->m);
@@ -1008,7 +1008,7 @@ AAA
 				 * Put it into a cluster.
 				 */
 				struct mbuf *n;
-				n = m_dup(m, M_DONTWAIT);
+				n = m_dup(m, M_NOWAIT);
 				m_freem(m);
 				m = n;
 				if (m) {
@@ -1350,7 +1350,7 @@ AAA
 			 * But first correct the length.
 			 */
 			sp->pkt_hdr.ph.length = htons((short)(m->m_pkthdr.len));
-			M_PREPEND(m, sizeof(*wh), M_DONTWAIT);
+			M_PREPEND(m, sizeof(*wh), M_NOWAIT);
 			if (m == NULL) {
 				LEAVE(ENOBUFS);
 			}
@@ -1525,7 +1525,7 @@ AAA
 				wh->eh.ether_type = ETHERTYPE_PPPOE_DISC;
 
 			/* generate a packet of that type */
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if(m == NULL)
 				printf("pppoe: Session out of mbufs\n");
 			else {
@@ -1596,7 +1596,7 @@ AAA
 	case	PPPOE_SINIT:
 	case	PPPOE_SREQ:
 		/* timeouts on these produce resends */
-		m0 = m_copypacket(sp->neg->m, M_DONTWAIT);
+		m0 = m_copypacket(sp->neg->m, M_NOWAIT);
 		NG_SEND_DATA_ONLY( error, privp->ethernet_hook, m0);
 		neg->timeout_handle = timeout(pppoe_ticker,
 					hook, neg->timeout * hz);
@@ -1642,7 +1642,7 @@ AAA
 
 	case	PPPOE_NEWCONNECTED:
 		/* send the PADS without a timeout - we're now connected */
-		m0 = m_copypacket(sp->neg->m, M_DONTWAIT);
+		m0 = m_copypacket(sp->neg->m, M_NOWAIT);
 		NG_SEND_DATA_ONLY( error, privp->ethernet_hook, m0);
 		break;
 
@@ -1657,7 +1657,7 @@ AAA
 		 * send the offer but if they don't respond
 		 * in PPPOE_OFFER_TIMEOUT seconds, forget about it.
 		 */
-		m0 = m_copypacket(sp->neg->m, M_DONTWAIT);
+		m0 = m_copypacket(sp->neg->m, M_NOWAIT);
 		NG_SEND_DATA_ONLY( error, privp->ethernet_hook, m0);
 		neg->timeout_handle = timeout(pppoe_ticker,
 					hook, PPPOE_OFFER_TIMEOUT * hz);
@@ -1665,7 +1665,7 @@ AAA
 
 	case	PPPOE_SINIT:
 	case	PPPOE_SREQ:
-		m0 = m_copypacket(sp->neg->m, M_DONTWAIT);
+		m0 = m_copypacket(sp->neg->m, M_NOWAIT);
 		NG_SEND_DATA_ONLY( error, privp->ethernet_hook, m0);
 		neg->timeout_handle = timeout(pppoe_ticker, hook,
 					(hz * PPPOE_INITIAL_TIMEOUT));
diff --git a/sys/netgraph/ng_pptpgre.c b/sys/netgraph/ng_pptpgre.c
index 50811da57bee..4422b29cf60a 100644
--- a/sys/netgraph/ng_pptpgre.c
+++ b/sys/netgraph/ng_pptpgre.c
@@ -522,7 +522,7 @@ ng_pptpgre_xmit(node_p node, item_p item)
 	/* Prepend GRE header to outgoing frame */
 	grelen = sizeof(*gre) + sizeof(u_int32_t) * (gre->hasSeq + gre->hasAck);
 	if (m == NULL) {
-		MGETHDR(m, M_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			if (item)
@@ -532,7 +532,7 @@ ng_pptpgre_xmit(node_p node, item_p item)
 		m->m_len = m->m_pkthdr.len = grelen;
 		m->m_pkthdr.rcvif = NULL;
 	} else {
-		M_PREPEND(m, grelen, M_DONTWAIT);
+		M_PREPEND(m, grelen, M_NOWAIT);
 		if (m == NULL || (m->m_len < grelen
 		    && (m = m_pullup(m, grelen)) == NULL)) {
 			priv->stats.memoryFailures++;
diff --git a/sys/netgraph/ng_rfc1490.c b/sys/netgraph/ng_rfc1490.c
index 778d07b5e90b..b6c75eafb7c5 100644
--- a/sys/netgraph/ng_rfc1490.c
+++ b/sys/netgraph/ng_rfc1490.c
@@ -278,14 +278,14 @@ ng_rfc1490_rcvdata(hook_p hook, item_p item)
 			break;
 		}
 	} else if (hook == priv->ppp) {
-		M_PREPEND(m, 2, M_DONTWAIT);	/* Prepend PPP NLPID */
+		M_PREPEND(m, 2, M_NOWAIT);	/* Prepend PPP NLPID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
 		mtod(m, u_char *)[1] = NLPID_PPP;
 		NG_FWD_NEW_DATA(error, item, priv->downlink, m);
 	} else if (hook == priv->inet) {
-		M_PREPEND(m, 2, M_DONTWAIT);	/* Prepend IP NLPID */
+		M_PREPEND(m, 2, M_NOWAIT);	/* Prepend IP NLPID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c
index f841a0e70f18..f5a7643187b1 100644
--- a/sys/netgraph/ng_socket.c
+++ b/sys/netgraph/ng_socket.c
@@ -224,7 +224,7 @@ ngc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
 	/* Allocate an expendable buffer for the path, chop off
 	 * the sockaddr header, and make sure it's NUL terminated */
 	len = sap->sg_len - 2;
-	MALLOC(path, char *, len + 1, M_NETGRAPH_PATH, M_WAITOK);
+	MALLOC(path, char *, len + 1, M_NETGRAPH_PATH, 0);
 	if (path == NULL) {
 		error = ENOMEM;
 		goto release;
@@ -239,7 +239,7 @@ ngc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
 
 	/* Move the data into a linear buffer as well. Messages are not
 	 * delivered in mbufs. */
-	MALLOC(msg, struct ng_mesg *, len + 1, M_NETGRAPH_MSG, M_WAITOK);
+	MALLOC(msg, struct ng_mesg *, len + 1, M_NETGRAPH_MSG, 0);
 	if (msg == NULL) {
 		error = ENOMEM;
 		goto release;
@@ -437,7 +437,7 @@ ng_setsockaddr(struct socket *so, struct sockaddr **addr)
 	if ( NG_NODE_HAS_NAME(pcbp->sockdata->node))
 		sg_len += namelen = strlen(NG_NODE_NAME(pcbp->sockdata->node));
 
-	MALLOC(sg, struct sockaddr_ng *, sg_len, M_SONAME, M_WAITOK | M_ZERO);
+	MALLOC(sg, struct sockaddr_ng *, sg_len, M_SONAME, M_ZERO);
 
 	if (NG_NODE_HAS_NAME(pcbp->sockdata->node))
 		bcopy(NG_NODE_NAME(pcbp->sockdata->node), sg->sg_data, namelen);
@@ -470,7 +470,7 @@ ng_attach_cntl(struct socket *so)
 
 	/* Allocate node private info */
 	MALLOC(privdata, struct ngsock *,
-	    sizeof(*privdata), M_NETGRAPH_SOCK, M_WAITOK | M_ZERO);
+	    sizeof(*privdata), M_NETGRAPH_SOCK, M_ZERO);
 	if (privdata == NULL) {
 		ng_detach_common(pcbp, NG_CONTROL);
 		return (ENOMEM);
@@ -513,7 +513,7 @@ ng_attach_common(struct socket *so, int type)
 		return (error);
 
 	/* Allocate the pcb */
-	MALLOC(pcbp, struct ngpcb *, sizeof(*pcbp), M_PCB, M_WAITOK | M_ZERO);
+	MALLOC(pcbp, struct ngpcb *, sizeof(*pcbp), M_PCB, M_ZERO);
 	if (pcbp == NULL)
 		return (ENOMEM);
 	pcbp->type = type;
diff --git a/sys/netgraph/ng_source.c b/sys/netgraph/ng_source.c
index 78525e89672d..8ad0a704d4c2 100644
--- a/sys/netgraph/ng_source.c
+++ b/sys/netgraph/ng_source.c
@@ -640,7 +640,7 @@ ng_source_send (sc_p sc, int tosend, int *sent_p)
 			break;
 
 		/* duplicate the packet */
-		m2 = m_copypacket(m, M_DONTWAIT);
+		m2 = m_copypacket(m, M_NOWAIT);
 		if (m2 == NULL) {
 			s = splnet();
 			IF_PREPEND(&sc->snd_queue, m);
diff --git a/sys/netgraph/ng_tee.c b/sys/netgraph/ng_tee.c
index fbe80ba6e65a..877ef169e9e1 100644
--- a/sys/netgraph/ng_tee.c
+++ b/sys/netgraph/ng_tee.c
@@ -334,7 +334,7 @@ ngt_rcvdata(hook_p hook, item_p item)
 		meta_p meta2;
 
 		/* Copy packet (failure will not stop the original)*/
-		m2 = m_dup(m, M_DONTWAIT);
+		m2 = m_dup(m, M_NOWAIT);
 		if (m2) {
 
 			/* Copy meta info */
diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c
index 9a0175e053a0..a25ee9ed6874 100644
--- a/sys/netgraph/ng_tty.c
+++ b/sys/netgraph/ng_tty.c
@@ -203,7 +203,7 @@ ngt_open(dev_t dev, struct tty *tp)
 	}
 
 	/* Initialize private struct */
-	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_WAITOK | M_ZERO);
+	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_ZERO);
 	if (sc == NULL) {
 		error = ENOMEM;
 		goto done;
@@ -368,7 +368,7 @@ ngt_input(int c, struct tty *tp)
 
 	/* Get a new header mbuf if we need one */
 	if (!(m = sc->m)) {
-		MGETHDR(m, M_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (!m) {
 			if (sc->flags & FLG_DEBUG)
 				log(LOG_ERR,
diff --git a/sys/netgraph/ng_vjc.c b/sys/netgraph/ng_vjc.c
index 90d7d4d987c7..14673ba03748 100644
--- a/sys/netgraph/ng_vjc.c
+++ b/sys/netgraph/ng_vjc.c
@@ -476,7 +476,7 @@ ng_vjc_rcvdata(hook_p hook, item_p item)
 		m_adj(m, vjlen);
 
 		/* Copy the reconstructed TCP/IP headers into a new mbuf */
-		MGETHDR(hm, M_DONTWAIT, MT_DATA);
+		MGETHDR(hm, M_NOWAIT, MT_DATA);
 		if (hm == NULL) {
 			priv->slc.sls_errorin++;
 			NG_FREE_M(m);
@@ -486,7 +486,7 @@ ng_vjc_rcvdata(hook_p hook, item_p item)
 		hm->m_len = 0;
 		hm->m_pkthdr.rcvif = NULL;
 		if (hlen > MHLEN) {		/* unlikely, but can happen */
-			MCLGET(hm, M_DONTWAIT);
+			MCLGET(hm, M_NOWAIT);
 			if ((hm->m_flags & M_EXT) == 0) {
 				m_freem(hm);
 				priv->slc.sls_errorin++;
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 16780b1f7cc8..6d9d158ffba8 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -317,7 +317,7 @@ arprequest(ifp, sip, tip, enaddr)
 				   LLC_UI, 0x00, 0x00, 0x00, 0x08, 0x06 };
 	u_short ar_hrd;
 
-	if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL)
+	if ((m = m_gethdr(M_NOWAIT, MT_DATA)) == NULL)
 		return;
 	m->m_pkthdr.rcvif = (struct ifnet *)0;
 #ifdef MAC
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 929d456ec66c..bc5fe1169097 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -108,7 +108,7 @@ igmp_init()
 	/*
 	 * Construct a Router Alert option to use in outgoing packets
 	 */
-	MGET(router_alert, M_DONTWAIT, MT_DATA);
+	MGET(router_alert, M_NOWAIT, MT_DATA);
 	ra = mtod(router_alert, struct ipoption *);
 	ra->ipopt_dst.s_addr = 0;
 	ra->ipopt_list[0] = IPOPT_RA;	/* Router Alert Option */
@@ -445,7 +445,7 @@ igmp_sendpkt(inm, type, addr)
         struct ip *ip;
         struct ip_moptions imo;
 
-        MGETHDR(m, M_DONTWAIT, MT_HEADER);
+        MGETHDR(m, M_NOWAIT, MT_HEADER);
         if (m == NULL)
                 return;
 
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 89c412313527..56104912ec04 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -268,7 +268,7 @@ in_control(so, cmd, data, ifp, td)
 			return (EADDRNOTAVAIL);
 		if (ia == (struct in_ifaddr *)0) {
 			ia = (struct in_ifaddr *)
-				malloc(sizeof *ia, M_IFADDR, M_WAITOK | M_ZERO);
+				malloc(sizeof *ia, M_IFADDR, M_ZERO);
 			if (ia == (struct in_ifaddr *)NULL)
 				return (ENOBUFS);
 			/*
@@ -837,7 +837,7 @@ in_addmulti(ap, ifp)
 		return ifma->ifma_protospec;
 	}
 
-	/* XXX - if_addmulti uses M_WAITOK.  Can this really be called
+	/* XXX - if_addmulti does not use N_NOWAIT.  Can this really be called
 	   at interrupt time?  If so, need to fix if_addmulti. XXX */
 	inm = (struct in_multi *)malloc(sizeof(*inm), M_IPMADDR,
 	    M_NOWAIT | M_ZERO);
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index cdf094aafbdc..3e996d75b3cd 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -167,7 +167,7 @@ in_gif_output(ifp, family, m)
 		ip_ecn_ingress(ECN_NOCARE, &iphdr.ip_tos, &tos);
 
 	/* prepend new IP header */
-	M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ip), M_NOWAIT);
 	if (m && m->m_len < sizeof(struct ip))
 		m = m_pullup(m, sizeof(struct ip));
 	if (m == NULL) {
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index b5a6722cd551..eaf7d3578d8f 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -663,7 +663,7 @@ in_sockaddr(port, addr_p)
 	struct sockaddr_in *sin;
 
 	MALLOC(sin, struct sockaddr_in *, sizeof *sin, M_SONAME,
-		M_WAITOK | M_ZERO);
+		M_ZERO);
 	sin->sin_family = AF_INET;
 	sin->sin_len = sizeof(*sin);
 	sin->sin_addr = *addr_p;
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 908273384acc..f9bad2ca1fb8 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -489,7 +489,7 @@ div_pcblist(SYSCTL_HANDLER_ARGS)
 	if (error)
 		return error;
 
-	inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK);
+	inp_list = malloc(n * sizeof *inp_list, M_TEMP, 0);
 	if (inp_list == 0)
 		return ENOMEM;
 	
diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c
index 478cdfae3ed5..a547c6619b6c 100644
--- a/sys/netinet/ip_encap.c
+++ b/sys/netinet/ip_encap.c
@@ -487,7 +487,7 @@ encap_fillarg(m, ep)
 {
 	struct m_tag *tag;
 
-	tag = m_tag_get(PACKET_TAG_ENCAP, sizeof (void*), M_DONTWAIT);
+	tag = m_tag_get(PACKET_TAG_ENCAP, sizeof (void*), M_NOWAIT);
 	if (tag) {
 		*(void**)(tag+1) = ep->arg;
 		m_tag_prepend(m, tag);
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index 26f4a0463bd5..b5327665e255 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -875,7 +875,7 @@ add_dyn_rule(struct ipfw_flow_id *id, u_int8_t dyn_type, struct ip_fw *rule)
 	    if (ipfw_dyn_v != NULL)
 		free(ipfw_dyn_v, M_IPFW);
 	    ipfw_dyn_v = malloc(curr_dyn_buckets * sizeof r,
-                   M_IPFW, M_DONTWAIT | M_ZERO);
+                   M_IPFW, M_NOWAIT | M_ZERO);
 	    if (ipfw_dyn_v == NULL)
 		return NULL; /* failed ! */
 	}
@@ -2036,7 +2036,7 @@ ip_fw_ctl(struct sockopt *sopt)
 		 * bother filling up the buffer, just jump to the
 		 * sooptcopyout.
 		 */
-		buf = malloc(size, M_TEMP, M_WAITOK);
+		buf = malloc(size, M_TEMP, 0);
 		if (buf == 0) {
 		    splx(s);
 		    error = ENOBUFS;
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c
index 7a425ede87e5..1f02a9c643f0 100644
--- a/sys/netinet/ip_fw2.c
+++ b/sys/netinet/ip_fw2.c
@@ -1057,7 +1057,7 @@ send_pkt(struct ipfw_flow_id *id, u_int32_t seq, u_int32_t ack, int flags)
 	struct tcphdr *tcp;
 	struct route sro;	/* fake route */
 
-	MGETHDR(m, M_DONTWAIT, MT_HEADER);
+	MGETHDR(m, M_NOWAIT, MT_HEADER);
 	if (m == 0)
 		return;
 	m->m_pkthdr.rcvif = (struct ifnet *)0;
@@ -2498,7 +2498,7 @@ ipfw_ctl(struct sockopt *sopt)
 		 * how much room is needed, do not bother filling up the
 		 * buffer, just jump to the sooptcopyout.
 		 */
-		buf = malloc(size, M_TEMP, M_WAITOK);
+		buf = malloc(size, M_TEMP, 0);
 		if (buf == 0) {
 			splx(s);
 			error = ENOBUFS;
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index a15ece2b83ba..a83dcbaa3fce 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -163,7 +163,7 @@ icmp_error(n, type, code, dest, destifp)
 	/*
 	 * First, formulate icmp message
 	 */
-	m = m_gethdr(M_DONTWAIT, MT_HEADER);
+	m = m_gethdr(M_NOWAIT, MT_HEADER);
 	if (m == NULL)
 		goto freeit;
 #ifdef MAC
@@ -656,7 +656,7 @@ match:
 		 */
 		cp = (u_char *) (ip + 1);
 		if ((opts = ip_srcroute()) == 0 &&
-		    (opts = m_gethdr(M_DONTWAIT, MT_HEADER))) {
+		    (opts = m_gethdr(M_NOWAIT, MT_HEADER))) {
 			opts->m_len = sizeof(struct in_addr);
 			mtod(opts, struct in_addr *)->s_addr = 0;
 		}
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 51332a5eee99..590e8677584c 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -823,7 +823,7 @@ found:
 
 		/* Clone packet if we're doing a 'tee' */
 		if ((divert_info & IP_FW_PORT_TEE_FLAG) != 0)
-			clone = m_dup(m, M_DONTWAIT);
+			clone = m_dup(m, M_NOWAIT);
 
 		/* Restore packet header fields to original values */
 		ip->ip_len += hlen;
@@ -983,7 +983,7 @@ ip_reass(struct mbuf *m, struct ipqhead *head, struct ipq *fp,
 		if ((ip_maxfragpackets >= 0) && (ip_nfragpackets >= ip_maxfragpackets))
 			goto dropfrag;
 		ip_nfragpackets++;
-		if ((t = m_get(M_DONTWAIT, MT_FTABLE)) == NULL)
+		if ((t = m_get(M_NOWAIT, MT_FTABLE)) == NULL)
 			goto dropfrag;
 		fp = mtod(t, struct ipq *);
 #ifdef MAC
@@ -1587,7 +1587,7 @@ ip_srcroute()
 
 	if (ip_nhops == 0)
 		return ((struct mbuf *)0);
-	m = m_get(M_DONTWAIT, MT_HEADER);
+	m = m_get(M_NOWAIT, MT_HEADER);
 	if (m == 0)
 		return ((struct mbuf *)0);
 
@@ -1762,8 +1762,8 @@ ip_forward(struct mbuf *m, int srcrt, struct sockaddr_in *next_hop)
 	 * assume exclusive access to the IP header in `m', so any
 	 * data in a cluster may change before we reach icmp_error().
 	 */
-	MGET(mcopy, M_DONTWAIT, m->m_type);
-	if (mcopy != NULL && !m_dup_pkthdr(mcopy, m, M_DONTWAIT)) {
+	MGET(mcopy, M_NOWAIT, m->m_type);
+	if (mcopy != NULL && !m_dup_pkthdr(mcopy, m, M_NOWAIT)) {
 		/*
 		 * It's probably ok if the pkthdr dup fails (because
 		 * the deep copy of the tag chain failed), but for now
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 3caba6b3a115..d48ae3e3cba1 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -1403,7 +1403,7 @@ encap_send(struct ip *ip, struct vif *vifp, struct mbuf *m)
      * new mbuf so we can modify it.  Try to fill the new
      * mbuf since if we don't the ethernet driver will.
      */
-    MGETHDR(mb_copy, M_DONTWAIT, MT_HEADER);
+    MGETHDR(mb_copy, M_NOWAIT, MT_HEADER);
     if (mb_copy == NULL)
 	return;
 #ifdef MAC
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 34849054aa3a..8a85124c2e9f 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -793,7 +793,7 @@ spd_done:
 
 			/* Clone packet if we're doing a 'tee' */
 			if ((off & IP_FW_PORT_TEE_FLAG) != 0)
-				clone = m_dup(m, M_DONTWAIT);
+				clone = m_dup(m, M_NOWAIT);
 
 			/*
 			 * XXX
@@ -1099,7 +1099,7 @@ smart_frag_failure:
 	m0 = m;
 	mhlen = sizeof (struct ip);
 	for (; off < (u_short)ip->ip_len; off += len) {
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
+		MGETHDR(m, M_NOWAIT, MT_HEADER);
 		if (m == 0) {
 			error = ENOBUFS;
 			ipstat.ips_odropped++;
@@ -1265,7 +1265,7 @@ ip_insertoptions(m, opt, phlen)
 	if (p->ipopt_dst.s_addr)
 		ip->ip_dst = p->ipopt_dst;
 	if (m->m_flags & M_EXT || m->m_data - optlen < m->m_pktdat) {
-		MGETHDR(n, M_DONTWAIT, MT_HEADER);
+		MGETHDR(n, M_NOWAIT, MT_HEADER);
 		if (n == 0) {
 			*phlen = 0;
 			return (m);
@@ -1370,7 +1370,7 @@ ip_ctloutput(so, sopt)
 				error = EMSGSIZE;
 				break;
 			}
-			MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_HEADER);
+			MGET(m, sopt->sopt_td ? 0 : M_NOWAIT, MT_HEADER);
 			if (m == 0) {
 				error = ENOBUFS;
 				break;
@@ -1764,7 +1764,7 @@ ip_setmoptions(sopt, imop)
 		 * allocate one and initialize to default values.
 		 */
 		imo = (struct ip_moptions*)malloc(sizeof(*imo), M_IPMOPTS,
-		    M_WAITOK);
+		    0);
 
 		if (imo == NULL)
 			return (ENOBUFS);
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 3c37fc49c28f..2b475faf7d86 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -287,7 +287,7 @@ rip_output(m, so, dst)
 			m_freem(m);
 			return(EMSGSIZE);
 		}
-		M_PREPEND(m, sizeof(struct ip), M_TRYWAIT);
+		M_PREPEND(m, sizeof(struct ip), 0);
 		ip = mtod(m, struct ip *);
 		ip->ip_tos = inp->inp_ip_tos;
 		ip->ip_off = 0;
@@ -698,7 +698,7 @@ rip_pcblist(SYSCTL_HANDLER_ARGS)
 	if (error)
 		return error;
 
-	inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK);
+	inp_list = malloc(n * sizeof *inp_list, M_TEMP, 0);
 	if (inp_list == 0)
 		return ENOMEM;
 	
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 34b0d844a94b..2e926d191ae4 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -603,14 +603,14 @@ send:
 		m->m_len += hdrlen;
 		m->m_data -= hdrlen;
 #else
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
+		MGETHDR(m, M_NOWAIT, MT_HEADER);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
 		}
 #ifdef INET6
 		if (MHLEN < hdrlen + max_linkhdr) {
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, M_NOWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_freem(m);
 				error = ENOBUFS;
@@ -651,7 +651,7 @@ send:
 		else
 			tcpstat.tcps_sndwinup++;
 
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
+		MGETHDR(m, M_NOWAIT, MT_HEADER);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 46e32d9e684d..cb9682dc0c8a 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -332,7 +332,7 @@ tcp_maketemplate(tp)
 	struct mbuf *m;
 	struct tcptemp *n;
 
-	m = m_get(M_DONTWAIT, MT_HEADER);
+	m = m_get(M_NOWAIT, MT_HEADER);
 	if (m == NULL)
 		return (0);
 	m->m_len = sizeof(struct tcptemp);
@@ -412,7 +412,7 @@ tcp_respond(tp, ipgen, th, m, ack, seq, flags)
 	      }
 	}
 	if (m == 0) {
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(M_NOWAIT, MT_HEADER);
 		if (m == NULL)
 			return;
 		tlen = 0;
@@ -901,7 +901,7 @@ tcp_pcblist(SYSCTL_HANDLER_ARGS)
 	if (error)
 		return error;
 
-	inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK);
+	inp_list = malloc(n * sizeof *inp_list, M_TEMP, 0);
 	if (inp_list == 0)
 		return ENOMEM;
 	
@@ -1496,7 +1496,7 @@ ipsec_hdrsiz_tcp(tp)
 
 	if ((tp == NULL) || ((inp = tp->t_inpcb) == NULL))
 		return 0;
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (!m)
 		return 0;
 
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 05660ec89f6d..798c379079a2 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -247,7 +247,7 @@ syncache_init(void)
 	/* Allocate the hash table. */
 	MALLOC(tcp_syncache.hashbase, struct syncache_head *,
 	    tcp_syncache.hashsize * sizeof(struct syncache_head),
-	    M_SYNCACHE, M_WAITOK);
+	    M_SYNCACHE, 0);
 
 	/* Initialize the hash buckets. */
 	for (i = 0; i < tcp_syncache.hashsize; i++) {
@@ -1099,7 +1099,7 @@ syncache_respond(sc, m)
 	if (m)
 		m_freem(m);
 
-	m = m_gethdr(M_DONTWAIT, MT_HEADER);
+	m = m_gethdr(M_NOWAIT, MT_HEADER);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_data += max_linkhdr;
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index 46e32d9e684d..cb9682dc0c8a 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -332,7 +332,7 @@ tcp_maketemplate(tp)
 	struct mbuf *m;
 	struct tcptemp *n;
 
-	m = m_get(M_DONTWAIT, MT_HEADER);
+	m = m_get(M_NOWAIT, MT_HEADER);
 	if (m == NULL)
 		return (0);
 	m->m_len = sizeof(struct tcptemp);
@@ -412,7 +412,7 @@ tcp_respond(tp, ipgen, th, m, ack, seq, flags)
 	      }
 	}
 	if (m == 0) {
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(M_NOWAIT, MT_HEADER);
 		if (m == NULL)
 			return;
 		tlen = 0;
@@ -901,7 +901,7 @@ tcp_pcblist(SYSCTL_HANDLER_ARGS)
 	if (error)
 		return error;
 
-	inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK);
+	inp_list = malloc(n * sizeof *inp_list, M_TEMP, 0);
 	if (inp_list == 0)
 		return ENOMEM;
 	
@@ -1496,7 +1496,7 @@ ipsec_hdrsiz_tcp(tp)
 
 	if ((tp == NULL) || ((inp = tp->t_inpcb) == NULL))
 		return 0;
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (!m)
 		return 0;
 
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 437ee4e9012c..4331770ab001 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -583,7 +583,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS)
 	if (error)
 		return error;
 
-	inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK);
+	inp_list = malloc(n * sizeof *inp_list, M_TEMP, 0);
 	if (inp_list == 0)
 		return ENOMEM;
 	
@@ -801,7 +801,7 @@ udp_output(inp, m, addr, control, td)
 	 * Calculate data length and get a mbuf
 	 * for UDP and IP headers.
 	 */
-	M_PREPEND(m, sizeof(struct udpiphdr), M_DONTWAIT);
+	M_PREPEND(m, sizeof(struct udpiphdr), M_NOWAIT);
 	if (m == 0) {
 		error = ENOBUFS;
 		goto release;
diff --git a/sys/netinet6/ah_core.c b/sys/netinet6/ah_core.c
index cbb620647ff7..4b7da313cb9e 100644
--- a/sys/netinet6/ah_core.c
+++ b/sys/netinet6/ah_core.c
@@ -1244,9 +1244,9 @@ again:
 				error = EMSGSIZE;
 				goto fail;
 			}
-			MGET(n, M_DONTWAIT, MT_DATA);
+			MGET(n, M_NOWAIT, MT_DATA);
 			if (n && hlen > MLEN) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, M_NOWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
@@ -1359,9 +1359,9 @@ again:
 				error = EMSGSIZE;
 				goto fail;
 			}
-			MGET(n, M_DONTWAIT, MT_DATA);
+			MGET(n, M_NOWAIT, MT_DATA);
 			if (n && totlen > MLEN) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, M_NOWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
@@ -1510,9 +1510,9 @@ ah6_calccksum(m, ahdat, len, algo, sav)
 				error = EMSGSIZE;
 				goto fail;
 			}
-			MGET(n, M_DONTWAIT, MT_DATA);
+			MGET(n, M_NOWAIT, MT_DATA);
 			if (n && newoff - off > MLEN) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, M_NOWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
@@ -1545,9 +1545,9 @@ ah6_calccksum(m, ahdat, len, algo, sav)
 			error = EMSGSIZE;
 			goto fail;
 		}
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (n && newoff - off > MLEN) {
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, M_NOWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				n = NULL;
diff --git a/sys/netinet6/ah_input.c b/sys/netinet6/ah_input.c
index 0afdfedc1513..94cd6735ecb1 100644
--- a/sys/netinet6/ah_input.c
+++ b/sys/netinet6/ah_input.c
@@ -494,7 +494,7 @@ ah4_input(m, off)
 			 */
 			struct mbuf *n;
 
-			n = m_split(m, off, M_DONTWAIT);
+			n = m_split(m, off, M_NOWAIT);
 			if (n == NULL) {
 				/* m is retained by m_split */
 				goto fail;
@@ -901,7 +901,7 @@ ah6_input(mp, offp, proto)
 			 */
 			struct mbuf *n;
 
-			n = m_split(m, off, M_DONTWAIT);
+			n = m_split(m, off, M_NOWAIT);
 			if (n == NULL) {
 				/* m is retained by m_split */
 				goto fail;
diff --git a/sys/netinet6/ah_output.c b/sys/netinet6/ah_output.c
index e85075225ce2..00104ce4ac27 100644
--- a/sys/netinet6/ah_output.c
+++ b/sys/netinet6/ah_output.c
@@ -211,7 +211,7 @@ ah4_output(m, isr)
 		panic("ah4_output: assumption failed (first mbuf length)");
 	if (M_LEADINGSPACE(m->m_next) < ahlen) {
 		struct mbuf *n;
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (!n) {
 			ipseclog((LOG_DEBUG, "ENOBUFS in ah4_output %d\n",
 			    __LINE__));
@@ -390,13 +390,13 @@ ah6_output(m, nexthdrp, md, isr)
 		return EINVAL;
 	}
 
-	MGET(mah, M_DONTWAIT, MT_DATA);
+	MGET(mah, M_NOWAIT, MT_DATA);
 	if (!mah) {
 		m_freem(m);
 		return ENOBUFS;
 	}
 	if (ahlen > MLEN) {
-		MCLGET(mah, M_DONTWAIT);
+		MCLGET(mah, M_NOWAIT);
 		if ((mah->m_flags & M_EXT) == 0) {
 			m_free(mah);
 			m_freem(m);
diff --git a/sys/netinet6/esp_core.c b/sys/netinet6/esp_core.c
index db09b9405c40..fe7d27b4319a 100644
--- a/sys/netinet6/esp_core.c
+++ b/sys/netinet6/esp_core.c
@@ -760,10 +760,10 @@ esp_cbc_decrypt(m, off, sav, algo, ivlen)
 		if (!d || dn + blocklen > d->m_len) {
 			if (d)
 				dp = d;
-			MGET(d, M_DONTWAIT, MT_DATA);
+			MGET(d, M_NOWAIT, MT_DATA);
 			i = m->m_pkthdr.len - (soff + sn);
 			if (d && i > MLEN) {
-				MCLGET(d, M_DONTWAIT);
+				MCLGET(d, M_NOWAIT);
 				if ((d->m_flags & M_EXT) == 0) {
 					m_free(d);
 					d = NULL;
@@ -970,10 +970,10 @@ esp_cbc_encrypt(m, off, plen, sav, algo, ivlen)
 		if (!d || dn + blocklen > d->m_len) {
 			if (d)
 				dp = d;
-			MGET(d, M_DONTWAIT, MT_DATA);
+			MGET(d, M_NOWAIT, MT_DATA);
 			i = m->m_pkthdr.len - (soff + sn);
 			if (d && i > MLEN) {
-				MCLGET(d, M_DONTWAIT);
+				MCLGET(d, M_NOWAIT);
 				if ((d->m_flags & M_EXT) == 0) {
 					m_free(d);
 					d = NULL;
diff --git a/sys/netinet6/esp_input.c b/sys/netinet6/esp_input.c
index d8de60c0ddf5..1584aa484aad 100644
--- a/sys/netinet6/esp_input.c
+++ b/sys/netinet6/esp_input.c
@@ -788,7 +788,7 @@ noreplaycheck:
 			 */
 			struct mbuf *n;
 
-			n = m_split(m, off, M_DONTWAIT);
+			n = m_split(m, off, M_NOWAIT);
 			if (n == NULL) {
 				/* m is retained by m_split */
 				goto bad;
@@ -810,12 +810,12 @@ noreplaycheck:
 			struct mbuf *n = NULL;
 			int maxlen;
 
-			MGETHDR(n, M_DONTWAIT, MT_HEADER);
+			MGETHDR(n, M_NOWAIT, MT_HEADER);
 			maxlen = MHLEN;
 			if (n)
 				M_MOVE_PKTHDR(n, m);
 			if (n && n->m_pkthdr.len > maxlen) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, M_NOWAIT);
 				maxlen = MCLBYTES;
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
diff --git a/sys/netinet6/esp_output.c b/sys/netinet6/esp_output.c
index 3e89c5d9a517..5a4932afd3ad 100644
--- a/sys/netinet6/esp_output.c
+++ b/sys/netinet6/esp_output.c
@@ -340,7 +340,7 @@ esp_output(m, nexthdrp, md, isr, af)
 	 * after:  IP ... ESP IV payload
 	 */
 	if (M_LEADINGSPACE(md) < esphlen || (md->m_flags & M_EXT) != 0) {
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			error = ENOBUFS;
@@ -495,7 +495,7 @@ esp_output(m, nexthdrp, md, isr, af)
 	} else {
 		struct mbuf *nn;
 
-		MGET(nn, M_DONTWAIT, MT_DATA);
+		MGET(nn, M_NOWAIT, MT_DATA);
 		if (!nn) {
 			ipseclog((LOG_DEBUG, "esp%d_output: can't alloc mbuf",
 			    afnumber));
@@ -624,7 +624,7 @@ esp_output(m, nexthdrp, md, isr, af)
 	} else {
 		struct mbuf *nn;
 
-		MGET(nn, M_DONTWAIT, MT_DATA);
+		MGET(nn, M_NOWAIT, MT_DATA);
 		if (!nn) {
 			ipseclog((LOG_DEBUG, "can't alloc mbuf in esp%d_output",
 			    afnumber));
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index 515a9fb6d6b1..c57709a9e285 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -233,7 +233,7 @@ frag6_input(mp, offp, proto)
 			goto dropfrag;
 		frag6_nfragpackets++;
 		q6 = (struct ip6q *)malloc(sizeof(struct ip6q), M_FTABLE,
-			M_DONTWAIT);
+			M_NOWAIT);
 		if (q6 == NULL)
 			goto dropfrag;
 		bzero(q6, sizeof(*q6));
@@ -325,7 +325,7 @@ frag6_input(mp, offp, proto)
 	}
 
 	ip6af = (struct ip6asfrag *)malloc(sizeof(struct ip6asfrag), M_FTABLE,
-	    M_DONTWAIT);
+	    M_NOWAIT);
 	if (ip6af == NULL)
 		goto dropfrag;
 	bzero(ip6af, sizeof(*ip6af));
@@ -489,7 +489,7 @@ insert:
 		m->m_len -= sizeof(struct ip6_frag);
 	} else {
 		/* this comes with no copy if the boundary is on cluster */
-		if ((t = m_split(m, offset, M_DONTWAIT)) == NULL) {
+		if ((t = m_split(m, offset, M_NOWAIT)) == NULL) {
 			frag6_remque(q6);
 			free(q6, M_FTABLE);
 			frag6_nfragpackets--;
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index b2781a4c19ea..6a5884ed1bb0 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -346,7 +346,7 @@ icmp6_error(m, type, code, param)
 		m_adj(m, ICMPV6_PLD_MAXLEN - m->m_pkthdr.len);
 
 	preplen = sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr);
-	M_PREPEND(m, preplen, M_DONTWAIT);
+	M_PREPEND(m, preplen, M_NOWAIT);
 	if (m && m->m_len < preplen)
 		m = m_pullup(m, preplen);
 	if (m == NULL) {
@@ -562,9 +562,9 @@ icmp6_input(mp, offp, proto)
 				m_freem(n0);
 				break;
 			}
-			MGETHDR(n, M_DONTWAIT, n0->m_type);
+			MGETHDR(n, M_NOWAIT, n0->m_type);
 			if (n && maxlen >= MHLEN) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, M_NOWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
@@ -623,7 +623,7 @@ icmp6_input(mp, offp, proto)
 			icmp6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_mldquery);
 		else
 			icmp6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_mldreport);
-		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
 			/* give up local */
 			mld6_input(m, off);
 			m = NULL;
@@ -684,15 +684,15 @@ icmp6_input(mp, offp, proto)
 				/* Give up remote */
 				break;
 			}
-			MGETHDR(n, M_DONTWAIT, m->m_type);
+			MGETHDR(n, M_NOWAIT, m->m_type);
 			if (n && maxlen > MHLEN) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, M_NOWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
 				}
 			}
-			if (!m_dup_pkthdr(n, m, M_DONTWAIT)) {
+			if (!m_dup_pkthdr(n, m, M_NOWAIT)) {
 				/*
 				 * Previous code did a blind M_COPY_PKTHDR
 				 * and said "just for rcvif".  If true, then
@@ -748,7 +748,7 @@ icmp6_input(mp, offp, proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_router_solicit))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
 			/* give up local */
 			nd6_rs_input(m, off, icmp6len);
 			m = NULL;
@@ -764,7 +764,7 @@ icmp6_input(mp, offp, proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_router_advert))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
 			/* give up local */
 			nd6_ra_input(m, off, icmp6len);
 			m = NULL;
@@ -780,7 +780,7 @@ icmp6_input(mp, offp, proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_neighbor_solicit))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
 			/* give up local */
 			nd6_ns_input(m, off, icmp6len);
 			m = NULL;
@@ -796,7 +796,7 @@ icmp6_input(mp, offp, proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_neighbor_advert))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
 			/* give up local */
 			nd6_na_input(m, off, icmp6len);
 			m = NULL;
@@ -812,7 +812,7 @@ icmp6_input(mp, offp, proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_redirect))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
 			/* give up local */
 			icmp6_redirect_input(m, off);
 			m = NULL;
@@ -1394,7 +1394,7 @@ ni6_input(m, off)
 	}
 
 	/* allocate an mbuf to reply. */
-	MGETHDR(n, M_DONTWAIT, m->m_type);
+	MGETHDR(n, M_NOWAIT, m->m_type);
 	if (n == NULL) {
 		m_freem(m);
 		return(NULL);
@@ -1408,7 +1408,7 @@ ni6_input(m, off)
 			 */
 			goto bad;
 		}
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, M_NOWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			goto bad;
 		}
@@ -1507,9 +1507,9 @@ ni6_nametodns(name, namelen, old)
 		len = MCLBYTES;
 
 	/* because MAXHOSTNAMELEN is usually 256, we use cluster mbuf */
-	MGET(m, M_DONTWAIT, MT_DATA);
+	MGET(m, M_NOWAIT, MT_DATA);
 	if (m && len > MLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0)
 			goto fail;
 	}
@@ -2477,9 +2477,9 @@ icmp6_redirect_output(m0, rt)
 #if IPV6_MMTU >= MCLBYTES
 # error assumption failed about IPV6_MMTU and MCLBYTES
 #endif
-	MGETHDR(m, M_DONTWAIT, MT_HEADER);
+	MGETHDR(m, M_NOWAIT, MT_HEADER);
 	if (m && IPV6_MMTU >= MHLEN)
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 	if (!m)
 		goto fail;
 	m->m_pkthdr.rcvif = NULL;
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 945ab65379ab..8b4384566dfa 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1676,7 +1676,7 @@ in6_addmulti(maddr6, ifp, errorp)
 	if (ifma->ifma_protospec != 0)
 		return ifma->ifma_protospec;
 
-	/* XXX - if_addmulti uses M_WAITOK.  Can this really be called
+	/* XXX - if_addmulti does not use M_NOWAIT.  Can this really be called
 	   at interrupt time?  If so, need to fix if_addmulti. XXX */
 	in6m = (struct in6_multi *)malloc(sizeof(*in6m), M_IPMADDR, M_NOWAIT);
 	if (in6m == NULL) {
@@ -2447,7 +2447,7 @@ in6_sin_2_v4mapsin6_in_sock(struct sockaddr **nam)
 	struct sockaddr_in6 *sin6_p;
 
 	MALLOC(sin6_p, struct sockaddr_in6 *, sizeof *sin6_p, M_SONAME,
-	       M_WAITOK);
+	       0);
 	sin_p = (struct sockaddr_in *)*nam;
 	in6_sin_2_v4mapsin6(sin_p, sin6_p);
 	FREE(*nam, M_SONAME);
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index b5600750debb..7376d851cfd4 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -145,7 +145,7 @@ in6_gif_output(ifp, family, m)
 	}
 	
 	/* prepend new IP header */
-	M_PREPEND(m, sizeof(struct ip6_hdr), M_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ip6_hdr), M_NOWAIT);
 	if (m && m->m_len < sizeof(struct ip6_hdr))
 		m = m_pullup(m, sizeof(struct ip6_hdr));
 	if (m == NULL) {
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 5abcca1b12aa..e92fa79a203d 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -774,7 +774,7 @@ in6_ifattach(ifp, altifp)
 
 		/* grow in6_ifstat */
 		n = if_indexlim * sizeof(struct in6_ifstat *);
-		q = (caddr_t)malloc(n, M_IFADDR, M_WAITOK);
+		q = (caddr_t)malloc(n, M_IFADDR, 0);
 		bzero(q, n);
 		if (in6_ifstat) {
 			bcopy((caddr_t)in6_ifstat, q,
@@ -786,7 +786,7 @@ in6_ifattach(ifp, altifp)
 
 		/* grow icmp6_ifstat */
 		n = if_indexlim * sizeof(struct icmp6_ifstat *);
-		q = (caddr_t)malloc(n, M_IFADDR, M_WAITOK);
+		q = (caddr_t)malloc(n, M_IFADDR, 0);
 		bzero(q, n);
 		if (icmp6_ifstat) {
 			bcopy((caddr_t)icmp6_ifstat, q,
@@ -864,12 +864,12 @@ statinit:
 
 	if (in6_ifstat[ifp->if_index] == NULL) {
 		in6_ifstat[ifp->if_index] = (struct in6_ifstat *)
-			malloc(sizeof(struct in6_ifstat), M_IFADDR, M_WAITOK);
+			malloc(sizeof(struct in6_ifstat), M_IFADDR, 0);
 		bzero(in6_ifstat[ifp->if_index], sizeof(struct in6_ifstat));
 	}
 	if (icmp6_ifstat[ifp->if_index] == NULL) {
 		icmp6_ifstat[ifp->if_index] = (struct icmp6_ifstat *)
-			malloc(sizeof(struct icmp6_ifstat), M_IFADDR, M_WAITOK);
+			malloc(sizeof(struct icmp6_ifstat), M_IFADDR, 0);
 		bzero(icmp6_ifstat[ifp->if_index], sizeof(struct icmp6_ifstat));
 	}
 
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 963cd9a9a1bb..4a5de69edcfd 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -640,7 +640,7 @@ in6_sockaddr(port, addr_p)
 {
 	struct sockaddr_in6 *sin6;
 
-	MALLOC(sin6, struct sockaddr_in6 *, sizeof *sin6, M_SONAME, M_WAITOK);
+	MALLOC(sin6, struct sockaddr_in6 *, sizeof *sin6, M_SONAME, 0);
 	bzero(sin6, sizeof *sin6);
 	sin6->sin6_family = AF_INET6;
 	sin6->sin6_len = sizeof(*sin6);
@@ -671,7 +671,7 @@ in6_v4mapsin6_sockaddr(port, addr_p)
 	sin.sin_addr = *addr_p;
 
 	MALLOC(sin6_p, struct sockaddr_in6 *, sizeof *sin6_p, M_SONAME,
-		M_WAITOK);
+		0);
 	in6_sin_2_v4mapsin6(&sin, sin6_p);
 
 	return (struct sockaddr *)sin6_p;
diff --git a/sys/netinet6/ip6_fw.c b/sys/netinet6/ip6_fw.c
index 0ef2c52f2b47..b1eb2ff3267b 100644
--- a/sys/netinet6/ip6_fw.c
+++ b/sys/netinet6/ip6_fw.c
@@ -1109,11 +1109,11 @@ ip6_fw_ctl(int stage, struct mbuf **mm)
 
 	if (stage == IPV6_FW_GET) {
 		struct ip6_fw_chain *fcp = ip6_fw_chain.lh_first;
-		*mm = m = m_get(M_TRYWAIT, MT_DATA); /* XXX */
+		*mm = m = m_get(0, MT_DATA); /* XXX */
 		if (!m)
 			return(ENOBUFS);
 		if (sizeof *(fcp->rule) > MLEN) {
-			MCLGET(m, M_TRYWAIT);
+			MCLGET(m, 0);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_free(m);
 				return(ENOBUFS);
@@ -1122,14 +1122,14 @@ ip6_fw_ctl(int stage, struct mbuf **mm)
 		for (; fcp; fcp = fcp->chain.le_next) {
 			bcopy(fcp->rule, m->m_data, sizeof *(fcp->rule));
 			m->m_len = sizeof *(fcp->rule);
-			m->m_next = m_get(M_TRYWAIT, MT_DATA); /* XXX */
+			m->m_next = m_get(0, MT_DATA); /* XXX */
 			if (!m->m_next) {
 				m_freem(*mm);
 				return(ENOBUFS);
 			}
 			m = m->m_next;
 			if (sizeof *(fcp->rule) > MLEN) {
-				MCLGET(m, M_TRYWAIT);
+				MCLGET(m, 0);
 				if ((m->m_flags & M_EXT) == 0) {
 					m_freem(*mm);
 					return(ENOBUFS);
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 1f37baec3873..01b923613198 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -317,11 +317,11 @@ ip6_input(m)
 	if (m && m->m_next != NULL && m->m_pkthdr.len < MCLBYTES) {
 		struct mbuf *n;
 
-		MGETHDR(n, M_DONTWAIT, MT_HEADER);
+		MGETHDR(n, M_NOWAIT, MT_HEADER);
 		if (n)
 			M_MOVE_PKTHDR(n, m);
 		if (n && n->m_pkthdr.len > MHLEN) {
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, M_NOWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_freem(n);
 				n = NULL;
@@ -1433,9 +1433,9 @@ ip6_pullexthdr(m, off, nxt)
 	else
 		elen = (ip6e.ip6e_len + 1) << 3;
 
-	MGET(n, M_DONTWAIT, MT_DATA);
+	MGET(n, M_NOWAIT, MT_DATA);
 	if (n && elen >= MLEN) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, M_NOWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_free(n);
 			n = NULL;
@@ -1623,7 +1623,7 @@ ip6_addaux(m)
 	if (!tag) {
 		tag = m_tag_get(PACKET_TAG_IPV6_INPUT,
 				sizeof (struct ip6aux),
-				M_DONTWAIT);
+				M_NOWAIT);
 		if (tag)
 			m_tag_prepend(m, tag);
 	}
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index f1257d35c550..20840651d7cd 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1531,7 +1531,7 @@ register_send(ip6, mif, m)
 	++pim6stat.pim6s_snd_registers;
 
 	/* Make a copy of the packet to send to the user level process */
-	MGETHDR(mm, M_DONTWAIT, MT_HEADER);
+	MGETHDR(mm, M_NOWAIT, MT_HEADER);
 	if (mm == NULL)
 		return ENOBUFS;
 	mm->m_pkthdr.rcvif = NULL;
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 64b11aa36a26..b4f56a62463a 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1040,7 +1040,7 @@ skip_ipsec2:;
 		 */
 		m0 = m;
 		for (off = hlen; off < tlen; off += len) {
-			MGETHDR(m, M_DONTWAIT, MT_HEADER);
+			MGETHDR(m, M_NOWAIT, MT_HEADER);
 			if (!m) {
 				error = ENOBUFS;
 				ip6stat.ip6s_odropped++;
@@ -1153,12 +1153,12 @@ ip6_copyexthdr(mp, hdr, hlen)
 	if (hlen > MCLBYTES)
 		return(ENOBUFS); /* XXX */
 
-	MGET(m, M_DONTWAIT, MT_DATA);
+	MGET(m, M_NOWAIT, MT_DATA);
 	if (!m)
 		return(ENOBUFS);
 
 	if (hlen > MLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return(ENOBUFS);
@@ -1193,7 +1193,7 @@ ip6_insert_jumboopt(exthdrs, plen)
 	 * Otherwise, use it to store the options.
 	 */
 	if (exthdrs->ip6e_hbh == 0) {
-		MGET(mopt, M_DONTWAIT, MT_DATA);
+		MGET(mopt, M_NOWAIT, MT_DATA);
 		if (mopt == 0)
 			return(ENOBUFS);
 		mopt->m_len = JUMBOOPTLEN;
@@ -1225,9 +1225,9 @@ ip6_insert_jumboopt(exthdrs, plen)
 			 * As a consequence, we must always prepare a cluster
 			 * at this point.
 			 */
-			MGET(n, M_DONTWAIT, MT_DATA);
+			MGET(n, M_NOWAIT, MT_DATA);
 			if (n) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, M_NOWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_freem(n);
 					n = NULL;
@@ -1282,7 +1282,7 @@ ip6_insertfraghdr(m0, m, hlen, frghdrp)
 
 	if (hlen > sizeof(struct ip6_hdr)) {
 		n = m_copym(m0, sizeof(struct ip6_hdr),
-			    hlen - sizeof(struct ip6_hdr), M_DONTWAIT);
+			    hlen - sizeof(struct ip6_hdr), M_NOWAIT);
 		if (n == 0)
 			return(ENOBUFS);
 		m->m_next = n;
@@ -1304,7 +1304,7 @@ ip6_insertfraghdr(m0, m, hlen, frghdrp)
 		/* allocate a new mbuf for the fragment header */
 		struct mbuf *mfrg;
 
-		MGET(mfrg, M_DONTWAIT, MT_DATA);
+		MGET(mfrg, M_NOWAIT, MT_DATA);
 		if (mfrg == 0)
 			return(ENOBUFS);
 		mfrg->m_len = sizeof(struct ip6_frag);
@@ -1496,7 +1496,7 @@ do { \
 					break;
 				}
 				/* XXX */
-				MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_HEADER);
+				MGET(m, sopt->sopt_td ? 0 : M_NOWAIT, MT_HEADER);
 				if (m == 0) {
 					error = ENOBUFS;
 					break;
@@ -1595,7 +1595,7 @@ do { \
 				if (in6p->in6p_options) {
 					struct mbuf *m;
 					m = m_copym(in6p->in6p_options,
-					    0, M_COPYALL, M_TRYWAIT);
+					    0, M_COPYALL, 0);
 					error = soopt_mcopyout(sopt, m);
 					if (error == 0)
 						m_freem(m);
@@ -1776,7 +1776,7 @@ ip6_pcbopts(pktopt, m, so, sopt)
 #endif
 		ip6_clearpktopts(opt, 1, -1);
 	} else
-		opt = malloc(sizeof(*opt), M_IP6OPT, M_WAITOK);
+		opt = malloc(sizeof(*opt), M_IP6OPT, 0);
 	*pktopt = NULL;
 
 	if (!m || m->m_len == 0) {
@@ -1959,7 +1959,7 @@ ip6_setmoptions(optname, im6op, m)
 		 * allocate one and initialize to default values.
 		 */
 		im6o = (struct ip6_moptions *)
-			malloc(sizeof(*im6o), M_IPMOPTS, M_WAITOK);
+			malloc(sizeof(*im6o), M_IPMOPTS, 0);
 
 		if (im6o == NULL)
 			return(ENOBUFS);
@@ -2129,7 +2129,7 @@ ip6_setmoptions(optname, im6op, m)
 		 * Everything looks good; add a new record to the multicast
 		 * address list for the given interface.
 		 */
-		imm = malloc(sizeof(*imm), M_IPMADDR, M_WAITOK);
+		imm = malloc(sizeof(*imm), M_IPMADDR, 0);
 		if (imm == NULL) {
 			error = ENOBUFS;
 			break;
@@ -2234,7 +2234,7 @@ ip6_getmoptions(optname, im6o, mp)
 {
 	u_int *hlim, *loop, *ifindex;
 
-	*mp = m_get(M_TRYWAIT, MT_HEADER);		/* XXX */
+	*mp = m_get(0, MT_HEADER);		/* XXX */
 
 	switch (optname) {
 
@@ -2333,7 +2333,7 @@ ip6_setpktoptions(control, opt, priv, needcopy)
 				/* XXX: Is it really WAITOK? */
 				opt->ip6po_pktinfo =
 					malloc(sizeof(struct in6_pktinfo),
-					       M_IP6OPT, M_WAITOK);
+					       M_IP6OPT, 0);
 				bcopy(CMSG_DATA(cm), opt->ip6po_pktinfo,
 				    sizeof(struct in6_pktinfo));
 			} else
@@ -2392,7 +2392,7 @@ ip6_setpktoptions(control, opt, priv, needcopy)
 			if (needcopy) {
 				opt->ip6po_nexthop =
 					malloc(*CMSG_DATA(cm),
-					       M_IP6OPT, M_WAITOK);
+					       M_IP6OPT, 0);
 				bcopy(CMSG_DATA(cm),
 				      opt->ip6po_nexthop,
 				      *CMSG_DATA(cm));
@@ -2415,7 +2415,7 @@ ip6_setpktoptions(control, opt, priv, needcopy)
 
 			if (needcopy) {
 				opt->ip6po_hbh =
-					malloc(hbhlen, M_IP6OPT, M_WAITOK);
+					malloc(hbhlen, M_IP6OPT, 0);
 				bcopy(hbh, opt->ip6po_hbh, hbhlen);
 			} else
 				opt->ip6po_hbh = hbh;
@@ -2453,7 +2453,7 @@ ip6_setpktoptions(control, opt, priv, needcopy)
 				newdest = &opt->ip6po_dest2;
 
 			if (needcopy) {
-				*newdest = malloc(destlen, M_IP6OPT, M_WAITOK);
+				*newdest = malloc(destlen, M_IP6OPT, 0);
 				bcopy(dest, *newdest, destlen);
 			} else
 				*newdest = dest;
@@ -2490,7 +2490,7 @@ ip6_setpktoptions(control, opt, priv, needcopy)
 
 			if (needcopy) {
 				opt->ip6po_rthdr = malloc(rthlen, M_IP6OPT,
-							  M_WAITOK);
+							  0);
 				bcopy(rth, opt->ip6po_rthdr, rthlen);
 			} else
 				opt->ip6po_rthdr = rth;
@@ -2570,7 +2570,7 @@ ip6_splithdr(m, exthdrs)
 
 	ip6 = mtod(m, struct ip6_hdr *);
 	if (m->m_len > sizeof(*ip6)) {
-		MGETHDR(mh, M_DONTWAIT, MT_HEADER);
+		MGETHDR(mh, M_NOWAIT, MT_HEADER);
 		if (mh == 0) {
 			m_freem(m);
 			return ENOBUFS;
diff --git a/sys/netinet6/ipcomp_core.c b/sys/netinet6/ipcomp_core.c
index a6cdea5218ef..e47779af9725 100644
--- a/sys/netinet6/ipcomp_core.c
+++ b/sys/netinet6/ipcomp_core.c
@@ -146,9 +146,9 @@ do { \
 	}							\
 								\
 	/* get a fresh reply buffer */				\
-	MGET(n, M_DONTWAIT, MT_DATA);				\
+	MGET(n, M_NOWAIT, MT_DATA);				\
 	if (n) {						\
-		MCLGET(n, M_DONTWAIT);				\
+		MCLGET(n, M_NOWAIT);				\
 	}							\
 	if (!n) {						\
 		error = ENOBUFS;				\
diff --git a/sys/netinet6/ipcomp_output.c b/sys/netinet6/ipcomp_output.c
index 71e5755c986d..17da4545101a 100644
--- a/sys/netinet6/ipcomp_output.c
+++ b/sys/netinet6/ipcomp_output.c
@@ -171,12 +171,12 @@ ipcomp_output(m, nexthdrp, md, isr, af)
 	 * compromise two m_copym().  we will be going through every byte of
 	 * the payload during compression process anyways.
 	 */
-	mcopy = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
+	mcopy = m_copym(m, 0, M_COPYALL, M_NOWAIT);
 	if (mcopy == NULL) {
 		error = ENOBUFS;
 		return 0;
 	}
-	md0 = m_copym(md, 0, M_COPYALL, M_DONTWAIT);
+	md0 = m_copym(md, 0, M_COPYALL, M_NOWAIT);
 	if (md0 == NULL) {
 		m_freem(mcopy);
 		error = ENOBUFS;
@@ -279,7 +279,7 @@ ipcomp_output(m, nexthdrp, md, isr, af)
 	 * after:  IP ... ipcomp payload
 	 */
 	if (M_LEADINGSPACE(md) < complen) {
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			error = ENOBUFS;
diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c
index f898c0a1cf3c..4f795fe5f888 100644
--- a/sys/netinet6/ipsec.c
+++ b/sys/netinet6/ipsec.c
@@ -2006,7 +2006,7 @@ ipsec4_encapsulate(m, sav)
 	 */
 	if (M_LEADINGSPACE(m->m_next) < hlen) {
 		struct mbuf *n;
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			return ENOBUFS;
@@ -2105,7 +2105,7 @@ ipsec6_encapsulate(m, sav)
 		panic("ipsec6_encapsulate: assumption failed (first mbuf length)");
 	if (M_LEADINGSPACE(m->m_next) < sizeof(struct ip6_hdr)) {
 		struct mbuf *n;
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			return ENOBUFS;
@@ -3119,7 +3119,7 @@ ipsec4_splithdr(m)
 	hlen = ip->ip_hl << 2;
 #endif
 	if (m->m_len > hlen) {
-		MGETHDR(mh, M_DONTWAIT, MT_HEADER);
+		MGETHDR(mh, M_NOWAIT, MT_HEADER);
 		if (!mh) {
 			m_freem(m);
 			return NULL;
@@ -3155,7 +3155,7 @@ ipsec6_splithdr(m)
 	ip6 = mtod(m, struct ip6_hdr *);
 	hlen = sizeof(struct ip6_hdr);
 	if (m->m_len > hlen) {
-		MGETHDR(mh, M_DONTWAIT, MT_HEADER);
+		MGETHDR(mh, M_NOWAIT, MT_HEADER);
 		if (!mh) {
 			m_freem(m);
 			return NULL;
@@ -3366,16 +3366,16 @@ ipsec_copypkt(m)
 				struct mbuf *mm;
 
 				if (n->m_flags & M_PKTHDR) {
-					MGETHDR(mnew, M_DONTWAIT, MT_HEADER);
+					MGETHDR(mnew, M_NOWAIT, MT_HEADER);
 					if (mnew == NULL)
 						goto fail;
-					if (!m_dup_pkthdr(mnew, n, M_DONTWAIT)) {
+					if (!m_dup_pkthdr(mnew, n, M_NOWAIT)) {
 						m_free(mnew);
 						goto fail;
 					}
 				}
 				else {
-					MGET(mnew, M_DONTWAIT, MT_DATA);
+					MGET(mnew, M_NOWAIT, MT_DATA);
 					if (mnew == NULL)
 						goto fail;
 				}
@@ -3399,7 +3399,7 @@ ipsec_copypkt(m)
 					if (remain <= (mm->m_flags & M_PKTHDR ? MHLEN : MLEN))
 						len = remain;
 					else { /* allocate a cluster */
-						MCLGET(mm, M_DONTWAIT);
+						MCLGET(mm, M_NOWAIT);
 						if (!(mm->m_flags & M_EXT)) {
 							m_free(mm);
 							goto fail;
@@ -3419,7 +3419,7 @@ ipsec_copypkt(m)
 						break;
 
 					/* need another mbuf */
-					MGETHDR(mn, M_DONTWAIT, MT_HEADER);
+					MGETHDR(mn, M_NOWAIT, MT_HEADER);
 					if (mn == NULL)
 						goto fail;
 					mn->m_pkthdr.rcvif = NULL;
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index 61c0e0c0a730..fce6e1bc7b80 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -400,10 +400,10 @@ mld6_sendpkt(in6m, type, dst)
 	 * We allocate 2 mbufs and make chain in advance because
 	 * it is more convenient when inserting the hop-by-hop option later.
 	 */
-	MGETHDR(mh, M_DONTWAIT, MT_HEADER);
+	MGETHDR(mh, M_NOWAIT, MT_HEADER);
 	if (mh == NULL)
 		return;
-	MGET(md, M_DONTWAIT, MT_DATA);
+	MGET(md, M_NOWAIT, MT_DATA);
 	if (md == NULL) {
 		m_free(mh);
 		return;
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 33913d446034..df3fdb9d3f55 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -164,7 +164,7 @@ nd6_ifattach(ifp)
 
 		/* grow nd_ifinfo */
 		n = nd_ifinfo_indexlim * sizeof(struct nd_ifinfo);
-		q = (caddr_t)malloc(n, M_IP6NDP, M_WAITOK);
+		q = (caddr_t)malloc(n, M_IP6NDP, 0);
 		bzero(q, n);
 		if (nd_ifinfo) {
 			bcopy((caddr_t)nd_ifinfo, q, n/2);
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index 16bfbb41aea8..4bf18200515e 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -362,9 +362,9 @@ nd6_ns_output(ifp, daddr6, taddr6, ln, dad)
 		return;
 	}
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m && max_linkhdr + maxlen >= MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			m = NULL;
@@ -847,9 +847,9 @@ nd6_na_output(ifp, daddr6, taddr6, flags, tlladdr, sdl0)
 		return;
 	}
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m && max_linkhdr + maxlen >= MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			m = NULL;
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 540533ba019a..abb7358a5c9d 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -372,7 +372,7 @@ rip6_output(m, va_alist)
 		code = icmp6->icmp6_code;
 	}
 
-	M_PREPEND(m, sizeof(*ip6), M_TRYWAIT);
+	M_PREPEND(m, sizeof(*ip6), 0);
 	ip6 = mtod(m, struct ip6_hdr *);
 
 	/*
diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c
index 0c32da8c4761..10637e35444d 100644
--- a/sys/netinet6/scope6.c
+++ b/sys/netinet6/scope6.c
@@ -75,7 +75,7 @@ scope6_ifattach(ifp)
 		/* grow scope index array */
 		n = if_indexlim * sizeof(struct scope6_id);
 		/* XXX: need new malloc type? */
-		q = (caddr_t)malloc(n, M_IFADDR, M_WAITOK);
+		q = (caddr_t)malloc(n, M_IFADDR, 0);
 		bzero(q, n);
 		if (scope6_ids) {
 			bcopy((caddr_t)scope6_ids, q, n/2);
diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index 1de45f0b6ddc..659eb0da5ef3 100644
--- a/sys/netinet6/udp6_output.c
+++ b/sys/netinet6/udp6_output.c
@@ -248,7 +248,7 @@ udp6_output(in6p, m, addr6, control, td)
 	 * Calculate data length and get a mbuf
 	 * for UDP and IP6 headers.
 	 */
-	M_PREPEND(m, hlen + sizeof(struct udphdr), M_DONTWAIT);
+	M_PREPEND(m, hlen + sizeof(struct udphdr), M_NOWAIT);
 	if (m == 0) {
 		error = ENOBUFS;
 		goto release;
diff --git a/sys/netipsec/ipsec_mbuf.c b/sys/netipsec/ipsec_mbuf.c
index 7fa291b5a9c7..089a4b4e5ca4 100644
--- a/sys/netipsec/ipsec_mbuf.c
+++ b/sys/netipsec/ipsec_mbuf.c
@@ -105,20 +105,20 @@ m_clone(struct mbuf *m0)
 			 * because M_MOVE_PKTHDR will smash the data
 			 * pointer and drop the M_EXT marker.
 			 */
-			MGETHDR(n, M_DONTWAIT, m->m_type);
+			MGETHDR(n, M_NOWAIT, m->m_type);
 			if (n == NULL) {
 				m_freem(m0);
 				return (NULL);
 			}
 			M_MOVE_PKTHDR(n, m);
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, M_NOWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				m_freem(m0);
 				return (NULL);
 			}
 		} else {
-			n = m_getcl(M_DONTWAIT, m->m_type, m->m_flags);
+			n = m_getcl(M_NOWAIT, m->m_type, m->m_flags);
 			if (n == NULL) {
 				m_freem(m0);
 				return (NULL);
@@ -150,7 +150,7 @@ m_clone(struct mbuf *m0)
 				break;
 			off += cc;
 
-			n = m_getcl(M_DONTWAIT, m->m_type, m->m_flags);
+			n = m_getcl(M_NOWAIT, m->m_type, m->m_flags);
 			if (n == NULL) {
 				m_freem(mfirst);
 				m_freem(m0);
@@ -210,7 +210,7 @@ m_makespace(struct mbuf *m0, int skip, int hlen, int *off)
 		 *
 		 * NB: this ignores mbuf types.
 		 */
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (n == NULL)
 			return (NULL);
 		n->m_next = m->m_next;		/* splice new mbuf */
@@ -238,7 +238,7 @@ m_makespace(struct mbuf *m0, int skip, int hlen, int *off)
 			if (remain + hlen > M_TRAILINGSPACE(n)) {
 				struct mbuf *n2;
 
-				MGET(n2, M_DONTWAIT, MT_DATA);
+				MGET(n2, M_NOWAIT, MT_DATA);
 				/* NB: new mbuf is on chain, let caller free */
 				if (n2 == NULL)
 					return (NULL);
@@ -328,7 +328,7 @@ KASSERT(m0->m_next != NULL, ("m_pad: m0 null, len %u m_len %u", len, m0->m_len))
 
 	if (pad > M_TRAILINGSPACE(m0)) {
 		/* Add an mbuf to the chain. */
-		MGET(m1, M_DONTWAIT, MT_DATA);
+		MGET(m1, M_NOWAIT, MT_DATA);
 		if (m1 == 0) {
 			m_freem(m0);
 			DPRINTF(("m_pad: unable to get extra mbuf\n"));
diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c
index 3748747abe9e..aa53f9ca3eaa 100644
--- a/sys/netipsec/ipsec_output.c
+++ b/sys/netipsec/ipsec_output.c
@@ -469,7 +469,7 @@ ipsec6_splithdr(struct mbuf *m)
 	ip6 = mtod(m, struct ip6_hdr *);
 	hlen = sizeof(struct ip6_hdr);
 	if (m->m_len > hlen) {
-		MGETHDR(mh, M_DONTWAIT, MT_HEADER);
+		MGETHDR(mh, M_NOWAIT, MT_HEADER);
 		if (!mh) {
 			m_freem(m);
 			return NULL;
@@ -580,7 +580,7 @@ ipsec6_encapsulate(struct mbuf *m, struct secasvar *sav)
 	plen = m->m_pkthdr.len;
 	if (M_LEADINGSPACE(m->m_next) < sizeof(struct ip6_hdr)) {
 		struct mbuf *n;
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			return ENOBUFS;
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index ff6bae157574..85e7f91e1a38 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -1627,7 +1627,7 @@ key_gather_mbuf(m, mhp, ndeep, nitem, va_alist)
 			if (len > MHLEN)
 				panic("assumption failed");
 #endif
-			MGETHDR(n, M_DONTWAIT, MT_DATA);
+			MGETHDR(n, M_NOWAIT, MT_DATA);
 			if (!n)
 				goto fail;
 			n->m_len = len;
@@ -1646,7 +1646,7 @@ key_gather_mbuf(m, mhp, ndeep, nitem, va_alist)
 			    mtod(n, caddr_t));
 		} else {
 			n = m_copym(m, mhp->extoff[idx], mhp->extlen[idx],
-			    M_DONTWAIT);
+			    M_NOWAIT);
 		}
 		if (n == NULL)
 			goto fail;
@@ -2079,9 +2079,9 @@ key_spddelete2(so, m, mhp)
 
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
-	MGETHDR(n, M_DONTWAIT, MT_DATA);
+	MGETHDR(n, M_NOWAIT, MT_DATA);
 	if (n && len > MHLEN) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, M_NOWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -2103,7 +2103,7 @@ key_spddelete2(so, m, mhp)
 #endif
 
 	n->m_next = m_copym(m, mhp->extoff[SADB_X_EXT_POLICY],
-	    mhp->extlen[SADB_X_EXT_POLICY], M_DONTWAIT);
+	    mhp->extlen[SADB_X_EXT_POLICY], M_NOWAIT);
 	if (!n->m_next) {
 		m_freem(n);
 		return key_senderror(so, m, ENOBUFS);
@@ -3329,7 +3329,7 @@ key_setdumpsa(sav, type, satype, seq, pid)
 		if ((!m && !p) || (m && p))
 			goto fail;
 		if (p && tres) {
-			M_PREPEND(tres, l, M_DONTWAIT);
+			M_PREPEND(tres, l, M_NOWAIT);
 			if (!tres)
 				goto fail;
 			bcopy(p, mtod(tres, caddr_t), l);
@@ -3388,9 +3388,9 @@ key_setsadbmsg(type, tlen, satype, seq, pid, reserved)
 	len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
 	if (len > MCLBYTES)
 		return NULL;
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m && len > MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_freem(m);
 			m = NULL;
@@ -4499,9 +4499,9 @@ key_getspi(so, m, mhp)
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
 
-	MGETHDR(n, M_DONTWAIT, MT_DATA);
+	MGETHDR(n, M_NOWAIT, MT_DATA);
 	if (len > MHLEN) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, M_NOWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -5388,7 +5388,7 @@ key_getcomb_esp()
 			KASSERT(l <= MLEN,
 				("key_getcomb_esp: l=%u > MLEN=%lu",
 				l, (u_long) MLEN));
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
@@ -5490,14 +5490,14 @@ key_getcomb_ah()
 			KASSERT(l <= MLEN,
 				("key_getcomb_ah: l=%u > MLEN=%lu",
 				l, (u_long) MLEN));
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, M_DONTWAIT);
+			M_PREPEND(m, l, M_NOWAIT);
 		if (!m)
 			return NULL;
 
@@ -5535,14 +5535,14 @@ key_getcomb_ipcomp()
 			KASSERT(l <= MLEN,
 				("key_getcomb_ipcomp: l=%u > MLEN=%lu",
 				l, (u_long) MLEN));
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, M_DONTWAIT);
+			M_PREPEND(m, l, M_NOWAIT);
 		if (!m)
 			return NULL;
 
@@ -5586,7 +5586,7 @@ key_getprop(saidx)
 
 	if (!m)
 		return NULL;
-	M_PREPEND(m, l, M_DONTWAIT);
+	M_PREPEND(m, l, M_NOWAIT);
 	if (!m)
 		return NULL;
 
@@ -6091,9 +6091,9 @@ key_register(so, m, mhp)
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
 
-	MGETHDR(n, M_DONTWAIT, MT_DATA);
+	MGETHDR(n, M_NOWAIT, MT_DATA);
 	if (len > MHLEN) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, M_NOWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -6657,9 +6657,9 @@ key_parse(m, so)
 	if (m->m_next) {
 		struct mbuf *n;
 
-		MGETHDR(n, M_DONTWAIT, MT_DATA);
+		MGETHDR(n, M_NOWAIT, MT_DATA);
 		if (n && m->m_pkthdr.len > MHLEN) {
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, M_NOWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				n = NULL;
@@ -7257,9 +7257,9 @@ key_alloc_mbuf(l)
 
 	len = l;
 	while (len > 0) {
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (n && len > MLEN)
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, M_NOWAIT);
 		if (!n) {
 			m_freem(m);
 			return NULL;
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c
index d61c15b4ba1a..7ae835a21d8b 100644
--- a/sys/netipsec/keysock.c
+++ b/sys/netipsec/keysock.c
@@ -152,7 +152,7 @@ key_sendup0(rp, m, promisc)
 	if (promisc) {
 		struct sadb_msg *pmsg;
 
-		M_PREPEND(m, sizeof(struct sadb_msg), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct sadb_msg), M_NOWAIT);
 		if (m && m->m_len < sizeof(struct sadb_msg))
 			m = m_pullup(m, sizeof(struct sadb_msg));
 		if (!m) {
@@ -223,10 +223,10 @@ key_sendup(so, msg, len, target)
 	m = mprev = NULL;
 	while (tlen > 0) {
 		if (tlen == len) {
-			MGETHDR(n, M_DONTWAIT, MT_DATA);
+			MGETHDR(n, M_NOWAIT, MT_DATA);
 			n->m_len = MHLEN;
 		} else {
-			MGET(n, M_DONTWAIT, MT_DATA);
+			MGET(n, M_NOWAIT, MT_DATA);
 			n->m_len = MLEN;
 		}
 		if (!n) {
@@ -234,7 +234,7 @@ key_sendup(so, msg, len, target)
 			return ENOBUFS;
 		}
 		if (tlen >= MCLBYTES) {	/*XXX better threshold? */
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, M_NOWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				m_freem(m);
@@ -402,7 +402,7 @@ key_attach(struct socket *so, int proto, struct thread *td)
 
 	if (sotorawcb(so) != 0)
 		return EISCONN;	/* XXX panic? */
-	kp = (struct keycb *)malloc(sizeof *kp, M_PCB, M_WAITOK|M_ZERO); /* XXX */
+	kp = (struct keycb *)malloc(sizeof *kp, M_PCB, M_ZERO); /* XXX */
 	if (kp == 0)
 		return ENOBUFS;
 
diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c
index f91d3cf54b82..ece649d25496 100644
--- a/sys/netipsec/xform_esp.c
+++ b/sys/netipsec/xform_esp.c
@@ -190,7 +190,7 @@ esp_init(struct secasvar *sav, struct xformsw *xsp)
 	 *      compromise is to force it to zero here.
 	 */
 	sav->ivlen = (txform == &enc_xform_null ? 0 : txform->blocksize);
-	sav->iv = (caddr_t) malloc(sav->ivlen, M_XDATA, M_WAITOK);
+	sav->iv = (caddr_t) malloc(sav->ivlen, M_XDATA, 0);
 	if (sav->iv == NULL) {
 		DPRINTF(("esp_init: no memory for IV\n"));
 		return EINVAL;
diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c
index 9d49a3e55948..6672b62de4c5 100644
--- a/sys/netipsec/xform_ipip.c
+++ b/sys/netipsec/xform_ipip.c
@@ -441,7 +441,7 @@ ipip_output(
 			goto bad;
 		}
 
-		M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct ip), M_NOWAIT);
 		if (m == 0) {
 			DPRINTF(("ipip_output: M_PREPEND failed\n"));
 			ipipstat.ipips_hdrops++;
@@ -529,7 +529,7 @@ ipip_output(
 		if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst))
 			ip6->ip6_dst.s6_addr16[1] = 0;
 
-		M_PREPEND(m, sizeof(struct ip6_hdr), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct ip6_hdr), M_NOWAIT);
 		if (m == 0) {
 			DPRINTF(("ipip_output: M_PREPEND failed\n"));
 			ipipstat.ipips_hdrops++;
diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c
index 35aa27d5d13b..6d2be1aa1690 100644
--- a/sys/netipx/ipx.c
+++ b/sys/netipx/ipx.c
@@ -130,7 +130,7 @@ ipx_control(so, cmd, data, ifp, td)
 		if (ia == NULL) {
 			oia = (struct ipx_ifaddr *)
 				malloc(sizeof(*ia), M_IFADDR,
-				M_WAITOK | M_ZERO);
+				M_ZERO);
 			if (oia == NULL)
 				return (ENOBUFS);
 			if ((ia = ipx_ifaddr) != NULL) {
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index 3410a41189d6..b3d95d214ad8 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -483,7 +483,7 @@ struct ifnet *ifp;
 		if (m0 != NULL) {
 			register struct ipx *ipx;
 
-			M_PREPEND(m0, sizeof(*ipx), M_DONTWAIT);
+			M_PREPEND(m0, sizeof(*ipx), M_NOWAIT);
 			if (m0 == NULL)
 				continue;
 			ipx = mtod(m0, struct ipx *);
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c
index 6f5d74c2ba87..59e769ba1e2f 100644
--- a/sys/netipx/ipx_ip.c
+++ b/sys/netipx/ipx_ip.c
@@ -175,7 +175,7 @@ ipxip_input(m, hlen)
 		if (ipxip_lastin != NULL) {
 			m_freem(ipxip_lastin);
 		}
-		ipxip_lastin = m_copym(m, 0, (int)M_COPYALL, M_DONTWAIT);
+		ipxip_lastin = m_copym(m, 0, (int)M_COPYALL, M_NOWAIT);
 	}
 	/*
 	 * Get IP and IPX header together in first mbuf.
@@ -256,7 +256,7 @@ ipxipoutput(ifp, m, dst, rt)
 	/* following clause not necessary on vax */
 	if (3 & (intptr_t)m->m_data) {
 		/* force longword alignment of ip hdr */
-		struct mbuf *m0 = m_gethdr(MT_HEADER, M_DONTWAIT);
+		struct mbuf *m0 = m_gethdr(MT_HEADER, M_NOWAIT);
 		if (m0 == NULL) {
 			m_freem(m);
 			return (ENOBUFS);
@@ -269,7 +269,7 @@ ipxipoutput(ifp, m, dst, rt)
 		m->m_flags &= ~M_PKTHDR;
 		m = m0;
 	} else {
-		M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct ip), M_NOWAIT);
 		if (m == NULL)
 			return (ENOBUFS);
 	}
diff --git a/sys/netipx/ipx_outputfl.c b/sys/netipx/ipx_outputfl.c
index 9f608dd42bdd..0436847f237a 100644
--- a/sys/netipx/ipx_outputfl.c
+++ b/sys/netipx/ipx_outputfl.c
@@ -244,7 +244,7 @@ ipx_output_type20(m)
 			if(ipx->ipx_sum != 0xffff)
 				ipx->ipx_sum = ipx_cksum(m, ntohs(ipx->ipx_len));
 
-			m1 = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
+			m1 = m_copym(m, 0, M_COPYALL, M_NOWAIT);
 			if(m1) {
 				error = (*ifp->if_output)(ifp, m1,
 					(struct sockaddr *)&dst, NULL);
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index f0c803a90b9a..bf0580842bba 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -218,7 +218,7 @@ ipx_output(ipxp, m0)
 			(m->m_len + m->m_data < &m->m_dat[MLEN])) {
 			mtod(m, char*)[m->m_len++] = 0;
 		} else {
-			struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
+			struct mbuf *m1 = m_get(M_NOWAIT, MT_DATA);
 
 			if (m1 == NULL) {
 				m_freem(m0);
@@ -239,7 +239,7 @@ ipx_output(ipxp, m0)
 	if (ipxp->ipxp_flags & IPXP_RAWOUT) {
 		ipx = mtod(m, struct ipx *);
 	} else {
-		M_PREPEND(m, sizeof(struct ipx), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct ipx), M_NOWAIT);
 		if (m == NULL)
 			return (ENOBUFS);
 		ipx = mtod(m, struct ipx *);
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index 189d741d09fa..92402c81a8ec 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -579,7 +579,7 @@ present:
 				spx_newchecks[4]++;
 				if (dt != cb->s_rhdr.spx_dt) {
 					struct mbuf *mm =
-					   m_getclr(M_DONTWAIT, MT_CONTROL);
+					   m_getclr(M_NOWAIT, MT_CONTROL);
 					spx_newchecks[0]++;
 					if (mm != NULL) {
 						u_short *s =
@@ -755,7 +755,7 @@ spx_output(cb, m0)
 					 * from usrreq(), so it is OK to
 					 * block.
 					 */
-					m = m_copym(m0, 0, mtu, M_TRYWAIT);
+					m = m_copym(m0, 0, mtu, 0);
 					if (cb->s_flags & SF_NEWCALL) {
 					    struct mbuf *mm = m;
 					    spx_newchecks[7]++;
@@ -785,7 +785,7 @@ spx_output(cb, m0)
 			if (M_TRAILINGSPACE(m) >= 1)
 				m->m_len++;
 			else {
-				struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
+				struct mbuf *m1 = m_get(M_NOWAIT, MT_DATA);
 
 				if (m1 == NULL) {
 					m_freem(m0);
@@ -796,7 +796,7 @@ spx_output(cb, m0)
 				m->m_next = m1;
 			}
 		}
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(M_NOWAIT, MT_HEADER);
 		if (m == NULL) {
 			m_freem(m0);
 			return (ENOBUFS);
@@ -1009,7 +1009,7 @@ send:
 			spxstat.spxs_sndprobe++;
 		if (cb->s_flags & SF_ACKNOW)
 			spxstat.spxs_sndacks++;
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(M_NOWAIT, MT_HEADER);
 		if (m == NULL)
 			return (ENOBUFS);
 		/*
@@ -1342,7 +1342,7 @@ spx_attach(so, proto, td)
 	}
 	sb = &so->so_snd;
 
-	mm = m_getclr(M_DONTWAIT, MT_HEADER);
+	mm = m_getclr(M_NOWAIT, MT_HEADER);
 	if (mm == NULL) {
 		FREE(cb, M_PCB);
 		error = ENOBUFS;
diff --git a/sys/netkey/key.c b/sys/netkey/key.c
index dbc0a2a102de..cfa735f573d7 100644
--- a/sys/netkey/key.c
+++ b/sys/netkey/key.c
@@ -1662,7 +1662,7 @@ key_gather_mbuf(m, mhp, ndeep, nitem, va_alist)
 			if (len > MHLEN)
 				panic("assumption failed");
 #endif
-			MGETHDR(n, M_DONTWAIT, MT_DATA);
+			MGETHDR(n, M_NOWAIT, MT_DATA);
 			if (!n)
 				goto fail;
 			n->m_len = len;
@@ -1681,7 +1681,7 @@ key_gather_mbuf(m, mhp, ndeep, nitem, va_alist)
 			    mtod(n, caddr_t));
 		} else {
 			n = m_copym(m, mhp->extoff[idx], mhp->extlen[idx],
-			    M_DONTWAIT);
+			    M_NOWAIT);
 		}
 		if (n == NULL)
 			goto fail;
@@ -2117,9 +2117,9 @@ key_spddelete2(so, m, mhp)
 
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
-	MGETHDR(n, M_DONTWAIT, MT_DATA);
+	MGETHDR(n, M_NOWAIT, MT_DATA);
 	if (n && len > MHLEN) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, M_NOWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -2141,7 +2141,7 @@ key_spddelete2(so, m, mhp)
 #endif
 
 	n->m_next = m_copym(m, mhp->extoff[SADB_X_EXT_POLICY],
-	    mhp->extlen[SADB_X_EXT_POLICY], M_DONTWAIT);
+	    mhp->extlen[SADB_X_EXT_POLICY], M_NOWAIT);
 	if (!n->m_next) {
 		m_freem(n);
 		return key_senderror(so, m, ENOBUFS);
@@ -3488,7 +3488,7 @@ key_setdumpsa(sav, type, satype, seq, pid)
 		if ((!m && !p) || (m && p))
 			goto fail;
 		if (p && tres) {
-			M_PREPEND(tres, l, M_DONTWAIT);
+			M_PREPEND(tres, l, M_NOWAIT);
 			if (!tres)
 				goto fail;
 			bcopy(p, mtod(tres, caddr_t), l);
@@ -3547,9 +3547,9 @@ key_setsadbmsg(type, tlen, satype, seq, pid, reserved)
 	len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
 	if (len > MCLBYTES)
 		return NULL;
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m && len > MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_freem(m);
 			m = NULL;
@@ -4681,9 +4681,9 @@ key_getspi(so, m, mhp)
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
 
-	MGETHDR(n, M_DONTWAIT, MT_DATA);
+	MGETHDR(n, M_NOWAIT, MT_DATA);
 	if (len > MHLEN) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, M_NOWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -5572,7 +5572,7 @@ key_getcomb_esp()
 			if (l > MLEN)
 				panic("assumption failed in key_getcomb_esp");
 #endif
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
@@ -5656,14 +5656,14 @@ key_getcomb_ah()
 			if (l > MLEN)
 				panic("assumption failed in key_getcomb_ah");
 #endif
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, M_DONTWAIT);
+			M_PREPEND(m, l, M_NOWAIT);
 		if (!m)
 			return NULL;
 
@@ -5702,14 +5702,14 @@ key_getcomb_ipcomp()
 			if (l > MLEN)
 				panic("assumption failed in key_getcomb_ipcomp");
 #endif
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, M_DONTWAIT);
+			M_PREPEND(m, l, M_NOWAIT);
 		if (!m)
 			return NULL;
 
@@ -5755,7 +5755,7 @@ key_getprop(saidx)
 
 	if (!m)
 		return NULL;
-	M_PREPEND(m, l, M_DONTWAIT);
+	M_PREPEND(m, l, M_NOWAIT);
 	if (!m)
 		return NULL;
 
@@ -6272,9 +6272,9 @@ key_register(so, m, mhp)
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
 
-	MGETHDR(n, M_DONTWAIT, MT_DATA);
+	MGETHDR(n, M_NOWAIT, MT_DATA);
 	if (len > MHLEN) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, M_NOWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -6846,9 +6846,9 @@ key_parse(m, so)
 	if (m->m_next) {
 		struct mbuf *n;
 
-		MGETHDR(n, M_DONTWAIT, MT_DATA);
+		MGETHDR(n, M_NOWAIT, MT_DATA);
 		if (n && m->m_pkthdr.len > MHLEN) {
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, M_NOWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				n = NULL;
@@ -7473,9 +7473,9 @@ key_alloc_mbuf(l)
 
 	len = l;
 	while (len > 0) {
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (n && len > MLEN)
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, M_NOWAIT);
 		if (!n) {
 			m_freem(m);
 			return NULL;
diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c
index dbc48a85e111..13394ac24b06 100644
--- a/sys/netkey/keysock.c
+++ b/sys/netkey/keysock.c
@@ -148,7 +148,7 @@ key_sendup0(rp, m, promisc)
 	if (promisc) {
 		struct sadb_msg *pmsg;
 
-		M_PREPEND(m, sizeof(struct sadb_msg), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct sadb_msg), M_NOWAIT);
 		if (m && m->m_len < sizeof(struct sadb_msg))
 			m = m_pullup(m, sizeof(struct sadb_msg));
 		if (!m) {
@@ -219,10 +219,10 @@ key_sendup(so, msg, len, target)
 	m = mprev = NULL;
 	while (tlen > 0) {
 		if (tlen == len) {
-			MGETHDR(n, M_DONTWAIT, MT_DATA);
+			MGETHDR(n, M_NOWAIT, MT_DATA);
 			n->m_len = MHLEN;
 		} else {
-			MGET(n, M_DONTWAIT, MT_DATA);
+			MGET(n, M_NOWAIT, MT_DATA);
 			n->m_len = MLEN;
 		}
 		if (!n) {
@@ -230,7 +230,7 @@ key_sendup(so, msg, len, target)
 			return ENOBUFS;
 		}
 		if (tlen >= MCLBYTES) {	/*XXX better threshold? */
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, M_NOWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				m_freem(m);
@@ -398,7 +398,7 @@ key_attach(struct socket *so, int proto, struct thread *td)
 
 	if (sotorawcb(so) != 0)
 		return EISCONN;	/* XXX panic? */
-	kp = (struct keycb *)malloc(sizeof *kp, M_PCB, M_WAITOK); /* XXX */
+	kp = (struct keycb *)malloc(sizeof *kp, M_PCB, 0); /* XXX */
 	if (kp == 0)
 		return ENOBUFS;
 	bzero(kp, sizeof *kp);
diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c
index e0535b6d5fbf..24b65edee46c 100644
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@@ -109,7 +109,7 @@ natm_usr_attach(struct socket *so, int proto, d_thread_t *p)
           goto out;
     }
 
-    so->so_pcb = (caddr_t) (npcb = npcb_alloc(M_WAITOK));
+    so->so_pcb = (caddr_t) (npcb = npcb_alloc(0));
     npcb->npcb_socket = so;
  out:
     splx(s);
@@ -300,7 +300,7 @@ natm_usr_send(struct socket *so, int flags, struct mbuf *m,
      * send the data.   we must put an atm_pseudohdr on first
      */
 
-    M_PREPEND(m, sizeof(*aph), M_TRYWAIT);
+    M_PREPEND(m, sizeof(*aph), 0);
     if (m == NULL) {
         error = ENOBUFS;
 	goto out;
@@ -469,7 +469,7 @@ struct proc *p;
           break;
       }
 
-      so->so_pcb = (caddr_t) (npcb = npcb_alloc(M_WAITOK));
+      so->so_pcb = (caddr_t) (npcb = npcb_alloc(0));
       npcb->npcb_socket = so;
 
       break;
@@ -599,7 +599,7 @@ struct proc *p;
        * send the data.   we must put an atm_pseudohdr on first
        */
 
-      M_PREPEND(m, sizeof(*aph), M_TRYWAIT);
+      M_PREPEND(m, sizeof(*aph), 0);
       if (m == NULL) {
         error = ENOBUFS;
 	break;
diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c
index 7016e33ec2bf..9fee1b0f2bfb 100644
--- a/sys/netnatm/natm_pcb.c
+++ b/sys/netnatm/natm_pcb.c
@@ -66,7 +66,7 @@ int wait;
   MALLOC(npcb, struct natmpcb *, sizeof(*npcb), M_PCB, wait | M_ZERO);
 
 #ifdef DIAGNOSTIC
-  if (wait == M_WAITOK && npcb == NULL) panic("npcb_alloc: malloc didn't wait");
+  if (wait == 0 && npcb == NULL) panic("npcb_alloc: malloc didn't wait");
 #endif
 
   if (npcb)
diff --git a/sys/netncp/ncp_conn.c b/sys/netncp/ncp_conn.c
index 14b8d7b2d5bc..a3dbec376392 100644
--- a/sys/netncp/ncp_conn.c
+++ b/sys/netncp/ncp_conn.c
@@ -233,7 +233,7 @@ ncp_conn_alloc(struct ncp_conn_args *cap, struct proc *p, struct ucred *cred,
 	} else
 		owner = crhold(cred);
 	MALLOC(ncp, struct ncp_conn *, sizeof(struct ncp_conn), 
-	    M_NCPDATA, M_WAITOK | M_ZERO);
+	    M_NCPDATA, M_ZERO);
 	error = 0;
 	lockinit(&ncp->nc_lock, PZERO, "ncplck", 0, 0);
 	ncp_conn_cnt++;
@@ -522,7 +522,7 @@ ncp_conn_gethandle(struct ncp_conn *conn, struct proc *p, struct ncp_handle **ha
 		return 0;
 	}
 	MALLOC(refp,struct ncp_handle *,sizeof(struct ncp_handle),M_NCPDATA,
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 	SLIST_INSERT_HEAD(&lhlist,refp,nh_next);
 	refp->nh_ref++;
 	refp->nh_proc = p;
diff --git a/sys/netncp/ncp_rq.c b/sys/netncp/ncp_rq.c
index ea707318862b..80d2fd0ca69c 100644
--- a/sys/netncp/ncp_rq.c
+++ b/sys/netncp/ncp_rq.c
@@ -63,7 +63,7 @@ ncp_rq_alloc_any(u_int32_t ptype, u_int8_t fn, struct ncp_conn *ncp,
 	struct ncp_rq *rqp;
 	int error;
 
-	MALLOC(rqp, struct ncp_rq *, sizeof(*rqp), M_NCPRQ, M_WAITOK);
+	MALLOC(rqp, struct ncp_rq *, sizeof(*rqp), M_NCPRQ, 0);
 	error = ncp_rq_init_any(rqp, ptype, fn, ncp, p, cred);
 	rqp->nr_flags |= NCPR_ALLOCED;
 	if (error) {
diff --git a/sys/netncp/ncp_sock.c b/sys/netncp/ncp_sock.c
index 4a03565b953c..d9351e5fe169 100644
--- a/sys/netncp/ncp_sock.c
+++ b/sys/netncp/ncp_sock.c
@@ -163,7 +163,7 @@ ncp_sock_send(struct socket *so, struct mbuf *top, struct ncp_rq *rqp)
 	int sendwait;
 
 	for(;;) {
-		m = m_copym(top, 0, M_COPYALL, M_TRYWAIT);
+		m = m_copym(top, 0, M_COPYALL, 0);
 /*		NCPDDEBUG(m);*/
 		error = so->so_proto->pr_usrreqs->pru_sosend(so, to, 0, m, 0, flags, p);
 		if (error == 0 || error == EINTR || error == ENETDOWN)
diff --git a/sys/netncp/ncp_subr.c b/sys/netncp/ncp_subr.c
index a55e53501e13..4f7e5f07fdff 100644
--- a/sys/netncp/ncp_subr.c
+++ b/sys/netncp/ncp_subr.c
@@ -69,7 +69,7 @@ ncp_str_dup(char *s) {
 		len++;
 		if (bt == 0) break;
 	}
-	MALLOC(p, char*, len, M_NCPDATA, M_WAITOK);
+	MALLOC(p, char*, len, M_NCPDATA, 0);
 	copyin(s, p, len);
 	return p;
 }
diff --git a/sys/netns/idp_usrreq.c b/sys/netns/idp_usrreq.c
index 2642d1a0b407..be9dd5c91a86 100644
--- a/sys/netns/idp_usrreq.c
+++ b/sys/netns/idp_usrreq.c
@@ -160,7 +160,7 @@ idp_output(nsp, m0)
 			(m->m_len + m->m_data < &m->m_dat[MLEN])) {
 			m->m_len++;
 		} else {
-			struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
+			struct mbuf *m1 = m_get(M_NOWAIT, MT_DATA);
 
 			if (m1 == 0) {
 				m_freem(m0);
@@ -181,7 +181,7 @@ idp_output(nsp, m0)
 	if (nsp->nsp_flags & NSP_RAWOUT) {
 		idp = mtod(m, struct idp *);
 	} else {
-		M_PREPEND(m, sizeof (struct idp), M_DONTWAIT);
+		M_PREPEND(m, sizeof (struct idp), M_NOWAIT);
 		if (m == 0)
 			return (ENOBUFS);
 		idp = mtod(m, struct idp *);
@@ -273,7 +273,7 @@ idp_ctloutput(req, so, level, name, value)
 	case PRCO_GETOPT:
 		if (value==NULL)
 			return (EINVAL);
-		m = m_get(M_DONTWAIT, MT_DATA);
+		m = m_get(M_NOWAIT, MT_DATA);
 		if (m==NULL)
 			return (ENOBUFS);
 		switch (name) {
diff --git a/sys/netns/ns.c b/sys/netns/ns.c
index 7af5acf12ac9..40a8b0c04df5 100644
--- a/sys/netns/ns.c
+++ b/sys/netns/ns.c
@@ -128,7 +128,7 @@ ns_control(so, cmd, data, ifp)
 	case SIOCSIFDSTADDR:
 		if (ia == (struct ns_ifaddr *)0) {
 			oia = (struct ns_ifaddr *)
-				malloc(sizeof *ia, M_IFADDR, M_WAITOK);
+				malloc(sizeof *ia, M_IFADDR, 0);
 			if (oia == (struct ns_ifaddr *)NULL)
 				return (ENOBUFS);
 			bzero((caddr_t)oia, sizeof(*oia));
diff --git a/sys/netns/ns_error.c b/sys/netns/ns_error.c
index fc4db94bd69e..769edf864a34 100644
--- a/sys/netns/ns_error.c
+++ b/sys/netns/ns_error.c
@@ -135,7 +135,7 @@ ns_error(om, type, param)
 	/*
 	 * First, formulate ns_err message
 	 */
-	m = m_gethdr(M_DONTWAIT, MT_HEADER);
+	m = m_gethdr(M_NOWAIT, MT_HEADER);
 	if (m == NULL)
 		goto freeit;
 	m->m_len = sizeof(*ep);
diff --git a/sys/netns/ns_input.c b/sys/netns/ns_input.c
index 22abe026347d..033eae6fb46a 100644
--- a/sys/netns/ns_input.c
+++ b/sys/netns/ns_input.c
@@ -470,7 +470,7 @@ struct ifnet *ifp;
 		if (m0) {
 			register struct idp *idp;
 
-			M_PREPEND(m0, sizeof (*idp), M_DONTWAIT);
+			M_PREPEND(m0, sizeof (*idp), M_NOWAIT);
 			if (m0 == NULL)
 				continue;
 			idp = mtod(m0, struct idp *);
diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c
index 55d1a9f88b3c..b566196b1704 100644
--- a/sys/netns/ns_ip.c
+++ b/sys/netns/ns_ip.c
@@ -168,7 +168,7 @@ idpip_input(m, ifp)
 		if (nsip_lastin) {
 			m_freem(nsip_lastin);
 		}
-		nsip_lastin = m_copym(m, 0, (int)M_COPYALL, M_DONTWAIT);
+		nsip_lastin = m_copym(m, 0, (int)M_COPYALL, M_NOWAIT);
 	}
 	/*
 	 * Get IP and IDP header together in first mbuf.
@@ -251,7 +251,7 @@ nsipoutput(ifn, m, dst)
 	/* following clause not necessary on vax */
 	if (3 & (int)m->m_data) {
 		/* force longword alignment of ip hdr */
-		struct mbuf *m0 = m_gethdr(MT_HEADER, M_DONTWAIT);
+		struct mbuf *m0 = m_gethdr(MT_HEADER, M_NOWAIT);
 		if (m0 == 0) {
 			m_freem(m);
 			return (ENOBUFS);
@@ -263,7 +263,7 @@ nsipoutput(ifn, m, dst)
 		m0->m_pkthdr.len = m0->m_len + m->m_len;
 		m->m_flags &= ~M_PKTHDR;
 	} else {
-		M_PREPEND(m, sizeof (struct ip), M_DONTWAIT);
+		M_PREPEND(m, sizeof (struct ip), M_NOWAIT);
 		if (m == 0)
 			return (ENOBUFS);
 	}
diff --git a/sys/netns/ns_pcb.c b/sys/netns/ns_pcb.c
index 01301c087827..bcccc3a2db3a 100644
--- a/sys/netns/ns_pcb.c
+++ b/sys/netns/ns_pcb.c
@@ -58,7 +58,7 @@ ns_pcballoc(so, head)
 	struct mbuf *m;
 	register struct nspcb *nsp;
 
-	m = m_getclr(M_DONTWAIT, MT_PCB);
+	m = m_getclr(M_NOWAIT, MT_PCB);
 	if (m == NULL)
 		return (ENOBUFS);
 	nsp = mtod(m, struct nspcb *);
diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c
index c9428842b101..2191d1ab1087 100644
--- a/sys/netns/spp_usrreq.c
+++ b/sys/netns/spp_usrreq.c
@@ -161,7 +161,7 @@ spp_input(m, nsp)
 			spp_istat.gonawy++;
 			goto dropwithreset;
 		}
-		am = m_get(M_DONTWAIT, MT_SONAME);
+		am = m_get(M_NOWAIT, MT_SONAME);
 		if (am == NULL)
 			goto drop;
 		am->m_len = sizeof (struct sockaddr_ns);
@@ -528,7 +528,7 @@ present:
 				spp_newchecks[4]++;
 				if (dt != cb->s_rhdr.sp_dt) {
 					struct mbuf *mm =
-					   m_getclr(M_DONTWAIT, MT_CONTROL);
+					   m_getclr(M_NOWAIT, MT_CONTROL);
 					spp_newchecks[0]++;
 					if (mm != NULL) {
 						u_short *s =
@@ -742,7 +742,7 @@ spp_output(cb, m0)
 					 * from usrreq(), so it is OK to
 					 * block.
 					 */
-					m = m_copym(m0, 0, mtu, M_TRYWAIT);
+					m = m_copym(m0, 0, mtu, 0);
 					if (cb->s_flags & SF_NEWCALL) {
 					    struct mbuf *mm = m;
 					    spp_newchecks[7]++;
@@ -772,7 +772,7 @@ spp_output(cb, m0)
 			if (M_TRAILINGSPACE(m) >= 1)
 				m->m_len++;
 			else {
-				struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
+				struct mbuf *m1 = m_get(M_NOWAIT, MT_DATA);
 
 				if (m1 == 0) {
 					m_freem(m0);
@@ -783,7 +783,7 @@ spp_output(cb, m0)
 				m->m_next = m1;
 			}
 		}
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(M_NOWAIT, MT_HEADER);
 		if (m == 0) {
 			m_freem(m0);
 			return (ENOBUFS);
@@ -996,7 +996,7 @@ send:
 			sppstat.spps_sndprobe++;
 		if (cb->s_flags & SF_ACKNOW)
 			sppstat.spps_sndacks++;
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(M_NOWAIT, MT_HEADER);
 		if (m == 0)
 			return (ENOBUFS);
 		/*
@@ -1156,7 +1156,7 @@ spp_ctloutput(req, so, level, name, value)
 	case PRCO_GETOPT:
 		if (value == NULL)
 			return (EINVAL);
-		m = m_get(M_DONTWAIT, MT_DATA);
+		m = m_get(M_NOWAIT, MT_DATA);
 		if (m == NULL)
 			return (ENOBUFS);
 		switch (name) {
@@ -1296,7 +1296,7 @@ spp_usrreq(so, req, m, nam, controlp)
 		}
 		nsp = sotonspcb(so);
 
-		mm = m_getclr(M_DONTWAIT, MT_PCB);
+		mm = m_getclr(M_NOWAIT, MT_PCB);
 		sb = &so->so_snd;
 
 		if (mm == NULL) {
@@ -1304,7 +1304,7 @@ spp_usrreq(so, req, m, nam, controlp)
 			break;
 		}
 		cb = mtod(mm, struct sppcb *);
-		mm = m_getclr(M_DONTWAIT, MT_HEADER);
+		mm = m_getclr(M_NOWAIT, MT_HEADER);
 		if (mm == NULL) {
 			(void) m_free(dtom(m));
 			error = ENOBUFS;
diff --git a/sys/netsmb/smb_conn.c b/sys/netsmb/smb_conn.c
index 9c52571ed352..2a1e913595e1 100644
--- a/sys/netsmb/smb_conn.c
+++ b/sys/netsmb/smb_conn.c
@@ -393,7 +393,7 @@ smb_vc_create(struct smb_vcspec *vcspec,
 	if (gid != SMBM_ANY_GROUP && !groupmember(gid, cred) && !isroot)
 		return EPERM;
 
-	vcp = smb_zmalloc(sizeof(*vcp), M_SMBCONN, M_WAITOK);
+	vcp = smb_zmalloc(sizeof(*vcp), M_SMBCONN, 0);
 	smb_co_init(VCTOCP(vcp), SMBL_VC, "smb_vc", td);
 	vcp->obj.co_free = smb_vc_free;
 	vcp->obj.co_gone = smb_vc_gone;
@@ -690,7 +690,7 @@ smb_share_create(struct smb_vc *vcp, struct smb_sharespec *shspec,
 		uid = realuid;
 	if (gid == SMBM_ANY_GROUP)
 		gid = cred->cr_groups[0];
-	ssp = smb_zmalloc(sizeof(*ssp), M_SMBCONN, M_WAITOK);
+	ssp = smb_zmalloc(sizeof(*ssp), M_SMBCONN, 0);
 	smb_co_init(SSTOCP(ssp), SMBL_SHARE, "smbss", td);
 	ssp->obj.co_free = smb_share_free;
 	ssp->obj.co_gone = smb_share_gone;
diff --git a/sys/netsmb/smb_crypt.c b/sys/netsmb/smb_crypt.c
index 8e35207eb64f..a6369324d794 100644
--- a/sys/netsmb/smb_crypt.c
+++ b/sys/netsmb/smb_crypt.c
@@ -73,7 +73,7 @@ smb_E(const u_char *key, u_char *data, u_char *dest)
 	kk[5] = key[4] << 3 | (key[5] >> 5 & 0xfe);
 	kk[6] = key[5] << 2 | (key[6] >> 6 & 0xfe);
 	kk[7] = key[6] << 1;
-	ksp = malloc(sizeof(des_key_schedule), M_SMBTEMP, M_WAITOK);
+	ksp = malloc(sizeof(des_key_schedule), M_SMBTEMP, 0);
 	des_set_key((des_cblock *)kk, *ksp);
 	des_ecb_encrypt((des_cblock *)data, (des_cblock *)dest, *ksp, 1);
 	free(ksp, M_SMBTEMP);
@@ -87,7 +87,7 @@ smb_encrypt(const u_char *apwd, u_char *C8, u_char *RN)
 #ifdef NETSMBCRYPTO
 	u_char *p, *P14, *S21;
 
-	p = malloc(14 + 21, M_SMBTEMP, M_WAITOK);
+	p = malloc(14 + 21, M_SMBTEMP, 0);
 	bzero(p, 14 + 21);
 	P14 = p;
 	S21 = p + 14;
@@ -120,12 +120,12 @@ smb_ntencrypt(const u_char *apwd, u_char *C8, u_char *RN)
 	int len;
 
 	len = strlen(apwd);
-	unipwd = malloc((len + 1) * sizeof(u_int16_t), M_SMBTEMP, M_WAITOK);
+	unipwd = malloc((len + 1) * sizeof(u_int16_t), M_SMBTEMP, 0);
 	/*
 	 * S21 = concat(MD4(U(apwd)), zeros(5));
 	 */
 	smb_strtouni(unipwd, apwd);
-	ctxp = malloc(sizeof(MD4_CTX), M_SMBTEMP, M_WAITOK);
+	ctxp = malloc(sizeof(MD4_CTX), M_SMBTEMP, 0);
 	MD4Init(ctxp);
 	MD4Update(ctxp, (u_char*)unipwd, len * sizeof(u_int16_t));
 	free(unipwd, M_SMBTEMP);
diff --git a/sys/netsmb/smb_dev.c b/sys/netsmb/smb_dev.c
index 3f22b163e847..12abf0a2cf89 100644
--- a/sys/netsmb/smb_dev.c
+++ b/sys/netsmb/smb_dev.c
@@ -131,7 +131,7 @@ nsmb_dev_open(dev_t dev, int oflags, int devtype, struct thread *td)
 	if (sdp && (sdp->sd_flags & NSMBFL_OPEN))
 		return EBUSY;
 	if (sdp == NULL) {
-		sdp = malloc(sizeof(*sdp), M_NSMBDEV, M_WAITOK);
+		sdp = malloc(sizeof(*sdp), M_NSMBDEV, 0);
 		dev->si_drv1 = (void*)sdp;
 	}
 	/*
diff --git a/sys/netsmb/smb_iod.c b/sys/netsmb/smb_iod.c
index 5ae5f146e62b..12c900015c76 100644
--- a/sys/netsmb/smb_iod.c
+++ b/sys/netsmb/smb_iod.c
@@ -248,7 +248,7 @@ smb_iod_sendrq(struct smbiod *iod, struct smb_rq *rqp)
 	}
 	SMBSDEBUG("M:%04x, P:%04x, U:%04x, T:%04x\n", rqp->sr_mid, 0, 0, 0);
 	m_dumpm(rqp->sr_rq.mb_top);
-	m = m_copym(rqp->sr_rq.mb_top, 0, M_COPYALL, M_TRYWAIT);
+	m = m_copym(rqp->sr_rq.mb_top, 0, M_COPYALL, 0);
 	error = rqp->sr_lerror = m ? SMB_TRAN_SEND(vcp, m, td) : ENOBUFS;
 	if (error == 0) {
 		getnanotime(&rqp->sr_timesent);
@@ -371,7 +371,7 @@ smb_iod_request(struct smbiod *iod, int event, void *ident)
 	int error;
 
 	SMBIODEBUG("\n");
-	evp = smb_zmalloc(sizeof(*evp), M_SMBIOD, M_WAITOK);
+	evp = smb_zmalloc(sizeof(*evp), M_SMBIOD, 0);
 	evp->ev_type = event;
 	evp->ev_ident = ident;
 	SMB_IOD_EVLOCK(iod);
@@ -663,7 +663,7 @@ smb_iod_create(struct smb_vc *vcp)
 	struct smbiod *iod;
 	int error;
 
-	iod = smb_zmalloc(sizeof(*iod), M_SMBIOD, M_WAITOK);
+	iod = smb_zmalloc(sizeof(*iod), M_SMBIOD, 0);
 	iod->iod_id = smb_iod_next++;
 	iod->iod_state = SMBIOD_ST_NOTCONN;
 	iod->iod_vc = vcp;
diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c
index 5e0c7a86d4f2..9fd14a6d5ad3 100644
--- a/sys/netsmb/smb_rq.c
+++ b/sys/netsmb/smb_rq.c
@@ -67,7 +67,7 @@ smb_rq_alloc(struct smb_connobj *layer, u_char cmd, struct smb_cred *scred,
 	struct smb_rq *rqp;
 	int error;
 
-	MALLOC(rqp, struct smb_rq *, sizeof(*rqp), M_SMBRQ, M_WAITOK);
+	MALLOC(rqp, struct smb_rq *, sizeof(*rqp), M_SMBRQ, 0);
 	if (rqp == NULL)
 		return ENOMEM;
 	error = smb_rq_init(rqp, layer, cmd, scred);
@@ -368,7 +368,7 @@ smb_t2_alloc(struct smb_connobj *layer, u_short setup, struct smb_cred *scred,
 	struct smb_t2rq *t2p;
 	int error;
 
-	MALLOC(t2p, struct smb_t2rq *, sizeof(*t2p), M_SMBRQ, M_WAITOK);
+	MALLOC(t2p, struct smb_t2rq *, sizeof(*t2p), M_SMBRQ, 0);
 	if (t2p == NULL)
 		return ENOMEM;
 	error = smb_t2_init(t2p, layer, setup, scred);
@@ -418,7 +418,7 @@ smb_t2_placedata(struct mbuf *mtop, u_int16_t offset, u_int16_t count,
 	struct mbuf *m, *m0;
 	int len;
 
-	m0 = m_split(mtop, offset, M_TRYWAIT);
+	m0 = m_split(mtop, offset, 0);
 	if (m0 == NULL)
 		return EBADRPC;
 	len = m_length(m0, &m);
diff --git a/sys/netsmb/smb_smb.c b/sys/netsmb/smb_smb.c
index b5e7c2251989..6a24de6e78c3 100644
--- a/sys/netsmb/smb_smb.c
+++ b/sys/netsmb/smb_smb.c
@@ -280,8 +280,8 @@ again:
 	error = smb_rq_alloc(VCTOCP(vcp), SMB_COM_SESSION_SETUP_ANDX, scred, &rqp);
 	if (error)
 		return error;
-	pbuf = malloc(SMB_MAXPASSWORDLEN + 1, M_SMBTEMP, M_WAITOK);
-	encpass = malloc(24, M_SMBTEMP, M_WAITOK);
+	pbuf = malloc(SMB_MAXPASSWORDLEN + 1, M_SMBTEMP, 0);
+	encpass = malloc(24, M_SMBTEMP, 0);
 	if (vcp->vc_sopt.sv_sm & SMB_SM_USER) {
 		/*
 		 * We try w/o uppercasing first so Samba mixed case
@@ -302,7 +302,7 @@ again:
 		if (vcp->vc_sopt.sv_sm & SMB_SM_ENCRYPT) {
 			uniplen = plen = 24;
 			smb_encrypt(pbuf, vcp->vc_ch, encpass);
-			ntencpass = malloc(uniplen, M_SMBTEMP, M_WAITOK);
+			ntencpass = malloc(uniplen, M_SMBTEMP, 0);
 			if (SMB_UNICODE_STRINGS(vcp)) {
 				strncpy(pbuf, smb_vc_getpass(vcp),
 					SMB_MAXPASSWORDLEN);
@@ -318,7 +318,7 @@ again:
 			plen = strlen(pbuf) + 1;
 			pp = pbuf;
 			uniplen = plen * 2;
-			ntencpass = malloc(uniplen, M_SMBTEMP, M_WAITOK);
+			ntencpass = malloc(uniplen, M_SMBTEMP, 0);
 			smb_strtouni(ntencpass, smb_vc_getpass(vcp));
 			plen--;
 
@@ -500,8 +500,8 @@ again:
 		pbuf = NULL;
 		encpass = NULL;
 	} else {
-		pbuf = malloc(SMB_MAXPASSWORDLEN + 1, M_SMBTEMP, M_WAITOK);
-		encpass = malloc(24, M_SMBTEMP, M_WAITOK);
+		pbuf = malloc(SMB_MAXPASSWORDLEN + 1, M_SMBTEMP, 0);
+		encpass = malloc(24, M_SMBTEMP, 0);
 		/*
 		 * We try w/o uppercasing first so Samba mixed case
 		 * passwords work.  If that fails we come back and try
diff --git a/sys/netsmb/smb_subr.c b/sys/netsmb/smb_subr.c
index fe10a5cbcc62..3ecfd8f406a3 100644
--- a/sys/netsmb/smb_subr.c
+++ b/sys/netsmb/smb_subr.c
@@ -90,7 +90,7 @@ smb_strdup(const char *s)
 	int len;
 
 	len = s ? strlen(s) + 1 : 1;
-	p = malloc(len, M_SMBSTR, M_WAITOK);
+	p = malloc(len, M_SMBSTR, 0);
 	if (s)
 		bcopy(s, p, len);
 	else
@@ -116,7 +116,7 @@ smb_strdupin(char *s, int maxlen)
 		if (bt == 0)
 			break;
 	}
-	p = malloc(len, M_SMBSTR, M_WAITOK);
+	p = malloc(len, M_SMBSTR, 0);
 	copyin(s, p, len);
 	return p;
 }
@@ -131,7 +131,7 @@ smb_memdupin(void *umem, int len)
 
 	if (len > 8 * 1024)
 		return NULL;
-	p = malloc(len, M_SMBSTR, M_WAITOK);
+	p = malloc(len, M_SMBSTR, 0);
 	if (copyin(umem, p, len) == 0)
 		return p;
 	free(p, M_SMBSTR);
@@ -148,7 +148,7 @@ smb_memdup(const void *umem, int len)
 
 	if (len > 8 * 1024)
 		return NULL;
-	p = malloc(len, M_SMBSTR, M_WAITOK);
+	p = malloc(len, M_SMBSTR, 0);
 	if (p == NULL)
 		return NULL;
 	bcopy(umem, p, len);
diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c
index cf0adcbb3e99..b631a52fa9d7 100644
--- a/sys/netsmb/smb_trantcp.c
+++ b/sys/netsmb/smb_trantcp.c
@@ -514,7 +514,7 @@ smb_nbst_create(struct smb_vc *vcp, struct thread *td)
 {
 	struct nbpcb *nbp;
 
-	MALLOC(nbp, struct nbpcb *, sizeof *nbp, M_NBDATA, M_WAITOK);
+	MALLOC(nbp, struct nbpcb *, sizeof *nbp, M_NBDATA, 0);
 	bzero(nbp, sizeof *nbp);
 	nbp->nbp_timo.tv_sec = 15;	/* XXX: sysctl ? */
 	nbp->nbp_state = NBST_CLOSED;
@@ -648,7 +648,7 @@ smb_nbst_send(struct smb_vc *vcp, struct mbuf *m0, struct thread *td)
 		error = ENOTCONN;
 		goto abort;
 	}
-	M_PREPEND(m0, 4, M_TRYWAIT);
+	M_PREPEND(m0, 4, 0);
 	if (m0 == NULL)
 		return ENOBUFS;
 	nb_sethdr(m0, NB_SSN_MESSAGE, m_fixhdr(m0) - 4);
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index b99c3b0fc388..f2a26d90f776 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -191,7 +191,7 @@ nfsm_disct(struct mbuf **mdp, caddr_t *dposp, int siz, int left)
 	} else if (siz > MHLEN) {
 		panic("nfs S too big");
 	} else {
-		MGET(mp2, M_TRYWAIT, MT_DATA);
+		MGET(mp2, 0, MT_DATA);
 		mp2->m_next = mp->m_next;
 		mp->m_next = mp2;
 		mp->m_len -= left;
@@ -254,7 +254,7 @@ nfsm_build_xx(int s, struct mbuf **mb, caddr_t *bpos)
 	void *ret;
 
 	if (s > M_TRAILINGSPACE(*mb)) {
-		MGET(mb2, M_TRYWAIT, MT_DATA);
+		MGET(mb2, 0, MT_DATA);
 		if (s > MLEN)
 			panic("build > MLEN");
 		(*mb)->m_next = mb2;
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c
index bfa419ee398c..8bd86b2606a7 100644
--- a/sys/nfsclient/bootp_subr.c
+++ b/sys/nfsclient/bootp_subr.c
@@ -433,7 +433,7 @@ allocifctx(struct bootpc_globalcontext *gctx)
 {
 	struct bootpc_ifcontext *ifctx;
 	ifctx = (struct bootpc_ifcontext *) malloc(sizeof(*ifctx),
-						   M_TEMP, M_WAITOK);
+						   M_TEMP, 0);
 	if (ifctx == NULL)
 		panic("Failed to allocate bootp interface context structure");
 
@@ -1675,7 +1675,7 @@ bootpc_init(void)
 	if (nfs_diskless_valid != 0)
 		return;
 
-	gctx = malloc(sizeof(*gctx), M_TEMP, M_WAITOK);
+	gctx = malloc(sizeof(*gctx), M_TEMP, 0);
 	if (gctx == NULL)
 		panic("Failed to allocate bootp global context structure");
 
@@ -1942,7 +1942,7 @@ md_lookup_swap(struct sockaddr_in *mdsin, char *path, u_char *fhp, int *fhsizep,
 		u_int32_t v3[21];
 	} fattribs;
 
-	m = m_get(M_TRYWAIT, MT_DATA);
+	m = m_get(0, MT_DATA);
 	if (m == NULL)
 	  	return ENOBUFS;
 
diff --git a/sys/nfsclient/krpc_subr.c b/sys/nfsclient/krpc_subr.c
index 4690104797fe..e470aebc1747 100644
--- a/sys/nfsclient/krpc_subr.c
+++ b/sys/nfsclient/krpc_subr.c
@@ -149,7 +149,7 @@ krpc_portmap(struct sockaddr_in *sin, u_int prog, u_int vers, u_int16_t *portp,
 		return 0;
 	}
 
-	m = m_get(M_TRYWAIT, MT_DATA);
+	m = m_get(0, MT_DATA);
 	if (m == NULL)
 		return ENOBUFS;
 	sdata = mtod(m, struct sdata *);
@@ -271,7 +271,7 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func,
 	/*
 	 * Prepend RPC message header.
 	 */
-	mhead = m_gethdr(M_TRYWAIT, MT_DATA);
+	mhead = m_gethdr(0, MT_DATA);
 	mhead->m_next = *data;
 	call = mtod(mhead, struct rpc_call *);
 	mhead->m_len = sizeof(*call);
@@ -311,7 +311,7 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func,
 	timo = 0;
 	for (;;) {
 		/* Send RPC request (or re-send). */
-		m = m_copym(mhead, 0, M_COPYALL, M_TRYWAIT);
+		m = m_copym(mhead, 0, M_COPYALL, 0);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
@@ -465,9 +465,9 @@ xdr_string_encode(char *str, int len)
 	if (mlen > MCLBYTES)		/* If too big, we just can't do it. */
 		return (NULL);
 
-	m = m_get(M_TRYWAIT, MT_DATA);
+	m = m_get(0, MT_DATA);
 	if (mlen > MLEN) {
-		MCLGET(m, M_TRYWAIT);
+		MCLGET(m, 0);
 		if ((m->m_flags & M_EXT) == 0) {
 			(void) m_free(m);	/* There can be only one. */
 			return (NULL);
diff --git a/sys/nfsclient/nfs_lock.c b/sys/nfsclient/nfs_lock.c
index 67f049abb5b0..1e098dbda4c0 100644
--- a/sys/nfsclient/nfs_lock.c
+++ b/sys/nfsclient/nfs_lock.c
@@ -114,7 +114,7 @@ nfs_dolock(struct vop_advlock_args *ap)
 	 */
 	if (p->p_nlminfo == NULL) {
 		MALLOC(p->p_nlminfo, struct nlminfo *,
-			sizeof(struct nlminfo), M_LOCKF, M_WAITOK | M_ZERO);
+			sizeof(struct nlminfo), M_LOCKF, M_ZERO);
 		p->p_nlminfo->pid_start = p->p_stats->p_start;
 	}
 	msg.lm_msg_ident.pid_start = p->p_nlminfo->pid_start;
diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c
index 30f4aff3eea9..b5ee0bdae094 100644
--- a/sys/nfsclient/nfs_node.c
+++ b/sys/nfsclient/nfs_node.c
@@ -224,7 +224,7 @@ loop:
 	 * might cause a bogus v_data pointer to get dereferenced
 	 * elsewhere if zalloc should block.
 	 */
-	np = uma_zalloc(nfsnode_zone, M_WAITOK);
+	np = uma_zalloc(nfsnode_zone, 0);
 
 	error = getnewvnode("nfs", mntp, nfsv2_vnodeop_p, &nvp);
 	if (error) {
@@ -255,7 +255,7 @@ loop:
 	}
 	LIST_INSERT_HEAD(nhpp, np, n_hash);
 	if (fhsize > NFS_SMALLFH) {
-		MALLOC(np->n_fhp, nfsfh_t *, fhsize, M_NFSBIGFH, M_WAITOK);
+		MALLOC(np->n_fhp, nfsfh_t *, fhsize, M_NFSBIGFH, 0);
 	} else
 		np->n_fhp = &np->n_fh;
 	bcopy((caddr_t)fhp, (caddr_t)np->n_fhp, fhsize);
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 15cf946e3370..cdf7cf1460d3 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -525,7 +525,7 @@ tryagain:
 			goto tryagain;
 		}
 		while (rep->r_flags & R_MUSTRESEND) {
-			m = m_copym(rep->r_mreq, 0, M_COPYALL, M_TRYWAIT);
+			m = m_copym(rep->r_mreq, 0, M_COPYALL, 0);
 			nfsstats.rpcretries++;
 			error = nfs_send(so, rep->r_nmp->nm_nam, m, rep);
 			if (error) {
@@ -864,7 +864,7 @@ nfs_request(struct vnode *vp, struct mbuf *mrest, int procnum,
 		return (ESTALE);
 	}
 	nmp = VFSTONFS(vp->v_mount);
-	MALLOC(rep, struct nfsreq *, sizeof(struct nfsreq), M_NFSREQ, M_WAITOK);
+	MALLOC(rep, struct nfsreq *, sizeof(struct nfsreq), M_NFSREQ, 0);
 	rep->r_nmp = nmp;
 	rep->r_vp = vp;
 	rep->r_td = td;
@@ -887,7 +887,7 @@ nfs_request(struct vnode *vp, struct mbuf *mrest, int procnum,
 	 * For stream protocols, insert a Sun RPC Record Mark.
 	 */
 	if (nmp->nm_sotype == SOCK_STREAM) {
-		M_PREPEND(m, NFSX_UNSIGNED, M_TRYWAIT);
+		M_PREPEND(m, NFSX_UNSIGNED, 0);
 		*mtod(m, u_int32_t *) = htonl(0x80000000 |
 			 (m->m_pkthdr.len - NFSX_UNSIGNED));
 	}
@@ -928,7 +928,7 @@ tryagain:
 		if (nmp->nm_soflags & PR_CONNREQUIRED)
 			error = nfs_sndlock(rep);
 		if (!error) {
-			m2 = m_copym(m, 0, M_COPYALL, M_TRYWAIT);
+			m2 = m_copym(m, 0, M_COPYALL, 0);
 			error = nfs_send(nmp->nm_so, nmp->nm_nam, m2, rep);
 			if (nmp->nm_soflags & PR_CONNREQUIRED)
 				nfs_sndunlock(rep);
@@ -1130,7 +1130,7 @@ nfs_timer(void *arg)
 		   ((nmp->nm_flag & NFSMNT_DUMBTIMR) ||
 		    (rep->r_flags & R_SENT) ||
 		    nmp->nm_sent < nmp->nm_cwnd) &&
-		   (m = m_copym(rep->r_mreq, 0, M_COPYALL, M_DONTWAIT))){
+		   (m = m_copym(rep->r_mreq, 0, M_COPYALL, M_NOWAIT))){
 			if ((nmp->nm_flag & NFSMNT_NOCONN) == 0)
 			    error = (*so->so_proto->pr_usrreqs->pru_send)
 				    (so, 0, m, NULL, NULL, td);
@@ -1377,9 +1377,9 @@ nfs_realign(struct mbuf **pm, int hsiz)
 	++nfs_realign_test;
 	while ((m = *pm) != NULL) {
 		if ((m->m_len & 0x3) || (mtod(m, intptr_t) & 0x3)) {
-			MGET(n, M_TRYWAIT, MT_DATA);
+			MGET(n, 0, MT_DATA);
 			if (m->m_len >= MINCLSIZE) {
-				MCLGET(n, M_TRYWAIT);
+				MCLGET(n, 0);
 			}
 			n->m_len = 0;
 			break;
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 2318a044892f..178cbbb38c81 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -142,9 +142,9 @@ nfsm_reqhead(struct vnode *vp, u_long procid, int hsiz)
 {
 	struct mbuf *mb;
 
-	MGET(mb, M_TRYWAIT, MT_DATA);
+	MGET(mb, 0, MT_DATA);
 	if (hsiz >= MINCLSIZE)
-		MCLGET(mb, M_TRYWAIT);
+		MCLGET(mb, 0);
 	mb->m_len = 0;
 	return (mb);
 }
@@ -168,9 +168,9 @@ nfsm_rpchead(struct ucred *cr, int nmflag, int procid, int auth_type,
 	int grpsiz, authsiz;
 
 	authsiz = nfsm_rndup(auth_len);
-	MGETHDR(mb, M_TRYWAIT, MT_DATA);
+	MGETHDR(mb, 0, MT_DATA);
 	if ((authsiz + 10 * NFSX_UNSIGNED) >= MINCLSIZE) {
-		MCLGET(mb, M_TRYWAIT);
+		MCLGET(mb, 0);
 	} else if ((authsiz + 10 * NFSX_UNSIGNED) < MHLEN) {
 		MH_ALIGN(mb, authsiz + 10 * NFSX_UNSIGNED);
 	} else {
@@ -271,9 +271,9 @@ nfsm_uiotombuf(struct uio *uiop, struct mbuf **mq, int siz, caddr_t *bpos)
 		while (left > 0) {
 			mlen = M_TRAILINGSPACE(mp);
 			if (mlen == 0) {
-				MGET(mp, M_TRYWAIT, MT_DATA);
+				MGET(mp, 0, MT_DATA);
 				if (clflg)
-					MCLGET(mp, M_TRYWAIT);
+					MCLGET(mp, 0);
 				mp->m_len = 0;
 				mp2->m_next = mp;
 				mp2 = mp;
@@ -304,7 +304,7 @@ nfsm_uiotombuf(struct uio *uiop, struct mbuf **mq, int siz, caddr_t *bpos)
 	}
 	if (rem > 0) {
 		if (rem > M_TRAILINGSPACE(mp)) {
-			MGET(mp, M_TRYWAIT, MT_DATA);
+			MGET(mp, 0, MT_DATA);
 			mp->m_len = 0;
 			mp2->m_next = mp;
 		}
@@ -349,9 +349,9 @@ nfsm_strtmbuf(struct mbuf **mb, char **bpos, const char *cp, long siz)
 	}
 	/* Loop around adding mbufs */
 	while (siz > 0) {
-		MGET(m1, M_TRYWAIT, MT_DATA);
+		MGET(m1, 0, MT_DATA);
 		if (siz > MLEN)
-			MCLGET(m1, M_TRYWAIT);
+			MCLGET(m1, 0);
 		m1->m_len = NFSMSIZ(m1);
 		m2->m_next = m1;
 		m2 = m1;
@@ -716,7 +716,7 @@ nfs_getcookie(struct nfsnode *np, off_t off, int add)
 	if (!dp) {
 		if (add) {
 			MALLOC(dp, struct nfsdmap *, sizeof (struct nfsdmap),
-				M_NFSDIROFF, M_WAITOK);
+				M_NFSDIROFF, 0);
 			dp->ndm_eocookie = 0;
 			LIST_INSERT_HEAD(&np->n_cookies, dp, ndm_list);
 		} else
@@ -731,7 +731,7 @@ nfs_getcookie(struct nfsnode *np, off_t off, int add)
 			dp = LIST_NEXT(dp, ndm_list);
 		} else if (add) {
 			MALLOC(dp2, struct nfsdmap *, sizeof (struct nfsdmap),
-				M_NFSDIROFF, M_WAITOK);
+				M_NFSDIROFF, 0);
 			dp2->ndm_eocookie = 0;
 			LIST_INSERT_AFTER(dp, dp2, ndm_list);
 			dp = dp2;
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index 51f6330c76a0..037dfc6a4ac2 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -808,7 +808,7 @@ mountnfs(struct nfs_args *argp, struct mount *mp, struct sockaddr *nam,
 		FREE(nam, M_SONAME);
 		return (0);
 	} else {
-		nmp = uma_zalloc(nfsmount_zone, M_WAITOK);
+		nmp = uma_zalloc(nfsmount_zone, 0);
 		bzero((caddr_t)nmp, sizeof (struct nfsmount));
 		TAILQ_INIT(&nmp->nm_bufq);
 		mp->mnt_data = (qaddr_t)nmp;
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 919f2a3394f2..f47d9da9435d 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -404,7 +404,7 @@ nfs_access(struct vop_access_args *ap)
 				error = nfs_readrpc(vp, &auio, ap->a_cred);
 			else if (vp->v_type == VDIR) {
 				char* bp;
-				bp = malloc(NFS_DIRBLKSIZ, M_TEMP, M_WAITOK);
+				bp = malloc(NFS_DIRBLKSIZ, M_TEMP, 0);
 				aiov.iov_base = bp;
 				aiov.iov_len = auio.uio_resid = NFS_DIRBLKSIZ;
 				error = nfs_readdirrpc(vp, &auio, ap->a_cred);
@@ -2370,7 +2370,7 @@ nfs_sillyrename(struct vnode *dvp, struct vnode *vp, struct componentname *cnp)
 		panic("nfs: sillyrename dir");
 #endif
 	MALLOC(sp, struct sillyrename *, sizeof (struct sillyrename),
-		M_NFSREQ, M_WAITOK);
+		M_NFSREQ, 0);
 	sp->s_cred = crhold(cnp->cn_cred);
 	sp->s_dvp = dvp;
 	VREF(dvp);
@@ -2438,7 +2438,7 @@ nfs_lookitup(struct vnode *dvp, const char *name, int len, struct ucred *cred,
 			free((caddr_t)np->n_fhp, M_NFSBIGFH);
 			np->n_fhp = &np->n_fh;
 		    } else if (np->n_fhsize <= NFS_SMALLFH && fhlen>NFS_SMALLFH)
-			np->n_fhp =(nfsfh_t *)malloc(fhlen, M_NFSBIGFH, M_WAITOK);
+			np->n_fhp =(nfsfh_t *)malloc(fhlen, M_NFSBIGFH, 0);
 		    bcopy((caddr_t)nfhp, (caddr_t)np->n_fhp, fhlen);
 		    np->n_fhsize = fhlen;
 		    newvp = NFSTOV(np);
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index 1d953cd564f6..322b1d4ee008 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -656,8 +656,8 @@ nfsrv_readlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 	len = 0;
 	i = 0;
 	while (len < NFS_MAXPATHLEN) {
-		MGET(nmp, M_TRYWAIT, MT_DATA);
-		MCLGET(nmp, M_TRYWAIT);
+		MGET(nmp, 0, MT_DATA);
+		MCLGET(nmp, 0);
 		nmp->m_len = NFSMSIZ(nmp);
 		if (len == 0)
 			mp3 = mp = nmp;
@@ -899,15 +899,15 @@ nfsrv_read(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 				i++;
 			}
 			if (left > 0) {
-				MGET(m, M_TRYWAIT, MT_DATA);
-				MCLGET(m, M_TRYWAIT);
+				MGET(m, 0, MT_DATA);
+				MCLGET(m, 0);
 				m->m_len = 0;
 				m2->m_next = m;
 				m2 = m;
 			}
 		}
 		MALLOC(iv, struct iovec *, i * sizeof (struct iovec),
-		       M_TEMP, M_WAITOK);
+		       M_TEMP, 0);
 		uiop->uio_iov = iv2 = iv;
 		m = mb;
 		left = len;
@@ -1107,7 +1107,7 @@ nfsrv_write(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 
 	if (len > 0) {
 	    MALLOC(ivp, struct iovec *, cnt * sizeof (struct iovec), M_TEMP,
-		M_WAITOK);
+		0);
 	    uiop->uio_iov = iv = ivp;
 	    uiop->uio_iovcnt = cnt;
 	    mp = mrep;
@@ -1404,7 +1404,7 @@ loop1:
 		    }
 		    uiop->uio_iovcnt = i;
 		    MALLOC(iov, struct iovec *, i * sizeof (struct iovec),
-			M_TEMP, M_WAITOK);
+			M_TEMP, 0);
 		    uiop->uio_iov = ivp = iov;
 		    mp = mrep;
 		    while (mp) {
@@ -2551,7 +2551,7 @@ nfsrv_symlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 	if (v3)
 		nfsm_srvsattr(vap);
 	nfsm_srvpathsiz(len2);
-	MALLOC(pathcp, caddr_t, len2 + 1, M_TEMP, M_WAITOK);
+	MALLOC(pathcp, caddr_t, len2 + 1, M_TEMP, 0);
 	iv.iov_base = pathcp;
 	iv.iov_len = len2;
 	io.uio_resid = len2;
@@ -3059,7 +3059,7 @@ nfsrv_readdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 	/*
 	 * end section.  Allocate rbuf and continue
 	 */
-	MALLOC(rbuf, caddr_t, siz, M_TEMP, M_WAITOK);
+	MALLOC(rbuf, caddr_t, siz, M_TEMP, 0);
 again:
 	iv.iov_base = rbuf;
 	iv.iov_len = fullsiz;
@@ -3337,7 +3337,7 @@ nfsrv_readdirplus(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 		goto nfsmout;
 	}
 	VOP_UNLOCK(vp, 0, td);
-	MALLOC(rbuf, caddr_t, siz, M_TEMP, M_WAITOK);
+	MALLOC(rbuf, caddr_t, siz, M_TEMP, 0);
 again:
 	iv.iov_base = rbuf;
 	iv.iov_len = fullsiz;
diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c
index 1986c0b62857..a9e84e921167 100644
--- a/sys/nfsserver/nfs_srvcache.c
+++ b/sys/nfsserver/nfs_srvcache.c
@@ -193,7 +193,7 @@ loop:
 			} else if (rp->rc_flag & RC_REPMBUF) {
 				nfsrvstats.srvcache_nonidemdonehits++;
 				*repp = m_copym(rp->rc_reply, 0, M_COPYALL,
-						M_TRYWAIT);
+						0);
 				ret = RC_REPLY;
 			} else {
 				nfsrvstats.srvcache_idemdonehits++;
@@ -212,7 +212,7 @@ loop:
 	NFS_DPF(RC, ("M%03x", nd->nd_retxid & 0xfff));
 	if (numnfsrvcache < desirednfsrvcache) {
 		rp = (struct nfsrvcache *)malloc((u_long)sizeof *rp,
-		    M_NFSD, M_WAITOK | M_ZERO);
+		    M_NFSD, M_ZERO);
 		numnfsrvcache++;
 		rp->rc_flag = RC_LOCKED;
 	} else {
@@ -303,7 +303,7 @@ loop:
 					rp->rc_flag |= RC_REPSTATUS;
 				} else {
 					rp->rc_reply = m_copym(repmbuf,
-						0, M_COPYALL, M_TRYWAIT);
+						0, M_COPYALL, 0);
 					rp->rc_flag |= RC_REPMBUF;
 				}
 			}
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index bf4e98566849..e17e023e7af3 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -148,7 +148,7 @@ nfs_rephead(int siz, struct nfsrv_descript *nd, int err,
 	nd->nd_repstat = err;
 	if (err && (nd->nd_flag & ND_NFSV3) == 0)	/* XXX recheck */
 		siz = 0;
-	MGETHDR(mreq, M_TRYWAIT, MT_DATA);
+	MGETHDR(mreq, 0, MT_DATA);
 	mb = mreq;
 	/*
 	 * If this is a big reply, use a cluster else
@@ -157,7 +157,7 @@ nfs_rephead(int siz, struct nfsrv_descript *nd, int err,
 	mreq->m_len = 6 * NFSX_UNSIGNED;
 	siz += RPC_REPLYSIZ;
 	if ((max_hdr + siz) >= MINCLSIZE) {
-		MCLGET(mreq, M_TRYWAIT);
+		MCLGET(mreq, 0);
 	} else
 		mreq->m_data += min(max_hdr, M_TRAILINGSPACE(mreq));
 	tl = mtod(mreq, u_int32_t *);
@@ -244,9 +244,9 @@ nfs_realign(struct mbuf **pm, int hsiz)	/* XXX COMMON */
 	++nfs_realign_test;
 	while ((m = *pm) != NULL) {
 		if ((m->m_len & 0x3) || (mtod(m, intptr_t) & 0x3)) {
-			MGET(n, M_TRYWAIT, MT_DATA);
+			MGET(n, 0, MT_DATA);
 			if (m->m_len >= MINCLSIZE) {
-				MCLGET(n, M_TRYWAIT);
+				MCLGET(n, 0);
 			}
 			n->m_len = 0;
 			break;
@@ -403,7 +403,7 @@ nfsmout:
  * Socket upcall routine for the nfsd sockets.
  * The caddr_t arg is a pointer to the "struct nfssvc_sock".
  * Essentially do as much as possible non-blocking, else punt and it will
- * be called with M_TRYWAIT from an nfsd.
+ * be called without M_NOWAIT from an nfsd.
  */
 void
 nfsrv_rcv(struct socket *so, void *arg, int waitflag)
@@ -421,7 +421,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag)
 	/*
 	 * Define this to test for nfsds handling this under heavy load.
 	 */
-	if (waitflag == M_DONTWAIT) {
+	if (waitflag == M_NOWAIT) {
 		slp->ns_flag |= SLP_NEEDQ;
 		goto dorecs;
 	}
@@ -433,7 +433,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag)
 		 * to an nfsd so that there is feedback to the TCP layer that
 		 * the nfs servers are heavily loaded.
 		 */
-		if (STAILQ_FIRST(&slp->ns_rec) && waitflag == M_DONTWAIT) {
+		if (STAILQ_FIRST(&slp->ns_rec) && waitflag == M_NOWAIT) {
 			slp->ns_flag |= SLP_NEEDQ;
 			goto dorecs;
 		}
@@ -509,7 +509,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag)
 	 * Now try and process the request records, non-blocking.
 	 */
 dorecs:
-	if (waitflag == M_DONTWAIT &&
+	if (waitflag == M_NOWAIT &&
 		(STAILQ_FIRST(&slp->ns_rec)
 		 || (slp->ns_flag & (SLP_NEEDQ | SLP_DISCONN))))
 		nfsrv_wakenfsd(slp);
@@ -667,7 +667,7 @@ nfsrv_dorec(struct nfssvc_sock *slp, struct nfsd *nfsd,
 	m = rec->nr_packet;
 	free(rec, M_NFSRVDESC);
 	MALLOC(nd, struct nfsrv_descript *, sizeof (struct nfsrv_descript),
-		M_NFSRVDESC, M_WAITOK);
+		M_NFSRVDESC, 0);
 	nd->nd_md = nd->nd_mrep = m;
 	nd->nd_nam2 = nam;
 	nd->nd_dpos = mtod(m, caddr_t);
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 5ac51ad7c1b6..9ad6af12da67 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -605,7 +605,7 @@ nfs_namei(struct nameidata *ndp, fhandle_t *fhp, int len,
 
 	*retdirp = NULL;
 	cnp->cn_flags |= NOMACCHECK;
-	cnp->cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
+	cnp->cn_pnbuf = uma_zalloc(namei_zone, 0);
 
 	/*
 	 * Copy the name from the mbuf list to ndp->ni_pnbuf
@@ -670,7 +670,7 @@ nfs_namei(struct nameidata *ndp, fhandle_t *fhp, int len,
 		 * Oh joy. For WebNFS, handle those pesky '%' escapes,
 		 * and the 'native path' indicator.
 		 */
-		cp = uma_zalloc(namei_zone, M_WAITOK);
+		cp = uma_zalloc(namei_zone, 0);
 		fromcp = cnp->cn_pnbuf;
 		tocp = cp;
 		if ((unsigned char)*fromcp >= WEBNFS_SPECCHAR_START) {
@@ -779,7 +779,7 @@ nfs_namei(struct nameidata *ndp, fhandle_t *fhp, int len,
 			goto badlink2;
 		}
 		if (ndp->ni_pathlen > 1)
-			cp = uma_zalloc(namei_zone, M_WAITOK);
+			cp = uma_zalloc(namei_zone, 0);
 		else
 			cp = cnp->cn_pnbuf;
 		aiov.iov_base = cp;
@@ -1287,8 +1287,8 @@ nfsm_clget_xx(u_int32_t **tl, struct mbuf *mb, struct mbuf **mp,
 	if (*bp >= *be) {
 		if (*mp == mb)
 			(*mp)->m_len += *bp - bpos;
-		MGET(nmp, M_TRYWAIT, MT_DATA);
-		MCLGET(nmp, M_TRYWAIT);
+		MGET(nmp, 0, MT_DATA);
+		MCLGET(nmp, 0);
 		nmp->m_len = NFSMSIZ(nmp);
 		(*mp)->m_next = nmp;
 		*mp = nmp;
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index cf9bf90b5058..b41a5f706a86 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -262,7 +262,7 @@ nfssvc_addsock(struct file *fp, struct sockaddr *mynam, struct thread *td)
 
 	slp = (struct nfssvc_sock *)
 		malloc(sizeof (struct nfssvc_sock), M_NFSSVC,
-		M_WAITOK | M_ZERO);
+		M_ZERO);
 	STAILQ_INIT(&slp->ns_rec);
 	TAILQ_INSERT_TAIL(&nfssvc_sockhead, slp, ns_chain);
 
@@ -301,7 +301,7 @@ nfssvc_nfsd(struct thread *td)
 	writes_todo = 0;
 #endif
 	nfsd = (struct nfsd *)
-		malloc(sizeof (struct nfsd), M_NFSD, M_WAITOK | M_ZERO);
+		malloc(sizeof (struct nfsd), M_NFSD, M_ZERO);
 	s = splnet();
 	nfsd->nfsd_td = td;
 	TAILQ_INSERT_TAIL(&nfsd_head, nfsd, nfsd_chain);
@@ -345,7 +345,7 @@ nfssvc_nfsd(struct thread *td)
 					slp->ns_flag &= ~SLP_NEEDQ;
 					(void) nfs_slplock(slp, 1);
 					nfsrv_rcv(slp->ns_so, (caddr_t)slp,
-						M_TRYWAIT);
+						0);
 					nfs_slpunlock(slp);
 				}
 				error = nfsrv_dorec(slp, nfsd, &nd);
@@ -471,7 +471,7 @@ nfssvc_nfsd(struct thread *td)
 			 * Record Mark.
 			 */
 			if (sotype == SOCK_STREAM) {
-				M_PREPEND(m, NFSX_UNSIGNED, M_TRYWAIT);
+				M_PREPEND(m, NFSX_UNSIGNED, 0);
 				*mtod(m, u_int32_t *) = htonl(0x80000000 | siz);
 			}
 			if (slp->ns_so->so_proto->pr_flags & PR_CONNREQUIRED)
@@ -671,12 +671,12 @@ nfsrv_init(int terminating)
 
 #if 0
 	nfs_udpsock = (struct nfssvc_sock *)
-	    malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK | M_ZERO);
+	    malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_ZERO);
 	STAILQ_INIT(&nfs_udpsock->ns_rec);
 	TAILQ_INSERT_HEAD(&nfssvc_sockhead, nfs_udpsock, ns_chain);
 
 	nfs_cltpsock = (struct nfssvc_sock *)
-	    malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK | M_ZERO);
+	    malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_ZERO);
 	STAILQ_INIT(&nfs_cltpsock->ns_rec);
 	TAILQ_INSERT_TAIL(&nfssvc_sockhead, nfs_cltpsock, ns_chain);
 #endif
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c
index 8b51d698a6c0..1b8a3381775f 100644
--- a/sys/opencrypto/cryptodev.c
+++ b/sys/opencrypto/cryptodev.c
@@ -228,7 +228,7 @@ cryptof_ioctl(
 			}
 
 			MALLOC(crie.cri_key, u_int8_t *,
-			    crie.cri_klen / 8, M_XDATA, M_WAITOK);
+			    crie.cri_klen / 8, M_XDATA, 0);
 			if ((error = copyin(sop->key, crie.cri_key,
 			    crie.cri_klen / 8)))
 				goto bail;
@@ -246,7 +246,7 @@ cryptof_ioctl(
 
 			if (cria.cri_klen) {
 				MALLOC(cria.cri_key, u_int8_t *,
-				    cria.cri_klen / 8, M_XDATA, M_WAITOK);
+				    cria.cri_klen / 8, M_XDATA, 0);
 				if ((error = copyin(sop->mackey, cria.cri_key,
 				    cria.cri_klen / 8)))
 					goto bail;
@@ -332,7 +332,7 @@ cryptodev_op(
 	cse->uio.uio_iov = cse->iovec;
 	bzero(&cse->iovec, sizeof(cse->iovec));
 	cse->uio.uio_iov[0].iov_len = cop->len;
-	cse->uio.uio_iov[0].iov_base = malloc(cop->len, M_XDATA, M_WAITOK);
+	cse->uio.uio_iov[0].iov_base = malloc(cop->len, M_XDATA, 0);
 	for (i = 0; i < cse->uio.uio_iovcnt; i++)
 		cse->uio.uio_resid += cse->uio.uio_iov[0].iov_len;
 
@@ -512,7 +512,7 @@ cryptodev_key(struct crypt_kop *kop)
 		return (EINVAL);
 	}
 
-	krp = (struct cryptkop *)malloc(sizeof *krp, M_XDATA, M_WAITOK);
+	krp = (struct cryptkop *)malloc(sizeof *krp, M_XDATA, 0);
 	if (!krp)
 		return (ENOMEM);
 	bzero(krp, sizeof *krp);
@@ -529,7 +529,7 @@ cryptodev_key(struct crypt_kop *kop)
 		size = (krp->krp_param[i].crp_nbits + 7) / 8;
 		if (size == 0)
 			continue;
-		MALLOC(krp->krp_param[i].crp_p, caddr_t, size, M_XDATA, M_WAITOK);
+		MALLOC(krp->krp_param[i].crp_p, caddr_t, size, M_XDATA, 0);
 		if (i >= krp->krp_iparams)
 			continue;
 		error = copyin(kop->crk_param[i].crp_p, krp->krp_param[i].crp_p, size);
@@ -719,7 +719,7 @@ cryptoioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 	switch (cmd) {
 	case CRIOGET:
 		MALLOC(fcr, struct fcrypt *,
-		    sizeof(struct fcrypt), M_XDATA, M_WAITOK);
+		    sizeof(struct fcrypt), M_XDATA, 0);
 		TAILQ_INIT(&fcr->csessions);
 		fcr->sesn = 0;
 
diff --git a/sys/pc98/cbus/scvtb.c b/sys/pc98/cbus/scvtb.c
index 2d0ea3f03284..05d5e5e33042 100644
--- a/sys/pc98/cbus/scvtb.c
+++ b/sys/pc98/cbus/scvtb.c
@@ -103,7 +103,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait)
 			vtb->vtb_buffer =
 			    (vm_offset_t)malloc(cols*rows*sizeof(u_int16_t)*2,
 				M_DEVBUF, 
-				((wait) ? M_WAITOK : M_NOWAIT) | M_ZERO);
+				((wait) ? 0 : M_NOWAIT) | M_ZERO);
 			if (vtb->vtb_buffer != 0) {
 				vtb->vtb_flags |= VTB_ALLOCED;
 			}
diff --git a/sys/pc98/pc98/scvtbpc98.c b/sys/pc98/pc98/scvtbpc98.c
index 2d0ea3f03284..05d5e5e33042 100644
--- a/sys/pc98/pc98/scvtbpc98.c
+++ b/sys/pc98/pc98/scvtbpc98.c
@@ -103,7 +103,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait)
 			vtb->vtb_buffer =
 			    (vm_offset_t)malloc(cols*rows*sizeof(u_int16_t)*2,
 				M_DEVBUF, 
-				((wait) ? M_WAITOK : M_NOWAIT) | M_ZERO);
+				((wait) ? 0 : M_NOWAIT) | M_ZERO);
 			if (vtb->vtb_buffer != 0) {
 				vtb->vtb_flags |= VTB_ALLOCED;
 			}
diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c
index 3e3f43767dd3..db60e82890c6 100644
--- a/sys/pc98/pc98/spkr.c
+++ b/sys/pc98/pc98/spkr.c
@@ -503,7 +503,7 @@ spkropen(dev, flags, fmt, td)
 	(void) printf("spkropen: about to perform play initialization\n");
 #endif /* DEBUG */
 	playinit();
-	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, M_WAITOK);
+	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, 0);
 	spkr_active = TRUE;
 	return(0);
     }
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index 55ce644e24c6..847ec74954ca 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/syscons.c
@@ -315,7 +315,7 @@ sc_attach_unit(int unit, int flags)
 	    /* assert(sc_console->ts != NULL); */
 	    kernel_console_ts = sc_console->ts;
 	    sc_console->ts = malloc(sc_console->tsw->te_size,
-				    M_DEVBUF, M_WAITOK);
+				    M_DEVBUF, 0);
 	    bcopy(kernel_console_ts, sc_console->ts, sc_console->tsw->te_size);
     	    (*sc_console->tsw->te_default_attr)(sc_console,
 						user_default.std_color,
@@ -2696,9 +2696,9 @@ scinit(int unit, int flags)
 	    sc->font_16 = font_16;
 	} else if (sc->font_8 == NULL) {
 	    /* assert(sc_malloc) */
-	    sc->font_8 = malloc(sizeof(font_8), M_DEVBUF, M_WAITOK);
-	    sc->font_14 = malloc(sizeof(font_14), M_DEVBUF, M_WAITOK);
-	    sc->font_16 = malloc(sizeof(font_16), M_DEVBUF, M_WAITOK);
+	    sc->font_8 = malloc(sizeof(font_8), M_DEVBUF, 0);
+	    sc->font_14 = malloc(sizeof(font_14), M_DEVBUF, 0);
+	    sc->font_16 = malloc(sizeof(font_16), M_DEVBUF, 0);
 	}
 #endif
 
@@ -2725,7 +2725,7 @@ scinit(int unit, int flags)
 					 kernel_default.rev_color);
 	} else {
 	    /* assert(sc_malloc) */
-	    sc->dev = malloc(sizeof(dev_t)*sc->vtys, M_DEVBUF, M_WAITOK|M_ZERO);
+	    sc->dev = malloc(sizeof(dev_t)*sc->vtys, M_DEVBUF, M_ZERO);
 	    sc->dev[0] = makedev(CDEV_MAJOR, unit*MAXCONS);
 	    sc->dev[0]->si_tty = ttymalloc(sc->dev[0]->si_tty);
 	    scp = alloc_scp(sc, sc->first_vty);
@@ -2945,7 +2945,7 @@ static scr_stat
 
     /* assert(sc_malloc) */
 
-    scp = (scr_stat *)malloc(sizeof(scr_stat), M_DEVBUF, M_WAITOK);
+    scp = (scr_stat *)malloc(sizeof(scr_stat), M_DEVBUF, 0);
     init_scp(sc, vty, scp);
 
     sc_alloc_scr_buffer(scp, TRUE, TRUE);
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index 61152717df3d..bf426fb1d146 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -216,7 +216,7 @@ allocate_driver(struct slot *slt, struct dev_desc *desc)
 	}
 	irq = ffs(desc->irqmask) - 1;
 	MALLOC(devi, struct pccard_devinfo *, sizeof(*devi), M_DEVBUF,
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 	strcpy(devi->name, desc->name);
 	/*
 	 *	Create an entry for the device under this slot.
diff --git a/sys/pci/agp.c b/sys/pci/agp.c
index 22813343aeff..ddd29b96daa5 100644
--- a/sys/pci/agp.c
+++ b/sys/pci/agp.c
@@ -351,7 +351,7 @@ agp_generic_alloc_memory(device_t dev, int type, vm_size_t size)
 		return 0;
 	}
 
-	mem = malloc(sizeof *mem, M_AGP, M_WAITOK);
+	mem = malloc(sizeof *mem, M_AGP, 0);
 	mem->am_id = sc->as_nextid++;
 	mem->am_size = size;
 	mem->am_type = 0;
diff --git a/sys/pci/agp_i810.c b/sys/pci/agp_i810.c
index dba76a9a5c21..d7c42f49ef97 100644
--- a/sys/pci/agp_i810.c
+++ b/sys/pci/agp_i810.c
@@ -500,7 +500,7 @@ agp_i810_alloc_memory(device_t dev, int type, vm_size_t size)
 			return 0;
 	}
 
-	mem = malloc(sizeof *mem, M_AGP, M_WAITOK);
+	mem = malloc(sizeof *mem, M_AGP, 0);
 	mem->am_id = sc->agp.as_nextid++;
 	mem->am_size = size;
 	mem->am_type = type;
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index a9e599ee9e39..2aa4e3337a57 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -2423,11 +2423,11 @@ dc_newbuf(sc, i, m)
 	c = &sc->dc_ldata->dc_rx_list[i];
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -3186,11 +3186,11 @@ dc_coal(sc, m_head)
 	struct mbuf		*m_new, *m;
 
 	m = *m_head;
-	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, M_NOWAIT, MT_DATA);
 	if (m_new == NULL)
 		return(ENOBUFS);
 	if (m->m_pkthdr.len > MHLEN) {
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index d1865865a099..9e1e319b2f2b 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -195,7 +195,7 @@ tulip_txprobe(
      * either is connected so the transmit is the only way
      * to verify the connectivity.
      */
-    MGETHDR(m, M_DONTWAIT, MT_DATA);
+    MGETHDR(m, M_NOWAIT, MT_DATA);
     if (m == NULL)
 	return 0;
     /*
@@ -3545,12 +3545,12 @@ tulip_rx_intr(
 	 */
 	if (accept || ms == NULL) {
 	    struct mbuf *m0;
-	    MGETHDR(m0, M_DONTWAIT, MT_DATA);
+	    MGETHDR(m0, M_NOWAIT, MT_DATA);
 	    if (m0 != NULL) {
 #if defined(TULIP_COPY_RXDATA)
 		if (!accept || total_len >= (MHLEN - 2)) {
 #endif
-		    MCLGET(m0, M_DONTWAIT);
+		    MCLGET(m0, M_NOWAIT);
 		    if ((m0->m_flags & M_EXT) == 0) {
 			m_freem(m0);
 			m0 = NULL;
@@ -4061,10 +4061,10 @@ tulip_mbuf_compress(
 {
     struct mbuf *m0;
 #if MCLBYTES >= ETHERMTU + 18 && !defined(BIG_PACKET)
-    MGETHDR(m0, M_DONTWAIT, MT_DATA);
+    MGETHDR(m0, M_NOWAIT, MT_DATA);
     if (m0 != NULL) {
 	if (m->m_pkthdr.len > MHLEN) {
-	    MCLGET(m0, M_DONTWAIT);
+	    MCLGET(m0, M_NOWAIT);
 	    if ((m0->m_flags & M_EXT) == 0) {
 		m_freem(m);
 		m_freem(m0);
@@ -4081,9 +4081,9 @@ tulip_mbuf_compress(
 
     while (len > 0) {
 	if (mlen == MHLEN) {
-	    MGETHDR(*mp, M_DONTWAIT, MT_DATA);
+	    MGETHDR(*mp, M_NOWAIT, MT_DATA);
 	} else {
-	    MGET(*mp, M_DONTWAIT, MT_DATA);
+	    MGET(*mp, M_NOWAIT, MT_DATA);
 	}
 	if (*mp == NULL) {
 	    m_freem(m0);
@@ -4091,7 +4091,7 @@ tulip_mbuf_compress(
 	    break;
 	}
 	if (len > MLEN) {
-	    MCLGET(*mp, M_DONTWAIT);
+	    MCLGET(*mp, M_NOWAIT);
 	    if (((*mp)->m_flags & M_EXT) == 0) {
 		m_freem(m0);
 		m0 = NULL;
diff --git a/sys/pci/if_mn.c b/sys/pci/if_mn.c
index b809d6bf8961..7ed07d112edd 100644
--- a/sys/pci/if_mn.c
+++ b/sys/pci/if_mn.c
@@ -695,7 +695,7 @@ ngmn_connect(hook_p hook)
 	/* Setup a transmit chain with one descriptor */
 	/* XXX: we actually send a 1 byte packet */
 	dp = mn_alloc_desc();
-	MGETHDR(m, M_TRYWAIT, MT_DATA);
+	MGETHDR(m, 0, MT_DATA);
 	if (m == NULL)
 		return ENOBUFS;
 	m->m_pkthdr.len = 0;
@@ -712,12 +712,12 @@ ngmn_connect(hook_p hook)
 
 	dp = mn_alloc_desc();
 	m = NULL;
-	MGETHDR(m, M_TRYWAIT, MT_DATA);
+	MGETHDR(m, 0, MT_DATA);
 	if (m == NULL) {
 		mn_free_desc(dp);
 		return (ENOBUFS);
 	}
-	MCLGET(m, M_TRYWAIT);
+	MCLGET(m, 0);
 	if ((m->m_flags & M_EXT) == 0) {
 		mn_free_desc(dp);
 		m_freem(m);
@@ -735,13 +735,13 @@ ngmn_connect(hook_p hook)
 		dp2 = dp;
 		dp = mn_alloc_desc();
 		m = NULL;
-		MGETHDR(m, M_TRYWAIT, MT_DATA);
+		MGETHDR(m, 0, MT_DATA);
 		if (m == NULL) {
 			mn_free_desc(dp);
 			m_freem(m);
 			return (ENOBUFS);
 		}
-		MCLGET(m, M_TRYWAIT);
+		MCLGET(m, 0);
 		if ((m->m_flags & M_EXT) == 0) {
 			mn_free_desc(dp);
 			m_freem(m);
@@ -839,7 +839,7 @@ mn_create_channel(struct mn_softc *sc, int chan)
 	struct schan *sch;
 
 	sch = sc->ch[chan] = (struct schan *)malloc(sizeof *sc->ch[chan], 
-	    M_MN, M_WAITOK | M_ZERO);
+	    M_MN, M_ZERO);
 	sch->sc = sc;
 	sch->state = DOWN;
 	sch->chan = chan;
@@ -1183,12 +1183,12 @@ mn_rx_intr(struct mn_softc *sc, u_int32_t vector)
 
 		/* Replenish desc + mbuf supplies */
 		if (!m) {
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m == NULL) {
 				mn_free_desc(dp);
 				return; /* ENOBUFS */
 			}
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, M_NOWAIT);
 			if((m->m_flags & M_EXT) == 0) {
 				mn_free_desc(dp);
 				m_freem(m);
@@ -1340,7 +1340,7 @@ mn_attach (device_t self)
 		once++;
 	}
 
-	sc = (struct mn_softc *)malloc(sizeof *sc, M_MN, M_WAITOK | M_ZERO);
+	sc = (struct mn_softc *)malloc(sizeof *sc, M_MN, M_ZERO);
 	device_set_softc(self, sc);
 
 	sc->dev = self;
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index 14abc27fe324..009fe46dddbf 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -776,11 +776,11 @@ pcn_newbuf(sc, idx, m)
 	c = &sc->pcn_ldata->pcn_rx_list[idx];
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index e05cbcde4a1b..e1713bb5f6a4 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -1500,11 +1500,11 @@ rl_encap(sc, m_head)
 	 * per packet. We have to copy pretty much all the time.
 	 */
 
-	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, M_NOWAIT, MT_DATA);
 	if (m_new == NULL)
 		return(1);
 	if (m_head->m_pkthdr.len > MHLEN) {
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(1);
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index a148ba575862..7b63a0120518 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -924,11 +924,11 @@ sf_newbuf(sc, c, m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1304,14 +1304,14 @@ sf_encap(sc, c, m_head)
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("sf%d: no memory for tx list\n", sc->sf_unit);
 			return(1);
 		}
 
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_DONTWAIT);
+			MCLGET(m_new, M_NOWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				printf("sf%d: no memory for tx list\n",
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 0f8e3924e1b5..4f4cce06b794 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -1481,7 +1481,7 @@ sis_newbuf(sc, c, m)
 		return(EINVAL);
 
 	if (m == NULL) {
-		m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+		m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (m == NULL)
 			return(ENOBUFS);
 	} else
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index e58d1c4f2803..3aa40e797070 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -688,7 +688,7 @@ sk_newbuf(sc_if, c, m)
 	if (m == NULL) {
 		caddr_t			*buf = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 370b0f52ae7a..4e5e9b77f83d 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -1142,10 +1142,10 @@ ste_newbuf(sc, c, m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1519,13 +1519,13 @@ encap_retry:
 		 * mbuf chain first. Bail out if we can't get the
 		 * new buffers. Code borrowed from if_fxp.c
 		 */
-		MGETHDR(mn, M_DONTWAIT, MT_DATA);
+		MGETHDR(mn, M_NOWAIT, MT_DATA);
 		if (mn == NULL) {
 			m_freem(m_head);
 			return ENOMEM;
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(mn, M_DONTWAIT);
+			MCLGET(mn, M_NOWAIT);
 			if ((mn->m_flags & M_EXT) == 0) {
 				m_freem(mn);
 				m_freem(m_head);
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index a3843223270e..894ac43559a5 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -1130,11 +1130,11 @@ ti_newbuf_std(sc, i, m)
 	struct ti_rx_desc	*r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1174,7 +1174,7 @@ ti_newbuf_mini(sc, i, m)
 	struct ti_rx_desc	*r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
@@ -1218,7 +1218,7 @@ ti_newbuf_jumbo(sc, i, m)
 		caddr_t			*buf = NULL;
 
 		/* Allocate the mbuf. */
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
@@ -1300,19 +1300,19 @@ ti_newbuf_jumbo(sc, idx, m_old)
 		}
 	} else {
 		/* Allocate the mbufs. */
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("ti%d: mbuf allocation failed "
    			       "-- packet dropped!\n", sc->ti_unit);
 			goto nobufs;
 		}
-		MGET(m[NPAYLOAD], M_DONTWAIT, MT_DATA);
+		MGET(m[NPAYLOAD], M_NOWAIT, MT_DATA);
 		if (m[NPAYLOAD] == NULL) {
 			printf("ti%d: cluster mbuf allocation failed "
 			       "-- packet dropped!\n", sc->ti_unit);
 			goto nobufs;
 		}
-		MCLGET(m[NPAYLOAD], M_DONTWAIT);
+		MCLGET(m[NPAYLOAD], M_NOWAIT);
 		if ((m[NPAYLOAD]->m_flags & M_EXT) == 0) {
 			printf("ti%d: mbuf allocation failed "
 			       "-- packet dropped!\n", sc->ti_unit);
@@ -1321,7 +1321,7 @@ ti_newbuf_jumbo(sc, idx, m_old)
 		m[NPAYLOAD]->m_len = MCLBYTES;
 
 		for (i = 0; i < NPAYLOAD; i++){
-			MGET(m[i], M_DONTWAIT, MT_DATA);
+			MGET(m[i], M_NOWAIT, MT_DATA);
 			if (m[i] == NULL) {
 				printf("ti%d: mbuf allocation failed "
 				       "-- packet dropped!\n", sc->ti_unit);
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index 0fc990abe644..682bbef236f0 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -1459,11 +1459,11 @@ tl_newbuf(sc, c)
 {
 	struct mbuf		*m_new = NULL;
 
-	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, M_NOWAIT, MT_DATA);
 	if (m_new == NULL)
 		return(ENOBUFS);
 
-	MCLGET(m_new, M_DONTWAIT);
+	MCLGET(m_new, M_NOWAIT);
 	if (!(m_new->m_flags & M_EXT)) {
 		m_freem(m_new);
 		return(ENOBUFS);
@@ -1909,13 +1909,13 @@ tl_encap(sc, c, m_head)
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			if_printf(ifp, "no memory for tx list\n");
 			return(1);
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_DONTWAIT);
+			MCLGET(m_new, M_NOWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				if_printf(ifp, "no memory for tx list\n");
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 407abf136d49..01b1992f7e04 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -948,11 +948,11 @@ vr_newbuf(sc, c, m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1292,13 +1292,13 @@ vr_encap(sc, c, m_head)
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("vr%d: no memory for tx list\n", sc->vr_unit);
 			return(1);
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_DONTWAIT);
+			MCLGET(m_new, M_NOWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				printf("vr%d: no memory for tx list\n",
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index 30618af8cc70..0ceaecbb7938 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -1112,7 +1112,7 @@ wb_newbuf(sc, c, m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 		m_new->m_data = c->wb_buf;
@@ -1467,11 +1467,11 @@ wb_encap(sc, c, m_head)
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(1);
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_DONTWAIT);
+			MCLGET(m_new, M_NOWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				return(1);
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 85011d2b51d5..203f9bad990c 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -931,7 +931,7 @@ xl_testpacket(sc)
 
 	ifp = &sc->arpcom.ac_if;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 
 	if (m == NULL)
 		return;
@@ -1931,11 +1931,11 @@ xl_newbuf(sc, c)
 	int			error;
 	u_int32_t		baddr;
 
-	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, M_NOWAIT, MT_DATA);
 	if (m_new == NULL)
 		return(ENOBUFS);
 
-	MCLGET(m_new, M_DONTWAIT);
+	MCLGET(m_new, M_NOWAIT);
 	if (!(m_new->m_flags & M_EXT)) {
 		m_freem(m_new);
 		return(ENOBUFS);
@@ -2432,14 +2432,14 @@ xl_encap(sc, c, m_head)
 	if (error) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			m_freem(m_head);
 			printf("xl%d: no memory for tx list\n", sc->xl_unit);
 			return(1);
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_DONTWAIT);
+			MCLGET(m_new, M_NOWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				m_freem(m_head);
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index bd7b5c318cd3..e91a39281258 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -3602,7 +3602,7 @@ ncr_attach (device_t dev)
 			 0, 0xffffffff, PAGE_SIZE);
 	} else {
 		np->script  = (struct script *)
-			malloc (sizeof (struct script), M_DEVBUF, M_WAITOK);
+			malloc (sizeof (struct script), M_DEVBUF, 0);
 	}
 
 	/* XXX JGibbs - Use contigmalloc */
@@ -3613,7 +3613,7 @@ ncr_attach (device_t dev)
 	} else 
 		{
 		np->scripth = (struct scripth *)
-			malloc (sizeof (struct scripth), M_DEVBUF, M_WAITOK);
+			malloc (sizeof (struct scripth), M_DEVBUF, 0);
 	}
 
 #ifdef SCSI_NCR_PCI_CONFIG_FIXUP
diff --git a/sys/pci/simos.c b/sys/pci/simos.c
index 040e042c4fe3..6b865dda828f 100644
--- a/sys/pci/simos.c
+++ b/sys/pci/simos.c
@@ -111,7 +111,7 @@ simos_attach(pcici_t config_id, int unit)
 	struct simos_softc* sc;
 	struct cam_devq *devq;
 
-	sc = malloc(sizeof(struct simos_softc), M_DEVBUF, M_WAITOK | M_ZERO);
+	sc = malloc(sizeof(struct simos_softc), M_DEVBUF, M_ZERO);
 	simosp[unit] = sc;
 
 	sc->sc_unit = unit;
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index dc218965c189..7afa22c242ec 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -164,7 +164,7 @@ xrpu_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct  thread *tdr)
 		/* Name SHALL be zero terminated */
 		xt->xt_name[sizeof xt->xt_name - 1] = '\0';
 		i = strlen(xt->xt_name);
-		sc->tc.tc_name = (char *)malloc(i + 1, M_XRPU, M_WAITOK);
+		sc->tc.tc_name = (char *)malloc(i + 1, M_XRPU, 0);
 		strcpy(sc->tc.tc_name, xt->xt_name);
 		sc->tc.tc_frequency = xt->xt_frequency;
 		sc->tc.tc_get_timecount = xrpu_get_timecount;
diff --git a/sys/posix4/posix4.h b/sys/posix4/posix4.h
index b17e9270e675..033c1ec46f1b 100644
--- a/sys/posix4/posix4.h
+++ b/sys/posix4/posix4.h
@@ -56,7 +56,7 @@ int SC (struct thread *td, struct SC##_args *uap) \
 
 MALLOC_DECLARE(M_P31B);
 
-#define p31b_malloc(SIZE) malloc((SIZE), M_P31B, M_WAITOK)
+#define p31b_malloc(SIZE) malloc((SIZE), M_P31B, 0)
 #define p31b_free(P) free((P), M_P31B)
 
 int p31b_proc(struct proc *, pid_t, struct proc **);
diff --git a/sys/powerpc/aim/nexus.c b/sys/powerpc/aim/nexus.c
index 7472bbeac881..7172962c61d1 100644
--- a/sys/powerpc/aim/nexus.c
+++ b/sys/powerpc/aim/nexus.c
@@ -392,7 +392,7 @@ create_device_from_node(device_t parent, phandle_t node)
 	OF_getprop_alloc(node, "compatible", 1, (void **)&compatible);
 	cdev = device_add_child(parent, NULL, -1);
 	if (cdev != NULL) {
-		dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK);
+		dinfo = malloc(sizeof(*dinfo), M_NEXUS, 0);
 		dinfo->ndi_node = node;
 		dinfo->ndi_name = name;
 		dinfo->ndi_device_type = type;
diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c
index a924dd4784cf..6445602b2185 100644
--- a/sys/powerpc/powermac/macio.c
+++ b/sys/powerpc/powermac/macio.c
@@ -287,7 +287,7 @@ macio_attach(device_t dev)
 
 		cdev = device_add_child(dev, NULL, -1);
 		if (cdev != NULL) {
-			dinfo = malloc(sizeof(*dinfo), M_MACIO, M_WAITOK);
+			dinfo = malloc(sizeof(*dinfo), M_MACIO, 0);
 			memset(dinfo, 0, sizeof(*dinfo));
 			resource_list_init(&dinfo->mdi_resources);
 			dinfo->mdi_node = child;
diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c
index 1ad7e09a9305..007137af325f 100644
--- a/sys/powerpc/powerpc/busdma_machdep.c
+++ b/sys/powerpc/powerpc/busdma_machdep.c
@@ -209,7 +209,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 	
         if (dmat->maxsize <= PAGE_SIZE) {
                 *vaddr = malloc(dmat->maxsize, M_DEVBUF,
-                             (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
+                             (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0);
         } else {
                 /*
                  * XXX Use Contigmalloc until it is merged into this facility
@@ -217,7 +217,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
                  *     multi-seg allocations yet though.
                  */
                 *vaddr = contigmalloc(dmat->maxsize, M_DEVBUF,
-                    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
+                    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
                     0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
                     dmat->boundary);
         }
diff --git a/sys/powerpc/powerpc/extintr.c b/sys/powerpc/powerpc/extintr.c
index 48e893dbf5fd..345c593f73fd 100644
--- a/sys/powerpc/powerpc/extintr.c
+++ b/sys/powerpc/powerpc/extintr.c
@@ -452,7 +452,7 @@ intr_establish(int irq, int type, int level, int (*ih_fun)(void *),
 	irq = mapirq(irq);
 
 	/* no point in sleeping unless someone can free memory. */
-	ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : M_WAITOK);
+	ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : 0);
 	if (ih == NULL)
 		panic("intr_establish: can't malloc handler info");
 
diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c
index 7472bbeac881..7172962c61d1 100644
--- a/sys/powerpc/powerpc/nexus.c
+++ b/sys/powerpc/powerpc/nexus.c
@@ -392,7 +392,7 @@ create_device_from_node(device_t parent, phandle_t node)
 	OF_getprop_alloc(node, "compatible", 1, (void **)&compatible);
 	cdev = device_add_child(parent, NULL, -1);
 	if (cdev != NULL) {
-		dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK);
+		dinfo = malloc(sizeof(*dinfo), M_NEXUS, 0);
 		dinfo->ndi_node = node;
 		dinfo->ndi_name = name;
 		dinfo->ndi_device_type = type;
diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c
index 3428125835b6..21534b3f9479 100644
--- a/sys/powerpc/psim/iobus.c
+++ b/sys/powerpc/psim/iobus.c
@@ -215,7 +215,7 @@ iobus_attach(device_t dev)
 
                 cdev = device_add_child(dev, NULL, -1);
                 if (cdev != NULL) {
-                        dinfo = malloc(sizeof(*dinfo), M_IOBUS, M_WAITOK);
+                        dinfo = malloc(sizeof(*dinfo), M_IOBUS, 0);
 			memset(dinfo, 0, sizeof(*dinfo));
 			resource_list_init(&dinfo->id_resources);
                         dinfo->id_node = child;
diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c
index e9d9eeb3b51a..b4df06f8964f 100644
--- a/sys/security/mac/mac_framework.c
+++ b/sys/security/mac/mac_framework.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, M_WAITOK);
+	mac_init_socket_label(&intlabel, 0);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, M_WAITOK);
+	    buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, M_WAITOK);
+	    elements, buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, M_WAITOK);
+	    elements, buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, M_WAITOK);
+			    elements, buffer, mac.m_buflen, 0);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, M_WAITOK);
+		    buffer, mac.m_buflen, 0);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index e9d9eeb3b51a..b4df06f8964f 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, M_WAITOK);
+	mac_init_socket_label(&intlabel, 0);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, M_WAITOK);
+	    buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, M_WAITOK);
+	    elements, buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, M_WAITOK);
+	    elements, buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, M_WAITOK);
+			    elements, buffer, mac.m_buflen, 0);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, M_WAITOK);
+		    buffer, mac.m_buflen, 0);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c
index e9d9eeb3b51a..b4df06f8964f 100644
--- a/sys/security/mac/mac_net.c
+++ b/sys/security/mac/mac_net.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, M_WAITOK);
+	mac_init_socket_label(&intlabel, 0);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, M_WAITOK);
+	    buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, M_WAITOK);
+	    elements, buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, M_WAITOK);
+	    elements, buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, M_WAITOK);
+			    elements, buffer, mac.m_buflen, 0);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, M_WAITOK);
+		    buffer, mac.m_buflen, 0);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c
index e9d9eeb3b51a..b4df06f8964f 100644
--- a/sys/security/mac/mac_pipe.c
+++ b/sys/security/mac/mac_pipe.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, M_WAITOK);
+	mac_init_socket_label(&intlabel, 0);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, M_WAITOK);
+	    buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, M_WAITOK);
+	    elements, buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, M_WAITOK);
+	    elements, buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, M_WAITOK);
+			    elements, buffer, mac.m_buflen, 0);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, M_WAITOK);
+		    buffer, mac.m_buflen, 0);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c
index e9d9eeb3b51a..b4df06f8964f 100644
--- a/sys/security/mac/mac_process.c
+++ b/sys/security/mac/mac_process.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, M_WAITOK);
+	mac_init_socket_label(&intlabel, 0);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, M_WAITOK);
+	    buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, M_WAITOK);
+	    elements, buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, M_WAITOK);
+	    elements, buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, M_WAITOK);
+			    elements, buffer, mac.m_buflen, 0);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, M_WAITOK);
+		    buffer, mac.m_buflen, 0);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c
index e9d9eeb3b51a..b4df06f8964f 100644
--- a/sys/security/mac/mac_syscalls.c
+++ b/sys/security/mac/mac_syscalls.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, M_WAITOK);
+	mac_init_socket_label(&intlabel, 0);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, M_WAITOK);
+	    buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, M_WAITOK);
+	    elements, buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, M_WAITOK);
+	    elements, buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, M_WAITOK);
+			    elements, buffer, mac.m_buflen, 0);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, M_WAITOK);
+		    buffer, mac.m_buflen, 0);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index e9d9eeb3b51a..b4df06f8964f 100644
--- a/sys/security/mac/mac_system.c
+++ b/sys/security/mac/mac_system.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, M_WAITOK);
+	mac_init_socket_label(&intlabel, 0);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, M_WAITOK);
+	    buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, M_WAITOK);
+	    elements, buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, M_WAITOK);
+	    elements, buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, M_WAITOK);
+			    elements, buffer, mac.m_buflen, 0);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, M_WAITOK);
+		    buffer, mac.m_buflen, 0);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c
index e9d9eeb3b51a..b4df06f8964f 100644
--- a/sys/security/mac/mac_vfs.c
+++ b/sys/security/mac/mac_vfs.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, M_WAITOK);
+	mac_init_socket_label(&intlabel, 0);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, M_WAITOK);
+	    buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, M_WAITOK);
+	    elements, buffer, mac->m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, M_WAITOK);
+	    buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, M_WAITOK);
+	    elements, buffer, mac.m_buflen, 0);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, M_WAITOK);
+			    elements, buffer, mac.m_buflen, 0);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, M_WAITOK);
+		    buffer, mac.m_buflen, 0);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, M_WAITOK);
+	    mac.m_buflen, 0);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c
index f9db7dd93cd0..67cb05b636b5 100644
--- a/sys/security/mac_biba/mac_biba.c
+++ b/sys/security/mac_biba/mac_biba.c
@@ -505,7 +505,7 @@ static void
 mac_biba_init_label(struct label *label)
 {
 
-	SLOT(label) = biba_alloc(M_WAITOK);
+	SLOT(label) = biba_alloc(0);
 }
 
 static int
diff --git a/sys/security/mac_bsdextended/mac_bsdextended.c b/sys/security/mac_bsdextended/mac_bsdextended.c
index ba357fffc9c0..9231125e4a1e 100644
--- a/sys/security/mac_bsdextended/mac_bsdextended.c
+++ b/sys/security/mac_bsdextended/mac_bsdextended.c
@@ -164,7 +164,7 @@ sysctl_rule(SYSCTL_HANDLER_ARGS)
 		if (rules[index] == NULL) {
 			/* printf("addition\n"); */
 			MALLOC(ruleptr, struct mac_bsdextended_rule *,
-			    sizeof(*ruleptr), M_MACBSDEXTENDED, M_WAITOK |
+			    sizeof(*ruleptr), M_MACBSDEXTENDED,
 			    M_ZERO);
 			*ruleptr = temprule;
 			rules[index] = ruleptr;
diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c
index 483fca1a161a..0e796fd321d0 100644
--- a/sys/security/mac_lomac/mac_lomac.c
+++ b/sys/security/mac_lomac/mac_lomac.c
@@ -621,7 +621,7 @@ static void
 mac_lomac_init_label(struct label *label)
 {
 
-	SLOT(label) = lomac_alloc(M_WAITOK);
+	SLOT(label) = lomac_alloc(0);
 }
 
 static int
@@ -640,7 +640,7 @@ mac_lomac_init_proc_label(struct label *label)
 {
 
 	PSLOT(label) = malloc(sizeof(struct mac_lomac_proc), M_MACLOMAC,
-	    M_ZERO | M_WAITOK);
+	    M_ZERO);
 	mtx_init(&PSLOT(label)->mtx, "MAC/Lomac proc lock", NULL, MTX_DEF);
 }
 
diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c
index f82993d5c6d8..3948c498d9b5 100644
--- a/sys/security/mac_mls/mac_mls.c
+++ b/sys/security/mac_mls/mac_mls.c
@@ -470,7 +470,7 @@ static void
 mac_mls_init_label(struct label *label)
 {
 
-	SLOT(label) = mls_alloc(M_WAITOK);
+	SLOT(label) = mls_alloc(0);
 }
 
 static int
diff --git a/sys/sparc64/ebus/ebus.c b/sys/sparc64/ebus/ebus.c
index 42d78c858c1e..71470601ff32 100644
--- a/sys/sparc64/ebus/ebus.c
+++ b/sys/sparc64/ebus/ebus.c
@@ -371,7 +371,7 @@ ebus_setup_dinfo(struct ebus_softc *sc, phandle_t node, char *name)
 	u_int64_t start;
 	int nreg, nintr, i;
 
-	edi = malloc(sizeof(*edi), M_DEVBUF, M_ZERO | M_WAITOK);
+	edi = malloc(sizeof(*edi), M_DEVBUF, M_ZERO);
 	if (edi == NULL)
 		return (NULL);
 	resource_list_init(&edi->edi_rl);
diff --git a/sys/sparc64/pci/ofw_pci.c b/sys/sparc64/pci/ofw_pci.c
index 3787a00bd0d1..3875a290dda1 100644
--- a/sys/sparc64/pci/ofw_pci.c
+++ b/sys/sparc64/pci/ofw_pci.c
@@ -94,7 +94,7 @@ ofw_pci_orb_callback(phandle_t node, u_int8_t *pintptr, int pintsz,
 		bcopy(pregptr, &preg, sizeof(preg));
 		intr = (OFW_PCI_PHYS_HI_DEVICE(preg.phys_hi) + pintr + 3) %
 		    4 + 1;
-		*rintr = malloc(sizeof(intr), M_OFWPROP, M_WAITOK);
+		*rintr = malloc(sizeof(intr), M_OFWPROP, 0);
 		bcopy(&intr, *rintr, sizeof(intr));
 		*terminate = 0;
 		return (sizeof(intr));
@@ -134,7 +134,7 @@ ofw_pci_alloc_busno(phandle_t node)
 		om = pci_bus_map;
 		pci_bus_map_sz = n + PCI_BUS_MAP_INC;
 		pci_bus_map = malloc(sizeof(*pci_bus_map) * pci_bus_map_sz,
-		    M_DEVBUF, M_WAITOK | M_ZERO);
+		    M_DEVBUF, M_ZERO);
 		if (om != NULL) {
 			bcopy(om, pci_bus_map, sizeof(*om) * osz);
 			free(om, M_DEVBUF);
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index 30205c842ead..9b32b952a110 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -611,7 +611,7 @@ psycho_attach(device_t dev)
 		 */
 		if (INTVEC(mr) != 0x7e6 && INTVEC(mr) != 0x7e7 &&
 		    INTVEC(mr) != 0) {
-			sclr = malloc(sizeof(*sclr), M_DEVBUF, M_WAITOK);
+			sclr = malloc(sizeof(*sclr), M_DEVBUF, 0);
 			sclr->psc_sc = sc;
 			sclr->psc_clr = clr;
 			intr_setup(PIL_LOW, intr_fast, INTVEC(mr),
diff --git a/sys/sparc64/sbus/sbus.c b/sys/sparc64/sbus/sbus.c
index 16b846b774a7..d76efb5977b0 100644
--- a/sys/sparc64/sbus/sbus.c
+++ b/sys/sparc64/sbus/sbus.c
@@ -480,7 +480,7 @@ sbus_setup_dinfo(struct sbus_softc *sc, phandle_t node, char *name)
 	u_int32_t base, iv, *intr;
 	int i, nreg, nintr, slot, rslot;
 
-	sdi = malloc(sizeof(*sdi), M_DEVBUF, M_ZERO | M_WAITOK);
+	sdi = malloc(sizeof(*sdi), M_DEVBUF, M_ZERO);
 	if (sdi == NULL)
 		return (NULL);
 	resource_list_init(&sdi->sdi_rl);
diff --git a/sys/sparc64/sparc64/bus_machdep.c b/sys/sparc64/sparc64/bus_machdep.c
index 518082347bd7..e63a844e1bcc 100644
--- a/sys/sparc64/sparc64/bus_machdep.c
+++ b/sys/sparc64/sparc64/bus_machdep.c
@@ -610,7 +610,7 @@ nexus_dmamem_alloc(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
 
 	if ((ddmat->dt_maxsize <= PAGE_SIZE)) {
 		*vaddr = malloc(ddmat->dt_maxsize, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0);
 	} else {
 		/*
 		 * XXX: Use contigmalloc until it is merged into this facility
@@ -618,7 +618,7 @@ nexus_dmamem_alloc(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
 		 * allocations yet though.
 		 */
 		*vaddr = contigmalloc(ddmat->dt_maxsize, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
 		    0ul, ddmat->dt_lowaddr,
 		    ddmat->dt_alignment ? ddmat->dt_alignment : 1UL,
 		    ddmat->dt_boundary);
diff --git a/sys/sparc64/sparc64/counter.c b/sys/sparc64/sparc64/counter.c
index 19bffef94f43..d90b89f286c3 100644
--- a/sys/sparc64/sparc64/counter.c
+++ b/sys/sparc64/sparc64/counter.c
@@ -83,8 +83,8 @@ sparc64_counter_init(bus_space_tag_t tag, bus_space_handle_t handle,
 	bus_space_write_8(tag, handle, offset + CTR_CT1 + CTR_LIMIT,
 	    COUNTER_MASK);
 	/* Register as a time counter. */
-	tc = malloc(sizeof(*tc), M_DEVBUF, M_WAITOK);
-	sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK);
+	tc = malloc(sizeof(*tc), M_DEVBUF, 0);
+	sc = malloc(sizeof(*sc), M_DEVBUF, 0);
 	sc->sc_tag = tag;
 	sc->sc_handle = handle;
 	sc->sc_offset = offset + CTR_CT0;
diff --git a/sys/sparc64/sparc64/iommu.c b/sys/sparc64/sparc64/iommu.c
index af033bf7ddef..2fc7865eea2e 100644
--- a/sys/sparc64/sparc64/iommu.c
+++ b/sys/sparc64/sparc64/iommu.c
@@ -677,7 +677,7 @@ iommu_dvmamem_alloc(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is,
 	if ((error = sparc64_dmamem_alloc_map(dt, mapp)) != 0)
 		return (error);
 	if ((*vaddr = malloc(dt->dt_maxsize, M_IOMMU,
-	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL) {
+	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0)) == NULL) {
 		error = ENOMEM;
 		sparc64_dmamem_free_map(dt, *mapp);
 		return (error);
diff --git a/sys/sparc64/sparc64/mem.c b/sys/sparc64/sparc64/mem.c
index cb20e6a65450..1edb50e3b705 100644
--- a/sys/sparc64/sparc64/mem.c
+++ b/sys/sparc64/sparc64/mem.c
@@ -150,7 +150,7 @@ mmrw(dev_t dev, struct uio *uio, int flags)
 		case 0:
 			/* mem (physical memory) */
 			if (buf == NULL) {
-				buf = malloc(PAGE_SIZE, M_DEVBUF, M_WAITOK);
+				buf = malloc(PAGE_SIZE, M_DEVBUF, 0);
 				if (buf == NULL) {
 					error = ENOMEM;
 					break;
diff --git a/sys/sparc64/sparc64/nexus.c b/sys/sparc64/sparc64/nexus.c
index cf70ced52f70..0a1ee91fced1 100644
--- a/sys/sparc64/sparc64/nexus.c
+++ b/sys/sparc64/sparc64/nexus.c
@@ -234,7 +234,7 @@ nexus_probe(device_t dev)
 		}
 		cdev = device_add_child(dev, NULL, -1);
 		if (cdev != NULL) {
-			dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK);
+			dinfo = malloc(sizeof(*dinfo), M_NEXUS, 0);
 			dinfo->ndi_node = child;
 			dinfo->ndi_name = name;
 			dinfo->ndi_device_type = type;
diff --git a/sys/sparc64/sparc64/ofw_bus.c b/sys/sparc64/sparc64/ofw_bus.c
index 605a347d7940..3d5736e7359d 100644
--- a/sys/sparc64/sparc64/ofw_bus.c
+++ b/sys/sparc64/sparc64/ofw_bus.c
@@ -108,7 +108,7 @@ ofw_bus_find_intr(u_int8_t *intr, int intrsz, u_int8_t *regs, int physsz,
 	int i, rsz, tsz;
 
 	rsz = -1;
-	ref = malloc(physsz + intrsz, M_TEMP, M_WAITOK);
+	ref = malloc(physsz + intrsz, M_TEMP, 0);
 	if (imapmsk != NULL) {
 		for (i = 0; i < physsz; i++)
 			ref[i] = regs[i] & imapmsk[i];
@@ -131,7 +131,7 @@ ofw_bus_find_intr(u_int8_t *intr, int intrsz, u_int8_t *regs, int physsz,
 		KASSERT(i >= physsz + intrsz + sizeof(parent) +
 		    pintrsz, ("ofw_bus_find_intr: truncated map"));
 		if (bcmp(ref, mptr, physsz + intrsz) == 0) {
-			*result = malloc(pintrsz, M_OFWPROP, M_WAITOK);
+			*result = malloc(pintrsz, M_OFWPROP, 0);
 			bcopy(mptr + physsz + intrsz + sizeof(parent),
 			    *result, pintrsz);
 			rsz = pintrsz;
@@ -177,7 +177,7 @@ ofw_bus_route_intr(phandle_t node, int intrp, obr_callback_t *cb)
 	} else {
 		ic = intrp;
 		isz = sizeof(ic);
-		intr = malloc(isz, M_OFWPROP, M_WAITOK);
+		intr = malloc(isz, M_OFWPROP, 0);
 		bcopy(&ic, intr, isz);
 	}
 	/*
diff --git a/sys/sparc64/sparc64/sys_machdep.c b/sys/sparc64/sparc64/sys_machdep.c
index 34be95acf580..4a0b51e11335 100644
--- a/sys/sparc64/sparc64/sys_machdep.c
+++ b/sys/sparc64/sparc64/sys_machdep.c
@@ -117,7 +117,7 @@ sparc_utrap_install(struct thread *td, char *args)
 		if (ua.type != UTH_NOCHANGE) {
 			if (ut == NULL) {
 				ut = malloc(sizeof *ut, M_SUBPROC,
-				    M_WAITOK | M_ZERO);
+				    M_ZERO);
 				ut->ut_refcnt = 1;
 				td->td_proc->p_md.md_utrap = ut;
 			}
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index f61043995af6..57b3071df71f 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -46,8 +46,9 @@
 /*
  * flags to malloc.
  */
-#define	M_WAITOK	0x0000
+#ifndef M_NOWAIT
 #define	M_NOWAIT	0x0001		/* do not block */
+#endif /* M_NOWAIT */
 #define	M_USE_RESERVE	0x0002		/* can alloc out of reserve memory */
 #define	M_ZERO		0x0004		/* bzero the allocation */
 #define	M_NOVM		0x0008		/* don't ask VM for pages */
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 0ad8664466ef..a66c1fba81cb 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -263,13 +263,13 @@ struct mbstat {
 
 /*
  * Flags specifying how an allocation should be made.
- * M_DONTWAIT means "don't block if nothing is available" whereas
- * M_TRYWAIT means "block for mbuf_wait ticks at most if nothing is
+ * M_NOWAIT means "don't block if nothing is available" whereas
+ * 0 means "block for mbuf_wait ticks at most if nothing is
  * available."
  */
-#define	M_DONTWAIT	1
-#define	M_TRYWAIT	0
-#define	M_WAIT		M_TRYWAIT	/* XXX: Deprecated. */
+#ifndef M_NOWAIT	/* malloc.h also defines this. */
+#define	M_NOWAIT	0x0001
+#endif
 
 #ifdef _KERNEL
 /*-
@@ -404,7 +404,7 @@ struct mbstat {
 #define	M_COPYALL	1000000000
 
 /* Compatibility with 4.3. */
-#define	m_copy(m, o, l)	m_copym((m), (o), (l), M_DONTWAIT)
+#define	m_copy(m, o, l)	m_copym((m), (o), (l), M_NOWAIT)
 
 extern	int max_datalen;		/* MHLEN - max_hdr */
 extern	int max_hdr;			/* Largest link + protocol header */
diff --git a/sys/sys/posix4.h b/sys/sys/posix4.h
index b17e9270e675..033c1ec46f1b 100644
--- a/sys/sys/posix4.h
+++ b/sys/sys/posix4.h
@@ -56,7 +56,7 @@ int SC (struct thread *td, struct SC##_args *uap) \
 
 MALLOC_DECLARE(M_P31B);
 
-#define p31b_malloc(SIZE) malloc((SIZE), M_P31B, M_WAITOK)
+#define p31b_malloc(SIZE) malloc((SIZE), M_P31B, 0)
 #define p31b_free(P) free((P), M_P31B)
 
 int p31b_proc(struct proc *, pid_t, struct proc **);
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index 6b22cfdf8413..6b715f228fc1 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -253,7 +253,7 @@ struct xsocket {
  * Returns error without lock if sleep is interrupted.
  */
 #define sblock(sb, wf) ((sb)->sb_flags & SB_LOCK ? \
-		(((wf) == M_WAITOK) ? sb_lock(sb) : EWOULDBLOCK) : \
+		(((wf) == 0) ? sb_lock(sb) : EWOULDBLOCK) : \
 		((sb)->sb_flags |= SB_LOCK), 0)
 
 /* release lock on sockbuf sb */
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index ed4e04c461dc..7af8b6998583 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -573,7 +573,7 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
 	else
 		bap2 = (ufs2_daddr_t *)bp->b_data;
 	if (lastbn != -1) {
-		MALLOC(copy, caddr_t, fs->fs_bsize, M_TEMP, M_WAITOK);
+		MALLOC(copy, caddr_t, fs->fs_bsize, M_TEMP, 0);
 		bcopy((caddr_t)bp->b_data, copy, (u_int)fs->fs_bsize);
 		for (i = last + 1; i < NINDIR(fs); i++)
 			BAP(ip, i) = 0;
diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c
index 7fe373d7bcaf..b26d10bd70d6 100644
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -269,7 +269,7 @@ restart:
 	 * the suspension period.
 	 */
 	len = howmany(fs->fs_ncg, NBBY);
-	MALLOC(fs->fs_active, int *, len, M_DEVBUF, M_WAITOK);
+	MALLOC(fs->fs_active, int *, len, M_DEVBUF, 0);
 	bzero(fs->fs_active, len);
 	for (cg = 0; cg < fs->fs_ncg; cg++) {
 		error = UFS_BALLOC(vp, (off_t)(cgtod(fs, cg)) << fs->fs_fshift,
@@ -359,7 +359,7 @@ restart:
 	size = blkroundup(fs, fs->fs_cssize);
 	if (fs->fs_contigsumsize > 0)
 		size += fs->fs_ncg * sizeof(int32_t);
-	space = malloc((u_long)size, M_UFSMNT, M_WAITOK);
+	space = malloc((u_long)size, M_UFSMNT, 0);
 	copy_fs->fs_csp = space;
 	bcopy(fs->fs_csp, copy_fs->fs_csp, fs->fs_cssize);
 	(char *)space += fs->fs_cssize;
@@ -473,7 +473,7 @@ loop:
 
 		VI_UNLOCK(devvp);
 		MALLOC(lkp, struct lock *, sizeof(struct lock), M_UFSMNT,
-		    M_WAITOK);
+		    0);
 		lockinit(lkp, PVFS, "snaplk", VLKTIMEOUT,
 		    LK_CANRECURSE | LK_NOPAUSE);
 		VI_LOCK(vp);
@@ -536,7 +536,7 @@ out1:
 	snaplistsize = fs->fs_ncg + howmany(fs->fs_cssize, fs->fs_bsize) +
 	    FSMAXSNAP + 1 /* superblock */ + 1 /* last block */ + 1 /* size */;
 	MALLOC(snapblklist, daddr_t *, snaplistsize * sizeof(daddr_t),
-	    M_UFSMNT, M_WAITOK);
+	    M_UFSMNT, 0);
 	ip->i_snapblklist = &snapblklist[1];
 	/*
 	 * Expunge the blocks used by the snapshots from the set of
@@ -872,7 +872,7 @@ indiracct_ufs1(snapvp, cancelvp, level, blkno, lbn, rlbn, remblks,
 	last = howmany(remblks, blksperindir);
 	if (last > NINDIR(fs))
 		last = NINDIR(fs);
-	MALLOC(bap, ufs1_daddr_t *, fs->fs_bsize, M_DEVBUF, M_WAITOK);
+	MALLOC(bap, ufs1_daddr_t *, fs->fs_bsize, M_DEVBUF, 0);
 	bcopy(bp->b_data, (caddr_t)bap, fs->fs_bsize);
 	bqrelse(bp);
 	error = (*acctfunc)(snapvp, &bap[0], &bap[last], fs,
@@ -1147,7 +1147,7 @@ indiracct_ufs2(snapvp, cancelvp, level, blkno, lbn, rlbn, remblks,
 	last = howmany(remblks, blksperindir);
 	if (last > NINDIR(fs))
 		last = NINDIR(fs);
-	MALLOC(bap, ufs2_daddr_t *, fs->fs_bsize, M_DEVBUF, M_WAITOK);
+	MALLOC(bap, ufs2_daddr_t *, fs->fs_bsize, M_DEVBUF, 0);
 	bcopy(bp->b_data, (caddr_t)bap, fs->fs_bsize);
 	bqrelse(bp);
 	error = (*acctfunc)(snapvp, &bap[0], &bap[last], fs,
@@ -1731,7 +1731,7 @@ ffs_snapshot_mount(mp)
 
 			VI_UNLOCK(devvp);
 			MALLOC(lkp, struct lock *, sizeof(struct lock),
-			    M_UFSMNT, M_WAITOK);
+			    M_UFSMNT, 0);
 			lockinit(lkp, PVFS, "snaplk", VLKTIMEOUT,
 			    LK_CANRECURSE | LK_NOPAUSE);
 			VI_LOCK(vp);
@@ -1779,7 +1779,7 @@ ffs_snapshot_mount(mp)
 		return;
 	}
 	MALLOC(snapblklist, void *, snaplistsize * sizeof(daddr_t),
-	    M_UFSMNT, M_WAITOK);
+	    M_UFSMNT, 0);
 	auio.uio_iovcnt = 1;
 	aiov.iov_base = snapblklist;
 	aiov.iov_len = snaplistsize * sizeof (daddr_t);
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 872433d14461..fcc892948b8c 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -96,7 +96,7 @@ static MALLOC_DEFINE(M_MKDIR, "mkdir","New directory");
 static MALLOC_DEFINE(M_DIRREM, "dirrem","Directory entry deleted");
 static MALLOC_DEFINE(M_NEWDIRBLK, "newdirblk","Unclaimed new directory block");
 
-#define M_SOFTDEP_FLAGS	(M_WAITOK | M_USE_RESERVE)
+#define M_SOFTDEP_FLAGS	(M_USE_RESERVE)
 
 #define	D_PAGEDEP	0
 #define	D_INODEDEP	1
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index e29cdb65e3e1..203ad037976d 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -686,9 +686,9 @@ ffs_mountfs(devvp, mp, td)
 		fs->fs_pendingblocks = 0;
 		fs->fs_pendinginodes = 0;
 	}
-	ump = malloc(sizeof *ump, M_UFSMNT, M_WAITOK | M_ZERO);
+	ump = malloc(sizeof *ump, M_UFSMNT, M_ZERO);
 	ump->um_fs = malloc((u_long)fs->fs_sbsize, M_UFSMNT,
-	    M_WAITOK);
+	    0);
 	if (fs->fs_magic == FS_UFS1_MAGIC) {
 		ump->um_fstype = UFS1;
 		ump->um_balloc = ffs_balloc_ufs1;
@@ -715,7 +715,7 @@ ffs_mountfs(devvp, mp, td)
 	if (fs->fs_contigsumsize > 0)
 		size += fs->fs_ncg * sizeof(int32_t);
 	size += fs->fs_ncg * sizeof(u_int8_t);
-	space = malloc((u_long)size, M_UFSMNT, M_WAITOK);
+	space = malloc((u_long)size, M_UFSMNT, 0);
 	fs->fs_csp = space;
 	for (i = 0; i < blks; i += fs->fs_frag) {
 		size = fs->fs_bsize;
@@ -1248,7 +1248,7 @@ ffs_vget(mp, ino, flags, vpp)
 	 * which will cause a panic because ffs_sync() blindly
 	 * dereferences vp->v_data (as well it should).
 	 */
-	ip = uma_zalloc(uma_inode, M_WAITOK);
+	ip = uma_zalloc(uma_inode, 0);
 
 	/* Allocate a new vnode/inode. */
 	error = getnewvnode("ufs", mp, ffs_vnodeop_p, &vp);
@@ -1315,9 +1315,9 @@ ffs_vget(mp, ino, flags, vpp)
 		return (error);
 	}
 	if (ip->i_ump->um_fstype == UFS1)
-		ip->i_din1 = uma_zalloc(uma_ufs1, M_WAITOK);
+		ip->i_din1 = uma_zalloc(uma_ufs1, 0);
 	else
-		ip->i_din2 = uma_zalloc(uma_ufs2, M_WAITOK);
+		ip->i_din2 = uma_zalloc(uma_ufs2, 0);
 	ffs_load_inode(bp, ip, fs, ino);
 	if (DOINGSOFTDEP(vp))
 		softdep_load_inodeblock(ip);
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 626b156cb2d0..6213a49890bc 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -1382,7 +1382,7 @@ ffs_rdextattr(u_char **p, struct vnode *vp, struct thread *td, int extra)
 	dp = ip->i_din2;
 	easize = dp->di_extsize;
 
-	eae = malloc(easize + extra, M_TEMP, M_WAITOK);
+	eae = malloc(easize + extra, M_TEMP, 0);
 
 	liovec.iov_base = eae;
 	liovec.iov_len = easize;
@@ -1707,7 +1707,7 @@ vop_setextattr {
 		ealength += eapad1 + ealen + eapad2;
 	}
 
-	eae = malloc(ip->i_ea_len + ealength, M_TEMP, M_WAITOK);
+	eae = malloc(ip->i_ea_len + ealength, M_TEMP, 0);
 	bcopy(ip->i_ea_area, eae, ip->i_ea_len);
 	easize = ip->i_ea_len;
 
diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c
index f2d3a70ff914..27d32efc157d 100644
--- a/sys/ufs/ufs/ufs_dirhash.c
+++ b/sys/ufs/ufs/ufs_dirhash.c
@@ -187,7 +187,7 @@ ufsdirhash_build(struct inode *ip)
 		goto fail;
 	for (i = 0; i < narrays; i++) {
 		if ((dh->dh_hash[i] = uma_zalloc(ufsdirhash_zone,
-		    M_WAITOK)) == NULL)
+		    0)) == NULL)
 			goto fail;
 		for (j = 0; j < DH_NBLKOFF; j++)
 			dh->dh_hash[i][j] = DIRHASH_EMPTY;
diff --git a/sys/ufs/ufs/ufs_extattr.c b/sys/ufs/ufs/ufs_extattr.c
index 3d999b1f2a4a..57d30e7aaeea 100644
--- a/sys/ufs/ufs/ufs_extattr.c
+++ b/sys/ufs/ufs/ufs_extattr.c
@@ -254,7 +254,7 @@ ufs_extattr_lookup(struct vnode *start_dvp, int lockparent, char *dirname,
 		cnp.cn_flags |= LOCKPARENT;
 	cnp.cn_thread = td;
 	cnp.cn_cred = td->td_ucred;
-	cnp.cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
+	cnp.cn_pnbuf = uma_zalloc(namei_zone, 0);
 	cnp.cn_nameptr = cnp.cn_pnbuf;
 	error = copystr(dirname, cnp.cn_pnbuf, MAXPATHLEN,
 	    (size_t *) &cnp.cn_namelen);
@@ -383,7 +383,7 @@ ufs_extattr_iterate_directory(struct ufsmount *ump, struct vnode *dvp,
 	if (dvp->v_type != VDIR)
 		return (ENOTDIR);
 
-	MALLOC(dirbuf, char *, DIRBLKSIZ, M_TEMP, M_WAITOK);
+	MALLOC(dirbuf, char *, DIRBLKSIZ, M_TEMP, 0);
 
 	auio.uio_iov = &aiov;
 	auio.uio_iovcnt = 1;
@@ -594,7 +594,7 @@ ufs_extattr_enable(struct ufsmount *ump, int attrnamespace,
 		return (EINVAL);
 
 	MALLOC(attribute, struct ufs_extattr_list_entry *,
-	    sizeof(struct ufs_extattr_list_entry), M_UFS_EXTATTR, M_WAITOK);
+	    sizeof(struct ufs_extattr_list_entry), M_UFS_EXTATTR, 0);
 	if (attribute == NULL)
 		return (ENOMEM);
 
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 258241293e3f..683c6bd6139d 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -822,7 +822,7 @@ dqget(vp, id, ump, type, dqp)
 		desireddquot += DQUOTINC;
 	if (numdquot < desireddquot) {
 		dq = (struct dquot *)malloc(sizeof *dq, M_DQUOT,
-		    M_WAITOK | M_ZERO);
+		    M_ZERO);
 		numdquot++;
 	} else {
 		if ((dq = TAILQ_FIRST(&dqfreelist)) == NULL) {
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index af65b36d80be..de56eece5285 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -368,7 +368,7 @@ ufs_access(ap)
 
 #ifdef UFS_ACL
 	if ((vp->v_mount->mnt_flag & MNT_ACLS) != 0) {
-		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, M_WAITOK);
+		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, 0);
 		len = sizeof(*acl);
 		error = VOP_GETACL(vp, ACL_TYPE_ACCESS, acl, ap->a_cred,
 		    ap->a_td);
@@ -1442,8 +1442,8 @@ ufs_mkdir(ap)
 #ifdef UFS_ACL
 	acl = dacl = NULL;
 	if ((dvp->v_mount->mnt_flag & MNT_ACLS) != 0) {
-		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, M_WAITOK);
-		MALLOC(dacl, struct acl *, sizeof(*dacl), M_ACL, M_WAITOK);
+		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, 0);
+		MALLOC(dacl, struct acl *, sizeof(*dacl), M_ACL, 0);
 
 		/*
 		 * Retrieve default ACL from parent, if any.
@@ -1845,7 +1845,7 @@ ufs_readdir(ap)
 			auio.uio_iovcnt = 1;
 			auio.uio_segflg = UIO_SYSSPACE;
 			aiov.iov_len = count;
-			MALLOC(dirbuf, caddr_t, count, M_TEMP, M_WAITOK);
+			MALLOC(dirbuf, caddr_t, count, M_TEMP, 0);
 			aiov.iov_base = dirbuf;
 			error = VOP_READ(ap->a_vp, &auio, 0, ap->a_cred);
 			if (error == 0) {
@@ -1889,7 +1889,7 @@ ufs_readdir(ap)
 		     dp = (struct dirent *)((caddr_t) dp + dp->d_reclen))
 			ncookies++;
 		MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP,
-		    M_WAITOK);
+		    0);
 		for (dp = dpStart, cookiep = cookies;
 		     dp < dpEnd;
 		     dp = (struct dirent *)((caddr_t) dp + dp->d_reclen)) {
@@ -2422,7 +2422,7 @@ ufs_makeinode(mode, dvp, vpp, cnp)
 #ifdef UFS_ACL
 	acl = NULL;
 	if ((dvp->v_mount->mnt_flag & MNT_ACLS) != 0) {
-		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, M_WAITOK);
+		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, 0);
 
 		/*
 		 * Retrieve default ACL for parent, if any.
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index e7acedcdbfb1..a0cf5283fba7 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -266,7 +266,7 @@ dev_pager_getfake(paddr)
 {
 	vm_page_t m;
 
-	m = uma_zalloc(fakepg_zone, M_WAITOK);
+	m = uma_zalloc(fakepg_zone, 0);
 
 	m->flags = PG_BUSY | PG_FICTITIOUS;
 	m->valid = VM_PAGE_BITS_ALL;
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 0fb5d2203113..58568a2e0298 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -337,7 +337,7 @@ swap_pager_swap_init()
 	 */
 	for (n = 1; n < n2 / 8; n *= 2)
 		;
-	swhash = malloc(sizeof(struct swblock *) * n, M_VMPGDATA, M_WAITOK | M_ZERO);
+	swhash = malloc(sizeof(struct swblock *) * n, M_VMPGDATA, M_ZERO);
 	swhash_mask = n - 1;
 }
 
diff --git a/sys/vm/uma.h b/sys/vm/uma.h
index 769d81af4d12..988b79f8867a 100644
--- a/sys/vm/uma.h
+++ b/sys/vm/uma.h
@@ -209,7 +209,7 @@ void uma_zdestroy(uma_zone_t zone);
  *
  * Returns:
  *	A non null pointer to an initialized element from the zone is
- *	garanteed if the wait flag is M_WAITOK, otherwise a null pointer may be
+ *	garanteed if the wait flag is not M_NOWAIT, otherwise null may be
  *	returned if the zone is empty or the ctor failed.
  */
 
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index 044112de1768..ef43fc26bb3c 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -354,7 +354,7 @@ hash_alloc(struct uma_hash *hash)
 	} else {
 		alloc = sizeof(hash->uh_slab_hash[0]) * UMA_HASH_SIZE_INIT;
 		hash->uh_slab_hash = uma_zalloc_internal(hashzone, NULL,
-		    M_WAITOK);
+		    0);
 		hash->uh_hashsize = UMA_HASH_SIZE_INIT;
 	}
 	if (hash->uh_slab_hash) {
@@ -1300,7 +1300,7 @@ uma_zcreate(char *name, size_t size, uma_ctor ctor, uma_dtor dtor,
 	args.align = align;
 	args.flags = flags;
 
-	return (uma_zalloc_internal(zones, &args, M_WAITOK));
+	return (uma_zalloc_internal(zones, &args, 0));
 }
 
 /* See uma.h */
@@ -1326,7 +1326,7 @@ uma_zalloc_arg(uma_zone_t zone, void *udata, int flags)
 
 	if (!(flags & M_NOWAIT)) {
 		KASSERT(curthread->td_intr_nesting_level == 0,
-		   ("malloc(M_WAITOK) in interrupt context"));
+		   ("malloc without M_NOWAIT in interrupt context"));
 		WITNESS_SLEEP(1, NULL);
 	}
 
@@ -1609,7 +1609,7 @@ done:
  * Arguments
  *	zone   The zone to alloc for.
  *	udata  The data to be passed to the constructor.
- *	flags  M_WAITOK, M_NOWAIT, M_ZERO.
+ *	flags  M_NOWAIT, M_ZERO.
  *
  * Returns
  *	NULL if there is no memory and M_NOWAIT is set
@@ -1964,7 +1964,7 @@ uma_prealloc(uma_zone_t zone, int items)
 		slabs++;
 
 	while (slabs > 0) {
-		slab = slab_zalloc(zone, M_WAITOK);
+		slab = slab_zalloc(zone, 0);
 		LIST_INSERT_HEAD(&zone->uz_free_slab, slab, us_link);
 		slabs--;
 	}
@@ -2074,7 +2074,7 @@ sysctl_vm_zone(SYSCTL_HANDLER_ARGS)
 		cnt++;
 	mtx_unlock(&uma_mtx);
 	MALLOC(tmpbuf, char *, (cnt == 0 ? 1 : cnt) * linesize,
-			M_TEMP, M_WAITOK);
+			M_TEMP, 0);
 	len = snprintf(tmpbuf, linesize,
 	    "\nITEM            SIZE     LIMIT     USED    FREE  REQUESTS\n\n");
 	if (cnt == 0)
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index f1f5b5154bbe..6d52a80636fd 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -255,7 +255,7 @@ vmspace_alloc(min, max)
 	struct vmspace *vm;
 
 	GIANT_REQUIRED;
-	vm = uma_zalloc(vmspace_zone, M_WAITOK);
+	vm = uma_zalloc(vmspace_zone, 0);
 	CTR1(KTR_VM, "vmspace_alloc: %p", vm);
 	_vm_map_init(&vm->vm_map, min, max);
 	pmap_pinit(vmspace_pmap(vm));
@@ -513,7 +513,7 @@ vm_map_create(pmap_t pmap, vm_offset_t min, vm_offset_t max)
 {
 	vm_map_t result;
 
-	result = uma_zalloc(mapzone, M_WAITOK);
+	result = uma_zalloc(mapzone, 0);
 	CTR1(KTR_VM, "vm_map_create: %p", result);
 	_vm_map_init(result, min, max);
 	result->pmap = pmap;
@@ -572,7 +572,7 @@ vm_map_entry_create(vm_map_t map)
 	if (map->system_map)
 		new_entry = uma_zalloc(kmapentzone, M_NOWAIT);
 	else
-		new_entry = uma_zalloc(mapentzone, M_WAITOK);
+		new_entry = uma_zalloc(mapentzone, 0);
 	if (new_entry == NULL)
 		panic("vm_map_entry_create: kernel resources exhausted");
 	return (new_entry);
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 1959cd3abebe..f00499f54a79 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -353,7 +353,7 @@ vm_object_allocate_wait(objtype_t type, vm_pindex_t size, int flags)
 vm_object_t
 vm_object_allocate(objtype_t type, vm_pindex_t size)
 {
-	return(vm_object_allocate_wait(type, size, M_WAITOK));
+	return(vm_object_allocate_wait(type, size, 0));
 }
 
 
-- 
cgit v1.3


From a163d034fadcfb4a25ca34a2ba5f491c47b6ff69 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 19 Feb 2003 05:47:46 +0000
Subject: Back out M_* changes, per decision of the TRB.

Approved by: trb
---
 sys/alpha/alpha/busdma_machdep.c                   |  4 +-
 sys/alpha/osf1/imgact_osf1.c                       |  6 +-
 sys/alpha/osf1/osf1_misc.c                         | 10 ++--
 sys/amd64/amd64/amd64_mem.c                        |  2 +-
 sys/amd64/amd64/bios.c                             |  2 +-
 sys/amd64/amd64/busdma_machdep.c                   |  4 +-
 sys/amd64/amd64/mem.c                              |  4 +-
 sys/amd64/amd64/mp_machdep.c                       |  8 +--
 sys/amd64/amd64/mptable.c                          |  8 +--
 sys/amd64/amd64/sys_machdep.c                      |  2 +-
 sys/amd64/ia32/ia32_misc.c                         | 10 ++--
 sys/amd64/include/mptable.h                        |  8 +--
 sys/cam/cam_periph.c                               |  2 +-
 sys/cam/cam_sim.c                                  |  2 +-
 sys/cam/cam_xpt.c                                  |  4 +-
 sys/cam/scsi/scsi_cd.c                             | 44 +++++++-------
 sys/cam/scsi/scsi_ch.c                             |  6 +-
 sys/cam/scsi/scsi_da.c                             |  2 +-
 sys/cam/scsi/scsi_low.c                            |  2 +-
 sys/cam/scsi/scsi_sa.c                             |  8 +--
 sys/cam/scsi/scsi_target.c                         |  6 +-
 sys/coda/cnode.h                                   |  2 +-
 sys/compat/freebsd32/freebsd32_misc.c              | 10 ++--
 sys/compat/linux/linux_file.c                      |  2 +-
 sys/compat/linux/linux_getcwd.c                    |  4 +-
 sys/compat/linux/linux_ioctl.c                     |  2 +-
 sys/compat/linux/linux_mib.c                       |  2 +-
 sys/compat/linux/linux_sysctl.c                    |  2 +-
 sys/compat/linux/linux_util.c                      |  2 +-
 sys/compat/pecoff/imgact_pecoff.c                  | 12 ++--
 sys/compat/svr4/svr4_filio.c                       |  2 +-
 sys/compat/svr4/svr4_misc.c                        |  4 +-
 sys/compat/svr4/svr4_socket.c                      |  2 +-
 sys/compat/svr4/svr4_stream.c                      |  8 +--
 sys/compat/svr4/svr4_sysvec.c                      |  2 +-
 sys/contrib/dev/fla/fla.c                          |  2 +-
 sys/contrib/dev/oltr/if_oltr.c                     |  8 +--
 sys/contrib/ipfilter/netinet/fil.c                 |  6 +-
 sys/contrib/ipfilter/netinet/ip_fil.c              | 18 +++---
 sys/dev/agp/agp.c                                  |  2 +-
 sys/dev/agp/agp_i810.c                             |  2 +-
 sys/dev/amr/amr.c                                  |  4 +-
 sys/dev/an/if_an.c                                 | 10 ++--
 sys/dev/ar/if_ar.c                                 |  6 +-
 sys/dev/asr/asr.c                                  | 38 ++++++------
 sys/dev/ata/atapi-cam.c                            |  2 +-
 sys/dev/awi/awi.c                                  | 20 +++----
 sys/dev/awi/awi_wep.c                              | 10 ++--
 sys/dev/bge/if_bge.c                               |  6 +-
 sys/dev/cardbus/cardbus_cis.c                      |  6 +-
 sys/dev/ccd/ccd.c                                  | 21 +++----
 sys/dev/ciss/ciss.c                                |  4 +-
 sys/dev/cm/smc90cx6.c                              |  4 +-
 sys/dev/cnw/if_cnw.c                               |  6 +-
 sys/dev/cs/if_cs.c                                 |  4 +-
 sys/dev/dc/if_dc.c                                 |  8 +--
 sys/dev/de/if_de.c                                 | 16 ++---
 sys/dev/digi/digi.c                                | 14 ++---
 sys/dev/dpt/dpt_scsi.c                             |  4 +-
 sys/dev/drm/drm_drv.h                              |  2 +-
 sys/dev/drm/drm_memory.h                           |  2 +-
 sys/dev/ed/if_ed.c                                 |  4 +-
 sys/dev/em/if_em.c                                 |  4 +-
 sys/dev/en/midway.c                                | 14 ++---
 sys/dev/ep/if_ep.c                                 |  8 +--
 sys/dev/ex/if_ex.c                                 |  6 +-
 sys/dev/fb/fb.c                                    |  6 +-
 sys/dev/fb/vga.c                                   |  4 +-
 sys/dev/fe/if_fe.c                                 |  4 +-
 sys/dev/firewire/if_fwe.c                          |  4 +-
 sys/dev/fxp/if_fxp.c                               |  6 +-
 sys/dev/gem/if_gem.c                               |  2 +-
 sys/dev/gx/if_gx.c                                 |  4 +-
 sys/dev/hifn/hifn7751.c                            | 12 ++--
 sys/dev/hme/if_hme.c                               |  2 +-
 sys/dev/idt/idt.c                                  |  8 +--
 sys/dev/ie/if_ie.c                                 |  6 +-
 sys/dev/iicbus/if_ic.c                             |  4 +-
 sys/dev/isp/isp_pci.c                              |  6 +-
 sys/dev/isp/isp_sbus.c                             |  4 +-
 sys/dev/kbd/kbd.c                                  |  2 +-
 sys/dev/lge/if_lge.c                               |  2 +-
 sys/dev/lmc/if_lmc.c                               | 14 ++---
 sys/dev/lnc/if_lnc.c                               | 14 ++---
 sys/dev/md/md.c                                    |  4 +-
 sys/dev/mlx/mlx.c                                  |  2 +-
 sys/dev/mly/mly.c                                  |  2 +-
 sys/dev/mpt/mpt_pci.c                              |  4 +-
 sys/dev/musycc/musycc.c                            | 20 +++----
 sys/dev/my/if_my.c                                 |  8 +--
 sys/dev/nge/if_nge.c                               |  2 +-
 sys/dev/nmdm/nmdm.c                                |  2 +-
 sys/dev/null/null.c                                |  2 +-
 sys/dev/ofw/openfirm.c                             |  4 +-
 sys/dev/ofw/openfirmio.c                           |  4 +-
 sys/dev/pccard/pccard.c                            |  2 +-
 sys/dev/pci/pci.c                                  |  2 +-
 sys/dev/pci/pci_user.c                             |  2 +-
 sys/dev/pdq/pdq_freebsd.h                          |  4 +-
 sys/dev/pdq/pdq_ifsubr.c                           |  4 +-
 sys/dev/pdq/pdqvar.h                               |  4 +-
 sys/dev/ppbus/if_plip.c                            |  2 +-
 sys/dev/ppbus/lpt.c                                |  4 +-
 sys/dev/ppbus/vpo.c                                |  2 +-
 sys/dev/puc/puc.c                                  |  2 +-
 sys/dev/raidframe/rf_freebsdkintf.c                | 14 ++---
 sys/dev/raidframe/rf_shutdown.c                    |  2 +-
 sys/dev/random/randomdev.c                         |  4 +-
 sys/dev/ray/if_ray.c                               |  6 +-
 sys/dev/sbni/if_sbni.c                             |  4 +-
 sys/dev/sf/if_sf.c                                 |  8 +--
 sys/dev/sk/if_sk.c                                 |  2 +-
 sys/dev/sn/if_sn.c                                 |  4 +-
 sys/dev/snc/dp83932.c                              |  6 +-
 sys/dev/snp/snp.c                                  |  8 +--
 sys/dev/sound/midi/midi.c                          |  6 +-
 sys/dev/sound/midi/midibuf.c                       |  2 +-
 sys/dev/sound/midi/sequencer.c                     |  6 +-
 sys/dev/sound/midi/timer.c                         |  4 +-
 sys/dev/sound/pci/ds1.c                            |  2 +-
 sys/dev/sound/pci/emu10k1.c                        |  2 +-
 sys/dev/sound/pcm/ac97.c                           |  2 +-
 sys/dev/sound/pcm/buffer.c                         |  2 +-
 sys/dev/sound/pcm/fake.c                           |  4 +-
 sys/dev/sound/pcm/feeder.c                         |  4 +-
 sys/dev/sound/pcm/mixer.c                          |  2 +-
 sys/dev/sound/pcm/sndstat.c                        |  2 +-
 sys/dev/sound/pcm/sound.c                          |  8 +--
 sys/dev/sound/pcm/vchan.c                          |  4 +-
 sys/dev/speaker/spkr.c                             |  2 +-
 sys/dev/sr/if_sr.c                                 |  6 +-
 sys/dev/streams/streams.c                          |  2 +-
 sys/dev/syscons/daemon/daemon_saver.c              |  2 +-
 sys/dev/syscons/schistory.c                        |  2 +-
 sys/dev/syscons/scmouse.c                          |  2 +-
 sys/dev/syscons/scvtb.c                            |  2 +-
 sys/dev/syscons/snake/snake_saver.c                |  4 +-
 sys/dev/syscons/syscons.c                          | 12 ++--
 sys/dev/ti/if_ti.c                                 | 16 ++---
 sys/dev/trm/trm.c                                  |  4 +-
 sys/dev/twe/twe.c                                  |  4 +-
 sys/dev/tx/if_tx.c                                 |  8 +--
 sys/dev/tx/if_txvar.h                              |  4 +-
 sys/dev/txp/if_txp.c                               | 12 ++--
 sys/dev/ubsec/ubsec.c                              | 12 ++--
 sys/dev/usb/hid.c                                  |  4 +-
 sys/dev/usb/if_aue.c                               |  4 +-
 sys/dev/usb/if_cue.c                               |  4 +-
 sys/dev/usb/if_kue.c                               |  4 +-
 sys/dev/usb/ubsa.c                                 |  4 +-
 sys/dev/usb/udbp.c                                 |  4 +-
 sys/dev/usb/uftdi.c                                |  2 +-
 sys/dev/usb/ugen.c                                 | 10 ++--
 sys/dev/usb/uhci.c                                 |  4 +-
 sys/dev/usb/uhid.c                                 |  4 +-
 sys/dev/usb/umass.c                                |  2 +-
 sys/dev/usb/umodem.c                               |  2 +-
 sys/dev/usb/uplcom.c                               |  4 +-
 sys/dev/usb/urio.c                                 |  2 +-
 sys/dev/usb/usb.c                                  |  4 +-
 sys/dev/usb/uscanner.c                             |  4 +-
 sys/dev/usb/uvisor.c                               |  2 +-
 sys/dev/usb/uvscom.c                               |  4 +-
 sys/dev/vinum/vinumext.h                           |  2 +-
 sys/dev/vinum/vinummemory.c                        |  2 +-
 sys/dev/vr/if_vr.c                                 |  8 +--
 sys/dev/vx/if_vx.c                                 |  8 +--
 sys/dev/wi/if_wi.c                                 | 12 ++--
 sys/dev/wl/if_wl.c                                 |  2 +-
 sys/dev/xe/if_xe.c                                 |  4 +-
 sys/fs/cd9660/cd9660_vfsops.c                      |  4 +-
 sys/fs/cd9660/cd9660_vnops.c                       |  8 +--
 sys/fs/coda/cnode.h                                |  2 +-
 sys/fs/devfs/devfs_devs.c                          | 10 ++--
 sys/fs/devfs/devfs_rule.c                          |  6 +-
 sys/fs/devfs/devfs_vfsops.c                        |  4 +-
 sys/fs/devfs/devfs_vnops.c                         |  4 +-
 sys/fs/fdescfs/fdesc_vfsops.c                      |  2 +-
 sys/fs/fdescfs/fdesc_vnops.c                       |  2 +-
 sys/fs/fifofs/fifo_vnops.c                         |  2 +-
 sys/fs/hpfs/hpfs_subr.c                            |  6 +-
 sys/fs/hpfs/hpfs_vfsops.c                          |  4 +-
 sys/fs/hpfs/hpfs_vnops.c                           |  2 +-
 sys/fs/msdosfs/msdosfs_denode.c                    |  2 +-
 sys/fs/msdosfs/msdosfs_vfsops.c                    |  4 +-
 sys/fs/msdosfs/msdosfs_vnops.c                     |  2 +-
 sys/fs/ntfs/ntfs_subr.c                            | 38 ++++++------
 sys/fs/ntfs/ntfs_vfsops.c                          |  6 +-
 sys/fs/ntfs/ntfs_vnops.c                           |  2 +-
 sys/fs/nullfs/null_subr.c                          |  2 +-
 sys/fs/nullfs/null_vfsops.c                        |  2 +-
 sys/fs/nwfs/nwfs_node.c                            |  2 +-
 sys/fs/nwfs/nwfs_vfsops.c                          |  2 +-
 sys/fs/portalfs/portal_vfsops.c                    |  4 +-
 sys/fs/portalfs/portal_vnops.c                     |  4 +-
 sys/fs/pseudofs/pseudofs.c                         | 10 ++--
 sys/fs/pseudofs/pseudofs_fileno.c                  |  4 +-
 sys/fs/pseudofs/pseudofs_vncache.c                 |  2 +-
 sys/fs/smbfs/smbfs_node.c                          |  6 +-
 sys/fs/smbfs/smbfs_smb.c                           |  6 +-
 sys/fs/udf/udf_vfsops.c                            |  2 +-
 sys/fs/udf/udf_vnops.c                             | 10 ++--
 sys/fs/umapfs/umap_subr.c                          |  2 +-
 sys/fs/umapfs/umap_vfsops.c                        |  2 +-
 sys/fs/unionfs/union_subr.c                        | 14 ++---
 sys/fs/unionfs/union_vfsops.c                      |  2 +-
 sys/geom/bde/g_bde.c                               |  2 +-
 sys/geom/geom_aes.c                                |  6 +-
 sys/geom/geom_ccd.c                                | 21 +++----
 sys/geom/geom_ctl.c                                |  2 +-
 sys/geom/geom_dev.c                                |  2 +-
 sys/geom/geom_disk.c                               |  2 +-
 sys/geom/geom_event.c                              |  2 +-
 sys/geom/geom_gpt.c                                |  2 +-
 sys/geom/geom_io.c                                 |  2 +-
 sys/geom/geom_mirror.c                             |  2 +-
 sys/geom/geom_slice.c                              |  8 +--
 sys/geom/geom_subr.c                               | 14 ++---
 sys/gnu/ext2fs/ext2_inode.c                        |  2 +-
 sys/gnu/ext2fs/ext2_lookup.c                       |  4 +-
 sys/gnu/ext2fs/ext2_vfsops.c                       | 12 ++--
 sys/gnu/fs/ext2fs/ext2_inode.c                     |  2 +-
 sys/gnu/fs/ext2fs/ext2_lookup.c                    |  4 +-
 sys/gnu/fs/ext2fs/ext2_vfsops.c                    | 12 ++--
 sys/i386/i386/bios.c                               |  2 +-
 sys/i386/i386/busdma_machdep.c                     |  4 +-
 sys/i386/i386/elan-mmcr.c                          |  2 +-
 sys/i386/i386/i686_mem.c                           |  2 +-
 sys/i386/i386/mem.c                                |  4 +-
 sys/i386/i386/mp_machdep.c                         |  8 +--
 sys/i386/i386/mptable.c                            |  8 +--
 sys/i386/i386/sys_machdep.c                        |  2 +-
 sys/i386/i386/vm86.c                               |  2 +-
 sys/i386/ibcs2/ibcs2_misc.c                        |  4 +-
 sys/i386/ibcs2/ibcs2_util.c                        |  2 +-
 sys/i386/ibcs2/imgact_coff.c                       |  2 +-
 sys/i386/include/mptable.h                         |  8 +--
 sys/i386/isa/ctx.c                                 |  2 +-
 sys/i386/isa/gpib.c                                |  2 +-
 sys/i386/isa/if_cx.c                               |  8 +--
 sys/i386/isa/if_el.c                               |  6 +-
 sys/i386/isa/if_le.c                               |  6 +-
 sys/i386/isa/if_rdp.c                              |  4 +-
 sys/i386/isa/loran.c                               |  2 +-
 sys/i386/isa/pcvt/pcvt_kbd.c                       |  2 +-
 sys/i386/isa/pcvt/pcvt_out.c                       |  2 +-
 sys/i386/isa/pcvt/pcvt_sup.c                       |  2 +-
 sys/i386/isa/spkr.c                                |  2 +-
 sys/i386/isa/vesa.c                                |  6 +-
 sys/i386/isa/wt.c                                  |  2 +-
 sys/i386/linux/linux_sysvec.c                      |  2 +-
 sys/i4b/driver/i4b_ipr.c                           |  2 +-
 sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c                |  2 +-
 sys/i4b/layer2/i4b_mbuf.c                          |  8 +--
 sys/i4b/layer4/i4b_i4bdrv.c                        | 10 ++--
 sys/ia64/ia32/ia32_misc.c                          | 10 ++--
 sys/ia64/ia64/busdma_machdep.c                     |  4 +-
 sys/ia64/ia64/mca.c                                |  6 +-
 sys/ia64/ia64/mp_machdep.c                         |  2 +-
 sys/ia64/ia64/pmap.c                               |  4 +-
 sys/ia64/ia64/sscdisk.c                            |  2 +-
 sys/isofs/cd9660/cd9660_vfsops.c                   |  4 +-
 sys/isofs/cd9660/cd9660_vnops.c                    |  8 +--
 sys/kern/imgact_aout.c                             |  2 +-
 sys/kern/imgact_elf.c                              | 10 ++--
 sys/kern/inflate.c                                 |  4 +-
 sys/kern/kern_alq.c                                |  6 +-
 sys/kern/kern_descrip.c                            | 12 ++--
 sys/kern/kern_environment.c                        | 12 ++--
 sys/kern/kern_event.c                              |  8 +--
 sys/kern/kern_exec.c                               |  6 +-
 sys/kern/kern_exit.c                               |  2 +-
 sys/kern/kern_fork.c                               |  6 +-
 sys/kern/kern_intr.c                               |  4 +-
 sys/kern/kern_jail.c                               |  2 +-
 sys/kern/kern_kse.c                                |  6 +-
 sys/kern/kern_ktrace.c                             | 12 ++--
 sys/kern/kern_linker.c                             | 22 +++----
 sys/kern/kern_lockf.c                              |  4 +-
 sys/kern/kern_mac.c                                | 68 +++++++++++-----------
 sys/kern/kern_malloc.c                             |  8 +--
 sys/kern/kern_module.c                             |  2 +-
 sys/kern/kern_proc.c                               |  2 +-
 sys/kern/kern_prot.c                               |  8 +--
 sys/kern/kern_resource.c                           |  4 +-
 sys/kern/kern_subr.c                               |  4 +-
 sys/kern/kern_sysctl.c                             | 16 ++---
 sys/kern/kern_thread.c                             |  6 +-
 sys/kern/link_elf.c                                | 14 ++---
 sys/kern/link_elf_obj.c                            | 14 ++---
 sys/kern/subr_blist.c                              |  4 +-
 sys/kern/subr_clist.c                              |  4 +-
 sys/kern/subr_mbuf.c                               | 44 +++++++-------
 sys/kern/subr_mchain.c                             | 10 ++--
 sys/kern/subr_prf.c                                |  4 +-
 sys/kern/subr_prof.c                               |  4 +-
 sys/kern/subr_sbuf.c                               |  2 +-
 sys/kern/sys_generic.c                             | 14 ++---
 sys/kern/sys_pipe.c                                |  4 +-
 sys/kern/sysv_msg.c                                |  8 +--
 sys/kern/sysv_sem.c                                | 14 ++---
 sys/kern/sysv_shm.c                                | 10 ++--
 sys/kern/tty.c                                     |  2 +-
 sys/kern/tty_cons.c                                |  2 +-
 sys/kern/tty_pty.c                                 |  2 +-
 sys/kern/tty_subr.c                                |  4 +-
 sys/kern/uipc_accf.c                               |  2 +-
 sys/kern/uipc_mbuf.c                               | 14 ++---
 sys/kern/uipc_mbuf2.c                              |  6 +-
 sys/kern/uipc_sem.c                                |  6 +-
 sys/kern/uipc_sockbuf.c                            | 10 ++--
 sys/kern/uipc_socket.c                             | 32 +++++-----
 sys/kern/uipc_socket2.c                            | 10 ++--
 sys/kern/uipc_syscalls.c                           | 22 +++----
 sys/kern/uipc_usrreq.c                             | 12 ++--
 sys/kern/vfs_aio.c                                 | 16 ++---
 sys/kern/vfs_bio.c                                 |  2 +-
 sys/kern/vfs_cache.c                               |  6 +-
 sys/kern/vfs_cluster.c                             |  2 +-
 sys/kern/vfs_export.c                              |  6 +-
 sys/kern/vfs_extattr.c                             |  4 +-
 sys/kern/vfs_init.c                                | 16 ++---
 sys/kern/vfs_lookup.c                              |  4 +-
 sys/kern/vfs_mount.c                               | 34 +++++------
 sys/kern/vfs_subr.c                                |  8 +--
 sys/kern/vfs_syscalls.c                            |  4 +-
 sys/libkern/iconv.c                                |  4 +-
 sys/libkern/iconv_xlat.c                           |  2 +-
 sys/net/bpf.c                                      | 12 ++--
 sys/net/bpf_compat.h                               |  2 +-
 sys/net/bridge.c                                   | 12 ++--
 sys/net/bsd_comp.c                                 | 16 ++---
 sys/net/if.c                                       | 14 ++---
 sys/net/if_arcsubr.c                               | 10 ++--
 sys/net/if_atmsubr.c                               |  2 +-
 sys/net/if_disc.c                                  |  2 +-
 sys/net/if_ef.c                                    | 10 ++--
 sys/net/if_ethersubr.c                             | 16 ++---
 sys/net/if_faith.c                                 |  2 +-
 sys/net/if_fddisubr.c                              | 10 ++--
 sys/net/if_gif.c                                   |  6 +-
 sys/net/if_gre.c                                   |  6 +-
 sys/net/if_ieee80211subr.c                         | 36 ++++++------
 sys/net/if_iso88025subr.c                          |  6 +-
 sys/net/if_loop.c                                  |  6 +-
 sys/net/if_ppp.c                                   | 12 ++--
 sys/net/if_sl.c                                    | 10 ++--
 sys/net/if_spppsubr.c                              | 12 ++--
 sys/net/if_stf.c                                   |  4 +-
 sys/net/if_tap.c                                   |  6 +-
 sys/net/if_tun.c                                   | 10 ++--
 sys/net/if_vlan.c                                  |  8 +--
 sys/net/if_vlan_var.h                              |  2 +-
 sys/net/pfil.c                                     |  4 +-
 sys/net/ppp_deflate.c                              | 16 ++---
 sys/net/ppp_tty.c                                  |  8 +--
 sys/net/raw_cb.c                                   |  2 +-
 sys/net/route.c                                    |  2 +-
 sys/net/rtsock.c                                   |  6 +-
 sys/netatalk/aarp.c                                | 10 ++--
 sys/netatalk/at_control.c                          |  2 +-
 sys/netatalk/ddp_output.c                          |  4 +-
 sys/netatalk/ddp_pcb.c                             |  2 +-
 sys/netatalk/ddp_usrreq.c                          |  2 +-
 sys/netatm/atm_cm.c                                | 14 ++---
 sys/netatm/atm_device.c                            |  2 +-
 sys/netatm/atm_if.c                                |  2 +-
 sys/netatm/atm_socket.c                            |  4 +-
 sys/netatm/ipatm/ipatm_if.c                        |  2 +-
 sys/netatm/ipatm/ipatm_vcm.c                       |  6 +-
 sys/netatm/port.h                                  |  4 +-
 sys/netatm/sigpvc/sigpvc_subr.c                    |  2 +-
 sys/netatm/spans/spans_arp.c                       |  6 +-
 sys/netatm/spans/spans_cls.c                       |  2 +-
 sys/netatm/spans/spans_msg.c                       | 26 ++++-----
 sys/netatm/spans/spans_proto.c                     |  2 +-
 sys/netatm/spans/spans_subr.c                      |  2 +-
 sys/netatm/uni/sscf_uni.c                          |  2 +-
 sys/netatm/uni/sscop.c                             |  2 +-
 sys/netatm/uni/uniarp.c                            |  2 +-
 sys/netatm/uni/uniarp_cache.c                      |  2 +-
 sys/netatm/uni/uniarp_vcm.c                        |  6 +-
 sys/netatm/uni/uniip.c                             |  2 +-
 sys/netatm/uni/unisig_decode.c                     |  2 +-
 sys/netatm/uni/unisig_subr.c                       | 26 ++++-----
 sys/netatm/uni/unisig_vc_state.c                   | 24 ++++----
 .../bluetooth/drivers/bt3c/ng_bt3c_pccard.c        |  4 +-
 sys/netgraph/bluetooth/drivers/h4/ng_h4.c          |  4 +-
 sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c        |  6 +-
 sys/netgraph/bluetooth/hci/ng_hci_cmds.c           |  2 +-
 sys/netgraph/bluetooth/hci/ng_hci_evnt.c           |  2 +-
 sys/netgraph/bluetooth/hci/ng_hci_misc.c           |  2 +-
 sys/netgraph/bluetooth/hci/ng_hci_ulpi.c           | 12 ++--
 sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h       | 22 +++----
 sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c       |  2 +-
 sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c       |  2 +-
 sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c       |  2 +-
 .../bluetooth/socket/ng_btsocket_hci_raw.c         | 16 ++---
 sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c  |  4 +-
 .../bluetooth/socket/ng_btsocket_l2cap_raw.c       | 16 ++---
 sys/netgraph/ng_UI.c                               |  2 +-
 sys/netgraph/ng_bridge.c                           |  2 +-
 sys/netgraph/ng_cisco.c                            |  4 +-
 sys/netgraph/ng_eiface.c                           |  2 +-
 sys/netgraph/ng_frame_relay.c                      |  2 +-
 sys/netgraph/ng_gif.c                              |  2 +-
 sys/netgraph/ng_gif_demux.c                        |  2 +-
 sys/netgraph/ng_l2tp.c                             | 14 ++---
 sys/netgraph/ng_lmi.c                              |  2 +-
 sys/netgraph/ng_one2many.c                         |  2 +-
 sys/netgraph/ng_ppp.c                              |  4 +-
 sys/netgraph/ng_pppoe.c                            | 18 +++---
 sys/netgraph/ng_pptpgre.c                          |  4 +-
 sys/netgraph/ng_rfc1490.c                          |  4 +-
 sys/netgraph/ng_socket.c                           | 10 ++--
 sys/netgraph/ng_source.c                           |  2 +-
 sys/netgraph/ng_tee.c                              |  2 +-
 sys/netgraph/ng_tty.c                              |  4 +-
 sys/netgraph/ng_vjc.c                              |  4 +-
 sys/netinet/if_ether.c                             |  2 +-
 sys/netinet/igmp.c                                 |  4 +-
 sys/netinet/in.c                                   |  4 +-
 sys/netinet/in_gif.c                               |  2 +-
 sys/netinet/in_pcb.c                               |  2 +-
 sys/netinet/ip_divert.c                            |  2 +-
 sys/netinet/ip_encap.c                             |  2 +-
 sys/netinet/ip_fw.c                                |  4 +-
 sys/netinet/ip_fw2.c                               |  4 +-
 sys/netinet/ip_icmp.c                              |  4 +-
 sys/netinet/ip_input.c                             | 10 ++--
 sys/netinet/ip_mroute.c                            |  2 +-
 sys/netinet/ip_output.c                            | 10 ++--
 sys/netinet/raw_ip.c                               |  4 +-
 sys/netinet/tcp_output.c                           |  6 +-
 sys/netinet/tcp_subr.c                             |  8 +--
 sys/netinet/tcp_syncache.c                         |  4 +-
 sys/netinet/tcp_timewait.c                         |  8 +--
 sys/netinet/udp_usrreq.c                           |  4 +-
 sys/netinet6/ah_core.c                             | 16 ++---
 sys/netinet6/ah_input.c                            |  4 +-
 sys/netinet6/ah_output.c                           |  6 +-
 sys/netinet6/esp_core.c                            |  8 +--
 sys/netinet6/esp_input.c                           |  6 +-
 sys/netinet6/esp_output.c                          |  6 +-
 sys/netinet6/frag6.c                               |  6 +-
 sys/netinet6/icmp6.c                               | 36 ++++++------
 sys/netinet6/in6.c                                 |  4 +-
 sys/netinet6/in6_gif.c                             |  2 +-
 sys/netinet6/in6_ifattach.c                        |  8 +--
 sys/netinet6/in6_pcb.c                             |  4 +-
 sys/netinet6/ip6_fw.c                              |  8 +--
 sys/netinet6/ip6_input.c                           | 10 ++--
 sys/netinet6/ip6_mroute.c                          |  2 +-
 sys/netinet6/ip6_output.c                          | 40 ++++++-------
 sys/netinet6/ipcomp_core.c                         |  4 +-
 sys/netinet6/ipcomp_output.c                       |  6 +-
 sys/netinet6/ipsec.c                               | 18 +++---
 sys/netinet6/mld6.c                                |  4 +-
 sys/netinet6/nd6.c                                 |  2 +-
 sys/netinet6/nd6_nbr.c                             |  8 +--
 sys/netinet6/raw_ip6.c                             |  2 +-
 sys/netinet6/scope6.c                              |  2 +-
 sys/netinet6/udp6_output.c                         |  2 +-
 sys/netipsec/ipsec_mbuf.c                          | 14 ++---
 sys/netipsec/ipsec_output.c                        |  4 +-
 sys/netipsec/key.c                                 | 44 +++++++-------
 sys/netipsec/keysock.c                             | 10 ++--
 sys/netipsec/xform_esp.c                           |  2 +-
 sys/netipsec/xform_ipip.c                          |  4 +-
 sys/netipx/ipx.c                                   |  2 +-
 sys/netipx/ipx_input.c                             |  2 +-
 sys/netipx/ipx_ip.c                                |  6 +-
 sys/netipx/ipx_outputfl.c                          |  2 +-
 sys/netipx/ipx_usrreq.c                            |  4 +-
 sys/netipx/spx_usrreq.c                            | 12 ++--
 sys/netkey/key.c                                   | 44 +++++++-------
 sys/netkey/keysock.c                               | 10 ++--
 sys/netnatm/natm.c                                 |  8 +--
 sys/netnatm/natm_pcb.c                             |  2 +-
 sys/netncp/ncp_conn.c                              |  4 +-
 sys/netncp/ncp_rq.c                                |  2 +-
 sys/netncp/ncp_sock.c                              |  2 +-
 sys/netncp/ncp_subr.c                              |  2 +-
 sys/netns/idp_usrreq.c                             |  6 +-
 sys/netns/ns.c                                     |  2 +-
 sys/netns/ns_error.c                               |  2 +-
 sys/netns/ns_input.c                               |  2 +-
 sys/netns/ns_ip.c                                  |  6 +-
 sys/netns/ns_pcb.c                                 |  2 +-
 sys/netns/spp_usrreq.c                             | 18 +++---
 sys/netsmb/smb_conn.c                              |  4 +-
 sys/netsmb/smb_crypt.c                             |  8 +--
 sys/netsmb/smb_dev.c                               |  2 +-
 sys/netsmb/smb_iod.c                               |  6 +-
 sys/netsmb/smb_rq.c                                |  6 +-
 sys/netsmb/smb_smb.c                               | 12 ++--
 sys/netsmb/smb_subr.c                              |  8 +--
 sys/netsmb/smb_trantcp.c                           |  4 +-
 sys/nfs/nfs_common.c                               |  4 +-
 sys/nfsclient/bootp_subr.c                         |  6 +-
 sys/nfsclient/krpc_subr.c                          | 10 ++--
 sys/nfsclient/nfs_lock.c                           |  2 +-
 sys/nfsclient/nfs_node.c                           |  4 +-
 sys/nfsclient/nfs_socket.c                         | 14 ++---
 sys/nfsclient/nfs_subs.c                           | 22 +++----
 sys/nfsclient/nfs_vfsops.c                         |  2 +-
 sys/nfsclient/nfs_vnops.c                          |  6 +-
 sys/nfsserver/nfs_serv.c                           | 20 +++----
 sys/nfsserver/nfs_srvcache.c                       |  6 +-
 sys/nfsserver/nfs_srvsock.c                        | 18 +++---
 sys/nfsserver/nfs_srvsubs.c                        | 10 ++--
 sys/nfsserver/nfs_syscalls.c                       | 12 ++--
 sys/opencrypto/cryptodev.c                         | 12 ++--
 sys/pc98/cbus/scvtb.c                              |  2 +-
 sys/pc98/pc98/scvtbpc98.c                          |  2 +-
 sys/pc98/pc98/spkr.c                               |  2 +-
 sys/pc98/pc98/syscons.c                            | 12 ++--
 sys/pccard/pccard.c                                |  2 +-
 sys/pci/agp.c                                      |  2 +-
 sys/pci/agp_i810.c                                 |  2 +-
 sys/pci/if_dc.c                                    |  8 +--
 sys/pci/if_de.c                                    | 16 ++---
 sys/pci/if_mn.c                                    | 18 +++---
 sys/pci/if_pcn.c                                   |  4 +-
 sys/pci/if_rl.c                                    |  4 +-
 sys/pci/if_sf.c                                    |  8 +--
 sys/pci/if_sis.c                                   |  2 +-
 sys/pci/if_sk.c                                    |  2 +-
 sys/pci/if_ste.c                                   |  8 +--
 sys/pci/if_ti.c                                    | 16 ++---
 sys/pci/if_tl.c                                    |  8 +--
 sys/pci/if_vr.c                                    |  8 +--
 sys/pci/if_wb.c                                    |  6 +-
 sys/pci/if_xl.c                                    | 10 ++--
 sys/pci/ncr.c                                      |  4 +-
 sys/pci/simos.c                                    |  2 +-
 sys/pci/xrpu.c                                     |  2 +-
 sys/posix4/posix4.h                                |  2 +-
 sys/powerpc/aim/nexus.c                            |  2 +-
 sys/powerpc/powermac/macio.c                       |  2 +-
 sys/powerpc/powerpc/busdma_machdep.c               |  4 +-
 sys/powerpc/powerpc/extintr.c                      |  2 +-
 sys/powerpc/powerpc/nexus.c                        |  2 +-
 sys/powerpc/psim/iobus.c                           |  2 +-
 sys/security/mac/mac_framework.c                   | 68 +++++++++++-----------
 sys/security/mac/mac_internal.h                    | 68 +++++++++++-----------
 sys/security/mac/mac_net.c                         | 68 +++++++++++-----------
 sys/security/mac/mac_pipe.c                        | 68 +++++++++++-----------
 sys/security/mac/mac_process.c                     | 68 +++++++++++-----------
 sys/security/mac/mac_syscalls.c                    | 68 +++++++++++-----------
 sys/security/mac/mac_system.c                      | 68 +++++++++++-----------
 sys/security/mac/mac_vfs.c                         | 68 +++++++++++-----------
 sys/security/mac_biba/mac_biba.c                   |  2 +-
 sys/security/mac_bsdextended/mac_bsdextended.c     |  2 +-
 sys/security/mac_lomac/mac_lomac.c                 |  4 +-
 sys/security/mac_mls/mac_mls.c                     |  2 +-
 sys/sparc64/ebus/ebus.c                            |  2 +-
 sys/sparc64/pci/ofw_pci.c                          |  4 +-
 sys/sparc64/pci/psycho.c                           |  2 +-
 sys/sparc64/sbus/sbus.c                            |  2 +-
 sys/sparc64/sparc64/bus_machdep.c                  |  4 +-
 sys/sparc64/sparc64/counter.c                      |  4 +-
 sys/sparc64/sparc64/iommu.c                        |  2 +-
 sys/sparc64/sparc64/mem.c                          |  2 +-
 sys/sparc64/sparc64/nexus.c                        |  2 +-
 sys/sparc64/sparc64/ofw_bus.c                      |  6 +-
 sys/sparc64/sparc64/sys_machdep.c                  |  2 +-
 sys/sys/malloc.h                                   |  3 +-
 sys/sys/mbuf.h                                     | 12 ++--
 sys/sys/posix4.h                                   |  2 +-
 sys/sys/socketvar.h                                |  2 +-
 sys/ufs/ffs/ffs_inode.c                            |  2 +-
 sys/ufs/ffs/ffs_snapshot.c                         | 16 ++---
 sys/ufs/ffs/ffs_softdep.c                          |  2 +-
 sys/ufs/ffs/ffs_vfsops.c                           | 12 ++--
 sys/ufs/ffs/ffs_vnops.c                            |  4 +-
 sys/ufs/ufs/ufs_dirhash.c                          |  2 +-
 sys/ufs/ufs/ufs_extattr.c                          |  6 +-
 sys/ufs/ufs/ufs_quota.c                            |  2 +-
 sys/ufs/ufs/ufs_vnops.c                            | 12 ++--
 sys/vm/device_pager.c                              |  2 +-
 sys/vm/swap_pager.c                                |  2 +-
 sys/vm/uma.h                                       |  2 +-
 sys/vm/uma_core.c                                  | 12 ++--
 sys/vm/vm_map.c                                    |  6 +-
 sys/vm/vm_object.c                                 |  2 +-
 586 files changed, 2103 insertions(+), 2102 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c
index 8b701041b521..169231bed7f2 100644
--- a/sys/alpha/alpha/busdma_machdep.c
+++ b/sys/alpha/alpha/busdma_machdep.c
@@ -360,7 +360,7 @@ bus_dmamem_alloc_size(bus_dma_tag_t dmat, void** vaddr, int flags,
 
 	if ((size <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
 		*vaddr = malloc(size, M_DEVBUF,
-				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0);
+				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
 	} else {
 		/*
 		 * XXX Use Contigmalloc until it is merged into this facility
@@ -368,7 +368,7 @@ bus_dmamem_alloc_size(bus_dma_tag_t dmat, void** vaddr, int flags,
 		 *     multi-seg allocations yet though.
 		 */
 		*vaddr = contigmalloc(size, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
 		    0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
 		    dmat->boundary);
 	}
diff --git a/sys/alpha/osf1/imgact_osf1.c b/sys/alpha/osf1/imgact_osf1.c
index 5db50d0fc374..d6331823a8e2 100644
--- a/sys/alpha/osf1/imgact_osf1.c
+++ b/sys/alpha/osf1/imgact_osf1.c
@@ -112,7 +112,7 @@ exec_osf1_imgact(struct image_params *imgp)
 		printf("unknown ecoff magic %x\n", eap->magic);
 		return ENOEXEC;
 	}
-	osf_auxargs = malloc(sizeof(Osf_Auxargs), M_TEMP, M_ZERO);
+	osf_auxargs = malloc(sizeof(Osf_Auxargs), M_TEMP, M_WAITOK | M_ZERO);
 	imgp->auxargs = osf_auxargs;
 	osf_auxargs->executable = osf_auxargs->exec_path;
 	path_not_saved = copyinstr(imgp->fname, osf_auxargs->executable,
@@ -135,7 +135,7 @@ exec_osf1_imgact(struct image_params *imgp)
 		 * page of the loader.
 		 */
 		ndp = (struct nameidata *)malloc(sizeof(struct nameidata),
-		    M_TEMP, 0);
+		    M_TEMP, M_WAITOK);
 		NDINIT(ndp, LOOKUP, LOCKLEAF | FOLLOW | SAVENAME, UIO_SYSSPACE,
 		    "/compat/osf1/sbin/loader",
 		    FIRST_THREAD_IN_PROC(imgp->proc));
@@ -218,7 +218,7 @@ exec_osf1_imgact(struct image_params *imgp)
 	raw_dend = (eap->data_start + eap->dsize);
 	if (dend > raw_dend) {
 		caddr_t zeros;
-		zeros = malloc(dend-raw_dend, M_TEMP, M_ZERO);
+		zeros = malloc(dend-raw_dend,M_TEMP,M_WAITOK|M_ZERO);
 		if ((error = copyout(zeros, (caddr_t)raw_dend,
 		    dend-raw_dend))) {
 			uprintf("Can't zero start of bss, error %d\n",error);
diff --git a/sys/alpha/osf1/osf1_misc.c b/sys/alpha/osf1/osf1_misc.c
index adf76e377a41..8b49723c7450 100644
--- a/sys/alpha/osf1/osf1_misc.c
+++ b/sys/alpha/osf1/osf1_misc.c
@@ -120,7 +120,7 @@ osf1_emul_find(td, sgp, prefix, path, pbuf, cflag)
         struct vattr		vat;
         struct vattr		vatroot;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	*pbuf = path;
 
 	for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
@@ -1180,8 +1180,8 @@ osf1_readv(td, uap)
 	osize = uap->iovcnt * sizeof (struct osf1_iovec);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, 0);
-	nio = malloc(nsize, M_TEMP, 0);
+	oio = malloc(osize, M_TEMP, M_WAITOK);
+	nio = malloc(nsize, M_TEMP, M_WAITOK);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
@@ -1229,8 +1229,8 @@ osf1_writev(td, uap)
 	osize = uap->iovcnt * sizeof (struct osf1_iovec);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, 0);
-	nio = malloc(nsize, M_TEMP, 0);
+	oio = malloc(osize, M_TEMP, M_WAITOK);
+	nio = malloc(nsize, M_TEMP, M_WAITOK);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
diff --git a/sys/amd64/amd64/amd64_mem.c b/sys/amd64/amd64/amd64_mem.c
index f3fc4e89db25..589fc64721cb 100644
--- a/sys/amd64/amd64/amd64_mem.c
+++ b/sys/amd64/amd64/amd64_mem.c
@@ -557,7 +557,7 @@ i686_mrinit(struct mem_range_softc *sc)
 
     sc->mr_desc = 
 	(struct mem_range_desc *)malloc(nmdesc * sizeof(struct mem_range_desc), 
-					M_MEMDESC, M_ZERO);
+					M_MEMDESC, M_WAITOK | M_ZERO);
     sc->mr_ndesc = nmdesc;
 
     mrd = sc->mr_desc;
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index ae14099f93be..747a3a14394f 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -388,7 +388,7 @@ bios16(struct bios_args *args, char *fmt, ...)
 	/*
 	 * no page table, so create one and install it.
 	 */
-	pte = (pt_entry_t *)malloc(PAGE_SIZE, M_TEMP, 0);
+	pte = (pt_entry_t *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
 	ptd = (pd_entry_t *)((u_int)ptd + KERNBASE);
 	*ptd = vtophys(pte) | PG_RW | PG_V;
     } else {
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index a5a20fcbab03..8f5898faa868 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -341,7 +341,7 @@ bus_dmamem_alloc_size(bus_dma_tag_t dmat, void** vaddr, int flags,
 
 	if ((size <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
 		*vaddr = malloc(size, M_DEVBUF,
-				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0);
+				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
 	} else {
 		/*
 		 * XXX Use Contigmalloc until it is merged into this facility
@@ -349,7 +349,7 @@ bus_dmamem_alloc_size(bus_dma_tag_t dmat, void** vaddr, int flags,
 		 *     multi-seg allocations yet though.
 		 */
 		*vaddr = contigmalloc(size, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
 		    0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
 		    dmat->boundary);
 	}
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index 4905d3c8158c..41fa63640b60 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -265,7 +265,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
 		if (nd > 0) {
 			md = (struct mem_range_desc *)
 				malloc(nd * sizeof(struct mem_range_desc),
-				       M_MEMDESC, 0);
+				       M_MEMDESC, M_WAITOK);
 			error = mem_range_attr_get(md, &nd);
 			if (!error)
 				error = copyout(md, mo->mo_desc, 
@@ -279,7 +279,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
 		
 	case MEMRANGE_SET:
 		md = (struct mem_range_desc *)malloc(sizeof(struct mem_range_desc),
-						    M_MEMDESC, 0);
+						    M_MEMDESC, M_WAITOK);
 		error = copyin(mo->mo_desc, md, sizeof(struct mem_range_desc));
 		/* clamp description string */
 		md->mr_owner[sizeof(md->mr_owner) - 1] = 0;
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index cc29843c7772..7ebd6ea9020a 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
 
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index cc29843c7772..7ebd6ea9020a 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
 
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index bd89b74341af..5fcad0311b0a 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -298,7 +298,7 @@ user_ldt_alloc(struct mdproc *mdp, int len)
 		mtx_unlock_spin(&sched_lock);
 	mtx_assert(&sched_lock, MA_NOTOWNED);
 	MALLOC(new_ldt, struct proc_ldt *, sizeof(struct proc_ldt),
-		M_SUBPROC, 0);
+		M_SUBPROC, M_WAITOK);
 
 	new_ldt->ldt_len = len = NEW_MAX_LD(len);
 	new_ldt->ldt_base = (caddr_t)kmem_alloc(kernel_map,
diff --git a/sys/amd64/ia32/ia32_misc.c b/sys/amd64/ia32/ia32_misc.c
index d593c04ee1b3..c6f26fe7038e 100644
--- a/sys/amd64/ia32/ia32_misc.c
+++ b/sys/amd64/ia32/ia32_misc.c
@@ -105,7 +105,7 @@ ia32_emul_find(td, sgp, prefix, path, pbuf, cflag)
 	struct vattr		vat;
 	struct vattr		vatroot;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	*pbuf = path;
 
 	for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
@@ -768,8 +768,8 @@ ia32_readv(struct thread *td, struct ia32_readv_args *uap)
 	osize = uap->iovcnt * sizeof (struct iovec32);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, 0);
-	nio = malloc(nsize, M_TEMP, 0);
+	oio = malloc(osize, M_TEMP, M_WAITOK);
+	nio = malloc(nsize, M_TEMP, M_WAITOK);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
@@ -814,8 +814,8 @@ ia32_writev(struct thread *td, struct ia32_writev_args *uap)
 	osize = uap->iovcnt * sizeof (struct iovec32);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, 0);
-	nio = malloc(nsize, M_TEMP, 0);
+	oio = malloc(osize, M_TEMP, M_WAITOK);
+	nio = malloc(nsize, M_TEMP, M_WAITOK);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index cc29843c7772..7ebd6ea9020a 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
 
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index 591d765ed068..247ebb87a24e 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -89,7 +89,7 @@ periphdriver_register(void *data)
 	int ndrivers;
 
 	ndrivers = nperiph_drivers + 2;
-	newdrivers = malloc(sizeof(*newdrivers) * ndrivers, M_TEMP, 0);
+	newdrivers = malloc(sizeof(*newdrivers) * ndrivers, M_TEMP, M_WAITOK);
 	if (periph_drivers)
 		bcopy(periph_drivers, newdrivers,
 		      sizeof(*newdrivers) * nperiph_drivers);
diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c
index 35b18f7e0b48..b7e0ec5bdf56 100644
--- a/sys/cam/cam_sim.c
+++ b/sys/cam/cam_sim.c
@@ -67,7 +67,7 @@ cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll,
 	 */
 	if (strcmp(sim_name, "xpt") == 0)
 		sim = (struct cam_sim *)malloc(sizeof(struct cam_sim),
-					       M_DEVBUF, 0);
+					       M_DEVBUF, M_WAITOK);
 	else
 		sim = (struct cam_sim *)malloc(sizeof(struct cam_sim),
 					       M_DEVBUF, M_NOWAIT);
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 96af6d74af43..e22357b4e636 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -4804,7 +4804,7 @@ xpt_alloc_ccb()
 {
 	union ccb *new_ccb;
 
-	new_ccb = malloc(sizeof(*new_ccb), M_DEVBUF, 0);
+	new_ccb = malloc(sizeof(*new_ccb), M_DEVBUF, M_WAITOK);
 	return (new_ccb);
 }
 
@@ -5169,7 +5169,7 @@ xpt_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 
 		/* Save some state for use while we probe for devices */
 		scan_info = (xpt_scan_bus_info *)
-		    malloc(sizeof(xpt_scan_bus_info), M_TEMP, 0);
+		    malloc(sizeof(xpt_scan_bus_info), M_TEMP, M_WAITOK);
 		scan_info->request_ccb = request_ccb;
 		scan_info->cpi = &work_ccb->cpi;
 
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index ebfe241a35f5..543714f275cb 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -1784,7 +1784,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 			struct cd_mode_data *data;
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP, 
-				      0);
+				      M_WAITOK);
 
 			CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, 
 				  ("trying to do CDIOCPLAYTRACKS\n"));
@@ -1818,7 +1818,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 			struct cd_mode_data *data;
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP,
-				      0);
+				      M_WAITOK);
 
 			CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, 
 				  ("trying to do CDIOCPLAYMSF\n"));
@@ -1853,7 +1853,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCPLAYBLOCKS\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP,
-				      0);
+				      M_WAITOK);
 
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
@@ -1880,7 +1880,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCREADSUBCHANNEL\n"));
 
 			data = malloc(sizeof(struct cd_sub_channel_info), 
-				      M_TEMP, 0);
+				      M_TEMP, M_WAITOK);
 
 			if ((len > sizeof(struct cd_sub_channel_info)) ||
 			    (len < sizeof(struct cd_sub_channel_header))) {
@@ -1924,7 +1924,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOREADTOCHEADER\n"));
 
 			th = malloc(sizeof(struct ioc_toc_header), M_TEMP,
-				    0);
+				    M_WAITOK);
 			error = cdreadtoc(periph, 0, 0, 
 					  (struct cd_toc_entry *)th, 
 				          sizeof (*th));
@@ -1967,8 +1967,8 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 			CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, 
 				  ("trying to do CDIOREADTOCENTRYS\n"));
 
-			data = malloc(sizeof(data_t), M_TEMP, 0);
-			lead = malloc(sizeof(lead_t), M_TEMP, 0);
+			data = malloc(sizeof(data_t), M_TEMP, M_WAITOK);
+			lead = malloc(sizeof(lead_t), M_TEMP, M_WAITOK);
 
 			if (te->data_len < sizeof(struct cd_toc_entry)
 			 || (te->data_len % sizeof(struct cd_toc_entry)) != 0
@@ -2094,7 +2094,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 			CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, 
 				  ("trying to do CDIOREADTOCENTRY\n"));
 
-			data = malloc(sizeof(data_t), M_TEMP, 0);
+			data = malloc(sizeof(data_t), M_TEMP, M_WAITOK);
 
 			if (te->address_format != CD_MSF_FORMAT
 			    && te->address_format != CD_LBA_FORMAT) {
@@ -2160,7 +2160,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCSETPATCH\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP, 
-				      0);
+				      M_WAITOK);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2185,7 +2185,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCGETVOL\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP, 
-				      0);
+				      M_WAITOK);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2209,7 +2209,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCSETVOL\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP, 
-				      0);
+				      M_WAITOK);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2235,7 +2235,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCSETMONO\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), 
-				      M_TEMP, 0);
+				      M_TEMP, M_WAITOK);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2259,7 +2259,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCSETSTEREO\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP,
-				      0);
+				      M_WAITOK);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2283,7 +2283,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCSETMUTE\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP,
-				      0);
+				      M_WAITOK);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2305,7 +2305,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCSETLEFT\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP,
-				      0);
+				      M_WAITOK);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2329,7 +2329,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 				  ("trying to do CDIOCSETRIGHT\n"));
 
 			data = malloc(sizeof(struct cd_mode_data), M_TEMP,
-				      0);
+				      M_WAITOK);
 			error = cdgetmode(periph, data, AUDIO_PAGE);
 			if (error) {
 				free(data, M_TEMP);
@@ -2481,7 +2481,7 @@ cdsize(dev_t dev, u_int32_t *size)
 	ccb = cdgetccb(periph, /* priority */ 1);
 
 	rcap_buf = malloc(sizeof(struct scsi_read_capacity_data), 
-			  M_TEMP, 0);
+			  M_TEMP, M_WAITOK);
 
 	scsi_read_capacity(&ccb->csio, 
 			   /*retries*/ 1,
@@ -3050,7 +3050,7 @@ cdreportkey(struct cam_periph *periph, struct dvd_authinfo *authinfo)
 	}
 
 	if (length != 0) {
-		databuf = malloc(length, M_DEVBUF, M_ZERO);
+		databuf = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO);
 	} else
 		databuf = NULL;
 
@@ -3183,7 +3183,7 @@ cdsendkey(struct cam_periph *periph, struct dvd_authinfo *authinfo)
 
 		length = sizeof(*challenge_data);
 
-		challenge_data = malloc(length, M_DEVBUF, M_ZERO);
+		challenge_data = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO);
 
 		databuf = (u_int8_t *)challenge_data;
 
@@ -3200,7 +3200,7 @@ cdsendkey(struct cam_periph *periph, struct dvd_authinfo *authinfo)
 
 		length = sizeof(*key2_data);
 
-		key2_data = malloc(length, M_DEVBUF, M_ZERO);
+		key2_data = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO);
 
 		databuf = (u_int8_t *)key2_data;
 
@@ -3217,7 +3217,7 @@ cdsendkey(struct cam_periph *periph, struct dvd_authinfo *authinfo)
 
 		length = sizeof(*rpc_data);
 
-		rpc_data = malloc(length, M_DEVBUF, M_ZERO);
+		rpc_data = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO);
 
 		databuf = (u_int8_t *)rpc_data;
 
@@ -3359,7 +3359,7 @@ cdreaddvdstructure(struct cam_periph *periph, struct dvd_struct *dvdstruct)
 	}
 
 	if (length != 0) {
-		databuf = malloc(length, M_DEVBUF, M_ZERO);
+		databuf = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO);
 	} else
 		databuf = NULL;
 
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index 51f694679b8c..fcbb53bac37b 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -1100,7 +1100,7 @@ chgetelemstatus(struct cam_periph *periph,
 	 * we can allocate enough storage for all of them.  We assume
 	 * that the first one can fit into 1k.
 	 */
-	data = (caddr_t)malloc(1024, M_DEVBUF, 0);
+	data = (caddr_t)malloc(1024, M_DEVBUF, M_WAITOK);
 
 	ccb = cam_periph_getccb(periph, /*priority*/ 1);
 
@@ -1137,7 +1137,7 @@ chgetelemstatus(struct cam_periph *periph,
 	 * device.
 	 */
 	free(data, M_DEVBUF);
-	data = (caddr_t)malloc(size, M_DEVBUF, 0);
+	data = (caddr_t)malloc(size, M_DEVBUF, M_WAITOK);
 
 	scsi_read_element_status(&ccb->csio,
 				 /* retries */ 1,
@@ -1172,7 +1172,7 @@ chgetelemstatus(struct cam_periph *periph,
 
 	user_data = (struct changer_element_status *)
 		malloc(avail * sizeof(struct changer_element_status),
-		       M_DEVBUF, M_ZERO);
+		       M_DEVBUF, M_WAITOK | M_ZERO);
 
 	desc = (struct read_element_status_descriptor *)((uintptr_t)data +
 		sizeof(struct read_element_status_header) +
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 6b5802deb536..65878a18fe93 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -582,7 +582,7 @@ daopen(dev_t dev, int flags __unused, int fmt __unused, struct thread *td __unus
 	/* Do a read capacity */
 	rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcap),
 							M_TEMP,
-							0);
+							M_WAITOK);
 		
 	ccb = cam_periph_getccb(periph, /*priority*/1);
 	scsi_read_capacity(&ccb->csio,
diff --git a/sys/cam/scsi/scsi_low.c b/sys/cam/scsi/scsi_low.c
index 753560a72763..afda1138e293 100644
--- a/sys/cam/scsi/scsi_low.c
+++ b/sys/cam/scsi/scsi_low.c
@@ -961,7 +961,7 @@ scsi_low_rescan_bus_cam(slp)
 	struct scsi_low_softc *slp;
 {
   	struct cam_path *path;
-	union ccb *ccb = malloc(sizeof(union ccb), M_DEVBUF, 0);
+	union ccb *ccb = malloc(sizeof(union ccb), M_DEVBUF, M_WAITOK);
 	cam_status status;
 
 	bzero(ccb, sizeof(union ccb));
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index 75dd670bf26c..e77865bee5e7 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -1896,7 +1896,7 @@ samount(struct cam_periph *periph, int oflags, dev_t dev)
 		 * read a full record.
 		 */
 		rblim = (struct  scsi_read_block_limits_data *)
-		    malloc(8192, M_TEMP, 0);
+		    malloc(8192, M_TEMP, M_WAITOK);
 		if (rblim == NULL) {
 			xpt_print_path(ccb->ccb_h.path);
 			printf("no memory for test read\n");
@@ -2521,7 +2521,7 @@ retry:
 			mode_buffer_len += sizeof (sa_comp_t);
 	}
 
-	mode_buffer = malloc(mode_buffer_len, M_TEMP, M_ZERO);
+	mode_buffer = malloc(mode_buffer_len, M_TEMP, M_WAITOK | M_ZERO);
 	mode_hdr = (struct scsi_mode_header_6 *)mode_buffer;
 	mode_blk = (struct scsi_mode_blk_desc *)&mode_hdr[1];
 
@@ -2701,7 +2701,7 @@ sasetparams(struct cam_periph *periph, sa_params params_to_set,
 
 	softc = (struct sa_softc *)periph->softc;
 
-	ccomp = malloc(sizeof (sa_comp_t), M_TEMP, 0);
+	ccomp = malloc(sizeof (sa_comp_t), M_TEMP, M_WAITOK);
 
 	/*
 	 * Since it doesn't make sense to set the number of blocks, or
@@ -2724,7 +2724,7 @@ sasetparams(struct cam_periph *periph, sa_params params_to_set,
 	if (params_to_set & SA_PARAM_COMPRESSION)
 		mode_buffer_len += sizeof (sa_comp_t);
 
-	mode_buffer = malloc(mode_buffer_len, M_TEMP, M_ZERO);
+	mode_buffer = malloc(mode_buffer_len, M_TEMP, M_WAITOK | M_ZERO);
 
 	mode_hdr = (struct scsi_mode_header_6 *)mode_buffer;
 	mode_blk = (struct scsi_mode_blk_desc *)&mode_hdr[1];
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index 25001efafc0e..9db2604dce38 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -189,7 +189,7 @@ targopen(dev_t dev, int flags, int fmt, struct thread *td)
 			 "targ%d", dev2unit(dev));
 	}
 	MALLOC(softc, struct targ_softc *, sizeof(*softc), M_TARG,
-	       M_ZERO);
+	       M_WAITOK | M_ZERO);
 	dev->si_drv1 = softc;
 	softc->state = TARG_STATE_OPENED;
 	softc->periph = NULL;
@@ -977,7 +977,7 @@ targgetccb(struct targ_softc *softc, xpt_opcode type, int priority)
 	int ccb_len;
 
 	ccb_len = targccblen(type);
-	MALLOC(ccb, union ccb *, ccb_len, M_TARG, 0);
+	MALLOC(ccb, union ccb *, ccb_len, M_TARG, M_WAITOK);
 	CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("getccb %p\n", ccb));
 
 	xpt_setup_ccb(&ccb->ccb_h, softc->path, priority);
@@ -1021,7 +1021,7 @@ targgetdescr(struct targ_softc *softc)
 	struct targ_cmd_descr *descr;
 
 	MALLOC(descr, struct targ_cmd_descr *, sizeof(*descr), M_TARG,
-	       0);
+	       M_WAITOK);
 	descr->mapinfo.num_bufs_used = 0;
 	return (descr);
 }
diff --git a/sys/coda/cnode.h b/sys/coda/cnode.h
index 8d0cebe3d131..962d329580e4 100644
--- a/sys/coda/cnode.h
+++ b/sys/coda/cnode.h
@@ -66,7 +66,7 @@ MALLOC_DECLARE(M_CODA);
 
 #define CODA_ALLOC(ptr, cast, size)                                        \
 do {                                                                      \
-    ptr = (cast)malloc((unsigned long) size, M_CODA, 0);                   \
+    ptr = (cast)malloc((unsigned long) size, M_CODA, M_WAITOK);            \
     if (ptr == 0) {                                                       \
 	panic("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__);  \
     }                                                                     \
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
index d593c04ee1b3..c6f26fe7038e 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -105,7 +105,7 @@ ia32_emul_find(td, sgp, prefix, path, pbuf, cflag)
 	struct vattr		vat;
 	struct vattr		vatroot;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	*pbuf = path;
 
 	for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
@@ -768,8 +768,8 @@ ia32_readv(struct thread *td, struct ia32_readv_args *uap)
 	osize = uap->iovcnt * sizeof (struct iovec32);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, 0);
-	nio = malloc(nsize, M_TEMP, 0);
+	oio = malloc(osize, M_TEMP, M_WAITOK);
+	nio = malloc(nsize, M_TEMP, M_WAITOK);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
@@ -814,8 +814,8 @@ ia32_writev(struct thread *td, struct ia32_writev_args *uap)
 	osize = uap->iovcnt * sizeof (struct iovec32);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, 0);
-	nio = malloc(nsize, M_TEMP, 0);
+	oio = malloc(osize, M_TEMP, M_WAITOK);
+	nio = malloc(nsize, M_TEMP, M_WAITOK);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index 160b2a9f90ce..2b37dcdaf40c 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -297,7 +297,7 @@ getdents_common(struct thread *td, struct linux_getdents64_args *args,
 
 	buflen = max(LINUX_DIRBLKSIZ, nbytes);
 	buflen = min(buflen, MAXBSIZE);
-	buf = malloc(buflen, M_TEMP, 0);
+	buf = malloc(buflen, M_TEMP, M_WAITOK);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 
 again:
diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c
index 81e84a303154..bb1c28fb3260 100644
--- a/sys/compat/linux/linux_getcwd.c
+++ b/sys/compat/linux/linux_getcwd.c
@@ -181,7 +181,7 @@ linux_getcwd_scandir(lvpp, uvpp, bpp, bufp, td)
 	dirbuflen = DIRBLKSIZ;
 	if (dirbuflen < va.va_blocksize)
 		dirbuflen = va.va_blocksize;
-	dirbuf = (char *)malloc(dirbuflen, M_TEMP, 0);
+	dirbuf = (char *)malloc(dirbuflen, M_TEMP, M_WAITOK);
 
 #if 0
 unionread:
@@ -429,7 +429,7 @@ linux_getcwd(struct thread *td, struct linux_getcwd_args *args)
 	else if (len < 2)
 		return ERANGE;
 
-	path = (char *)malloc(len, M_TEMP, 0);
+	path = (char *)malloc(len, M_TEMP, M_WAITOK);
 
 	error = kern___getcwd(td, path, UIO_SYSSPACE, len);
 	if (!error) {
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index eb1b9749aa7d..9f10ba5152fe 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -2420,7 +2420,7 @@ linux_ioctl_register_handler(struct linux_ioctl_handler *h)
 	}
 	if (he == NULL) {
 		MALLOC(he, struct handler_element *, sizeof(*he),
-		    M_LINUX, 0);
+		    M_LINUX, M_WAITOK);
 		he->func = h->func;
 	} else
 		TAILQ_REMOVE(&handlers, he, list);
diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c
index 4f7f199b320b..d9cdd076124c 100644
--- a/sys/compat/linux/linux_mib.c
+++ b/sys/compat/linux/linux_mib.c
@@ -139,7 +139,7 @@ linux_get_prison(struct proc *p)
 	if (pr->pr_linux == NULL) {
 		mtx_unlock(&pr->pr_mtx);
 		MALLOC(lpr, struct linux_prison *, sizeof *lpr,
-		    M_PRISON, M_ZERO);
+		    M_PRISON, M_WAITOK|M_ZERO);
 		mtx_lock(&pr->pr_mtx);
 		if (pr->pr_linux == NULL) {
 			pr->pr_linux = lpr;
diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c
index d737f559df20..699b5d6f01fb 100644
--- a/sys/compat/linux/linux_sysctl.c
+++ b/sys/compat/linux/linux_sysctl.c
@@ -92,7 +92,7 @@ linux_sysctl(struct thread *td, struct linux_sysctl_args *args)
 	if (la.nlen <= 0 || la.nlen > LINUX_CTL_MAXNAME)
 		return (ENOTDIR);
 
-	mib = malloc(la.nlen * sizeof(l_int), M_TEMP, 0);
+	mib = malloc(la.nlen * sizeof(l_int), M_TEMP, M_WAITOK);
 	error = copyin(la.name, mib, la.nlen * sizeof(l_int));
 	if (error) {
 		free(mib, M_TEMP);
diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c
index bd2c81d8ede1..5bd8c15fa359 100644
--- a/sys/compat/linux/linux_util.c
+++ b/sys/compat/linux/linux_util.c
@@ -101,7 +101,7 @@ linux_emul_convpath(td, path, pathseg, pbuf, cflag)
 	char			*ptr, *buf, *cp;
 	size_t			 len, sz;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	*pbuf = buf;
 
 	prefix = linux_emul_path;
diff --git a/sys/compat/pecoff/imgact_pecoff.c b/sys/compat/pecoff/imgact_pecoff.c
index b15e5c690c82..fd9ab262a1db 100644
--- a/sys/compat/pecoff/imgact_pecoff.c
+++ b/sys/compat/pecoff/imgact_pecoff.c
@@ -184,7 +184,7 @@ pecoff_coredump(register struct thread * td, register struct vnode * vp,
 	    limit)
 		return (EFAULT);
 	tempuser = malloc(ctob(uarea_pages + kstack_pages), M_TEMP,
-	    M_ZERO);
+	    M_WAITOK | M_ZERO);
 	if (tempuser == NULL)
 		return (ENOMEM);
 	PROC_LOCK(p);
@@ -393,7 +393,7 @@ pecoff_load_file(struct thread * td, const char *file, u_long * addr, u_long * e
 		goto fail;
 	if ((error = pecoff_signature(td, imgp->vp, &dh) != 0))
 		goto fail;
-	fp = malloc(PECOFF_HDR_SIZE, M_TEMP, 0);
+	fp = malloc(PECOFF_HDR_SIZE, M_TEMP, M_WAITOK);
 	peofs = dh.d_peofs + sizeof(signature) - 1;
 	if ((error = pecoff_read_from(td, imgp->vp, peofs, (caddr_t) fp, PECOFF_HDR_SIZE) != 0))
 		goto fail;
@@ -405,7 +405,7 @@ pecoff_load_file(struct thread * td, const char *file, u_long * addr, u_long * e
 	wp = (void *) ((char *) ap + sizeof(struct coff_aouthdr));
 	/* read section header */
 	scnsiz = sizeof(struct coff_scnhdr) * fp->f_nscns;
-	sh = malloc(scnsiz, M_TEMP, 0);
+	sh = malloc(scnsiz, M_TEMP, M_WAITOK);
 	if ((error = pecoff_read_from(td, imgp->vp, peofs + PECOFF_HDR_SIZE,
 				      (caddr_t) sh, scnsiz)) != 0)
 		goto fail;
@@ -481,7 +481,7 @@ exec_pecoff_coff_prep_zmagic(struct image_params * imgp,
 	struct vmspace *vmspace;
 	struct pecoff_args *argp = NULL;
 
-	sh = malloc(scnsiz, M_TEMP, 0);
+	sh = malloc(scnsiz, M_TEMP, M_WAITOK);
 
 	wp = (void *) ((char *) ap + sizeof(struct coff_aouthdr));
 	error = pecoff_read_from(FIRST_THREAD_IN_PROC(imgp->proc), imgp->vp,
@@ -529,7 +529,7 @@ exec_pecoff_coff_prep_zmagic(struct image_params * imgp,
 	vmspace->vm_taddr = (caddr_t) (uintptr_t) text_addr;
 	vmspace->vm_dsize = data_size >> PAGE_SHIFT;
 	vmspace->vm_daddr = (caddr_t) (uintptr_t) data_addr;
-	argp = malloc(sizeof(struct pecoff_args), M_TEMP, 0);
+	argp = malloc(sizeof(struct pecoff_args), M_TEMP, M_WAITOK);
 	if (argp == NULL) {
 		error = ENOMEM;
 		goto fail;
@@ -659,7 +659,7 @@ imgact_pecoff(struct image_params * imgp)
 	VOP_UNLOCK(imgp->vp, 0, td);
 
 	peofs = dp->d_peofs + sizeof(signature) - 1;
-	fp = malloc(PECOFF_HDR_SIZE, M_TEMP, 0);
+	fp = malloc(PECOFF_HDR_SIZE, M_TEMP, M_WAITOK);
 	error = pecoff_read_from(FIRST_THREAD_IN_PROC(imgp->proc),
 	     imgp->vp, peofs, (caddr_t) fp, PECOFF_HDR_SIZE);
 	if (error)
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c
index ab98dced59bd..ca1b8db0aeaf 100644
--- a/sys/compat/svr4/svr4_filio.c
+++ b/sys/compat/svr4/svr4_filio.c
@@ -68,7 +68,7 @@ svr4_sys_poll(td, uap)
      pa.timeout = uap->timeout;
 
      siz = uap->nfds * sizeof(struct pollfd);
-     pfd = (struct pollfd *)malloc(siz, M_TEMP, 0);
+     pfd = (struct pollfd *)malloc(siz, M_TEMP, M_WAITOK);
 
      error = poll(td, (struct poll_args *)uap);
 
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 5938993f9498..2db3c960ffed 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -296,7 +296,7 @@ svr4_sys_getdents64(td, uap)
 #define	DIRBLKSIZ	512		/* XXX we used to use ufs's DIRBLKSIZ */
 	buflen = max(DIRBLKSIZ, nbytes);
 	buflen = min(buflen, MAXBSIZE);
-	buf = malloc(buflen, M_TEMP, 0);
+	buf = malloc(buflen, M_TEMP, M_WAITOK);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 again:
 	aiov.iov_base = buf;
@@ -459,7 +459,7 @@ svr4_sys_getdents(td, uap)
 	}
 
 	buflen = min(MAXBSIZE, uap->nbytes);
-	buf = malloc(buflen, M_TEMP, 0);
+	buf = malloc(buflen, M_TEMP, M_WAITOK);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 	off = fp->f_offset;
 again:
diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c
index 54274f9db7a9..b5da396c92bf 100644
--- a/sys/compat/svr4/svr4_socket.c
+++ b/sys/compat/svr4/svr4_socket.c
@@ -138,7 +138,7 @@ svr4_add_socket(td, path, st)
 			atomic_store_rel_int(&svr4_str_initialized, 2);
 		}
 
-	e = malloc(sizeof(*e), M_TEMP, 0);
+	e = malloc(sizeof(*e), M_TEMP, M_WAITOK);
 	e->cookie = NULL;
 	e->dev = st->st_dev;
 	e->ino = st->st_ino;
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index ce2b68af34b2..95d67cd2d0dd 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -212,7 +212,7 @@ svr4_sendit(td, s, mp, flags)
 	if (KTRPOINT(td, KTR_GENIO)) {
 		int iovlen = auio.uio_iovcnt * sizeof (struct iovec);
 
-		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, 0);
+		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
 		bcopy((caddr_t)auio.uio_iov, (caddr_t)ktriov, iovlen);
 		ktruio = auio;
 	}
@@ -297,7 +297,7 @@ svr4_recvit(td, s, mp, namelenp)
 	if (KTRPOINT(td, KTR_GENIO)) {
 		int iovlen = auio.uio_iovcnt * sizeof (struct iovec);
 
-		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, 0);
+		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
 		bcopy((caddr_t)auio.uio_iov, (caddr_t)ktriov, iovlen);
 		ktruio = auio;
 	}
@@ -405,7 +405,7 @@ show_ioc(str, ioc)
 	const char		*str;
 	struct svr4_strioctl	*ioc;
 {
-	u_char *ptr = (u_char *) malloc(ioc->len, M_TEMP, 0);
+	u_char *ptr = (u_char *) malloc(ioc->len, M_TEMP, M_WAITOK);
 	int error;
 
 	uprintf("%s cmd = %ld, timeout = %d, len = %d, buf = %p { ",
@@ -441,7 +441,7 @@ show_strbuf(str)
 		len = maxlen;
 
 	if (len > 0) {
-	    ptr = (u_char *) malloc(len, M_TEMP, 0);
+	    ptr = (u_char *) malloc(len, M_TEMP, M_WAITOK);
 
 	    if ((error = copyin(str->buf, ptr, len)) != 0) {
 		    free((char *) ptr, M_TEMP);
diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c
index 508e9dc7f801..1d4ad6e5cfad 100644
--- a/sys/compat/svr4/svr4_sysvec.c
+++ b/sys/compat/svr4/svr4_sysvec.c
@@ -267,7 +267,7 @@ svr4_emul_find(td, sgp, prefix, path, pbuf, cflag)
 	char			*ptr, *buf, *cp;
 	size_t			 sz, len;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	*pbuf = path;
 
 	for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
diff --git a/sys/contrib/dev/fla/fla.c b/sys/contrib/dev/fla/fla.c
index aad18b63e51d..dda7f5b18989 100644
--- a/sys/contrib/dev/fla/fla.c
+++ b/sys/contrib/dev/fla/fla.c
@@ -65,7 +65,7 @@ static struct cdevsw fladisk_cdevsw;
 void *
 doc2k_malloc(int bytes) 
 {
-	return malloc(bytes, M_FLA, 0);
+	return malloc(bytes, M_FLA, M_WAITOK);
 }
 
 void
diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c
index 453fe75d12e1..73f4d576468b 100644
--- a/sys/contrib/dev/oltr/if_oltr.c
+++ b/sys/contrib/dev/oltr/if_oltr.c
@@ -1404,14 +1404,14 @@ DriverReceiveFrameCompleted(void *DriverHandle, int ByteCount, int FragmentCount
 	
 	if (sc->state > OL_CLOSED) {
 		if (ReceiveStatus == TRLLD_RCV_OK) {
-			MGETHDR(m0, M_NOWAIT, MT_DATA);
+			MGETHDR(m0, M_DONTWAIT, MT_DATA);
 			mbuf_size = MHLEN - 2;
 			if (!m0) {
 				ifp->if_ierrors++;
 				goto dropped;
 			}
 			if (ByteCount + 2 > MHLEN) {
-				MCLGET(m0, M_NOWAIT);
+				MCLGET(m0, M_DONTWAIT);
 				mbuf_size = MCLBYTES - 2;
 				if (!(m0->m_flags & M_EXT)) {
 					m_freem(m0);
@@ -1446,7 +1446,7 @@ DriverReceiveFrameCompleted(void *DriverHandle, int ByteCount, int FragmentCount
 					frag_offset = 0;
 				}
 				if ((mbuf_offset == mbuf_size) && (frame_len > 0)) {
-					MGET(m1, M_NOWAIT, MT_DATA);
+					MGET(m1, M_DONTWAIT, MT_DATA);
 					mbuf_size = MHLEN;
 					if (!m1) {
 						ifp->if_ierrors++;
@@ -1454,7 +1454,7 @@ DriverReceiveFrameCompleted(void *DriverHandle, int ByteCount, int FragmentCount
 						goto dropped;
 					}
 					if (frame_len > MHLEN) {
-						MCLGET(m1, M_NOWAIT);
+						MCLGET(m1, M_DONTWAIT);
 						mbuf_size = MCLBYTES;
 						if (!(m1->m_flags & M_EXT)) {
 							m_freem(m0);
diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c
index 7072753610c0..67d9f032c772 100644
--- a/sys/contrib/ipfilter/netinet/fil.c
+++ b/sys/contrib/ipfilter/netinet/fil.c
@@ -1209,7 +1209,7 @@ logit:
 		mc = dupmsg(m);
 # else
 #  if defined(__OpenBSD__) && (OpenBSD >= 199905)
-		mc = m_copym2(m, 0, M_COPYALL, M_NOWAIT);
+		mc = m_copym2(m, 0, M_COPYALL, M_DONTWAIT);
 #  else
 		mc = m_copy(m, 0, M_COPYALL);
 #  endif
@@ -1608,7 +1608,7 @@ m_copyback(m0, off, len, cp)
 		off -= mlen;
 		totlen += mlen;
 		if (m->m_next == 0) {
-			n = m_getclr(M_NOWAIT, m->m_type);
+			n = m_getclr(M_DONTWAIT, m->m_type);
 			if (n == 0)
 				goto out;
 			n->m_len = min(MLEN, len + off);
@@ -1627,7 +1627,7 @@ m_copyback(m0, off, len, cp)
 		if (len == 0)
 			break;
 		if (m->m_next == 0) {
-			n = m_get(M_NOWAIT, m->m_type);
+			n = m_get(M_DONTWAIT, m->m_type);
 			if (n == 0)
 				break;
 			n->m_len = min(MLEN, len);
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.c b/sys/contrib/ipfilter/netinet/ip_fil.c
index ec4f041dc290..f1f63a9f8759 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.c
+++ b/sys/contrib/ipfilter/netinet/ip_fil.c
@@ -1199,9 +1199,9 @@ fr_info_t *fin;
 	if (tcp->th_flags & TH_RST)
 		return -1;		/* feedback loop */
 # if	(BSD < 199306) || defined(__sgi)
-	m = m_get(M_NOWAIT, MT_HEADER);
+	m = m_get(M_DONTWAIT, MT_HEADER);
 # else
-	m = m_gethdr(M_NOWAIT, MT_HEADER);
+	m = m_gethdr(M_DONTWAIT, MT_HEADER);
 # endif
 	if (m == NULL)
 		return ENOBUFS;
@@ -1377,10 +1377,10 @@ int dst;
 
 # if	(BSD < 199306) || defined(__sgi)
 		avail = MLEN;
-		m = m_get(M_NOWAIT, MT_HEADER);
+		m = m_get(M_DONTWAIT, MT_HEADER);
 # else
 		avail = MHLEN;
-		m = m_gethdr(M_NOWAIT, MT_HEADER);
+		m = m_gethdr(M_DONTWAIT, MT_HEADER);
 # endif
 		if (m == NULL)
 			return ENOBUFS;
@@ -1404,11 +1404,11 @@ int dst;
 		if (type == ICMP6_DST_UNREACH)
 			code = icmptoicmp6unreach[code];
 
-		MGETHDR(m, M_NOWAIT, MT_HEADER);
+		MGETHDR(m, M_DONTWAIT, MT_HEADER);
 		if (!m)
 			return ENOBUFS;
 
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_freem(m);
 			return ENOBUFS;
@@ -1604,7 +1604,7 @@ frdest_t *fdp;
 	 * problem.
 	 */
 	if (M_WRITABLE(m) == 0) {
-		if ((m0 = m_dup(m, M_NOWAIT)) != NULL) {
+		if ((m0 = m_dup(m, M_DONTWAIT)) != NULL) {
 			m_freem(*mpp);
 			*mpp = m0;
 			m = m0;
@@ -1787,9 +1787,9 @@ frdest_t *fdp;
 	mhlen = sizeof (struct ip);
 	for (off = hlen + len; off < ip->ip_len; off += len) {
 # ifdef	MGETHDR
-		MGETHDR(m, M_NOWAIT, MT_HEADER);
+		MGETHDR(m, M_DONTWAIT, MT_HEADER);
 # else
-		MGET(m, M_NOWAIT, MT_HEADER);
+		MGET(m, M_DONTWAIT, MT_HEADER);
 # endif
 		if (m == 0) {
 			error = ENOBUFS;
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c
index 293011c26245..f8210267ccba 100644
--- a/sys/dev/agp/agp.c
+++ b/sys/dev/agp/agp.c
@@ -357,7 +357,7 @@ agp_generic_alloc_memory(device_t dev, int type, vm_size_t size)
 		return 0;
 	}
 
-	mem = malloc(sizeof *mem, M_AGP, 0);
+	mem = malloc(sizeof *mem, M_AGP, M_WAITOK);
 	mem->am_id = sc->as_nextid++;
 	mem->am_size = size;
 	mem->am_type = 0;
diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index 7590c501fe09..39890ac4cd64 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -567,7 +567,7 @@ agp_i810_alloc_memory(device_t dev, int type, vm_size_t size)
 			return 0;
 	}
 
-	mem = malloc(sizeof *mem, M_AGP, 0);
+	mem = malloc(sizeof *mem, M_AGP, M_WAITOK);
 	mem->am_id = sc->agp.as_nextid++;
 	mem->am_size = size;
 	mem->am_type = type;
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index e763c6c71890..e75c2afc1429 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -433,7 +433,7 @@ amr_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, d_thread_t *td)
 	debug(1, "AMR_IO_COMMAND  0x%x", au->au_cmd[0]);
 	/* handle inbound data buffer */
 	if (au->au_length != 0) {
-	    if ((dp = malloc(au->au_length, M_DEVBUF, 0)) == NULL) {
+	    if ((dp = malloc(au->au_length, M_DEVBUF, M_WAITOK)) == NULL) {
 		error = ENOMEM;
 		break;
 	    }
@@ -449,7 +449,7 @@ amr_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, d_thread_t *td)
 
 	/* handle SCSI passthrough command */
 	if (au->au_cmd[0] == AMR_CMD_PASS) {
-	    if ((ap = malloc(sizeof(*ap), M_DEVBUF, M_ZERO)) == NULL) {
+	    if ((ap = malloc(sizeof(*ap), M_DEVBUF, M_WAITOK | M_ZERO)) == NULL) {
 		error = ENOMEM;
 		break;
 	    }
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index c33c7c0418dd..cf1ff5d832ee 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -921,12 +921,12 @@ an_rxeof(sc)
 			/* dump raw 802.11 packet to bpf and skip ip stack */
 			BPF_TAP(ifp, bpf_buf, len);
 		} else {
-			MGETHDR(m, M_NOWAIT, MT_DATA);
+			MGETHDR(m, M_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				ifp->if_ierrors++;
 				return;
 			}
-			MCLGET(m, M_NOWAIT);
+			MCLGET(m, M_DONTWAIT);
 			if (!(m->m_flags & M_EXT)) {
 				m_freem(m);
 				ifp->if_ierrors++;
@@ -1006,12 +1006,12 @@ an_rxeof(sc)
 			if (an_rx_desc.an_done && !an_rx_desc.an_valid) {
 				buf = sc->an_rx_buffer[count].an_dma_vaddr;
 
-				MGETHDR(m, M_NOWAIT, MT_DATA);
+				MGETHDR(m, M_DONTWAIT, MT_DATA);
 				if (m == NULL) {
 					ifp->if_ierrors++;
 					return;
 				}
-				MCLGET(m, M_NOWAIT);
+				MCLGET(m, M_DONTWAIT);
 				if (!(m->m_flags & M_EXT)) {
 					m_freem(m);
 					ifp->if_ierrors++;
@@ -3610,7 +3610,7 @@ flashcard(ifp, l_ioctl)
 			free(sc->an_flash_buffer, M_DEVBUF);
 			sc->an_flash_buffer = NULL;
 		}
-		sc->an_flash_buffer = malloc(FLASH_SIZE, M_DEVBUF, 0);
+		sc->an_flash_buffer = malloc(FLASH_SIZE, M_DEVBUF, M_WAITOK);
 		if (sc->an_flash_buffer)
 			return setflashmode(ifp);
 		else
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 14561f774388..0c09885c6d83 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -1078,7 +1078,7 @@ arc_init(struct ar_hardc *hc)
 	u_char isr, mar;
 
 	MALLOC(sc, struct ar_softc *, hc->numports * sizeof(struct ar_softc),
-		M_DEVBUF, M_ZERO);
+		M_DEVBUF, M_WAITOK | M_ZERO);
 	if (sc == NULL)
 		return;
 	hc->sc = sc;
@@ -1678,7 +1678,7 @@ ar_get_packets(struct ar_softc *sc)
 	while(ar_packet_avail(sc, &len, &rxstat)) {
 		TRC(printf("apa: len %d, rxstat %x\n", len, rxstat));
 		if(((rxstat & SCA_DESC_ERRORS) == 0) && (len < MCLBYTES)) {
-			MGETHDR(m, M_NOWAIT, MT_DATA);
+			MGETHDR(m, M_DONTWAIT, MT_DATA);
 			if(m == NULL) {
 				/* eat packet if get mbuf fail!! */
 				ar_eat_packet(sc, 1);
@@ -1693,7 +1693,7 @@ ar_get_packets(struct ar_softc *sc)
 #endif	/* NETGRAPH */
 			m->m_pkthdr.len = m->m_len = len;
 			if(len > MHLEN) {
-				MCLGET(m, M_NOWAIT);
+				MCLGET(m, M_DONTWAIT);
 				if((m->m_flags & M_EXT) == 0) {
 					m_freem(m);
 					ar_eat_packet(sc, 1);
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index c377c9d48a1a..4e1c28415579 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -911,7 +911,7 @@ asr_alloc_ccb (
 	OUT union asr_ccb * new_ccb;
 
 	if ((new_ccb = (union asr_ccb *)malloc(sizeof(*new_ccb),
-	  M_DEVBUF, M_ZERO)) != (union asr_ccb *)NULL) {
+	  M_DEVBUF, M_WAITOK | M_ZERO)) != (union asr_ccb *)NULL) {
 		new_ccb->ccb_h.pinfo.priority = 1;
 		new_ccb->ccb_h.pinfo.index = CAM_UNQUEUED_INDEX;
 		new_ccb->ccb_h.spriv_ptr0 = sc;
@@ -1205,7 +1205,7 @@ ASR_getTidAddress(
 		if ((new_entry == FALSE)
 		 || ((sc->ha_targets[bus] = bus_ptr = (target2lun_t *)malloc (
 		    sizeof(*bus_ptr) + (sizeof(bus_ptr->LUN) * new_size),
-		    M_TEMP, M_ZERO))
+		    M_TEMP, M_WAITOK | M_ZERO))
 		   == (target2lun_t *)NULL)) {
 			debug_asr_printf("failed to allocate bus list\n");
 			return ((tid_t *)NULL);
@@ -1222,7 +1222,7 @@ ASR_getTidAddress(
 		if ((new_entry == FALSE)
 		 || ((new_bus_ptr = (target2lun_t *)malloc (
 		    sizeof(*bus_ptr) + (sizeof(bus_ptr->LUN) * new_size),
-		    M_TEMP, M_ZERO))
+		    M_TEMP, M_WAITOK | M_ZERO))
 		   == (target2lun_t *)NULL)) {
 			debug_asr_printf("failed to reallocate bus list\n");
 			return ((tid_t *)NULL);
@@ -1258,7 +1258,7 @@ ASR_getTidAddress(
 		if ((new_entry == FALSE)
 		 || ((bus_ptr->LUN[target] = target_ptr = (lun2tid_t *)malloc (
 		    sizeof(*target_ptr) + (sizeof(target_ptr->TID) * new_size),
-		    M_TEMP, M_ZERO))
+		    M_TEMP, M_WAITOK | M_ZERO))
 		   == (lun2tid_t *)NULL)) {
 			debug_asr_printf("failed to allocate target list\n");
 			return ((tid_t *)NULL);
@@ -1275,7 +1275,7 @@ ASR_getTidAddress(
 		if ((new_entry == FALSE)
 		 || ((new_target_ptr = (lun2tid_t *)malloc (
 		    sizeof(*target_ptr) + (sizeof(target_ptr->TID) * new_size),
-		    M_TEMP, M_ZERO))
+		    M_TEMP, M_WAITOK | M_ZERO))
 		   == (lun2tid_t *)NULL)) {
 			debug_asr_printf("failed to reallocate target list\n");
 			return ((tid_t *)NULL);
@@ -1808,7 +1808,7 @@ ASR_acquireLct (
 	MessageSizeInBytes = sizeof(I2O_EXEC_LCT_NOTIFY_MESSAGE)
 	  - sizeof(I2O_SG_ELEMENT) + sizeof(I2O_SGE_SIMPLE_ELEMENT);
 	if ((Message_Ptr = (PI2O_EXEC_LCT_NOTIFY_MESSAGE)malloc (
-	  MessageSizeInBytes, M_TEMP, 0))
+	  MessageSizeInBytes, M_TEMP, M_WAITOK))
 	  == (PI2O_EXEC_LCT_NOTIFY_MESSAGE)NULL) {
 		return (ENOMEM);
 	}
@@ -1852,7 +1852,7 @@ ASR_acquireLct (
 		free (Message_Ptr, M_TEMP);
 		return (EINVAL);
 	}
-	if ((sc->ha_LCT = (PI2O_LCT)malloc (len, M_TEMP, 0))
+	if ((sc->ha_LCT = (PI2O_LCT)malloc (len, M_TEMP, M_WAITOK))
 	  == (PI2O_LCT)NULL) {
 		free (Message_Ptr, M_TEMP);
 		return (ENOMEM);
@@ -1921,7 +1921,7 @@ ASR_acquireLct (
 			PI2O_EXEC_LCT_NOTIFY_MESSAGE NewMessage_Ptr;
 
 			if ((NewMessage_Ptr = (PI2O_EXEC_LCT_NOTIFY_MESSAGE)
-			    malloc (MessageSizeInBytes, M_TEMP, 0))
+			    malloc (MessageSizeInBytes, M_TEMP, M_WAITOK))
 			    == (PI2O_EXEC_LCT_NOTIFY_MESSAGE)NULL) {
 				free (sc->ha_LCT, M_TEMP);
 				sc->ha_LCT = (PI2O_LCT)NULL;
@@ -2262,7 +2262,7 @@ ASR_initOutBound (
 			 * initialization time.
 			 */
 			if ((sc->ha_Msgs = (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)
-			  contigmalloc (size, M_DEVBUF, 0, 0ul,
+			  contigmalloc (size, M_DEVBUF, M_WAITOK, 0ul,
 			    0xFFFFFFFFul, (u_long)sizeof(U32), 0ul))
 			  != (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)NULL) {
 				(void)bzero ((char *)sc->ha_Msgs, size);
@@ -2296,7 +2296,7 @@ ASR_setSysTab(
 	int			      retVal;
 
 	if ((SystemTable = (PI2O_SET_SYSTAB_HEADER)malloc (
-	  sizeof(I2O_SET_SYSTAB_HEADER), M_TEMP, M_ZERO))
+	  sizeof(I2O_SET_SYSTAB_HEADER), M_TEMP, M_WAITOK | M_ZERO))
 	  == (PI2O_SET_SYSTAB_HEADER)NULL) {
 		return (ENOMEM);
 	}
@@ -2306,7 +2306,7 @@ ASR_setSysTab(
 	if ((Message_Ptr = (PI2O_EXEC_SYS_TAB_SET_MESSAGE)malloc (
 	  sizeof(I2O_EXEC_SYS_TAB_SET_MESSAGE) - sizeof(I2O_SG_ELEMENT)
 	   + ((3+SystemTable->NumberEntries) * sizeof(I2O_SGE_SIMPLE_ELEMENT)),
-	  M_TEMP, 0)) == (PI2O_EXEC_SYS_TAB_SET_MESSAGE)NULL) {
+	  M_TEMP, M_WAITOK)) == (PI2O_EXEC_SYS_TAB_SET_MESSAGE)NULL) {
 		free (SystemTable, M_TEMP);
 		return (ENOMEM);
 	}
@@ -2918,7 +2918,7 @@ asr_attach (ATTACH_ARGS)
 		/* Check if the device is there? */
 		if ((ASR_resetIOP(sc->ha_Virt, sc->ha_Fvirt) == 0)
 		 || ((status = (PI2O_EXEC_STATUS_GET_REPLY)malloc (
-		  sizeof(I2O_EXEC_STATUS_GET_REPLY), M_TEMP, 0))
+		  sizeof(I2O_EXEC_STATUS_GET_REPLY), M_TEMP, M_WAITOK))
 		  == (PI2O_EXEC_STATUS_GET_REPLY)NULL)
 		 || (ASR_getStatus(sc->ha_Virt, sc->ha_Fvirt, status) == NULL)) {
 			printf ("asr%d: could not initialize hardware\n", unit);
@@ -3037,7 +3037,7 @@ asr_attach (ATTACH_ARGS)
 	printf ("asr%d:", unit);
 
 	if ((iq = (struct scsi_inquiry_data *)malloc (
-	    sizeof(struct scsi_inquiry_data), M_TEMP, M_ZERO))
+	    sizeof(struct scsi_inquiry_data), M_TEMP, M_WAITOK | M_ZERO))
 	  != (struct scsi_inquiry_data *)NULL) {
 		defAlignLong(PRIVATE_SCSI_SCB_EXECUTE_MESSAGE,Message);
 		PPRIVATE_SCSI_SCB_EXECUTE_MESSAGE	      Message_Ptr;
@@ -3947,7 +3947,7 @@ ASR_queue_i(
 	}
 	/* Copy in the message into a local allocation */
 	if ((Message_Ptr = (PI2O_MESSAGE_FRAME)malloc (
-	  sizeof(I2O_MESSAGE_FRAME), M_TEMP, 0))
+	  sizeof(I2O_MESSAGE_FRAME), M_TEMP, M_WAITOK))
 	 == (PI2O_MESSAGE_FRAME)NULL) {
 		debug_usr_cmd_printf (
 		  "Failed to acquire I2O_MESSAGE_FRAME memory\n");
@@ -4014,7 +4014,7 @@ ASR_queue_i(
 	}
 
 	if ((Message_Ptr = (PI2O_MESSAGE_FRAME)malloc (MessageSizeInBytes,
-	  M_TEMP, 0)) == (PI2O_MESSAGE_FRAME)NULL) {
+	  M_TEMP, M_WAITOK)) == (PI2O_MESSAGE_FRAME)NULL) {
 		debug_usr_cmd_printf ("Failed to acquire frame[%d] memory\n",
 		  MessageSizeInBytes);
 		return (ENOMEM);
@@ -4030,7 +4030,7 @@ ASR_queue_i(
 	/* Check the size of the reply frame, and start constructing */
 
 	if ((Reply_Ptr = (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)malloc (
-	  sizeof(I2O_MESSAGE_FRAME), M_TEMP, 0))
+	  sizeof(I2O_MESSAGE_FRAME), M_TEMP, M_WAITOK))
 	  == (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)NULL) {
 		free (Message_Ptr, M_TEMP);
 		debug_usr_cmd_printf (
@@ -4061,7 +4061,7 @@ ASR_queue_i(
 	  ((ReplySizeInBytes > sizeof(I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME))
 	    ? ReplySizeInBytes
 	    : sizeof(I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)),
-	  M_TEMP, 0)) == (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)NULL) {
+	  M_TEMP, M_WAITOK)) == (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)NULL) {
 		free (Message_Ptr, M_TEMP);
 		debug_usr_cmd_printf ("Failed to acquire frame[%d] memory\n",
 		  ReplySizeInBytes);
@@ -4130,7 +4130,7 @@ ASR_queue_i(
 
 			if ((elm = (struct ioctlSgList_S *)malloc (
 			  sizeof(*elm) - sizeof(elm->KernelSpace) + len,
-			  M_TEMP, 0))
+			  M_TEMP, M_WAITOK))
 			  == (struct ioctlSgList_S *)NULL) {
 				debug_usr_cmd_printf (
 				  "Failed to allocate SG[%d]\n", len);
@@ -4219,7 +4219,7 @@ ASR_queue_i(
 					if ((NewMessage_Ptr
 					  = (PI2O_MESSAGE_FRAME)
 					    malloc (MessageSizeInBytes,
-					     M_TEMP, 0))
+					     M_TEMP, M_WAITOK))
 					    == (PI2O_MESSAGE_FRAME)NULL) {
 						debug_usr_cmd_printf (
 						  "Failed to acquire frame[%d] memory\n",
diff --git a/sys/dev/ata/atapi-cam.c b/sys/dev/ata/atapi-cam.c
index b6329a65d3d3..02e234b70502 100644
--- a/sys/dev/ata/atapi-cam.c
+++ b/sys/dev/ata/atapi-cam.c
@@ -624,7 +624,7 @@ static void
 cam_rescan(struct cam_sim *sim)
 {
     struct cam_path *path;
-    union ccb *ccb = malloc(sizeof(union ccb), M_ATACAM, M_ZERO);
+    union ccb *ccb = malloc(sizeof(union ccb), M_ATACAM, M_WAITOK | M_ZERO);
     
     if (xpt_create_path(&path, xpt_periph, cam_sim_path(sim),
 			CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP)
diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c
index 1eeaf78476e9..e77fae6d601a 100644
--- a/sys/dev/awi/awi.c
+++ b/sys/dev/awi/awi.c
@@ -1243,7 +1243,7 @@ awi_fix_txhdr(sc, m0)
 		    llc->llc_snap.org_code[2] = 0;
 		llc->llc_snap.ether_type = eh.ether_type;
 	}
-	M_PREPEND(m0, sizeof(struct ieee80211_frame), M_NOWAIT);
+	M_PREPEND(m0, sizeof(struct ieee80211_frame), M_DONTWAIT);
 	if (m0 == NULL)
 		return NULL;
 	wh = mtod(m0, struct ieee80211_frame *);
@@ -1321,7 +1321,7 @@ awi_fix_rxhdr(sc, m0)
 		off = 0;
 		while (m0->m_pkthdr.len > off) {
 			if (n0 == NULL) {
-				MGETHDR(n, M_NOWAIT, MT_DATA);
+				MGETHDR(n, M_DONTWAIT, MT_DATA);
 				if (n == NULL) {
 					m_freem(m0);
 					return NULL;
@@ -1329,7 +1329,7 @@ awi_fix_rxhdr(sc, m0)
 				M_MOVE_PKTHDR(n, m0);
 				n->m_len = MHLEN;
 			} else {
-				MGET(n, M_NOWAIT, MT_DATA);
+				MGET(n, M_DONTWAIT, MT_DATA);
 				if (n == NULL) {
 					m_freem(m0);
 					m_freem(n0);
@@ -1338,7 +1338,7 @@ awi_fix_rxhdr(sc, m0)
 				n->m_len = MLEN;
 			}
 			if (m0->m_pkthdr.len - off >= MINCLSIZE) {
-				MCLGET(n, M_NOWAIT);
+				MCLGET(n, M_DONTWAIT);
 				if (n->m_flags & M_EXT)
 					n->m_len = n->m_ext.ext_size;
 			}
@@ -1549,14 +1549,14 @@ awi_devget(sc, off, len)
 
 	while (len > 0) {
 		if (top == NULL) {
-			MGETHDR(m, M_NOWAIT, MT_DATA);
+			MGETHDR(m, M_DONTWAIT, MT_DATA);
 			if (m == NULL)
 				return NULL;
 			m->m_pkthdr.rcvif = sc->sc_ifp;
 			m->m_pkthdr.len = len;
 			m->m_len = MHLEN;
 		} else {
-			MGET(m, M_NOWAIT, MT_DATA);
+			MGET(m, M_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				m_freem(top);
 				return NULL;
@@ -1564,7 +1564,7 @@ awi_devget(sc, off, len)
 			m->m_len = MLEN;
 		}
 		if (len >= MINCLSIZE) {
-			MCLGET(m, M_NOWAIT);
+			MCLGET(m, M_DONTWAIT);
 			if (m->m_flags & M_EXT)
 				m->m_len = m->m_ext.ext_size;
 		}
@@ -2232,7 +2232,7 @@ awi_send_deauth(sc)
 	struct ieee80211_frame *wh;
 	u_int8_t *deauth;
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	if (ifp->if_flags & IFF_DEBUG)
@@ -2269,7 +2269,7 @@ awi_send_auth(sc, seq)
 	struct ieee80211_frame *wh;
 	u_int8_t *auth;
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	sc->sc_status = AWI_ST_AUTH;
@@ -2370,7 +2370,7 @@ awi_send_asreq(sc, reassoc)
 	u_int16_t capinfo, lintval;
 	u_int8_t *asreq;
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	sc->sc_status = AWI_ST_ASSOC;
diff --git a/sys/dev/awi/awi_wep.c b/sys/dev/awi/awi_wep.c
index 1eec0233bfb4..ecaf548b4ce0 100644
--- a/sys/dev/awi/awi_wep.c
+++ b/sys/dev/awi/awi_wep.c
@@ -319,7 +319,7 @@ awi_wep_encrypt(sc, m0, txflag)
 	ctx = sc->sc_wep_ctx;
 	m = m0;
 	left = m->m_pkthdr.len;
-	MGET(n, M_NOWAIT, m->m_type);
+	MGET(n, M_DONTWAIT, m->m_type);
 	n0 = n;
 	if (n == NULL)
 		goto fail;
@@ -333,7 +333,7 @@ awi_wep_encrypt(sc, m0, txflag)
 	}
 	n->m_len = MHLEN;
 	if (n->m_pkthdr.len >= MINCLSIZE) {
-		MCLGET(n, M_NOWAIT);
+		MCLGET(n, M_DONTWAIT);
 		if (n->m_flags & M_EXT)
 			n->m_len = n->m_ext.ext_size;
 	}
@@ -382,13 +382,13 @@ awi_wep_encrypt(sc, m0, txflag)
 		if (len > n->m_len - noff) {
 			len = n->m_len - noff;
 			if (len == 0) {
-				MGET(n->m_next, M_NOWAIT, n->m_type);
+				MGET(n->m_next, M_DONTWAIT, n->m_type);
 				if (n->m_next == NULL)
 					goto fail;
 				n = n->m_next;
 				n->m_len = MLEN;
 				if (left >= MINCLSIZE) {
-					MCLGET(n, M_NOWAIT);
+					MCLGET(n, M_DONTWAIT);
 					if (n->m_flags & M_EXT)
 						n->m_len = n->m_ext.ext_size;
 				}
@@ -418,7 +418,7 @@ awi_wep_encrypt(sc, m0, txflag)
 			n->m_len = noff + sizeof(crcbuf);
 		else {
 			n->m_len = noff;
-			MGET(n->m_next, M_NOWAIT, n->m_type);
+			MGET(n->m_next, M_DONTWAIT, n->m_type);
 			if (n->m_next == NULL)
 				goto fail;
 			n = n->m_next;
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 26803b8d543a..01d720370479 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -719,12 +719,12 @@ bge_newbuf_std(sc, i, m)
 	struct bge_rx_bd	*r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
 
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -765,7 +765,7 @@ bge_newbuf_jumbo(sc, i, m)
 		caddr_t			*buf = NULL;
 
 		/* Allocate the mbuf. */
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c
index 250ac65916b8..adee34dac411 100644
--- a/sys/dev/cardbus/cardbus_cis.c
+++ b/sys/dev/cardbus/cardbus_cis.c
@@ -201,7 +201,7 @@ decode_tuple_copy(device_t cbdev, device_t child, int id,
 	struct cis_tupleinfo *tmpbuf;
 
 	tmpbuf = malloc(sizeof(struct cis_tupleinfo) * (ncisread_buf+1),
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	if (ncisread_buf > 0) {
 		memcpy(tmpbuf, cisread_buf,
 		    sizeof(struct cis_tupleinfo) * ncisread_buf);
@@ -211,7 +211,7 @@ decode_tuple_copy(device_t cbdev, device_t child, int id,
 
 	cisread_buf[ncisread_buf].id = id;
 	cisread_buf[ncisread_buf].len = len;
-	cisread_buf[ncisread_buf].data = malloc(len, M_DEVBUF, 0);
+	cisread_buf[ncisread_buf].data = malloc(len, M_DEVBUF, M_WAITOK);
 	memcpy(cisread_buf[ncisread_buf].data, tupledata, len);
 	ncisread_buf++;
 	return (0);
@@ -804,7 +804,7 @@ cardbus_alloc_resources(device_t cbdev, device_t child)
 	if (count == 0)
 		return (0);
 	barlist = malloc(sizeof(struct resource_list_entry*) * count, M_DEVBUF,
-	    0);
+	    M_WAITOK);
 	count = 0;
 	SLIST_FOREACH(rle, &dinfo->pci.resources, link) {
 		barlist[count] = rle;
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index c7f659102f0e..d947708b6021 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -186,7 +186,7 @@ ccdnew(int unit)
 	if (IS_ALLOCATED(unit) || unit > 32)
 		return (NULL);
 
-	MALLOC(sc, struct ccd_s *, sizeof(*sc), M_CCD, M_ZERO);
+	MALLOC(sc, struct ccd_s *, sizeof(*sc), M_CCD, M_WAITOK | M_ZERO);
 	sc->sc_unit = unit;
 	LIST_INSERT_HEAD(&ccd_softc_list, sc, list);
 	/* XXX: UNLOCK(unique unit numbers) */
@@ -263,7 +263,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 
 	/* Allocate space for the component info. */
 	cs->sc_cinfo = malloc(cs->sc_nccdisks * sizeof(struct ccdcinfo),
-	    M_CCD, 0);
+	    M_CCD, M_WAITOK);
 
 	/*
 	 * Verify that each component piece exists and record
@@ -271,7 +271,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 	 */
 	maxsecsize = 0;
 	minsize = 0;
-	tmppath = malloc(MAXPATHLEN, M_CCD, 0);
+	tmppath = malloc(MAXPATHLEN, M_CCD, M_WAITOK);
 	for (ix = 0; ix < cs->sc_nccdisks; ix++) {
 		vp = cs->sc_vpp[ix];
 		ci = &cs->sc_cinfo[ix];
@@ -284,7 +284,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 		    MAXPATHLEN, &ci->ci_pathlen)) != 0) {
 			goto fail;
 		}
-		ci->ci_path = malloc(ci->ci_pathlen, M_CCD, 0);
+		ci->ci_path = malloc(ci->ci_pathlen, M_CCD, M_WAITOK);
 		bcopy(tmppath, ci->ci_path, ci->ci_pathlen);
 
 		ci->ci_dev = vn_todev(vp);
@@ -439,7 +439,7 @@ ccdinterleave(struct ccd_s *cs, int unit)
 	 */
 	size = (cs->sc_nccdisks + 1) * sizeof(struct ccdiinfo);
 	cs->sc_itable = (struct ccdiinfo *)malloc(size, M_CCD,
-	    M_ZERO);
+	    M_WAITOK | M_ZERO);
 
 	/*
 	 * Trivial case: no interleave (actually interleave of disk size).
@@ -453,7 +453,7 @@ ccdinterleave(struct ccd_s *cs, int unit)
 
 		for (ix = 0; ix < cs->sc_nccdisks; ix++) {
 			/* Allocate space for ii_index. */
-			ii->ii_index = malloc(sizeof(int), M_CCD, 0);
+			ii->ii_index = malloc(sizeof(int), M_CCD, M_WAITOK);
 			ii->ii_ndisk = 1;
 			ii->ii_startblk = bn;
 			ii->ii_startoff = 0;
@@ -476,7 +476,7 @@ ccdinterleave(struct ccd_s *cs, int unit)
 		 * we use.
 		 */
 		ii->ii_index = malloc((sizeof(int) * cs->sc_nccdisks),
-		    M_CCD, 0);
+		    M_CCD, M_WAITOK);
 
 		/*
 		 * Locate the smallest of the remaining components
@@ -1066,9 +1066,9 @@ ccdioctltoo(int unit, u_long cmd, caddr_t data, int flag, struct thread *td)
 		 * componet pathnames and device numbers.
 		 */
 		cpp = malloc(ccio->ccio_ndisks * sizeof(char *),
-		    M_CCD, 0);
+		    M_CCD, M_WAITOK);
 		vpp = malloc(ccio->ccio_ndisks * sizeof(struct vnode *),
-		    M_CCD, 0);
+		    M_CCD, M_WAITOK);
 
 		error = copyin((caddr_t)ccio->ccio_disks, (caddr_t)cpp,
 		    ccio->ccio_ndisks * sizeof(char **));
@@ -1124,7 +1124,8 @@ ccdioctltoo(int unit, u_long cmd, caddr_t data, int flag, struct thread *td)
 		ccio->ccio_unit = unit;
 		ccio->ccio_size = cs->sc_size;
 		ccg = &cs->sc_geom;
-		cs->sc_disk = malloc(sizeof(struct disk), M_CCD, M_ZERO);
+		cs->sc_disk = malloc(sizeof(struct disk), M_CCD,
+		    M_ZERO | M_WAITOK);
 		cs->sc_disk->d_strategy = ccdstrategy;
 		cs->sc_disk->d_name = "ccd";
 		cs->sc_disk->d_sectorsize = ccg->ccg_secsize;
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index 3189ca066155..540627271582 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -1930,7 +1930,7 @@ ciss_user_command(struct ciss_softc *sc, IOCTL_Command_struct *ioc)
      */
     cr->cr_length = ioc->buf_size;
     if (ioc->buf_size > 0) {
-	if ((cr->cr_data = malloc(ioc->buf_size, CISS_MALLOC_CLASS, 0)) == NULL) {
+	if ((cr->cr_data = malloc(ioc->buf_size, CISS_MALLOC_CLASS, M_WAITOK)) == NULL) {
 	    error = ENOMEM;
 	    goto out;
 	}
@@ -2109,7 +2109,7 @@ ciss_cam_rescan_target(struct ciss_softc *sc, int target)
 
     debug_called(1);
 
-    if ((ccb = malloc(sizeof(union ccb), M_TEMP, M_ZERO)) == NULL) {
+    if ((ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO)) == NULL) {
 	ciss_printf(sc, "rescan failed (can't allocate CCB)\n");
 	return;
     }
diff --git a/sys/dev/cm/smc90cx6.c b/sys/dev/cm/smc90cx6.c
index 9347b5d2bb68..7ef0d1084237 100644
--- a/sys/dev/cm/smc90cx6.c
+++ b/sys/dev/cm/smc90cx6.c
@@ -628,7 +628,7 @@ cm_srint(vsc)
 	splx(s);
 
 	/* Allocate header mbuf */
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 
 	if (m == 0) {
 		/*
@@ -665,7 +665,7 @@ cm_srint(vsc)
 	 */
 	if ((len + 2 + 2) > MHLEN) {
 		/* attach an mbuf cluster */
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 
 		/* Insist on getting a cluster */
 		if ((m->m_flags & M_EXT) == 0) {
diff --git a/sys/dev/cnw/if_cnw.c b/sys/dev/cnw/if_cnw.c
index 7043fff0c87b..84bdcedcd5cf 100644
--- a/sys/dev/cnw/if_cnw.c
+++ b/sys/dev/cnw/if_cnw.c
@@ -941,7 +941,7 @@ cnw_read(sc)
 	bufbytes = 0;
 	bufptr = 0; /* XXX make gcc happy */
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == 0)
 		return (0);
 #if !defined(__FreeBSD__)
@@ -956,7 +956,7 @@ cnw_read(sc)
 
 	while (totbytes > 0) {
 		if (top) {
-			MGET(m, M_NOWAIT, MT_DATA);
+			MGET(m, M_DONTWAIT, MT_DATA);
 			if (m == 0) {
 				m_freem(top);
 				return (0);
@@ -964,7 +964,7 @@ cnw_read(sc)
 			mbytes = MLEN;
 		}
 		if (totbytes >= MINCLSIZE) {
-			MCLGET(m, M_NOWAIT);
+			MCLGET(m, M_DONTWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_free(m);
 				m_freem(top);
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 94643f0a1892..bffccf909b23 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -780,12 +780,12 @@ cs_get_packet(struct cs_softc *sc)
 		return -1;
 	}
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m==NULL)
 		return -1;
 
 	if (length > MHLEN) {
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if (!(m->m_flags & M_EXT)) {
 			m_freem(m);
 			return -1;
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index 0fb625d83621..1570ea452602 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -2428,11 +2428,11 @@ dc_newbuf(sc, i, m)
 	c = &sc->dc_ldata->dc_rx_list[i];
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -3192,11 +3192,11 @@ dc_coal(sc, m_head)
 	struct mbuf		*m_new, *m;
 
 	m = *m_head;
-	MGETHDR(m_new, M_NOWAIT, MT_DATA);
+	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 	if (m_new == NULL)
 		return(ENOBUFS);
 	if (m->m_pkthdr.len > MHLEN) {
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 9e1e319b2f2b..d1865865a099 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -195,7 +195,7 @@ tulip_txprobe(
      * either is connected so the transmit is the only way
      * to verify the connectivity.
      */
-    MGETHDR(m, M_NOWAIT, MT_DATA);
+    MGETHDR(m, M_DONTWAIT, MT_DATA);
     if (m == NULL)
 	return 0;
     /*
@@ -3545,12 +3545,12 @@ tulip_rx_intr(
 	 */
 	if (accept || ms == NULL) {
 	    struct mbuf *m0;
-	    MGETHDR(m0, M_NOWAIT, MT_DATA);
+	    MGETHDR(m0, M_DONTWAIT, MT_DATA);
 	    if (m0 != NULL) {
 #if defined(TULIP_COPY_RXDATA)
 		if (!accept || total_len >= (MHLEN - 2)) {
 #endif
-		    MCLGET(m0, M_NOWAIT);
+		    MCLGET(m0, M_DONTWAIT);
 		    if ((m0->m_flags & M_EXT) == 0) {
 			m_freem(m0);
 			m0 = NULL;
@@ -4061,10 +4061,10 @@ tulip_mbuf_compress(
 {
     struct mbuf *m0;
 #if MCLBYTES >= ETHERMTU + 18 && !defined(BIG_PACKET)
-    MGETHDR(m0, M_NOWAIT, MT_DATA);
+    MGETHDR(m0, M_DONTWAIT, MT_DATA);
     if (m0 != NULL) {
 	if (m->m_pkthdr.len > MHLEN) {
-	    MCLGET(m0, M_NOWAIT);
+	    MCLGET(m0, M_DONTWAIT);
 	    if ((m0->m_flags & M_EXT) == 0) {
 		m_freem(m);
 		m_freem(m0);
@@ -4081,9 +4081,9 @@ tulip_mbuf_compress(
 
     while (len > 0) {
 	if (mlen == MHLEN) {
-	    MGETHDR(*mp, M_NOWAIT, MT_DATA);
+	    MGETHDR(*mp, M_DONTWAIT, MT_DATA);
 	} else {
-	    MGET(*mp, M_NOWAIT, MT_DATA);
+	    MGET(*mp, M_DONTWAIT, MT_DATA);
 	}
 	if (*mp == NULL) {
 	    m_freem(m0);
@@ -4091,7 +4091,7 @@ tulip_mbuf_compress(
 	    break;
 	}
 	if (len > MLEN) {
-	    MCLGET(*mp, M_NOWAIT);
+	    MCLGET(*mp, M_DONTWAIT);
 	    if (((*mp)->m_flags & M_EXT) == 0) {
 		m_freem(m0);
 		m0 = NULL;
diff --git a/sys/dev/digi/digi.c b/sys/dev/digi/digi.c
index cde3b98734a2..57f60222dc24 100644
--- a/sys/dev/digi/digi.c
+++ b/sys/dev/digi/digi.c
@@ -546,12 +546,12 @@ digi_init(struct digi_softc *sc)
 	if (sc->ports)
 		free(sc->ports, M_TTYS);
 	sc->ports = malloc(sizeof(struct digi_p) * sc->numports,
-	    M_TTYS, M_ZERO);
+	    M_TTYS, M_WAITOK | M_ZERO);
 
 	if (sc->ttys)
 		free(sc->ttys, M_TTYS);
 	sc->ttys = malloc(sizeof(struct tty) * sc->numports,
-	    M_TTYS, M_ZERO);
+	    M_TTYS, M_WAITOK | M_ZERO);
 
 	/*
 	 * XXX Should read port 0xc90 for an array of 2byte values, 1 per
@@ -1035,7 +1035,7 @@ digi_loadmoduledata(struct digi_softc *sc)
 	KASSERT(sc->module != NULL, ("Uninitialised module name"));
 
 	modlen = strlen(sc->module);
-	modfile = malloc(modlen + 6, M_TEMP, 0);
+	modfile = malloc(modlen + 6, M_TEMP, M_WAITOK);
 	snprintf(modfile, modlen + 6, "digi_%s", sc->module);
 	if ((res = linker_reference_module(modfile, NULL, &lf)) != 0) {
 		if (res == ENOENT && rootdev == NODEV)
@@ -1049,7 +1049,7 @@ digi_loadmoduledata(struct digi_softc *sc)
 	if (res != 0)
 		return (res);
 
-	sym = malloc(modlen + 10, M_TEMP, 0);
+	sym = malloc(modlen + 10, M_TEMP, M_WAITOK);
 	snprintf(sym, modlen + 10, "digi_mod_%s", sc->module);
 	if ((symptr = linker_file_lookup_symbol(lf, sym, 0)) == NULL)
 		printf("digi_%s.ko: Symbol `%s' not found\n", sc->module, sym);
@@ -1065,19 +1065,19 @@ digi_loadmoduledata(struct digi_softc *sc)
 
 	sc->bios.size = digi_mod->dm_bios.size;
 	if (sc->bios.size != 0 && digi_mod->dm_bios.data != NULL) {
-		sc->bios.data = malloc(sc->bios.size, M_TTYS, 0);
+		sc->bios.data = malloc(sc->bios.size, M_TTYS, M_WAITOK);
 		bcopy(digi_mod->dm_bios.data, sc->bios.data, sc->bios.size);
 	}
 
 	sc->fep.size = digi_mod->dm_fep.size;
 	if (sc->fep.size != 0 && digi_mod->dm_fep.data != NULL) {
-		sc->fep.data = malloc(sc->fep.size, M_TTYS, 0);
+		sc->fep.data = malloc(sc->fep.size, M_TTYS, M_WAITOK);
 		bcopy(digi_mod->dm_fep.data, sc->fep.data, sc->fep.size);
 	}
 
 	sc->link.size = digi_mod->dm_link.size;
 	if (sc->link.size != 0 && digi_mod->dm_link.data != NULL) {
-		sc->link.data = malloc(sc->link.size, M_TTYS, 0);
+		sc->link.data = malloc(sc->link.size, M_TTYS, M_WAITOK);
 		bcopy(digi_mod->dm_link.data, sc->link.data, sc->link.size);
 	}
 
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index 9186c9615bfe..f035a8c249a3 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -2321,12 +2321,12 @@ dpt_user_cmd(dpt_softc_t * dpt, eata_pt_t * user_cmd,
 		/* Data I/O is involved in this command.  Alocate buffer */
 		if (ccb->eata_ccb.cp_datalen > PAGE_SIZE) {
 			data = contigmalloc(ccb->eata_ccb.cp_datalen,
-					    M_TEMP, 0, 0, ~0,
+					    M_TEMP, M_WAITOK, 0, ~0,
 					    ccb->eata_ccb.cp_datalen,
 					    0x10000);
 		} else {
 			data = malloc(ccb->eata_ccb.cp_datalen, M_TEMP,
-				      0);
+				      M_WAITOK);
 		}
 
 		if (data == NULL) {
diff --git a/sys/dev/drm/drm_drv.h b/sys/dev/drm/drm_drv.h
index 1425859b7cc3..729b2f960c04 100644
--- a/sys/dev/drm/drm_drv.h
+++ b/sys/dev/drm/drm_drv.h
@@ -1451,7 +1451,7 @@ DRM(linux_ioctl)(DRM_OS_STRUCTPROC *p, struct linux_ioctl_args* args)
 	if ( size > STK_PARAMS ) {
 		if ( size > IOCPARM_MAX )
 			return EINVAL;
-		memp = malloc( (u_long)size, DRM(M_DRM), 0 );
+		memp = malloc( (u_long)size, DRM(M_DRM), M_WAITOK );
 		data = memp;
 	} else {
 		data = ubuf.stkbuf;
diff --git a/sys/dev/drm/drm_memory.h b/sys/dev/drm/drm_memory.h
index c6f319c84ba8..81fa561a4186 100644
--- a/sys/dev/drm/drm_memory.h
+++ b/sys/dev/drm/drm_memory.h
@@ -288,7 +288,7 @@ unsigned long DRM(alloc_pages)(int order, int area)
 	address = __get_free_pages(GFP_KERNEL, order);
 #endif /* __linux__ */
 #ifdef __FreeBSD__
-	address = (vm_offset_t) contigmalloc(bytes, DRM(M_DRM), 0, 0, ~0, 1, 0);
+	address = (vm_offset_t) contigmalloc(bytes, DRM(M_DRM), M_WAITOK, 0, ~0, 1, 0);
 #endif /* __FreeBSD__ */
 	if (!address) {
 		DRM_OS_SPINLOCK(&DRM(mem_lock));
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index e5040a553051..8d1c84996fd1 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -2679,7 +2679,7 @@ ed_get_packet(sc, buf, len)
 	struct mbuf *m;
 
 	/* Allocate a header mbuf */
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	m->m_pkthdr.rcvif = ifp;
@@ -2693,7 +2693,7 @@ ed_get_packet(sc, buf, len)
 	 */
 	if ((len + 2) > MHLEN) {
 		/* Attach an mbuf cluster */
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 
 		/* Insist on getting a cluster */
 		if ((m->m_flags & M_EXT) == 0) {
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c
index 9f8b609e8ef9..1503ea2779c6 100644
--- a/sys/dev/em/if_em.c
+++ b/sys/dev/em/if_em.c
@@ -1802,12 +1802,12 @@ em_get_buf(int i, struct adapter *adapter,
 	ifp = &adapter->interface_data.ac_if;
 
 	if (mp == NULL) {
-		MGETHDR(mp, M_NOWAIT, MT_DATA);
+		MGETHDR(mp, M_DONTWAIT, MT_DATA);
 		if (mp == NULL) {
 			adapter->mbuf_alloc_failed++;
 			return(ENOBUFS);
 		}
-		MCLGET(mp, M_NOWAIT);
+		MCLGET(mp, M_DONTWAIT);
 		if ((mp->m_flags & M_EXT) == 0) {
 			m_freem(mp);
 			adapter->mbuf_cluster_failed++;
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index 3e5d3f30059d..ffcc6c96dfda 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -601,7 +601,7 @@ u_int totlen, *drqneed;
   struct mbuf *top, **mp;
   *drqneed = 0;
 
-  MGETHDR(m, M_NOWAIT, MT_DATA);
+  MGETHDR(m, M_DONTWAIT, MT_DATA);
   if (m == NULL)
     return(NULL);
   m->m_pkthdr.rcvif = &sc->enif;
@@ -613,7 +613,7 @@ u_int totlen, *drqneed;
   /* if (top != NULL) then we've already got 1 mbuf on the chain */
   while (totlen > 0) {
     if (top) {
-      MGET(m, M_NOWAIT, MT_DATA);
+      MGET(m, M_DONTWAIT, MT_DATA);
       if (!m) {
 	m_freem(top);	
 	return(NULL);	/* out of mbufs */
@@ -621,7 +621,7 @@ u_int totlen, *drqneed;
       m->m_len = MLEN;
     }
     if (totlen >= MINCLSIZE) {
-      MCLGET(m, M_NOWAIT);
+      MCLGET(m, M_DONTWAIT);
       if ((m->m_flags & M_EXT) == 0) {
 	m_free(m);
 	m_freem(top);
@@ -1770,12 +1770,12 @@ struct mbuf **mm, *prev;
       m->m_data = (caddr_t)d;
     } else {
       /* can't write to an M_EXT mbuf since it may be shared */
-      MGET(new, M_NOWAIT, MT_DATA);
+      MGET(new, M_DONTWAIT, MT_DATA);
       if (!new) {
         EN_COUNT(sc->mfixfail);
         return(0);
       }
-      MCLGET(new, M_NOWAIT);
+      MCLGET(new, M_DONTWAIT);
       if ((new->m_flags & M_EXT) == 0) {
         m_free(new);
         EN_COUNT(sc->mfixfail);
@@ -1837,14 +1837,14 @@ STATIC int en_makeexclusive(sc, mm, prev)
 	
 	if (MEXT_IS_REF(m)) {
 	    /* make a real copy of the M_EXT mbuf since it is shared */
-	    MGET(new, M_NOWAIT, MT_DATA);
+	    MGET(new, M_DONTWAIT, MT_DATA);
 	    if (!new) {
 		EN_COUNT(sc->mfixfail);
 		return(0);
 	    }
 	    if (m->m_flags & M_PKTHDR)
 		M_MOVE_PKTHDR(new, m);
-	    MCLGET(new, M_NOWAIT);
+	    MCLGET(new, M_DONTWAIT);
 	    if ((new->m_flags & M_EXT) == 0) {
 		m_free(new);
 		EN_COUNT(sc->mfixfail);
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 5e0dc5de7528..749fa580b001 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -686,11 +686,11 @@ read_again:
     rx_fifo = rx_fifo2 = status & RX_BYTES_MASK;
 
     if (EP_FTST(sc, F_RX_FIRST)) {
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (!m)
 	    goto out;
 	if (rx_fifo >= MINCLSIZE)
-	    MCLGET(m, M_NOWAIT);
+	    MCLGET(m, M_DONTWAIT);
 	sc->top = sc->mcur = top = m;
 #define EROUND  ((sizeof(struct ether_header) + 3) & ~3)
 #define EOFF    (EROUND - sizeof(struct ether_header))
@@ -714,11 +714,11 @@ read_again:
 	lenthisone = min(rx_fifo, M_TRAILINGSPACE(m));
 	if (lenthisone == 0) {	/* no room in this one */
 	    mcur = m;
-	    MGET(m, M_NOWAIT, MT_DATA);
+	    MGET(m, M_DONTWAIT, MT_DATA);
 	    if (!m)
 		goto out;
 	    if (rx_fifo >= MINCLSIZE)
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 	    m->m_len = 0;
 	    mcur->m_next = m;
 	    lenthisone = min(rx_fifo, M_TRAILINGSPACE(m));
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index d948af229b39..f7458afe73c6 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -695,7 +695,7 @@ ex_rx_intr(struct ex_softc *sc)
 		QQQ = pkt_len = inw(iobase + IO_PORT_REG);
 
 		if (rx_status & RCV_OK_bit) {
-			MGETHDR(m, M_NOWAIT, MT_DATA);
+			MGETHDR(m, M_DONTWAIT, MT_DATA);
 			ipkt = m;
 			if (ipkt == NULL) {
 				ifp->if_iqdrops++;
@@ -706,7 +706,7 @@ ex_rx_intr(struct ex_softc *sc)
 
 				while (pkt_len > 0) {
 					if (pkt_len > MINCLSIZE) {
-						MCLGET(m, M_NOWAIT);
+						MCLGET(m, M_DONTWAIT);
 						if (m->m_flags & M_EXT) {
 							m->m_len = MCLBYTES;
 						} else {
@@ -731,7 +731,7 @@ ex_rx_intr(struct ex_softc *sc)
 					pkt_len -= m->m_len;
 
 					if (pkt_len > 0) {
-						MGET(m->m_next, M_NOWAIT, MT_DATA);
+						MGET(m->m_next, M_DONTWAIT, MT_DATA);
 						if (m->m_next == NULL) {
 							m_freem(ipkt);
 							ifp->if_iqdrops++;
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index edfc64eef5b1..0dbb73bac830 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -86,12 +86,12 @@ vid_realloc_array(void)
 
 	s = spltty();
 	newsize = ((adapters + ARRAY_DELTA)/ARRAY_DELTA)*ARRAY_DELTA;
-	new_adp = malloc(sizeof(*new_adp)*newsize, M_DEVBUF, M_ZERO);
+	new_adp = malloc(sizeof(*new_adp)*newsize, M_DEVBUF, M_WAITOK | M_ZERO);
 	new_vidsw = malloc(sizeof(*new_vidsw)*newsize, M_DEVBUF,
-	    M_ZERO);
+	    M_WAITOK | M_ZERO);
 #ifdef FB_INSTALL_CDEV
 	new_cdevsw = malloc(sizeof(*new_cdevsw)*newsize, M_DEVBUF,
-	    M_ZERO);
+	    M_WAITOK | M_ZERO);
 #endif
 	bcopy(adapter, new_adp, sizeof(*adapter)*adapters);
 	bcopy(vidsw, new_vidsw, sizeof(*vidsw)*adapters);
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index 0f3cda117dda..56e015ba1399 100644
--- a/sys/dev/fb/vga.c
+++ b/sys/dev/fb/vga.c
@@ -2848,7 +2848,7 @@ get_palette(video_adapter_t *adp, int base, int count,
     if ((base < 0) || (base >= 256) || (base + count > 256))
 	return EINVAL;
 
-    r = malloc(count*3, M_DEVBUF, 0);
+    r = malloc(count*3, M_DEVBUF, M_WAITOK);
     g = r + count;
     b = g + count;
     if (vga_save_palette2(adp, base, count, r, g, b)) {
@@ -2879,7 +2879,7 @@ set_palette(video_adapter_t *adp, int base, int count,
     if ((base < 0) || (base >= 256) || (base + count > 256))
 	return EINVAL;
 
-    r = malloc(count*3, M_DEVBUF, 0);
+    r = malloc(count*3, M_DEVBUF, M_WAITOK);
     g = r + count;
     b = g + count;
     copyin(red, r, count);
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 81e4865d176f..b6ad14cef775 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -1847,13 +1847,13 @@ fe_get_packet (struct fe_softc * sc, u_short len)
 	 */
 
 	/* Allocate an mbuf with packet header info.  */
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return -1;
 
 	/* Attach a cluster if this packet doesn't fit in a normal mbuf.  */
 	if (len > MHLEN - NFS_MAGIC_OFFSET) {
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if (!(m->m_flags & M_EXT)) {
 			m_freem(m);
 			return -1;
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index 3f428df45fde..ca9bd816bdb0 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -469,7 +469,7 @@ fwe_as_output(struct fwe_softc *fwe, struct ifnet *ifp)
 		xfer->act.hand = fwe_output_callback;
 
 		/* keep ip packet alignment for alpha */
-		M_PREPEND(m, ALIGN_PAD, M_NOWAIT);
+		M_PREPEND(m, ALIGN_PAD, M_DONTWAIT);
 		fp = (struct fw_pkt *)&xfer->dst; /* XXX */
 		xfer->dst = *((int32_t *)&fwe->pkt_hdr);
 		fp->mode.stream.len = htons(m->m_pkthdr.len);
@@ -547,7 +547,7 @@ fwe_as_input(struct fw_xferq *xferq)
 	while ((xfer = STAILQ_FIRST(&xferq->q)) != NULL) {
 		STAILQ_REMOVE_HEAD(&xferq->q, link);
 		xferq->queued --;
-		MGETHDR(m, M_NOWAIT, MT_DATA);
+		MGETHDR(m, M_DONTWAIT, MT_DATA);
 		if (m == NULL) {
 			printf("MGETHDR failed\n");
 			fw_xfer_free(xfer);
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 062e432e3c84..cb2a986d3761 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -1069,13 +1069,13 @@ tbdinit:
 			 * mbuf chain first. Bail out if we can't get the
 			 * new buffers.
 			 */
-			MGETHDR(mn, M_NOWAIT, MT_DATA);
+			MGETHDR(mn, M_DONTWAIT, MT_DATA);
 			if (mn == NULL) {
 				m_freem(mb_head);
 				break;
 			}
 			if (mb_head->m_pkthdr.len > MHLEN) {
-				MCLGET(mn, M_NOWAIT);
+				MCLGET(mn, M_DONTWAIT);
 				if ((mn->m_flags & M_EXT) == 0) {
 					m_freem(mn);
 					m_freem(mb_head);
@@ -1873,7 +1873,7 @@ fxp_add_rfabuf(struct fxp_softc *sc, struct mbuf *oldm)
 	struct mbuf *m;
 	struct fxp_rfa *rfa, *p_rfa;
 
-	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) { /* try to recycle the old mbuf instead */
 		if (oldm == NULL)
 			return 1;
diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c
index 09bef5fa37a4..ae0d2b6ac566 100644
--- a/sys/dev/gem/if_gem.c
+++ b/sys/dev/gem/if_gem.c
@@ -1422,7 +1422,7 @@ gem_add_rxbuf(sc, idx)
 	struct mbuf *m;
 	int error;
 
-	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
diff --git a/sys/dev/gx/if_gx.c b/sys/dev/gx/if_gx.c
index 8dec6b213f76..8d59cd682705 100644
--- a/sys/dev/gx/if_gx.c
+++ b/sys/dev/gx/if_gx.c
@@ -1068,13 +1068,13 @@ gx_newbuf(struct gx_softc *gx, int idx, struct mbuf *m)
 	struct gx_rx_desc *r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			device_printf(gx->gx_dev, 
 			    "mbuf allocation failed -- packet dropped\n");
 			return (ENOBUFS);
 		}
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if ((m_new->m_flags & M_EXT) == 0) {
 			device_printf(gx->gx_dev, 
 			    "cluster allocation failed -- packet dropped\n");
diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c
index 6b6d9c6b922c..cb58fe0b0f98 100644
--- a/sys/dev/hifn/hifn7751.c
+++ b/sys/dev/hifn/hifn7751.c
@@ -1667,14 +1667,14 @@ hifn_crypto(
 			totlen = cmd->src_mapsize;
 			if (cmd->src_m->m_flags & M_PKTHDR) {
 				len = MHLEN;
-				MGETHDR(m0, M_NOWAIT, MT_DATA);
-				if (m0 && !m_dup_pkthdr(m0, cmd->src_m, M_NOWAIT)) {
+				MGETHDR(m0, M_DONTWAIT, MT_DATA);
+				if (m0 && !m_dup_pkthdr(m0, cmd->src_m, M_DONTWAIT)) {
 					m_free(m0);
 					m0 = NULL;
 				}
 			} else {
 				len = MLEN;
-				MGET(m0, M_NOWAIT, MT_DATA);
+				MGET(m0, M_DONTWAIT, MT_DATA);
 			}
 			if (m0 == NULL) {
 				hifnstats.hst_nomem_mbuf++;
@@ -1682,7 +1682,7 @@ hifn_crypto(
 				goto err_srcmap;
 			}
 			if (totlen >= MINCLSIZE) {
-				MCLGET(m0, M_NOWAIT);
+				MCLGET(m0, M_DONTWAIT);
 				if ((m0->m_flags & M_EXT) == 0) {
 					hifnstats.hst_nomem_mcl++;
 					err = dma->cmdu ? ERESTART : ENOMEM;
@@ -1696,7 +1696,7 @@ hifn_crypto(
 			mlast = m0;
 
 			while (totlen > 0) {
-				MGET(m, M_NOWAIT, MT_DATA);
+				MGET(m, M_DONTWAIT, MT_DATA);
 				if (m == NULL) {
 					hifnstats.hst_nomem_mbuf++;
 					err = dma->cmdu ? ERESTART : ENOMEM;
@@ -1705,7 +1705,7 @@ hifn_crypto(
 				}
 				len = MLEN;
 				if (totlen >= MINCLSIZE) {
-					MCLGET(m, M_NOWAIT);
+					MCLGET(m, M_DONTWAIT);
 					if ((m->m_flags & M_EXT) == 0) {
 						hifnstats.hst_nomem_mcl++;
 						err = dma->cmdu ? ERESTART : ENOMEM;
diff --git a/sys/dev/hme/if_hme.c b/sys/dev/hme/if_hme.c
index aadbe475a2d4..83d15fde8969 100644
--- a/sys/dev/hme/if_hme.c
+++ b/sys/dev/hme/if_hme.c
@@ -491,7 +491,7 @@ hme_add_rxbuf(struct hme_softc *sc, unsigned int ri, int keepold)
 		hme_discard_rxbuf(sc, ri);
 		return (0);
 	}
-	if ((m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR)) == NULL)
+	if ((m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR)) == NULL)
 		return (ENOBUFS);
 	m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
 	b = mtod(m, uintptr_t);
diff --git a/sys/dev/idt/idt.c b/sys/dev/idt/idt.c
index e5169e01930b..3a74b4dd6edc 100644
--- a/sys/dev/idt/idt.c
+++ b/sys/dev/idt/idt.c
@@ -1171,10 +1171,10 @@ nicstar_ld_rcv_buf(IDT * idt)
 		idt_sysctl_buflarge = 10;
 
 	while (card_small < idt_sysctl_bufsmall) {	/* 05/25/2001 from fixed */
-		MGETHDR(m1, M_NOWAIT, MT_DATA);
+		MGETHDR(m1, M_DONTWAIT, MT_DATA);
 		if (m1 == NULL)
 			break;
-		MGETHDR(m2, M_NOWAIT, MT_DATA);
+		MGETHDR(m2, M_DONTWAIT, MT_DATA);
 		if (m2 == NULL) {
 			m_free(m1);
 			break;
@@ -2006,11 +2006,11 @@ idt_mbufcl_get(void)
 {
 	struct mbuf *m;
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return (NULL);
 
-	MCLGET(m, M_NOWAIT);
+	MCLGET(m, M_DONTWAIT);
 	if (m->m_flags & M_EXT)
 		return (m);
 
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 088f12268827..b3e844c61827 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -1133,7 +1133,7 @@ ieget(int unit, struct ie_softc *ie, struct mbuf **mp)
 	if (totlen <= 0)
 		return (-1);
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (!m) {
 		ie_drop_packet_buffer(unit, ie);
 		/* XXXX if_ierrors++; */
@@ -1188,7 +1188,7 @@ ieget(int unit, struct ie_softc *ie, struct mbuf **mp)
 		 * single mbuf which may or may not be big enough. Got that?
 		 */
 		if (top) {
-			MGET(m, M_NOWAIT, MT_DATA);
+			MGET(m, M_DONTWAIT, MT_DATA);
 			if (!m) {
 				m_freem(top);
 				ie_drop_packet_buffer(unit, ie);
@@ -1197,7 +1197,7 @@ ieget(int unit, struct ie_softc *ie, struct mbuf **mp)
 			m->m_len = MLEN;
 		}
 		if (resid >= MINCLSIZE) {
-			MCLGET(m, M_NOWAIT);
+			MCLGET(m, M_DONTWAIT);
 			if (m->m_flags & M_EXT)
 				m->m_len = min(resid, MCLBYTES);
 		} else {
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index 84d7b2fbeeff..a6660b744d31 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -192,14 +192,14 @@ icioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		return (error);
 
 	    sc->ic_obuf = malloc(sc->ic_if.if_mtu + ICHDRLEN,
-				  M_DEVBUF, 0);
+				  M_DEVBUF, M_WAITOK);
 	    if (!sc->ic_obuf) {
 		iicbus_release_bus(parent, icdev);
 		return ENOBUFS;
 	    }
 
 	    sc->ic_ifbuf = malloc(sc->ic_if.if_mtu + ICHDRLEN,
-				  M_DEVBUF, 0);
+				  M_DEVBUF, M_WAITOK);
 	    if (!sc->ic_ifbuf) {
 		iicbus_release_bus(parent, icdev);
 		return ENOBUFS;
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 449fa141d593..9636a7ff4831 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -624,7 +624,7 @@ isp_pci_attach(device_t dev)
 		}
 		if (amt) {
 			FCPARAM(isp)->isp_dump_data =
-			    malloc(amt, M_DEVBUF, M_ZERO);
+			    malloc(amt, M_DEVBUF, M_WAITOK | M_ZERO);
 		} else {
 			device_printf(dev,
 			    "f/w crash dumps not supported for this model\n");
@@ -1105,14 +1105,14 @@ isp_pci_mbxdma(struct ispsoftc *isp)
 
 
 	len = sizeof (XS_T **) * isp->isp_maxcmds;
-	isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_ZERO);
+	isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
 	if (isp->isp_xflist == NULL) {
 		isp_prt(isp, ISP_LOGERR, "cannot alloc xflist array");
 		ISP_LOCK(isp);
 		return (1);
 	}
 	len = sizeof (bus_dmamap_t) * isp->isp_maxcmds;
-	pcs->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF,  0);
+	pcs->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF,  M_WAITOK);
 	if (pcs->dmaps == NULL) {
 		isp_prt(isp, ISP_LOGERR, "can't alloc dma map storage");
 		free(isp->isp_xflist, M_DEVBUF);
diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c
index 829ee8e2852f..d2af1a5ef3d6 100644
--- a/sys/dev/isp/isp_sbus.c
+++ b/sys/dev/isp/isp_sbus.c
@@ -498,14 +498,14 @@ isp_sbus_mbxdma(struct ispsoftc *isp)
 	}
 
 	len = sizeof (XS_T **) * isp->isp_maxcmds;
-	isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_ZERO);
+	isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
 	if (isp->isp_xflist == NULL) {
 		isp_prt(isp, ISP_LOGERR, "cannot alloc xflist array");
 		ISP_LOCK(isp);
 		return (1);
 	}
 	len = sizeof (bus_dmamap_t) * isp->isp_maxcmds;
-	sbs->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF, 0);
+	sbs->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF,  M_WAITOK);
 	if (sbs->dmaps == NULL) {
 		isp_prt(isp, ISP_LOGERR, "can't alloc dma map storage");
 		free(isp->isp_xflist, M_DEVBUF);
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 035813aed91d..6eef728733bc 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -454,7 +454,7 @@ kbd_attach(keyboard_t *kbd)
 		       "kbd%r", kbd->kb_index);
 	if (dev->si_drv1 == NULL)
 		dev->si_drv1 = malloc(sizeof(genkbd_softc_t), M_DEVBUF,
-				      0);
+				      M_WAITOK);
 	bzero(dev->si_drv1, sizeof(genkbd_softc_t));
 
 	printf("kbd%d at %s%d\n", kbd->kb_index, kbd->kb_name, kbd->kb_unit);
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 81d10419e682..9efa94da6485 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -784,7 +784,7 @@ lge_newbuf(sc, c, m)
 	caddr_t			*buf = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("lge%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->lge_unit);
diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c
index 68fce9045f2e..83250cfc86c2 100644
--- a/sys/dev/lmc/if_lmc.c
+++ b/sys/dev/lmc/if_lmc.c
@@ -621,9 +621,9 @@ lmc_rx_intr(lmc_softc_t * const sc)
 		 */
 		if (accept || ms == NULL) {
 			struct mbuf *m0;
-			MGETHDR(m0, M_NOWAIT, MT_DATA);
+			MGETHDR(m0, M_DONTWAIT, MT_DATA);
 			if (m0 != NULL) {
-				MCLGET(m0, M_NOWAIT);
+				MCLGET(m0, M_DONTWAIT);
 				if ((m0->m_flags & M_EXT) == 0) {
 					m_freem(m0);
 					m0 = NULL;
@@ -830,10 +830,10 @@ lmc_mbuf_compress(struct mbuf *m)
 {
 	struct mbuf *m0;
 #if MCLBYTES >= LMC_MTU + PPP_HEADER_LEN && !defined(BIG_PACKET)
-	MGETHDR(m0, M_NOWAIT, MT_DATA);
+	MGETHDR(m0, M_DONTWAIT, MT_DATA);
 	if (m0 != NULL) {
 		if (m->m_pkthdr.len > MHLEN) {
-			MCLGET(m0, M_NOWAIT);
+			MCLGET(m0, M_DONTWAIT);
 			if ((m0->m_flags & M_EXT) == 0) {
 				m_freem(m);
 				m_freem(m0);
@@ -850,9 +850,9 @@ lmc_mbuf_compress(struct mbuf *m)
 
 	while (len > 0) {
 		if (mlen == MHLEN) {
-			MGETHDR(*mp, M_NOWAIT, MT_DATA);
+			MGETHDR(*mp, M_DONTWAIT, MT_DATA);
 		} else {
-			MGET(*mp, M_NOWAIT, MT_DATA);
+			MGET(*mp, M_DONTWAIT, MT_DATA);
 		}
 		if (*mp == NULL) {
 			m_freem(m0);
@@ -860,7 +860,7 @@ lmc_mbuf_compress(struct mbuf *m)
 			break;
 		}
 		if (len > MLEN) {
-			MCLGET(*mp, M_NOWAIT);
+			MCLGET(*mp, M_DONTWAIT);
 			if (((*mp)->m_flags & M_EXT) == 0) {
 				m_freem(m0);
 				m0 = NULL;
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index c1d63f191f6e..eeb678abbe27 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -314,10 +314,10 @@ alloc_mbuf_cluster(struct lnc_softc *sc, struct host_ring_entry *desc)
 		sc->mbufs = m->m_next;
 		/* XXX m->m_data = m->m_ext.ext_buf;*/
 	} else {
-		MGET(m, M_NOWAIT, MT_DATA);
+		MGET(m, M_DONTWAIT, MT_DATA);
    	if (!m)
 			return(1);
-        MCLGET(m, M_NOWAIT);
+        MCLGET(m, M_DONTWAIT);
    	if (!m->m_ext.ext_buf) {
 			m_free(m);
 			return(1);
@@ -379,7 +379,7 @@ mbuf_packet(struct lnc_softc *sc, int start_of_packet, int pkt_len)
 	int amount;
 
 	/* Get a pkthdr mbuf for the start of packet */
-	MGETHDR(head, M_NOWAIT, MT_DATA);
+	MGETHDR(head, M_DONTWAIT, MT_DATA);
 	if (!head) {
 		LNCSTATS(drop_packet)
 		return(0);
@@ -409,13 +409,13 @@ mbuf_packet(struct lnc_softc *sc, int start_of_packet, int pkt_len)
 		if (amount == 0) {
 			/* mbuf must be empty */
 			m_prev = m;
-			MGET(m, M_NOWAIT, MT_DATA);
+			MGET(m, M_DONTWAIT, MT_DATA);
 			if (!m) {
 				m_freem(head);
 				return(0);
 			}
 			if (pkt_len >= MINCLSIZE)
-				MCLGET(m, M_NOWAIT);
+				MCLGET(m, M_DONTWAIT);
 			m->m_len = 0;
 			m_prev->m_next = m;
 			amount = min(blen, M_TRAILINGSPACE(m));
@@ -1218,9 +1218,9 @@ chain_to_cluster(struct mbuf *m)
 {
 	struct mbuf *new;
 
-	MGET(new, M_NOWAIT, MT_DATA);
+	MGET(new, M_DONTWAIT, MT_DATA);
 	if (new) {
-		MCLGET(new, M_NOWAIT);
+		MCLGET(new, M_DONTWAIT);
 		if (new->m_ext.ext_buf) {
 			new->m_len = mbuf_to_buffer(m, new->m_data);
 			m_freem(m);
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index 75f76ee373c2..591cd646a1dc 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -658,7 +658,7 @@ mdnew(int unit)
 		unit = max + 1;
 	if (unit > 255)
 		return (NULL);
-	sc = (struct md_s *)malloc(sizeof *sc, M_MD, M_ZERO);
+	sc = (struct md_s *)malloc(sizeof *sc, M_MD, M_WAITOK | M_ZERO);
 	sc->unit = unit;
 	bioq_init(&sc->bio_queue);
 	mtx_init(&sc->queue_mtx, "md bio queue", NULL, MTX_DEF);
@@ -815,7 +815,7 @@ mdsetcred(struct md_s *sc, struct ucred *cred)
 		struct uio auio;
 		struct iovec aiov;
 
-		tmpbuf = malloc(sc->secsize, M_TEMP, 0);
+		tmpbuf = malloc(sc->secsize, M_TEMP, M_WAITOK);
 		bzero(&auio, sizeof(auio));
 
 		aiov.iov_base = tmpbuf;
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index 61e1c8beeeb3..aecd9dc34b80 100644
--- a/sys/dev/mlx/mlx.c
+++ b/sys/dev/mlx/mlx.c
@@ -1880,7 +1880,7 @@ mlx_user_command(struct mlx_softc *sc, struct mlx_usercommand *mu)
     if (mu->mu_datasize > 0) {
 	if (mu->mu_datasize > MAXPHYS)
 	    return (EINVAL);
-	if (((kbuf = malloc(mu->mu_datasize, M_DEVBUF, 0)) == NULL) ||
+	if (((kbuf = malloc(mu->mu_datasize, M_DEVBUF, M_WAITOK)) == NULL) ||
 	    (error = copyin(mu->mu_buf, kbuf, mu->mu_datasize)))
 	    goto out;
 	debug(0, "got kernel buffer");
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index 71759ce7193f..4fd18801849b 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.c
@@ -2019,7 +2019,7 @@ mly_cam_rescan_btl(struct mly_softc *sc, int bus, int target)
 
     debug_called(1);
 
-    if ((ccb = malloc(sizeof(union ccb), M_TEMP, M_ZERO)) == NULL) {
+    if ((ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO)) == NULL) {
 	mly_printf(sc, "rescan failed (can't allocate CCB)\n");
 	return;
     }
diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c
index 7f9a14571142..9a0a5ba9493d 100644
--- a/sys/dev/mpt/mpt_pci.c
+++ b/sys/dev/mpt/mpt_pci.c
@@ -478,7 +478,7 @@ mpt_dma_mem_alloc(mpt_softc_t *mpt)
 
 	len = sizeof (request_t *) * MPT_REQ_MEM_SIZE(mpt);
 #ifdef	RELENG_4
-	mpt->request_pool = (request_t *) malloc(len, M_DEVBUF, 0);
+	mpt->request_pool = (request_t *) malloc(len, M_DEVBUF, M_WAITOK);
 	if (mpt->request_pool == NULL) {
 		device_printf(dev, "cannot allocate request pool\n");
 		return (1);
@@ -486,7 +486,7 @@ mpt_dma_mem_alloc(mpt_softc_t *mpt)
 	bzero(mpt->request_pool, len);
 #else
 	mpt->request_pool = (request_t *)
-	    malloc(len, M_DEVBUF, M_ZERO);
+	    malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
 	if (mpt->request_pool == NULL) {
 		device_printf(dev, "cannot allocate request pool\n");
 		return (1);
diff --git a/sys/dev/musycc/musycc.c b/sys/dev/musycc/musycc.c
index 48504db17f37..3fb7834b1e32 100644
--- a/sys/dev/musycc/musycc.c
+++ b/sys/dev/musycc/musycc.c
@@ -696,9 +696,9 @@ musycc_intr0_rx_eom(struct softc *sc, int ch)
 		m->m_len = m->m_pkthdr.len = status & 0x3fff;
 		error = (status >> 16) & 0xf;
 		if (error == 0) {
-			MGETHDR(m2, M_NOWAIT, MT_DATA);
+			MGETHDR(m2, M_DONTWAIT, MT_DATA);
 			if (m2 != NULL) {
-				MCLGET(m2, M_NOWAIT);
+				MCLGET(m2, M_DONTWAIT);
 				if((m2->m_flags & M_EXT) != 0) {
 					/* Substitute the mbuf+cluster. */
 					md->m = m2;
@@ -1069,7 +1069,7 @@ musycc_newhook(node_p node, hook_p hook, const char *name)
 		return (EINVAL);
 		
 	if (sc->chan[chan] == NULL) {
-		MALLOC(sch, struct schan *, sizeof(*sch), M_MUSYCC, M_ZERO);
+		MALLOC(sch, struct schan *, sizeof(*sch), M_MUSYCC, M_WAITOK | M_ZERO);
 		sch->sc = sc;
 		sch->state = DOWN;
 		sch->chan = chan;
@@ -1268,9 +1268,9 @@ musycc_connect(hook_p hook)
 	sch->nmd = nmd = 200 + nts * 4;
 	sch->rx_last_md = 0;
 	MALLOC(sc->mdt[ch], struct mdesc *, 
-	    sizeof(struct mdesc) * nmd, M_MUSYCC, 0);
+	    sizeof(struct mdesc) * nmd, M_MUSYCC, M_WAITOK);
 	MALLOC(sc->mdr[ch], struct mdesc *, 
-	    sizeof(struct mdesc) * nmd, M_MUSYCC, 0);
+	    sizeof(struct mdesc) * nmd, M_MUSYCC, M_WAITOK);
 	for (i = 0; i < nmd; i++) {
 		if (i == nmd - 1) {
 			sc->mdt[ch][i].snext = &sc->mdt[ch][0];
@@ -1287,13 +1287,13 @@ musycc_connect(hook_p hook)
 		sc->mdt[ch][i].m = NULL;
 		sc->mdt[ch][i].data = 0;
 
-		MGETHDR(m, 0, MT_DATA);
+		MGETHDR(m, M_TRYWAIT, MT_DATA);
 		if (m == NULL)
 			goto errfree;
-		MCLGET(m, 0);
+		MCLGET(m, M_TRYWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			/* We've waited mbuf_wait and still got nothing.
-			   We're calling with 0 anyway - a little
+			   We're calling with M_TRYWAIT anyway - a little
 			   defensive programming costs us very little - if
 			   anything at all in the case of error. */
 			m_free(m);
@@ -1455,7 +1455,7 @@ musycc_attach(device_t self)
 	f = pci_get_function(self);
 	/* For function zero allocate a csoftc */
 	if (f == 0) {
-		MALLOC(csc, struct csoftc *, sizeof(*csc), M_MUSYCC, M_ZERO);
+		MALLOC(csc, struct csoftc *, sizeof(*csc), M_MUSYCC, M_WAITOK | M_ZERO);
 		csc->bus = pci_get_bus(self);
 		csc->slot = pci_get_slot(self);
 		LIST_INSERT_HEAD(&sc_list, csc, list);
@@ -1529,7 +1529,7 @@ musycc_attach(device_t self)
 		sc->reg = (struct globalr *)
 		    (csc->virbase[0] + i * 0x800);
 		MALLOC(sc->mycg, struct mycg *, 
-		    sizeof(struct mycg), M_MUSYCC, M_ZERO);
+		    sizeof(struct mycg), M_MUSYCC, M_WAITOK | M_ZERO);
 		sc->ram = &sc->mycg->cg;
 
 		error = ng_make_node_common(&ngtypestruct, &sc->node);
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index 70ac9508a8e0..9f7a930186c7 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -1179,14 +1179,14 @@ my_newbuf(struct my_softc * sc, struct my_chain_onefrag * c)
 	struct mbuf    *m_new = NULL;
 
 	MY_LOCK(sc);
-	MGETHDR(m_new, M_NOWAIT, MT_DATA);
+	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 	if (m_new == NULL) {
 		printf("my%d: no memory for rx list -- packet dropped!\n",
 		       sc->my_unit);
 		MY_UNLOCK(sc);
 		return (ENOBUFS);
 	}
-	MCLGET(m_new, M_NOWAIT);
+	MCLGET(m_new, M_DONTWAIT);
 	if (!(m_new->m_flags & M_EXT)) {
 		printf("my%d: no memory for rx list -- packet dropped!\n",
 		       sc->my_unit);
@@ -1451,14 +1451,14 @@ my_encap(struct my_softc * sc, struct my_chain * c, struct mbuf * m_head)
 	 * chain.
 	 */
 	m = m_head;
-	MGETHDR(m_new, M_NOWAIT, MT_DATA);
+	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 	if (m_new == NULL) {
 		printf("my%d: no memory for tx list", sc->my_unit);
 		MY_UNLOCK(sc);
 		return (1);
 	}
 	if (m_head->m_pkthdr.len > MHLEN) {
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			printf("my%d: no memory for tx list", sc->my_unit);
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index e591ea75a2fc..d498ebb07ba2 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -1162,7 +1162,7 @@ nge_newbuf(sc, c, m)
 	caddr_t			*buf = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("nge%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->nge_unit);
diff --git a/sys/dev/nmdm/nmdm.c b/sys/dev/nmdm/nmdm.c
index 2c69998e527d..6037451eeb67 100644
--- a/sys/dev/nmdm/nmdm.c
+++ b/sys/dev/nmdm/nmdm.c
@@ -133,7 +133,7 @@ nmdminit(n)
 	if (n & ~0xff)
 		return;
 
-	pt = malloc(sizeof(*pt), M_NLMDM, 0);
+	pt = malloc(sizeof(*pt), M_NLMDM, M_WAITOK);
 	bzero(pt, sizeof(*pt));
 	pt->part1.dev = dev1 = make_dev(&nmdm_cdevsw, n+n,
 	    0, 0, 0666, "nmdm%dA", n);
diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c
index 7a3ae8b108bf..908e533a9287 100644
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
@@ -127,7 +127,7 @@ null_modevent(module_t mod, int type, void *data)
 	case MOD_LOAD:
 		if (bootverbose)
 			printf("null: <null device, zero device>\n");
-		zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_ZERO);
+		zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK | M_ZERO);
 		zero_dev = make_dev(&zero_cdevsw, ZERO_MINOR, UID_ROOT,
 			GID_WHEEL, 0666, "zero");
 		null_dev = make_dev(&null_cdevsw, NULL_MINOR, UID_ROOT,
diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c
index 9ea97d3ad970..7704109b44a3 100644
--- a/sys/dev/ofw/openfirm.c
+++ b/sys/dev/ofw/openfirm.c
@@ -292,7 +292,7 @@ OF_getprop(phandle_t package, char *propname, void *buf, int buflen)
 
 /*
  * Store the value of a property of a package into newly allocated memory (using
- * the M_OFWPROP malloc pool and 0). elsz is the size of a single element,
+ * the M_OFWPROP malloc pool and M_WAITOK). elsz is the size of a single element,
  * the number of elements is return in number.
  */
 int
@@ -305,7 +305,7 @@ OF_getprop_alloc(phandle_t package, char *propname, int elsz, void **buf)
 	    len % elsz != 0)
 		return (-1);
 
-	*buf = malloc(len, M_OFWPROP, 0);
+	*buf = malloc(len, M_OFWPROP, M_WAITOK);
 	if (OF_getprop(package, propname, *buf, len) == -1) {
 		free(*buf, M_OFWPROP);
 		*buf = NULL;
diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c
index 8bd5c0474a1d..6f4061961818 100644
--- a/sys/dev/ofw/openfirmio.c
+++ b/sys/dev/ofw/openfirmio.c
@@ -115,7 +115,7 @@ openfirm_getstr(int len, const char *user, char **cpp)
 	if ((u_int)len > OFW_NAME_MAX)
 		return (ENAMETOOLONG);
 
-	*cpp = cp = malloc(len + 1, M_TEMP, 0);
+	*cpp = cp = malloc(len + 1, M_TEMP, M_WAITOK);
 	if (cp == NULL)
 		return (ENOMEM);
 	error = copyin(user, cp, len);
@@ -183,7 +183,7 @@ openfirm_ioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
 		/* -1 means no entry; 0 means no value */
 		if (len <= 0)
 			break;
-		value = malloc(len, M_TEMP, 0);
+		value = malloc(len, M_TEMP, M_WAITOK);
 		if (value == NULL) {
 			error = ENOMEM;
 			break;
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index 2cf04a207142..6c8263283727 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -224,7 +224,7 @@ pccard_attach_card(device_t dev)
 		 * can be on at a time.
 		 */
 		ivar = malloc(sizeof(struct pccard_ivar), M_DEVBUF,
-		    M_ZERO);
+		    M_WAITOK | M_ZERO);
 		child = device_add_child(dev, NULL, -1);
 		device_set_ivars(child, ivar);
 		ivar->fcn = pf;
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 130bf3c822b8..a450df845894 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -335,7 +335,7 @@ pci_read_device(device_t pcib, int b, int s, int f, size_t size)
 	devlist_entry = NULL;
 
 	if (PCIB_READ_CONFIG(pcib, b, s, f, PCIR_DEVVENDOR, 4) != -1) {
-		devlist_entry = malloc(size, M_DEVBUF, M_ZERO);
+		devlist_entry = malloc(size, M_DEVBUF, M_WAITOK | M_ZERO);
 		if (devlist_entry == NULL)
 			return (NULL);
 
diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c
index d39b026e2ae1..83b63b3ed692 100644
--- a/sys/dev/pci/pci_user.c
+++ b/sys/dev/pci/pci_user.c
@@ -307,7 +307,7 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 			 * Allocate a buffer to hold the patterns.
 			 */
 			pattern_buf = malloc(cio->pat_buf_len, M_TEMP,
-					     0);
+					     M_WAITOK);
 			error = copyin(cio->patterns, pattern_buf,
 				       cio->pat_buf_len);
 			if (error != 0)
diff --git a/sys/dev/pdq/pdq_freebsd.h b/sys/dev/pdq/pdq_freebsd.h
index 5db50c800097..bd949005072b 100644
--- a/sys/dev/pdq/pdq_freebsd.h
+++ b/sys/dev/pdq/pdq_freebsd.h
@@ -186,9 +186,9 @@ typedef struct _pdq_os_ctx_t {
 
 #define	PDQ_OS_DATABUF_ALLOC(pdq, b) do { \
     PDQ_OS_DATABUF_T *x_m0; \
-    MGETHDR(x_m0, M_NOWAIT, MT_DATA); \
+    MGETHDR(x_m0, M_DONTWAIT, MT_DATA); \
     if (x_m0 != NULL) { \
-	MCLGET(x_m0, M_NOWAIT);	\
+	MCLGET(x_m0, M_DONTWAIT);	\
 	if ((x_m0->m_flags & M_EXT) == 0) { \
 	    m_free(x_m0); \
 	    (b) = NULL; \
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 5af78841d9a0..064bb688af04 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -703,12 +703,12 @@ pdq_os_databuf_alloc(
     struct mbuf *m;
     bus_dmamap_t map;
 
-    MGETHDR(m, M_NOWAIT, MT_DATA);
+    MGETHDR(m, M_DONTWAIT, MT_DATA);
     if (m == NULL) {
 	printf("%s: can't alloc small buf\n", sc->sc_dev.dv_xname);
 	return NULL;
     }
-    MCLGET(m, M_NOWAIT);
+    MCLGET(m, M_DONTWAIT);
     if ((m->m_flags & M_EXT) == 0) {
 	printf("%s: can't alloc cluster\n", sc->sc_dev.dv_xname);
         m_free(m);
diff --git a/sys/dev/pdq/pdqvar.h b/sys/dev/pdq/pdqvar.h
index 825a2b9a177f..09358d86995c 100644
--- a/sys/dev/pdq/pdqvar.h
+++ b/sys/dev/pdq/pdqvar.h
@@ -401,9 +401,9 @@ typedef struct mbuf PDQ_OS_DATABUF_T;
 #ifndef PDQ_OS_DATABUF_ALLOC
 #define	PDQ_OS_DATABUF_ALLOC(pdq, b) do { \
     PDQ_OS_DATABUF_T *x_m0; \
-    MGETHDR(x_m0, M_NOWAIT, MT_DATA); \
+    MGETHDR(x_m0, M_DONTWAIT, MT_DATA); \
     if (x_m0 != NULL) { \
-	MCLGET(x_m0, M_NOWAIT);	\
+	MCLGET(x_m0, M_DONTWAIT);	\
 	if ((x_m0->m_flags & M_EXT) == 0) { \
 	    m_free(x_m0); \
 	    (b) = NULL; \
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 24a18ecd0021..5ba4dc3a6099 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -343,7 +343,7 @@ lpioctl (struct ifnet *ifp, u_long cmd, caddr_t data)
 	    }
 
 	    sc->sc_ifbuf = malloc(sc->sc_if.if_mtu + MLPIPHDRLEN,
-				  M_DEVBUF, 0);
+				  M_DEVBUF, M_WAITOK);
 	    if (!sc->sc_ifbuf) {
 		ppb_release_bus(ppbus, dev);
 		return ENOBUFS;
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index abc9e95c5d76..9364c5033659 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -548,8 +548,8 @@ lptopen(dev_t dev, int flags, int fmt, struct thread *td)
 	ppb_wctr(ppbus, sc->sc_control);
 
 	sc->sc_state = OPEN;
-	sc->sc_inbuf = malloc(BUFSIZE, M_DEVBUF, 0);
-	sc->sc_statbuf = malloc(BUFSTATSIZE, M_DEVBUF, 0);
+	sc->sc_inbuf = malloc(BUFSIZE, M_DEVBUF, M_WAITOK);
+	sc->sc_statbuf = malloc(BUFSTATSIZE, M_DEVBUF, M_WAITOK);
 	sc->sc_xfercnt = 0;
 	splx(s);
 
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index 09208b6e9d56..ad83e2f83270 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -186,7 +186,7 @@ static void
 vpo_cam_rescan(struct vpo_data *vpo)
 {
         struct cam_path *path;
-        union ccb *ccb = malloc(sizeof(union ccb), M_TEMP, M_ZERO);
+        union ccb *ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO);
 
         if (xpt_create_path(&path, xpt_periph, cam_sim_path(vpo->sim), 0, 0)
             != CAM_REQ_CMP) {
diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c
index 4cba354222dd..18d2fbabc0f5 100644
--- a/sys/dev/puc/puc.c
+++ b/sys/dev/puc/puc.c
@@ -248,7 +248,7 @@ puc_attach(device_t dev, const struct puc_device_description *desc)
 			rle->res = sc->sc_bar_mappings[bidx].res;
 		} else {
 			rle->res = malloc(sizeof(struct resource), M_DEVBUF,
-			    M_ZERO);
+			    M_WAITOK | M_ZERO);
 			if (rle->res == NULL) {
 				free(pdev, M_DEVBUF);
 				return (ENOMEM);
diff --git a/sys/dev/raidframe/rf_freebsdkintf.c b/sys/dev/raidframe/rf_freebsdkintf.c
index 144cda693ea7..e2b2508349d4 100644
--- a/sys/dev/raidframe/rf_freebsdkintf.c
+++ b/sys/dev/raidframe/rf_freebsdkintf.c
@@ -917,7 +917,7 @@ raidioctl(dev, cmd, data, flag, td)
 	case RAIDFRAME_INIT_LABELS:
 		MALLOC(ci_label, RF_ComponentLabel_t *,
 		    sizeof(RF_ComponentLabel_t), M_RAIDFRAME,
-		    M_ZERO);
+		    M_WAITOK | M_ZERO);
 		clabel = (RF_ComponentLabel_t *) data;
 		/* 
 		   we only want the serial number from
@@ -984,7 +984,7 @@ raidioctl(dev, cmd, data, flag, td)
 	case RAIDFRAME_ADD_HOT_SPARE:
 		MALLOC(hot_spare, RF_SingleComponent_t *,
 		    sizeof(RF_SingleComponent_t), M_RAIDFRAME,
-		     M_ZERO);
+		     M_WAITOK | M_ZERO);
 		sparePtr = (RF_SingleComponent_t *) data;
 		memcpy( hot_spare, sparePtr, sizeof(RF_SingleComponent_t));
 		retcode = rf_add_hot_spare(raidPtr, hot_spare);
@@ -997,7 +997,7 @@ raidioctl(dev, cmd, data, flag, td)
 	case RAIDFRAME_DELETE_COMPONENT:
 		MALLOC(component, RF_SingleComponent_t *,
 		    sizeof(RF_SingleComponent_t), M_RAIDFRAME,
-		     M_ZERO);
+		     M_WAITOK | M_ZERO);
 		componentPtr = (RF_SingleComponent_t *)data;
 		memcpy( component, componentPtr, 
 			sizeof(RF_SingleComponent_t));
@@ -1008,7 +1008,7 @@ raidioctl(dev, cmd, data, flag, td)
 	case RAIDFRAME_INCORPORATE_HOT_SPARE:
 		MALLOC(component, RF_SingleComponent_t *,
 		    sizeof(RF_SingleComponent_t), M_RAIDFRAME,
-		     M_ZERO);
+		     M_WAITOK | M_ZERO);
 		componentPtr = (RF_SingleComponent_t *)data;
 		memcpy( component, componentPtr, 
 			sizeof(RF_SingleComponent_t));
@@ -1020,7 +1020,7 @@ raidioctl(dev, cmd, data, flag, td)
 
 		MALLOC(component, RF_SingleComponent_t *,
 		    sizeof(RF_SingleComponent_t), M_RAIDFRAME,
-		     M_ZERO);
+		     M_WAITOK | M_ZERO);
 		if (raidPtr->Layout.map->faultsTolerated == 0) {
 			/* Can't do this on a RAID 0!! */
 			FREE(component, M_RAIDFRAME);
@@ -2894,7 +2894,7 @@ rf_set_autoconfig(raidPtr, new_value)
 	int row, column;
 
 	MALLOC(clabel, RF_ComponentLabel_t *, sizeof(RF_ComponentLabel_t),
-	    M_RAIDFRAME, M_ZERO);
+	    M_RAIDFRAME, M_WAITOK | M_ZERO);
 
 	raidPtr->autoconfigure = new_value;
 	for(row=0; row<raidPtr->numRow; row++) {
@@ -2924,7 +2924,7 @@ rf_set_rootpartition(raidPtr, new_value)
 	int row, column;
 
 	MALLOC(clabel, RF_ComponentLabel_t *, sizeof(RF_ComponentLabel_t),
-	    M_RAIDFRAME, M_ZERO);
+	    M_RAIDFRAME, M_WAITOK | M_ZERO);
 
 	raidPtr->root_partition = new_value;
 	for(row=0; row<raidPtr->numRow; row++) {
diff --git a/sys/dev/raidframe/rf_shutdown.c b/sys/dev/raidframe/rf_shutdown.c
index 9dc62558946e..7db93e9ce895 100644
--- a/sys/dev/raidframe/rf_shutdown.c
+++ b/sys/dev/raidframe/rf_shutdown.c
@@ -61,7 +61,7 @@ _rf_ShutdownCreate(
          * and shutdown after RAIDframe internal allocation system.
          */
 	/* 	ent = (RF_ShutdownList_t *) malloc(sizeof(RF_ShutdownList_t), 
-		M_RAIDFRAME, 0); */
+		M_RAIDFRAME, M_WAITOK); */
 	ent = (RF_ShutdownList_t *) malloc(sizeof(RF_ShutdownList_t), 
 					   M_RAIDFRAME, M_NOWAIT);
 	if (ent == NULL)
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index 6256ae217d31..d965cbc8d366 100644
--- a/sys/dev/random/randomdev.c
+++ b/sys/dev/random/randomdev.c
@@ -187,7 +187,7 @@ random_read(dev_t dev __unused, struct uio *uio, int flag)
 			return error;
 	}
 	c = uio->uio_resid < PAGE_SIZE ? uio->uio_resid : PAGE_SIZE;
-	random_buf = (void *)malloc((u_long)c, M_TEMP, 0);
+	random_buf = (void *)malloc((u_long)c, M_TEMP, M_WAITOK);
 	while (uio->uio_resid > 0 && error == 0) {
 		ret = read_random_real(random_buf, c);
 		error = uiomove(random_buf, ret, uio);
@@ -205,7 +205,7 @@ random_write(dev_t dev __unused, struct uio *uio, int flag __unused)
 	void	*random_buf;
 
 	error = 0;
-	random_buf = (void *)malloc(PAGE_SIZE, M_TEMP, 0);
+	random_buf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
 	while (uio->uio_resid > 0) {
 		c = (int)(uio->uio_resid < PAGE_SIZE
 		    ? uio->uio_resid
diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c
index 7cd9b8758694..1c92d50bd9ee 100644
--- a/sys/dev/ray/if_ray.c
+++ b/sys/dev/ray/if_ray.c
@@ -1782,14 +1782,14 @@ ray_rx(struct ray_softc *sc, size_t rcs)
 		goto skip_read;
 	}
 
-	MGETHDR(m0, M_NOWAIT, MT_DATA);
+	MGETHDR(m0, M_DONTWAIT, MT_DATA);
 	if (m0 == NULL) {
 		RAY_RECERR(sc, "MGETHDR failed");
 		ifp->if_ierrors++;
 		goto skip_read;
 	}
 	if (pktlen > MHLEN) {
-		MCLGET(m0, M_NOWAIT);
+		MCLGET(m0, M_DONTWAIT);
 		if (!(m0->m_flags & M_EXT)) {
 			RAY_RECERR(sc, "MCLGET failed");
 			ifp->if_ierrors++;
@@ -3155,7 +3155,7 @@ ray_com_malloc(ray_comqfn_t function, int flags, char *mesg)
 	struct ray_comq_entry *com;
 
 	MALLOC(com, struct ray_comq_entry *,
-	    sizeof(struct ray_comq_entry), M_RAYCOM, 0);
+	    sizeof(struct ray_comq_entry), M_RAYCOM, M_WAITOK);
     
 	return (ray_com_init(com, function, flags, mesg));
 }
diff --git a/sys/dev/sbni/if_sbni.c b/sys/dev/sbni/if_sbni.c
index d99882f10c4d..e5d54172a8eb 100644
--- a/sys/dev/sbni/if_sbni.c
+++ b/sys/dev/sbni/if_sbni.c
@@ -814,7 +814,7 @@ get_rx_buf(struct sbni_softc *sc)
 {
 	struct mbuf *m;
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		if_printf(&sc->arpcom.ac_if, "cannot allocate header mbuf\n");
 		return (0);
@@ -828,7 +828,7 @@ get_rx_buf(struct sbni_softc *sc)
 	 */
 	if (ETHER_MAX_LEN + 2 > MHLEN) {
 		/* Attach an mbuf cluster */
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_freem(m);
 			return (0);
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index 7b63a0120518..a148ba575862 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -924,11 +924,11 @@ sf_newbuf(sc, c, m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1304,14 +1304,14 @@ sf_encap(sc, c, m_head)
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("sf%d: no memory for tx list\n", sc->sf_unit);
 			return(1);
 		}
 
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_NOWAIT);
+			MCLGET(m_new, M_DONTWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				printf("sf%d: no memory for tx list\n",
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 3aa40e797070..e58d1c4f2803 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -688,7 +688,7 @@ sk_newbuf(sc_if, c, m)
 	if (m == NULL) {
 		caddr_t			*buf = NULL;
 
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index 18ca1cc82fe2..46011cb18393 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -1057,7 +1057,7 @@ read_another:
 	/*
 	 * Allocate a header mbuf from the kernel.
 	 */
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		goto out;
 
@@ -1067,7 +1067,7 @@ read_another:
 	/*
 	 * Attach an mbuf cluster
 	 */
-	MCLGET(m, M_NOWAIT);
+	MCLGET(m, M_DONTWAIT);
 
 	/*
 	 * Insist on getting a cluster
diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c
index bb92c96cc440..f0ebae15aeeb 100644
--- a/sys/dev/snc/dp83932.c
+++ b/sys/dev/snc/dp83932.c
@@ -1121,7 +1121,7 @@ sonic_get(sc, pkt, datalen)
 	 * Our sonic_read() and sonic_get() require it.
 	 */
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == 0)
 		return (0);
 	m->m_pkthdr.rcvif = &sc->sc_if;
@@ -1132,7 +1132,7 @@ sonic_get(sc, pkt, datalen)
 
 	while (datalen > 0) {
 		if (top) {
-			MGET(m, M_NOWAIT, MT_DATA);
+			MGET(m, M_DONTWAIT, MT_DATA);
 			if (m == 0) {
 				m_freem(top);
 				return (0);
@@ -1140,7 +1140,7 @@ sonic_get(sc, pkt, datalen)
 			len = MLEN;
 		}
 		if (datalen >= MINCLSIZE) {
-			MCLGET(m, M_NOWAIT);
+			MCLGET(m, M_DONTWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				if (top) m_freem(top);
 				return (0);
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 81583431a1c8..34e3e29d030d 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -150,7 +150,7 @@ snplwrite(tp, uio, flag)
 	snp = tp->t_sc;
 	while (uio->uio_resid > 0) {
 		ilen = imin(512, uio->uio_resid);
-		ibuf = malloc(ilen, M_SNP, 0);
+		ibuf = malloc(ilen, M_SNP, M_WAITOK);
 		error = uiomove(ibuf, ilen, uio);
 		if (error != 0)
 			break;
@@ -391,7 +391,7 @@ snpopen(dev, flag, mode, td)
 			make_dev(&snp_cdevsw, minor(dev), UID_ROOT, GID_WHEEL,
 			    0600, "snp%d", dev2unit(dev));
 		dev->si_drv1 = snp = malloc(sizeof(*snp), M_SNP,
-		    M_ZERO);
+		    M_WAITOK | M_ZERO);
 		snp->snp_unit = dev2unit(dev);
 	} else
 		return (EBUSY);
@@ -402,7 +402,7 @@ snpopen(dev, flag, mode, td)
 	 */
 	snp->snp_flags = SNOOP_OPEN;
 
-	snp->snp_buf = malloc(SNOOP_MINLEN, M_SNP, 0);
+	snp->snp_buf = malloc(SNOOP_MINLEN, M_SNP, M_WAITOK);
 	snp->snp_blen = SNOOP_MINLEN;
 	snp->snp_base = 0;
 	snp->snp_len = 0;
@@ -480,7 +480,7 @@ snp_down(snp)
 
 	if (snp->snp_blen != SNOOP_MINLEN) {
 		free(snp->snp_buf, M_SNP);
-		snp->snp_buf = malloc(SNOOP_MINLEN, M_SNP, 0);
+		snp->snp_buf = malloc(SNOOP_MINLEN, M_SNP, M_WAITOK);
 		snp->snp_blen = SNOOP_MINLEN;
 	}
 	snp->snp_flags |= SNOOP_DOWN;
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index 6e2de523830c..07d26608fcb7 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -282,7 +282,7 @@ create_mididev_info_unit(int type, mididev_info *mdinf, synthdev_info *syninf)
 	}
 
 	/* As malloc(9) might block, allocate mididev_info now. */
-	mdnew = malloc(sizeof(mididev_info), M_DEVBUF, M_ZERO);
+	mdnew = malloc(sizeof(mididev_info), M_DEVBUF, M_WAITOK | M_ZERO);
 	if (mdnew == NULL)
 		return NULL;
 	bcopy(mdinf, mdnew, sizeof(mididev_info));
@@ -607,7 +607,7 @@ midi_read(dev_t i_dev, struct uio * buf, int flag)
 	len = buf->uio_resid;
 	lenr = 0;
 
-	uiobuf = (u_char *)malloc(len, M_DEVBUF, M_ZERO);
+	uiobuf = (u_char *)malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
 	if (uiobuf == NULL)
 		return (ENOMEM);
 
@@ -659,7 +659,7 @@ midi_write(dev_t i_dev, struct uio * buf, int flag)
 	len = buf->uio_resid;
 	lenw = 0;
 
-	uiobuf = (u_char *)malloc(len, M_DEVBUF, M_ZERO);
+	uiobuf = (u_char *)malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
 	if (uiobuf == NULL)
 		return (ENOMEM);
 
diff --git a/sys/dev/sound/midi/midibuf.c b/sys/dev/sound/midi/midibuf.c
index 41ea4dd2a385..8b4eda7dbc00 100644
--- a/sys/dev/sound/midi/midibuf.c
+++ b/sys/dev/sound/midi/midibuf.c
@@ -55,7 +55,7 @@ int
 midibuf_init(midi_dbuf *dbuf)
 {
 	if (dbuf->buf == NULL) {
-		dbuf->buf = malloc(MIDI_BUFFSIZE, M_DEVBUF, M_ZERO);
+		dbuf->buf = malloc(MIDI_BUFFSIZE, M_DEVBUF, M_WAITOK | M_ZERO);
 		cv_init(&dbuf->cv_in, "midi queue in");
 		cv_init(&dbuf->cv_out, "midi queue out");
 	}
diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c
index 7d0b6e2aadca..5115cc9b6fc2 100644
--- a/sys/dev/sound/midi/sequencer.c
+++ b/sys/dev/sound/midi/sequencer.c
@@ -322,7 +322,7 @@ seq_initunit(int unit)
 	dev_t seqdev, musicdev;
 
 	/* Allocate the softc. */
-	scp = malloc(sizeof(*scp), M_DEVBUF, M_ZERO);
+	scp = malloc(sizeof(*scp), M_DEVBUF, M_WAITOK | M_ZERO);
 	if (scp == (sc_p)NULL) {
 		printf("seq_initunit: unit %d, softc allocation failed.\n", unit);
 		return (1);
@@ -544,7 +544,7 @@ seq_read(dev_t i_dev, struct uio *buf, int flag)
 	len = buf->uio_resid;
 	lenr = 0;
 
-	uiobuf = (u_char *)malloc(len, M_DEVBUF, M_ZERO);
+	uiobuf = (u_char *)malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
 	if (uiobuf == NULL)
 		return (ENOMEM);
 
@@ -2364,7 +2364,7 @@ create_seqdev_info_unit(int unit, seqdev_info *seq)
 	seqdev_info *sd, *sdnew;
 
 	/* As malloc(9) might block, allocate seqdev_info now. */
-	sdnew = malloc(sizeof(seqdev_info), M_DEVBUF, M_ZERO);
+	sdnew = malloc(sizeof(seqdev_info), M_DEVBUF, M_WAITOK | M_ZERO);
 	if (sdnew == NULL)
 		return NULL;
 	bcopy(seq, sdnew, sizeof(seqdev_info));
diff --git a/sys/dev/sound/midi/timer.c b/sys/dev/sound/midi/timer.c
index b5c75cf4a64d..ba4bce0d5828 100644
--- a/sys/dev/sound/midi/timer.c
+++ b/sys/dev/sound/midi/timer.c
@@ -97,7 +97,7 @@ timerdev_install(void)
 	tmd = NULL;
 	scp = NULL;
 
-	scp = malloc(sizeof(*scp), M_DEVBUF, M_ZERO);
+	scp = malloc(sizeof(*scp), M_DEVBUF, M_WAITOK | M_ZERO);
 	if (scp == NULL) {
 		ret = ENOMEM;
 		goto fail;
@@ -146,7 +146,7 @@ create_timerdev_info_unit(timerdev_info *tmdinf)
 	}
 
 	/* As malloc(9) might block, allocate timerdev_info now. */
-	tmdnew = malloc(sizeof(timerdev_info), M_DEVBUF, M_ZERO);
+	tmdnew = malloc(sizeof(timerdev_info), M_DEVBUF, M_WAITOK | M_ZERO);
 	if (tmdnew == NULL)
 		return NULL;
 	bcopy(tmdinf, tmdnew, sizeof(timerdev_info));
diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c
index dfffd8d23b4d..896a8af0e7ac 100644
--- a/sys/dev/sound/pci/ds1.c
+++ b/sys/dev/sound/pci/ds1.c
@@ -934,7 +934,7 @@ ds_pci_attach(device_t dev)
 	struct ac97_info *codec = NULL;
 	char 		status[SND_STATUSLEN];
 
-	if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_ZERO)) == NULL) {
+	if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO)) == NULL) {
 		device_printf(dev, "cannot allocate softc\n");
 		return ENXIO;
 	}
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index 52e16bff27cb..e9c99cb41b13 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -1455,7 +1455,7 @@ emu_pci_attach(device_t dev)
 	int i, gotmic;
 	char status[SND_STATUSLEN];
 
-	if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_ZERO)) == NULL) {
+	if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO)) == NULL) {
 		device_printf(dev, "cannot allocate softc\n");
 		return ENXIO;
 	}
diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
index a4b49a37792b..472c2dab11e4 100644
--- a/sys/dev/sound/pcm/ac97.c
+++ b/sys/dev/sound/pcm/ac97.c
@@ -552,7 +552,7 @@ ac97_create(device_t dev, void *devinfo, kobj_class_t cls)
 
 	snprintf(codec->name, AC97_NAMELEN, "%s:ac97", device_get_nameunit(dev));
 	codec->lock = snd_mtxcreate(codec->name, "ac97 codec");
-	codec->methods = kobj_create(cls, M_AC97, 0);
+	codec->methods = kobj_create(cls, M_AC97, M_WAITOK);
 	if (codec->methods == NULL) {
 		snd_mtxlock(codec->lock);
 		snd_mtxfree(codec->lock);
diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c
index 645e3b359757..a096b4017150 100644
--- a/sys/dev/sound/pcm/buffer.c
+++ b/sys/dev/sound/pcm/buffer.c
@@ -35,7 +35,7 @@ sndbuf_create(device_t dev, char *drv, char *desc)
 {
 	struct snd_dbuf *b;
 
-	b = malloc(sizeof(*b), M_DEVBUF, M_ZERO);
+	b = malloc(sizeof(*b), M_DEVBUF, M_WAITOK | M_ZERO);
 	snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", drv, desc);
 	b->dev = dev;
 
diff --git a/sys/dev/sound/pcm/fake.c b/sys/dev/sound/pcm/fake.c
index f1bd33cc70f5..8c4ba7781400 100644
--- a/sys/dev/sound/pcm/fake.c
+++ b/sys/dev/sound/pcm/fake.c
@@ -117,8 +117,8 @@ fkchan_setup(device_t dev)
     	struct snddev_info *d = device_get_softc(dev);
 	struct pcm_channel *c;
 
-	c = malloc(sizeof(*c), M_DEVBUF, 0);
-	c->methods = kobj_create(&fkchan_class, M_DEVBUF, 0);
+	c = malloc(sizeof(*c), M_DEVBUF, M_WAITOK);
+	c->methods = kobj_create(&fkchan_class, M_DEVBUF, M_WAITOK);
 	c->parentsnddev = d;
 	snprintf(c->name, CHN_NAMELEN, "%s:fake", device_get_nameunit(dev));
 
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 915111a660b2..91bdb66311cc 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -59,7 +59,7 @@ feeder_register(void *p)
 		KASSERT(fc->desc == NULL, ("first feeder not root: %s", fc->name));
 
 		SLIST_INIT(&feedertab);
-		fte = malloc(sizeof(*fte), M_FEEDER, M_ZERO);
+		fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO);
 		if (fte == NULL) {
 			printf("can't allocate memory for root feeder: %s\n",
 			    fc->name);
@@ -84,7 +84,7 @@ feeder_register(void *p)
 	i = 0;
 	while ((feedercnt < MAXFEEDERS) && (fc->desc[i].type > 0)) {
 		/* printf("adding feeder %s, %x -> %x\n", fc->name, fc->desc[i].in, fc->desc[i].out); */
-		fte = malloc(sizeof(*fte), M_FEEDER, M_ZERO);
+		fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO);
 		if (fte == NULL) {
 			printf("can't allocate memory for feeder '%s', %x -> %x\n", fc->name, fc->desc[i].in, fc->desc[i].out);
 
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index 2c3c3f4d230b..182d2902385f 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -200,7 +200,7 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo)
 	dev_t pdev;
 	int i, unit;
 
-	m = (struct snd_mixer *)kobj_create(cls, M_MIXER, M_ZERO);
+	m = (struct snd_mixer *)kobj_create(cls, M_MIXER, M_WAITOK | M_ZERO);
 	snprintf(m->name, MIXER_NAMELEN, "%s:mixer", device_get_nameunit(dev));
 	m->lock = snd_mtxcreate(m->name, "pcm mixer");
 	m->type = cls->name;
diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
index 6d2a27a8a4cd..bdaff2bc9968 100644
--- a/sys/dev/sound/pcm/sndstat.c
+++ b/sys/dev/sound/pcm/sndstat.c
@@ -222,7 +222,7 @@ sndstat_register(device_t dev, char *str, sndstat_handler handler)
 		unit = -1;
 	}
 
-	ent = malloc(sizeof *ent, M_DEVBUF, M_ZERO | 0);
+	ent = malloc(sizeof *ent, M_DEVBUF, M_ZERO | M_WAITOK);
 	if (!ent)
 		return ENOSPC;
 
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index f6d852fc4255..c184a69e13e9 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -91,7 +91,7 @@ snd_mtxcreate(const char *desc, const char *type)
 #ifdef USING_MUTEX
 	struct mtx *m;
 
-	m = malloc(sizeof(*m), M_DEVBUF, M_ZERO);
+	m = malloc(sizeof(*m), M_DEVBUF, M_WAITOK | M_ZERO);
 	if (m == NULL)
 		return NULL;
 	mtx_init(m, desc, type, MTX_RECURSE);
@@ -364,11 +364,11 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c
 		return NULL;
 	}
 
-	ch = malloc(sizeof(*ch), M_DEVBUF, M_ZERO);
+	ch = malloc(sizeof(*ch), M_DEVBUF, M_WAITOK | M_ZERO);
 	if (!ch)
 		return NULL;
 
-	ch->methods = kobj_create(cls, M_DEVBUF, 0);
+	ch->methods = kobj_create(cls, M_DEVBUF, M_WAITOK);
 	if (!ch->methods) {
 		free(ch, M_DEVBUF);
 
@@ -426,7 +426,7 @@ pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch, int mkdev)
     	int unit = device_get_unit(d->dev);
 	int x = -1;
 
-	sce = malloc(sizeof(*sce), M_DEVBUF, M_ZERO);
+	sce = malloc(sizeof(*sce), M_DEVBUF, M_WAITOK | M_ZERO);
 	if (!sce) {
 		return ENOMEM;
 	}
diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c
index f0b5c1e862a8..eca4ac44c5f9 100644
--- a/sys/dev/sound/pcm/vchan.c
+++ b/sys/dev/sound/pcm/vchan.c
@@ -122,7 +122,7 @@ vchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channel *c,
 	struct pcm_channel *parent = devinfo;
 
 	KASSERT(dir == PCMDIR_PLAY, ("vchan_init: bad direction"));
-	ch = malloc(sizeof(*ch), M_DEVBUF, M_ZERO);
+	ch = malloc(sizeof(*ch), M_DEVBUF, M_WAITOK | M_ZERO);
 	ch->parent = parent;
 	ch->channel = c;
 	ch->fmt = AFMT_U8;
@@ -235,7 +235,7 @@ vchan_create(struct pcm_channel *parent)
 	struct pcm_channel *child;
 	int err, first;
 
-	pce = malloc(sizeof(*pce), M_DEVBUF, M_ZERO);
+	pce = malloc(sizeof(*pce), M_DEVBUF, M_WAITOK | M_ZERO);
 	if (!pce) {
 		return ENOMEM;
 	}
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index e6487c1acb1b..de4c5cab33eb 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -495,7 +495,7 @@ spkropen(dev, flags, fmt, td)
 	(void) printf("spkropen: about to perform play initialization\n");
 #endif /* DEBUG */
 	playinit();
-	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, 0);
+	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, M_WAITOK);
 	spkr_active = TRUE;
 	return(0);
     }
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index dfde40e9693e..18b5511f6741 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -311,7 +311,7 @@ sr_attach(device_t device)
 	hc = (struct sr_hardc *)device_get_softc(device);
 	MALLOC(sc, struct sr_softc *,
 		hc->numports * sizeof(struct sr_softc),
-		M_DEVBUF, M_ZERO);
+		M_DEVBUF, M_WAITOK | M_ZERO);
 	if (sc == NULL)
 		goto errexit;
 	hc->sc = sc;
@@ -2088,7 +2088,7 @@ sr_get_packets(struct sr_softc *sc)
 			       sc->unit, rxstat, len);
 #endif
 
-			MGETHDR(m, M_NOWAIT, MT_DATA);
+			MGETHDR(m, M_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				/*
 				 * eat (flush) packet if get mbuf fail!!
@@ -2106,7 +2106,7 @@ sr_get_packets(struct sr_softc *sc)
 #endif /* NETGRAPH */
 			m->m_pkthdr.len = m->m_len = len;
 			if (len > MHLEN) {
-				MCLGET(m, M_NOWAIT);
+				MCLGET(m, M_DONTWAIT);
 				if ((m->m_flags & M_EXT) == 0) {
 					/*
 					 * We couldn't get a big enough
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index 4ee45a2f3114..4347d99b402d 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -367,7 +367,7 @@ svr4_stream_get(fp)
 	}
 
 	/* Allocate a new one. */
-	st = malloc(sizeof(struct svr4_strm), M_TEMP, 0);
+	st = malloc(sizeof(struct svr4_strm), M_TEMP, M_WAITOK);
 	st->s_family = so->so_proto->pr_domain->dom_family;
 	st->s_cmd = ~0;
 	st->s_afd = -1;
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index aebeab2545ab..3cd58305cde5 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -383,7 +383,7 @@ daemon_init(video_adapter_t *adp)
 {
 	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
 	    strlen(osrelease);
-	message = malloc(messagelen + 1, M_DEVBUF, 0);
+	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s - %s %s", hostname, ostype, osrelease);
 	blanked = 0;
 	return 0;
diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c
index 479add933025..30cbdfd0af41 100644
--- a/sys/dev/syscons/schistory.c
+++ b/sys/dev/syscons/schistory.c
@@ -124,7 +124,7 @@ sc_alloc_history_buffer(scr_stat *scp, int lines, int prev_ysize, int wait)
 	/* allocate a new buffer */
 	history = (sc_vtb_t *)malloc(sizeof(*history),
 				     M_DEVBUF,
-				     (wait) ? 0 : M_NOWAIT);
+				     (wait) ? M_WAITOK : M_NOWAIT);
 	if (history != NULL) {
 		if (lines > min_lines)
 			extra_history_size -= lines - min_lines;
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index 6db469aeef91..0c4ba2cdb457 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -106,7 +106,7 @@ sc_alloc_cut_buffer(scr_stat *scp, int wait)
 	    free(p, M_DEVBUF);
 	cut_buffer_size = scp->xsize * scp->ysize + 1;
 	p = (u_char *)malloc(cut_buffer_size, 
-			     M_DEVBUF, (wait) ? 0 : M_NOWAIT);
+			     M_DEVBUF, (wait) ? M_WAITOK : M_NOWAIT);
 	if (p != NULL)
 	    p[0] = '\0';
 	cut_buffer = p;
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index 8a0a24f6f4ac..6712e9b4c643 100644
--- a/sys/dev/syscons/scvtb.c
+++ b/sys/dev/syscons/scvtb.c
@@ -61,7 +61,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait)
 			vtb->vtb_buffer =
 				(vm_offset_t)malloc(cols*rows*sizeof(u_int16_t),
 						    M_DEVBUF, 
-						    (wait) ? 0 : M_NOWAIT);
+						    (wait) ? M_WAITOK : M_NOWAIT);
 			if (vtb->vtb_buffer != 0) {
 				bzero((void *)sc_vtb_pointer(vtb, 0),
 				      cols*rows*sizeof(u_int16_t));
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index 5741eea0e8b1..ea5651fee2f6 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -131,9 +131,9 @@ static int
 snake_init(video_adapter_t *adp)
 {
 	messagelen = strlen(ostype) + 1 + strlen(osrelease);
-	message = malloc(messagelen + 1, M_DEVBUF, 0);
+	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s %s", ostype, osrelease);
-	messagep = malloc(messagelen * sizeof *messagep, M_DEVBUF, 0);
+	messagep = malloc(messagelen * sizeof *messagep, M_DEVBUF, M_WAITOK);
 	return 0;
 }
 
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 38465abab7fe..6a885c459761 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -318,7 +318,7 @@ sc_attach_unit(int unit, int flags)
 	    /* assert(sc_console->ts != NULL); */
 	    kernel_console_ts = sc_console->ts;
 	    sc_console->ts = malloc(sc_console->tsw->te_size,
-				    M_DEVBUF, 0);
+				    M_DEVBUF, M_WAITOK);
 	    bcopy(kernel_console_ts, sc_console->ts, sc_console->tsw->te_size);
     	    (*sc_console->tsw->te_default_attr)(sc_console,
 						user_default.std_color,
@@ -2674,9 +2674,9 @@ scinit(int unit, int flags)
 	    sc->font_16 = font_16;
 	} else if (sc->font_8 == NULL) {
 	    /* assert(sc_malloc) */
-	    sc->font_8 = malloc(sizeof(font_8), M_DEVBUF, 0);
-	    sc->font_14 = malloc(sizeof(font_14), M_DEVBUF, 0);
-	    sc->font_16 = malloc(sizeof(font_16), M_DEVBUF, 0);
+	    sc->font_8 = malloc(sizeof(font_8), M_DEVBUF, M_WAITOK);
+	    sc->font_14 = malloc(sizeof(font_14), M_DEVBUF, M_WAITOK);
+	    sc->font_16 = malloc(sizeof(font_16), M_DEVBUF, M_WAITOK);
 	}
 #endif
 
@@ -2703,7 +2703,7 @@ scinit(int unit, int flags)
 					 kernel_default.rev_color);
 	} else {
 	    /* assert(sc_malloc) */
-	    sc->dev = malloc(sizeof(dev_t)*sc->vtys, M_DEVBUF, M_ZERO);
+	    sc->dev = malloc(sizeof(dev_t)*sc->vtys, M_DEVBUF, M_WAITOK|M_ZERO);
 	    sc->dev[0] = makedev(CDEV_MAJOR, unit*MAXCONS);
 	    sc->dev[0]->si_tty = ttymalloc(sc->dev[0]->si_tty);
 	    scp = alloc_scp(sc, sc->first_vty);
@@ -2928,7 +2928,7 @@ static scr_stat
 
     /* assert(sc_malloc) */
 
-    scp = (scr_stat *)malloc(sizeof(scr_stat), M_DEVBUF, 0);
+    scp = (scr_stat *)malloc(sizeof(scr_stat), M_DEVBUF, M_WAITOK);
     init_scp(sc, vty, scp);
 
     sc_alloc_scr_buffer(scp, TRUE, TRUE);
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 894ac43559a5..a3843223270e 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -1130,11 +1130,11 @@ ti_newbuf_std(sc, i, m)
 	struct ti_rx_desc	*r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1174,7 +1174,7 @@ ti_newbuf_mini(sc, i, m)
 	struct ti_rx_desc	*r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
@@ -1218,7 +1218,7 @@ ti_newbuf_jumbo(sc, i, m)
 		caddr_t			*buf = NULL;
 
 		/* Allocate the mbuf. */
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
@@ -1300,19 +1300,19 @@ ti_newbuf_jumbo(sc, idx, m_old)
 		}
 	} else {
 		/* Allocate the mbufs. */
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("ti%d: mbuf allocation failed "
    			       "-- packet dropped!\n", sc->ti_unit);
 			goto nobufs;
 		}
-		MGET(m[NPAYLOAD], M_NOWAIT, MT_DATA);
+		MGET(m[NPAYLOAD], M_DONTWAIT, MT_DATA);
 		if (m[NPAYLOAD] == NULL) {
 			printf("ti%d: cluster mbuf allocation failed "
 			       "-- packet dropped!\n", sc->ti_unit);
 			goto nobufs;
 		}
-		MCLGET(m[NPAYLOAD], M_NOWAIT);
+		MCLGET(m[NPAYLOAD], M_DONTWAIT);
 		if ((m[NPAYLOAD]->m_flags & M_EXT) == 0) {
 			printf("ti%d: mbuf allocation failed "
 			       "-- packet dropped!\n", sc->ti_unit);
@@ -1321,7 +1321,7 @@ ti_newbuf_jumbo(sc, idx, m_old)
 		m[NPAYLOAD]->m_len = MCLBYTES;
 
 		for (i = 0; i < NPAYLOAD; i++){
-			MGET(m[i], M_NOWAIT, MT_DATA);
+			MGET(m[i], M_DONTWAIT, MT_DATA);
 			if (m[i] == NULL) {
 				printf("ti%d: mbuf allocation failed "
 				       "-- packet dropped!\n", sc->ti_unit);
diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c
index 839112353cea..e157cb1141ea 100644
--- a/sys/dev/trm/trm.c
+++ b/sys/dev/trm/trm.c
@@ -2887,7 +2887,7 @@ trm_initACB(PACB pACB, u_int16_t unit)
 			for (j = 0; j < (pACB->max_lun +1); j++) {
 				pACB->scan_devices[i][j] = 1;
 				pACB->pDCB[i][j]= (PDCB) malloc (
-				    sizeof (struct _DCB), M_DEVBUF, 0);
+				    sizeof (struct _DCB), M_DEVBUF, M_WAITOK);
 				trm_initDCB(pACB,
 				    pACB->pDCB[i][j], unit, i, j);
 				TRM_DPRINTF("pDCB= %8x \n",
@@ -3292,7 +3292,7 @@ trm_attach(device_t pci_config_id)
 	 * of the multi-channel controller.
 	 * trm_action     : sim_action_func
 	 * trm_poll       : sim_poll_func
-	 * "trm"        : sim_name ,if sim_name =  "xpt" ..M_DEVBUF,0
+	 * "trm"        : sim_name ,if sim_name =  "xpt" ..M_DEVBUF,M_WAITOK
 	 * pACB         : *softc    if sim_name <> "xpt" ..M_DEVBUF,M_NOWAIT
 	 * pACB->unit   : unit
 	 * 1            : max_dev_transactions
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c
index 4284942db37c..43df8e98760b 100644
--- a/sys/dev/twe/twe.c
+++ b/sys/dev/twe/twe.c
@@ -476,7 +476,7 @@ twe_ioctl(struct twe_softc *sc, int cmd, void *addr)
 	/* if there's a data buffer, allocate and copy it in */
 	tr->tr_length = tu->tu_size;
 	if (tr->tr_length > 0) {
-	    if ((tr->tr_data = malloc(tr->tr_length, M_DEVBUF, 0)) == NULL) {
+	    if ((tr->tr_data = malloc(tr->tr_length, M_DEVBUF, M_WAITOK)) == NULL) {
 		error = ENOMEM;
 		goto cmd_done;
 	    }
@@ -559,7 +559,7 @@ twe_ioctl(struct twe_softc *sc, int cmd, void *addr)
 	break;
 
     case TWEIO_SET_PARAM:
-	if ((data = malloc(tp->tp_size, M_DEVBUF, 0)) == NULL) {
+	if ((data = malloc(tp->tp_size, M_DEVBUF, M_WAITOK)) == NULL) {
 	    error = ENOMEM;
 	} else {
 	    error = copyin(tp->tp_data, data, tp->tp_size);
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 5a6871934a78..189a69ef8906 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -577,7 +577,7 @@ epic_ifstart(ifp)
 		/* If packet was more than EPIC_MAX_FRAGS parts, */
 		/* recopy packet to new allocated mbuf cluster */
 		if( NULL != m ){
-			m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
+			m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
 			if( NULL == m ){
 				m_freem(m0);
 				ifp->if_oerrors++;
@@ -652,7 +652,7 @@ epic_rx_done(sc)
 		m = buf->mbuf;
 
 		/* Try to get mbuf cluster */
-		buf->mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
+		buf->mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
 		if( NULL == buf->mbuf ) { 
 			buf->mbuf = m;
 			desc->status = 0x8000;
@@ -1415,7 +1415,7 @@ epic_queue_last_packet(sc)
 	if ((desc->status & 0x8000) || (buf->mbuf != NULL))
 		return (EBUSY);
 
-	MGETHDR(m0, M_NOWAIT, MT_DATA);
+	MGETHDR(m0, M_DONTWAIT, MT_DATA);
 	if (NULL == m0)
 		return (ENOBUFS);
 
@@ -1556,7 +1556,7 @@ epic_init_rings(sc)
 			return EFAULT;
 		}
 
-		buf->mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
+		buf->mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
 		if( NULL == buf->mbuf ) {
 			epic_free_rings(sc);
 			return ENOBUFS;
diff --git a/sys/dev/tx/if_txvar.h b/sys/dev/tx/if_txvar.h
index 465727fc7075..16dc36d9f5b7 100644
--- a/sys/dev/tx/if_txvar.h
+++ b/sys/dev/tx/if_txvar.h
@@ -134,9 +134,9 @@ struct epic_type {
 
 /* Macro to get either mbuf cluster or nothing */
 #define EPIC_MGETCLUSTER(m)						\
-	{ MGETHDR((m),M_NOWAIT,MT_DATA);				\
+	{ MGETHDR((m),M_DONTWAIT,MT_DATA);				\
 	  if (m) {							\
-	    MCLGET((m),M_NOWAIT);					\
+	    MCLGET((m),M_DONTWAIT);					\
 	    if( 0 == ((m)->m_flags & M_EXT) ) {				\
 	      m_freem(m);						\
 	      (m) = NULL;						\
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index 385c91d0a62d..7c4d74d25ec3 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -768,13 +768,13 @@ txp_rx_reclaim(sc, r)
 			 */
 			struct mbuf *mnew;
 
-			MGETHDR(mnew, M_NOWAIT, MT_DATA);
+			MGETHDR(mnew, M_DONTWAIT, MT_DATA);
 			if (mnew == NULL) {
 				m_freem(m);
 				goto next;
 			}
 			if (m->m_len > (MHLEN - 2)) {
-				MCLGET(mnew, M_NOWAIT);
+				MCLGET(mnew, M_DONTWAIT);
 				if (!(mnew->m_flags & M_EXT)) {
 					m_freem(mnew);
 					m_freem(m);
@@ -847,11 +847,11 @@ txp_rxbuf_reclaim(sc)
 		if (sd->sd_mbuf != NULL)
 			break;
 
-		MGETHDR(sd->sd_mbuf, M_NOWAIT, MT_DATA);
+		MGETHDR(sd->sd_mbuf, M_DONTWAIT, MT_DATA);
 		if (sd->sd_mbuf == NULL)
 			goto err_sd;
 
-		MCLGET(sd->sd_mbuf, M_NOWAIT);
+		MCLGET(sd->sd_mbuf, M_DONTWAIT);
 		if ((sd->sd_mbuf->m_flags & M_EXT) == 0)
 			goto err_mbuf;
 		sd->sd_mbuf->m_pkthdr.rcvif = ifp;
@@ -1142,11 +1142,11 @@ txp_rxring_fill(sc)
 
 	for (i = 0; i < RXBUF_ENTRIES; i++) {
 		sd = sc->sc_rxbufs[i].rb_sd;
-		MGETHDR(sd->sd_mbuf, M_NOWAIT, MT_DATA);
+		MGETHDR(sd->sd_mbuf, M_DONTWAIT, MT_DATA);
 		if (sd->sd_mbuf == NULL)
 			return(ENOBUFS);
 
-		MCLGET(sd->sd_mbuf, M_NOWAIT);
+		MCLGET(sd->sd_mbuf, M_DONTWAIT);
 		if ((sd->sd_mbuf->m_flags & M_EXT) == 0) {
 			m_freem(sd->sd_mbuf);
 			return(ENOBUFS);
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index de1566eb47c4..728ebb417ef0 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -1332,14 +1332,14 @@ ubsec_process(void *arg, struct cryptop *crp, int hint)
 				totlen = q->q_src_mapsize;
 				if (q->q_src_m->m_flags & M_PKTHDR) {
 					len = MHLEN;
-					MGETHDR(m, M_NOWAIT, MT_DATA);
-					if (m && !m_dup_pkthdr(m, q->q_src_m, M_NOWAIT)) {
+					MGETHDR(m, M_DONTWAIT, MT_DATA);
+					if (m && !m_dup_pkthdr(m, q->q_src_m, M_DONTWAIT)) {
 						m_free(m);
 						m = NULL;
 					}
 				} else {
 					len = MLEN;
-					MGET(m, M_NOWAIT, MT_DATA);
+					MGET(m, M_DONTWAIT, MT_DATA);
 				}
 				if (m == NULL) {
 					ubsecstats.hst_nombuf++;
@@ -1347,7 +1347,7 @@ ubsec_process(void *arg, struct cryptop *crp, int hint)
 					goto errout;
 				}
 				if (totlen >= MINCLSIZE) {
-					MCLGET(m, M_NOWAIT);
+					MCLGET(m, M_DONTWAIT);
 					if ((m->m_flags & M_EXT) == 0) {
 						m_free(m);
 						ubsecstats.hst_nomcl++;
@@ -1362,7 +1362,7 @@ ubsec_process(void *arg, struct cryptop *crp, int hint)
 
 				while (totlen > 0) {
 					if (top) {
-						MGET(m, M_NOWAIT, MT_DATA);
+						MGET(m, M_DONTWAIT, MT_DATA);
 						if (m == NULL) {
 							m_freem(top);
 							ubsecstats.hst_nombuf++;
@@ -1372,7 +1372,7 @@ ubsec_process(void *arg, struct cryptop *crp, int hint)
 						len = MLEN;
 					}
 					if (top && totlen >= MINCLSIZE) {
-						MCLGET(m, M_NOWAIT);
+						MCLGET(m, M_DONTWAIT);
 						if ((m->m_flags & M_EXT) == 0) {
 							*mp = m;
 							m_freem(top);
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c
index d5484a8ecd63..b37a5d06d517 100644
--- a/sys/dev/usb/hid.c
+++ b/sys/dev/usb/hid.c
@@ -96,7 +96,7 @@ hid_start_parse(void *d, int len, int kindset)
 {
 	struct hid_data *s;
 
-	s = malloc(sizeof *s, M_TEMP, M_ZERO);
+	s = malloc(sizeof *s, M_TEMP, M_WAITOK|M_ZERO);
 	s->start = s->p = d;
 	s->end = (char *)d + len;
 	s->kindset = kindset;
@@ -288,7 +288,7 @@ hid_get_item(struct hid_data *s, struct hid_item *h)
 				c->loc.count = dval;
 				break;
 			case 10: /* Push */
-				hi = malloc(sizeof *hi, M_TEMP, 0);
+				hi = malloc(sizeof *hi, M_TEMP, M_WAITOK);
 				*hi = s->cur;
 				c->next = hi;
 				break;
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 94903c40eecf..fa80dd6ec08b 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -812,14 +812,14 @@ aue_newbuf(struct aue_softc *sc, struct aue_chain *c, struct mbuf *m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("aue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->aue_unit);
 			return (ENOBUFS);
 		}
 
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			printf("aue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->aue_unit);
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index a669e97ccd53..8748a83558c6 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -568,14 +568,14 @@ cue_newbuf(struct cue_softc *sc, struct cue_chain *c, struct mbuf *m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("cue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->cue_unit);
 			return(ENOBUFS);
 		}
 
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			printf("cue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->cue_unit);
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 3f51b5ae1f22..767d6fab845f 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -542,14 +542,14 @@ kue_newbuf(struct kue_softc *sc, struct kue_chain *c, struct mbuf *m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("kue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->kue_unit);
 			return(ENOBUFS);
 		}
 
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			printf("kue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->kue_unit);
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 81915d3b30ba..60ebd4ca95ba 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -278,7 +278,7 @@ USB_ATTACH(ubsa)
 	int i;
 
 	dev = uaa->device;
-	devinfo = malloc(1024, M_USBDEV, 0);
+	devinfo = malloc(1024, M_USBDEV, M_WAITOK);
 	ucom = &sc->sc_ucom;
 
 	bzero(sc, sizeof (struct ubsa_softc));
@@ -643,7 +643,7 @@ ubsa_open(void *addr, int portno)
 	DPRINTF(("ubsa_open: sc = %p\n", sc));
 
 	if (sc->sc_intr_number != -1 && sc->sc_intr_pipe == NULL) {
-		sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, 0);
+		sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, M_WAITOK);
 		err = usbd_open_pipe_intr(sc->sc_intr_iface,
 		    sc->sc_intr_number,
 		    USBD_SHORT_XFER_OK,
diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c
index 77f4b1d076b0..a0519da07d0a 100644
--- a/sys/dev/usb/udbp.c
+++ b/sys/dev/usb/udbp.c
@@ -326,11 +326,11 @@ USB_ATTACH(udbp)
 	if (!sc->sc_bulkout_xfer) {
 		goto bad;
 	}
-	sc->sc_bulkin_buffer = malloc(UDBP_BUFFERSIZE, M_USBDEV, 0);
+	sc->sc_bulkin_buffer = malloc(UDBP_BUFFERSIZE, M_USBDEV, M_WAITOK);
 	if (!sc->sc_bulkin_buffer) {
 		goto bad;
 	}
-	sc->sc_bulkout_buffer = malloc(UDBP_BUFFERSIZE, M_USBDEV, 0);
+	sc->sc_bulkout_buffer = malloc(UDBP_BUFFERSIZE, M_USBDEV, M_WAITOK);
 	if (!sc->sc_bulkout_xfer || !sc->sc_bulkout_buffer) {
 		goto bad;
 	}
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index fb2445989092..d400ff8122de 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -171,7 +171,7 @@ USB_ATTACH(uftdi)
 	usbd_status err;
 	struct ucom_softc *ucom = &sc->sc_ucom;
 	DPRINTFN(10,("\nuftdi_attach: sc=%p\n", sc));
-	devinfo = malloc(1024, M_USBDEV, 0);
+	devinfo = malloc(1024, M_USBDEV, M_WAITOK);
 
 	ucom->sc_dev = self;
 	ucom->sc_udev = dev;
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 06bbaddd9807..fb2b46af8221 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -422,7 +422,7 @@ ugenopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 			isize = UGETW(edesc->wMaxPacketSize);
 			if (isize == 0)	/* shouldn't happen */
 				return (EINVAL);
-			sce->ibuf = malloc(isize, M_USBDEV, 0);
+			sce->ibuf = malloc(isize, M_USBDEV, M_WAITOK);
 			DPRINTFN(5, ("ugenopen: intr endpt=%d,isize=%d\n", 
 				     endpt, isize));
 			if (clalloc(&sce->q, UGEN_IBSIZE, 0) == -1)
@@ -452,7 +452,7 @@ ugenopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 			if (isize == 0)	/* shouldn't happen */
 				return (EINVAL);
 			sce->ibuf = malloc(isize * UGEN_NISOFRAMES,
-				M_USBDEV, 0);
+				M_USBDEV, M_WAITOK);
 			sce->cur = sce->fill = sce->ibuf;
 			sce->limit = sce->ibuf + isize * UGEN_NISOFRAMES;
 			DPRINTFN(5, ("ugenopen: isoc endpt=%d, isize=%d\n", 
@@ -1042,7 +1042,7 @@ ugen_get_cdesc(struct ugen_softc *sc, int index, int *lenp)
 		len = UGETW(tdesc->wTotalLength);
 		if (lenp)
 			*lenp = len;
-		cdesc = malloc(len, M_TEMP, 0);
+		cdesc = malloc(len, M_TEMP, M_WAITOK);
 		memcpy(cdesc, tdesc, len);
 		DPRINTFN(5,("ugen_get_cdesc: current, len=%d\n", len));
 	} else {
@@ -1053,7 +1053,7 @@ ugen_get_cdesc(struct ugen_softc *sc, int index, int *lenp)
 		DPRINTFN(5,("ugen_get_cdesc: index=%d, len=%d\n", index, len));
 		if (lenp)
 			*lenp = len;
-		cdesc = malloc(len, M_TEMP, 0);
+		cdesc = malloc(len, M_TEMP, M_WAITOK);
 		err = usbd_get_config_desc_full(sc->sc_udev, index, cdesc, len);
 		if (err) {
 			free(cdesc, M_TEMP);
@@ -1307,7 +1307,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
 				ur->ucr_request.bmRequestType & UT_READ ? 
 				UIO_READ : UIO_WRITE;
 			uio.uio_procp = p;
-			ptr = malloc(len, M_TEMP, 0);
+			ptr = malloc(len, M_TEMP, M_WAITOK);
 			if (uio.uio_rw == UIO_WRITE) {
 				error = uiomove(ptr, len, &uio);
 				if (error)
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 228b352f2ef0..68a80700e7ed 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -2529,7 +2529,7 @@ uhci_setup_isoc(usbd_pipe_handle pipe)
 
 	iso = &upipe->u.iso;
 	iso->stds = malloc(UHCI_VFRAMELIST_COUNT * sizeof (uhci_soft_td_t *),
-			   M_USBHC, 0);
+			   M_USBHC, M_WAITOK);
 
 	token = rd ? UHCI_TD_IN (0, endpt, addr, 0) :
 		     UHCI_TD_OUT(0, endpt, addr, 0);
@@ -2775,7 +2775,7 @@ uhci_device_setintr(uhci_softc_t *sc, struct uhci_pipe *upipe, int ival)
 
 	upipe->u.intr.npoll = npoll;
 	upipe->u.intr.qhs =
-		malloc(npoll * sizeof(uhci_soft_qh_t *), M_USBHC, 0);
+		malloc(npoll * sizeof(uhci_soft_qh_t *), M_USBHC, M_WAITOK);
 
 	/*
 	 * Figure out which offset in the schedule that has most
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index ad8862ea8cc2..2570aa19a8d4 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -418,8 +418,8 @@ uhidopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 		return (ENOMEM);
 	}
 
-	sc->sc_ibuf = malloc(sc->sc_isize, M_USBDEV, 0);
-	sc->sc_obuf = malloc(sc->sc_osize, M_USBDEV, 0);
+	sc->sc_ibuf = malloc(sc->sc_isize, M_USBDEV, M_WAITOK);
+	sc->sc_obuf = malloc(sc->sc_osize, M_USBDEV, M_WAITOK);
 
 	/* Set up interrupt pipe. */
 	err = usbd_open_pipe_intr(sc->sc_iface, sc->sc_ep_addr, 
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index f1a2e3c1694f..df04e4e8b2da 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -2128,7 +2128,7 @@ umass_cam_rescan(void *addr)
 	struct umass_softc *sc = (struct umass_softc *) addr;
 #endif
 	struct cam_path *path;
-	union ccb *ccb = malloc(sizeof(union ccb), M_USBDEV, 0);
+	union ccb *ccb = malloc(sizeof(union ccb), M_USBDEV, M_WAITOK);
 
 	memset(ccb, 0, sizeof(union ccb));
 
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index d6bbfc58224b..30e337d83696 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -247,7 +247,7 @@ USB_ATTACH(umodem)
 	int i;
 	struct ucom_softc *ucom;
 
-	devinfo = malloc(1024, M_USBDEV, 0);
+	devinfo = malloc(1024, M_USBDEV, M_WAITOK);
 	usbd_devinfo(dev, 0, devinfo);
 	ucom = &sc->sc_ucom;
 	ucom->sc_dev = self;
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index e576f9cbc243..cc017c807658 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -260,7 +260,7 @@ USB_ATTACH(uplcom)
 	usbd_status err;
 	int i;
 
-	devinfo = malloc(1024, M_USBDEV, 0);
+	devinfo = malloc(1024, M_USBDEV, M_WAITOK);
 	ucom = &sc->sc_ucom;
 
 	bzero(sc, sizeof (struct uplcom_softc));
@@ -685,7 +685,7 @@ uplcom_open(void *addr, int portno)
 
 	if (sc->sc_intr_number != -1 && sc->sc_intr_pipe == NULL) {
 		sc->sc_status = 0; /* clear status bit */
-		sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, 0);
+		sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, M_WAITOK);
 		err = usbd_open_pipe_intr(sc->sc_intr_iface,
 					  sc->sc_intr_number,
 					  USBD_SHORT_XFER_OK,
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index d0eb1fab5550..ba9ca84b96d2 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -552,7 +552,7 @@ urioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
 			req.bmRequestType & UT_READ ? 
 			UIO_READ : UIO_WRITE;
 		uio.uio_procp = p;
-		ptr = malloc(len, M_TEMP, 0);
+		ptr = malloc(len, M_TEMP, M_WAITOK);
 		if (uio.uio_rw == UIO_WRITE) {
 			error = uiomove(ptr, len, &uio);
 			if (error)
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 4e9483cb2400..21127d698383 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -596,7 +596,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 				ur->ucr_request.bmRequestType & UT_READ ?
 				UIO_READ : UIO_WRITE;
 			uio.uio_procp = p;
-			ptr = malloc(len, M_TEMP, 0);
+			ptr = malloc(len, M_TEMP, M_WAITOK);
 			if (uio.uio_rw == UIO_WRITE) {
 				error = uiomove(ptr, len, &uio);
 				if (error)
@@ -774,7 +774,7 @@ usb_add_event(int type, struct usb_event *uep)
 	struct timeval thetime;
 	int s;
 
-	ueq = malloc(sizeof *ueq, M_USBDEV, 0);
+	ueq = malloc(sizeof *ueq, M_USBDEV, M_WAITOK);
 	ueq->ue = *uep;
 	ueq->ue.ue_type = type;
 	microtime(&thetime);
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 4a793c6333e8..80f79abeb3f7 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -384,8 +384,8 @@ uscanneropen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 
 	sc->sc_state |= USCANNER_OPEN;
 
-	sc->sc_bulkin_buffer = malloc(USCANNER_BUFFERSIZE, M_USBDEV, 0);
-	sc->sc_bulkout_buffer = malloc(USCANNER_BUFFERSIZE, M_USBDEV, 0);
+	sc->sc_bulkin_buffer = malloc(USCANNER_BUFFERSIZE, M_USBDEV, M_WAITOK);
+	sc->sc_bulkout_buffer = malloc(USCANNER_BUFFERSIZE, M_USBDEV, M_WAITOK);
 	/* No need to check buffers for NULL since we have WAITOK */
 
 	sc->sc_bulkin_bufferlen = USCANNER_BUFFERSIZE;
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index 1ea97d9a9953..0cffd8684d5d 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -233,7 +233,7 @@ USB_ATTACH(uvisor)
 	usbd_status err;
 	struct ucom_softc *ucom;
 
-	devinfo = malloc(1024, M_USBDEV, 0);
+	devinfo = malloc(1024, M_USBDEV, M_WAITOK);
 	ucom = &sc->sc_ucom;
 
 	bzero(sc, sizeof (struct uvisor_softc));
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index bc9a856e829e..aac4743d47bc 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -265,7 +265,7 @@ USB_ATTACH(uvscom)
 	usbd_status err;
 	int i;
 
-	devinfo = malloc(1024, M_USBDEV, 0);
+	devinfo = malloc(1024, M_USBDEV, M_WAITOK);
 	ucom = &sc->sc_ucom;
 
 	bzero(sc, sizeof (struct uvscom_softc));
@@ -728,7 +728,7 @@ uvscom_open(void *addr, int portno)
 			return (ENXIO);
 		}
 
-		sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, 0);
+		sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, M_WAITOK);
 		err = usbd_open_pipe_intr(sc->sc_ucom.sc_iface,
 					  sc->sc_intr_number,
 					  USBD_SHORT_XFER_OK,
diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h
index a8af0cddf460..3c6bbad1e16c 100644
--- a/sys/dev/vinum/vinumext.h
+++ b/sys/dev/vinum/vinumext.h
@@ -245,7 +245,7 @@ void FFree(void *mem, char *, int);
 #define LOCKDRIVE(d) lockdrive (d, __FILE__, __LINE__)
 #else
 #define Malloc(x)  malloc((x), M_DEVBUF, \
-	curthread->td_proc->p_intr_nesting_level == 0? 0: M_NOWAIT)
+	curthread->td_proc->p_intr_nesting_level == 0? M_WAITOK: M_NOWAIT)
 #define Free(x)    free((x), M_DEVBUF)
 #define LOCKDRIVE(d) lockdrive (d)
 #endif
diff --git a/sys/dev/vinum/vinummemory.c b/sys/dev/vinum/vinummemory.c
index cedcbfb51459..6936e481e0f1 100644
--- a/sys/dev/vinum/vinummemory.c
+++ b/sys/dev/vinum/vinummemory.c
@@ -152,7 +152,7 @@ MMalloc(int size, char *file, int line)
     /* Wait for malloc if we can */
     result = malloc(size,
 	M_DEVBUF,
-	curthread->td_intr_nesting_level == 0 ? 0 : M_NOWAIT);
+	curthread->td_intr_nesting_level == 0 ? M_WAITOK : M_NOWAIT);
     if (result == NULL)
 	log(LOG_ERR, "vinum: can't allocate %d bytes from %s:%d\n", size, file, line);
     else {
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index b6d472d622da..95e4670835a1 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -1041,11 +1041,11 @@ vr_newbuf(sc, c, m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1423,13 +1423,13 @@ vr_encap(sc, c, m_head)
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("vr%d: no memory for tx list\n", sc->vr_unit);
 			return(1);
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_NOWAIT);
+			MCLGET(m_new, M_DONTWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				printf("vr%d: no memory for tx list\n",
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index d86fab8f8c82..143a821e57dd 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -761,7 +761,7 @@ vxget(sc, totlen)
     m = sc->mb[sc->next_mb];
     sc->mb[sc->next_mb] = 0;
     if (m == 0) {
-        MGETHDR(m, M_NOWAIT, MT_DATA);
+        MGETHDR(m, M_DONTWAIT, MT_DATA);
         if (m == 0)
             return 0;
     } else {
@@ -800,7 +800,7 @@ vxget(sc, totlen)
             m = sc->mb[sc->next_mb];
             sc->mb[sc->next_mb] = 0;
             if (m == 0) {
-                MGET(m, M_NOWAIT, MT_DATA);
+                MGET(m, M_DONTWAIT, MT_DATA);
                 if (m == 0) {
                     splx(sh);
                     m_freem(top);
@@ -812,7 +812,7 @@ vxget(sc, totlen)
             len = MLEN;
         }
         if (totlen >= MINCLSIZE) {
-	    MCLGET(m, M_NOWAIT);
+	    MCLGET(m, M_DONTWAIT);
 	    if (m->m_flags & M_EXT)
 		len = MCLBYTES;
         }
@@ -993,7 +993,7 @@ vxmbuffill(sp)
     i = sc->last_mb;
     do {
 	if (sc->mb[i] == NULL)
-	    MGET(sc->mb[i], M_NOWAIT, MT_DATA);
+	    MGET(sc->mb[i], M_DONTWAIT, MT_DATA);
 	if (sc->mb[i] == NULL)
 	    break;
 	i = (i + 1) % MAX_MBS;
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 1b4ce1af9c55..a5c6ff65eec5 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -916,9 +916,9 @@ wi_start(struct ifnet *ifp)
 		if (sc->sc_drvbpf) {
 			struct mbuf *mb;
 
-			MGETHDR(mb, M_NOWAIT, m0->m_type);
+			MGETHDR(mb, M_DONTWAIT, m0->m_type);
 			if (mb != NULL) {
-				(void) m_dup_pkthdr(mb, m0, M_NOWAIT);
+				(void) m_dup_pkthdr(mb, m0, M_DONTWAIT);
 				mb->m_next = m0;
 				mb->m_data = (caddr_t)&frmhdr;
 				mb->m_len = sizeof(frmhdr);
@@ -1345,7 +1345,7 @@ wi_rx_intr(struct wi_softc *sc)
 	len = le16toh(frmhdr.wi_dat_len);
 	off = ALIGN(sizeof(struct ieee80211_frame));
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX);
 		ifp->if_ierrors++;
@@ -1353,7 +1353,7 @@ wi_rx_intr(struct wi_softc *sc)
 		return;
 	}
 	if (off + len > MHLEN) {
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX);
 			m_freem(m);
@@ -1376,9 +1376,9 @@ wi_rx_intr(struct wi_softc *sc)
 	if (sc->sc_drvbpf) {
 		struct mbuf *mb;
 
-		MGETHDR(mb, M_NOWAIT, m->m_type);
+		MGETHDR(mb, M_DONTWAIT, m->m_type);
 		if (mb != NULL) {
-			(void) m_dup_pkthdr(mb, m, M_NOWAIT);
+			(void) m_dup_pkthdr(mb, m, M_DONTWAIT);
 			mb->m_next = m;
 			mb->m_data = (caddr_t)&frmhdr;
 			mb->m_len = sizeof(frmhdr);
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 4b44fa37b830..dfaca89135c9 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -966,7 +966,7 @@ wlread(int unit, u_short fd_p)
     /*
      * Allocate a cluster'd mbuf to receive the packet.
      */
-    m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
+    m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
     if (m == NULL) {
 	if (wlhwrst(unit) != TRUE) {
 	    sc->hacr &= ~HACR_INTRON;
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index 6ed52828cf40..aa5722896874 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -643,7 +643,7 @@ xe_intr(void *xscp)
 	if (len & 0x01)
 	  len++;
 
-	MGETHDR(mbp, M_NOWAIT, MT_DATA);	/* Allocate a header mbuf */
+	MGETHDR(mbp, M_DONTWAIT, MT_DATA);	/* Allocate a header mbuf */
 	if (mbp != NULL) {
 	  mbp->m_pkthdr.rcvif = ifp;
 	  mbp->m_pkthdr.len = mbp->m_len = len;
@@ -654,7 +654,7 @@ xe_intr(void *xscp)
 	   * alignment hack below.
 	   */
 	  if (len + 2 > MHLEN) {
-	    MCLGET(mbp, M_NOWAIT);
+	    MCLGET(mbp, M_DONTWAIT);
 	    if ((mbp->m_flags & M_EXT) == 0) {
 	      m_freem(mbp);
 	      mbp = NULL;
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index f9161176bc53..a44df4caa371 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -411,7 +411,7 @@ iso_mountfs(devvp, mp, td, argp)
 		 pri_sierra->root_directory_record:
 		 pri->root_directory_record);
 
-	isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_ZERO);
+	isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_WAITOK | M_ZERO);
 	isomp->logical_block_size = logical_block_size;
 	isomp->volume_space_size =
 		isonum_733 (high_sierra?
@@ -712,7 +712,7 @@ cd9660_vget_internal(mp, ino, flags, vpp, relocated, isodir)
 		return (error);
 	}
 	MALLOC(ip, struct iso_node *, sizeof(struct iso_node), M_ISOFSNODE,
-	    M_ZERO);
+	    M_WAITOK | M_ZERO);
 	vp->v_data = ip;
 	ip->i_vnode = vp;
 	ip->i_dev = dev;
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 062c22aa27c1..0b892e6e8012 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -194,7 +194,7 @@ cd9660_getattr(ap)
 		struct uio auio;
 		char *cp;
 
-		MALLOC(cp, char *, MAXPATHLEN, M_TEMP, 0);
+		MALLOC(cp, char *, MAXPATHLEN, M_TEMP, M_WAITOK);
 		aiov.iov_base = cp;
 		aiov.iov_len = MAXPATHLEN;
 		auio.uio_iov = &aiov;
@@ -451,7 +451,7 @@ cd9660_readdir(ap)
 	imp = dp->i_mnt;
 	bmask = imp->im_bmask;
 
-	MALLOC(idp, struct isoreaddir *, sizeof(*idp), M_TEMP, 0);
+	MALLOC(idp, struct isoreaddir *, sizeof(*idp), M_TEMP, M_WAITOK);
 	idp->saveent.d_namlen = idp->assocent.d_namlen = 0;
 	/*
 	 * XXX
@@ -468,7 +468,7 @@ cd9660_readdir(ap)
 		 */
 		ncookies = uio->uio_resid / 16;
 		MALLOC(cookies, u_long *, ncookies * sizeof(u_int), M_TEMP,
-		    0);
+		    M_WAITOK);
 		idp->cookies = cookies;
 		idp->ncookies = ncookies;
 	}
@@ -671,7 +671,7 @@ cd9660_readlink(ap)
 	if (uio->uio_segflg == UIO_SYSSPACE)
 		symname = uio->uio_iov->iov_base;
 	else
-		symname = uma_zalloc(namei_zone, 0);
+		symname = uma_zalloc(namei_zone, M_WAITOK);
 	
 	/*
 	 * Ok, we just gathering a symbolic name in SL record.
diff --git a/sys/fs/coda/cnode.h b/sys/fs/coda/cnode.h
index 8d0cebe3d131..962d329580e4 100644
--- a/sys/fs/coda/cnode.h
+++ b/sys/fs/coda/cnode.h
@@ -66,7 +66,7 @@ MALLOC_DECLARE(M_CODA);
 
 #define CODA_ALLOC(ptr, cast, size)                                        \
 do {                                                                      \
-    ptr = (cast)malloc((unsigned long) size, M_CODA, 0);                   \
+    ptr = (cast)malloc((unsigned long) size, M_CODA, M_WAITOK);            \
     if (ptr == 0) {                                                       \
 	panic("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__);  \
     }                                                                     \
diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c
index 75ef5737cabe..95f2e2ee14af 100644
--- a/sys/fs/devfs/devfs_devs.c
+++ b/sys/fs/devfs/devfs_devs.c
@@ -152,11 +152,11 @@ devfs_attemptoverflow(int insist)
 	or = NULL;
 	n = devfs_noverflowwant;
 	nb = sizeof (dev_t *) * n;
-	MALLOC(ot, dev_t **, nb, M_DEVFS, (insist ? 0 : M_NOWAIT) | M_ZERO);
+	MALLOC(ot, dev_t **, nb, M_DEVFS, (insist ? M_WAITOK : M_NOWAIT) | M_ZERO);
 	if (ot == NULL)
 		goto bail;
 	nb = sizeof (int) * n;
-	MALLOC(or, int *, nb, M_DEVFS, (insist ? 0 : M_NOWAIT) | M_ZERO);
+	MALLOC(or, int *, nb, M_DEVFS, (insist ? M_WAITOK : M_NOWAIT) | M_ZERO);
 	if (or == NULL)
 		goto bail;
 	if (!atomic_cmpset_ptr(&devfs_overflow, NULL, ot))
@@ -199,7 +199,7 @@ devfs_newdirent(char *name, int namelen)
 
 	d.d_namlen = namelen;
 	i = sizeof (*de) + GENERIC_DIRSIZ(&d);
-	MALLOC(de, struct devfs_dirent *, i, M_DEVFS, M_ZERO);
+	MALLOC(de, struct devfs_dirent *, i, M_DEVFS, M_WAITOK | M_ZERO);
 	de->de_dirent = (struct dirent *)(de + 1);
 	de->de_dirent->d_namlen = namelen;
 	de->de_dirent->d_reclen = GENERIC_DIRSIZ(&d);
@@ -294,7 +294,7 @@ devfs_populate(struct devfs_mount *dm)
 	if (devfs_noverflow && dm->dm_overflow == NULL) {
 		i = devfs_noverflow * sizeof (struct devfs_dirent *);
 		MALLOC(dm->dm_overflow, struct devfs_dirent **, i,
-			M_DEVFS, M_ZERO);
+			M_DEVFS, M_WAITOK | M_ZERO);
 	}
 	while (dm->dm_generation != devfs_generation) {
 		dm->dm_generation = devfs_generation;
@@ -352,7 +352,7 @@ devfs_populate(struct devfs_mount *dm)
 				de->de_dirent->d_type = DT_LNK;
 				pdev = dev->si_parent;
 				j = strlen(pdev->si_name) + 1;
-				MALLOC(de->de_symlink, char *, j, M_DEVFS, 0);
+				MALLOC(de->de_symlink, char *, j, M_DEVFS, M_WAITOK);
 				bcopy(pdev->si_name, de->de_symlink, j);
 			} else {
 				de->de_inode = i;
diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c
index 1da70197db3a..e6802024617f 100644
--- a/sys/fs/devfs/devfs_rule.c
+++ b/sys/fs/devfs/devfs_rule.c
@@ -222,7 +222,7 @@ devfs_rules_ioctl(struct mount *mp, u_long cmd, caddr_t data, struct thread *td)
 			error = ESRCH;
 			goto out;
 		}
-		dk = malloc(sizeof(*dk), M_TEMP, M_ZERO);
+		dk = malloc(sizeof(*dk), M_TEMP, M_WAITOK | M_ZERO);
 		memcpy(&dk->dk_rule, dr, sizeof(*dr));
 		lockmgr(&dm->dm_lock, LK_UPGRADE, 0, td);
 		devfs_rule_applydm(dk, dm);
@@ -556,7 +556,7 @@ devfs_rule_insert(struct devfs_rule *dr)
 			return (error);
 	}
 
-	dk = malloc(sizeof(*dk), M_DEVFS, 0);
+	dk = malloc(sizeof(*dk), M_DEVFS, M_WAITOK);
 	dk->dk_ruleset = ds;
 	if (dsi != NULL)
 		++dsi->ds_refcount;
@@ -749,7 +749,7 @@ devfs_ruleset_create(devfs_rsnum rsnum)
 	KASSERT(devfs_ruleset_bynum(rsnum) == NULL,
 	    ("creating already existent ruleset %d", rsnum));
 
-	ds = malloc(sizeof(*ds), M_DEVFS, M_ZERO);
+	ds = malloc(sizeof(*ds), M_DEVFS, M_WAITOK | M_ZERO);
 	ds->ds_number = rsnum;
 	ds->ds_refcount = ds->ds_flags = 0;
 	SLIST_INIT(&ds->ds_rules);
diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c
index 26b0deb7cac6..64d4cdeaa9cb 100644
--- a/sys/fs/devfs/devfs_vfsops.c
+++ b/sys/fs/devfs/devfs_vfsops.c
@@ -77,10 +77,10 @@ devfs_nmount(mp, ndp, td)
 		return (EOPNOTSUPP);
 
 	MALLOC(fmp, struct devfs_mount *, sizeof(struct devfs_mount),
-	    M_DEVFS, M_ZERO);
+	    M_DEVFS, M_WAITOK | M_ZERO);
 	MALLOC(fmp->dm_dirent, struct devfs_dirent **,
 	    sizeof(struct devfs_dirent *) * NDEVFSINO,
-	    M_DEVFS, M_ZERO);
+	    M_DEVFS, M_WAITOK | M_ZERO);
 	lockinit(&fmp->dm_lock, PVFS, "devfs", 0, LK_NOPAUSE);
 
 	mp->mnt_flag |= MNT_LOCAL;
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index db6e475c7228..6b6683a5fe5c 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -607,7 +607,7 @@ devfs_readdir(ap)
 	}
 	if( !error && ap->a_ncookies != NULL && ap->a_cookies != NULL ) {
 		MALLOC(cookiebuf, u_long *, ncookies * sizeof(u_long),
-                       M_TEMP, 0);
+                       M_TEMP, M_WAITOK);
 		cookiep = cookiebuf;
 		dps = (struct dirent *)((char *)uio->uio_iov->iov_base -
 		    (uio->uio_offset - oldoff));
@@ -858,7 +858,7 @@ devfs_symlink(ap)
 	de->de_inode = dmp->dm_inode++;
 	de->de_dirent->d_type = DT_LNK;
 	i = strlen(ap->a_target) + 1;
-	MALLOC(de->de_symlink, char *, i, M_DEVFS, 0);
+	MALLOC(de->de_symlink, char *, i, M_DEVFS, M_WAITOK);
 	bcopy(ap->a_target, de->de_symlink, i);
 	lockmgr(&dmp->dm_lock, LK_EXCLUSIVE, 0, curthread);
 #ifdef MAC
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index 18bff45d8c5a..a4741bc3760c 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -89,7 +89,7 @@ fdesc_mount(mp, ndp, td)
 		return (error);
 
 	MALLOC(fmp, struct fdescmount *, sizeof(struct fdescmount),
-				M_FDESCMNT, 0);	/* XXX */
+				M_FDESCMNT, M_WAITOK);	/* XXX */
 	rvp->v_type = VDIR;
 	rvp->v_vflag |= VV_ROOT;
 	fmp->f_root = rvp;
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 467066ba8067..2225220cfe1d 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -132,7 +132,7 @@ loop:
 	 * might cause a bogus v_data pointer to get dereferenced
 	 * elsewhere if MALLOC should block.
 	 */
-	MALLOC(fd, struct fdescnode *, sizeof(struct fdescnode), M_TEMP, 0);
+	MALLOC(fd, struct fdescnode *, sizeof(struct fdescnode), M_TEMP, M_WAITOK);
 
 	error = getnewvnode("fdesc", mp, fdesc_vnodeop_p, vpp);
 	if (error) {
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index bb58afb637e0..64fee388c93c 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -174,7 +174,7 @@ fifo_open(ap)
 	int error;
 
 	if ((fip = vp->v_fifoinfo) == NULL) {
-		MALLOC(fip, struct fifoinfo *, sizeof(*fip), M_VNODE, 0);
+		MALLOC(fip, struct fifoinfo *, sizeof(*fip), M_VNODE, M_WAITOK);
 		vp->v_fifoinfo = fip;
 		error = socreate(AF_LOCAL, &rso, SOCK_STREAM, 0,
 		    ap->a_td->td_ucred, ap->a_td);
diff --git a/sys/fs/hpfs/hpfs_subr.c b/sys/fs/hpfs/hpfs_subr.c
index 6d020cde1269..b45ebbd0a869 100644
--- a/sys/fs/hpfs/hpfs_subr.c
+++ b/sys/fs/hpfs/hpfs_subr.c
@@ -110,10 +110,10 @@ hpfs_bminit(
 	dprintf(("0x%lx data bands, ", hpmp->hpm_dbnum));
 
 	MALLOC(hpmp->hpm_bmind, lsn_t *, hpmp->hpm_dbnum * sizeof(lsn_t),
-		M_HPFSMNT, 0);
+		M_HPFSMNT, M_WAITOK);
 
 	MALLOC(hpmp->hpm_bitmap, u_int8_t *, hpmp->hpm_dbnum * BMSIZE,
-		M_HPFSMNT, 0);
+		M_HPFSMNT, M_WAITOK);
 
 	error = bread(hpmp->hpm_devvp, hpmp->hpm_su.su_bitmap.lsn1,
 		((hpmp->hpm_dbnum + 0x7F) & ~(0x7F)) << 2, NOCRED, &bp);
@@ -273,7 +273,7 @@ hpfs_cpinit (
 	cpicnt = hpmp->hpm_sp.sp_cpinum;
 
 	MALLOC(hpmp->hpm_cpdblk, struct cpdblk *,	
-		cpicnt * sizeof(struct cpdblk), M_HPFSMNT, 0);
+		cpicnt * sizeof(struct cpdblk), M_HPFSMNT, M_WAITOK);
 
 	cpdbp = hpmp->hpm_cpdblk;
 	lsn = hpmp->hpm_sp.sp_cpi;
diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c
index 7244936607a7..1242e8419ce2 100644
--- a/sys/fs/hpfs/hpfs_vfsops.c
+++ b/sys/fs/hpfs/hpfs_vfsops.c
@@ -252,7 +252,7 @@ hpfs_mountfs(devvp, mp, argsp, td)
 	/*
 	 * Do actual mount
 	 */
-	hpmp = malloc(sizeof(struct hpfsmount), M_HPFSMNT, M_ZERO);
+	hpmp = malloc(sizeof(struct hpfsmount), M_HPFSMNT, M_WAITOK | M_ZERO);
 
 	/* Read in SuperBlock */
 	error = bread(devvp, SUBLOCK, SUSIZE, NOCRED, &bp);
@@ -494,7 +494,7 @@ hpfs_vget(
 	 * check for it).
 	 */
 	MALLOC(hp, struct hpfsnode *, sizeof(struct hpfsnode), 
-		M_HPFSNO, 0);
+		M_HPFSNO, M_WAITOK);
 
 	error = getnewvnode("hpfs", hpmp->hpm_mp, hpfs_vnodeop_p, &vp);
 	if (error) {
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index 6578095aee76..fe9d36a47743 100644
--- a/sys/fs/hpfs/hpfs_vnops.c
+++ b/sys/fs/hpfs/hpfs_vnops.c
@@ -1005,7 +1005,7 @@ readdone:
 		     ((caddr_t)uio->uio_iov->iov_base -
 			 (uio->uio_offset - off));
 		MALLOC(cookies, u_long *, ncookies * sizeof(u_long),
-		       M_TEMP, 0);
+		       M_TEMP, M_WAITOK);
 		for (dp = dpStart, cookiep = cookies, i=0;
 		     i < ncookies;
 		     dp = (struct dirent *)((caddr_t) dp + dp->d_reclen), i++) {
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index a0da2c7bf878..735e7dfebd57 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -246,7 +246,7 @@ deget(pmp, dirclust, diroffset, depp)
 	 * might cause a bogus v_data pointer to get dereferenced
 	 * elsewhere if MALLOC should block.
 	 */
-	MALLOC(ldep, struct denode *, sizeof(struct denode), M_MSDOSFSNODE, 0);
+	MALLOC(ldep, struct denode *, sizeof(struct denode), M_MSDOSFSNODE, M_WAITOK);
 
 	/*
 	 * Directory entry was not in cache, have to create a vnode and
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 82b80434430b..b6ea5143c710 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -349,7 +349,7 @@ mountmsdosfs(devvp, mp, td, argp)
 	}
 #endif
 
-	pmp = malloc(sizeof *pmp, M_MSDOSFSMNT, M_ZERO);
+	pmp = malloc(sizeof *pmp, M_MSDOSFSMNT, M_WAITOK | M_ZERO);
 	pmp->pm_mountp = mp;
 
 	/*
@@ -560,7 +560,7 @@ mountmsdosfs(devvp, mp, td, argp)
 	pmp->pm_inusemap = malloc(((pmp->pm_maxcluster + N_INUSEBITS - 1)
 				   / N_INUSEBITS)
 				  * sizeof(*pmp->pm_inusemap),
-				  M_MSDOSFSFAT, 0);
+				  M_MSDOSFSFAT, M_WAITOK);
 
 	/*
 	 * fillinusemap() needs pm_devvp.
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index d3687758ee5c..c92c83adeea1 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1501,7 +1501,7 @@ msdosfs_readdir(ap)
 	if (ap->a_ncookies) {
 		ncookies = uio->uio_resid / 16;
 		MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP,
-		       0);
+		       M_WAITOK);
 		*ap->a_cookies = cookies;
 		*ap->a_ncookies = ncookies;
 	}
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c
index 919fcff42a4b..20b98a540123 100644
--- a/sys/fs/ntfs/ntfs_subr.c
+++ b/sys/fs/ntfs/ntfs_subr.c
@@ -187,7 +187,7 @@ ntfs_ntvattrget(
 	}
 	/* Scan $ATTRIBUTE_LIST for requested attribute */
 	len = lvap->va_datalen;
-	MALLOC(alpool, caddr_t, len, M_TEMP, 0);
+	MALLOC(alpool, caddr_t, len, M_TEMP, M_WAITOK);
 	error = ntfs_readntvattr_plain(ntmp, ip, lvap, 0, len, alpool, &len,
 			NULL);
 	if (error)
@@ -266,7 +266,7 @@ ntfs_loadntnode(
 	dprintf(("ntfs_loadntnode: loading ino: %d\n",ip->i_number));
 
 	MALLOC(mfrp, struct filerec *, ntfs_bntob(ntmp->ntm_bpmftrec),
-	       M_TEMP, 0);
+	       M_TEMP, M_WAITOK);
 
 	if (ip->i_number < NTFS_SYSNODESNUM) {
 		struct buf     *bp;
@@ -390,7 +390,7 @@ ntfs_ntlookup(
 	    NULL));
 
 	MALLOC(ip, struct ntnode *, sizeof(struct ntnode), M_NTFSNTNODE,
-		M_ZERO);
+		M_WAITOK | M_ZERO);
 	ddprintf(("ntfs_ntlookup: allocating ntnode: %d: %p\n", ino, ip));
 
 	/* Generic initialization */
@@ -539,7 +539,7 @@ ntfs_attrtontvattr(
 	*rvapp = NULL;
 
 	MALLOC(vap, struct ntvattr *, sizeof(struct ntvattr),
-		M_NTFSNTVATTR, M_ZERO);
+		M_NTFSNTVATTR, M_WAITOK | M_ZERO);
 	vap->va_ip = NULL;
 	vap->va_flag = rap->a_hdr.a_flag;
 	vap->va_type = rap->a_hdr.a_type;
@@ -576,7 +576,7 @@ ntfs_attrtontvattr(
 		vap->va_vcnstart = 0;
 		vap->va_vcnend = ntfs_btocn(vap->va_allocated);
 		MALLOC(vap->va_datap, caddr_t, vap->va_datalen,
-		       M_NTFSRDATA, 0);
+		       M_NTFSRDATA, M_WAITOK);
 		memcpy(vap->va_datap, (caddr_t) rap + rap->a_r.a_dataoff,
 		       rap->a_r.a_datalen);
 	}
@@ -617,8 +617,8 @@ ntfs_runtovrun(
 		off += (run[off] & 0xF) + ((run[off] >> 4) & 0xF) + 1;
 		cnt++;
 	}
-	MALLOC(cn, cn_t *, cnt * sizeof(cn_t), M_NTFSRUN, 0);
-	MALLOC(cl, cn_t *, cnt * sizeof(cn_t), M_NTFSRUN, 0);
+	MALLOC(cn, cn_t *, cnt * sizeof(cn_t), M_NTFSRUN, M_WAITOK);
+	MALLOC(cl, cn_t *, cnt * sizeof(cn_t), M_NTFSRUN, M_WAITOK);
 
 	off = 0;
 	cnt = 0;
@@ -738,13 +738,13 @@ ntfs_fget(
 		return (0);
 
 	MALLOC(fp, struct fnode *, sizeof(struct fnode), M_NTFSFNODE,
-		M_ZERO);
+		M_WAITOK | M_ZERO);
 	dprintf(("ntfs_fget: allocating fnode: %p\n",fp));
 
 	fp->f_ip = ip;
 	if (attrname) {
 		fp->f_flag |= FN_AATTRNAME;
-		MALLOC(fp->f_attrname, char *, strlen(attrname)+1, M_TEMP, 0);
+		MALLOC(fp->f_attrname, char *, strlen(attrname)+1, M_TEMP, M_WAITOK);
 		strcpy(fp->f_attrname, attrname);
 	} else
 		fp->f_attrname = NULL;
@@ -829,7 +829,7 @@ ntfs_ntlookupattr(
 
     out:
 	if (namelen) {
-		MALLOC((*attrname), char *, namelen, M_TEMP, 0);
+		MALLOC((*attrname), char *, namelen, M_TEMP, M_WAITOK);
 		memcpy((*attrname), name, namelen);
 		(*attrname)[namelen] = '\0';
 	}
@@ -894,7 +894,7 @@ ntfs_ntlookupfile(
 
 	dprintf(("ntfs_ntlookupfile: blksz: %d, rdsz: %d\n", blsize, rdsize));
 
-	MALLOC(rdbuf, caddr_t, blsize, M_TEMP, 0);
+	MALLOC(rdbuf, caddr_t, blsize, M_TEMP, M_WAITOK);
 
 	error = ntfs_readattr(ntmp, ip, NTFS_A_INDXROOT, "$I30",
 			       0, rdsize, rdbuf, NULL);
@@ -1112,7 +1112,7 @@ ntfs_ntreaddir(
 	if (fp->f_dirblbuf == NULL) {
 		fp->f_dirblsz = vap->va_a_iroot->ir_size;
 		MALLOC(fp->f_dirblbuf, caddr_t,
-		       max(vap->va_datalen,fp->f_dirblsz), M_NTFSDIR, 0);
+		       max(vap->va_datalen,fp->f_dirblsz), M_NTFSDIR, M_WAITOK);
 	}
 
 	blsize = fp->f_dirblsz;
@@ -1127,7 +1127,7 @@ ntfs_ntreaddir(
 			error = ENOTDIR;
 			goto fail;
 		}
-		MALLOC(bmp, u_char *, bmvap->va_datalen, M_TEMP, 0);
+		MALLOC(bmp, u_char *, bmvap->va_datalen, M_TEMP, M_WAITOK);
 		error = ntfs_readattr(ntmp, ip, NTFS_A_INDXBITMAP, "$I30", 0,
 				       bmvap->va_datalen, bmp, NULL);
 		if (error)
@@ -1708,9 +1708,9 @@ ntfs_readattr(
 			 vap->va_compressalg));
 
 		MALLOC(cup, u_int8_t *, ntfs_cntob(NTFS_COMPUNIT_CL),
-		       M_NTFSDECOMP, 0);
+		       M_NTFSDECOMP, M_WAITOK);
 		MALLOC(uup, u_int8_t *, ntfs_cntob(NTFS_COMPUNIT_CL),
-		       M_NTFSDECOMP, 0);
+		       M_NTFSDECOMP, M_WAITOK);
 
 		cn = (ntfs_btocn(roff)) & (~(NTFS_COMPUNIT_CL - 1));
 		off = roff - ntfs_cntob(cn);
@@ -1943,7 +1943,7 @@ ntfs_toupper_use(mp, ntmp)
 	 * so don't bother reading more
 	 */
 	MALLOC(ntfs_toupper_tab, wchar *, 65536 * sizeof(wchar),
-		M_NTFSRDATA, 0);
+		M_NTFSRDATA, M_WAITOK);
 
 	if ((error = VFS_VGET(mp, NTFS_UPCASEINO, LK_EXCLUSIVE, &vp)))
 		goto out;
@@ -1991,14 +1991,14 @@ ntfs_u28_init(
 	char ** u28;
 	int i, j, h, l;
 
-	MALLOC(u28, char **, 256 * sizeof(char*), M_TEMP, M_ZERO);
+	MALLOC(u28, char **, 256 * sizeof(char*), M_TEMP, M_WAITOK | M_ZERO);
 
 	for (i=0; i<256; i++) {
 		h = (u2w[i] >> 8) & 0xFF;
 		l = (u2w[i]) &0xFF;
 
 		if (u28[h] == NULL) {
-			MALLOC(u28[h], char *, 256 * sizeof(char), M_TEMP, 0);
+			MALLOC(u28[h], char *, 256 * sizeof(char), M_TEMP, M_WAITOK);
 			for (j=0; j<256; j++)
 				u28[h][j] = '_';
 		}
@@ -2039,7 +2039,7 @@ ntfs_82u_init(
 	wchar * _82u;
 	int i;
 
-	MALLOC(_82u, wchar *, 256 * sizeof(wchar), M_TEMP, 0);
+	MALLOC(_82u, wchar *, 256 * sizeof(wchar), M_TEMP, M_WAITOK);
 
 	if (u2w == NULL) {
 		for (i=0; i<256; i++)
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index 7221e0b6b4bc..1e267a990ec9 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -309,7 +309,7 @@ ntfs_mountfs(devvp, mp, argsp, td)
 	error = bread(devvp, BBLOCK, BBSIZE, NOCRED, &bp);
 	if (error)
 		goto out;
-	ntmp = malloc( sizeof *ntmp, M_NTFSMNT, M_ZERO);
+	ntmp = malloc( sizeof *ntmp, M_NTFSMNT, M_WAITOK | M_ZERO);
 	bcopy( bp->b_data, &ntmp->ntm_bootfile, sizeof(struct bootfile) );
 	brelse( bp );
 	bp = NULL;
@@ -415,7 +415,7 @@ ntfs_mountfs(devvp, mp, argsp, td)
 		/* Alloc memory for attribute definitions */
 		MALLOC(ntmp->ntm_ad, struct ntvattrdef *,
 			num * sizeof(struct ntvattrdef),
-			M_NTFSMNT, 0);
+			M_NTFSMNT, M_WAITOK);
 
 		ntmp->ntm_adnum = num;
 
@@ -562,7 +562,7 @@ ntfs_calccfree(
 
 	bmsize = VTOF(vp)->f_size;
 
-	MALLOC(tmp, u_int8_t *, bmsize, M_TEMP, 0);
+	MALLOC(tmp, u_int8_t *, bmsize, M_TEMP, M_WAITOK);
 
 	error = ntfs_readattr(ntmp, VTONT(vp), NTFS_A_DATA, NULL,
 			       0, bmsize, tmp, NULL);
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index b39f0cb5a751..90ca4f1a8fa4 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -590,7 +590,7 @@ ntfs_readdir(ap)
 		     ((caddr_t)uio->uio_iov->iov_base -
 			 (uio->uio_offset - off));
 		MALLOC(cookies, u_long *, ncookies * sizeof(u_long),
-		       M_TEMP, 0);
+		       M_TEMP, M_WAITOK);
 		for (dp = dpStart, cookiep = cookies, i=0;
 		     i < ncookies;
 		     dp = (struct dirent *)((caddr_t) dp + dp->d_reclen), i++) {
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index 0285add67787..f2a43e026264 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -212,7 +212,7 @@ null_nodeget(mp, lowervp, vpp)
 	 * elsewhere if MALLOC should block.
 	 */
 	MALLOC(xp, struct null_node *, sizeof(struct null_node),
-	    M_NULLFSNODE, 0);
+	    M_NULLFSNODE, M_WAITOK);
 
 	error = getnewvnode("null", mp, null_vnodeop_p, &vp);
 	if (error) {
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 20b187767d35..d6ca21115f6d 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -158,7 +158,7 @@ nullfs_mount(mp, ndp, td)
 	}
 
 	xmp = (struct null_mount *) malloc(sizeof(struct null_mount),
-				M_NULLFSMNT, 0);	/* XXX */
+				M_NULLFSMNT, M_WAITOK);	/* XXX */
 
 	/*
 	 * Save reference to underlying FS
diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c
index d8bdbc456cf3..b92dd4c977cc 100644
--- a/sys/fs/nwfs/nwfs_node.c
+++ b/sys/fs/nwfs/nwfs_node.c
@@ -169,7 +169,7 @@ rescan:
 	 * might cause a bogus v_data pointer to get dereferenced
 	 * elsewhere if MALLOC should block.
 	 */
-	MALLOC(np, struct nwnode *, sizeof *np, M_NWNODE, M_ZERO);
+	MALLOC(np, struct nwnode *, sizeof *np, M_NWNODE, M_WAITOK | M_ZERO);
 	error = getnewvnode("nwfs", mp, nwfs_vnodeop_p, &vp);
 	if (error) {
 		*vpp = NULL;
diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c
index c033b1152e1c..f097b3e0173f 100644
--- a/sys/fs/nwfs/nwfs_vfsops.c
+++ b/sys/fs/nwfs/nwfs_vfsops.c
@@ -125,7 +125,7 @@ nwfs_initnls(struct nwmount *nmp) {
 		nmp->m.nls.u2n = ncp_defnls.u2n;
 		return 0;
 	}
-	MALLOC(pe, char *, 256 * 4, M_NWFSDATA, 0);
+	MALLOC(pe, char *, 256 * 4, M_NWFSDATA, M_WAITOK);
 	pc = pe;
 	do {
 		COPY_TABLE(nmp->m.nls.to_lower, ncp_defnls.to_lower);
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 4c8c3f9472ec..66e516d4ff0b 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -113,10 +113,10 @@ portal_mount(mp, path, data, ndp, td)
 	}
 
 	MALLOC(pn, struct portalnode *, sizeof(struct portalnode),
-		M_TEMP, 0);
+		M_TEMP, M_WAITOK);
 
 	MALLOC(fmp, struct portalmount *, sizeof(struct portalmount),
-		M_PORTALFSMNT, 0);	/* XXX */
+		M_PORTALFSMNT, M_WAITOK);	/* XXX */
 
 	error = getnewvnode("portal", mp, portal_vnodeop_p, &rvp); /* XXX */
 	if (error) {
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index f272e141fb0b..0d8c06d3a0f1 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -132,7 +132,7 @@ portal_lookup(ap)
 	 * elsewhere if MALLOC should block.
 	 */
 	MALLOC(pt, struct portalnode *, sizeof(struct portalnode),
-		M_TEMP, 0);
+		M_TEMP, M_WAITOK);
 
 	error = getnewvnode("portal", dvp->v_mount, portal_vnodeop_p, &fvp);
 	if (error) {
@@ -150,7 +150,7 @@ portal_lookup(ap)
 		size++;
 	cnp->cn_consume = size - cnp->cn_namelen;
 
-	pt->pt_arg = malloc(size+1, M_TEMP, 0);
+	pt->pt_arg = malloc(size+1, M_TEMP, M_WAITOK);
 	pt->pt_size = size+1;
 	bcopy(pname, pt->pt_arg, pt->pt_size);
 	pt->pt_fileid = portal_fileid++;
diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c
index 67b3fae96722..8297ef6af3f9 100644
--- a/sys/fs/pseudofs/pseudofs.c
+++ b/sys/fs/pseudofs/pseudofs.c
@@ -92,7 +92,7 @@ _pfs_fixup_dir(struct pfs_node *parent)
 	struct pfs_node *dir;
 
 	MALLOC(dir, struct pfs_node *, sizeof *dir,
-	    M_PFSNODES, M_ZERO);
+	    M_PFSNODES, M_WAITOK|M_ZERO);
 	dir->pn_name[0] = '.';
 	dir->pn_type = pfstype_this;
 
@@ -102,7 +102,7 @@ _pfs_fixup_dir(struct pfs_node *parent)
 	}
 
 	MALLOC(dir, struct pfs_node *, sizeof *dir,
-	    M_PFSNODES, M_ZERO);
+	    M_PFSNODES, M_WAITOK|M_ZERO);
 	dir->pn_name[0] = dir->pn_name[1] = '.';
 	dir->pn_type = pfstype_parent;
 
@@ -127,7 +127,7 @@ pfs_create_dir(struct pfs_node *parent, char *name,
 	    ("%s(): node name is too long", __func__));
 
 	MALLOC(dir, struct pfs_node *, sizeof *dir,
-	    M_PFSNODES, M_ZERO);
+	    M_PFSNODES, M_WAITOK|M_ZERO);
 	strcpy(dir->pn_name, name);
 	dir->pn_type = (flags & PFS_PROCDEP) ? pfstype_procdir : pfstype_dir;
 	dir->pn_attr = attr;
@@ -160,7 +160,7 @@ pfs_create_file(struct pfs_node *parent, char *name, pfs_fill_t fill,
 	    ("%s(): node name is too long", __func__));
 
 	MALLOC(node, struct pfs_node *, sizeof *node,
-	    M_PFSNODES, M_ZERO);
+	    M_PFSNODES, M_WAITOK|M_ZERO);
 	strcpy(node->pn_name, name);
 	node->pn_type = pfstype_file;
 	node->pn_func = fill;
@@ -320,7 +320,7 @@ pfs_init(struct pfs_info *pi, struct vfsconf *vfc)
 
 	/* set up the root diretory */
 	MALLOC(root, struct pfs_node *, sizeof *root,
-	    M_PFSNODES, M_ZERO);
+	    M_PFSNODES, M_WAITOK|M_ZERO);
 	root->pn_type = pfstype_root;
 	root->pn_name[0] = '/';
 	root->pn_info = pi;
diff --git a/sys/fs/pseudofs/pseudofs_fileno.c b/sys/fs/pseudofs/pseudofs_fileno.c
index 0ca164027e48..4341e236fa9a 100644
--- a/sys/fs/pseudofs/pseudofs_fileno.c
+++ b/sys/fs/pseudofs/pseudofs_fileno.c
@@ -82,7 +82,7 @@ pfs_fileno_init(struct pfs_info *pi)
 	struct pfs_bitmap *pb;
 
 	MALLOC(pb, struct pfs_bitmap *, sizeof *pb,
-	    M_PFSFILENO, M_ZERO);
+	    M_PFSFILENO, M_WAITOK|M_ZERO);
 
 	mtx_lock(&pi->pi_mutex);
 
@@ -144,7 +144,7 @@ pfs_get_fileno(struct pfs_info *pi)
 	if (pb == NULL) {
 		mtx_unlock(&pi->pi_mutex);
 		MALLOC(pb, struct pfs_bitmap *, sizeof *pb,
-		    M_PFSFILENO, M_ZERO);
+		    M_PFSFILENO, M_WAITOK|M_ZERO);
 		mtx_lock(&pi->pi_mutex);
 		/* protect against possible race */
 		while (ppb->pb_next)
diff --git a/sys/fs/pseudofs/pseudofs_vncache.c b/sys/fs/pseudofs/pseudofs_vncache.c
index eed7aefe54fc..c832925ff2c9 100644
--- a/sys/fs/pseudofs/pseudofs_vncache.c
+++ b/sys/fs/pseudofs/pseudofs_vncache.c
@@ -133,7 +133,7 @@ pfs_vncache_alloc(struct mount *mp, struct vnode **vpp,
 	++pfs_vncache_misses;
 
 	/* nope, get a new one */
-	MALLOC(pvd, struct pfs_vdata *, sizeof *pvd, M_PFSVNCACHE, 0);
+	MALLOC(pvd, struct pfs_vdata *, sizeof *pvd, M_PFSVNCACHE, M_WAITOK);
 	if (++pfs_vncache_entries > pfs_vncache_maxentries)
 		pfs_vncache_maxentries = pfs_vncache_entries;
 	error = getnewvnode("pseudofs", mp, pfs_vnodeop_p, vpp);
diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c
index f4c3c039b0f8..093e7ca423d8 100644
--- a/sys/fs/smbfs/smbfs_node.c
+++ b/sys/fs/smbfs/smbfs_node.c
@@ -114,7 +114,7 @@ smbfs_name_alloc(const u_char *name, int nmlen)
 
 	nmlen++;
 #ifdef SMBFS_NAME_DEBUG
-	cp = malloc(nmlen + 2 + sizeof(int), M_SMBNODENAME, 0);
+	cp = malloc(nmlen + 2 + sizeof(int), M_SMBNODENAME, M_WAITOK);
 	*(int*)cp = nmlen;
 	cp += sizeof(int);
 	cp[0] = 0xfc;
@@ -122,7 +122,7 @@ smbfs_name_alloc(const u_char *name, int nmlen)
 	bcopy(name, cp, nmlen - 1);
 	cp[nmlen] = 0xfe;
 #else
-	cp = malloc(nmlen, M_SMBNODENAME, 0);
+	cp = malloc(nmlen, M_SMBNODENAME, M_WAITOK);
 	bcopy(name, cp, nmlen - 1);
 #endif
 	cp[nmlen - 1] = 0;
@@ -219,7 +219,7 @@ loop:
 	if (fap == NULL)
 		return ENOENT;
 
-	MALLOC(np, struct smbnode *, sizeof *np, M_SMBNODE, 0);
+	MALLOC(np, struct smbnode *, sizeof *np, M_SMBNODE, M_WAITOK);
 	error = getnewvnode("smbfs", mp, smbfs_vnodeop_p, &vp);
 	if (error) {
 		FREE(np, M_SMBNODE);
diff --git a/sys/fs/smbfs/smbfs_smb.c b/sys/fs/smbfs/smbfs_smb.c
index 59a5691f7a4b..034fc7725b7f 100644
--- a/sys/fs/smbfs/smbfs_smb.c
+++ b/sys/fs/smbfs/smbfs_smb.c
@@ -1264,7 +1264,7 @@ static int
 smbfs_findopenLM2(struct smbfs_fctx *ctx, struct smbnode *dnp,
 	const char *wildcard, int wclen, int attr, struct smb_cred *scred)
 {
-	ctx->f_name = malloc(SMB_MAXFNAMELEN, M_SMBFSDATA, 0);
+	ctx->f_name = malloc(SMB_MAXFNAMELEN, M_SMBFSDATA, M_WAITOK);
 	if (ctx->f_name == NULL)
 		return ENOMEM;
 	ctx->f_infolevel = SMB_DIALECT(SSTOVC(ctx->f_ssp)) < SMB_DIALECT_NTLM0_12 ?
@@ -1371,7 +1371,7 @@ smbfs_findnextLM2(struct smbfs_fctx *ctx, int limit)
 		if (ctx->f_rnamelen <= nmlen) {
 			if (ctx->f_rname)
 				free(ctx->f_rname, M_SMBFSDATA);
-			ctx->f_rname = malloc(nmlen + 1, M_SMBFSDATA, 0);
+			ctx->f_rname = malloc(nmlen + 1, M_SMBFSDATA, M_WAITOK);
 			ctx->f_rnamelen = nmlen;
 		}
 		bcopy(ctx->f_name, ctx->f_rname, nmlen);
@@ -1404,7 +1404,7 @@ smbfs_findopen(struct smbnode *dnp, const char *wildcard, int wclen, int attr,
 	struct smbfs_fctx *ctx;
 	int error;
 
-	ctx = malloc(sizeof(*ctx), M_SMBFSDATA, 0);
+	ctx = malloc(sizeof(*ctx), M_SMBFSDATA, M_WAITOK);
 	if (ctx == NULL)
 		return ENOMEM;
 	bzero(ctx, sizeof(*ctx));
diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c
index 2e7df0a1ee23..b41b86bfc24b 100644
--- a/sys/fs/udf/udf_vfsops.c
+++ b/sys/fs/udf/udf_vfsops.c
@@ -562,7 +562,7 @@ udf_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp)
 	 * Allocate memory and check the tag id's before grabbing a new
 	 * vnode, since it's hard to roll back if there is a problem.
 	 */
-	unode = uma_zalloc(udf_zone_node, 0);
+	unode = uma_zalloc(udf_zone_node, M_WAITOK);
 	if (unode == NULL) {
 		printf("Cannot allocate udf node\n");
 		return (ENOMEM);
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index f6d5fd220828..8d9be5790aa3 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -449,7 +449,7 @@ udf_transname(char *cs0string, char *destname, int len)
 	int i, unilen = 0;
 
 	/* allocate a buffer big enough to hold an 8->16 bit expansion */
-	transname = uma_zalloc(udf_zone_trans, 0);
+	transname = uma_zalloc(udf_zone_trans, M_WAITOK);
 
 	if ((unilen = udf_UncompressUnicode(len, cs0string, transname)) == -1) {
 		printf("udf: Unicode translation failed\n");
@@ -486,7 +486,7 @@ udf_cmpname(char *cs0string, char *cmpname, int cs0len, int cmplen)
 	int error = 0;
 
 	/* This is overkill, but not worth creating a new zone */
-	transname = uma_zalloc(udf_zone_trans, 0);
+	transname = uma_zalloc(udf_zone_trans, M_WAITOK);
 
 	cs0len = udf_transname(cs0string, transname, cs0len);
 
@@ -532,7 +532,7 @@ udf_opendir(struct udf_node *node, int offset, int fsize, struct udf_mnt *udfmp)
 {
 	struct udf_dirstream *ds;
 
-	ds = uma_zalloc(udf_zone_ds, M_ZERO);
+	ds = uma_zalloc(udf_zone_ds, M_WAITOK | M_ZERO);
 
 	ds->node = node;
 	ds->offset = offset;
@@ -597,7 +597,7 @@ udf_getfid(struct udf_dirstream *ds)
 		 * logical sector in size.
 		 */
 		MALLOC(ds->buf, uint8_t*, ds->udfmp->bsize, M_UDFFID,
-		     M_ZERO);
+		     M_WAITOK | M_ZERO);
 		bcopy(fid, ds->buf, frag_size);
 
 		/* Reduce all of the casting magic */
@@ -697,7 +697,7 @@ udf_readdir(struct vop_readdir_args *a)
 		 */
 		ncookies = uio->uio_resid / 8;
 		MALLOC(cookies, u_long *, sizeof(u_long) * ncookies,
-		    M_TEMP, 0);
+		    M_TEMP, M_WAITOK);
 		if (cookies == NULL)
 			return (ENOMEM);
 		uiodir.ncookies = ncookies;
diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index e33adb61f80a..d3fed34602e6 100644
--- a/sys/fs/umapfs/umap_subr.c
+++ b/sys/fs/umapfs/umap_subr.c
@@ -210,7 +210,7 @@ umap_node_alloc(mp, lowervp, vpp)
 	 * elsewhere if MALLOC should block.
 	 */
 	MALLOC(xp, struct umap_node *, sizeof(struct umap_node),
-	    M_TEMP, 0);
+	    M_TEMP, M_WAITOK);
 
 	error = getnewvnode("umap", mp, umap_vnodeop_p, vpp);
 	if (error) {
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index b148c73bdd56..c1ed75108e37 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -155,7 +155,7 @@ umapfs_mount(mp, path, data, ndp, td)
 #endif
 
 	amp = (struct umap_mount *) malloc(sizeof(struct umap_mount),
-				M_UMAPFSMNT, 0);	/* XXX */
+				M_UMAPFSMNT, M_WAITOK);	/* XXX */
 
 	/*
 	 * Save reference to underlying FS
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index b645265b671b..e08b70a1ee96 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -509,7 +509,7 @@ loop:
 			union_newlower(un, lowervp);
 			if (cnp && (lowervp != NULLVP)) {
 				un->un_path = malloc(cnp->cn_namelen+1,
-						M_TEMP, 0);
+						M_TEMP, M_WAITOK);
 				bcopy(cnp->cn_nameptr, un->un_path,
 						cnp->cn_namelen);
 				un->un_path[cnp->cn_namelen] = '\0';
@@ -564,7 +564,7 @@ loop:
 	}
 
 	MALLOC((*vpp)->v_data, void *, sizeof(struct union_node),
-		M_TEMP, 0);
+		M_TEMP, M_WAITOK);
 
 	ASSERT_VOP_LOCKED(*vpp, "union_allocvp");
 	(*vpp)->v_vflag |= vflag;
@@ -591,7 +591,7 @@ loop:
 	un->un_openl = 0;
 
 	if (cnp && (lowervp != NULLVP)) {
-		un->un_path = malloc(cnp->cn_namelen+1, M_TEMP, 0);
+		un->un_path = malloc(cnp->cn_namelen+1, M_TEMP, M_WAITOK);
 		bcopy(cnp->cn_nameptr, un->un_path, cnp->cn_namelen);
 		un->un_path[cnp->cn_namelen] = '\0';
 	} else {
@@ -686,7 +686,7 @@ union_copyfile(fvp, tvp, cred, td)
 	VOP_LEASE(fvp, td, cred, LEASE_READ);
 	VOP_LEASE(tvp, td, cred, LEASE_WRITE);
 
-	buf = malloc(MAXBSIZE, M_TEMP, 0);
+	buf = malloc(MAXBSIZE, M_TEMP, M_WAITOK);
 
 	/* ugly loop follows... */
 	do {
@@ -858,7 +858,7 @@ union_relookup(um, dvp, vpp, cnp, cn, path, pathlen)
 	 * Conclusion: Horrible.
 	 */
 	cn->cn_namelen = pathlen;
-	cn->cn_pnbuf = uma_zalloc(namei_zone, 0);
+	cn->cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
 	bcopy(path, cn->cn_pnbuf, cn->cn_namelen);
 	cn->cn_pnbuf[cn->cn_namelen] = '\0';
 
@@ -1068,7 +1068,7 @@ union_vn_create(vpp, un, td)
 	 * copied in the first place).
 	 */
 	cn.cn_namelen = strlen(un->un_path);
-	cn.cn_pnbuf = uma_zalloc(namei_zone, 0);
+	cn.cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
 	bcopy(un->un_path, cn.cn_pnbuf, cn.cn_namelen+1);
 	cn.cn_nameiop = CREATE;
 	cn.cn_flags = (LOCKPARENT|LOCKLEAF|HASBUF|SAVENAME|ISLASTCN);
@@ -1260,7 +1260,7 @@ union_dircache(vp, td)
 		union_dircache_r(vp, 0, &cnt);
 		cnt++;
 		dircache = malloc(cnt * sizeof(struct vnode *),
-				M_TEMP, 0);
+				M_TEMP, M_WAITOK);
 		vpp = dircache;
 		union_dircache_r(vp, &vpp, &cnt);
 		*vpp = NULLVP;
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 505c5da32594..637b35077f0d 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -194,7 +194,7 @@ union_mount(mp, ndp, td)
 	 */
 
 	um = (struct union_mount *) malloc(sizeof(struct union_mount),
-				M_UNIONFSMNT, M_ZERO);
+				M_UNIONFSMNT, M_WAITOK | M_ZERO);
 
 	um->um_op = op;
 
diff --git a/sys/geom/bde/g_bde.c b/sys/geom/bde/g_bde.c
index 8a399261ae2e..4d7f615e6e69 100644
--- a/sys/geom/bde/g_bde.c
+++ b/sys/geom/bde/g_bde.c
@@ -212,7 +212,7 @@ g_bde_config(struct g_configargs *ga)
 	while (1) {
 		sectorsize = cp->provider->sectorsize;
 		mediasize = cp->provider->mediasize;
-		sc = g_malloc(sizeof(struct g_bde_softc), M_ZERO);
+		sc = g_malloc(sizeof(struct g_bde_softc), M_WAITOK | M_ZERO);
 		gp->softc = sc;
 		sc->geom = gp;
 		sc->consumer = cp;
diff --git a/sys/geom/geom_aes.c b/sys/geom/geom_aes.c
index 5471cbf6c142..72f0d3dcc56f 100644
--- a/sys/geom/geom_aes.c
+++ b/sys/geom/geom_aes.c
@@ -148,7 +148,7 @@ g_aes_read_done(struct bio *bp)
 
 	gp = bp->bio_from->geom;
 	sc = gp->softc;
-	sb = g_malloc(sc->sectorsize, 0);
+	sb = g_malloc(sc->sectorsize, M_WAITOK);
 	b = bp->bio_data;
 	e = bp->bio_data;
 	e += bp->bio_length;
@@ -211,7 +211,7 @@ g_aes_start(struct bio *bp)
 		}
 		bp2->bio_done = g_aes_write_done;
 		bp2->bio_offset += sc->sectorsize;
-		bp2->bio_data = g_malloc(bp->bio_length, 0);
+		bp2->bio_data = g_malloc(bp->bio_length, M_WAITOK);
 		b = bp->bio_data;
 		e = bp->bio_data;
 		e += bp->bio_length;
@@ -322,7 +322,7 @@ g_aes_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 		if (buf == NULL || error != 0) {
 			break;
 		}
-		sc = g_malloc(sizeof(struct g_aes_softc), M_ZERO);
+		sc = g_malloc(sizeof(struct g_aes_softc), M_WAITOK | M_ZERO);
 		if (!memcmp(buf, aes_magic, strlen(aes_magic))) {
 			sc->keying = KEY_ZERO;
 		} else if (!memcmp(buf, aes_magic_random, 
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index c7f659102f0e..d947708b6021 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -186,7 +186,7 @@ ccdnew(int unit)
 	if (IS_ALLOCATED(unit) || unit > 32)
 		return (NULL);
 
-	MALLOC(sc, struct ccd_s *, sizeof(*sc), M_CCD, M_ZERO);
+	MALLOC(sc, struct ccd_s *, sizeof(*sc), M_CCD, M_WAITOK | M_ZERO);
 	sc->sc_unit = unit;
 	LIST_INSERT_HEAD(&ccd_softc_list, sc, list);
 	/* XXX: UNLOCK(unique unit numbers) */
@@ -263,7 +263,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 
 	/* Allocate space for the component info. */
 	cs->sc_cinfo = malloc(cs->sc_nccdisks * sizeof(struct ccdcinfo),
-	    M_CCD, 0);
+	    M_CCD, M_WAITOK);
 
 	/*
 	 * Verify that each component piece exists and record
@@ -271,7 +271,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 	 */
 	maxsecsize = 0;
 	minsize = 0;
-	tmppath = malloc(MAXPATHLEN, M_CCD, 0);
+	tmppath = malloc(MAXPATHLEN, M_CCD, M_WAITOK);
 	for (ix = 0; ix < cs->sc_nccdisks; ix++) {
 		vp = cs->sc_vpp[ix];
 		ci = &cs->sc_cinfo[ix];
@@ -284,7 +284,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 		    MAXPATHLEN, &ci->ci_pathlen)) != 0) {
 			goto fail;
 		}
-		ci->ci_path = malloc(ci->ci_pathlen, M_CCD, 0);
+		ci->ci_path = malloc(ci->ci_pathlen, M_CCD, M_WAITOK);
 		bcopy(tmppath, ci->ci_path, ci->ci_pathlen);
 
 		ci->ci_dev = vn_todev(vp);
@@ -439,7 +439,7 @@ ccdinterleave(struct ccd_s *cs, int unit)
 	 */
 	size = (cs->sc_nccdisks + 1) * sizeof(struct ccdiinfo);
 	cs->sc_itable = (struct ccdiinfo *)malloc(size, M_CCD,
-	    M_ZERO);
+	    M_WAITOK | M_ZERO);
 
 	/*
 	 * Trivial case: no interleave (actually interleave of disk size).
@@ -453,7 +453,7 @@ ccdinterleave(struct ccd_s *cs, int unit)
 
 		for (ix = 0; ix < cs->sc_nccdisks; ix++) {
 			/* Allocate space for ii_index. */
-			ii->ii_index = malloc(sizeof(int), M_CCD, 0);
+			ii->ii_index = malloc(sizeof(int), M_CCD, M_WAITOK);
 			ii->ii_ndisk = 1;
 			ii->ii_startblk = bn;
 			ii->ii_startoff = 0;
@@ -476,7 +476,7 @@ ccdinterleave(struct ccd_s *cs, int unit)
 		 * we use.
 		 */
 		ii->ii_index = malloc((sizeof(int) * cs->sc_nccdisks),
-		    M_CCD, 0);
+		    M_CCD, M_WAITOK);
 
 		/*
 		 * Locate the smallest of the remaining components
@@ -1066,9 +1066,9 @@ ccdioctltoo(int unit, u_long cmd, caddr_t data, int flag, struct thread *td)
 		 * componet pathnames and device numbers.
 		 */
 		cpp = malloc(ccio->ccio_ndisks * sizeof(char *),
-		    M_CCD, 0);
+		    M_CCD, M_WAITOK);
 		vpp = malloc(ccio->ccio_ndisks * sizeof(struct vnode *),
-		    M_CCD, 0);
+		    M_CCD, M_WAITOK);
 
 		error = copyin((caddr_t)ccio->ccio_disks, (caddr_t)cpp,
 		    ccio->ccio_ndisks * sizeof(char **));
@@ -1124,7 +1124,8 @@ ccdioctltoo(int unit, u_long cmd, caddr_t data, int flag, struct thread *td)
 		ccio->ccio_unit = unit;
 		ccio->ccio_size = cs->sc_size;
 		ccg = &cs->sc_geom;
-		cs->sc_disk = malloc(sizeof(struct disk), M_CCD, M_ZERO);
+		cs->sc_disk = malloc(sizeof(struct disk), M_CCD,
+		    M_ZERO | M_WAITOK);
 		cs->sc_disk->d_strategy = ccdstrategy;
 		cs->sc_disk->d_name = "ccd";
 		cs->sc_disk->d_sectorsize = ccg->ccg_secsize;
diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c
index b3cd33185fcf..48bac226f5ad 100644
--- a/sys/geom/geom_ctl.c
+++ b/sys/geom/geom_ctl.c
@@ -174,7 +174,7 @@ g_ctl_ioctl_configgeom(dev_t dev, u_long cmd, caddr_t data, int fflag, struct th
 	else if (gcp->len == 0) {
 		ga.ptr = NULL;
 	} else {
-		ga.ptr = g_malloc(gcp->len, 0);
+		ga.ptr = g_malloc(gcp->len, M_WAITOK);
 		error = copyin(gcp->ptr, ga.ptr, gcp->len);
 		if (error) {
 			g_free(ga.ptr);
diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c
index 2bb3ac6823bc..55a90585546a 100644
--- a/sys/geom/geom_dev.c
+++ b/sys/geom/geom_dev.c
@@ -305,7 +305,7 @@ g_dev_ioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct thread *td)
 		break;
 
 	default:
-		gio = g_malloc(sizeof *gio, M_ZERO);
+		gio = g_malloc(sizeof *gio, M_WAITOK | M_ZERO);
 		gio->cmd = cmd;
 		gio->data = data;
 		gio->fflag = fflag;
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 4688bcf08d6c..1f7e8b0c69c7 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -337,7 +337,7 @@ disk_create(int unit, struct disk *dp, int flags, struct cdevsw *cdevsw, void *
 {
 	dev_t dev;
 
-	dev = g_malloc(sizeof *dev, M_ZERO);
+	dev = g_malloc(sizeof *dev, M_WAITOK | M_ZERO);
 	dp->d_unit = unit;
 	dp->d_dev = dev;
 	dp->d_flags = flags;
diff --git a/sys/geom/geom_event.c b/sys/geom/geom_event.c
index 228bc065fcb2..1b657e91a1c0 100644
--- a/sys/geom/geom_event.c
+++ b/sys/geom/geom_event.c
@@ -266,7 +266,7 @@ g_post_event(enum g_events ev, struct g_class *mp, struct g_geom *gp, struct g_p
 	g_trace(G_T_TOPOLOGY, "g_post_event(%d, %p, %p, %p, %p)",
 	    ev, mp, gp, pp, cp);
 	g_topology_assert();
-	ep = g_malloc(sizeof *ep, M_ZERO);
+	ep = g_malloc(sizeof *ep, M_WAITOK | M_ZERO);
 	ep->event = ev;
 	if (mp != NULL) {
 		ep->class = mp;
diff --git a/sys/geom/geom_gpt.c b/sys/geom/geom_gpt.c
index a54d9a28439b..6b046c449809 100644
--- a/sys/geom/geom_gpt.c
+++ b/sys/geom/geom_gpt.c
@@ -220,7 +220,7 @@ g_gpt_taste(struct g_class *mp, struct g_provider *pp, int insist)
 			ent = (void*)(buf + i * hdr->hdr_entsz);
 			if (!memcmp(&ent->ent_type, &unused, sizeof(unused)))
 				continue;
-			gs->part[i] = g_malloc(hdr->hdr_entsz, 0);
+			gs->part[i] = g_malloc(hdr->hdr_entsz, M_WAITOK);
 			if (gs->part[i] == NULL)
 				break;
 			bcopy(ent, gs->part[i], hdr->hdr_entsz);
diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c
index dc426376e1d5..399df597daaf 100644
--- a/sys/geom/geom_io.c
+++ b/sys/geom/geom_io.c
@@ -493,7 +493,7 @@ g_read_data(struct g_consumer *cp, off_t offset, off_t length, int *error)
 	bp->bio_done = NULL;
 	bp->bio_offset = offset;
 	bp->bio_length = length;
-	ptr = g_malloc(length, 0);
+	ptr = g_malloc(length, M_WAITOK);
 	bp->bio_data = ptr;
 	g_io_request(bp, cp);
 	errorc = biowait(bp, "gread");
diff --git a/sys/geom/geom_mirror.c b/sys/geom/geom_mirror.c
index db426cda2a8c..23e2f5244023 100644
--- a/sys/geom/geom_mirror.c
+++ b/sys/geom/geom_mirror.c
@@ -214,7 +214,7 @@ g_mirror_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 			g_topology_unlock();
 			break;
 		}
-		gp->softc = g_malloc(sizeof(struct g_mirror_softc), 0);
+		gp->softc = g_malloc(sizeof(struct g_mirror_softc), M_WAITOK);
 		sc = gp->softc;
 		memcpy(sc->magic, buf + 16, sizeof sc->magic);
 		g_topology_lock();
diff --git a/sys/geom/geom_slice.c b/sys/geom/geom_slice.c
index 43fbc5ff3a31..0a237513a5f0 100644
--- a/sys/geom/geom_slice.c
+++ b/sys/geom/geom_slice.c
@@ -71,10 +71,10 @@ g_slice_init(unsigned nslice, unsigned scsize)
 {
 	struct g_slicer *gsp;
 
-	gsp = g_malloc(sizeof *gsp, M_ZERO);
-	gsp->softc = g_malloc(scsize, M_ZERO);
+	gsp = g_malloc(sizeof *gsp, M_WAITOK | M_ZERO);
+	gsp->softc = g_malloc(scsize, M_WAITOK | M_ZERO);
 	gsp->slices = g_malloc(nslice * sizeof(struct g_slice),
-	    M_ZERO);
+	    M_WAITOK | M_ZERO);
 	gsp->nslice = nslice;
 	return (gsp);
 }
@@ -377,7 +377,7 @@ g_slice_conf_hot(struct g_geom *gp, u_int idx, off_t offset, off_t length)
 	gsp = gp->softc;
 	gsl = gsp->hot;
 	if(idx >= gsp->nhot) {
-		gsl2 = g_malloc((idx + 1) * sizeof *gsl2, M_ZERO);
+		gsl2 = g_malloc((idx + 1) * sizeof *gsl2, M_WAITOK | M_ZERO);
 		if (gsp->hot != NULL)
 			bcopy(gsp->hot, gsl2, gsp->nhot * sizeof *gsl2);
 		gsp->hot = gsl2;
diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c
index e2209fc417ac..1b9c01ef9d32 100644
--- a/sys/geom/geom_subr.c
+++ b/sys/geom/geom_subr.c
@@ -100,9 +100,9 @@ g_new_geomf(struct g_class *mp, const char *fmt, ...)
 	sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
 	sbuf_vprintf(sb, fmt, ap);
 	sbuf_finish(sb);
-	gp = g_malloc(sizeof *gp, M_ZERO);
+	gp = g_malloc(sizeof *gp, M_WAITOK | M_ZERO);
 	gp->protect = 0x020016601;
-	gp->name = g_malloc(sbuf_len(sb) + 1, M_ZERO);
+	gp->name = g_malloc(sbuf_len(sb) + 1, M_WAITOK | M_ZERO);
 	gp->class = mp;
 	gp->rank = 1;
 	LIST_INIT(&gp->consumer);
@@ -143,7 +143,7 @@ g_new_consumer(struct g_geom *gp)
 	    ("g_new_consumer on geom(%s) (class %s) without orphan",
 	    gp->name, gp->class->name));
 
-	cp = g_malloc(sizeof *cp, M_ZERO);
+	cp = g_malloc(sizeof *cp, M_WAITOK | M_ZERO);
 	cp->protect = 0x020016602;
 	cp->geom = gp;
 	cp->stat = g_stat_new(cp);
@@ -179,7 +179,7 @@ g_new_providerf(struct g_geom *gp, const char *fmt, ...)
 	sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
 	sbuf_vprintf(sb, fmt, ap);
 	sbuf_finish(sb);
-	pp = g_malloc(sizeof *pp + sbuf_len(sb) + 1, M_ZERO);
+	pp = g_malloc(sizeof *pp + sbuf_len(sb) + 1, M_WAITOK | M_ZERO);
 	pp->protect = 0x020016603;
 	pp->name = (char *)(pp + 1);
 	strcpy(pp->name, sbuf_data(sb));
@@ -684,7 +684,7 @@ g_idclass(struct geomidorname *p)
 				return (mp);
 		return (NULL);
 	}
-	n = g_malloc(p->len + 1, 0);
+	n = g_malloc(p->len + 1, M_WAITOK);
 	if (copyin(p->u.name, n, p->len) == 0) {
 		n[p->len] = '\0';
 		LIST_FOREACH(mp, &g_classes, class)
@@ -711,7 +711,7 @@ g_idgeom(struct geomidorname *p)
 					return (gp);
 		return (NULL);
 	}
-	n = g_malloc(p->len + 1, 0);
+	n = g_malloc(p->len + 1, M_WAITOK);
 	if (copyin(p->u.name, n, p->len) == 0) {
 		n[p->len] = '\0';
 		LIST_FOREACH(mp, &g_classes, class)
@@ -741,7 +741,7 @@ g_idprovider(struct geomidorname *p)
 						return (pp);
 		return (NULL);
 	}
-	n = g_malloc(p->len + 1, 0);
+	n = g_malloc(p->len + 1, M_WAITOK);
 	if (copyin(p->u.name, n, p->len) == 0) {
 		n[p->len] = '\0';
 		LIST_FOREACH(mp, &g_classes, class)
diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c
index 66737619b96b..fc14dba51817 100644
--- a/sys/gnu/ext2fs/ext2_inode.c
+++ b/sys/gnu/ext2fs/ext2_inode.c
@@ -414,7 +414,7 @@ ext2_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
 	}
 
 	bap = (int32_t *)bp->b_data;
-	MALLOC(copy, int32_t *, fs->s_blocksize, M_TEMP, 0);
+	MALLOC(copy, int32_t *, fs->s_blocksize, M_TEMP, M_WAITOK);
 	bcopy((caddr_t)bap, (caddr_t)copy, (u_int)fs->s_blocksize);
 	bzero((caddr_t)&bap[last + 1],
 	  (u_int)(NINDIR(fs) - (last + 1)) * sizeof (int32_t));
diff --git a/sys/gnu/ext2fs/ext2_lookup.c b/sys/gnu/ext2fs/ext2_lookup.c
index c11aa5af4d23..49caccfb8684 100644
--- a/sys/gnu/ext2fs/ext2_lookup.c
+++ b/sys/gnu/ext2fs/ext2_lookup.c
@@ -181,7 +181,7 @@ ext2_readdir(ap)
 	auio.uio_resid = count;
 	auio.uio_segflg = UIO_SYSSPACE;
 	aiov.iov_len = count;
-	MALLOC(dirbuf, caddr_t, count, M_TEMP, 0);
+	MALLOC(dirbuf, caddr_t, count, M_TEMP, M_WAITOK);
 	aiov.iov_base = dirbuf;
 	error = VOP_READ(ap->a_vp, &auio, 0, ap->a_cred);
 	if (error == 0) {
@@ -243,7 +243,7 @@ ext2_readdir(ap)
 			if (uio->uio_segflg != UIO_SYSSPACE || uio->uio_iovcnt != 1)
 				panic("ext2fs_readdir: unexpected uio from NFS server");
 			MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP,
-			       0);
+			       M_WAITOK);
 			off = startoffset;
 			for (dp = (struct ext2_dir_entry_2 *)dirbuf,
 			     cookiep = cookies, ecookies = cookies + ncookies;
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index d281ddb9a279..d91a92ea0d8f 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -135,7 +135,7 @@ ext2_mountroot()
 		printf("ext2_mountroot: can't find rootvp\n");
 		return (error);
 	}
-	mp = bsd_malloc((u_long)sizeof(struct mount), M_MOUNT, 0);
+	mp = bsd_malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK);
 	bzero((char *)mp, (u_long)sizeof(struct mount));
 	TAILQ_INIT(&mp->mnt_nvnodelist);
 	TAILQ_INIT(&mp->mnt_reservedvnlist);
@@ -473,7 +473,7 @@ static int compute_sb_data(devvp, es, fs)
     V(s_db_per_group)
 
     fs->s_group_desc = bsd_malloc(db_count * sizeof (struct buf *),
-		M_EXT2MNT, 0);
+		M_EXT2MNT, M_WAITOK);
 
     /* adjust logic_sb_block */
     if(fs->s_blocksize > SBSIZE) 
@@ -683,16 +683,16 @@ ext2_mountfs(devvp, mp, td)
 			goto out;
 		}
 	}
-	ump = bsd_malloc(sizeof *ump, M_EXT2MNT, 0);
+	ump = bsd_malloc(sizeof *ump, M_EXT2MNT, M_WAITOK);
 	bzero((caddr_t)ump, sizeof *ump);
 	/* I don't know whether this is the right strategy. Note that
 	   we dynamically allocate both an ext2_sb_info and an ext2_super_block
 	   while Linux keeps the super block in a locked buffer
 	 */
 	ump->um_e2fs = bsd_malloc(sizeof(struct ext2_sb_info), 
-		M_EXT2MNT, 0);
+		M_EXT2MNT, M_WAITOK);
 	ump->um_e2fs->s_es = bsd_malloc(sizeof(struct ext2_super_block), 
-		M_EXT2MNT, 0);
+		M_EXT2MNT, M_WAITOK);
 	bcopy(es, ump->um_e2fs->s_es, (u_int)sizeof(struct ext2_super_block));
 	if ((error = compute_sb_data(devvp, ump->um_e2fs->s_es, ump->um_e2fs)))
 		goto out;
@@ -1005,7 +1005,7 @@ restart:
 	 * which will cause a panic because ext2_sync() blindly
 	 * dereferences vp->v_data (as well it should).
 	 */
-	MALLOC(ip, struct inode *, sizeof(struct inode), M_EXT2NODE, 0);
+	MALLOC(ip, struct inode *, sizeof(struct inode), M_EXT2NODE, M_WAITOK);
 
 	/* Allocate a new vnode/inode. */
 	if ((error = getnewvnode("ext2fs", mp, ext2_vnodeop_p, &vp)) != 0) {
diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c
index 66737619b96b..fc14dba51817 100644
--- a/sys/gnu/fs/ext2fs/ext2_inode.c
+++ b/sys/gnu/fs/ext2fs/ext2_inode.c
@@ -414,7 +414,7 @@ ext2_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
 	}
 
 	bap = (int32_t *)bp->b_data;
-	MALLOC(copy, int32_t *, fs->s_blocksize, M_TEMP, 0);
+	MALLOC(copy, int32_t *, fs->s_blocksize, M_TEMP, M_WAITOK);
 	bcopy((caddr_t)bap, (caddr_t)copy, (u_int)fs->s_blocksize);
 	bzero((caddr_t)&bap[last + 1],
 	  (u_int)(NINDIR(fs) - (last + 1)) * sizeof (int32_t));
diff --git a/sys/gnu/fs/ext2fs/ext2_lookup.c b/sys/gnu/fs/ext2fs/ext2_lookup.c
index c11aa5af4d23..49caccfb8684 100644
--- a/sys/gnu/fs/ext2fs/ext2_lookup.c
+++ b/sys/gnu/fs/ext2fs/ext2_lookup.c
@@ -181,7 +181,7 @@ ext2_readdir(ap)
 	auio.uio_resid = count;
 	auio.uio_segflg = UIO_SYSSPACE;
 	aiov.iov_len = count;
-	MALLOC(dirbuf, caddr_t, count, M_TEMP, 0);
+	MALLOC(dirbuf, caddr_t, count, M_TEMP, M_WAITOK);
 	aiov.iov_base = dirbuf;
 	error = VOP_READ(ap->a_vp, &auio, 0, ap->a_cred);
 	if (error == 0) {
@@ -243,7 +243,7 @@ ext2_readdir(ap)
 			if (uio->uio_segflg != UIO_SYSSPACE || uio->uio_iovcnt != 1)
 				panic("ext2fs_readdir: unexpected uio from NFS server");
 			MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP,
-			       0);
+			       M_WAITOK);
 			off = startoffset;
 			for (dp = (struct ext2_dir_entry_2 *)dirbuf,
 			     cookiep = cookies, ecookies = cookies + ncookies;
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index d281ddb9a279..d91a92ea0d8f 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -135,7 +135,7 @@ ext2_mountroot()
 		printf("ext2_mountroot: can't find rootvp\n");
 		return (error);
 	}
-	mp = bsd_malloc((u_long)sizeof(struct mount), M_MOUNT, 0);
+	mp = bsd_malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK);
 	bzero((char *)mp, (u_long)sizeof(struct mount));
 	TAILQ_INIT(&mp->mnt_nvnodelist);
 	TAILQ_INIT(&mp->mnt_reservedvnlist);
@@ -473,7 +473,7 @@ static int compute_sb_data(devvp, es, fs)
     V(s_db_per_group)
 
     fs->s_group_desc = bsd_malloc(db_count * sizeof (struct buf *),
-		M_EXT2MNT, 0);
+		M_EXT2MNT, M_WAITOK);
 
     /* adjust logic_sb_block */
     if(fs->s_blocksize > SBSIZE) 
@@ -683,16 +683,16 @@ ext2_mountfs(devvp, mp, td)
 			goto out;
 		}
 	}
-	ump = bsd_malloc(sizeof *ump, M_EXT2MNT, 0);
+	ump = bsd_malloc(sizeof *ump, M_EXT2MNT, M_WAITOK);
 	bzero((caddr_t)ump, sizeof *ump);
 	/* I don't know whether this is the right strategy. Note that
 	   we dynamically allocate both an ext2_sb_info and an ext2_super_block
 	   while Linux keeps the super block in a locked buffer
 	 */
 	ump->um_e2fs = bsd_malloc(sizeof(struct ext2_sb_info), 
-		M_EXT2MNT, 0);
+		M_EXT2MNT, M_WAITOK);
 	ump->um_e2fs->s_es = bsd_malloc(sizeof(struct ext2_super_block), 
-		M_EXT2MNT, 0);
+		M_EXT2MNT, M_WAITOK);
 	bcopy(es, ump->um_e2fs->s_es, (u_int)sizeof(struct ext2_super_block));
 	if ((error = compute_sb_data(devvp, ump->um_e2fs->s_es, ump->um_e2fs)))
 		goto out;
@@ -1005,7 +1005,7 @@ restart:
 	 * which will cause a panic because ext2_sync() blindly
 	 * dereferences vp->v_data (as well it should).
 	 */
-	MALLOC(ip, struct inode *, sizeof(struct inode), M_EXT2NODE, 0);
+	MALLOC(ip, struct inode *, sizeof(struct inode), M_EXT2NODE, M_WAITOK);
 
 	/* Allocate a new vnode/inode. */
 	if ((error = getnewvnode("ext2fs", mp, ext2_vnodeop_p, &vp)) != 0) {
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index ae14099f93be..747a3a14394f 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -388,7 +388,7 @@ bios16(struct bios_args *args, char *fmt, ...)
 	/*
 	 * no page table, so create one and install it.
 	 */
-	pte = (pt_entry_t *)malloc(PAGE_SIZE, M_TEMP, 0);
+	pte = (pt_entry_t *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
 	ptd = (pd_entry_t *)((u_int)ptd + KERNBASE);
 	*ptd = vtophys(pte) | PG_RW | PG_V;
     } else {
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index a5a20fcbab03..8f5898faa868 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -341,7 +341,7 @@ bus_dmamem_alloc_size(bus_dma_tag_t dmat, void** vaddr, int flags,
 
 	if ((size <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
 		*vaddr = malloc(size, M_DEVBUF,
-				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0);
+				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
 	} else {
 		/*
 		 * XXX Use Contigmalloc until it is merged into this facility
@@ -349,7 +349,7 @@ bus_dmamem_alloc_size(bus_dma_tag_t dmat, void** vaddr, int flags,
 		 *     multi-seg allocations yet though.
 		 */
 		*vaddr = contigmalloc(size, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
 		    0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
 		    dmat->boundary);
 	}
diff --git a/sys/i386/i386/elan-mmcr.c b/sys/i386/i386/elan-mmcr.c
index ca6476828dea..7ddd90cbda44 100644
--- a/sys/i386/i386/elan-mmcr.c
+++ b/sys/i386/i386/elan-mmcr.c
@@ -286,7 +286,7 @@ elan_write(dev_t dev, struct uio *uio, int ioflag)
 
 	if (uio->uio_resid > 512)
 		return (EINVAL);
-	s = malloc(uio->uio_resid + 1, M_DEVBUF, 0);
+	s = malloc(uio->uio_resid + 1, M_DEVBUF, M_WAITOK);
 	if (s == NULL)
 		return (ENOMEM);
 	untimeout(timeout_errled, NULL, errled_h);
diff --git a/sys/i386/i386/i686_mem.c b/sys/i386/i386/i686_mem.c
index f3fc4e89db25..589fc64721cb 100644
--- a/sys/i386/i386/i686_mem.c
+++ b/sys/i386/i386/i686_mem.c
@@ -557,7 +557,7 @@ i686_mrinit(struct mem_range_softc *sc)
 
     sc->mr_desc = 
 	(struct mem_range_desc *)malloc(nmdesc * sizeof(struct mem_range_desc), 
-					M_MEMDESC, M_ZERO);
+					M_MEMDESC, M_WAITOK | M_ZERO);
     sc->mr_ndesc = nmdesc;
 
     mrd = sc->mr_desc;
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 4905d3c8158c..41fa63640b60 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -265,7 +265,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
 		if (nd > 0) {
 			md = (struct mem_range_desc *)
 				malloc(nd * sizeof(struct mem_range_desc),
-				       M_MEMDESC, 0);
+				       M_MEMDESC, M_WAITOK);
 			error = mem_range_attr_get(md, &nd);
 			if (!error)
 				error = copyout(md, mo->mo_desc, 
@@ -279,7 +279,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
 		
 	case MEMRANGE_SET:
 		md = (struct mem_range_desc *)malloc(sizeof(struct mem_range_desc),
-						    M_MEMDESC, 0);
+						    M_MEMDESC, M_WAITOK);
 		error = copyin(mo->mo_desc, md, sizeof(struct mem_range_desc));
 		/* clamp description string */
 		md->mr_owner[sizeof(md->mr_owner) - 1] = 0;
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index cc29843c7772..7ebd6ea9020a 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
 
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index cc29843c7772..7ebd6ea9020a 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
 
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index bd89b74341af..5fcad0311b0a 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -298,7 +298,7 @@ user_ldt_alloc(struct mdproc *mdp, int len)
 		mtx_unlock_spin(&sched_lock);
 	mtx_assert(&sched_lock, MA_NOTOWNED);
 	MALLOC(new_ldt, struct proc_ldt *, sizeof(struct proc_ldt),
-		M_SUBPROC, 0);
+		M_SUBPROC, M_WAITOK);
 
 	new_ldt->ldt_len = len = NEW_MAX_LD(len);
 	new_ldt->ldt_base = (caddr_t)kmem_alloc(kernel_map,
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index 6126ddac51f7..dd7624f7bb9a 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -490,7 +490,7 @@ vm86_addpage(struct vm86context *vmc, int pagenum, vm_offset_t kva)
 		goto full;			/* XXX grow map? */
 
 	if (kva == 0) {
-		kva = (vm_offset_t)malloc(PAGE_SIZE, M_TEMP, 0);
+		kva = (vm_offset_t)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
 		flags = VMAP_MALLOC;
 	}
 
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index abebf2a34a72..295be86b1df7 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -333,7 +333,7 @@ ibcs2_getdents(td, uap)
 #define	DIRBLKSIZ	512		/* XXX we used to use ufs's DIRBLKSIZ */
 	buflen = max(DIRBLKSIZ, uap->nbytes);
 	buflen = min(buflen, MAXBSIZE);
-	buf = malloc(buflen, M_TEMP, 0);
+	buf = malloc(buflen, M_TEMP, M_WAITOK);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 again:
 	aiov.iov_base = buf;
@@ -494,7 +494,7 @@ ibcs2_read(td, uap)
 
 	buflen = max(DIRBLKSIZ, uap->nbytes);
 	buflen = min(buflen, MAXBSIZE);
-	buf = malloc(buflen, M_TEMP, 0);
+	buf = malloc(buflen, M_TEMP, M_WAITOK);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 again:
 	aiov.iov_base = buf;
diff --git a/sys/i386/ibcs2/ibcs2_util.c b/sys/i386/ibcs2/ibcs2_util.c
index 55ff6abff0db..217243300822 100644
--- a/sys/i386/ibcs2/ibcs2_util.c
+++ b/sys/i386/ibcs2/ibcs2_util.c
@@ -66,7 +66,7 @@ ibcs2_emul_find(td, sgp, prefix, path, pbuf, cflag)
 	char			*ptr, *buf, *cp;
 	size_t			 sz, len;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	*pbuf = path;
 
 	for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index b19cb56d74cc..fb5f537566f7 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -386,7 +386,7 @@ exec_coff_imgact(imgp)
 			int emul_path_len = strlen(ibcs2_emul_path);
 
 			libbuf = malloc(MAXPATHLEN + emul_path_len,
-					M_TEMP, 0);
+					M_TEMP, M_WAITOK);
 			strcpy(libbuf, ibcs2_emul_path);
 
 		    	for (j = off; j < scns[i].s_size + off;) {
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index cc29843c7772..7ebd6ea9020a 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
 
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 6b5a2caf742b..e70c40ee5840 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -234,7 +234,7 @@ ctxopen(dev_t dev, int flags, int fmt, struct thread *td)
 
 	/* get space for the LUT buffer */
 
-	sr->lutp = malloc(LUTSIZE, M_DEVBUF, 0);
+	sr->lutp = malloc(LUTSIZE, M_DEVBUF, M_WAITOK);
 	if (sr->lutp == NULL)
 		return (ENOMEM);
 
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index 4b7b3cbb5f2f..0a5a0e054fbd 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -184,7 +184,7 @@ gpopen(dev, flags, fmt, td)
 		return (EBUSY);
 
 	/* Have memory for buffer? */
-	sc->sc_inbuf = malloc(BUFSIZE, M_DEVBUF, 0);
+	sc->sc_inbuf = malloc(BUFSIZE, M_DEVBUF, M_WAITOK);
 	if (sc->sc_inbuf == 0)
 		return (ENOMEM);
 
diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c
index a96d5fa280cc..b64f9787ddaa 100644
--- a/sys/i386/isa/if_cx.c
+++ b/sys/i386/isa/if_cx.c
@@ -136,11 +136,11 @@ static struct mbuf *makembuf (void *buf, unsigned len)
 {
 	struct mbuf *m, *o, *p;
 
-	MGETHDR (m, M_NOWAIT, MT_DATA);
+	MGETHDR (m, M_DONTWAIT, MT_DATA);
 	if (! m)
 		return (0);
 	if (len >= MINCLSIZE)
-		MCLGET (m, M_NOWAIT);
+		MCLGET (m, M_DONTWAIT);
 	m->m_pkthdr.len = len;
 	m->m_len = 0;
 
@@ -153,13 +153,13 @@ static struct mbuf *makembuf (void *buf, unsigned len)
 		if (! n) {
 			/* Allocate new mbuf. */
 			o = p;
-			MGET (p, M_NOWAIT, MT_DATA);
+			MGET (p, M_DONTWAIT, MT_DATA);
 			if (! p) {
 				m_freem (m);
 				return (0);
 			}
 			if (len >= MINCLSIZE)
-				MCLGET (p, M_NOWAIT);
+				MCLGET (p, M_DONTWAIT);
 			p->m_len = 0;
 			o->m_next = p;
 
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 60abe60dbe5e..dd6236526d04 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -671,7 +671,7 @@ elget(buf, totlen, ifp)
         cp = buf;
         epkt = cp + totlen;
 
-        MGETHDR(m, M_NOWAIT, MT_DATA);
+        MGETHDR(m, M_DONTWAIT, MT_DATA);
         if (m == 0)
                 return (0);
         m->m_pkthdr.rcvif = ifp;
@@ -681,7 +681,7 @@ elget(buf, totlen, ifp)
         mp = &top;
         while (totlen > 0) {
                 if (top) {
-                        MGET(m, M_NOWAIT, MT_DATA);
+                        MGET(m, M_DONTWAIT, MT_DATA);
                         if (m == 0) {
                                 m_freem(top);
                                 return (0);
@@ -690,7 +690,7 @@ elget(buf, totlen, ifp)
                 }
                 len = min(totlen, epkt - cp);
                 if (len >= MINCLSIZE) {
-                        MCLGET(m, M_NOWAIT);
+                        MCLGET(m, M_DONTWAIT);
                         if (m->m_flags & M_EXT)
                                 m->m_len = len = min(len, MCLBYTES);
                         else
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index d3dd2f13b690..3ed6a96c1701 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -386,7 +386,7 @@ le_input(
     struct ifnet *ifp = &sc->le_if;
     struct mbuf *m;
 
-    MGETHDR(m, M_NOWAIT, MT_DATA);
+    MGETHDR(m, M_DONTWAIT, MT_DATA);
     if (m == NULL) {
 	ifp->if_ierrors++;
 	return;
@@ -394,14 +394,14 @@ le_input(
     m->m_pkthdr.len = total_len;
     m->m_pkthdr.rcvif = ifp;
     if (total_len + LE_XTRA > MHLEN /* >= MINCLSIZE */) {
-	MCLGET(m, M_NOWAIT);
+	MCLGET(m, M_DONTWAIT);
 	if ((m->m_flags & M_EXT) == 0) {
 	    m_free(m);
 	    ifp->if_ierrors++;
 	    return;
 	}
     } else if (total_len + LE_XTRA > MHLEN && MINCLSIZE == (MHLEN+MLEN)) {
-	MGET(m->m_next, M_NOWAIT, MT_DATA);
+	MGET(m->m_next, M_DONTWAIT, MT_DATA);
 	if (m->m_next == NULL) {
 	    m_free(m);
 	    ifp->if_ierrors++;
diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c
index 84cd17490d86..574d3e76a9fa 100644
--- a/sys/i386/isa/if_rdp.c
+++ b/sys/i386/isa/if_rdp.c
@@ -1095,7 +1095,7 @@ rdp_get_packet(struct rdp_softc *sc, unsigned len)
 	size_t s;
 
 	/* Allocate a header mbuf */
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	m->m_pkthdr.rcvif = ifp;
@@ -1109,7 +1109,7 @@ rdp_get_packet(struct rdp_softc *sc, unsigned len)
 	 */
 	if ((len + ETHER_ALIGN) > MHLEN) {
 		/* Attach an mbuf cluster */
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 
 		/* Insist on getting a cluster */
 		if ((m->m_flags & M_EXT) == 0) {
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index 9e32538d24a1..59c4b6e8b7bb 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -402,7 +402,7 @@ loranwrite(dev_t dev, struct uio * uio, int ioflag)
 
 	idx = minor(dev);
 
-	MALLOC(this, struct datapoint *, sizeof *this, M_LORAN, 0);
+	MALLOC(this, struct datapoint *, sizeof *this, M_LORAN, M_WAITOK);
 	c = imin(uio->uio_resid, (int)sizeof *this);
 	err = uiomove((caddr_t)this, c, uio);        
 	if (err) {
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c
index d3362e3462d9..d1041964390f 100644
--- a/sys/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/i386/isa/pcvt/pcvt_kbd.c
@@ -330,7 +330,7 @@ void ovlinit(int force)
 	{
 		if(ovlinitflag == 0 &&
 		   (ovltbl = (Ovl_tbl *)malloc(sizeof(Ovl_tbl) * OVLTBL_SIZE,
-					       M_DEVBUF, 0)) == NULL)
+					       M_DEVBUF, M_WAITOK)) == NULL)
 			panic("pcvt_kbd: malloc of Ovl_tbl failed");
 
 		for(i=0; i<OVLTBL_SIZE; i++)
diff --git a/sys/i386/isa/pcvt/pcvt_out.c b/sys/i386/isa/pcvt/pcvt_out.c
index d908c7bc95eb..8c7793385add 100644
--- a/sys/i386/isa/pcvt/pcvt_out.c
+++ b/sys/i386/isa/pcvt/pcvt_out.c
@@ -1305,7 +1305,7 @@ vt_coldmalloc(void)
 	for(nscr = 0; nscr < PCVT_NSCREENS; nscr++)
 	{
 		if((vs[nscr].Memory = (u_short *)malloc(screen_max_size * 2,
-			 M_DEVBUF, 0)) == NULL)
+			 M_DEVBUF, M_WAITOK)) == NULL)
 		{
 			printf("pcvt: screen memory malloc failed, "
 			       "NSCREEN=%d, nscr=%d\n",
diff --git a/sys/i386/isa/pcvt/pcvt_sup.c b/sys/i386/isa/pcvt/pcvt_sup.c
index 5f08f40c3ecd..4df2971b69bd 100644
--- a/sys/i386/isa/pcvt/pcvt_sup.c
+++ b/sys/i386/isa/pcvt/pcvt_sup.c
@@ -1409,7 +1409,7 @@ loadchar(int fontset, int character, int char_scanlines, u_char *char_table)
 
 	if(saved_charsets[fontset] == 0)
 		saved_charsets[fontset] =
-			(u_char *)malloc(32 * 256, M_DEVBUF, 0);
+			(u_char *)malloc(32 * 256, M_DEVBUF, M_WAITOK);
 
 	if((bak = saved_charsets[fontset]))
 	{
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index e6487c1acb1b..de4c5cab33eb 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -495,7 +495,7 @@ spkropen(dev, flags, fmt, td)
 	(void) printf("spkropen: about to perform play initialization\n");
 #endif /* DEBUG */
 	playinit();
-	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, 0);
+	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, M_WAITOK);
 	spkr_active = TRUE;
 	return(0);
     }
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index c368e4deae74..5284cece0154 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -694,7 +694,7 @@ vesa_bios_init(void)
 		if (modes >= vesa_vmode_max) {
 			vesa_vmode_max += MODE_TABLE_DELTA;
 			p = malloc(sizeof(*vesa_vmode)*(vesa_vmode_max + 1),
-				   M_DEVBUF, 0);
+				   M_DEVBUF, M_WAITOK);
 #if VESA_DEBUG > 1
 			printf("vesa_bios_init(): modes:%d, vesa_mode_max:%d\n",
 			       modes, vesa_vmode_max);
@@ -1341,7 +1341,7 @@ get_palette(video_adapter_t *adp, int base, int count,
 	if (bits <= 6)
 		return 1;
 
-	r = malloc(count*3, M_DEVBUF, 0);
+	r = malloc(count*3, M_DEVBUF, M_WAITOK);
 	g = r + count;
 	b = g + count;
 	error = vesa_bios_save_palette2(base, count, r, g, b, bits);
@@ -1378,7 +1378,7 @@ set_palette(video_adapter_t *adp, int base, int count,
 		|| ((bits = vesa_bios_set_dac(8)) <= 6))
 		return 1;
 
-	r = malloc(count*3, M_DEVBUF, 0);
+	r = malloc(count*3, M_DEVBUF, M_WAITOK);
 	g = r + count;
 	b = g + count;
 	copyin(red, r, count);
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 37627d25b486..ab5d4c3e1a57 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -343,7 +343,7 @@ wtopen (dev_t dev, int flag, int fmt, struct thread *td)
 		return (ENXIO);
 
 	t->bsize = (minor (dev) & WT_BSIZE) ? 1024 : 512;
-	t->buf = malloc (t->bsize, M_TEMP, 0);
+	t->buf = malloc (t->bsize, M_TEMP, M_WAITOK);
 	if (! t->buf)
 		return (EAGAIN);
 
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 70fe108e90c9..63ff5d701f1b 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -731,7 +731,7 @@ linux_aout_coredump(struct thread *td, struct vnode *vp, off_t limit)
 	    vm->vm_dsize + vm->vm_ssize) >= limit)
 		return (EFAULT);
 	tempuser = malloc(ctob(uarea_pages + kstack_pages), M_TEMP,
-	    M_ZERO);
+	    M_WAITOK | M_ZERO);
 	if (tempuser == NULL)
 		return (ENOMEM);
 	PROC_LOCK(p);
diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index e35b4e51857b..33033d221a85 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -255,7 +255,7 @@ i4biprattach(void *dummy)
 
 #ifdef IPR_VJ_USEBUFFER
 		if(!((sc->sc_cbuf =
-		   (u_char *)malloc(I4BIPRMAXMTU+128, M_DEVBUF, 0))))
+		   (u_char *)malloc(I4BIPRMAXMTU+128, M_DEVBUF, M_WAITOK))))
 		{
 			panic("if_ipr.c, ipr_attach: VJ malloc failed");
 		}
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
index ee698c7603c1..c5c3d4714eef 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
@@ -121,7 +121,7 @@ ihfc_ph_data_req(int unit, struct mbuf *m, int freeflag)
 
 	/* "Allow" I-frames (-hp) */
 
-	if (freeflag == MBUF_DONTFREE)	m = m_copypacket(m, M_NOWAIT);
+	if (freeflag == MBUF_DONTFREE)	m = m_copypacket(m, M_DONTWAIT);
 
 	if (!_IF_QFULL(&S_IFQUEUE) && m)
 	{
diff --git a/sys/i4b/layer2/i4b_mbuf.c b/sys/i4b/layer2/i4b_mbuf.c
index c12a9ae97bd9..95f234ce43f3 100644
--- a/sys/i4b/layer2/i4b_mbuf.c
+++ b/sys/i4b/layer2/i4b_mbuf.c
@@ -78,7 +78,7 @@ i4b_Dgetmbuf(int len)
 		return(NULL);
 	}
 
-	MGETHDR(m, M_NOWAIT, MT_I4B_D);	/* get mbuf with pkthdr */
+	MGETHDR(m, M_DONTWAIT, MT_I4B_D);	/* get mbuf with pkthdr */
 
 	/* did we actually get the mbuf ? */
 
@@ -94,7 +94,7 @@ i4b_Dgetmbuf(int len)
 
 	if(len >= MHLEN)
 	{
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 
 		if(!(m->m_flags & M_EXT))
 		{
@@ -155,7 +155,7 @@ i4b_Bgetmbuf(int len)
 		return(NULL);
 	}
 
-	MGETHDR(m, M_NOWAIT, MT_I4B_B);	/* get mbuf with pkthdr */
+	MGETHDR(m, M_DONTWAIT, MT_I4B_B);	/* get mbuf with pkthdr */
 
 	/* did we actually get the mbuf ? */
 
@@ -171,7 +171,7 @@ i4b_Bgetmbuf(int len)
 
 	if(len >= MHLEN)
 	{
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 
 		if(!(m->m_flags & M_EXT))
 		{
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index 95afcc99a892..1dffc0f4625d 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -646,10 +646,10 @@ i4bioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 			}
 
 			prots = malloc(r->numprotos * sizeof(struct isdn_dr_prot),
-					M_DEVBUF, 0);
+					M_DEVBUF, M_WAITOK);
 
 			prots2 = malloc(r->numprotos * sizeof(struct isdn_dr_prot),
-					M_DEVBUF, 0);
+					M_DEVBUF, M_WAITOK);
 
 			if(!prots || !prots2)
 			{
@@ -661,7 +661,7 @@ i4bioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 
 			for(i = 0; i < r->numprotos; i++)
 			{
-				prots2[i].microcode = malloc(prots[i].bytecount, M_DEVBUF, 0);
+				prots2[i].microcode = malloc(prots[i].bytecount, M_DEVBUF, M_WAITOK);
 				copyin(prots[i].microcode, prots2[i].microcode, prots[i].bytecount);
 				prots2[i].bytecount = prots[i].bytecount; 
 			}
@@ -721,7 +721,7 @@ download_done:
 				    	goto diag_done;
 				}	
 
-				req.in_param = malloc(r->in_param_len, M_DEVBUF, 0);
+				req.in_param = malloc(r->in_param_len, M_DEVBUF, M_WAITOK);
 
 				if(!req.in_param)
 				{
@@ -735,7 +735,7 @@ download_done:
 
 			if(req.out_param_len)
 			{
-				req.out_param = malloc(r->out_param_len, M_DEVBUF, 0);
+				req.out_param = malloc(r->out_param_len, M_DEVBUF, M_WAITOK);
 
 				if(!req.out_param)
 				{
diff --git a/sys/ia64/ia32/ia32_misc.c b/sys/ia64/ia32/ia32_misc.c
index d593c04ee1b3..c6f26fe7038e 100644
--- a/sys/ia64/ia32/ia32_misc.c
+++ b/sys/ia64/ia32/ia32_misc.c
@@ -105,7 +105,7 @@ ia32_emul_find(td, sgp, prefix, path, pbuf, cflag)
 	struct vattr		vat;
 	struct vattr		vatroot;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	*pbuf = path;
 
 	for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
@@ -768,8 +768,8 @@ ia32_readv(struct thread *td, struct ia32_readv_args *uap)
 	osize = uap->iovcnt * sizeof (struct iovec32);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, 0);
-	nio = malloc(nsize, M_TEMP, 0);
+	oio = malloc(osize, M_TEMP, M_WAITOK);
+	nio = malloc(nsize, M_TEMP, M_WAITOK);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
@@ -814,8 +814,8 @@ ia32_writev(struct thread *td, struct ia32_writev_args *uap)
 	osize = uap->iovcnt * sizeof (struct iovec32);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, 0);
-	nio = malloc(nsize, M_TEMP, 0);
+	oio = malloc(osize, M_TEMP, M_WAITOK);
+	nio = malloc(nsize, M_TEMP, M_WAITOK);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
diff --git a/sys/ia64/ia64/busdma_machdep.c b/sys/ia64/ia64/busdma_machdep.c
index d12ea4f7ab13..70b8d4c06a79 100644
--- a/sys/ia64/ia64/busdma_machdep.c
+++ b/sys/ia64/ia64/busdma_machdep.c
@@ -347,7 +347,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 
 	if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
 		*vaddr = malloc(dmat->maxsize, M_DEVBUF,
-				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0);
+				(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
 	} else {
 		/*
 		 * XXX Use Contigmalloc until it is merged into this facility
@@ -355,7 +355,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 		 *     multi-seg allocations yet though.
 		 */
 		*vaddr = contigmalloc(dmat->maxsize, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
 		    0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
 		    dmat->boundary);
 	}
diff --git a/sys/ia64/ia64/mca.c b/sys/ia64/ia64/mca.c
index 4109e3de8931..ff66b7a45470 100644
--- a/sys/ia64/ia64/mca.c
+++ b/sys/ia64/ia64/mca.c
@@ -109,7 +109,7 @@ ia64_mca_save_state(int type)
 		mtx_unlock_spin(&mca_info_block_lock);
 
 		totsz = sizeof(struct sysctl_oid) + recsz + 32;
-		oidp = malloc(totsz, M_MCA, M_ZERO);
+		oidp = malloc(totsz, M_MCA, M_WAITOK|M_ZERO);
 		state = (char*)(oidp + 1);
 		name = state + recsz;
 		sprintf(name, "%lld", (long long)seqnr);
@@ -199,8 +199,8 @@ ia64_mca_init(void)
 	max_size = round_page(max_size);
 
 	if (max_size) {
-		p = contigmalloc(max_size, M_TEMP, 0, 0ul, 256*1024*1024 - 1,
-		    PAGE_SIZE, 256*1024*1024);
+		p = contigmalloc(max_size, M_TEMP, M_WAITOK, 0ul,
+		    256*1024*1024 - 1, PAGE_SIZE, 256*1024*1024);
 		mca_info_block = IA64_PHYS_TO_RR7(ia64_tpa((u_int64_t)p));
 
 		if (bootverbose)
diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c
index 2a7ff9f95f9c..4ef629bdcbe6 100644
--- a/sys/ia64/ia64/mp_machdep.c
+++ b/sys/ia64/ia64/mp_machdep.c
@@ -222,7 +222,7 @@ cpu_mp_start()
 			 * recording a trapframe.
 			 */
 			ks = contigmalloc(KSTACK_PAGES * PAGE_SIZE, M_TEMP,
-					  0,
+					  M_WAITOK,
 					  0ul,
 					  256*1024*1024 - 1,
 					  PAGE_SIZE,
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c
index 82135fe26a47..0be8b8335e86 100644
--- a/sys/ia64/ia64/pmap.c
+++ b/sys/ia64/ia64/pmap.c
@@ -748,7 +748,7 @@ pmap_new_thread(struct thread *td, int pages)
 	 * 7 address for it which makes it impossible to accidentally
 	 * lose when recording a trapframe.
 	 */
-	ks = contigmalloc(pages * PAGE_SIZE, M_PMAP, 0, 0ul,
+	ks = contigmalloc(pages * PAGE_SIZE, M_PMAP, M_WAITOK, 0ul,
 	    256*1024*1024 - 1, PAGE_SIZE, 256*1024*1024);
 	if (ks == NULL)
 		panic("pmap_new_thread: could not contigmalloc %d pages\n",
@@ -1214,7 +1214,7 @@ pmap_find_pte(vm_offset_t va)
 
 	pte = pmap_find_vhpt(va);
 	if (!pte) {
-		pte = uma_zalloc(ptezone, 0);
+		pte = uma_zalloc(ptezone, M_WAITOK);
 		pte->pte_p = 0;
 	}
 	return pte;
diff --git a/sys/ia64/ia64/sscdisk.c b/sys/ia64/ia64/sscdisk.c
index 64435b0f1cee..3943cbd122db 100644
--- a/sys/ia64/ia64/sscdisk.c
+++ b/sys/ia64/ia64/sscdisk.c
@@ -195,7 +195,7 @@ ssccreate(int unit)
 		if (sc->unit == unit)
 			return (NULL);
 	}
-	MALLOC(sc, struct ssc_s *,sizeof(*sc), M_SSC, M_ZERO);
+	MALLOC(sc, struct ssc_s *,sizeof(*sc), M_SSC, M_WAITOK | M_ZERO);
 	LIST_INSERT_HEAD(&ssc_softc_list, sc, list);
 	sc->unit = unit;
 	bioq_init(&sc->bio_queue);
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index f9161176bc53..a44df4caa371 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -411,7 +411,7 @@ iso_mountfs(devvp, mp, td, argp)
 		 pri_sierra->root_directory_record:
 		 pri->root_directory_record);
 
-	isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_ZERO);
+	isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_WAITOK | M_ZERO);
 	isomp->logical_block_size = logical_block_size;
 	isomp->volume_space_size =
 		isonum_733 (high_sierra?
@@ -712,7 +712,7 @@ cd9660_vget_internal(mp, ino, flags, vpp, relocated, isodir)
 		return (error);
 	}
 	MALLOC(ip, struct iso_node *, sizeof(struct iso_node), M_ISOFSNODE,
-	    M_ZERO);
+	    M_WAITOK | M_ZERO);
 	vp->v_data = ip;
 	ip->i_vnode = vp;
 	ip->i_dev = dev;
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 062c22aa27c1..0b892e6e8012 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -194,7 +194,7 @@ cd9660_getattr(ap)
 		struct uio auio;
 		char *cp;
 
-		MALLOC(cp, char *, MAXPATHLEN, M_TEMP, 0);
+		MALLOC(cp, char *, MAXPATHLEN, M_TEMP, M_WAITOK);
 		aiov.iov_base = cp;
 		aiov.iov_len = MAXPATHLEN;
 		auio.uio_iov = &aiov;
@@ -451,7 +451,7 @@ cd9660_readdir(ap)
 	imp = dp->i_mnt;
 	bmask = imp->im_bmask;
 
-	MALLOC(idp, struct isoreaddir *, sizeof(*idp), M_TEMP, 0);
+	MALLOC(idp, struct isoreaddir *, sizeof(*idp), M_TEMP, M_WAITOK);
 	idp->saveent.d_namlen = idp->assocent.d_namlen = 0;
 	/*
 	 * XXX
@@ -468,7 +468,7 @@ cd9660_readdir(ap)
 		 */
 		ncookies = uio->uio_resid / 16;
 		MALLOC(cookies, u_long *, ncookies * sizeof(u_int), M_TEMP,
-		    0);
+		    M_WAITOK);
 		idp->cookies = cookies;
 		idp->ncookies = ncookies;
 	}
@@ -671,7 +671,7 @@ cd9660_readlink(ap)
 	if (uio->uio_segflg == UIO_SYSSPACE)
 		symname = uio->uio_iov->iov_base;
 	else
-		symname = uma_zalloc(namei_zone, 0);
+		symname = uma_zalloc(namei_zone, M_WAITOK);
 	
 	/*
 	 * Ok, we just gathering a symbolic name in SL record.
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index a11c17dc8676..e96054a19bed 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -276,7 +276,7 @@ aout_coredump(td, vp, limit)
 	    + vm->vm_dsize + vm->vm_ssize) >= limit)
 		return (EFAULT);
 	tempuser = malloc(ctob(uarea_pages + kstack_pages), M_TEMP,
-	    M_ZERO);
+	    M_WAITOK | M_ZERO);
 	if (tempuser == NULL)
 		return (ENOMEM);
 	PROC_LOCK(p);
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index e0d49d4a92f5..f6b0cb2175b4 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -516,7 +516,7 @@ __elfN(load_file)(struct proc *p, const char *file, u_long *addr,
 	if (curthread->td_proc != p)
 		panic("elf_load_file - thread");	/* XXXKSE DIAGNOSTIC */
 
-	tempdata = malloc(sizeof(*tempdata), M_TEMP, 0);
+	tempdata = malloc(sizeof(*tempdata), M_TEMP, M_WAITOK);
 	nd = &tempdata->nd;
 	attr = &tempdata->attr;
 	imgp = &tempdata->image_params;
@@ -812,7 +812,7 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)
 
 	imgp->proc->p_sysent = sv;
 	if (interp != NULL) {
-		path = malloc(MAXPATHLEN, M_TEMP, 0);
+		path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 		snprintf(path, MAXPATHLEN, "%s%s", brand_info->emul_path,
 		    interp);
 		if ((error = __elfN(load_file)(imgp->proc, path, &addr,
@@ -831,7 +831,7 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)
 	/*
 	 * Construct auxargs table (used by the fixup routine)
 	 */
-	elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, 0);
+	elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, M_WAITOK);
 	elf_auxargs->execfd = -1;
 	elf_auxargs->phdr = proghdr;
 	elf_auxargs->phent = hdr->e_phentsize;
@@ -951,7 +951,7 @@ __elfN(coredump)(td, vp, limit)
 	 * Allocate memory for building the header, fill it up,
 	 * and write it out.
 	 */
-	hdr = malloc(hdrsize, M_TEMP, 0);
+	hdr = malloc(hdrsize, M_TEMP, M_WAITOK);
 	if (hdr == NULL) {
 		return (EINVAL);
 	}
@@ -1113,7 +1113,7 @@ __elfN(corehdr)(td, vp, cred, numsegs, hdr, hdrsize)
 	prfpregset_t *fpregset;
 	prpsinfo_t *psinfo;
 
-	tempdata = malloc(sizeof(*tempdata), M_TEMP, M_ZERO | 0);
+	tempdata = malloc(sizeof(*tempdata), M_TEMP, M_ZERO | M_WAITOK);
 	status = &tempdata->status;
 	fpregset = &tempdata->fpregset;
 	psinfo = &tempdata->psinfo;
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index e8142944b009..2a16ba2c2d08 100644
--- a/sys/kern/inflate.c
+++ b/sys/kern/inflate.c
@@ -551,7 +551,7 @@ huft_build(glbl, b, n, s, d, e, t, m)
 				l[h] = j;	/* set table size in stack */
 
 				/* allocate and link in new table */
-				if ((q = (struct huft *) malloc((z + 1) * sizeof(struct huft), M_GZIP, 0)) ==
+				if ((q = (struct huft *) malloc((z + 1) * sizeof(struct huft), M_GZIP, M_WAITOK)) ==
 				    (struct huft *) NULL) {
 					if (h)
 						huft_free(glbl, u[0]);
@@ -1049,7 +1049,7 @@ inflate(glbl)
 	u_char		*p = NULL;
 
 	if (!glbl->gz_slide)
-		p = glbl->gz_slide = malloc(GZ_WSIZE, M_GZIP, 0);
+		p = glbl->gz_slide = malloc(GZ_WSIZE, M_GZIP, M_WAITOK);
 #endif
 	if (!glbl->gz_slide)
 #ifdef _KERNEL
diff --git a/sys/kern/kern_alq.c b/sys/kern/kern_alq.c
index 7e86b55be861..7ddacc811b15 100644
--- a/sys/kern/kern_alq.c
+++ b/sys/kern/kern_alq.c
@@ -352,9 +352,9 @@ alq_open(struct alq **alqp, const char *file, int size, int count)
 	/* We just unlock so we hold a reference */
 	VOP_UNLOCK(nd.ni_vp, 0, td);
 
-	alq = malloc(sizeof(*alq), M_ALD, M_ZERO);
-	alq->aq_entbuf = malloc(count * size, M_ALD, M_ZERO);
-	alq->aq_first = malloc(sizeof(*ale) * count, M_ALD, M_ZERO);
+	alq = malloc(sizeof(*alq), M_ALD, M_WAITOK|M_ZERO);
+	alq->aq_entbuf = malloc(count * size, M_ALD, M_WAITOK|M_ZERO);
+	alq->aq_first = malloc(sizeof(*ale) * count, M_ALD, M_WAITOK|M_ZERO);
 	alq->aq_vp = nd.ni_vp;
 	alq->aq_cred = crhold(td->td_ucred);
 	alq->aq_entmax = count;
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 342673eabcd3..97298d59d2f1 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -697,7 +697,7 @@ fsetown(pgid, sigiop)
 	ret = 0;
 
 	/* Allocate and fill in the new sigio out of locks. */
-	MALLOC(sigio, struct sigio *, sizeof(struct sigio), M_SIGIO, 0);
+	MALLOC(sigio, struct sigio *, sizeof(struct sigio), M_SIGIO, M_WAITOK);
 	sigio->sio_pgid = pgid;
 	sigio->sio_ucred = crhold(curthread->td_ucred);
 	sigio->sio_myref = sigiop;
@@ -1082,7 +1082,7 @@ fdalloc(td, want, result)
 		 * than KMEM_ZMAX bytes. uma_large_malloc() requires Giant.
 		 */
 		mtx_lock(&Giant);
-		newofile = malloc(nfiles * OFILESIZE, M_FILEDESC, 0);
+		newofile = malloc(nfiles * OFILESIZE, M_FILEDESC, M_WAITOK);
 		mtx_unlock(&Giant);
 
 		/*
@@ -1173,7 +1173,7 @@ falloc(td, resultfp, resultfd)
 	struct file *fp, *fq;
 	int error, i;
 
-	fp = uma_zalloc(file_zone, M_ZERO);
+	fp = uma_zalloc(file_zone, M_WAITOK | M_ZERO);
 	sx_xlock(&filelist_lock);
 	if (nfiles >= maxfiles) {
 		sx_xunlock(&filelist_lock);
@@ -1243,7 +1243,7 @@ fdinit(fdp)
 	struct filedesc0 *newfdp;
 
 	MALLOC(newfdp, struct filedesc0 *, sizeof(struct filedesc0),
-	    M_FILEDESC, M_ZERO);
+	    M_FILEDESC, M_WAITOK | M_ZERO);
 	mtx_init(&newfdp->fd_fd.fd_mtx, FILEDESC_LOCK_DESC, NULL, MTX_DEF);
 	newfdp->fd_fd.fd_cdir = fdp->fd_cdir;
 	if (newfdp->fd_fd.fd_cdir)
@@ -1299,7 +1299,7 @@ fdcopy(fdp)
 
 	FILEDESC_UNLOCK(fdp);
 	MALLOC(newfdp, struct filedesc *, sizeof(struct filedesc0),
-	    M_FILEDESC, 0);
+	    M_FILEDESC, M_WAITOK);
 	FILEDESC_LOCK(fdp);
 	bcopy(fdp, newfdp, sizeof(struct filedesc));
 	FILEDESC_UNLOCK(fdp);
@@ -1339,7 +1339,7 @@ retry:
 			i /= 2;
 		FILEDESC_UNLOCK(fdp);
 		MALLOC(newfdp->fd_ofiles, struct file **, i * OFILESIZE,
-		    M_FILEDESC, 0);
+		    M_FILEDESC, M_WAITOK);
 		FILEDESC_LOCK(fdp);
 		newfdp->fd_lastfile = fdp->fd_lastfile;
 		newfdp->fd_nfiles = fdp->fd_nfiles;
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index 70ba635c5375..98f5fc64a807 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -131,7 +131,7 @@ kenv(td, uap)
 			return (error);
 	}
 
-	name = malloc(KENV_MNAMELEN, M_TEMP, 0);
+	name = malloc(KENV_MNAMELEN, M_TEMP, M_WAITOK);
 
 	error = copyinstr(uap->name, name, KENV_MNAMELEN, NULL);
 	if (error)
@@ -166,7 +166,7 @@ kenv(td, uap)
 		}
 		if (len > KENV_MVALLEN)
 			len = KENV_MVALLEN;
-		value = malloc(len, M_TEMP, 0);
+		value = malloc(len, M_TEMP, M_WAITOK);
 		error = copyinstr(uap->value, value, len, NULL);
 		if (error) {
 			free(value, M_TEMP);
@@ -207,11 +207,11 @@ init_dynamic_kenv(void *data __unused)
 	char *cp;
 	int len, i;
 
-	kenvp = malloc(KENV_SIZE * sizeof(char *), M_KENV, M_ZERO);
+	kenvp = malloc(KENV_SIZE * sizeof(char *), M_KENV, M_WAITOK | M_ZERO);
 	i = 0;
 	for (cp = kern_envp; cp != NULL; cp = kernenv_next(cp)) {
 		len = strlen(cp) + 1;
-		kenvp[i] = malloc(len, M_KENV, 0);
+		kenvp[i] = malloc(len, M_KENV, M_WAITOK);
 		strcpy(kenvp[i++], cp);
 	}
 	kenvp[i] = NULL;
@@ -290,7 +290,7 @@ getenv(const char *name)
 			strcpy(buf, cp);
 			sx_sunlock(&kenv_lock);
 			len = strlen(buf) + 1;
-			ret = malloc(len, M_KENV, 0);
+			ret = malloc(len, M_KENV, M_WAITOK);
 			strcpy(ret, buf);
 		} else {
 			sx_sunlock(&kenv_lock);
@@ -337,7 +337,7 @@ setenv(const char *name, const char *value)
 	vallen = strlen(value) + 1;
 	if (vallen > KENV_MVALLEN)
 		return (-1);
-	buf = malloc(namelen + vallen, M_KENV, 0);
+	buf = malloc(namelen + vallen, M_KENV, M_WAITOK);
 	sprintf(buf, "%s=%s", name, value);
 
 	sx_xlock(&kenv_lock);
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 4910b7e1ec4c..8c552d1a4ea7 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -330,7 +330,7 @@ filt_timerattach(struct knote *kn)
 
 	kn->kn_flags |= EV_CLEAR;		/* automatically set */
 	MALLOC(calloutp, struct callout *, sizeof(*calloutp),
-	    M_KQUEUE, 0);
+	    M_KQUEUE, M_WAITOK);
 	callout_init(calloutp, 0);
 	callout_reset(calloutp, tticks, filt_timerexpire, kn);
 	kn->kn_hook = calloutp;
@@ -372,7 +372,7 @@ kqueue(struct thread *td, struct kqueue_args *uap)
 	error = falloc(td, &fp, &fd);
 	if (error)
 		goto done2;
-	kq = malloc(sizeof(struct kqueue), M_KQUEUE, M_ZERO);
+	kq = malloc(sizeof(struct kqueue), M_KQUEUE, M_WAITOK | M_ZERO);
 	TAILQ_INIT(&kq->kq_head);
 	FILE_LOCK(fp);
 	fp->f_flag = FREAD | FWRITE;
@@ -980,7 +980,7 @@ knote_attach(struct knote *kn, struct filedesc *fdp)
 			size += KQEXTENT;
 		FILEDESC_UNLOCK(fdp);
 		MALLOC(list, struct klist *,
-		    size * sizeof(struct klist *), M_KQUEUE, 0);
+		    size * sizeof(struct klist *), M_KQUEUE, M_WAITOK);
 		FILEDESC_LOCK(fdp);
 		if (fdp->fd_knlistsize > kn->kn_id) {
 			FREE(list, M_KQUEUE);
@@ -1074,7 +1074,7 @@ SYSINIT(knote, SI_SUB_PSEUDO, SI_ORDER_ANY, knote_init, NULL)
 static struct knote *
 knote_alloc(void)
 {
-	return ((struct knote *)uma_zalloc(knote_zone, 0));
+	return ((struct knote *)uma_zalloc(knote_zone, M_WAITOK));
 }
 
 static void
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index b6d77d2d975a..f239ab7ad3e7 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -425,7 +425,7 @@ interpret:
 		oldprocsig = p->p_procsig;
 		PROC_UNLOCK(p);
 		MALLOC(newprocsig, struct procsig *, sizeof(struct procsig),
-		    M_SUBPROC, 0);
+		    M_SUBPROC, M_WAITOK);
 		bcopy(oldprocsig, newprocsig, sizeof(*newprocsig));
 		newprocsig->ps_refcnt = 1;
 		oldprocsig->ps_refcnt--;
@@ -1171,7 +1171,7 @@ exec_register(execsw_arg)
 	if (execsw)
 		for (es = execsw; *es; es++)
 			count++;
-	newexecsw = malloc(count * sizeof(*es), M_TEMP, 0);
+	newexecsw = malloc(count * sizeof(*es), M_TEMP, M_WAITOK);
 	if (newexecsw == NULL)
 		return (ENOMEM);
 	xs = newexecsw;
@@ -1205,7 +1205,7 @@ exec_unregister(execsw_arg)
 	for (es = execsw; *es; es++)
 		if (*es != execsw_arg)
 			count++;
-	newexecsw = malloc(count * sizeof(*es), M_TEMP, 0);
+	newexecsw = malloc(count * sizeof(*es), M_TEMP, M_WAITOK);
 	if (newexecsw == NULL)
 		return (ENOMEM);
 	xs = newexecsw;
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index abf9025c7a09..2e0e7098fa49 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -228,7 +228,7 @@ exit1(td, rv)
 
 
 	MALLOC(p->p_ru, struct rusage *, sizeof(struct rusage),
-		M_ZOMBIE, 0);
+		M_ZOMBIE, M_WAITOK);
 	/*
 	 * If parent is waiting for us to exit or exec,
 	 * P_PPWAIT is set; we will wakeup the parent below.
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 6089c922664a..5c36a246ea7f 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -313,7 +313,7 @@ fork1(td, flags, pages, procp)
 	}
 
 	/* Allocate new proc. */
-	newproc = uma_zalloc(proc_zone, 0);
+	newproc = uma_zalloc(proc_zone, M_WAITOK);
 #ifdef MAC
 	mac_init_proc(newproc);
 #endif
@@ -438,12 +438,12 @@ again:
 	 */
 	if (flags & RFSIGSHARE) {
 		MALLOC(newsigacts, struct sigacts *,
-		    sizeof(struct sigacts), M_SUBPROC, 0);
+		    sizeof(struct sigacts), M_SUBPROC, M_WAITOK);
 		newprocsig = NULL;
 	} else {
 		newsigacts = NULL;
 		MALLOC(newprocsig, struct procsig *, sizeof(struct procsig),
-		    M_SUBPROC, 0);
+		    M_SUBPROC, M_WAITOK);
 	}
 
 	/*
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index 53308680e79f..a0a7e0d1e0e0 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -177,7 +177,7 @@ ithread_create(struct ithd **ithread, int vector, int flags,
 	if ((flags & ~IT_SOFT) != 0)
 		return (EINVAL);
 
-	ithd = malloc(sizeof(struct ithd), M_ITHREAD, M_ZERO);
+	ithd = malloc(sizeof(struct ithd), M_ITHREAD, M_WAITOK | M_ZERO);
 	ithd->it_vector = vector;
 	ithd->it_disable = disable;
 	ithd->it_enable = enable;
@@ -249,7 +249,7 @@ ithread_add_handler(struct ithd* ithread, const char *name,
 	if ((flags & INTR_FAST) !=0)
 		flags |= INTR_EXCL;
 
-	ih = malloc(sizeof(struct intrhand), M_ITHREAD, M_ZERO);
+	ih = malloc(sizeof(struct intrhand), M_ITHREAD, M_WAITOK | M_ZERO);
 	ih->ih_handler = handler;
 	ih->ih_argument = arg;
 	ih->ih_name = name;
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index f367d4f56e05..15f4b36450d8 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -72,7 +72,7 @@ jail(td, uap)
 	if (j.version != 0)
 		return (EINVAL);
 
-	MALLOC(pr, struct prison *, sizeof *pr , M_PRISON, M_ZERO);
+	MALLOC(pr, struct prison *, sizeof *pr , M_PRISON, M_WAITOK | M_ZERO);
 	mtx_init(&pr->pr_mtx, "jail mutex", NULL, MTX_DEF);
 	pr->pr_securelevel = securelevel;
 	error = copyinstr(j.hostname, &pr->pr_host, sizeof pr->pr_host, 0);
diff --git a/sys/kern/kern_kse.c b/sys/kern/kern_kse.c
index b3017d0520ce..55b0f24aa833 100644
--- a/sys/kern/kern_kse.c
+++ b/sys/kern/kern_kse.c
@@ -899,7 +899,7 @@ thread_reap(void)
 struct ksegrp *
 ksegrp_alloc(void)
 {
-	return (uma_zalloc(ksegrp_zone, 0));
+	return (uma_zalloc(ksegrp_zone, M_WAITOK));
 }
 
 /*
@@ -908,7 +908,7 @@ ksegrp_alloc(void)
 struct kse *
 kse_alloc(void)
 {
-	return (uma_zalloc(kse_zone, 0));
+	return (uma_zalloc(kse_zone, M_WAITOK));
 }
 
 /*
@@ -918,7 +918,7 @@ struct thread *
 thread_alloc(void)
 {
 	thread_reap(); /* check if any zombies to get */
-	return (uma_zalloc(thread_zone, 0));
+	return (uma_zalloc(thread_zone, M_WAITOK));
 }
 
 /*
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 23f6f7ba7515..bb4642c5acb3 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -131,7 +131,7 @@ ktrace_init(void *dummy)
 	STAILQ_INIT(&ktr_todo);
 	STAILQ_INIT(&ktr_free);
 	for (i = 0; i < ktr_requestpool; i++) {
-		req = malloc(sizeof(struct ktr_request), M_KTRACE, 0);
+		req = malloc(sizeof(struct ktr_request), M_KTRACE, M_WAITOK);
 		STAILQ_INSERT_HEAD(&ktr_free, req, ktr_list);
 	}
 	kthread_create(ktr_loop, NULL, NULL, RFHIGHPID, 0, "ktrace");
@@ -199,7 +199,7 @@ ktrace_resize_pool(uint newsize)
 		while (ktr_requestpool < newsize) {
 			mtx_unlock(&ktrace_mtx);
 			req = malloc(sizeof(struct ktr_request), M_KTRACE,
-			    0);
+			    M_WAITOK);
 			mtx_lock(&ktrace_mtx);
 			STAILQ_INSERT_HEAD(&ktr_free, req, ktr_list);
 			ktr_requestpool++;
@@ -321,7 +321,7 @@ ktrsyscall(code, narg, args)
 
 	buflen = sizeof(register_t) * narg;
 	if (buflen > 0) {
-		buf = malloc(buflen, M_KTRACE, 0);
+		buf = malloc(buflen, M_KTRACE, M_WAITOK);
 		bcopy(args, buf, buflen);
 	}
 	req = ktr_getrequest(KTR_SYSCALL);
@@ -371,7 +371,7 @@ ktrnamei(path)
 
 	namelen = strlen(path);
 	if (namelen > 0) {
-		buf = malloc(namelen, M_KTRACE, 0);
+		buf = malloc(namelen, M_KTRACE, M_WAITOK);
 		bcopy(path, buf, namelen);
 	}
 	req = ktr_getrequest(KTR_NAMEI);
@@ -413,7 +413,7 @@ ktrgenio(fd, rw, uio, error)
 	uio->uio_offset = 0;
 	uio->uio_rw = UIO_WRITE;
 	datalen = imin(uio->uio_resid, ktr_geniosize);
-	buf = malloc(datalen, M_KTRACE, 0);
+	buf = malloc(datalen, M_KTRACE, M_WAITOK);
 	if (uiomove(buf, datalen, uio)) {
 		free(buf, M_KTRACE);
 		return;
@@ -625,7 +625,7 @@ utrace(td, uap)
 		return (0);
 	if (uap->len > KTR_USER_MAXLEN)
 		return (EINVAL);
-	cp = malloc(uap->len, M_KTRACE, 0);
+	cp = malloc(uap->len, M_KTRACE, M_WAITOK);
 	error = copyin(uap->addr, cp, uap->len);
 	if (error) {
 		free(cp, M_KTRACE);
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index fcecdd954f5b..3c38baca614a 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -110,7 +110,7 @@ linker_strdup(const char *str)
 {
 	char *result;
 
-	if ((result = malloc((strlen(str) + 1), M_LINKER, 0)) != NULL)
+	if ((result = malloc((strlen(str) + 1), M_LINKER, M_WAITOK)) != NULL)
 		strcpy(result, str);
 	return (result);
 }
@@ -402,7 +402,7 @@ linker_find_file_by_name(const char *filename)
 	linker_file_t lf = 0;
 	char *koname;
 
-	koname = malloc(strlen(filename) + 4, M_LINKER, 0);
+	koname = malloc(strlen(filename) + 4, M_LINKER, M_WAITOK);
 	if (koname == NULL)
 		goto out;
 	sprintf(koname, "%s.ko", filename);
@@ -444,7 +444,7 @@ linker_make_file(const char *pathname, linker_class_t lc)
 	filename = linker_basename(pathname);
 
 	KLD_DPF(FILE, ("linker_make_file: new file, filename=%s\n", filename));
-	lf = (linker_file_t)kobj_create((kobj_class_t)lc, M_LINKER, 0);
+	lf = (linker_file_t)kobj_create((kobj_class_t)lc, M_LINKER, M_WAITOK);
 	if (lf == NULL)
 		goto out;
 	lf->refs = 1;
@@ -558,7 +558,7 @@ linker_file_add_dependency(linker_file_t file, linker_file_t dep)
 	linker_file_t *newdeps;
 
 	newdeps = malloc((file->ndeps + 1) * sizeof(linker_file_t *),
-	    M_LINKER, M_ZERO);
+	    M_LINKER, M_WAITOK | M_ZERO);
 	if (newdeps == NULL)
 		return (ENOMEM);
 
@@ -644,7 +644,7 @@ linker_file_lookup_symbol(linker_file_t file, const char *name, int deps)
 		common_size = (common_size + sizeof(int) - 1) & -sizeof(int);
 		cp = malloc(sizeof(struct common_symbol)
 		    + common_size + strlen(name) + 1, M_LINKER,
-		    M_ZERO);
+		    M_WAITOK | M_ZERO);
 		if (cp == NULL) {
 			KLD_DPF(SYM, ("linker_file_lookup_symbol: nomem\n"));
 			return (0);
@@ -753,7 +753,7 @@ kldload(struct thread *td, struct kldload_args *uap)
 	if ((error = suser(td)) != 0)
 		goto out;
 
-	pathname = malloc(MAXPATHLEN, M_TEMP, 0);
+	pathname = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	if ((error = copyinstr(uap->file, pathname, MAXPATHLEN, NULL)) != 0)
 		goto out;
 
@@ -839,7 +839,7 @@ kldfind(struct thread *td, struct kldfind_args *uap)
 	mtx_lock(&Giant);
 	td->td_retval[0] = -1;
 
-	pathname = malloc(MAXPATHLEN, M_TEMP, 0);
+	pathname = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	if ((error = copyinstr(uap->file, pathname, MAXPATHLEN, NULL)) != 0)
 		goto out;
 
@@ -1011,7 +1011,7 @@ kldsym(struct thread *td, struct kldsym_args *uap)
 		error = EINVAL;
 		goto out;
 	}
-	symstr = malloc(MAXPATHLEN, M_TEMP, 0);
+	symstr = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	if ((error = copyinstr(lookup.symname, symstr, MAXPATHLEN, NULL)) != 0)
 		goto out;
 	if (uap->fileid != 0) {
@@ -1381,7 +1381,7 @@ linker_lookup_file(const char *path, int pathlen, const char *name,
 	sep = (path[pathlen - 1] != '/') ? "/" : "";
 
 	reclen = pathlen + strlen(sep) + namelen + extlen + 1;
-	result = malloc(reclen, M_LINKER, 0);
+	result = malloc(reclen, M_LINKER, M_WAITOK);
 	for (cpp = linker_ext_list; *cpp; cpp++) {
 		snprintf(result, reclen, "%.*s%s%.*s%s", pathlen, path, sep,
 		    namelen, name, *cpp);
@@ -1433,7 +1433,7 @@ linker_hints_lookup(const char *path, int pathlen, const char *modname,
 	sep = (path[pathlen - 1] != '/') ? "/" : "";
 	reclen = imax(modnamelen, strlen(linker_hintfile)) + pathlen +
 	    strlen(sep) + 1;
-	pathbuf = malloc(reclen, M_LINKER, 0);
+	pathbuf = malloc(reclen, M_LINKER, M_WAITOK);
 	snprintf(pathbuf, reclen, "%.*s%s%s", pathlen, path, sep,
 	    linker_hintfile);
 
@@ -1456,7 +1456,7 @@ linker_hints_lookup(const char *path, int pathlen, const char *modname,
 		printf("hints file too large %ld\n", (long)vattr.va_size);
 		goto bad;
 	}
-	hints = malloc(vattr.va_size, M_TEMP, 0);
+	hints = malloc(vattr.va_size, M_TEMP, M_WAITOK);
 	if (hints == NULL)
 		goto bad;
 	error = vn_rdwr(UIO_READ, nd.ni_vp, (caddr_t)hints, vattr.va_size, 0,
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index b5d420453f4d..cb1fad413389 100644
--- a/sys/kern/kern_lockf.c
+++ b/sys/kern/kern_lockf.c
@@ -160,7 +160,7 @@ lf_advlock(ap, head, size)
 	/*
 	 * Create the lockf structure
 	 */
-	MALLOC(lock, struct lockf *, sizeof *lock, M_LOCKF, 0);
+	MALLOC(lock, struct lockf *, sizeof *lock, M_LOCKF, M_WAITOK);
 	lock->lf_start = start;
 	lock->lf_end = end;
 	lock->lf_id = ap->a_id;
@@ -726,7 +726,7 @@ lf_split(lock1, lock2)
 	 * Make a new lock consisting of the last part of
 	 * the encompassing lock
 	 */
-	MALLOC(splitlock, struct lockf *, sizeof *splitlock, M_LOCKF, 0);
+	MALLOC(splitlock, struct lockf *, sizeof *splitlock, M_LOCKF, M_WAITOK);
 	bcopy(lock1, splitlock, sizeof *splitlock);
 	splitlock->lf_start = lock2->lf_end + 1;
 	TAILQ_INIT(&splitlock->lf_blkhd);
diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c
index b4df06f8964f..e9d9eeb3b51a 100644
--- a/sys/kern/kern_mac.c
+++ b/sys/kern/kern_mac.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, 0);
+	mac_init_socket_label(&intlabel, M_WAITOK);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, 0);
+	    buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, 0);
+	    elements, buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, 0);
+	    elements, buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, 0);
+			    elements, buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, 0);
+		    buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 33d23f101961..c18212034dc3 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -173,7 +173,7 @@ malloc(size, type, flags)
 #endif
 	if (!(flags & M_NOWAIT))
 		KASSERT(curthread->td_intr_nesting_level == 0,
-		   ("malloc() without M_NOWAIT in interrupt context"));
+		   ("malloc(M_WAITOK) in interrupt context"));
 	if (size <= KMEM_ZMAX) {
 		if (size & KMEM_ZMASK)
 			size = (size & ~KMEM_ZMASK) + KMEM_ZBASE;
@@ -206,7 +206,7 @@ out:
 
 	mtx_unlock(&ksp->ks_mtx);
 	if (!(flags & M_NOWAIT))
-		KASSERT(va != NULL, ("malloc() without M_NOWAIT returned NULL"));
+		KASSERT(va != NULL, ("malloc(M_WAITOK) returned NULL"));
 	if (va == NULL) {
 		t_malloc_fail = time_uptime;
 	}
@@ -501,7 +501,7 @@ sysctl_kern_malloc(SYSCTL_HANDLER_ARGS)
 
 	mtx_unlock(&malloc_mtx);
 	bufsize = linesize * (cnt + 1);
-	p = buf = (char *)malloc(bufsize, M_TEMP, M_ZERO);
+	p = buf = (char *)malloc(bufsize, M_TEMP, M_WAITOK|M_ZERO);
 	mtx_lock(&malloc_mtx);
 
 	len = snprintf(p, linesize,
@@ -581,7 +581,7 @@ sysctl_kern_mprof(SYSCTL_HANDLER_ARGS)
 	waste = 0;
 	mem = 0;
 
-	p = buf = (char *)malloc(bufsize, M_TEMP, M_ZERO);
+	p = buf = (char *)malloc(bufsize, M_TEMP, M_WAITOK|M_ZERO);
 	len = snprintf(p, bufsize,
 	    "\n  Size                    Requests  Real Size\n");
 	bufsize -= len;
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index 84ad1c62a143..677d9f15fe4c 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -132,7 +132,7 @@ module_register(const moduledata_t *data, linker_file_t container)
 	}
 	MOD_SUNLOCK;
 	namelen = strlen(data->name) + 1;
-	newmod = malloc(sizeof(struct module) + namelen, M_MODULE, 0);
+	newmod = malloc(sizeof(struct module) + namelen, M_MODULE, M_WAITOK);
 	if (newmod == NULL)
 		return (ENOMEM);
 	MOD_XLOCK;
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 73062c2f23ea..00f61866deb7 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -975,7 +975,7 @@ pargs_alloc(int len)
 	struct pargs *pa;
 
 	MALLOC(pa, struct pargs *, sizeof(struct pargs) + len, M_PARGS,
-		0);
+		M_WAITOK);
 	pa->ar_ref = 1;
 	pa->ar_length = len;
 	return (pa);
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index e89f342279c9..027913745f75 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -336,8 +336,8 @@ setsid(register struct thread *td, struct setsid_args *uap)
 	error = 0;
 	pgrp = NULL;
 
-	MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, M_ZERO);
-	MALLOC(newsess, struct session *, sizeof(struct session), M_SESSION, M_ZERO);
+	MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, M_WAITOK | M_ZERO);
+	MALLOC(newsess, struct session *, sizeof(struct session), M_SESSION, M_WAITOK | M_ZERO);
 
 	sx_xlock(&proctree_lock);
 
@@ -399,7 +399,7 @@ setpgid(struct thread *td, register struct setpgid_args *uap)
 
 	error = 0;
 
-	MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, M_ZERO);
+	MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, M_WAITOK | M_ZERO);
 
 	sx_xlock(&proctree_lock);
 	if (uap->pid != 0 && uap->pid != curp->p_pid) {
@@ -1678,7 +1678,7 @@ crget(void)
 {
 	register struct ucred *cr;
 
-	MALLOC(cr, struct ucred *, sizeof(*cr), M_CRED, M_ZERO);
+	MALLOC(cr, struct ucred *, sizeof(*cr), M_CRED, M_WAITOK | M_ZERO);
 	cr->cr_ref = 1;
 	cr->cr_mtxp = mtx_pool_find(cr);
 #ifdef MAC
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index d0892e1e7c57..5b3920cbaab7 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -826,7 +826,7 @@ limcopy(lim)
 	register struct plimit *copy;
 
 	MALLOC(copy, struct plimit *, sizeof(struct plimit),
-	    M_SUBPROC, 0);
+	    M_SUBPROC, M_WAITOK);
 	bcopy(lim->pl_rlimit, copy->pl_rlimit, sizeof(struct plimit));
 	copy->p_lflags = 0;
 	copy->p_refcnt = 1;
@@ -883,7 +883,7 @@ uifind(uid)
 		struct  uidinfo *old_uip;
 
 		mtx_unlock(&uihashtbl_mtx);
-		uip = malloc(sizeof(*uip), M_UIDINFO, M_ZERO);
+		uip = malloc(sizeof(*uip), M_UIDINFO, M_WAITOK | M_ZERO);
 		mtx_lock(&uihashtbl_mtx);
 		/*
 		 * There's a chance someone created our uidinfo while we
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index dca389fa65f3..154b6e03ab4f 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -490,7 +490,7 @@ hashinit(elements, type, hashmask)
 	for (hashsize = 1; hashsize <= elements; hashsize <<= 1)
 		continue;
 	hashsize >>= 1;
-	hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, 0);
+	hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, M_WAITOK);
 	for (i = 0; i < hashsize; i++)
 		LIST_INIT(&hashtbl[i]);
 	*hashmask = hashsize - 1;
@@ -539,7 +539,7 @@ phashinit(elements, type, nentries)
 		hashsize = primes[i];
 	}
 	hashsize = primes[i - 1];
-	hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, 0);
+	hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, M_WAITOK);
 	for (i = 0; i < hashsize; i++)
 		LIST_INIT(&hashtbl[i]);
 	*nentries = hashsize;
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 0a0d94cb021e..08d1f80ec99d 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -224,7 +224,7 @@ sysctl_ctx_entry_add(struct sysctl_ctx_list *clist, struct sysctl_oid *oidp)
 
 	if (clist == NULL || oidp == NULL)
 		return(NULL);
-	e = malloc(sizeof(struct sysctl_ctx_entry), M_SYSCTLOID, 0);
+	e = malloc(sizeof(struct sysctl_ctx_entry), M_SYSCTLOID, M_WAITOK);
 	e->entry = oidp;
 	TAILQ_INSERT_HEAD(clist, e, link);
 	return (e);
@@ -354,13 +354,13 @@ sysctl_add_oid(struct sysctl_ctx_list *clist, struct sysctl_oid_list *parent,
 			return (NULL);
 		}
 	}
-	oidp = malloc(sizeof(struct sysctl_oid), M_SYSCTLOID, M_ZERO);
+	oidp = malloc(sizeof(struct sysctl_oid), M_SYSCTLOID, M_WAITOK|M_ZERO);
 	oidp->oid_parent = parent;
 	SLIST_NEXT(oidp, oid_link) = NULL;
 	oidp->oid_number = number;
 	oidp->oid_refcnt = 1;
 	len = strlen(name);
-	newname = malloc(len + 1, M_SYSCTLOID, 0);
+	newname = malloc(len + 1, M_SYSCTLOID, M_WAITOK);
 	bcopy(name, newname, len + 1);
 	newname[len] = '\0';
 	oidp->oid_name = newname;
@@ -369,7 +369,7 @@ sysctl_add_oid(struct sysctl_ctx_list *clist, struct sysctl_oid_list *parent,
 	if ((kind & CTLTYPE) == CTLTYPE_NODE) {
 		/* Allocate space for children */
 		SYSCTL_CHILDREN(oidp) = malloc(sizeof(struct sysctl_oid_list),
-		    M_SYSCTLOID, 0);
+		    M_SYSCTLOID, M_WAITOK);
 		SLIST_INIT(SYSCTL_CHILDREN(oidp));
 	} else {
 		oidp->oid_arg1 = arg1;
@@ -378,7 +378,7 @@ sysctl_add_oid(struct sysctl_ctx_list *clist, struct sysctl_oid_list *parent,
 	oidp->oid_fmt = fmt;
 	if (descr) {
 		int len = strlen(descr) + 1;
-		oidp->descr = malloc(len, M_SYSCTLOID, 0);
+		oidp->descr = malloc(len, M_SYSCTLOID, M_WAITOK);
 		if (oidp->descr)
 			strcpy((char *)(uintptr_t)(const void *)oidp->descr, descr);
 	}
@@ -679,7 +679,7 @@ sysctl_sysctl_name2oid(SYSCTL_HANDLER_ARGS)
 	if (req->newlen >= MAXPATHLEN)	/* XXX arbitrary, undocumented */
 		return (ENAMETOOLONG);
 
-	p = malloc(req->newlen+1, M_SYSCTL, 0);
+	p = malloc(req->newlen+1, M_SYSCTL, M_WAITOK);
 
 	error = SYSCTL_IN(req, p, req->newlen);
 	if (error) {
@@ -823,7 +823,7 @@ sysctl_handle_string(SYSCTL_HANDLER_ARGS)
 	 */
 retry:
 	outlen = strlen((char *)arg1)+1;
-	tmparg = malloc(outlen, M_SYSCTLTMP, 0);
+	tmparg = malloc(outlen, M_SYSCTLTMP, M_WAITOK);
 
 	if (strlcpy(tmparg, (char *)arg1, outlen) >= outlen) {
 		free(tmparg, M_SYSCTLTMP);
@@ -867,7 +867,7 @@ sysctl_handle_opaque(SYSCTL_HANDLER_ARGS)
 		sysctl_wire_old_buffer(req, arg2);
 		error = SYSCTL_OUT(req, arg1, arg2);
 	} else {
-		tmparg = malloc(arg2, M_SYSCTLTMP, 0);
+		tmparg = malloc(arg2, M_SYSCTLTMP, M_WAITOK);
 		bcopy(arg1, tmparg, arg2);
 		error = SYSCTL_OUT(req, tmparg, arg2);
 		free(tmparg, M_SYSCTLTMP);
diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c
index b3017d0520ce..55b0f24aa833 100644
--- a/sys/kern/kern_thread.c
+++ b/sys/kern/kern_thread.c
@@ -899,7 +899,7 @@ thread_reap(void)
 struct ksegrp *
 ksegrp_alloc(void)
 {
-	return (uma_zalloc(ksegrp_zone, 0));
+	return (uma_zalloc(ksegrp_zone, M_WAITOK));
 }
 
 /*
@@ -908,7 +908,7 @@ ksegrp_alloc(void)
 struct kse *
 kse_alloc(void)
 {
-	return (uma_zalloc(kse_zone, 0));
+	return (uma_zalloc(kse_zone, M_WAITOK));
 }
 
 /*
@@ -918,7 +918,7 @@ struct thread *
 thread_alloc(void)
 {
 	thread_reap(); /* check if any zombies to get */
-	return (uma_zalloc(thread_zone, 0));
+	return (uma_zalloc(thread_zone, M_WAITOK));
 }
 
 /*
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 6c3e4d4fd268..f15803fa8435 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -235,7 +235,7 @@ link_elf_link_common_finish(linker_file_t lf)
 #ifdef DDB
     GDB_STATE(RT_ADD);
     ef->gdb.l_addr = lf->address;
-    newfilename = malloc(strlen(lf->filename) + 1, M_LINKER, 0);
+    newfilename = malloc(strlen(lf->filename) + 1, M_LINKER, M_WAITOK);
     strcpy(newfilename, lf->filename);
     ef->gdb.l_name = newfilename;
     ef->gdb.l_ld = ef->dynamic;
@@ -571,7 +571,7 @@ link_elf_load_file(linker_class_t cls, const char* filename,
     /*
      * Read the elf header from the file.
      */
-    firstpage = malloc(PAGE_SIZE, M_LINKER, 0);
+    firstpage = malloc(PAGE_SIZE, M_LINKER, M_WAITOK);
     if (firstpage == NULL) {
 	error = ENOMEM;
 	goto out;
@@ -702,7 +702,7 @@ link_elf_load_file(linker_class_t cls, const char* filename,
 	goto out;
     }
 #else
-    ef->address = malloc(mapsize, M_LINKER, 0);
+    ef->address = malloc(mapsize, M_LINKER, M_WAITOK);
     if (!ef->address) {
 	error = ENOMEM;
 	goto out;
@@ -773,7 +773,7 @@ link_elf_load_file(linker_class_t cls, const char* filename,
     nbytes = hdr->e_shnum * hdr->e_shentsize;
     if (nbytes == 0 || hdr->e_shoff == 0)
 	goto nosyms;
-    shdr = malloc(nbytes, M_LINKER, M_ZERO);
+    shdr = malloc(nbytes, M_LINKER, M_WAITOK | M_ZERO);
     if (shdr == NULL) {
 	error = ENOMEM;
 	goto out;
@@ -796,9 +796,9 @@ link_elf_load_file(linker_class_t cls, const char* filename,
 	goto nosyms;
 
     symcnt = shdr[symtabindex].sh_size;
-    ef->symbase = malloc(symcnt, M_LINKER, 0);
+    ef->symbase = malloc(symcnt, M_LINKER, M_WAITOK);
     strcnt = shdr[symstrindex].sh_size;
-    ef->strbase = malloc(strcnt, M_LINKER, 0);
+    ef->strbase = malloc(strcnt, M_LINKER, M_WAITOK);
 
     if (ef->symbase == NULL || ef->strbase == NULL) {
 	error = ENOMEM;
@@ -1124,7 +1124,7 @@ link_elf_lookup_set(linker_file_t lf, const char *name,
 	int len, error = 0, count;
 
 	len = strlen(name) + sizeof("__start_set_"); /* sizeof includes \0 */
-	setsym = malloc(len, M_LINKER, 0);
+	setsym = malloc(len, M_LINKER, M_WAITOK);
 	if (setsym == NULL)
 		return ENOMEM;
 
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index 6c3e4d4fd268..f15803fa8435 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -235,7 +235,7 @@ link_elf_link_common_finish(linker_file_t lf)
 #ifdef DDB
     GDB_STATE(RT_ADD);
     ef->gdb.l_addr = lf->address;
-    newfilename = malloc(strlen(lf->filename) + 1, M_LINKER, 0);
+    newfilename = malloc(strlen(lf->filename) + 1, M_LINKER, M_WAITOK);
     strcpy(newfilename, lf->filename);
     ef->gdb.l_name = newfilename;
     ef->gdb.l_ld = ef->dynamic;
@@ -571,7 +571,7 @@ link_elf_load_file(linker_class_t cls, const char* filename,
     /*
      * Read the elf header from the file.
      */
-    firstpage = malloc(PAGE_SIZE, M_LINKER, 0);
+    firstpage = malloc(PAGE_SIZE, M_LINKER, M_WAITOK);
     if (firstpage == NULL) {
 	error = ENOMEM;
 	goto out;
@@ -702,7 +702,7 @@ link_elf_load_file(linker_class_t cls, const char* filename,
 	goto out;
     }
 #else
-    ef->address = malloc(mapsize, M_LINKER, 0);
+    ef->address = malloc(mapsize, M_LINKER, M_WAITOK);
     if (!ef->address) {
 	error = ENOMEM;
 	goto out;
@@ -773,7 +773,7 @@ link_elf_load_file(linker_class_t cls, const char* filename,
     nbytes = hdr->e_shnum * hdr->e_shentsize;
     if (nbytes == 0 || hdr->e_shoff == 0)
 	goto nosyms;
-    shdr = malloc(nbytes, M_LINKER, M_ZERO);
+    shdr = malloc(nbytes, M_LINKER, M_WAITOK | M_ZERO);
     if (shdr == NULL) {
 	error = ENOMEM;
 	goto out;
@@ -796,9 +796,9 @@ link_elf_load_file(linker_class_t cls, const char* filename,
 	goto nosyms;
 
     symcnt = shdr[symtabindex].sh_size;
-    ef->symbase = malloc(symcnt, M_LINKER, 0);
+    ef->symbase = malloc(symcnt, M_LINKER, M_WAITOK);
     strcnt = shdr[symstrindex].sh_size;
-    ef->strbase = malloc(strcnt, M_LINKER, 0);
+    ef->strbase = malloc(strcnt, M_LINKER, M_WAITOK);
 
     if (ef->symbase == NULL || ef->strbase == NULL) {
 	error = ENOMEM;
@@ -1124,7 +1124,7 @@ link_elf_lookup_set(linker_file_t lf, const char *name,
 	int len, error = 0, count;
 
 	len = strlen(name) + sizeof("__start_set_"); /* sizeof includes \0 */
-	setsym = malloc(len, M_LINKER, 0);
+	setsym = malloc(len, M_LINKER, M_WAITOK);
 	if (setsym == NULL)
 		return ENOMEM;
 
diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c
index 8acf5f53f1d6..a58e548401fe 100644
--- a/sys/kern/subr_blist.c
+++ b/sys/kern/subr_blist.c
@@ -157,14 +157,14 @@ blist_create(daddr_t blocks)
 		skip = (skip + 1) * BLIST_META_RADIX;
 	}
 
-	bl = malloc(sizeof(struct blist), M_SWAP, M_ZERO);
+	bl = malloc(sizeof(struct blist), M_SWAP, M_WAITOK | M_ZERO);
 
 	bl->bl_blocks = blocks;
 	bl->bl_radix = radix;
 	bl->bl_skip = skip;
 	bl->bl_rootblks = 1 +
 	    blst_radix_init(NULL, bl->bl_radix, bl->bl_skip, blocks);
-	bl->bl_root = malloc(sizeof(blmeta_t) * bl->bl_rootblks, M_SWAP, 0);
+	bl->bl_root = malloc(sizeof(blmeta_t) * bl->bl_rootblks, M_SWAP, M_WAITOK);
 
 #if defined(BLIST_DEBUG)
 	printf(
diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c
index e4da151d2cc8..165f628e256f 100644
--- a/sys/kern/subr_clist.c
+++ b/sys/kern/subr_clist.c
@@ -135,8 +135,8 @@ cblock_alloc_cblocks(number)
 		cbp = malloc(sizeof *cbp, M_TTYS, M_NOWAIT);
 		if (cbp == NULL) {
 			printf(
-"cblock_alloc_cblocks: M_NOWAIT malloc failed, trying blocking malloc\n");
-			cbp = malloc(sizeof *cbp, M_TTYS, 0);
+"cblock_alloc_cblocks: M_NOWAIT malloc failed, trying M_WAITOK\n");
+			cbp = malloc(sizeof *cbp, M_TTYS, M_WAITOK);
 		}
 		/*
 		 * Freed cblocks have zero quotes and garbage elsewhere.
diff --git a/sys/kern/subr_mbuf.c b/sys/kern/subr_mbuf.c
index 97944ece2183..0713b7bf0868 100644
--- a/sys/kern/subr_mbuf.c
+++ b/sys/kern/subr_mbuf.c
@@ -478,7 +478,7 @@ mbuf_init(void *dummy)
 		pcpu_cnt = MB_GET_PCPU_LIST_NUM(&mb_list_mbuf, i);
 		MB_LOCK_CONT(pcpu_cnt);
 		for (j = 0; j < NMB_MBUF_INIT; j++) {
-			if (mb_pop_cont(&mb_list_mbuf, M_NOWAIT, pcpu_cnt)
+			if (mb_pop_cont(&mb_list_mbuf, M_DONTWAIT, pcpu_cnt)
 			    == NULL)
 				goto bad;
 		}
@@ -487,7 +487,7 @@ mbuf_init(void *dummy)
 		pcpu_cnt = MB_GET_PCPU_LIST_NUM(&mb_list_clust, i);
 		MB_LOCK_CONT(pcpu_cnt);
 		for (j = 0; j < NMB_CLUST_INIT; j++) {
-			if (mb_pop_cont(&mb_list_clust, M_NOWAIT, pcpu_cnt)
+			if (mb_pop_cont(&mb_list_clust, M_DONTWAIT, pcpu_cnt)
 			    == NULL)
 				goto bad;
 		}
@@ -528,15 +528,15 @@ mb_pop_cont(struct mb_lstmngr *mb_list, int how, struct mb_pcpu_list *cnt_lst)
 
 	bucket = malloc(sizeof(struct mb_bucket) +
 	    PAGE_SIZE / mb_list->ml_objsize * sizeof(void *), M_MBUF,
-	    how == 0 ? 0 : M_NOWAIT);
+	    how == M_TRYWAIT ? M_WAITOK : M_NOWAIT);
 	if (bucket == NULL)
 		return (NULL);
 
 	p = (caddr_t)kmem_malloc(mb_list->ml_map, PAGE_SIZE,
-	    how == 0 ? 0 : M_NOWAIT);
+	    how == M_TRYWAIT ? M_WAITOK : M_NOWAIT);
 	if (p == NULL) {
 		free(bucket, M_MBUF);
-		if (how == 0)
+		if (how == M_TRYWAIT)
 			mb_list->ml_mapfull = 1;
 		return (NULL);
 	}
@@ -563,7 +563,7 @@ mb_pop_cont(struct mb_lstmngr *mb_list, int how, struct mb_pcpu_list *cnt_lst)
  * The general case is very easy.  Complications only arise if our PCPU
  * container is empty.  Things get worse if the PCPU container is empty,
  * the general container is empty, and we've run out of address space
- * in our map; then we try to block if we're willing to wait.
+ * in our map; then we try to block if we're willing to (M_TRYWAIT).
  */
 static __inline
 void *
@@ -667,7 +667,7 @@ mb_alloc(struct mb_lstmngr *mb_list, int how, short type, short persist,
 				else
 					*pers_list=cnt_lst->mb_cont.mc_numowner;
 			} else {
-				if (how == 0) {
+				if (how == M_TRYWAIT) {
 					/*
 				 	 * Absolute worst-case scenario.
 					 * We block if we're willing to, but
@@ -701,7 +701,7 @@ mb_alloc(struct mb_lstmngr *mb_list, int how, short type, short persist,
 
 /*
  * This is the worst-case scenario called only if we're allocating with
- * 0.  We first drain all the protocols, then try to find an mbuf
+ * M_TRYWAIT.  We first drain all the protocols, then try to find an mbuf
  * by looking in every PCPU container.  If we're still unsuccesful, we
  * try the general container one last time and possibly block on our
  * starved cv.
@@ -1128,8 +1128,8 @@ _mgetm_internal(int how, short type, short persist, int cchnum)
  * Allocate and return a single (normal) mbuf.  NULL is returned on failure.
  *
  * Arguments:
- *  - how: 0 to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_NOWAIT to never block.
+ *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  M_DONTWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1156,8 +1156,8 @@ m_get(int how, short type)
  *  - m: existing chain to which to append new chain (optional).
  *  - len: total length of data to append, either in mbufs or clusters
  *    (we allocate whatever combination yields the best fit).
- *  - how: 0 to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_NOWAIT to never block.
+ *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  M_DONTWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1246,8 +1246,8 @@ failed:
  * Allocate and return a single M_PKTHDR mbuf.  NULL is returned on failure.
  *
  * Arguments:
- *  - how: 0 to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_NOWAIT to never block.
+ *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  M_DONTWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1273,8 +1273,8 @@ m_gethdr(int how, short type)
  * returned on failure.
  *
  * Arguments:
- *  - how: 0 to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_NOWAIT to never block.
+ *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  M_DONTWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1295,8 +1295,8 @@ m_get_clrd(int how, short type)
  * returned on failure.
  *
  * Arguments:
- *  - how: 0 to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_NOWAIT to never block.
+ *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  M_DONTWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1419,8 +1419,8 @@ m_freem(struct mbuf *mb)
  * NULL on failure. 
  *
  * Arguments:
- *  - how: 0 to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_NOWAIT to never block.
+ *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  M_DONTWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  *  - flags: any flags to pass to the mbuf being allocated; if this includes
  *    the M_PKTHDR bit, then the mbuf is configured as a M_PKTHDR mbuf.
@@ -1471,8 +1471,8 @@ m_getcl(int how, short type, int flags)
  *
  * Arguments:
  *  - mb: the existing mbuf to which to attach the allocated cluster.
- *  - how: 0 to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_NOWAIT to never block.
+ *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  M_DONTWAIT to never block.
  */
 void
 m_clget(struct mbuf *mb, int how)
diff --git a/sys/kern/subr_mchain.c b/sys/kern/subr_mchain.c
index 2125004bf5c8..ed231bae8742 100644
--- a/sys/kern/subr_mchain.c
+++ b/sys/kern/subr_mchain.c
@@ -58,7 +58,7 @@ mb_init(struct mbchain *mbp)
 {
 	struct mbuf *m;
 
-	m = m_gethdr(0, MT_DATA);
+	m = m_gethdr(M_TRYWAIT, MT_DATA);
 	if (m == NULL) 
 		return ENOBUFS;
 	m->m_len = 0;
@@ -115,7 +115,7 @@ mb_reserve(struct mbchain *mbp, int size)
 		panic("mb_reserve: size = %d\n", size);
 	m = mbp->mb_cur;
 	if (mbp->mb_mleft < size) {
-		mn = m_get(0, MT_DATA);
+		mn = m_get(M_TRYWAIT, MT_DATA);
 		if (mn == NULL)
 			return NULL;
 		mbp->mb_cur = m->m_next = mn;
@@ -192,7 +192,7 @@ mb_put_mem(struct mbchain *mbp, c_caddr_t source, int size, int type)
 	while (size > 0) {
 		if (mleft == 0) {
 			if (m->m_next == NULL) {
-				m = m_getm(m, size, 0, MT_DATA);
+				m = m_getm(m, size, M_TRYWAIT, MT_DATA);
 				if (m == NULL)
 					return ENOBUFS;
 			}
@@ -292,7 +292,7 @@ md_init(struct mdchain *mdp)
 {
 	struct mbuf *m;
 
-	m = m_gethdr(0, MT_DATA);
+	m = m_gethdr(M_TRYWAIT, MT_DATA);
 	if (m == NULL) 
 		return ENOBUFS;
 	m->m_len = 0;
@@ -500,7 +500,7 @@ md_get_mbuf(struct mdchain *mdp, int size, struct mbuf **ret)
 {
 	struct mbuf *m = mdp->md_cur, *rm;
 
-	rm = m_copym(m, mdp->md_pos - mtod(m, u_char*), size, 0);
+	rm = m_copym(m, mdp->md_pos - mtod(m, u_char*), size, M_TRYWAIT);
 	if (rm == NULL)
 		return EBADRPC;
 	md_get_mem(mdp, NULL, size, MB_MZERO);
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index abe059bf7610..5a298acdf601 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -260,8 +260,8 @@ log_console(struct uio *uio)
 	pri = LOG_INFO | LOG_CONSOLE;
 	muio = *uio;
 	iovlen = uio->uio_iovcnt * sizeof (struct iovec);
-	MALLOC(miov, struct iovec *, iovlen, M_TEMP, 0);
-	MALLOC(consbuffer, char *, CONSCHUNK, M_TEMP, 0);
+	MALLOC(miov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+	MALLOC(consbuffer, char *, CONSCHUNK, M_TEMP, M_WAITOK);
 	bcopy(muio.uio_iov, miov, iovlen);
 	muio.uio_iov = miov;
 	uio = &muio;
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 894309d8dbd7..cf4a6e98b827 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -107,7 +107,7 @@ kmupetext(uintfptr_t nhighpc)
 		np.tolimit = MAXARCS;
 	np.tossize = np.tolimit * sizeof(struct tostruct);
 	cp = malloc(np.kcountsize + np.fromssize + np.tossize,
-	    M_GPROF, 0);
+	    M_GPROF, M_WAITOK);
 	/*
 	 * Check for something else extending highpc while we slept.
 	 */
@@ -176,7 +176,7 @@ kmstartup(dummy)
 		p->tolimit = MAXARCS;
 	p->tossize = p->tolimit * sizeof(struct tostruct);
 	cp = (char *)malloc(p->kcountsize + p->fromssize + p->tossize,
-	    M_GPROF, M_ZERO);
+	    M_GPROF, M_WAITOK | M_ZERO);
 	p->tos = (struct tostruct *)cp;
 	cp += p->tossize;
 	p->kcount = (HISTCOUNTER *)cp;
diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c
index f4ec519f0b74..9e63e8e7aaf5 100644
--- a/sys/kern/subr_sbuf.c
+++ b/sys/kern/subr_sbuf.c
@@ -49,7 +49,7 @@
 
 #ifdef _KERNEL
 MALLOC_DEFINE(M_SBUF, "sbuf", "string buffers");
-#define	SBMALLOC(size)		malloc(size, M_SBUF, 0)
+#define	SBMALLOC(size)		malloc(size, M_SBUF, M_WAITOK)
 #define	SBFREE(buf)		free(buf, M_SBUF)
 #else /* _KERNEL */
 #define	KASSERT(e, m)
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 9e3ccff82be2..c26cf47dcee1 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -248,7 +248,7 @@ readv(td, uap)
 			error = EINVAL;
 			goto done;
 		}
-		MALLOC(iov, struct iovec *, iovlen, M_IOV, 0);
+		MALLOC(iov, struct iovec *, iovlen, M_IOV, M_WAITOK);
 		needfree = iov;
 	} else
 		iov = aiov;
@@ -274,7 +274,7 @@ readv(td, uap)
 	 * if tracing, save a copy of iovec
 	 */
 	if (KTRPOINT(td, KTR_GENIO))  {
-		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, 0);
+		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
 		bcopy(auio.uio_iov, ktriov, iovlen);
 		ktruio = auio;
 	}
@@ -480,7 +480,7 @@ writev(td, uap)
 			error = EINVAL;
 			goto done;
 		}
-		MALLOC(iov, struct iovec *, iovlen, M_IOV, 0);
+		MALLOC(iov, struct iovec *, iovlen, M_IOV, M_WAITOK);
 		needfree = iov;
 	} else {
 		iov = aiov;
@@ -508,7 +508,7 @@ writev(td, uap)
 	 * if tracing, save a copy of iovec and uio
 	 */
 	if (KTRPOINT(td, KTR_GENIO))  {
-		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, 0);
+		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
 		bcopy(auio.uio_iov, ktriov, iovlen);
 		ktruio = auio;
 	}
@@ -618,7 +618,7 @@ ioctl(td, uap)
 
 	memp = NULL;
 	if (size > sizeof (ubuf.stkbuf)) {
-		memp = malloc((u_long)size, M_IOCTLOPS, 0);
+		memp = malloc((u_long)size, M_IOCTLOPS, M_WAITOK);
 		data = memp;
 	} else {
 		data = ubuf.stkbuf;
@@ -768,7 +768,7 @@ kern_select(struct thread *td, int nd, fd_set *fd_in, fd_set *fd_ou,
 	if (nbufbytes <= sizeof s_selbits)
 		selbits = &s_selbits[0];
 	else
-		selbits = malloc(nbufbytes, M_SELECT, 0);
+		selbits = malloc(nbufbytes, M_SELECT, M_WAITOK);
 
 	/*
 	 * Assign pointers into the bit buffers and fetch the input bits.
@@ -968,7 +968,7 @@ poll(td, uap)
 	}
 	ni = nfds * sizeof(struct pollfd);
 	if (ni > sizeof(smallbits))
-		bits = malloc(ni, M_TEMP, 0);
+		bits = malloc(ni, M_TEMP, M_WAITOK);
 	else
 		bits = smallbits;
 	error = copyin(uap->fds, bits, ni);
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 2612101fc5dd..32c9384521b4 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -206,7 +206,7 @@ pipe(td, uap)
 	
 	KASSERT(pipe_zone != NULL, ("pipe_zone not initialized"));
 
-	pmtx = malloc(sizeof(*pmtx), M_TEMP, M_ZERO);
+	pmtx = malloc(sizeof(*pmtx), M_TEMP, M_WAITOK | M_ZERO);
 	
 	rpipe = wpipe = NULL;
 	if (pipe_create(&rpipe) || pipe_create(&wpipe)) {
@@ -346,7 +346,7 @@ pipe_create(cpipep)
 	struct pipe *cpipe;
 	int error;
 
-	*cpipep = uma_zalloc(pipe_zone, 0);
+	*cpipep = uma_zalloc(pipe_zone, M_WAITOK);
 	if (*cpipep == NULL)
 		return (ENOMEM);
 
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 08ca4b5a5f32..47e629c3b246 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -141,16 +141,16 @@ msginit()
 	msginfo.msgmax = msginfo.msgseg * msginfo.msgssz;
 	TUNABLE_INT_FETCH("kern.ipc.msgmni", &msginfo.msgmni);
 
-	msgpool = malloc(msginfo.msgmax, M_MSG, 0);
+	msgpool = malloc(msginfo.msgmax, M_MSG, M_WAITOK);
 	if (msgpool == NULL)
 		panic("msgpool is NULL");
-	msgmaps = malloc(sizeof(struct msgmap) * msginfo.msgseg, M_MSG, 0);
+	msgmaps = malloc(sizeof(struct msgmap) * msginfo.msgseg, M_MSG, M_WAITOK);
 	if (msgmaps == NULL)
 		panic("msgmaps is NULL");
-	msghdrs = malloc(sizeof(struct msg) * msginfo.msgtql, M_MSG, 0);
+	msghdrs = malloc(sizeof(struct msg) * msginfo.msgtql, M_MSG, M_WAITOK);
 	if (msghdrs == NULL)
 		panic("msghdrs is NULL");
-	msqids = malloc(sizeof(struct msqid_ds) * msginfo.msgmni, M_MSG, 0);
+	msqids = malloc(sizeof(struct msqid_ds) * msginfo.msgmni, M_MSG, M_WAITOK);
 	if (msqids == NULL)
 		panic("msqids is NULL");
 
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 0a7e58b7596e..7eeb625043b7 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -185,12 +185,12 @@ seminit(void)
 	TUNABLE_INT_FETCH("kern.ipc.semvmx", &seminfo.semvmx);
 	TUNABLE_INT_FETCH("kern.ipc.semaem", &seminfo.semaem);
 
-	sem = malloc(sizeof(struct sem) * seminfo.semmns, M_SEM, 0);
+	sem = malloc(sizeof(struct sem) * seminfo.semmns, M_SEM, M_WAITOK);
 	sema = malloc(sizeof(struct semid_ds) * seminfo.semmni, M_SEM,
-	    0);
+	    M_WAITOK);
 	sema_mtx = malloc(sizeof(struct mtx) * seminfo.semmni, M_SEM,
-	    M_ZERO);
-	semu = malloc(seminfo.semmnu * seminfo.semusz, M_SEM, 0);
+	    M_WAITOK | M_ZERO);
+	semu = malloc(seminfo.semmnu * seminfo.semusz, M_SEM, M_WAITOK);
 
 	for (i = 0; i < seminfo.semmni; i++) {
 		sema[i].sem_base = 0;
@@ -644,7 +644,7 @@ __semctl(td, uap)
 		if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
 			goto done2;
 		array = malloc(sizeof(*array) * semaptr->sem_nsems, M_TEMP,
-		    0);
+		    M_WAITOK);
 		mtx_lock(sema_mtxp);
 		if ((error = semvalid(uap->semid, semaptr)) != 0)
 			goto done2;
@@ -702,7 +702,7 @@ raced:
 		mtx_unlock(sema_mtxp);
 		if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
 			goto done2;
-		array = malloc(sizeof(*array) * count, M_TEMP, 0);
+		array = malloc(sizeof(*array) * count, M_TEMP, M_WAITOK);
 		copyin(real_arg.array, array, count * sizeof(*array));
 		if (error)
 			break;
@@ -898,7 +898,7 @@ semop(td, uap)
 		    nsops));
 		return (E2BIG);
 	}
-	sops = malloc(nsops * sizeof(sops[0]), M_SEM, 0);
+	sops = malloc(nsops * sizeof(sops[0]), M_SEM, M_WAITOK);
 	if ((error = copyin(uap->sops, sops, nsops * sizeof(sops[0]))) != 0) {
 		DPRINTF(("error = %d from copyin(%08x, %08x, %d)\n", error,
 		    uap->sops, sops, nsops * sizeof(sops[0])));
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 97f9afb3cad4..d3fa3230ac56 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -314,7 +314,7 @@ shmat(td, uap)
 	shmmap_s = p->p_vmspace->vm_shm;
 	if (shmmap_s == NULL) {
 		size = shminfo.shmseg * sizeof(struct shmmap_state);
-		shmmap_s = malloc(size, M_SHM, 0);
+		shmmap_s = malloc(size, M_SHM, M_WAITOK);
 		for (i = 0; i < shminfo.shmseg; i++)
 			shmmap_s[i].shmid = -1;
 		p->p_vmspace->vm_shm = shmmap_s;
@@ -643,7 +643,7 @@ shmget_allocate_segment(td, uap, mode)
 	shmseg->shm_perm.key = uap->key;
 	shmseg->shm_perm.seq = (shmseg->shm_perm.seq + 1) & 0x7fff;
 	shm_handle = (struct shm_handle *)
-	    malloc(sizeof(struct shm_handle), M_SHM, 0);
+	    malloc(sizeof(struct shm_handle), M_SHM, M_WAITOK);
 	shmid = IXSEQ_TO_IPCID(segnum, shmseg->shm_perm);
 	
 	/*
@@ -756,7 +756,7 @@ shmfork_myhook(p1, p2)
 	int i;
 
 	size = shminfo.shmseg * sizeof(struct shmmap_state);
-	shmmap_s = malloc(size, M_SHM, 0);
+	shmmap_s = malloc(size, M_SHM, M_WAITOK);
 	bcopy(p1->p_vmspace->vm_shm, shmmap_s, size);
 	p2->p_vmspace->vm_shm = shmmap_s;
 	for (i = 0; i < shminfo.shmseg; i++, shmmap_s++)
@@ -791,7 +791,7 @@ shmrealloc(void)
 	if (shmalloced >= shminfo.shmmni)
 		return;
 
-	newsegs = malloc(shminfo.shmmni * sizeof(*newsegs), M_SHM, 0);
+	newsegs = malloc(shminfo.shmmni * sizeof(*newsegs), M_SHM, M_WAITOK);
 	if (newsegs == NULL)
 		return;
 	for (i = 0; i < shmalloced; i++)
@@ -822,7 +822,7 @@ shminit()
 	TUNABLE_INT_FETCH("kern.ipc.shm_use_phys", &shm_use_phys);
 
 	shmalloced = shminfo.shmmni;
-	shmsegs = malloc(shmalloced * sizeof(shmsegs[0]), M_SHM, 0);
+	shmsegs = malloc(shmalloced * sizeof(shmsegs[0]), M_SHM, M_WAITOK);
 	if (shmsegs == NULL)
 		panic("cannot allocate initial memory for sysvshm");
 	for (i = 0; i < shmalloced; i++) {
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 2c4e5547d2c2..6f8114eb53fa 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -2609,7 +2609,7 @@ ttymalloc(struct tty *tp)
 
 	if (tp)
 		return(tp);
-	tp = malloc(sizeof *tp, M_TTYS, M_ZERO);
+	tp = malloc(sizeof *tp, M_TTYS, M_WAITOK | M_ZERO);
 	ttyregister(tp);
 	return (tp);
 }
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 9d487b7737e0..361a5ddedaa2 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -277,7 +277,7 @@ sysctl_kern_console(SYSCTL_HANDLER_ARGS)
 	STAILQ_FOREACH(cnd, &cn_devlist, cnd_next)
 		len += strlen(devtoname(cnd->cnd_cn->cn_dev)) + 1;
 	len = len > CNDEVPATHMAX ? len : CNDEVPATHMAX;
-	MALLOC(name, char *, len, M_TEMP, M_ZERO);
+	MALLOC(name, char *, len, M_TEMP, M_WAITOK | M_ZERO);
 	p = name;
 	STAILQ_FOREACH(cnd, &cn_devlist, cnd_next)
 		p += sprintf(p, "%s,", devtoname(cnd->cnd_cn->cn_dev));
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index d954ac757083..098108cc80ab 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -153,7 +153,7 @@ ptyinit(dev_t devc)
 
 	devc->si_flags &= ~SI_CHEAPCLONE;
 
-	pt = malloc(sizeof(*pt), M_PTY, M_ZERO);
+	pt = malloc(sizeof(*pt), M_PTY, M_WAITOK | M_ZERO);
 	pt->devs = devs = make_dev(&pts_cdevsw, n,
 	    UID_ROOT, GID_WHEEL, 0666, "tty%c%r", names[n / 32], n % 32);
 	pt->devc = devc;
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index e4da151d2cc8..165f628e256f 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -135,8 +135,8 @@ cblock_alloc_cblocks(number)
 		cbp = malloc(sizeof *cbp, M_TTYS, M_NOWAIT);
 		if (cbp == NULL) {
 			printf(
-"cblock_alloc_cblocks: M_NOWAIT malloc failed, trying blocking malloc\n");
-			cbp = malloc(sizeof *cbp, M_TTYS, 0);
+"cblock_alloc_cblocks: M_NOWAIT malloc failed, trying M_WAITOK\n");
+			cbp = malloc(sizeof *cbp, M_TTYS, M_WAITOK);
 		}
 		/*
 		 * Freed cblocks have zero quotes and garbage elsewhere.
diff --git a/sys/kern/uipc_accf.c b/sys/kern/uipc_accf.c
index 6580e1d72024..b31026af3b68 100644
--- a/sys/kern/uipc_accf.c
+++ b/sys/kern/uipc_accf.c
@@ -115,7 +115,7 @@ accept_filt_generic_mod_event(module_t mod, int event, void *data)
 
 	switch (event) {
 	case MOD_LOAD:
-		MALLOC(p, struct accept_filter *, sizeof(*p), M_ACCF, 0);
+		MALLOC(p, struct accept_filter *, sizeof(*p), M_ACCF, M_WAITOK);
 		bcopy(accfp, p, sizeof(*p));
 		s = splnet();
 		error = accept_filt_add(p);
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 4ea316c5aa0d..bc6aa71e683c 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -164,7 +164,7 @@ m_prepend(struct mbuf *m, int len, int how)
 /*
  * Make a copy of an mbuf chain starting "off0" bytes from the beginning,
  * continuing for "len" bytes.  If len is M_COPYALL, copy to end of mbuf.
- * The wait parameter is a choice of 0/M_NOWAIT from caller.
+ * The wait parameter is a choice of M_TRYWAIT/M_DONTWAIT from caller.
  * Note that the copy is read-only, because clusters are not copied,
  * only their reference counts are incremented.
  */
@@ -522,7 +522,7 @@ m_pullup(struct mbuf *n, int len)
 	} else {
 		if (len > MHLEN)
 			goto bad;
-		MGET(m, M_NOWAIT, n->m_type);
+		MGET(m, M_DONTWAIT, n->m_type);
 		if (m == NULL)
 			goto bad;
 		m->m_len = 0;
@@ -639,7 +639,7 @@ m_devget(char *buf, int totlen, int off, struct ifnet *ifp,
 	if (off < 0 || off > MHLEN)
 		return (NULL);
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return (NULL);
 	m->m_pkthdr.rcvif = ifp;
@@ -648,7 +648,7 @@ m_devget(char *buf, int totlen, int off, struct ifnet *ifp,
 
 	while (totlen > 0) {
 		if (top) {
-			MGET(m, M_NOWAIT, MT_DATA);
+			MGET(m, M_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				m_freem(top);
 				return (NULL);
@@ -656,7 +656,7 @@ m_devget(char *buf, int totlen, int off, struct ifnet *ifp,
 			len = MLEN;
 		}
 		if (totlen + off >= MINCLSIZE) {
-			MCLGET(m, M_NOWAIT);
+			MCLGET(m, M_DONTWAIT);
 			if (m->m_flags & M_EXT)
 				len = MCLBYTES;
 		} else {
@@ -704,7 +704,7 @@ m_copyback(struct mbuf *m0, int off, int len, caddr_t cp)
 		off -= mlen;
 		totlen += mlen;
 		if (m->m_next == NULL) {
-			n = m_get_clrd(M_NOWAIT, m->m_type);
+			n = m_get_clrd(M_DONTWAIT, m->m_type);
 			if (n == NULL)
 				goto out;
 			n->m_len = min(MLEN, len + off);
@@ -723,7 +723,7 @@ m_copyback(struct mbuf *m0, int off, int len, caddr_t cp)
 		if (len == 0)
 			break;
 		if (m->m_next == NULL) {
-			n = m_get(M_NOWAIT, m->m_type);
+			n = m_get(M_DONTWAIT, m->m_type);
 			if (n == NULL)
 				break;
 			n->m_len = min(MLEN, len);
diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c
index 336ffa5e27de..50b37f54ec44 100644
--- a/sys/kern/uipc_mbuf2.c
+++ b/sys/kern/uipc_mbuf2.c
@@ -171,7 +171,7 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp)
 	 * chop the current mbuf into two pieces, set off to 0.
 	 */
 	if (len <= n->m_len - off) {
-		o = m_dup1(n, off, n->m_len - off, M_NOWAIT);
+		o = m_dup1(n, off, n->m_len - off, M_DONTWAIT);
 		if (o == NULL) {
 			m_freem(m);
 			return NULL;	/* ENOBUFS */
@@ -230,9 +230,9 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp)
 	 * now, we need to do the hard way.  don't m_copy as there's no room
 	 * on both end.
 	 */
-	MGET(o, M_NOWAIT, m->m_type);
+	MGET(o, M_DONTWAIT, m->m_type);
 	if (o && len > MLEN) {
-		MCLGET(o, M_NOWAIT);
+		MCLGET(o, M_DONTWAIT);
 		if ((o->m_flags & M_EXT) == 0) {
 			m_free(o);
 			o = NULL;
diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c
index 3d9d5b551d00..e3912e1b1cb9 100644
--- a/sys/kern/uipc_sem.c
+++ b/sys/kern/uipc_sem.c
@@ -188,7 +188,7 @@ sem_create(td, name, ksret, mode, value)
 	uc = p->p_ucred;
 	if (value > SEM_VALUE_MAX)
 		return (EINVAL);
-	ret = malloc(sizeof(*ret), M_SEM, M_ZERO);
+	ret = malloc(sizeof(*ret), M_SEM, M_WAITOK | M_ZERO);
 	if (name != NULL) {
 		len = strlen(name);
 		if (len > SEM_MAX_NAMELEN) {
@@ -200,7 +200,7 @@ sem_create(td, name, ksret, mode, value)
 			free(ret, M_SEM);
 			return (EINVAL);
 		}
-		ret->ks_name = malloc(len + 1, M_SEM, 0);
+		ret->ks_name = malloc(len + 1, M_SEM, M_WAITOK);
 		strcpy(ret->ks_name, name);
 	} else {
 		ret->ks_name = NULL;
@@ -504,7 +504,7 @@ sem_enter(p, ks)
 {
 	struct kuser *ku, *k;
 
-	ku = malloc(sizeof(*ku), M_SEM, 0);
+	ku = malloc(sizeof(*ku), M_SEM, M_WAITOK);
 	ku->ku_pid = p->p_pid;
 	mtx_lock(&sem_lock);
 	k = sem_getuser(p, ks);
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index 2ca7010288ec..b63eb1ae54c2 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -315,7 +315,7 @@ sowakeup(so, sb)
 	if ((so->so_state & SS_ASYNC) && so->so_sigio != NULL)
 		pgsigio(&so->so_sigio, SIGIO, 0);
 	if (sb->sb_flags & SB_UPCALL)
-		(*so->so_upcall)(so, so->so_upcallarg, M_NOWAIT);
+		(*so->so_upcall)(so, so->so_upcallarg, M_DONTWAIT);
 	if (sb->sb_flags & SB_AIO)
 		aio_swake(so, sb);
 	KNOTE(&sb->sb_sel.si_note, 0);
@@ -626,7 +626,7 @@ sbappendaddr(sb, asa, m0, control)
 		return (0);
 	if (asa->sa_len > MLEN)
 		return (0);
-	MGET(m, M_NOWAIT, MT_SONAME);
+	MGET(m, M_DONTWAIT, MT_SONAME);
 	if (m == 0)
 		return (0);
 	m->m_len = asa->sa_len;
@@ -833,10 +833,10 @@ sbcreatecontrol(p, size, type, level)
 
 	if (CMSG_SPACE((u_int)size) > MCLBYTES)
 		return ((struct mbuf *) NULL);
-	if ((m = m_get(M_NOWAIT, MT_CONTROL)) == NULL)
+	if ((m = m_get(M_DONTWAIT, MT_CONTROL)) == NULL)
 		return ((struct mbuf *) NULL);
 	if (CMSG_SPACE((u_int)size) > MLEN) {
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return ((struct mbuf *) NULL);
@@ -924,7 +924,7 @@ dup_sockaddr(sa, canwait)
 	struct sockaddr *sa2;
 
 	MALLOC(sa2, struct sockaddr *, sa->sa_len, M_SONAME, 
-	       canwait ? 0 : M_NOWAIT);
+	       canwait ? M_WAITOK : M_NOWAIT);
 	if (sa2)
 		bcopy(sa, sa2, sa->sa_len);
 	return sa2;
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 1ab28851f83d..4163f2e1d495 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -137,7 +137,7 @@ soalloc(waitok)
 	int flag;
 
 	if (waitok == 1)
-		flag = 0;
+		flag = M_WAITOK;
 	else
 		flag = M_NOWAIT;
 	flag |= M_ZERO;
@@ -482,7 +482,7 @@ bad:
 	return (error);
 }
 
-#define	SBLOCKWAIT(f)	(((f) & MSG_DONTWAIT) ? M_NOWAIT : 0)
+#define	SBLOCKWAIT(f)	(((f) & MSG_DONTWAIT) ? M_NOWAIT : M_WAITOK)
 /*
  * Send on a socket.
  * If send must go all at once and message is larger than
@@ -626,7 +626,7 @@ restart:
 			cow_send = 0;
 #endif /* ZERO_COPY_SOCKETS */
 			if (top == 0) {
-				MGETHDR(m, 0, MT_DATA);
+				MGETHDR(m, M_TRYWAIT, MT_DATA);
 				if (m == NULL) {
 					error = ENOBUFS;
 					goto release;
@@ -635,7 +635,7 @@ restart:
 				m->m_pkthdr.len = 0;
 				m->m_pkthdr.rcvif = (struct ifnet *)0;
 			} else {
-				MGET(m, 0, MT_DATA);
+				MGET(m, M_TRYWAIT, MT_DATA);
 				if (m == NULL) {
 					error = ENOBUFS;
 					goto release;
@@ -657,7 +657,7 @@ restart:
 				} 
 				if (!cow_send){
 #endif /* ZERO_COPY_SOCKETS */
-				MCLGET(m, 0);
+				MCLGET(m, M_TRYWAIT);
 				if ((m->m_flags & M_EXT) == 0)
 					goto nopages;
 				mlen = MCLBYTES;
@@ -788,7 +788,7 @@ soreceive(so, psa, uio, mp0, controlp, flagsp)
 	else
 		flags = 0;
 	if (flags & MSG_OOB) {
-		m = m_get(0, MT_DATA);
+		m = m_get(M_TRYWAIT, MT_DATA);
 		if (m == NULL)
 			return (ENOBUFS);
 		error = (*pr->pr_usrreqs->pru_rcvoob)(so, m, flags & MSG_PEEK);
@@ -1025,7 +1025,7 @@ dontblock:
 				moff += len;
 			else {
 				if (mp)
-					*mp = m_copym(m, 0, len, 0);
+					*mp = m_copym(m, 0, len, M_TRYWAIT);
 				m->m_data += len;
 				m->m_len -= len;
 				so->so_rcv.sb_cc -= len;
@@ -1128,7 +1128,7 @@ sorflush(so)
 	struct sockbuf asb;
 
 	sb->sb_flags |= SB_NOINTR;
-	(void) sblock(sb, 0);
+	(void) sblock(sb, M_WAITOK);
 	s = splimp();
 	socantrcvmore(so);
 	sbunlock(sb);
@@ -1180,7 +1180,7 @@ do_setopt_accept_filter(so, sopt)
 		goto out;
 	}
 	/* don't put large objects on the kernel stack */
-	MALLOC(afap, struct accept_filter_arg *, sizeof(*afap), M_TEMP, 0);
+	MALLOC(afap, struct accept_filter_arg *, sizeof(*afap), M_TEMP, M_WAITOK);
 	error = sooptcopyin(sopt, afap, sizeof *afap, sizeof *afap);
 	afap->af_name[sizeof(afap->af_name)-1] = '\0';
 	afap->af_arg[sizeof(afap->af_arg)-1] = '\0';
@@ -1191,12 +1191,12 @@ do_setopt_accept_filter(so, sopt)
 		error = ENOENT;
 		goto out;
 	}
-	MALLOC(af, struct so_accf *, sizeof(*af), M_ACCF, M_ZERO);
+	MALLOC(af, struct so_accf *, sizeof(*af), M_ACCF, M_WAITOK | M_ZERO);
 	if (afp->accf_create != NULL) {
 		if (afap->af_name[0] != '\0') {
 			int len = strlen(afap->af_name) + 1;
 
-			MALLOC(af->so_accept_filter_str, char *, len, M_ACCF, 0);
+			MALLOC(af->so_accept_filter_str, char *, len, M_ACCF, M_WAITOK);
 			strcpy(af->so_accept_filter_str, afap->af_name);
 		}
 		af->so_accept_filter_arg = afp->accf_create(so, afap->af_arg);
@@ -1478,7 +1478,7 @@ sogetopt(so, sopt)
 			if ((so->so_options & SO_ACCEPTCONN) == 0)
 				return (EINVAL);
 			MALLOC(afap, struct accept_filter_arg *, sizeof(*afap),
-				M_TEMP, M_ZERO);
+				M_TEMP, M_WAITOK | M_ZERO);
 			if ((so->so_options & SO_ACCEPTFILTER) != 0) {
 				strcpy(afap->af_name, so->so_accf->so_accept_filter->accf_name);
 				if (so->so_accf->so_accept_filter_str != NULL)
@@ -1581,11 +1581,11 @@ soopt_getm(struct sockopt *sopt, struct mbuf **mp)
 	struct mbuf *m, *m_prev;
 	int sopt_size = sopt->sopt_valsize;
 
-	MGET(m, sopt->sopt_td ? 0 : M_NOWAIT, MT_DATA);
+	MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_DATA);
 	if (m == 0)
 		return ENOBUFS;
 	if (sopt_size > MLEN) {
-		MCLGET(m, sopt->sopt_td ? 0 : M_NOWAIT);
+		MCLGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return ENOBUFS;
@@ -1599,13 +1599,13 @@ soopt_getm(struct sockopt *sopt, struct mbuf **mp)
 	m_prev = m;
 
 	while (sopt_size) {
-		MGET(m, sopt->sopt_td ? 0 : M_NOWAIT, MT_DATA);
+		MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_DATA);
 		if (m == 0) {
 			m_freem(*mp);
 			return ENOBUFS;
 		}
 		if (sopt_size > MLEN) {
-			MCLGET(m, sopt->sopt_td ? 0 : M_NOWAIT);
+			MCLGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_freem(*mp);
 				return ENOBUFS;
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 2ca7010288ec..b63eb1ae54c2 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -315,7 +315,7 @@ sowakeup(so, sb)
 	if ((so->so_state & SS_ASYNC) && so->so_sigio != NULL)
 		pgsigio(&so->so_sigio, SIGIO, 0);
 	if (sb->sb_flags & SB_UPCALL)
-		(*so->so_upcall)(so, so->so_upcallarg, M_NOWAIT);
+		(*so->so_upcall)(so, so->so_upcallarg, M_DONTWAIT);
 	if (sb->sb_flags & SB_AIO)
 		aio_swake(so, sb);
 	KNOTE(&sb->sb_sel.si_note, 0);
@@ -626,7 +626,7 @@ sbappendaddr(sb, asa, m0, control)
 		return (0);
 	if (asa->sa_len > MLEN)
 		return (0);
-	MGET(m, M_NOWAIT, MT_SONAME);
+	MGET(m, M_DONTWAIT, MT_SONAME);
 	if (m == 0)
 		return (0);
 	m->m_len = asa->sa_len;
@@ -833,10 +833,10 @@ sbcreatecontrol(p, size, type, level)
 
 	if (CMSG_SPACE((u_int)size) > MCLBYTES)
 		return ((struct mbuf *) NULL);
-	if ((m = m_get(M_NOWAIT, MT_CONTROL)) == NULL)
+	if ((m = m_get(M_DONTWAIT, MT_CONTROL)) == NULL)
 		return ((struct mbuf *) NULL);
 	if (CMSG_SPACE((u_int)size) > MLEN) {
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return ((struct mbuf *) NULL);
@@ -924,7 +924,7 @@ dup_sockaddr(sa, canwait)
 	struct sockaddr *sa2;
 
 	MALLOC(sa2, struct sockaddr *, sa->sa_len, M_SONAME, 
-	       canwait ? 0 : M_NOWAIT);
+	       canwait ? M_WAITOK : M_NOWAIT);
 	if (sa2)
 		bcopy(sa, sa2, sa->sa_len);
 	return sa2;
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index d0ccfa0271a7..e38bb90f5352 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -673,7 +673,7 @@ sendit(td, s, mp, flags)
 		if (mp->msg_flags == MSG_COMPAT) {
 			register struct cmsghdr *cm;
 
-			M_PREPEND(control, sizeof(*cm), 0);
+			M_PREPEND(control, sizeof(*cm), M_TRYWAIT);
 			if (control == 0) {
 				error = ENOBUFS;
 				goto bad;
@@ -691,7 +691,7 @@ sendit(td, s, mp, flags)
 #ifdef KTRACE
 	if (KTRPOINT(td, KTR_GENIO)) {
 		iovlen = auio.uio_iovcnt * sizeof (struct iovec);
-		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, 0);
+		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
 		bcopy(auio.uio_iov, ktriov, iovlen);
 		ktruio = auio;
 	}
@@ -823,7 +823,7 @@ osendmsg(td, uap)
 		}
 		MALLOC(iov, struct iovec *,
 		      sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV,
-		      0);
+		      M_WAITOK);
 	} else {
 		iov = aiov;
 	}
@@ -870,7 +870,7 @@ sendmsg(td, uap)
 		}
 		MALLOC(iov, struct iovec *,
 		       sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV,
-		       0);
+		       M_WAITOK);
 	} else {
 		iov = aiov;
 	}
@@ -940,7 +940,7 @@ recvit(td, s, mp, namelenp)
 #ifdef KTRACE
 	if (KTRPOINT(td, KTR_GENIO)) {
 		iovlen = auio.uio_iovcnt * sizeof (struct iovec);
-		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, 0);
+		MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
 		bcopy(auio.uio_iov, ktriov, iovlen);
 		ktruio = auio;
 	}
@@ -1170,7 +1170,7 @@ orecvmsg(td, uap)
 		}
 		MALLOC(iov, struct iovec *,
 		      sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV,
-		      0);
+		      M_WAITOK);
 	} else {
 		iov = aiov;
 	}
@@ -1221,7 +1221,7 @@ recvmsg(td, uap)
 		}
 		MALLOC(iov, struct iovec *,
 		       sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV,
-		       0);
+		       M_WAITOK);
 	} else {
 		iov = aiov;
 	}
@@ -1557,7 +1557,7 @@ sockargs(mp, buf, buflen, type)
 #endif
 		return (EINVAL);
 	}
-	m = m_get(0, type);
+	m = m_get(M_TRYWAIT, type);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_len = buflen;
@@ -1590,7 +1590,7 @@ getsockaddr(namp, uaddr, len)
 
 	if (len > SOCK_MAXADDRLEN)
 		return ENAMETOOLONG;
-	MALLOC(sa, struct sockaddr *, len, M_SONAME, 0);
+	MALLOC(sa, struct sockaddr *, len, M_SONAME, M_WAITOK);
 	error = copyin(uaddr, sa, len);
 	if (error) {
 		FREE(sa, M_SONAME);
@@ -1804,7 +1804,7 @@ do_sendfile(struct thread *td, struct sendfile_args *uap, int compat)
 	/*
 	 * Protect against multiple writers to the socket.
 	 */
-	(void) sblock(&so->so_snd, 0);
+	(void) sblock(&so->so_snd, M_WAITOK);
 
 	/*
 	 * Loop through the pages in the file, starting with the requested
@@ -1948,7 +1948,7 @@ retry_lookup:
 		/*
 		 * Get an mbuf header and set it up as having external storage.
 		 */
-		MGETHDR(m, 0, MT_DATA);
+		MGETHDR(m, M_TRYWAIT, MT_DATA);
 		if (m == NULL) {
 			error = ENOBUFS;
 			sf_buf_free((void *)sf->kva, NULL);
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 51c7d84e7f21..e3d3e3b219ec 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -541,7 +541,7 @@ unp_attach(so)
 		if (error)
 			return (error);
 	}
-	unp = uma_zalloc(unp_zone, 0);
+	unp = uma_zalloc(unp_zone, M_WAITOK);
 	if (unp == NULL)
 		return (ENOBUFS);
 	bzero(unp, sizeof *unp);
@@ -610,7 +610,7 @@ unp_bind(unp, nam, td)
 	if (namelen <= 0)
 		return EINVAL;
 
-	buf = malloc(namelen + 1, M_TEMP, 0);
+	buf = malloc(namelen + 1, M_TEMP, M_WAITOK);
 	strlcpy(buf, soun->sun_path, namelen + 1);
 
 restart:
@@ -851,7 +851,7 @@ unp_pcblist(SYSCTL_HANDLER_ARGS)
 	/*
 	 * OK, now we're committed to doing something.
 	 */
-	xug = malloc(sizeof(*xug), M_TEMP, 0);
+	xug = malloc(sizeof(*xug), M_TEMP, M_WAITOK);
 	gencnt = unp_gencnt;
 	n = unp_count;
 
@@ -865,7 +865,7 @@ unp_pcblist(SYSCTL_HANDLER_ARGS)
 		return error;
 	}
 
-	unp_list = malloc(n * sizeof *unp_list, M_TEMP, 0);
+	unp_list = malloc(n * sizeof *unp_list, M_TEMP, M_WAITOK);
 	
 	for (unp = LIST_FIRST(head), i = 0; unp && i < n;
 	     unp = LIST_NEXT(unp, unp_link)) {
@@ -879,7 +879,7 @@ unp_pcblist(SYSCTL_HANDLER_ARGS)
 	n = i;			/* in case we lost some during malloc */
 
 	error = 0;
-	xu = malloc(sizeof(*xu), M_TEMP, 0);
+	xu = malloc(sizeof(*xu), M_TEMP, M_WAITOK);
 	for (i = 0; i < n; i++) {
 		unp = unp_list[i];
 		if (unp->unp_gencnt <= gencnt) {
@@ -1385,7 +1385,7 @@ unp_gc()
 	 *
 	 * 91/09/19, bsy@cs.cmu.edu
 	 */
-	extra_ref = malloc(nfiles * sizeof(struct file *), M_TEMP, 0);
+	extra_ref = malloc(nfiles * sizeof(struct file *), M_TEMP, M_WAITOK);
 	sx_slock(&filelist_lock);
 	for (nunref = 0, fp = LIST_FIRST(&filehead), fpp = extra_ref; fp != 0;
 	    fp = nextfp) {
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 5cee627cff24..9532ff21bf2e 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -392,7 +392,7 @@ aio_init_aioinfo(struct proc *p)
 	struct kaioinfo *ki;
 
 	if (p->p_aioinfo == NULL) {
-		ki = uma_zalloc(kaio_zone, 0);
+		ki = uma_zalloc(kaio_zone, M_WAITOK);
 		p->p_aioinfo = ki;
 		ki->kaio_flags = 0;
 		ki->kaio_maxactive_count = max_aio_per_proc;
@@ -777,7 +777,7 @@ aio_daemon(void *uproc)
 	 * Allocate and ready the aio control info.  There is one aiop structure
 	 * per daemon.
 	 */
-	aiop = uma_zalloc(aiop_zone, 0);
+	aiop = uma_zalloc(aiop_zone, M_WAITOK);
 	aiop->aiothread = td;
 	aiop->aiothreadflags |= AIOP_FREE;
 
@@ -801,9 +801,9 @@ aio_daemon(void *uproc)
 	mtx_unlock(&Giant);
 	/* The daemon resides in its own pgrp. */
 	MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP,
-		M_ZERO);
+		M_WAITOK | M_ZERO);
 	MALLOC(newsess, struct session *, sizeof(struct session), M_SESSION,
-		M_ZERO);
+		M_WAITOK | M_ZERO);
 
 	sx_xlock(&proctree_lock);
 	enterpgrp(mycp, mycp->p_pid, newpgrp, newsess);
@@ -1301,7 +1301,7 @@ _aio_aqueue(struct thread *td, struct aiocb *job, struct aio_liojob *lj, int typ
 	struct kqueue *kq;
 	struct file *kq_fp;
 
-	aiocbe = uma_zalloc(aiocb_zone, 0);
+	aiocbe = uma_zalloc(aiocb_zone, M_WAITOK);
 	aiocbe->inputcharge = 0;
 	aiocbe->outputcharge = 0;
 	callout_handle_init(&aiocbe->timeouthandle);
@@ -1647,8 +1647,8 @@ aio_suspend(struct thread *td, struct aio_suspend_args *uap)
 		return (EAGAIN);
 
 	njoblist = 0;
-	ijoblist = uma_zalloc(aiol_zone, 0);
-	ujoblist = uma_zalloc(aiol_zone, 0);
+	ijoblist = uma_zalloc(aiol_zone, M_WAITOK);
+	ujoblist = uma_zalloc(aiol_zone, M_WAITOK);
 	cbptr = uap->aiocbp;
 
 	for (i = 0; i < uap->nent; i++) {
@@ -1971,7 +1971,7 @@ lio_listio(struct thread *td, struct lio_listio_args *uap)
 	if ((nent + ki->kaio_queue_count) > ki->kaio_qallowed_count)
 		return (EAGAIN);
 
-	lj = uma_zalloc(aiolio_zone, 0);
+	lj = uma_zalloc(aiolio_zone, M_WAITOK);
 	if (!lj)
 		return (EAGAIN);
 
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 104043cd65e5..a1f31e18728d 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -2742,7 +2742,7 @@ allocbuf(struct buf *bp, int size)
 				(bp->b_bufsize == 0) &&
 				(mbsize <= PAGE_SIZE/2)) {
 
-				bp->b_data = malloc(mbsize, M_BIOBUF, 0);
+				bp->b_data = malloc(mbsize, M_BIOBUF, M_WAITOK);
 				bp->b_bufsize = mbsize;
 				bp->b_bcount = size;
 				bp->b_flags |= B_MALLOC;
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 33fc4f0ef059..cac844e4269d 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -417,7 +417,7 @@ cache_enter(dvp, vp, cnp)
 	}
 	 
 	ncp = (struct namecache *)
-		malloc(sizeof *ncp + cnp->cn_namelen, M_VFSCACHE, 0);
+		malloc(sizeof *ncp + cnp->cn_namelen, M_VFSCACHE, M_WAITOK);
 	bzero((char *)ncp, sizeof *ncp);
 	numcache++;
 	if (!vp) {
@@ -737,7 +737,7 @@ kern___getcwd(struct thread *td, u_char *buf, enum uio_seg bufseg, u_int buflen)
 	if (buflen > MAXPATHLEN)
 		buflen = MAXPATHLEN;
 	error = 0;
-	tmpbuf = bp = malloc(buflen, M_TEMP, 0);
+	tmpbuf = bp = malloc(buflen, M_TEMP, M_WAITOK);
 	bp += buflen - 1;
 	*bp = '\0';
 	fdp = td->td_proc->p_fd;
@@ -848,7 +848,7 @@ vn_fullpath(struct thread *td, struct vnode *vn, char **retbuf, char **freebuf)
 		return (ENODEV);
 	if (vn == NULL)
 		return (EINVAL);
-	buf = malloc(MAXPATHLEN, M_TEMP, 0);
+	buf = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	bp = buf + MAXPATHLEN - 1;
 	*bp = '\0';
 	fdp = td->td_proc->p_fd;
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index da8441978fb1..7fd04023a8f0 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -1001,7 +1001,7 @@ cluster_collectbufs(vp, last_bp)
 
 	len = vp->v_lastw - vp->v_cstart + 1;
 	buflist = malloc(sizeof(struct buf *) * (len + 1) + sizeof(*buflist),
-	    M_SEGMENT, 0);
+	    M_SEGMENT, M_WAITOK);
 	buflist->bs_nchildren = 0;
 	buflist->bs_children = (struct buf **) (buflist + 1);
 	for (lbn = vp->v_cstart, i = 0; i < len; lbn++, i++) {
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 80158a34f1e2..b909b8304246 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -122,7 +122,7 @@ vfs_hang_addrlist(mp, nep, argp)
 		return (EINVAL);
 
 	i = sizeof(struct netcred) + argp->ex_addrlen + argp->ex_masklen;
-	np = (struct netcred *) malloc(i, M_NETADDR, M_ZERO);
+	np = (struct netcred *) malloc(i, M_NETADDR, M_WAITOK | M_ZERO);
 	saddr = (struct sockaddr *) (np + 1);
 	if ((error = copyin(argp->ex_addr, saddr, argp->ex_addrlen)))
 		goto out;
@@ -236,7 +236,7 @@ vfs_export(mp, argp)
 	}
 	if (argp->ex_flags & MNT_EXPORTED) {
 		if (nep == NULL) {
-			nep = malloc(sizeof(struct netexport), M_MOUNT, M_ZERO);
+			nep = malloc(sizeof(struct netexport), M_MOUNT, M_WAITOK | M_ZERO);
 			mp->mnt_export = nep;
 		}
 		if (argp->ex_flags & MNT_EXPUBLIC) {
@@ -306,7 +306,7 @@ vfs_setpublicfs(mp, nep, argp)
 	 */
 	if (argp->ex_indexfile != NULL) {
 		MALLOC(nfs_pub.np_index, char *, MAXNAMLEN + 1, M_TEMP,
-		    0);
+		    M_WAITOK);
 		error = copyinstr(argp->ex_indexfile, nfs_pub.np_index,
 		    MAXNAMLEN, (size_t *)0);
 		if (!error) {
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 0c89a944ae87..0592e9711649 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -1105,7 +1105,7 @@ kern_symlink(struct thread *td, char *path, char *link, enum uio_seg segflg)
 	if (segflg == UIO_SYSSPACE) {
 		syspath = path;
 	} else {
-		syspath = uma_zalloc(namei_zone, 0);
+		syspath = uma_zalloc(namei_zone, M_WAITOK);
 		if ((error = copyinstr(path, syspath, MAXPATHLEN, NULL)) != 0)
 			goto out;
 	}
@@ -3111,7 +3111,7 @@ unionread:
 		kuio.uio_iov = &kiov;
 		kuio.uio_segflg = UIO_SYSSPACE;
 		kiov.iov_len = uap->count;
-		MALLOC(dirbuf, caddr_t, uap->count, M_TEMP, 0);
+		MALLOC(dirbuf, caddr_t, uap->count, M_TEMP, M_WAITOK);
 		kiov.iov_base = dirbuf;
 		error = VOP_READDIR(vp, &kuio, fp->f_cred, &eofflag,
 			    NULL, NULL);
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 24ae27acc1e4..b221cd3aa3cb 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -133,7 +133,7 @@ vfs_opv_recalc(void)
 	 * detectable.
 	 */
 	MALLOC(vfs_op_offsets, int *,
-		num_op_descs * sizeof(int), M_TEMP, 0);
+		num_op_descs * sizeof(int), M_TEMP, M_WAITOK);
 	if (vfs_op_offsets == NULL)
 		panic("vfs_opv_recalc: no memory");
 	for (i = 0; i < num_op_descs; i++)
@@ -186,7 +186,7 @@ vfs_opv_recalc(void)
 		if (*opv_desc_vector_p == NULL)
 			MALLOC(*opv_desc_vector_p, vop_t **,
 				vfs_opv_numops * sizeof(vop_t *), M_VNODE,
-				M_ZERO);
+				M_WAITOK | M_ZERO);
 
 		/* Fill in, with slot 0 being to return EOPNOTSUPP */
 		opv_desc_vector = *opv_desc_vector_p;
@@ -221,7 +221,7 @@ vfs_add_vnodeops(const void *data)
 
 	opv = (const struct vnodeopv_desc *)data;
 	MALLOC(newopv, const struct vnodeopv_desc **,
-	       (vnodeopv_num + 1) * sizeof(*newopv), M_VNODE, 0);
+	       (vnodeopv_num + 1) * sizeof(*newopv), M_VNODE, M_WAITOK);
 	if (vnodeopv_descs) {
 		bcopy(vnodeopv_descs, newopv, vnodeopv_num * sizeof(*newopv));
 		FREE(vnodeopv_descs, M_VNODE);
@@ -244,11 +244,11 @@ vfs_add_vnodeops(const void *data)
 			/* not found, new entry */
 			MALLOC(newop, struct vnodeop_desc **,
 			       (num_op_descs + 1) * sizeof(*newop),
-			       M_VNODE, 0);
+			       M_VNODE, M_WAITOK);
 			/* new reference count (for unload) */
 			MALLOC(newref, int *,
 				(num_op_descs + 1) * sizeof(*newref),
-				M_VNODE, 0);
+				M_VNODE, M_WAITOK);
 			if (vfs_op_descs) {
 				bcopy(vfs_op_descs, newop,
 					num_op_descs * sizeof(*newop));
@@ -306,11 +306,11 @@ vfs_rm_vnodeops(const void *data)
 			}
 			MALLOC(newop, struct vnodeop_desc **,
 			       (num_op_descs - 1) * sizeof(*newop),
-			       M_VNODE, 0);
+			       M_VNODE, M_WAITOK);
 			/* new reference count (for unload) */
 			MALLOC(newref, int *,
 				(num_op_descs - 1) * sizeof(*newref),
-				M_VNODE, 0);
+				M_VNODE, M_WAITOK);
 			for (k = j; k < (num_op_descs - 1); k++) {
 				vfs_op_descs[k] = vfs_op_descs[k + 1];
 				vfs_op_desc_refs[k] = vfs_op_desc_refs[k + 1];
@@ -340,7 +340,7 @@ vfs_rm_vnodeops(const void *data)
 	if (opv_desc_vector != NULL)
 		FREE(opv_desc_vector, M_VNODE);
 	MALLOC(newopv, const struct vnodeopv_desc **,
-	       (vnodeopv_num - 1) * sizeof(*newopv), M_VNODE, 0);
+	       (vnodeopv_num - 1) * sizeof(*newopv), M_VNODE, M_WAITOK);
 	bcopy(vnodeopv_descs, newopv, (vnodeopv_num - 1) * sizeof(*newopv));
 	FREE(vnodeopv_descs, M_VNODE);
 	vnodeopv_descs = newopv;
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index e33e2c650b6a..f064b6460ad9 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -120,7 +120,7 @@ namei(ndp)
 	 * name into the buffer.
 	 */
 	if ((cnp->cn_flags & HASBUF) == 0)
-		cnp->cn_pnbuf = uma_zalloc(namei_zone, 0);
+		cnp->cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
 	if (ndp->ni_segflg == UIO_SYSSPACE)
 		error = copystr(ndp->ni_dirp, cnp->cn_pnbuf,
 			    MAXPATHLEN, (size_t *)&ndp->ni_pathlen);
@@ -224,7 +224,7 @@ namei(ndp)
 		}
 #endif
 		if (ndp->ni_pathlen > 1)
-			cp = uma_zalloc(namei_zone, 0);
+			cp = uma_zalloc(namei_zone, M_WAITOK);
 		else
 			cp = cnp->cn_pnbuf;
 		aiov.iov_base = cp;
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index eb208cc7362e..9c47ceb66d0d 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -224,13 +224,13 @@ vfs_buildopts(struct uio *auio, struct vfsoptlist **options)
 	int error, namelen, optlen;
 
 	iovcnt = auio->uio_iovcnt;
-	opts = malloc(sizeof(struct vfsoptlist), M_MOUNT, 0);
+	opts = malloc(sizeof(struct vfsoptlist), M_MOUNT, M_WAITOK);
 	TAILQ_INIT(opts);
 	for (i = 0; i < iovcnt; i += 2) {
-		opt = malloc(sizeof(struct vfsopt), M_MOUNT, 0);
+		opt = malloc(sizeof(struct vfsopt), M_MOUNT, M_WAITOK);
 		namelen = auio->uio_iov[i].iov_len;
 		optlen = auio->uio_iov[i + 1].iov_len;
-		opt->name = malloc(namelen, M_MOUNT, 0);
+		opt->name = malloc(namelen, M_MOUNT, M_WAITOK);
 		opt->value = NULL;
 		if (auio->uio_segflg == UIO_SYSSPACE) {
 			bcopy(auio->uio_iov[i].iov_base, opt->name, namelen);
@@ -242,7 +242,7 @@ vfs_buildopts(struct uio *auio, struct vfsoptlist **options)
 		}
 		opt->len = optlen;
 		if (optlen != 0) {
-			opt->value = malloc(optlen, M_MOUNT, 0);
+			opt->value = malloc(optlen, M_MOUNT, M_WAITOK);
 			if (auio->uio_segflg == UIO_SYSSPACE) {
 				bcopy(auio->uio_iov[i + 1].iov_base, opt->value,
 				    optlen);
@@ -289,11 +289,11 @@ vfs_mergeopts(struct vfsoptlist *toopts, struct vfsoptlist *opts)
 			opt2 = TAILQ_NEXT(opt2, link);
 		}
 		/* We want this option, duplicate it. */
-		new = malloc(sizeof(struct vfsopt), M_MOUNT, 0);
-		new->name = malloc(strlen(opt->name) + 1, M_MOUNT, 0);
+		new = malloc(sizeof(struct vfsopt), M_MOUNT, M_WAITOK);
+		new->name = malloc(strlen(opt->name) + 1, M_MOUNT, M_WAITOK);
 		strcpy(new->name, opt->name);
 		if (opt->len != 0) {
-			new->value = malloc(opt->len, M_MOUNT, 0);
+			new->value = malloc(opt->len, M_MOUNT, M_WAITOK);
 			bcopy(opt->value, new->value, opt->len);
 		} else {
 			new->value = NULL;
@@ -334,7 +334,7 @@ nmount(td, uap)
 		return (EINVAL);
 
 	if (iovcnt > UIO_SMALLIOV) {
-		MALLOC(iov, struct iovec *, iovlen, M_IOV, 0);
+		MALLOC(iov, struct iovec *, iovlen, M_IOV, M_WAITOK);
 		needfree = iov;
 	} else {
 		iov = aiov;
@@ -406,8 +406,8 @@ kernel_vmount(int flags, ...)
 		return (EINVAL);
 
 	iovlen = iovcnt * sizeof (struct iovec);
-	MALLOC(iovp, struct iovec *, iovlen, M_MOUNT, 0);
-	MALLOC(buf, char *, len, M_MOUNT, 0);
+	MALLOC(iovp, struct iovec *, iovlen, M_MOUNT, M_WAITOK);
+	MALLOC(buf, char *, len, M_MOUNT, M_WAITOK);
 	pos = buf;
 	va_start(ap, flags);
 	for (i = 0; i < iovcnt; i++) {
@@ -634,7 +634,7 @@ vfs_nmount(td, fsflags, fsoptions)
 	/*
 	 * Allocate and initialize the filesystem.
 	 */
-	mp = malloc(sizeof(struct mount), M_MOUNT, M_ZERO);
+	mp = malloc(sizeof(struct mount), M_MOUNT, M_WAITOK | M_ZERO);
 	TAILQ_INIT(&mp->mnt_nvnodelist);
 	TAILQ_INIT(&mp->mnt_reservedvnlist);
 	lockinit(&mp->mnt_lock, PVFS, "vfslock", 0, LK_NOPAUSE);
@@ -805,8 +805,8 @@ mount(td, uap)
 	char *fspath;
 	int error;
 
-	fstype = malloc(MFSNAMELEN, M_TEMP, 0);
-	fspath = malloc(MNAMELEN, M_TEMP, 0);
+	fstype = malloc(MFSNAMELEN, M_TEMP, M_WAITOK);
+	fspath = malloc(MNAMELEN, M_TEMP, M_WAITOK);
 
 	/*
 	 * vfs_mount() actually takes a kernel string for `type' and
@@ -998,7 +998,7 @@ vfs_mount(td, fstype, fspath, fsflags, fsdata)
 	/*
 	 * Allocate and initialize the filesystem.
 	 */
-	mp = malloc(sizeof(struct mount), M_MOUNT, M_ZERO);
+	mp = malloc(sizeof(struct mount), M_MOUNT, M_WAITOK | M_ZERO);
 	TAILQ_INIT(&mp->mnt_nvnodelist);
 	TAILQ_INIT(&mp->mnt_reservedvnlist);
 	lockinit(&mp->mnt_lock, PVFS, "vfslock", 0, LK_NOPAUSE);
@@ -1361,7 +1361,7 @@ vfs_rootmountalloc(fstypename, devname, mpp)
 			break;
 	if (vfsp == NULL)
 		return (ENODEV);
-	mp = malloc((u_long)sizeof(struct mount), M_MOUNT, M_ZERO);
+	mp = malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK | M_ZERO);
 	lockinit(&mp->mnt_lock, PVFS, "vfslock", 0, LK_NOPAUSE);
 	(void)vfs_busy(mp, LK_NOWAIT, 0, td);
 	TAILQ_INIT(&mp->mnt_nvnodelist);
@@ -1494,8 +1494,8 @@ vfs_mountroot_try(char *mountfrom)
 	splx(s);
 
 	/* parse vfs name and path */
-	vfsname = malloc(MFSNAMELEN, M_MOUNT, 0);
-	path = malloc(MNAMELEN, M_MOUNT, 0);
+	vfsname = malloc(MFSNAMELEN, M_MOUNT, M_WAITOK);
+	path = malloc(MNAMELEN, M_MOUNT, M_WAITOK);
 	vfsname[0] = path[0] = 0;
 	sprintf(patt, "%%%d[a-z0-9]:%%%zds", MFSNAMELEN, MNAMELEN);
 	if (sscanf(mountfrom, patt, vfsname, path) < 1)
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 7f3af03eac91..8e954eb6a48d 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -452,7 +452,7 @@ vop_lock_post(void *ap, int rc)
 void
 v_addpollinfo(struct vnode *vp)
 {
-	vp->v_pollinfo = uma_zalloc(vnodepoll_zone, 0);
+	vp->v_pollinfo = uma_zalloc(vnodepoll_zone, M_WAITOK);
 	mtx_init(&vp->v_pollinfo->vpi_lock, "vnode pollinfo", NULL, MTX_DEF);
 }
 
@@ -996,7 +996,7 @@ getnewvnode(tag, mp, vops, vpp)
 		numvnodes++;
 		mtx_unlock(&vnode_free_list_mtx);
 
-		vp = (struct vnode *) uma_zalloc(vnode_zone, M_ZERO);
+		vp = (struct vnode *) uma_zalloc(vnode_zone, M_WAITOK|M_ZERO);
 		mtx_init(&vp->v_interlock, "vnode interlock", NULL, MTX_DEF);
 		VI_LOCK(vp);
 		vp->v_dd = vp;
@@ -2938,7 +2938,7 @@ sysctl_vfs_conflist(SYSCTL_HANDLER_ARGS)
 	cnt = 0;
 	for (vfsp = vfsconf; vfsp != NULL; vfsp = vfsp->vfc_next)
 		cnt++;
-	xvfsp = malloc(sizeof(struct xvfsconf) * cnt, M_TEMP, 0);
+	xvfsp = malloc(sizeof(struct xvfsconf) * cnt, M_TEMP, M_WAITOK);
 	/*
 	 * Handle the race that we will have here when struct vfsconf
 	 * will be locked down by using both cnt and checking vfc_next
@@ -3051,7 +3051,7 @@ sysctl_vnode(SYSCTL_HANDLER_ARGS)
 		return (SYSCTL_OUT(req, 0, len));
 
 	sysctl_wire_old_buffer(req, 0);
-	xvn = malloc(len, M_TEMP, M_ZERO | 0);
+	xvn = malloc(len, M_TEMP, M_ZERO | M_WAITOK);
 	n = 0;
 	mtx_lock(&mountlist_mtx);
 	TAILQ_FOREACH(mp, &mountlist, mnt_list) {
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 0c89a944ae87..0592e9711649 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1105,7 +1105,7 @@ kern_symlink(struct thread *td, char *path, char *link, enum uio_seg segflg)
 	if (segflg == UIO_SYSSPACE) {
 		syspath = path;
 	} else {
-		syspath = uma_zalloc(namei_zone, 0);
+		syspath = uma_zalloc(namei_zone, M_WAITOK);
 		if ((error = copyinstr(path, syspath, MAXPATHLEN, NULL)) != 0)
 			goto out;
 	}
@@ -3111,7 +3111,7 @@ unionread:
 		kuio.uio_iov = &kiov;
 		kuio.uio_segflg = UIO_SYSSPACE;
 		kiov.iov_len = uap->count;
-		MALLOC(dirbuf, caddr_t, uap->count, M_TEMP, 0);
+		MALLOC(dirbuf, caddr_t, uap->count, M_TEMP, M_WAITOK);
 		kiov.iov_base = dirbuf;
 		error = VOP_READDIR(vp, &kuio, fp->f_cred, &eofflag,
 			    NULL, NULL);
diff --git a/sys/libkern/iconv.c b/sys/libkern/iconv.c
index 8352fcd1f832..8bc03c1e7a1f 100644
--- a/sys/libkern/iconv.c
+++ b/sys/libkern/iconv.c
@@ -186,7 +186,7 @@ iconv_register_cspair(const char *to, const char *from,
 	ucsfrom = strcmp(from, iconv_unicode_string) == 0;
 	if (!ucsfrom)
 		csize += strlen(from) + 1;
-	csp = malloc(csize, M_ICONV, 0);
+	csp = malloc(csize, M_ICONV, M_WAITOK);
 	bzero(csp, csize);
 	csp->cp_id = iconv_csid++;
 	csp->cp_dcp = dcp;
@@ -360,7 +360,7 @@ iconv_sysctl_add(SYSCTL_HANDLER_ARGS)
 	if (error)
 		return error;
 	if (din.ia_datalen) {
-		csp->cp_data = malloc(din.ia_datalen, M_ICONVDATA, 0);
+		csp->cp_data = malloc(din.ia_datalen, M_ICONVDATA, M_WAITOK);
 		error = copyin(din.ia_data, csp->cp_data, din.ia_datalen);
 		if (error)
 			goto bad;
diff --git a/sys/libkern/iconv_xlat.c b/sys/libkern/iconv_xlat.c
index e355c6b42194..6dd2800a535f 100644
--- a/sys/libkern/iconv_xlat.c
+++ b/sys/libkern/iconv_xlat.c
@@ -62,7 +62,7 @@ iconv_xlat_open(struct iconv_converter_class *dcp,
 {
 	struct iconv_xlat *dp;
 
-	dp = (struct iconv_xlat *)kobj_create((struct kobj_class*)dcp, M_ICONV, 0);
+	dp = (struct iconv_xlat *)kobj_create((struct kobj_class*)dcp, M_ICONV, M_WAITOK);
 	dp->d_table = csp->cp_data;
 	dp->d_csp = csp;
 	csp->cp_refcount++;
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index e5a567df3a27..df210e203939 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -207,9 +207,9 @@ bpf_movein(uio, linktype, mp, sockp, datlen)
 		return (EIO);
 
 	if (len > MHLEN) {
-		m = m_getcl(0, MT_DATA, M_PKTHDR);
+		m = m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR);
 	} else {
-		MGETHDR(m, 0, MT_DATA);
+		MGETHDR(m, M_TRYWAIT, MT_DATA);
 	}
 	if (m == NULL)
 		return (ENOBUFS);
@@ -340,7 +340,7 @@ bpfopen(dev, flags, fmt, td)
 	if ((dev->si_flags & SI_NAMED) == 0)
 		make_dev(&bpf_cdevsw, minor(dev), UID_ROOT, GID_WHEEL, 0600,
 		    "bpf%d", dev2unit(dev));
-	MALLOC(d, struct bpf_d *, sizeof(*d), M_BPF, M_ZERO);
+	MALLOC(d, struct bpf_d *, sizeof(*d), M_BPF, M_WAITOK | M_ZERO);
 	dev->si_drv1 = d;
 	d->bd_bufsize = bpf_bufsize;
 	d->bd_sig = SIGIO;
@@ -947,7 +947,7 @@ bpf_setf(d, fp)
 		return (EINVAL);
 
 	size = flen * sizeof(*fp->bf_insns);
-	fcode = (struct bpf_insn *)malloc(size, M_BPF, 0);
+	fcode = (struct bpf_insn *)malloc(size, M_BPF, M_WAITOK);
 	if (copyin((caddr_t)fp->bf_insns, (caddr_t)fcode, size) == 0 &&
 	    bpf_validate(fcode, (int)flen)) {
 		BPFD_LOCK(d);
@@ -1247,11 +1247,11 @@ static int
 bpf_allocbufs(d)
 	register struct bpf_d *d;
 {
-	d->bd_fbuf = (caddr_t)malloc(d->bd_bufsize, M_BPF, 0);
+	d->bd_fbuf = (caddr_t)malloc(d->bd_bufsize, M_BPF, M_WAITOK);
 	if (d->bd_fbuf == 0)
 		return (ENOBUFS);
 
-	d->bd_sbuf = (caddr_t)malloc(d->bd_bufsize, M_BPF, 0);
+	d->bd_sbuf = (caddr_t)malloc(d->bd_bufsize, M_BPF, M_WAITOK);
 	if (d->bd_sbuf == 0) {
 		free(d->bd_fbuf, M_BPF);
 		return (ENOBUFS);
diff --git a/sys/net/bpf_compat.h b/sys/net/bpf_compat.h
index 16fae349b488..212ac5ff2808 100644
--- a/sys/net/bpf_compat.h
+++ b/sys/net/bpf_compat.h
@@ -45,7 +45,7 @@
  * a fixed offset from the associated mbuf.  Sorry for this kludge.
  */
 #define malloc(size, type, canwait)				\
-bpf_alloc(size, (canwait & M_NOWAIT) ? M_NOWAIT : 0)
+bpf_alloc(size, (canwait & M_NOWAIT) ? M_DONTWAIT : M_TRYWAIT)
 
 #define free(cp, type) m_free(*(struct mbuf **)(cp - 8))
 
diff --git a/sys/net/bridge.c b/sys/net/bridge.c
index ff01a22eaa46..6efcc346f1a6 100644
--- a/sys/net/bridge.c
+++ b/sys/net/bridge.c
@@ -246,7 +246,7 @@ add_cluster(u_int16_t cluster_id, struct arpcom *ac)
     }
     c[n_clusters].ht = (struct hash_table *)
 	    malloc(HASH_SIZE * sizeof(struct hash_table),
-		M_IFADDR, M_ZERO);
+		M_IFADDR, M_WAITOK | M_ZERO);
     if (c[n_clusters].ht == NULL) {
 	printf("-- bridge: cannot allocate hash table for new cluster\n");
 	free(c, M_IFADDR);
@@ -254,7 +254,7 @@ add_cluster(u_int16_t cluster_id, struct arpcom *ac)
     }
     c[n_clusters].my_macs = (struct bdg_addr *)
 	    malloc(BDG_MAX_PORTS * sizeof(struct bdg_addr),
-		M_IFADDR, M_ZERO);
+		M_IFADDR, M_WAITOK | M_ZERO);
     if (c[n_clusters].my_macs == NULL) {
         printf("-- bridge: cannot allocate mac addr table for new cluster\n");
 	free(c[n_clusters].ht, M_IFADDR);
@@ -799,7 +799,7 @@ static struct mbuf *
 bdg_forward(struct mbuf *m0, struct ifnet *dst)
 {
 #define	EH_RESTORE(_m) do {						   \
-    M_PREPEND((_m), ETHER_HDR_LEN, M_NOWAIT);			   	   \
+    M_PREPEND((_m), ETHER_HDR_LEN, M_DONTWAIT);			   	   \
     if ((_m) == NULL) {							   \
 	bdg_dropped++;							   \
 	return NULL;							   \
@@ -976,7 +976,7 @@ bdg_forward(struct mbuf *m0, struct ifnet *dst)
 	    struct mbuf *m ;
 
 	    if (shared) {
-		m = m_copypacket(m0, M_NOWAIT);
+		m = m_copypacket(m0, M_DONTWAIT);
 		if (m == NULL) {	/* copy failed, give up */
 		    bdg_dropped++;
 		    return NULL;
@@ -1042,7 +1042,7 @@ forward:
 		m = m0 ;
 		m0 = NULL ; /* original is gone */
 	    } else {
-		m = m_copypacket(m0, M_NOWAIT);
+		m = m_copypacket(m0, M_DONTWAIT);
 		if (m == NULL) {
 		    IFNET_RUNLOCK();
 		    printf("bdg_forward: sorry, m_copypacket failed!\n");
@@ -1091,7 +1091,7 @@ bdginit(void)
     printf("BRIDGE 020214 loaded\n");
 
     ifp2sc = malloc(BDG_MAX_PORTS * sizeof(struct bdg_softc),
-		M_IFADDR, M_ZERO );
+		M_IFADDR, M_WAITOK | M_ZERO );
     if (ifp2sc == NULL)
 	return ENOMEM ;
 
diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c
index 89c5e293b8fd..dd6ab5617933 100644
--- a/sys/net/bsd_comp.c
+++ b/sys/net/bsd_comp.c
@@ -496,12 +496,12 @@ bsd_compress(state, mret, mp, slen, maxolen)
 	*wptr++ = (v);					\
 	if (wptr >= cp_end) {				\
 	    m->m_len = wptr - mtod(m, u_char *);	\
-	    MGET(m->m_next, M_NOWAIT, MT_DATA);	\
+	    MGET(m->m_next, M_DONTWAIT, MT_DATA);	\
 	    m = m->m_next;				\
 	    if (m) {					\
 		m->m_len = 0;				\
 		if (maxolen - olen > MLEN)		\
-		    MCLGET(m, M_NOWAIT);		\
+		    MCLGET(m, M_DONTWAIT);		\
 		wptr = mtod(m, u_char *);		\
 		cp_end = wptr + M_TRAILINGSPACE(m);	\
 	    } else					\
@@ -538,12 +538,12 @@ bsd_compress(state, mret, mp, slen, maxolen)
 	maxolen = slen;
 
     /* Allocate one mbuf to start with. */
-    MGET(m, M_NOWAIT, MT_DATA);
+    MGET(m, M_DONTWAIT, MT_DATA);
     *mret = m;
     if (m != NULL) {
 	m->m_len = 0;
 	if (maxolen + db->hdrlen > MLEN)
-	    MCLGET(m, M_NOWAIT);
+	    MCLGET(m, M_DONTWAIT);
 	m->m_data += db->hdrlen;
 	wptr = mtod(m, u_char *);
 	cp_end = wptr + M_TRAILINGSPACE(m);
@@ -872,13 +872,13 @@ bsd_decompress(state, cmp, dmpp)
     /*
      * Allocate one mbuf to start with.
      */
-    MGETHDR(dmp, M_NOWAIT, MT_DATA);
+    MGETHDR(dmp, M_DONTWAIT, MT_DATA);
     if (dmp == NULL)
 	return DECOMP_ERROR;
     mret = dmp;
     dmp->m_len = 0;
     dmp->m_next = NULL;
-    MCLGET(dmp, M_NOWAIT);
+    MCLGET(dmp, M_DONTWAIT);
     dmp->m_data += db->hdrlen;
     wptr = mtod(dmp, u_char *);
     space = M_TRAILINGSPACE(dmp) - PPP_HDRLEN + 1;
@@ -987,7 +987,7 @@ bsd_decompress(state, cmp, dmpp)
 	 */
 	if ((space -= codelen + extra) < 0) {
 	    dmp->m_len = wptr - mtod(dmp, u_char *);
-	    MGET(m, M_NOWAIT, MT_DATA);
+	    MGET(m, M_DONTWAIT, MT_DATA);
 	    if (m == NULL) {
 		m_freem(mret);
 		return DECOMP_ERROR;
@@ -995,7 +995,7 @@ bsd_decompress(state, cmp, dmpp)
 	    m->m_len = 0;
 	    m->m_next = NULL;
 	    dmp->m_next = m;
-	    MCLGET(m, M_NOWAIT);
+	    MCLGET(m, M_DONTWAIT);
 	    space = M_TRAILINGSPACE(m) - (codelen + extra);
 	    if (space < 0) {
 		/* now that's what I call *compression*. */
diff --git a/sys/net/if.c b/sys/net/if.c
index d9b3dad76617..599d069a2c0b 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -280,7 +280,7 @@ if_grow(void)
 
 	if_indexlim <<= 1;
 	n = if_indexlim * sizeof(*e);
-	e = malloc(n, M_IFADDR, M_ZERO);
+	e = malloc(n, M_IFADDR, M_WAITOK | M_ZERO);
 	if (ifindex_table != NULL) {
 		memcpy((caddr_t)e, (caddr_t)ifindex_table, n/2);
 		free((caddr_t)ifindex_table, M_IFADDR);
@@ -429,7 +429,7 @@ if_attach(ifp)
 		socksize = sizeof(*sdl);
 	socksize = ROUNDUP(socksize);
 	ifasize = sizeof(*ifa) + 2 * socksize;
-	ifa = (struct ifaddr *)malloc(ifasize, M_IFADDR, M_ZERO);
+	ifa = (struct ifaddr *)malloc(ifasize, M_IFADDR, M_WAITOK | M_ZERO);
 	if (ifa) {
 		IFA_LOCK_INIT(ifa);
 		sdl = (struct sockaddr_dl *)(ifa + 1);
@@ -775,7 +775,7 @@ if_clone_attach(ifc)
 	len = maxclone >> 3;
 	if ((len << 3) < maxclone)
 		len++;
-	ifc->ifc_units = malloc(len, M_CLONE, M_ZERO);
+	ifc->ifc_units = malloc(len, M_CLONE, M_WAITOK | M_ZERO);
 	ifc->ifc_bmlen = len;
 
 	LIST_INSERT_HEAD(&if_cloners, ifc, ifc_list);
@@ -1797,8 +1797,8 @@ if_addmulti(ifp, sa, retifma)
 		llsa = 0;
 	}
 
-	MALLOC(ifma, struct ifmultiaddr *, sizeof *ifma, M_IFMADDR, 0);
-	MALLOC(dupsa, struct sockaddr *, sa->sa_len, M_IFMADDR, 0);
+	MALLOC(ifma, struct ifmultiaddr *, sizeof *ifma, M_IFMADDR, M_WAITOK);
+	MALLOC(dupsa, struct sockaddr *, sa->sa_len, M_IFMADDR, M_WAITOK);
 	bcopy(sa, dupsa, sa->sa_len);
 
 	ifma->ifma_addr = dupsa;
@@ -1827,9 +1827,9 @@ if_addmulti(ifp, sa, retifma)
 			ifma->ifma_refcount++;
 		} else {
 			MALLOC(ifma, struct ifmultiaddr *, sizeof *ifma,
-			       M_IFMADDR, 0);
+			       M_IFMADDR, M_WAITOK);
 			MALLOC(dupsa, struct sockaddr *, llsa->sa_len,
-			       M_IFMADDR, 0);
+			       M_IFMADDR, M_WAITOK);
 			bcopy(llsa, dupsa, llsa->sa_len);
 			ifma->ifma_addr = dupsa;
 			ifma->ifma_ifp = ifp;
diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c
index 562149f3972f..667291d46772 100644
--- a/sys/net/if_arcsubr.c
+++ b/sys/net/if_arcsubr.c
@@ -212,7 +212,7 @@ arc_output(ifp, m, dst, rt0)
 	}
 
 	isphds = arc_isphds(atype);
-	M_PREPEND(m, isphds ? ARC_HDRNEWLEN : ARC_HDRLEN, M_NOWAIT);
+	M_PREPEND(m, isphds ? ARC_HDRNEWLEN : ARC_HDRLEN, M_DONTWAIT);
 	if (m == 0)
 		senderr(ENOBUFS);
 	ah = mtod(m, struct arc_header *);
@@ -297,13 +297,13 @@ arc_frag_next(ifp)
 	/* split out next fragment and return it */
 	if (ac->sflag < ac->fsflag) {
 		/* we CAN'T have short packets here */
-		ac->curr_frag = m_split(m, ARC_MAX_DATA, M_NOWAIT);
+		ac->curr_frag = m_split(m, ARC_MAX_DATA, M_DONTWAIT);
 		if (ac->curr_frag == 0) {
 			m_freem(m);
 			return 0;
 		}
 
-		M_PREPEND(m, ARC_HDRNEWLEN, M_NOWAIT);
+		M_PREPEND(m, ARC_HDRNEWLEN, M_DONTWAIT);
 		if (m == 0) {
 			m_freem(ac->curr_frag);
 			ac->curr_frag = 0;
@@ -322,7 +322,7 @@ arc_frag_next(ifp)
 	    ARC_MAX_FORBID_LEN - ARC_HDRNEWLEN + 2)) {
 		ac->curr_frag = 0;
 
-		M_PREPEND(m, ARC_HDRNEWLEN_EXC, M_NOWAIT);
+		M_PREPEND(m, ARC_HDRNEWLEN_EXC, M_DONTWAIT);
 		if (m == 0)
 			return 0;
 
@@ -335,7 +335,7 @@ arc_frag_next(ifp)
 	} else {
 		ac->curr_frag = 0;
 
-		M_PREPEND(m, ARC_HDRNEWLEN, M_NOWAIT);
+		M_PREPEND(m, ARC_HDRNEWLEN, M_DONTWAIT);
 		if (m == 0)
 			return 0;
 
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index 21b9f07c4482..3ec389443ee9 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -189,7 +189,7 @@ atm_output(ifp, m0, dst, rt0)
 		sz = sizeof(atmdst);
 		atm_flags = ATM_PH_FLAGS(&atmdst);
 		if (atm_flags & ATM_PH_LLCSNAP) sz += 8; /* sizeof snap == 8 */
-		M_PREPEND(m, sz, M_NOWAIT);
+		M_PREPEND(m, sz, M_DONTWAIT);
 		if (m == 0)
 			senderr(ENOBUFS);
 		ad = mtod(m, struct atm_pseudohdr *);
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index 4bad63764767..79775f1ac3a5 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -87,7 +87,7 @@ disc_clone_create(struct if_clone *ifc, int unit)
 	struct ifnet		*ifp;
 	struct disc_softc	*sc;
 
-	sc = malloc(sizeof(struct disc_softc), M_DISC, 0);
+	sc = malloc(sizeof(struct disc_softc), M_DISC, M_WAITOK);
 	bzero(sc, sizeof(struct disc_softc));
 
 	ifp = &sc->sc_if;
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index e7362ae7ce42..b064d381045b 100644
--- a/sys/net/if_ef.c
+++ b/sys/net/if_ef.c
@@ -430,7 +430,7 @@ ef_output(struct ifnet *ifp, struct mbuf **mp, struct sockaddr *dst, short *tp,
 		type = htons(m->m_pkthdr.len);
 		break;
 	    case ETHER_FT_8022:
-		M_PREPEND(m, ETHER_HDR_LEN + 3, 0);
+		M_PREPEND(m, ETHER_HDR_LEN + 3, M_TRYWAIT);
 		if (m == NULL) {
 			*mp = NULL;
 			return ENOBUFS;
@@ -453,7 +453,7 @@ ef_output(struct ifnet *ifp, struct mbuf **mp, struct sockaddr *dst, short *tp,
 		*hlen += 3;
 		break;
 	    case ETHER_FT_SNAP:
-		M_PREPEND(m, 8, 0);
+		M_PREPEND(m, 8, M_TRYWAIT);
 		if (m == NULL) {
 			*mp = NULL;
 			return ENOBUFS;
@@ -484,14 +484,14 @@ ef_clone(struct ef_link *efl, int ft)
 	int ifnlen;
 
 	efp = (struct efnet*)malloc(sizeof(struct efnet), M_IFADDR,
-	    M_ZERO);
+	    M_WAITOK | M_ZERO);
 	if (efp == NULL)
 		return ENOMEM;
 	efp->ef_ifp = ifp;
 	eifp = &efp->ef_ac.ac_if;
 	ifnlen = 1 + snprintf(cbuf, sizeof(cbuf), "%s%df", ifp->if_name,
 	    ifp->if_unit);
-	ifname = (char*)malloc(ifnlen, M_IFADDR, 0);
+	ifname = (char*)malloc(ifnlen, M_IFADDR, M_WAITOK);
 	eifp->if_name = strcpy(ifname, cbuf);
 	eifp->if_unit = ft;
 	eifp->if_softc = efp;
@@ -514,7 +514,7 @@ ef_load(void)
 		if (ifp->if_type != IFT_ETHER) continue;
 		EFDEBUG("Found interface %s%d\n", ifp->if_name, ifp->if_unit);
 		efl = (struct ef_link*)malloc(sizeof(struct ef_link), 
-		    M_IFADDR, M_ZERO);
+		    M_IFADDR, M_WAITOK | M_ZERO);
 		if (efl == NULL) {
 			error = ENOMEM;
 			break;
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 537dd1f2c6ac..0af11144bdf5 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -236,7 +236,7 @@ ether_output(ifp, m, dst, rt0)
 	    if ( aa->aa_flags & AFA_PHASE2 ) {
 		struct llc llc;
 
-		M_PREPEND(m, sizeof(struct llc), 0);
+		M_PREPEND(m, sizeof(struct llc), M_TRYWAIT);
 		llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
 		llc.llc_control = LLC_UI;
 		bcopy(at_org_code, llc.llc_snap_org_code, sizeof(at_org_code));
@@ -261,7 +261,7 @@ ether_output(ifp, m, dst, rt0)
 			type = htons( m->m_pkthdr.len);
 			break;
 		case 0xe0e0: /* Novell 802.2 and Token-Ring */
-			M_PREPEND(m, 3, 0);
+			M_PREPEND(m, 3, M_TRYWAIT);
 			type = htons( m->m_pkthdr.len);
 			cp = mtod(m, u_char *);
 			*cp++ = 0xE0;
@@ -312,7 +312,7 @@ ether_output(ifp, m, dst, rt0)
 	 * Add local net header.  If no space in first mbuf,
 	 * allocate another.
 	 */
-	M_PREPEND(m, sizeof (struct ether_header), M_NOWAIT);
+	M_PREPEND(m, sizeof (struct ether_header), M_DONTWAIT);
 	if (m == 0)
 		senderr(ENOBUFS);
 	eh = mtod(m, struct ether_header *);
@@ -470,7 +470,7 @@ ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst,
 		 * Restore Ethernet header, as needed, in case the
 		 * mbuf chain was replaced by ipfw.
 		 */
-		M_PREPEND(m, ETHER_HDR_LEN, M_NOWAIT);
+		M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT);
 		if (m == NULL) {
 			*m0 = m;
 			return 0;
@@ -494,7 +494,7 @@ ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst,
 		 * If shared, make a copy and keep the original.
 		 */
 		if (shared) {
-			m = m_copypacket(m, M_NOWAIT);
+			m = m_copypacket(m, M_DONTWAIT);
 			if (m == NULL)
 				return 0;
 		} else {
@@ -893,7 +893,7 @@ discard:
 		 * Put back the ethernet header so netgraph has a
 		 * consistent view of inbound packets.
 		 */
-		M_PREPEND(m, sizeof (struct ether_header), M_NOWAIT);
+		M_PREPEND(m, sizeof (struct ether_header), M_DONTWAIT);
 		(*ng_ether_input_orphan_p)(ifp, m);
 		return;
 	}
@@ -1112,7 +1112,7 @@ ether_resolvemulti(ifp, llsa, sa)
 		if (!IN_MULTICAST(ntohl(sin->sin_addr.s_addr)))
 			return EADDRNOTAVAIL;
 		MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR,
-		       M_ZERO);
+		       M_WAITOK|M_ZERO);
 		sdl->sdl_len = sizeof *sdl;
 		sdl->sdl_family = AF_LINK;
 		sdl->sdl_index = ifp->if_index;
@@ -1139,7 +1139,7 @@ ether_resolvemulti(ifp, llsa, sa)
 		if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
 			return EADDRNOTAVAIL;
 		MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR,
-		       M_ZERO);
+		       M_WAITOK|M_ZERO);
 		sdl->sdl_len = sizeof *sdl;
 		sdl->sdl_family = AF_LINK;
 		sdl->sdl_index = ifp->if_index;
diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c
index 08a5ca3d25e8..280a0417da62 100644
--- a/sys/net/if_faith.c
+++ b/sys/net/if_faith.c
@@ -159,7 +159,7 @@ faith_clone_create(ifc, unit)
 {
 	struct faith_softc *sc;
 
-	sc = malloc(sizeof(struct faith_softc), M_FAITH, 0);
+	sc = malloc(sizeof(struct faith_softc), M_FAITH, M_WAITOK);
 	bzero(sc, sizeof(struct faith_softc));
 
 	sc->sc_if.if_softc = sc;
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 05ff6ae4e56e..49a5f21811d1 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -203,7 +203,7 @@ fddi_output(ifp, m, dst, rt0)
 	    if (aa->aa_flags & AFA_PHASE2) {
 		struct llc llc;
 
-		M_PREPEND(m, LLC_SNAPFRAMELEN, 0);
+		M_PREPEND(m, LLC_SNAPFRAMELEN, M_TRYWAIT);
 		if (m == 0)
 			senderr(ENOBUFS);
 		llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
@@ -290,7 +290,7 @@ fddi_output(ifp, m, dst, rt0)
 	 */
 	if (type != 0) {
 		struct llc *l;
-		M_PREPEND(m, LLC_SNAPFRAMELEN, M_NOWAIT);
+		M_PREPEND(m, LLC_SNAPFRAMELEN, M_DONTWAIT);
 		if (m == 0)
 			senderr(ENOBUFS);
 		l = mtod(m, struct llc *);
@@ -305,7 +305,7 @@ fddi_output(ifp, m, dst, rt0)
 	 * Add local net header.  If no space in first mbuf,
 	 * allocate another.
 	 */
-	M_PREPEND(m, FDDI_HDR_LEN, M_NOWAIT);
+	M_PREPEND(m, FDDI_HDR_LEN, M_DONTWAIT);
 	if (m == 0)
 		senderr(ENOBUFS);
 	fh = mtod(m, struct fddi_header *);
@@ -706,7 +706,7 @@ fddi_resolvemulti(ifp, llsa, sa)
 		if (!IN_MULTICAST(ntohl(sin->sin_addr.s_addr)))
 			return (EADDRNOTAVAIL);
 		MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR,
-		       0);
+		       M_WAITOK);
 		sdl->sdl_len = sizeof *sdl;
 		sdl->sdl_family = AF_LINK;
 		sdl->sdl_index = ifp->if_index;
@@ -735,7 +735,7 @@ fddi_resolvemulti(ifp, llsa, sa)
 		if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
 			return (EADDRNOTAVAIL);
 		MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR,
-		       0);
+		       M_WAITOK);
 		sdl->sdl_len = sizeof *sdl;
 		sdl->sdl_family = AF_LINK;
 		sdl->sdl_index = ifp->if_index;
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index fce294df3934..1cb4463abd63 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -137,7 +137,7 @@ gif_clone_create(ifc, unit)
 {
 	struct gif_softc *sc;
 
-	sc = malloc (sizeof(struct gif_softc), M_GIF, 0);
+	sc = malloc (sizeof(struct gif_softc), M_GIF, M_WAITOK);
 	bzero(sc, sizeof(struct gif_softc));
 
 	sc->gif_if.if_softc = sc;
@@ -777,12 +777,12 @@ gif_set_tunnel(ifp, src, dst)
 		}
 
 	osrc = sc->gif_psrc;
-	sa = (struct sockaddr *)malloc(src->sa_len, M_IFADDR, 0);
+	sa = (struct sockaddr *)malloc(src->sa_len, M_IFADDR, M_WAITOK);
 	bcopy((caddr_t)src, (caddr_t)sa, src->sa_len);
 	sc->gif_psrc = sa;
 
 	odst = sc->gif_pdst;
-	sa = (struct sockaddr *)malloc(dst->sa_len, M_IFADDR, 0);
+	sa = (struct sockaddr *)malloc(dst->sa_len, M_IFADDR, M_WAITOK);
 	bcopy((caddr_t)dst, (caddr_t)sa, dst->sa_len);
 	sc->gif_pdst = sa;
 
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 33a4eff9cca3..658539687205 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -160,7 +160,7 @@ gre_clone_create(ifc, unit)
 {
 	struct gre_softc *sc;
 
-	sc = malloc(sizeof(struct gre_softc), M_GRE, 0);
+	sc = malloc(sizeof(struct gre_softc), M_GRE, M_WAITOK);
 	memset(sc, 0, sizeof(struct gre_softc));
 
 	sc->sc_if.if_name = GRENAME;
@@ -294,7 +294,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 
 			if ((m->m_data - msiz) < m->m_pktdat) {
 				/* need new mbuf */
-				MGETHDR(m0, M_NOWAIT, MT_HEADER);
+				MGETHDR(m0, M_DONTWAIT, MT_HEADER);
 				if (m0 == NULL) {
 					_IF_DROP(&ifp->if_snd);
 					m_freem(m);
@@ -348,7 +348,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 			error = EAFNOSUPPORT;
 			goto end;
 		}
-		M_PREPEND(m, sizeof(struct greip), M_NOWAIT);
+		M_PREPEND(m, sizeof(struct greip), M_DONTWAIT);
 	} else {
 		_IF_DROP(&ifp->if_snd);
 		m_freem(m);
diff --git a/sys/net/if_ieee80211subr.c b/sys/net/if_ieee80211subr.c
index e67243580278..b088e26169c7 100644
--- a/sys/net/if_ieee80211subr.c
+++ b/sys/net/if_ieee80211subr.c
@@ -406,7 +406,7 @@ ieee80211_input(struct ifnet *ifp, struct mbuf *m, int rssi, u_int32_t rstamp)
 		if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
 			eh = mtod(m, struct ether_header *);
 			if (ETHER_IS_MULTICAST(eh->ether_dhost)) {
-				m1 = m_copym(m, 0, M_COPYALL, M_NOWAIT);
+				m1 = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
 				if (m1 == NULL)
 					ifp->if_oerrors++;
 				else
@@ -517,7 +517,7 @@ ieee80211_mgmt_output(struct ifnet *ifp, struct ieee80211_node *ni,
 	if (ni == NULL)
 		ni = &ic->ic_bss;
 	ni->ni_inact = 0;
-	M_PREPEND(m, sizeof(struct ieee80211_frame), M_NOWAIT);
+	M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT);
 	if (m == NULL)
 		return ENOMEM;
 	wh = mtod(m, struct ieee80211_frame *);
@@ -585,7 +585,7 @@ ieee80211_encap(struct ifnet *ifp, struct mbuf *m)
 	llc->llc_snap.org_code[1] = 0;
 	llc->llc_snap.org_code[2] = 0;
 	llc->llc_snap.ether_type = eh.ether_type;
-	M_PREPEND(m, sizeof(struct ieee80211_frame), M_NOWAIT);
+	M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT);
 	if (m == NULL)
 		return NULL;
 	wh = mtod(m, struct ieee80211_frame *);
@@ -671,7 +671,7 @@ ieee80211_decap(struct ifnet *ifp, struct mbuf *m)
 		pktlen = m->m_pkthdr.len;
 		while (pktlen > off) {
 			if (n0 == NULL) {
-				MGETHDR(n, M_NOWAIT, MT_DATA);
+				MGETHDR(n, M_DONTWAIT, MT_DATA);
 				if (n == NULL) {
 					m_freem(m);
 					return NULL;
@@ -679,7 +679,7 @@ ieee80211_decap(struct ifnet *ifp, struct mbuf *m)
 				M_MOVE_PKTHDR(n, m);
 				n->m_len = MHLEN;
 			} else {
-				MGET(n, M_NOWAIT, MT_DATA);
+				MGET(n, M_DONTWAIT, MT_DATA);
 				if (n == NULL) {
 					m_freem(m);
 					m_freem(n0);
@@ -688,7 +688,7 @@ ieee80211_decap(struct ifnet *ifp, struct mbuf *m)
 				n->m_len = MLEN;
 			}
 			if (pktlen - off >= MINCLSIZE) {
-				MCLGET(n, M_NOWAIT);
+				MCLGET(n, M_DONTWAIT);
 				if (n->m_flags & M_EXT)
 					n->m_len = n->m_ext.ext_size;
 			}
@@ -1407,7 +1407,7 @@ ieee80211_send_prreq(struct ieee80211com *ic, struct ieee80211_node *ni,
 	 *	[tlv] ssid
 	 *	[tlv] supported rates
 	 */
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	m->m_data += sizeof(struct ieee80211_frame);
@@ -1450,7 +1450,7 @@ ieee80211_send_prresp(struct ieee80211com *ic, struct ieee80211_node *bs0,
 	 *	[tlv] supported rates
 	 *	[tlv] parameter set (IBSS)
 	 */
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	m->m_data += sizeof(struct ieee80211_frame);
@@ -1503,7 +1503,7 @@ ieee80211_send_auth(struct ieee80211com *ic, struct ieee80211_node *ni,
 	u_int16_t *frm;
 	int ret;
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	MH_ALIGN(m, 2 * 3);
@@ -1529,7 +1529,7 @@ ieee80211_send_deauth(struct ieee80211com *ic, struct ieee80211_node *ni,
 	if (ifp->if_flags & IFF_DEBUG)
 		if_printf(ifp, "station %s deauthenticate (reason %d)\n",
 		    ether_sprintf(ni->ni_macaddr), reason);
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	MH_ALIGN(m, 2);
@@ -1555,7 +1555,7 @@ ieee80211_send_asreq(struct ieee80211com *ic, struct ieee80211_node *ni,
 	 *	[tlv] ssid
 	 *	[tlv] supported rates
 	 */
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	m->m_data += sizeof(struct ieee80211_frame);
@@ -1613,7 +1613,7 @@ ieee80211_send_asresp(struct ieee80211com *ic, struct ieee80211_node *ni,
 	 *	[2] association ID
 	 *	[tlv] supported rates
 	 */
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	m->m_data += sizeof(struct ieee80211_frame);
@@ -1659,7 +1659,7 @@ ieee80211_send_disassoc(struct ieee80211com *ic, struct ieee80211_node *ni,
 	if (ifp->if_flags & IFF_DEBUG)
 		if_printf(ifp, "station %s disassociate (reason %d)\n",
 		    ether_sprintf(ni->ni_macaddr), reason);
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	MH_ALIGN(m, 2);
@@ -2476,7 +2476,7 @@ ieee80211_wep_crypt(struct ifnet *ifp, struct mbuf *m0, int txflag)
 	}
 	m = m0;
 	left = m->m_pkthdr.len;
-	MGET(n, M_NOWAIT, m->m_type);
+	MGET(n, M_DONTWAIT, m->m_type);
 	n0 = n;
 	if (n == NULL)
 		goto fail;
@@ -2490,7 +2490,7 @@ ieee80211_wep_crypt(struct ifnet *ifp, struct mbuf *m0, int txflag)
 	}
 	n->m_len = MHLEN;
 	if (n->m_pkthdr.len >= MINCLSIZE) {
-		MCLGET(n, M_NOWAIT);
+		MCLGET(n, M_DONTWAIT);
 		if (n->m_flags & M_EXT)
 			n->m_len = n->m_ext.ext_size;
 	}
@@ -2544,13 +2544,13 @@ ieee80211_wep_crypt(struct ifnet *ifp, struct mbuf *m0, int txflag)
 		if (len > n->m_len - noff) {
 			len = n->m_len - noff;
 			if (len == 0) {
-				MGET(n->m_next, M_NOWAIT, n->m_type);
+				MGET(n->m_next, M_DONTWAIT, n->m_type);
 				if (n->m_next == NULL)
 					goto fail;
 				n = n->m_next;
 				n->m_len = MLEN;
 				if (left >= MINCLSIZE) {
-					MCLGET(n, M_NOWAIT);
+					MCLGET(n, M_DONTWAIT);
 					if (n->m_flags & M_EXT)
 						n->m_len = n->m_ext.ext_size;
 				}
@@ -2579,7 +2579,7 @@ ieee80211_wep_crypt(struct ifnet *ifp, struct mbuf *m0, int txflag)
 			n->m_len = noff + sizeof(crcbuf);
 		else {
 			n->m_len = noff;
-			MGET(n->m_next, M_NOWAIT, n->m_type);
+			MGET(n->m_next, M_DONTWAIT, n->m_type);
 			if (n->m_next == NULL)
 				goto fail;
 			n = n->m_next;
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index 4fa3e36d0a5c..acb11471aac4 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -299,7 +299,7 @@ iso88025_output(ifp, m, dst, rt0)
 		bcopy((caddr_t)&(satoipx_addr(dst).x_host), (caddr_t)edst,
 			sizeof (edst));
 
-		M_PREPEND(m, 3, 0);
+		M_PREPEND(m, 3, M_TRYWAIT);
 		if (m == 0)
 			senderr(ENOBUFS);
 		m = m_pullup(m, 3);
@@ -342,7 +342,7 @@ iso88025_output(ifp, m, dst, rt0)
 
 	if (snap_type != 0) {
         	struct llc *l;
-		M_PREPEND(m, sizeof (struct llc), M_NOWAIT);
+		M_PREPEND(m, sizeof (struct llc), M_DONTWAIT);
 		if (m == 0)
 			senderr(ENOBUFS);
 		l = mtod(m, struct llc *);
@@ -358,7 +358,7 @@ iso88025_output(ifp, m, dst, rt0)
 	 * Add local net header.  If no space in first mbuf,
 	 * allocate another.
 	 */
-	M_PREPEND(m, ISO88025_HDR_LEN + rif_len, M_NOWAIT);
+	M_PREPEND(m, ISO88025_HDR_LEN + rif_len, M_DONTWAIT);
 	if (m == 0)
 		senderr(ENOBUFS);
 
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index deeecab0e287..c753fdc2b05c 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -147,7 +147,7 @@ lo_clone_create(ifc, unit)
 {
 	struct lo_softc *sc;
 
-	MALLOC(sc, struct lo_softc *, sizeof(*sc), M_LO, M_ZERO);
+	MALLOC(sc, struct lo_softc *, sizeof(*sc), M_LO, M_WAITOK | M_ZERO);
 
 	sc->sc_if.if_name = LONAME;
 	sc->sc_if.if_unit = unit;
@@ -215,7 +215,7 @@ looutput(ifp, m, dst, rt)
 		struct mbuf *n;
 
 		/* XXX MT_HEADER should be m->m_type */
-		MGETHDR(n, M_NOWAIT, MT_HEADER);
+		MGETHDR(n, M_DONTWAIT, MT_HEADER);
 		if (!n)
 			goto contiguousfail;
 		M_MOVE_PKTHDR(n, m);
@@ -227,7 +227,7 @@ looutput(ifp, m, dst, rt)
 		 */
 		m->m_pkthdr.label.l_flags &= ~MAC_FLAG_INITIALIZED;
 #endif
-		MCLGET(n, M_NOWAIT);
+		MCLGET(n, M_DONTWAIT);
 		if (! (n->m_flags & M_EXT)) {
 			m_freem(n);
 			goto contiguousfail;
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 75578447490c..564d3242d34f 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -199,7 +199,7 @@ ppp_clone_create(struct if_clone *ifc, int unit)
 {
 	struct ppp_softc	*sc;
 
-	sc = malloc(sizeof(struct ppp_softc), M_PPP, M_ZERO);
+	sc = malloc(sizeof(struct ppp_softc), M_PPP, M_WAITOK | M_ZERO);
 	sc->sc_if.if_softc = sc;
 	sc->sc_if.if_name = PPPNAME;
 	sc->sc_if.if_unit = unit;
@@ -572,7 +572,7 @@ pppioctl(sc, cmd, data, flag, td)
 	}
 	newcodelen = nbp->bf_len * sizeof(struct bpf_insn);
 	if (newcodelen != 0) {
-	    MALLOC(newcode, struct bpf_insn *, newcodelen, M_DEVBUF, 0);
+	    MALLOC(newcode, struct bpf_insn *, newcodelen, M_DEVBUF, M_WAITOK);
 	    if (newcode == 0) {
 		error = EINVAL;		/* or sumpin */
 		break;
@@ -831,7 +831,7 @@ pppoutput(ifp, m0, dst, rtp)
      * (This assumes M_LEADINGSPACE is always 0 for a cluster mbuf.)
      */
     if (M_LEADINGSPACE(m0) < PPP_HDRLEN) {
-	m0 = m_prepend(m0, PPP_HDRLEN, M_NOWAIT);
+	m0 = m_prepend(m0, PPP_HDRLEN, M_DONTWAIT);
 	if (m0 == 0) {
 	    error = ENOBUFS;
 	    goto bad;
@@ -1411,13 +1411,13 @@ ppp_inproc(sc, m)
 	}
 
 	/* Copy the PPP and IP headers into a new mbuf. */
-	MGETHDR(mp, M_NOWAIT, MT_DATA);
+	MGETHDR(mp, M_DONTWAIT, MT_DATA);
 	if (mp == NULL)
 	    goto bad;
 	mp->m_len = 0;
 	mp->m_next = NULL;
 	if (hlen + PPP_HDRLEN > MHLEN) {
-	    MCLGET(mp, M_NOWAIT);
+	    MCLGET(mp, M_DONTWAIT);
 	    if (M_TRAILINGSPACE(mp) < hlen + PPP_HDRLEN) {
 		m_freem(mp);
 		goto bad;	/* lose if big headers and no clusters */
@@ -1475,7 +1475,7 @@ ppp_inproc(sc, m)
      * whole cluster on it.
      */
     if (ilen <= MHLEN && M_IS_CLUSTER(m)) {
-	MGETHDR(mp, M_NOWAIT, MT_DATA);
+	MGETHDR(mp, M_DONTWAIT, MT_DATA);
 	if (mp != NULL) {
 #ifdef MAC
 	    mac_create_mbuf_from_mbuf(m, mp);
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 80d8b359f54f..8a91b0bbb3ff 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -264,11 +264,11 @@ slcreate()
 	int unit;
 	struct mbuf *m;
 
-	MALLOC(sc, struct sl_softc *, sizeof(*sc), M_SL, M_ZERO);
+	MALLOC(sc, struct sl_softc *, sizeof(*sc), M_SL, M_WAITOK | M_ZERO);
 
-	m = m_gethdr(0, MT_DATA);
+	m = m_gethdr(M_TRYWAIT, MT_DATA);
 	if (m != NULL) {
-		MCLGET(m, 0);
+		MCLGET(m, M_TRYWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			m = NULL;
@@ -791,7 +791,7 @@ sl_btom(sc, len)
 {
 	struct mbuf *m, *newm;
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return (NULL);
 
@@ -803,7 +803,7 @@ sl_btom(sc, len)
 	 * guarantees that packet will fit in a cluster.
 	 */
 	if (len >= MHLEN) {
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			/*
 			 * we couldn't get a cluster - if memory's this
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index cfd1546c856f..2df21cf35066 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -618,7 +618,7 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
 				 * enough leading space in the existing mbuf).
 				 */
 				m_adj(m, vjlen);
-				M_PREPEND(m, hlen, M_NOWAIT);
+				M_PREPEND(m, hlen, M_DONTWAIT);
 				if (m == NULL)
 					goto drop2;
 				bcopy(iphdr, mtod(m, u_char *), hlen);
@@ -892,7 +892,7 @@ sppp_output(struct ifnet *ifp, struct mbuf *m,
 	/*
 	 * Prepend general data packet PPP header. For now, IP only.
 	 */
-	M_PREPEND (m, PPP_HEADER_LEN, M_NOWAIT);
+	M_PREPEND (m, PPP_HEADER_LEN, M_DONTWAIT);
 	if (! m) {
 		if (debug)
 			log(LOG_DEBUG, SPP_FMT "no memory for transmit header\n",
@@ -1036,7 +1036,7 @@ sppp_attach(struct ifnet *ifp)
 #ifdef INET6
 	sp->confflags |= CONF_ENABLE_IPV6;
 #endif
-	sp->pp_comp = malloc(sizeof(struct slcompress), M_TEMP, 0);
+	sp->pp_comp = malloc(sizeof(struct slcompress), M_TEMP, M_WAIT);
 	sl_compress_init(sp->pp_comp, -1);
 	sppp_lcp_init(sp);
 	sppp_ipcp_init(sp);
@@ -1357,7 +1357,7 @@ sppp_cisco_send(struct sppp *sp, int type, long par1, long par2)
 	getmicrouptime(&tv);
 #endif
 
-	MGETHDR (m, M_NOWAIT, MT_DATA);
+	MGETHDR (m, M_DONTWAIT, MT_DATA);
 	if (! m)
 		return;
 	m->m_pkthdr.len = m->m_len = PPP_HEADER_LEN + CISCO_PACKET_LEN;
@@ -1410,7 +1410,7 @@ sppp_cp_send(struct sppp *sp, u_short proto, u_char type,
 
 	if (len > MHLEN - PPP_HEADER_LEN - LCP_HEADER_LEN)
 		len = MHLEN - PPP_HEADER_LEN - LCP_HEADER_LEN;
-	MGETHDR (m, M_NOWAIT, MT_DATA);
+	MGETHDR (m, M_DONTWAIT, MT_DATA);
 	if (! m)
 		return;
 	m->m_pkthdr.len = m->m_len = PPP_HEADER_LEN + LCP_HEADER_LEN + len;
@@ -4616,7 +4616,7 @@ sppp_auth_send(const struct cp *cp, struct sppp *sp,
 	const char *msg;
 	va_list ap;
 
-	MGETHDR (m, M_NOWAIT, MT_DATA);
+	MGETHDR (m, M_DONTWAIT, MT_DATA);
 	if (! m)
 		return;
 	m->m_pkthdr.rcvif = 0;
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index b96883cf83f4..1d84836eb879 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -179,7 +179,7 @@ stf_clone_create(ifc, unit)
 {
 	struct stf_softc *sc;
 
-	sc = malloc(sizeof(struct stf_softc), M_STF, M_ZERO);
+	sc = malloc(sizeof(struct stf_softc), M_STF, M_WAITOK | M_ZERO);
 	sc->sc_if.if_name = STFNAME;
 	sc->sc_if.if_unit = unit;
 
@@ -446,7 +446,7 @@ stf_output(ifp, m, dst, rt)
 	}
 #endif /*NBPFILTER > 0*/
 
-	M_PREPEND(m, sizeof(struct ip), M_NOWAIT);
+	M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
 	if (m && m->m_len < sizeof(struct ip))
 		m = m_pullup(m, sizeof(struct ip));
 	if (m == NULL) {
diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c
index 58b535debba8..ee7124a9f09e 100644
--- a/sys/net/if_tap.c
+++ b/sys/net/if_tap.c
@@ -324,7 +324,7 @@ tapcreate(dev)
 	char			*name = NULL;
 
 	/* allocate driver storage and create device */
-	MALLOC(tp, struct tap_softc *, sizeof(*tp), M_TAP, M_ZERO);
+	MALLOC(tp, struct tap_softc *, sizeof(*tp), M_TAP, M_WAITOK | M_ZERO);
 	SLIST_INSERT_HEAD(&taphead, tp, tap_next);
 
 	unit = dev2unit(dev) & TAPMAXUNIT;
@@ -839,7 +839,7 @@ tapwrite(dev, uio, flag)
 	tlen = uio->uio_resid;
 
 	/* get a header mbuf */
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return (ENOBUFS);
 	mlen = MHLEN;
@@ -852,7 +852,7 @@ tapwrite(dev, uio, flag)
 		*mp = m;
 		mp = &m->m_next;
 		if (uio->uio_resid > 0) {
-			MGET(m, M_NOWAIT, MT_DATA);
+			MGET(m, M_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				error = ENOBUFS;
 				break;
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index e7c3a86db63c..bcb9062b4d3b 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -230,7 +230,7 @@ tuncreate(dev_t dev)
 		dev = make_dev(&tun_cdevsw, minor(dev),
 		    UID_UUCP, GID_DIALER, 0600, "tun%d", dev2unit(dev));
 
-	MALLOC(sc, struct tun_softc *, sizeof(*sc), M_TUN, M_ZERO);
+	MALLOC(sc, struct tun_softc *, sizeof(*sc), M_TUN, M_WAITOK | M_ZERO);
 	sc->tun_flags = TUN_INITED;
 	sc->next = tunhead;
 	tunhead = sc;
@@ -484,7 +484,7 @@ tunoutput(
 	/* prepend sockaddr? this may abort if the mbuf allocation fails */
 	if (tp->tun_flags & TUN_LMODE) {
 		/* allocate space for sockaddr */
-		M_PREPEND(m0, dst->sa_len, M_NOWAIT);
+		M_PREPEND(m0, dst->sa_len, M_DONTWAIT);
 
 		/* if allocation failed drop packet */
 		if (m0 == NULL) {
@@ -498,7 +498,7 @@ tunoutput(
 
 	if (tp->tun_flags & TUN_IFHEAD) {
 		/* Prepend the address family */
-		M_PREPEND(m0, 4, M_NOWAIT);
+		M_PREPEND(m0, 4, M_DONTWAIT);
 
 		/* if allocation failed drop packet */
 		if (m0 == NULL) {
@@ -718,7 +718,7 @@ tunwrite(dev_t dev, struct uio *uio, int flag)
 	tlen = uio->uio_resid;
 
 	/* get a header mbuf */
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return (ENOBUFS);
 	mlen = MHLEN;
@@ -731,7 +731,7 @@ tunwrite(dev_t dev, struct uio *uio, int flag)
 		*mp = m;
 		mp = &m->m_next;
 		if (uio->uio_resid > 0) {
-			MGET (m, M_NOWAIT, MT_DATA);
+			MGET (m, M_DONTWAIT, MT_DATA);
 			if (m == 0) {
 				error = ENOBUFS;
 				break;
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 421a8b571a3f..abef59159ba8 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -168,7 +168,7 @@ vlan_setmulti(struct ifnet *ifp)
 	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
-		mc = malloc(sizeof(struct vlan_mc_entry), M_VLAN, 0);
+		mc = malloc(sizeof(struct vlan_mc_entry), M_VLAN, M_WAITOK);
 		bcopy(LLADDR((struct sockaddr_dl *)ifma->ifma_addr),
 		    (char *)&mc->mc_addr, ETHER_ADDR_LEN);
 		SLIST_INSERT_HEAD(&sc->vlan_mc_listhead, mc, mc_entries);
@@ -232,7 +232,7 @@ vlan_clone_create(struct if_clone *ifc, int unit)
 	struct ifnet *ifp;
 	int s;
 
-	ifv = malloc(sizeof(struct ifvlan), M_VLAN, M_ZERO);
+	ifv = malloc(sizeof(struct ifvlan), M_VLAN, M_WAITOK | M_ZERO);
 	ifp = &ifv->ifv_if;
 	SLIST_INIT(&ifv->vlan_mc_listhead);
 
@@ -323,7 +323,7 @@ vlan_start(struct ifnet *ifp)
 			struct m_tag *mtag = m_tag_alloc(MTAG_VLAN,
 							 MTAG_VLAN_TAG,
 							 sizeof (u_int),
-							 M_NOWAIT);
+							 M_DONTWAIT);
 			if (mtag == NULL) {
 				ifp->if_oerrors++;
 				m_freem(m);
@@ -332,7 +332,7 @@ vlan_start(struct ifnet *ifp)
 			*(u_int*)(mtag+1) = ifv->ifv_tag;
 			m_tag_prepend(m, mtag);
 		} else {
-			M_PREPEND(m, ifv->ifv_encaplen, M_NOWAIT);
+			M_PREPEND(m, ifv->ifv_encaplen, M_DONTWAIT);
 			if (m == NULL) {
 				if_printf(ifp, "unable to prepend VLAN header");
 				ifp->if_ierrors++;
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index ff656a62a169..42f2dcc92002 100644
--- a/sys/net/if_vlan_var.h
+++ b/sys/net/if_vlan_var.h
@@ -98,7 +98,7 @@ struct	vlanreq {
 #define	VLAN_INPUT_TAG(_ifp, _m, _t, _errcase) do {		\
 	struct m_tag *mtag;					\
 	mtag = m_tag_alloc(MTAG_VLAN, MTAG_VLAN_TAG,		\
-			   sizeof (u_int), M_NOWAIT);		\
+			   sizeof (u_int), M_DONTWAIT);		\
 	if (mtag == NULL) {					\
 		(_ifp)->if_ierrors++;				\
 		m_freem(_m);					\
diff --git a/sys/net/pfil.c b/sys/net/pfil.c
index a53051b917b8..2ed40b2f0f4c 100644
--- a/sys/net/pfil.c
+++ b/sys/net/pfil.c
@@ -61,7 +61,7 @@ pfil_init(ph)
  *	PFIL_IN		call me on incoming packets
  *	PFIL_OUT	call me on outgoing packets
  *	PFIL_ALL	call me on all of the above
- *	PFIL_WAITOK	OK to call malloc with 0.
+ *	PFIL_WAITOK	OK to call malloc with M_WAITOK.
  */
 int
 pfil_add_hook(func, flags, ph)
@@ -97,7 +97,7 @@ pfil_list_add(list, func, flags)
 	struct packet_filter_hook *pfh;
 
 	pfh = (struct packet_filter_hook *)malloc(sizeof(*pfh), M_IFADDR,
-	    flags & PFIL_WAITOK ? 0 : M_NOWAIT);
+	    flags & PFIL_WAITOK ? M_WAITOK : M_NOWAIT);
 	if (pfh == NULL)
 		return ENOMEM;
 	pfh->pfil_func = func;
diff --git a/sys/net/ppp_deflate.c b/sys/net/ppp_deflate.c
index 96fb810341e2..3c7884e033d7 100644
--- a/sys/net/ppp_deflate.c
+++ b/sys/net/ppp_deflate.c
@@ -248,12 +248,12 @@ z_compress(arg, mret, mp, orig_len, maxolen)
     /* Allocate one mbuf initially. */
     if (maxolen > orig_len)
 	maxolen = orig_len;
-    MGET(m, M_NOWAIT, MT_DATA);
+    MGET(m, M_DONTWAIT, MT_DATA);
     *mret = m;
     if (m != NULL) {
 	m->m_len = 0;
 	if (maxolen + state->hdrlen > MLEN)
-	    MCLGET(m, M_NOWAIT);
+	    MCLGET(m, M_DONTWAIT);
 	wspace = M_TRAILINGSPACE(m);
 	if (state->hdrlen + PPP_HDRLEN + 2 < wspace) {
 	    m->m_data += state->hdrlen;
@@ -308,12 +308,12 @@ z_compress(arg, mret, mp, orig_len, maxolen)
 	    if (m != NULL) {
 		m->m_len = wspace;
 		olen += wspace;
-		MGET(m->m_next, M_NOWAIT, MT_DATA);
+		MGET(m->m_next, M_DONTWAIT, MT_DATA);
 		m = m->m_next;
 		if (m != NULL) {
 		    m->m_len = 0;
 		    if (maxolen - olen > MLEN)
-			MCLGET(m, M_NOWAIT);
+			MCLGET(m, M_DONTWAIT);
 		    state->strm.next_out = mtod(m, u_char *);
 		    state->strm.avail_out = wspace = M_TRAILINGSPACE(m);
 		}
@@ -507,13 +507,13 @@ z_decompress(arg, mi, mop)
     ++state->seqno;
 
     /* Allocate an output mbuf. */
-    MGETHDR(mo, M_NOWAIT, MT_DATA);
+    MGETHDR(mo, M_DONTWAIT, MT_DATA);
     if (mo == NULL)
 	return DECOMP_ERROR;
     mo_head = mo;
     mo->m_len = 0;
     mo->m_next = NULL;
-    MCLGET(mo, M_NOWAIT);
+    MCLGET(mo, M_DONTWAIT);
     ospace = M_TRAILINGSPACE(mo);
     if (state->hdrlen + PPP_HDRLEN < ospace) {
 	mo->m_data += state->hdrlen;
@@ -582,13 +582,13 @@ z_decompress(arg, mi, mop)
 	    } else {
 		mo->m_len = ospace;
 		olen += ospace;
-		MGET(mo->m_next, M_NOWAIT, MT_DATA);
+		MGET(mo->m_next, M_DONTWAIT, MT_DATA);
 		mo = mo->m_next;
 		if (mo == NULL) {
 		    m_freem(mo_head);
 		    return DECOMP_ERROR;
 		}
-		MCLGET(mo, M_NOWAIT);
+		MCLGET(mo, M_DONTWAIT);
 		state->strm.next_out = mtod(mo, u_char *);
 		state->strm.avail_out = ospace = M_TRAILINGSPACE(mo);
 	    }
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index 52a0ff5a314e..f50c4d6e704c 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -396,7 +396,7 @@ pppwrite(tp, uio, flag)
 
     s = spltty();
     for (mp = &m0; uio->uio_resid; mp = &m->m_next) {
-	MGET(m, 0, MT_DATA);
+	MGET(m, M_TRYWAIT, MT_DATA);
 	if ((*mp = m) == NULL) {
 	    m_freem(m0);
 	    splx(s);
@@ -404,7 +404,7 @@ pppwrite(tp, uio, flag)
 	}
 	m->m_len = 0;
 	if (uio->uio_resid >= MCLBYTES / 2)
-	    MCLGET(m, M_NOWAIT);
+	    MCLGET(m, M_DONTWAIT);
 	len = M_TRAILINGSPACE(m);
 	if (len > uio->uio_resid)
 	    len = uio->uio_resid;
@@ -808,11 +808,11 @@ pppgetm(sc)
     mp = &sc->sc_m;
     for (len = sc->sc_mru + PPP_HDRLEN + PPP_FCSLEN; len > 0; ){
 	if ((m = *mp) == NULL) {
-	    MGETHDR(m, M_NOWAIT, MT_DATA);
+	    MGETHDR(m, M_DONTWAIT, MT_DATA);
 	    if (m == NULL)
 		break;
 	    *mp = m;
-	    MCLGET(m, M_NOWAIT);
+	    MCLGET(m, M_DONTWAIT);
 	}
 	len -= M_DATASIZE(m);
 	mp = &m->m_next;
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 66abcd0368f5..6f3f8b5bb158 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -139,7 +139,7 @@ raw_bind(so, nam)
 	if (ifnet == 0)
 		return (EADDRNOTAVAIL);
 	rp = sotorawcb(so);
-	nam = m_copym(nam, 0, M_COPYALL, 0);
+	nam = m_copym(nam, 0, M_COPYALL, M_TRYWAIT);
 	rp->rcb_laddr = mtod(nam, struct sockaddr *);
 	return (0);
 }
diff --git a/sys/net/route.c b/sys/net/route.c
index ee0b7d3096ef..7847466e6430 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1071,7 +1071,7 @@ rtinit(ifa, cmd, flags)
 		 * (Assuming we have a mask)
 		 */
 		if (netmask != NULL) {
-			m = m_get(M_NOWAIT, MT_SONAME);
+			m = m_get(M_DONTWAIT, MT_SONAME);
 			if (m == NULL)
 				return(ENOBUFS);
 			deldst = mtod(m, struct sockaddr *);
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 3b5457d678f5..4780cc5a8b8d 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -110,7 +110,7 @@ rts_attach(struct socket *so, int proto, struct thread *td)
 	if (sotorawcb(so) != 0)
 		return EISCONN;	/* XXX panic? */
 	/* XXX */
-	MALLOC(rp, struct rawcb *, sizeof *rp, M_PCB, M_ZERO);
+	MALLOC(rp, struct rawcb *, sizeof *rp, M_PCB, M_WAITOK | M_ZERO);
 	if (rp == 0)
 		return ENOBUFS;
 
@@ -608,9 +608,9 @@ rt_msg1(type, rtinfo)
 	}
 	if (len > MCLBYTES)
 		panic("rt_msg1");
-	m = m_gethdr(M_NOWAIT, MT_DATA);
+	m = m_gethdr(M_DONTWAIT, MT_DATA);
 	if (m && len > MHLEN) {
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			m = NULL;
diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c
index b89dfdc2edab..a22488acf257 100644
--- a/sys/netatalk/aarp.c
+++ b/sys/netatalk/aarp.c
@@ -127,7 +127,7 @@ aarpwhohas( struct arpcom *ac, struct sockaddr_at *sat )
     struct llc		*llc;
     struct sockaddr	sa;
 
-    if (( m = m_gethdr( M_NOWAIT, MT_DATA )) == NULL ) {
+    if (( m = m_gethdr( M_DONTWAIT, MT_DATA )) == NULL ) {
 	return;
     }
 #ifdef MAC
@@ -166,7 +166,7 @@ aarpwhohas( struct arpcom *ac, struct sockaddr_at *sat )
 	bcopy((caddr_t)atmulticastaddr, (caddr_t)eh->ether_dhost,
 		sizeof( eh->ether_dhost ));
 	eh->ether_type = htons(sizeof(struct llc) + sizeof(struct ether_aarp));
-	M_PREPEND( m, sizeof( struct llc ), 0 );
+	M_PREPEND( m, sizeof( struct llc ), M_TRYWAIT );
 	llc = mtod( m, struct llc *);
 	llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP;
 	llc->llc_control = LLC_UI;
@@ -440,7 +440,7 @@ at_aarpinput( struct arpcom *ac, struct mbuf *m)
     if ( aa->aa_flags & AFA_PHASE2 ) {
 	eh->ether_type = htons( sizeof( struct llc ) +
 		sizeof( struct ether_aarp ));
-	M_PREPEND( m, sizeof( struct llc ), M_NOWAIT );
+	M_PREPEND( m, sizeof( struct llc ), M_DONTWAIT );
 	if ( m == NULL ) {
 	    return;
 	}
@@ -551,7 +551,7 @@ aarpprobe( void *arg )
 	aa->aa_ch = timeout( aarpprobe, (caddr_t)ac, hz / 5 );
     }
 
-    if (( m = m_gethdr( M_NOWAIT, MT_DATA )) == NULL ) {
+    if (( m = m_gethdr( M_DONTWAIT, MT_DATA )) == NULL ) {
 	return;
     }
 #ifdef MAC
@@ -579,7 +579,7 @@ aarpprobe( void *arg )
 		sizeof( eh->ether_dhost ));
 	eh->ether_type = htons( sizeof( struct llc ) +
 		sizeof( struct ether_aarp ));
-	M_PREPEND( m, sizeof( struct llc ), 0 );
+	M_PREPEND( m, sizeof( struct llc ), M_TRYWAIT );
 	llc = mtod( m, struct llc *);
 	llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP;
 	llc->llc_control = LLC_UI;
diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c
index 8f9091163956..d7e7586b648a 100644
--- a/sys/netatalk/at_control.c
+++ b/sys/netatalk/at_control.c
@@ -138,7 +138,7 @@ at_control(struct socket *so, u_long cmd, caddr_t data,
 	 * allocate a fresh one. 
 	 */
 	if ( aa == (struct at_ifaddr *) 0 ) {
-	    aa0 = malloc(sizeof(struct at_ifaddr), M_IFADDR, M_ZERO);
+	    aa0 = malloc(sizeof(struct at_ifaddr), M_IFADDR, M_WAITOK | M_ZERO);
 	    if (( aa = at_ifaddr ) != NULL ) {
 		/*
 		 * Don't let the loopback be first, since the first
diff --git a/sys/netatalk/ddp_output.c b/sys/netatalk/ddp_output.c
index e3fb38453f5f..f15914be2bba 100644
--- a/sys/netatalk/ddp_output.c
+++ b/sys/netatalk/ddp_output.c
@@ -55,7 +55,7 @@ ddp_output( struct mbuf *m, struct socket *so)
     mac_create_mbuf_from_socket(so, m);
 #endif
 
-    M_PREPEND( m, sizeof( struct ddpehdr ), 0 );
+    M_PREPEND( m, sizeof( struct ddpehdr ), M_TRYWAIT );
 
     deh = mtod( m, struct ddpehdr *);
     deh->deh_pad = 0;
@@ -196,7 +196,7 @@ ddp_route( struct mbuf *m, struct route *ro)
      * packets end up poorly aligned due to the three byte elap header.
      */
     if ( !(aa->aa_flags & AFA_PHASE2) ) {
-	MGET( m0, 0, MT_HEADER );
+	MGET( m0, M_TRYWAIT, MT_HEADER );
 	if ( m0 == 0 ) {
 	    m_freem( m );
 	    printf("ddp_route: no buffers\n");
diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c
index 0bd2e6d1c4f5..fa79cec9de4a 100644
--- a/sys/netatalk/ddp_pcb.c
+++ b/sys/netatalk/ddp_pcb.c
@@ -420,7 +420,7 @@ at_pcballoc( struct socket *so )
 {
 	struct ddpcb	*ddp;
 
-	MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_ZERO);
+	MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_WAITOK | M_ZERO);
 	ddp->ddp_lsat.sat_port = ATADDR_ANYPORT;
 
 	ddp->ddp_next = ddpcb;
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index 0bd2e6d1c4f5..fa79cec9de4a 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -420,7 +420,7 @@ at_pcballoc( struct socket *so )
 {
 	struct ddpcb	*ddp;
 
-	MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_ZERO);
+	MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_WAITOK | M_ZERO);
 	ddp->ddp_lsat.sat_port = ATADDR_ANYPORT;
 
 	ddp->ddp_next = ddpcb;
diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index c5e317289388..b101abf55039 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -174,7 +174,7 @@ atm_cm_connect(epp, token, ap, copp)
 	/*
 	 * Get a connection block
 	 */
-	cop = uma_zalloc(atm_connection_zone, 0);
+	cop = uma_zalloc(atm_connection_zone, M_WAITOK);
 	if (cop == NULL)
 		return (ENOMEM);
 
@@ -405,7 +405,7 @@ atm_cm_connect(epp, token, ap, copp)
 	/*
 	 * Get a connection VCC block
 	 */
-	cvp = uma_zalloc(atm_connvc_zone, 0);
+	cvp = uma_zalloc(atm_connvc_zone, M_WAITOK);
 	if (cvp == NULL) {
 		err = ENOMEM;
 		goto donex;
@@ -551,7 +551,7 @@ atm_cm_listen(epp, token, ap, copp)
 	/*
 	 * Get a connection block
 	 */
-	cop = uma_zalloc(atm_connection_zone, 0);
+	cop = uma_zalloc(atm_connection_zone, M_WAITOK);
 	if (cop == NULL)
 		return (ENOMEM);
 
@@ -710,7 +710,7 @@ atm_cm_listen(epp, token, ap, copp)
 	/*
 	 * Get an attribute block and save listening attributes
 	 */
-	cop->co_lattr = uma_zalloc(atm_attributes_zone, M_ZERO);
+	cop->co_lattr = uma_zalloc(atm_attributes_zone, M_WAITOK | M_ZERO);
 	if (cop->co_lattr == NULL) {
 		err = ENOMEM;
 		goto done;
@@ -815,7 +815,7 @@ atm_cm_addllc(epp, token, llc, ecop, copp)
 	/*
 	 * Get a connection block
 	 */
-	cop = uma_zalloc(atm_connection_zone, 0);
+	cop = uma_zalloc(atm_connection_zone, M_WAITOK);
 	if (cop == NULL)
 		return (ENOMEM);
 
@@ -1266,7 +1266,7 @@ atm_cm_incoming(vcp, ap)
 	/*
 	 * Get a connection VCC block
 	 */
-	cvp = uma_zalloc(atm_connvc_zone, 0);
+	cvp = uma_zalloc(atm_connvc_zone, M_WAITOK);
 	if (cvp == NULL) {
 		err = ENOMEM;
 		goto fail;
@@ -1584,7 +1584,7 @@ atm_cm_incall(cvp)
 			/*
 			 * Need a new connection block
 			 */
-			cop = uma_zalloc(atm_connection_zone, 0);
+			cop = uma_zalloc(atm_connection_zone, M_WAITOK);
 			if (cop == NULL) {
 				cvp->cvc_attr.cause = atm_cause_tmpl;
 				cvp->cvc_attr.cause.v.cause_value =
diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c
index 959c61ca340b..c85303e93604 100644
--- a/sys/netatm/atm_device.c
+++ b/sys/netatm/atm_device.c
@@ -170,7 +170,7 @@ atm_dev_inst(ssp, cvcp)
 	/*
 	 * Allocate a VCC control block
 	 */
-	cvp = uma_zalloc(cup->cu_vcc_zone, 0);
+	cvp = uma_zalloc(cup->cu_vcc_zone, M_WAITOK);
 	if (cvp == NULL)
 		return (ENOMEM);
 	
diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c
index a93d566679f1..69c90820263a 100644
--- a/sys/netatm/atm_if.c
+++ b/sys/netatm/atm_if.c
@@ -496,7 +496,7 @@ atm_physif_ioctl(code, data, arg)
 		 */
 		for ( count = 0; count < asr->asr_nif_cnt; count++ )
 		{
-			nip = uma_zalloc(cup->cu_nif_zone, M_ZERO);
+			nip = uma_zalloc(cup->cu_nif_zone, M_WAITOK | M_ZERO);
 			if ( nip == NULL )
 			{
 				/*
diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c
index 3c0b806ef318..6ff6abcc4018 100644
--- a/sys/netatm/atm_socket.c
+++ b/sys/netatm/atm_socket.c
@@ -596,7 +596,7 @@ atm_sock_sockaddr(so, addr)
 	/*
 	 * Return local interface address, if known
 	 */
-	satm = malloc(sizeof(*satm), M_SONAME, M_ZERO);
+	satm = malloc(sizeof(*satm), M_SONAME, M_WAITOK | M_ZERO);
 	if (satm == NULL)
 		return (ENOMEM);
 
@@ -654,7 +654,7 @@ atm_sock_peeraddr(so, addr)
 	/*
 	 * Return remote address, if known
 	 */
-	satm = malloc(sizeof(*satm), M_SONAME, M_ZERO);
+	satm = malloc(sizeof(*satm), M_SONAME, M_WAITOK | M_ZERO);
 	if (satm == NULL)
 		return (ENOMEM);
 
diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index 5dca9710587a..49dbf48c4a88 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -124,7 +124,7 @@ ipatm_nifstat(cmd, nip, arg)
 		/*
 		 * Get a new interface block
 		 */
-		inp = uma_zalloc(ipatm_nif_zone, 0);
+		inp = uma_zalloc(ipatm_nif_zone, M_WAITOK);
 		if (inp == NULL) {
 			err = ENOMEM;
 			break;
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index 76c8a551a567..14cf7cc1f986 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -382,7 +382,7 @@ ipatm_openpvc(pvp, sivp)
 	/*
 	 * Allocate IP VCC block
 	 */
-	ivp = uma_zalloc(ipatm_vc_zone, 0);
+	ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK);
 	if (ivp == NULL) {
 		err = ENOMEM;
 		goto done;
@@ -585,7 +585,7 @@ ipatm_createsvc(ifp, daf, dst, sivp)
 	/*
 	 * Allocate IP VCC
 	 */
-	ivp = uma_zalloc(ipatm_vc_zone, 0);
+	ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK);
 	if (ivp == NULL) {
 		err = ENOMEM;
 		goto done;
@@ -937,7 +937,7 @@ ipatm_incoming(tok, cop, ap, tokp)
 	/*
 	 * Allocate IP VCC
 	 */
-	ivp = uma_zalloc(ipatm_vc_zone, 0);
+	ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK);
 	if (ivp == NULL) {
 		err = ENOMEM;
 		cause = T_ATM_CAUSE_UNSPECIFIED_RESOURCE_UNAVAILABLE;
diff --git a/sys/netatm/port.h b/sys/netatm/port.h
index d11bd40327d4..df599adf1cbc 100644
--- a/sys/netatm/port.h
+++ b/sys/netatm/port.h
@@ -126,8 +126,8 @@
 #include <sys/mbuf.h>
 typedef struct mbuf	KBuffer;
 
-#define	KB_F_WAIT	0
-#define	KB_F_NOWAIT	M_NOWAIT
+#define	KB_F_WAIT	M_TRYWAIT
+#define	KB_F_NOWAIT	M_DONTWAIT
 
 #define	KB_T_HEADER	MT_HEADER
 #define	KB_T_DATA	MT_DATA
diff --git a/sys/netatm/sigpvc/sigpvc_subr.c b/sys/netatm/sigpvc/sigpvc_subr.c
index b0a4da533e12..4c3196e4f840 100644
--- a/sys/netatm/sigpvc/sigpvc_subr.c
+++ b/sys/netatm/sigpvc/sigpvc_subr.c
@@ -122,7 +122,7 @@ sigpvc_create_pvc(pvp, cvp, errp)
 	/*
 	 * Allocate control block for PVC
 	 */
-	vcp = uma_zalloc(sigpvc_vc_zone, M_ZERO);
+	vcp = uma_zalloc(sigpvc_vc_zone, M_WAITOK | M_ZERO);
 	if (vcp == NULL) {
 		*errp = ENOMEM;
 		return (CALL_FAILED);
diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index 7fb5a10483e5..e0c83f97ed38 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -172,7 +172,7 @@ spansarp_svcout(ivp, dst)
 	/*
 	 * Now get the new arp entry
 	 */
-	sap = uma_zalloc(spansarp_zone, 0);
+	sap = uma_zalloc(spansarp_zone, M_WAITOK);
 	if (sap == NULL) {
 		(void) splx(s);
 		return (MAP_FAILED);
@@ -720,7 +720,7 @@ spansarp_input(clp, m)
 		/*
 		 * Source unknown and we're the target - add new entry
 		 */
-		sap = uma_zalloc(spansarp_zone, 0);
+		sap = uma_zalloc(spansarp_zone, M_WAITOK);
 		if (sap) {
 			sap->sa_dstip.s_addr = in_src.s_addr;
 			sap->sa_dstatm.address_format = T_ATM_SPANS_ADDR;
@@ -961,7 +961,7 @@ spansarp_ioctl(code, data, arg1)
 			/*
 			 * No, get a new arp entry
 			 */
-			sap = uma_zalloc(spansarp_zone, 0);
+			sap = uma_zalloc(spansarp_zone, M_WAITOK);
 			if (sap == NULL) {
 				err = ENOMEM;
 				break;
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index a71967884038..5b938923c796 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -348,7 +348,7 @@ spanscls_attach(spp)
 	/*
 	 * Get a new cls control block
 	 */
-	clp = uma_zalloc(spanscls_zone, 0);
+	clp = uma_zalloc(spanscls_zone, M_WAITOK);
 	if (clp == NULL)
 		return (ENOMEM);
 
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index 89185bd4149f..c59708081995 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -232,7 +232,7 @@ spans_send_open_req(spp, svp)
 	/*
 	 * Get memory for a request message
 	 */
-	req = uma_zalloc(spans_msg_zone, 0);
+	req = uma_zalloc(spans_msg_zone, M_WAITOK);
 	if (req == NULL) {
 		err = ENOBUFS;
 		goto done;
@@ -290,7 +290,7 @@ spans_send_open_rsp(spp, svp, result)
 	/*
 	 * Get memory for a response message
 	 */
-	rsp = uma_zalloc(spans_msg_zone, 0);
+	rsp = uma_zalloc(spans_msg_zone, M_WAITOK);
 	if (rsp == NULL)
 		return(ENOBUFS);
 
@@ -340,7 +340,7 @@ spans_send_close_req(spp, svp)
 	/*
 	 * Get memory for a close request
 	 */
-	req = uma_zalloc(spans_msg_zone, 0);
+	req = uma_zalloc(spans_msg_zone, M_WAITOK);
 	if (req == NULL) {
 		err = ENOBUFS;
 		goto done;
@@ -468,7 +468,7 @@ spans_status_ind(spp, msg)
 	 * Respond to the status request or indication with a
 	 * status response
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	if (rsp_msg == NULL)
 		return;
 	rsp_msg->sm_vers = SPANS_VERS_1_0;
@@ -658,7 +658,7 @@ spans_open_req(spp, msg)
 	/*
 	 * Get a new VCCB for the connection
 	 */
-	svp = uma_zalloc(spans_vc_zone, 0);
+	svp = uma_zalloc(spans_vc_zone, M_WAITOK);
 	if (svp == NULL) {
 		ATM_DEBUG0("spans_open_req: VCCB pool empty\n");
 		result = SPANS_NORSC;
@@ -808,7 +808,7 @@ response:
 	 * Some problem was detected with the request.  Send a SPANS
 	 * message rejecting the connection.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1034,7 +1034,7 @@ response:
 	/*
 	 * Respond to the SPANS_CLOSE_IND with a SPANS_CLOSE_RSP
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	if (rsp_msg == NULL)
 		return;
 	rsp_msg->sm_vers = SPANS_VERS_1_0;
@@ -1169,7 +1169,7 @@ spans_multi_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_MULTI_RSP message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1215,7 +1215,7 @@ spans_add_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_ADD_RSP message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1262,7 +1262,7 @@ spans_join_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_JOIN_CNF message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1307,7 +1307,7 @@ spans_leave_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_LEAVE_CNF message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1401,7 +1401,7 @@ spans_query_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_QUERY_RSP message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1489,7 +1489,7 @@ spans_rcv_msg(spp, m)
 	/*
 	 * Get storage for the message
 	 */
-	msg = uma_zalloc(spans_msg_zone, 0);
+	msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	if (msg == NULL)
 		return;
 
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index 8f96374553cc..75628200c1e2 100644
--- a/sys/netatm/spans/spans_proto.c
+++ b/sys/netatm/spans/spans_proto.c
@@ -279,7 +279,7 @@ spans_timer(tip)
 		/*
 		 * Send out SPANS_STAT_REQ message
 		 */
-		msg = uma_zalloc(spans_msg_zone, 0);
+		msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 		if (msg == NULL) {
 			/* XXX arr: This is bogus and will go away RSN */
 			/* Retry later if no memory */
diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c
index 24edec234e01..93ea6d44aba8 100644
--- a/sys/netatm/spans/spans_subr.c
+++ b/sys/netatm/spans/spans_subr.c
@@ -192,7 +192,7 @@ spans_open_vcc(spp, cvp)
 	/*
 	 * Allocate control block for VCC
 	 */
-	svp = uma_zalloc(spans_vc_zone, 0);
+	svp = uma_zalloc(spans_vc_zone, M_WAITOK);
 	if (svp == NULL) {
 		return(ENOMEM);
 	}
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c
index a0c3d6750011..b5ff7d0e1cf9 100644
--- a/sys/netatm/uni/sscf_uni.c
+++ b/sys/netatm/uni/sscf_uni.c
@@ -213,7 +213,7 @@ sscf_uni_inst(ssp, cvp)
 	/*
 	 * Allocate our control block
 	 */
-	uvp = uma_zalloc(sscf_uni_zone, 0);
+	uvp = uma_zalloc(sscf_uni_zone, M_WAITOK);
 	if (uvp == NULL)
 		return (ENOMEM);
 	uvp->uv_ustate = UVU_INST;
diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c
index e5553077c1b4..6374f30caf0d 100644
--- a/sys/netatm/uni/sscop.c
+++ b/sys/netatm/uni/sscop.c
@@ -258,7 +258,7 @@ sscop_inst(ssp, cvp)
 	/*
 	 * Allocate our control block
 	 */
-	sop = uma_zalloc(sscop_zone, 0);
+	sop = uma_zalloc(sscop_zone, M_WAITOK);
 	if (sop == NULL)
 		return (ENOMEM);
 
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c
index e9469374eca5..0de56b8df535 100644
--- a/sys/netatm/uni/uniarp.c
+++ b/sys/netatm/uni/uniarp.c
@@ -713,7 +713,7 @@ uniarp_client_mode(uip, aap)
 	 * Now, get an arp entry for the server connection
 	 */
 	uip->uip_arpstate = UIAS_CLIENT_POPEN;
-	uap = uma_zalloc(uniarp_zone, M_ZERO);
+	uap = uma_zalloc(uniarp_zone, M_WAITOK | M_ZERO);
 	if (uap == NULL) {
 		UNIIP_ARP_TIMER(uip, 1 * ATM_HZ);
 		return;
diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c
index 10c780a05e1b..dbfe40241b94 100644
--- a/sys/netatm/uni/uniarp_cache.c
+++ b/sys/netatm/uni/uniarp_cache.c
@@ -126,7 +126,7 @@ uniarp_cache_svc(uip, ip, atm, atmsub, origin)
 	 * If there aren't any entries yet, create one
 	 */
 	if ((ipuap == NULL) && (nouap == NULL)) {
-		ipuap = uma_zalloc(uniarp_zone, 0);
+		ipuap = uma_zalloc(uniarp_zone, M_WAITOK);
 		if (ipuap == NULL)
 			return (ENOMEM);
 		ipuap->ua_dstip.s_addr = ip->s_addr;
diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c
index cfc081cd9583..ac1c1675f7ba 100644
--- a/sys/netatm/uni/uniarp_vcm.c
+++ b/sys/netatm/uni/uniarp_vcm.c
@@ -133,7 +133,7 @@ uniarp_pvcopen(ivp)
 	/*
 	 * Get an arp map entry
 	 */
-	uap = uma_zalloc(uniarp_zone, M_ZERO);
+	uap = uma_zalloc(uniarp_zone, M_WAITOK | M_ZERO);
 	if (uap == NULL)
 		return (MAP_FAILED);
 
@@ -279,7 +279,7 @@ uniarp_svcout(ivp, dst)
 	/*
 	 * We're a client with an open VCC to the server, get a new arp entry
 	 */
-	uap = uma_zalloc(uniarp_zone, 0);
+	uap = uma_zalloc(uniarp_zone, M_WAITOK);
 	if (uap == NULL) {
 		(void) splx(s);
 		return (MAP_FAILED);
@@ -440,7 +440,7 @@ uniarp_svcin(ivp, dst, dstsub)
 	/*
 	 * No info in the cache - get a new arp entry
 	 */
-	uap = uma_zalloc(uniarp_zone, M_ZERO);
+	uap = uma_zalloc(uniarp_zone, M_WAITOK | M_ZERO);
 	if (uap == NULL) {
 		(void) splx(s);
 		return (MAP_FAILED);
diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c
index 7bdb1007fbd8..3635523df396 100644
--- a/sys/netatm/uni/uniip.c
+++ b/sys/netatm/uni/uniip.c
@@ -188,7 +188,7 @@ uniip_ipact(inp)
 	/*
 	 * Get a new interface control block
 	 */
-	uip = uma_zalloc(uniip_zone, M_ZERO);
+	uip = uma_zalloc(uniip_zone, M_WAITOK | M_ZERO);
 	if (uip == NULL)
 		return (ENOMEM);
 
diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c
index c15d02e2a7c2..aa49fdaca7f9 100644
--- a/sys/netatm/uni/unisig_decode.c
+++ b/sys/netatm/uni/unisig_decode.c
@@ -67,7 +67,7 @@ __RCSID("@(#) $FreeBSD$");
 #endif
 
 #define	ALLOC_IE(ie) do {						\
-	(ie) = uma_zalloc(unisig_ie_zone, M_ZERO);			\
+	(ie) = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);		\
 	if ((ie) == NULL)						\
 		return (ENOMEM);					\
 } while (0)
diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c
index 8a91fb6e2245..31cd1a4fc2fd 100644
--- a/sys/netatm/uni/unisig_subr.c
+++ b/sys/netatm/uni/unisig_subr.c
@@ -275,7 +275,7 @@ unisig_open_vcc(usp, cvp)
 	/*
 	 * Allocate control block for VCC
 	 */
-	uvp = uma_zalloc(unisig_vc_zone, M_ZERO);
+	uvp = uma_zalloc(unisig_vc_zone, M_WAITOK | M_ZERO);
 	if (uvp == NULL) {
 		return(ENOMEM);
 	}
@@ -897,7 +897,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->aal.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_aalp) {
 			msg->msg_ie_aalp = uma_zalloc(unisig_ie_zone,
-			    M_ZERO);
+			    M_WAITOK | M_ZERO);
 			if (msg->msg_ie_aalp == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -955,7 +955,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->traffic.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_clrt) {
 			msg->msg_ie_clrt = uma_zalloc(unisig_ie_zone,
-			    M_ZERO);
+			    M_WAITOK | M_ZERO);
 			if (msg->msg_ie_clrt == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1012,7 +1012,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->bearer.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_bbcp) {
 			msg->msg_ie_bbcp = uma_zalloc(unisig_ie_zone,
-			    M_ZERO);
+			    M_WAITOK | M_ZERO);
 			if (msg->msg_ie_bbcp == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1040,7 +1040,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->bhli.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_bhli) {
 			msg->msg_ie_bhli = uma_zalloc(unisig_ie_zone,
-			    M_ZERO);
+			    M_WAITOK | M_ZERO);
 			if (msg->msg_ie_bhli == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1080,7 +1080,7 @@ unisig_set_attrs(usp, msg, ap)
 			ap->blli.tag_l3 == T_ATM_PRESENT) {
 		if (!msg->msg_ie_blli) {
 			msg->msg_ie_blli = uma_zalloc(unisig_ie_zone,
-			    M_ZERO);
+			    M_WAITOK | M_ZERO);
 			if (msg->msg_ie_blli == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1165,7 +1165,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->called.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_cdad) {
 			msg->msg_ie_cdad = uma_zalloc(unisig_ie_zone,
-			    M_ZERO);
+			    M_WAITOK | M_ZERO);
 			if (msg->msg_ie_cdad == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1181,7 +1181,7 @@ unisig_set_attrs(usp, msg, ap)
 		if (ap->called.subaddr.address_format != T_ATM_ABSENT) {
 			if (!msg->msg_ie_cdsa) {
 				msg->msg_ie_cdsa = uma_zalloc(unisig_ie_zone,
-				    M_ZERO);
+				    M_WAITOK | M_ZERO);
 				if (msg->msg_ie_cdsa == NULL) {
 					err = ENOMEM;
 					goto done;
@@ -1203,7 +1203,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->calling.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_cgad) {
 			msg->msg_ie_cgad = uma_zalloc(unisig_ie_zone,
-			    M_ZERO);
+			    M_WAITOK | M_ZERO);
 			if (msg->msg_ie_cgad == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1220,7 +1220,7 @@ unisig_set_attrs(usp, msg, ap)
 				T_ATM_ABSENT) {
 			if (!msg->msg_ie_cgsa) {
 				msg->msg_ie_cgsa = uma_zalloc(unisig_ie_zone,
-				    M_ZERO);
+				    M_WAITOK | M_ZERO);
 				if (msg->msg_ie_cgsa == NULL) {
 					err = ENOMEM;
 					goto done;
@@ -1241,7 +1241,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->qos.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_qosp) {
 			msg->msg_ie_qosp = uma_zalloc(unisig_ie_zone,
-			    M_ZERO);
+			    M_WAITOK | M_ZERO);
 			if (msg->msg_ie_qosp == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1273,7 +1273,7 @@ unisig_set_attrs(usp, msg, ap)
 				ap->transit.v.length != 0) {
 		if (!msg->msg_ie_trnt) {
 			msg->msg_ie_trnt = uma_zalloc(unisig_ie_zone,
-			    M_ZERO);
+			    M_WAITOK | M_ZERO);
 			if (msg->msg_ie_trnt == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1298,7 +1298,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->cause.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_caus) {
 			msg->msg_ie_caus = uma_zalloc(unisig_ie_zone,
-			    M_ZERO);
+			    M_WAITOK | M_ZERO);
 			if (msg->msg_ie_caus == NULL) {
 				err = ENOMEM;
 				goto done;
diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c
index 6c5bc369650f..3c88cba80101 100644
--- a/sys/netatm/uni/unisig_vc_state.c
+++ b/sys/netatm/uni/unisig_vc_state.c
@@ -456,7 +456,7 @@ unisig_vc_act04(usp, uvp, msg)
 		vpi = msg->msg_ie_cnid->ie_cnid_vpci;
 		vci = msg->msg_ie_cnid->ie_cnid_vci;
 	} else {
-		iep = uma_zalloc(unisig_ie_zone, 0);
+		iep = uma_zalloc(unisig_ie_zone, M_WAITOK);
 		if (iep == NULL)
 			return (ENOMEM);
 		iep->ie_ident = UNI_IE_CNID;
@@ -548,10 +548,10 @@ unisig_vc_act05(usp, uvp, msg)
 	/*
 	 * Send a RELEASE message
 	 */
-	rls_msg = uma_zalloc(unisig_msg_zone, M_ZERO);
+	rls_msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
 	if (rls_msg == NULL)
 		return(ENOMEM);
-	cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
+	cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);
 	if (cause_ie == NULL) {
 		uma_zfree(unisig_msg_zone, rls_msg);
 		return(ENOMEM);
@@ -668,7 +668,7 @@ unisig_vc_act06(usp, uvp, msg)
 		 * No--VCI must have been specified earlier
 		 */
 		if (!uvp->uv_vci) {
-			iep = uma_zalloc(unisig_ie_zone, 0);
+			iep = uma_zalloc(unisig_ie_zone, M_WAITOK);
 			if (iep == NULL)
 				return(ENOMEM);
 			iep->ie_ident = UNI_IE_CNID;
@@ -742,7 +742,7 @@ unisig_vc_act06(usp, uvp, msg)
 	/*
 	 * Get memory for a CONNECT ACK message
 	 */
-	cack_msg = uma_zalloc(unisig_msg_zone, 0);
+	cack_msg = uma_zalloc(unisig_msg_zone, M_WAITOK);
 	if (cack_msg == NULL)
 		return(ENOMEM);
 
@@ -1058,7 +1058,7 @@ unisig_vc_act09(usp, uvp, msg)
 	int			rc;
 	struct unisig_msg	*conn_msg;
 
-	conn_msg = uma_zalloc(unisig_msg_zone, 0);
+	conn_msg = uma_zalloc(unisig_msg_zone, M_WAITOK);
 	if (conn_msg == NULL)
 		return(ENOMEM);
 
@@ -1389,7 +1389,7 @@ unisig_vc_act15(usp, uvp, msg)
 			}
 		}
 		if (cause == UNI_IE_CAUS_MISSING) {
-			iep = uma_zalloc(unisig_ie_zone, 0);
+			iep = uma_zalloc(unisig_ie_zone, M_WAITOK);
 			if (iep == NULL)
 				return(ENOMEM);
 			iep->ie_ident = UNI_IE_CNID;
@@ -1611,7 +1611,7 @@ unisig_vc_act20(usp, uvp, msg)
 	/*
 	 * Get memory for a STATUS ENQUIRY message
 	 */
-	stat_msg = uma_zalloc(unisig_msg_zone, 0);
+	stat_msg = uma_zalloc(unisig_msg_zone, M_WAITOK);
 	if (stat_msg == NULL)
 		return(ENOMEM);
 
@@ -1757,15 +1757,15 @@ unisig_vc_act22(usp, uvp, msg)
 	/*
 	 * Get memory for a STATUS message
 	 */
-	status = uma_zalloc(unisig_msg_zone, M_ZERO);
+	status = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
 	if (status == NULL)
 		return(ENOMEM);
-	callst_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
+	callst_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);
 	if (callst_ie == NULL) {
 		uma_zfree(unisig_msg_zone, status);
 		return(ENOMEM);
 	}
-	cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
+	cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO); 
 	if (cause_ie == NULL) {
 		uma_zfree(unisig_msg_zone, status);
 		uma_zfree(unisig_ie_zone, callst_ie);
@@ -1859,7 +1859,7 @@ unisig_vc_act23(usp, uvp, msg)
 	/*
 	 * Get memory for the ADD PARTY REJECT message
 	 */
-	apr_msg = uma_zalloc(unisig_msg_zone, M_ZERO);
+	apr_msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
 	if (apr_msg == NULL)
 		return(ENOMEM);
 
diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
index 2b008bf206b2..443c18acb784 100644
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
@@ -832,7 +832,7 @@ bt3c_receive(bt3c_softc_p sc)
 			sc->state = NG_BT3C_W4_PKT_IND;
 			sc->want = 1;
 
-			MGETHDR(sc->m, M_NOWAIT, MT_DATA);
+			MGETHDR(sc->m, M_DONTWAIT, MT_DATA);
 			if (sc->m == NULL) {
 				NG_BT3C_ERR(sc->dev, "Could not get mbuf\n");
 				NG_BT3C_STAT_IERROR(sc->stat);
@@ -996,7 +996,7 @@ bt3c_append(struct mbuf *m0, int c)
 	}
 
 	if (m->m_len >= len) {
-		MGET(m->m_next, M_NOWAIT, m0->m_type);
+		MGET(m->m_next, M_DONTWAIT, m0->m_type);
 		if (m->m_next == NULL)
 			return (ENOBUFS);
  
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
index d793c04f43d6..650c6f4d2c06 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
@@ -170,7 +170,7 @@ ng_h4_open(dev_t dev, struct tty *tp)
 	}
 
 	/* Initialize private struct */
-	MALLOC(sc, ng_h4_info_p, sizeof(*sc), M_NETGRAPH_H4, M_ZERO);
+	MALLOC(sc, ng_h4_info_p, sizeof(*sc), M_NETGRAPH_H4, M_WAITOK | M_ZERO);
 	if (sc == NULL) {
 		error = ENOMEM;
 		goto out;
@@ -516,7 +516,7 @@ ng_h4_input(int c, struct tty *tp)
 		if (sc->hook != NULL && NG_HOOK_IS_VALID(sc->hook)) {
 			struct mbuf	*m = NULL;
 
-			MGETHDR(m, M_NOWAIT, MT_DATA);
+			MGETHDR(m, M_DONTWAIT, MT_DATA);
 			if (m != NULL) {
 				m->m_pkthdr.len = 0;
 
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index 71cb2dff11f4..603d72228bb6 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -1012,7 +1012,7 @@ ubt_intr_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s)
 
 	/* Copy HCI event frame to mbuf */
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		NG_UBT_ALERT(
 "%s: %s - Could not allocate mbuf\n", __func__, USBDEVNAME(sc->sc_dev));
@@ -1148,7 +1148,7 @@ ubt_bulk_in_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s)
 	if (h->actlen < sizeof(*hdr))
 		goto done;
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		NG_UBT_ALERT(
 "%s: %s - Could not allocate mbuf\n", __func__, USBDEVNAME(sc->sc_dev));
@@ -1426,7 +1426,7 @@ ubt_isoc_in_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s)
 
 	/* Copy SCO data frame to mbuf */
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		NG_UBT_ALERT(
 "%s: %s - Could not allocate mbuf\n",
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
index 3e3e501adf1d..5769ee586cec 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
@@ -116,7 +116,7 @@ ng_hci_send_command(ng_hci_unit_p unit)
 
 	ng_hci_mtap(unit, m0);
 
-	m = m_dup(m0, M_NOWAIT);
+	m = m_dup(m0, M_DONTWAIT);
 	if (m != NULL)
 		NG_SEND_DATA_ONLY(error, unit->drv, m);
 	else
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
index cd199db08a3d..9d81380e019c 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
@@ -504,7 +504,7 @@ con_compl(ng_hci_unit_p unit, struct mbuf *event)
 			} __attribute__ ((packed))			*lp;
 			struct mbuf					*m;
 
-			MGETHDR(m, M_NOWAIT, MT_DATA);
+			MGETHDR(m, M_DONTWAIT, MT_DATA);
 			if (m != NULL) {
 				m->m_pkthdr.len = m->m_len = sizeof(*lp);
 				lp = mtod(m, struct __link_policy *);
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.c b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
index c4f1f85c6c1d..ba92f8987ae2 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
@@ -67,7 +67,7 @@ ng_hci_mtap(ng_hci_unit_p unit, struct mbuf *m0)
 	int		 error = 0;
 
 	if (unit->raw != NULL && NG_HOOK_IS_VALID(unit->raw)) {
-		m = m_dup(m0, M_NOWAIT);
+		m = m_dup(m0, M_DONTWAIT);
 		if (m != NULL)
 			NG_SEND_DATA_ONLY(error, unit->raw, m);
 
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
index 0a2c48b99659..97a0ea8ec2f3 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
@@ -232,7 +232,7 @@ ng_hci_lp_acl_con_req(ng_hci_unit_p unit, item_p item, hook_p hook)
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		ng_hci_free_con(con);
 		error = ENOBUFS;
@@ -427,7 +427,7 @@ ng_hci_lp_sco_con_req(ng_hci_unit_p unit, item_p item, hook_p hook)
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		ng_hci_free_con(sco_con);
 		error = ENOBUFS;
@@ -545,7 +545,7 @@ ng_hci_lp_discon_req(ng_hci_unit_p unit, item_p item, hook_p hook)
 	 * Create HCI command
 	 */
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto out;
@@ -794,7 +794,7 @@ ng_hci_lp_con_rsp(ng_hci_unit_p unit, item_p item, hook_p hook)
 		 * Create HCI command 
 		 */
 
-		MGETHDR(m, M_NOWAIT, MT_DATA);
+		MGETHDR(m, M_DONTWAIT, MT_DATA);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
@@ -1017,7 +1017,7 @@ ng_hci_lp_qos_req(ng_hci_unit_p unit, item_p item, hook_p hook)
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto out;
@@ -1247,7 +1247,7 @@ ng_hci_process_con_watchdog_timeout(node_p node, hook_p hook,
 	 * Create HCI command
 	 */
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return; /* XXX this is bad */
 
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
index 42f53aacef9c..d107ad687ff7 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
@@ -54,7 +54,7 @@ do {									\
 		ng_l2cap_cmd_rej_data_t	 data;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
+	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -88,7 +88,7 @@ do {									\
 		ng_l2cap_con_req_cp	 param;				\
 	} __attribute__ ((packed)) 	*c = NULL;			\
 									\
-	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
+	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -111,7 +111,7 @@ do {									\
 		ng_l2cap_con_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
+	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -136,7 +136,7 @@ do {									\
 		ng_l2cap_cfg_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
+	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL) { 						\
 		NG_FREE_M((_data));					\
 		break;							\
@@ -168,7 +168,7 @@ do {									\
 		ng_l2cap_cfg_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
+	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL) { 						\
 		NG_FREE_M((_data));					\
 		break;							\
@@ -198,7 +198,7 @@ do {									\
 do {									\
 	u_int8_t	*p = NULL;					\
 									\
-	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
+	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -275,7 +275,7 @@ do {									\
 		ng_l2cap_discon_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
+	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -298,7 +298,7 @@ do {									\
 		ng_l2cap_discon_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
+	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -318,7 +318,7 @@ do {									\
 do {									\
 	ng_l2cap_cmd_hdr_t	*c = NULL;				\
 									\
-	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
+	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -345,7 +345,7 @@ do {									\
 		ng_l2cap_info_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
+	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -368,7 +368,7 @@ do {									\
 		ng_l2cap_info_rsp_data_t data;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
+	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
index e4a644d60b02..3779b91a433f 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
@@ -190,7 +190,7 @@ ng_l2cap_process_signal_cmd(ng_l2cap_con_p con)
 
 		/* Get the command, save the rest (if any) */
 		if (con->rx_pkt->m_pkthdr.len > hdr->length)
-			m = m_split(con->rx_pkt, hdr->length, M_NOWAIT);
+			m = m_split(con->rx_pkt, hdr->length, M_DONTWAIT);
 		else
 			m = NULL;
 
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
index 39979be90c50..f505158564d3 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
@@ -502,7 +502,7 @@ ng_l2cap_lp_send(ng_l2cap_con_p con, u_int16_t dcid, struct mbuf *m0)
 		/* Check length of the packet against HCI MTU */
 		len = m0->m_pkthdr.len;
 		if (len > l2cap->pkt_size) {
-			m = m_split(m0, l2cap->pkt_size, M_NOWAIT);
+			m = m_split(m0, l2cap->pkt_size, M_DONTWAIT);
 			if (m == NULL) {
 				NG_L2CAP_ALERT(
 "%s: %s - m_split(%d) failed\n",	__func__, NG_NODE_NAME(l2cap->node),
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
index affa98e5f4a5..9fcbc6ee5d4a 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
@@ -432,7 +432,7 @@ ng_l2cap_queue_command_timeout(void *context)
 struct mbuf *
 ng_l2cap_prepend(struct mbuf *m, int size)
 {
-	M_PREPEND(m, size, M_NOWAIT);
+	M_PREPEND(m, size, M_DONTWAIT);
 	if (m == NULL || (m->m_len < size && (m = m_pullup(m, size)) == NULL))
 		return (NULL);
 
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
index 9bc24388a7de..8fa8a08e5ce3 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
@@ -275,7 +275,7 @@ ng_btsocket_hci_raw_node_rcvdata(hook_p hook, item_p item)
 	struct mbuf	*nam = NULL;
 	int		 error;
 
-	MGET(nam, M_NOWAIT, MT_SONAME);
+	MGET(nam, M_DONTWAIT, MT_SONAME);
 	if (nam != NULL) {
 		struct sockaddr_hci	*sa = mtod(nam, struct sockaddr_hci *);
 
@@ -348,7 +348,7 @@ ng_btsocket_raw_send_ngmsg(char *path, int cmd, void *arg, int arglen)
 	struct ng_mesg	*msg = NULL;
 	int		 error = 0;
 
-	NG_MKMESSAGE(msg, NGM_HCI_COOKIE, cmd, arglen, 0);
+	NG_MKMESSAGE(msg, NGM_HCI_COOKIE, cmd, arglen, M_WAITOK);
 	if (msg == NULL)
 		return (ENOMEM);
 
@@ -374,7 +374,7 @@ ng_btsocket_raw_send_sync_ngmsg(ng_btsocket_hci_raw_pcb_p pcb, char *path,
 	ng_btsocket_hci_raw_get_token(&pcb->token);
 	pcb->msg = NULL;
 
-	NG_MKMESSAGE(msg, NGM_HCI_COOKIE, cmd, 0, 0);
+	NG_MKMESSAGE(msg, NGM_HCI_COOKIE, cmd, 0, M_WAITOK);
 	if (msg == NULL) {
 		pcb->token = 0;
 		return (ENOMEM);
@@ -504,7 +504,7 @@ ng_btsocket_hci_raw_data_input(struct mbuf *nam)
 		 * will check if socket has enough buffer space.
 		 */
 
-		m = m_dup(m0, M_NOWAIT);
+		m = m_dup(m0, M_DONTWAIT);
 		if (m != NULL) {
 			struct mbuf	*ctl = NULL;
 
@@ -743,7 +743,7 @@ ng_btsocket_hci_raw_attach(struct socket *so, int proto, struct thread *td)
 		return (error);
 
 	MALLOC(pcb, ng_btsocket_hci_raw_pcb_p, sizeof(*pcb), 
-		M_NETGRAPH_BTSOCKET_HCI_RAW, M_ZERO);
+		M_NETGRAPH_BTSOCKET_HCI_RAW, M_WAITOK | M_ZERO);
 	if (pcb == NULL)
 		return (ENOMEM);
 
@@ -956,7 +956,7 @@ ng_btsocket_hci_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_HCI_COOKIE,
-			NGM_HCI_NODE_GET_NEIGHBOR_CACHE, 0, 0);
+			NGM_HCI_NODE_GET_NEIGHBOR_CACHE, 0, M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -1014,7 +1014,7 @@ ng_btsocket_hci_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_HCI_COOKIE, NGM_HCI_NODE_GET_CON_LIST,
-			0, 0);
+			0, M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -1271,7 +1271,7 @@ ng_btsocket_hci_raw_send(struct socket *so, int flags, struct mbuf *m,
 		sa = (struct sockaddr *) &pcb->addr;
 	}
 
-	MGET(nam, 0, MT_SONAME);
+	MGET(nam, M_TRYWAIT, MT_SONAME);
 	if (nam == NULL) {
 		error = ENOBUFS;
 		goto drop;
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
index 8360038d8bc7..dec7a3c2e62e 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -1464,7 +1464,7 @@ ng_btsocket_l2cap_data_input(struct mbuf *m, hook_p hook)
 			 * it is a broadcast traffic after all
 			 */
 
-			copy = m_dup(m, M_NOWAIT);
+			copy = m_dup(m, M_DONTWAIT);
 			if (copy != NULL) {
 				sbappendrecord(&pcb->so->so_rcv, copy);
 				sorwakeup(pcb->so);
@@ -2384,7 +2384,7 @@ ng_btsocket_l2cap_send2(ng_btsocket_l2cap_pcb_p pcb)
 	if (pcb->so->so_snd.sb_cc == 0)
 		return (EINVAL); /* XXX */
 
-	m = m_dup(pcb->so->so_snd.sb_mb, M_NOWAIT);
+	m = m_dup(pcb->so->so_snd.sb_mb, M_DONTWAIT);
 	if (m == NULL)
 		return (ENOBUFS);
 
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
index 44e3be10ee61..3b24afd73a9f 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
@@ -571,7 +571,7 @@ ng_btsocket_l2cap_raw_attach(struct socket *so, int proto, struct thread *td)
 
 	/* Allocate the PCB */
         MALLOC(pcb, ng_btsocket_l2cap_raw_pcb_p, sizeof(*pcb),
-		M_NETGRAPH_BTSOCKET_L2CAP_RAW, M_ZERO);
+		M_NETGRAPH_BTSOCKET_L2CAP_RAW, M_WAITOK | M_ZERO);
         if (pcb == NULL)
                 return (ENOMEM);
 
@@ -758,7 +758,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE, NGM_L2CAP_NODE_GET_FLAGS,
-			0, 0);
+			0, M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -799,7 +799,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE, NGM_L2CAP_NODE_GET_DEBUG,
-			0, 0);
+			0, M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -837,7 +837,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 			(struct ng_btsocket_l2cap_raw_node_debug *) data;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE, NGM_L2CAP_NODE_SET_DEBUG,
-			sizeof(ng_l2cap_node_debug_ep), 0);
+			sizeof(ng_l2cap_node_debug_ep), M_WAITOK);
 		if (msg == NULL) {
 			error = ENOMEM;
 			break;
@@ -865,7 +865,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE, NGM_L2CAP_NODE_GET_CON_LIST,
-			0, 0);
+			0, M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -923,7 +923,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 		pcb->msg = NULL;
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE,
-			NGM_L2CAP_NODE_GET_CHAN_LIST, 0, 0);
+			NGM_L2CAP_NODE_GET_CHAN_LIST, 0, M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -987,7 +987,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE,
 			NGM_L2CAP_L2CA_PING, sizeof(*ip) + p->echo_size,
-			0);
+			M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
@@ -1056,7 +1056,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
 
 		NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE,
 			NGM_L2CAP_L2CA_GET_INFO, sizeof(*ip) + p->info_size,
-			0);
+			M_WAITOK);
 		if (msg == NULL) {
 			pcb->token = 0;
 			error = ENOMEM;
diff --git a/sys/netgraph/ng_UI.c b/sys/netgraph/ng_UI.c
index 8751105deb63..e0733bce2fbe 100644
--- a/sys/netgraph/ng_UI.c
+++ b/sys/netgraph/ng_UI.c
@@ -194,7 +194,7 @@ ng_UI_rcvdata(hook_p hook, item_p item)
 		m_adj(m, ptr - start);
 		NG_FWD_NEW_DATA(error, item, priv->uplink, m);	/* m -> NULL */
 	} else if (hook == priv->uplink) {
-		M_PREPEND(m, 1, M_NOWAIT);	/* Prepend IP NLPID */
+		M_PREPEND(m, 1, M_DONTWAIT);	/* Prepend IP NLPID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c
index 1e1ff1c70e1b..f552a503ee5a 100644
--- a/sys/netgraph/ng_bridge.c
+++ b/sys/netgraph/ng_bridge.c
@@ -713,7 +713,7 @@ ng_bridge_rcvdata(hook_p hook, item_p item)
 			 * It's usable link but not the reserved (first) one.
 			 * Copy mbuf and meta info for sending.
 			 */
-			m2 = m_dup(m, M_NOWAIT);	/* XXX m_copypacket() */
+			m2 = m_dup(m, M_DONTWAIT);	/* XXX m_copypacket() */
 			if (m2 == NULL) {
 				link->stats.memoryFailures++;
 				NG_FREE_ITEM(item);
diff --git a/sys/netgraph/ng_cisco.c b/sys/netgraph/ng_cisco.c
index 70ef5d7eb406..f263f3569399 100644
--- a/sys/netgraph/ng_cisco.c
+++ b/sys/netgraph/ng_cisco.c
@@ -360,7 +360,7 @@ cisco_rcvdata(hook_p hook, item_p item)
 	/* OK so it came from a protocol, heading out. Prepend general data
 	   packet header. For now, IP,IPX only  */
 	m = NGI_M(item); /* still associated with item */
-	M_PREPEND(m, CISCO_HEADER_LEN, M_NOWAIT);
+	M_PREPEND(m, CISCO_HEADER_LEN, M_DONTWAIT);
 	if (!m) {
 		error = ENOBUFS;
 		goto out;
@@ -606,7 +606,7 @@ cisco_send(sc_p sc, int type, long par1, long par2)
 
 	getmicrotime(&time);
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (!m)
 		return (ENOBUFS);
 
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index 1bead1a0f9b4..7588c92fe8a1 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -417,7 +417,7 @@ ng_eiface_constructor(node_p node)
 	int		error = 0;
 
 	/* Allocate node and interface private structures */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, 0);
+	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK);
 	if (priv == NULL) {
 		return (ENOMEM);
 	}
diff --git a/sys/netgraph/ng_frame_relay.c b/sys/netgraph/ng_frame_relay.c
index e2dc2996c3ef..dc555922be09 100644
--- a/sys/netgraph/ng_frame_relay.c
+++ b/sys/netgraph/ng_frame_relay.c
@@ -366,7 +366,7 @@ ngfrm_rcvdata(hook_p hook, item_p item)
 	alen = sc->addrlen;
 	if (alen == 0)
 		alen = 2;	/* default value for transmit */
-	M_PREPEND(m, alen, M_NOWAIT);
+	M_PREPEND(m, alen, M_DONTWAIT);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto bad;
diff --git a/sys/netgraph/ng_gif.c b/sys/netgraph/ng_gif.c
index 985cf315c0af..2d999590f412 100644
--- a/sys/netgraph/ng_gif.c
+++ b/sys/netgraph/ng_gif.c
@@ -309,7 +309,7 @@ ng_gif_glue_af(struct mbuf **mp, int af)
 	 * hopefully everything after that will not
 	 * need one. So let's just use M_PREPEND.
 	 */
-	M_PREPEND(m, sizeof (tmp_af), M_NOWAIT);
+	M_PREPEND(m, sizeof (tmp_af), M_DONTWAIT);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto done;
diff --git a/sys/netgraph/ng_gif_demux.c b/sys/netgraph/ng_gif_demux.c
index 9f6495a880b4..066bea6e4e29 100644
--- a/sys/netgraph/ng_gif_demux.c
+++ b/sys/netgraph/ng_gif_demux.c
@@ -346,7 +346,7 @@ ng_gif_demux_rcvdata(hook_p hook, item_p item)
 		 * Add address family header and set the output hook.
 		 */
 		iffam = get_iffam_from_hook(priv, hook);
-		M_PREPEND(m, sizeof (iffam->family), M_NOWAIT);
+		M_PREPEND(m, sizeof (iffam->family), M_DONTWAIT);
 		if (m == NULL) {
 			NG_FREE_M(m);
 			NG_FREE_ITEM(item);
diff --git a/sys/netgraph/ng_l2tp.c b/sys/netgraph/ng_l2tp.c
index 69a7cf96ec02..ebc6a4186360 100644
--- a/sys/netgraph/ng_l2tp.c
+++ b/sys/netgraph/ng_l2tp.c
@@ -851,7 +851,7 @@ ng_l2tp_recv_lower(node_p node, item_p item)
 		 * later because of a memory error, because then the upper
 		 * layer would never get the packet.
 		 */
-		M_PREPEND(m, 2, M_NOWAIT);
+		M_PREPEND(m, 2, M_DONTWAIT);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			NG_FREE_ITEM(item);
@@ -955,7 +955,7 @@ ng_l2tp_recv_ctrl(node_p node, item_p item)
 	}
 
 	/* Copy packet */
-	if ((m = L2TP_COPY_MBUF(seq->xwin[i], M_NOWAIT)) == NULL) {
+	if ((m = L2TP_COPY_MBUF(seq->xwin[i], M_DONTWAIT)) == NULL) {
 		priv->stats.memoryFailures++;
 		return (ENOBUFS);
 	}
@@ -991,7 +991,7 @@ ng_l2tp_recv_data(node_p node, item_p item, hookpriv_p hpriv)
 	M_PREPEND(m, 6
 	    + (2 * (hpriv->conf.include_length != 0))
 	    + (4 * (hpriv->conf.enable_dseq != 0)),
-	    M_NOWAIT);
+	    M_DONTWAIT);
 	if (m == NULL) {
 		priv->stats.memoryFailures++;
 		NG_FREE_ITEM(item);
@@ -1219,7 +1219,7 @@ ng_l2tp_seq_recv_nr(priv_p priv, u_int16_t nr)
 	 */
 	while ((i = L2TP_SEQ_DIFF(seq->ns, seq->rack)) < seq->cwnd
 	    && seq->xwin[i] != NULL) {
-		if ((m = L2TP_COPY_MBUF(seq->xwin[i], M_NOWAIT)) == NULL)
+		if ((m = L2TP_COPY_MBUF(seq->xwin[i], M_DONTWAIT)) == NULL)
 			priv->stats.memoryFailures++;
 		else
 			ng_l2tp_xmit_ctrl(priv, m, seq->ns);
@@ -1361,7 +1361,7 @@ ng_l2tp_seq_rack_timeout(void *arg)
 	seq->acks = 0;
 
 	/* Retransmit oldest unack'd packet */
-	if ((m = L2TP_COPY_MBUF(seq->xwin[0], M_NOWAIT)) == NULL)
+	if ((m = L2TP_COPY_MBUF(seq->xwin[0], M_DONTWAIT)) == NULL)
 		priv->stats.memoryFailures++;
 	else
 		ng_l2tp_xmit_ctrl(priv, m, seq->rack);
@@ -1388,7 +1388,7 @@ ng_l2tp_xmit_ctrl(priv_p priv, struct mbuf *m, u_int16_t ns)
 	if (m == NULL) {
 
 		/* Create a new mbuf for ZLB packet */
-		MGETHDR(m, M_NOWAIT, MT_DATA);
+		MGETHDR(m, M_DONTWAIT, MT_DATA);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			return (ENOBUFS);
@@ -1407,7 +1407,7 @@ ng_l2tp_xmit_ctrl(priv_p priv, struct mbuf *m, u_int16_t ns)
 		m_adj(m, 2);
 
 		/* Make room for L2TP header */
-		M_PREPEND(m, 12, M_NOWAIT);
+		M_PREPEND(m, 12, M_DONTWAIT);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			return (ENOBUFS);
diff --git a/sys/netgraph/ng_lmi.c b/sys/netgraph/ng_lmi.c
index f098aa8caf37..87f35675ac36 100644
--- a/sys/netgraph/ng_lmi.c
+++ b/sys/netgraph/ng_lmi.c
@@ -321,7 +321,7 @@ nglmi_inquire(sc_p sc, int full)
 
 	if (sc->lmi_channel == NULL)
 		return;
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		log(LOG_ERR, "nglmi: unable to start up LMI processing\n");
 		return;
diff --git a/sys/netgraph/ng_one2many.c b/sys/netgraph/ng_one2many.c
index 5332049f4353..927bb77a99c1 100644
--- a/sys/netgraph/ng_one2many.c
+++ b/sys/netgraph/ng_one2many.c
@@ -427,7 +427,7 @@ ng_one2many_rcvdata(hook_p hook, item_p item)
 				struct ng_one2many_link *mdst;
 
 				mdst = &priv->many[priv->activeMany[i]];
-				m2 = m_dup(m, M_NOWAIT);        /* XXX m_copypacket() */
+				m2 = m_dup(m, M_DONTWAIT);        /* XXX m_copypacket() */
 				if (m2 == NULL) {
 					mdst->stats.memoryFailures++;
 					NG_FREE_ITEM(item);
diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index 16373e3f4b57..6ffb0829d65b 100644
--- a/sys/netgraph/ng_ppp.c
+++ b/sys/netgraph/ng_ppp.c
@@ -1595,7 +1595,7 @@ deliver:
 			/* Split off next fragment as "m2" */
 			m2 = m;
 			if (!lastFragment) {
-				struct mbuf *n = m_split(m, len, M_NOWAIT);
+				struct mbuf *n = m_split(m, len, M_DONTWAIT);
 
 				if (n == NULL) {
 					NG_FREE_M(m);
@@ -1916,7 +1916,7 @@ ng_ppp_addproto(struct mbuf *m, int proto, int compOK)
 static struct mbuf *
 ng_ppp_prepend(struct mbuf *m, const void *buf, int len)
 {
-	M_PREPEND(m, len, M_NOWAIT);
+	M_PREPEND(m, len, M_DONTWAIT);
 	if (m == NULL || (m->m_len < len && (m = m_pullup(m, len)) == NULL))
 		return (NULL);
 	bcopy(buf, mtod(m, u_char *), len);
diff --git a/sys/netgraph/ng_pppoe.c b/sys/netgraph/ng_pppoe.c
index 521d708e190b..886747e65695 100644
--- a/sys/netgraph/ng_pppoe.c
+++ b/sys/netgraph/ng_pppoe.c
@@ -723,14 +723,14 @@ AAA
 				printf("pppoe: Session out of memory\n");
 				LEAVE(ENOMEM);
 			}
-			MGETHDR(neg->m, M_NOWAIT, MT_DATA);
+			MGETHDR(neg->m, M_DONTWAIT, MT_DATA);
 			if(neg->m == NULL) {
 				printf("pppoe: Session out of mbufs\n");
 				FREE(neg, M_NETGRAPH_PPPOE);
 				LEAVE(ENOBUFS);
 			}
 			neg->m->m_pkthdr.rcvif = NULL;
-			MCLGET(neg->m, M_NOWAIT);
+			MCLGET(neg->m, M_DONTWAIT);
 			if ((neg->m->m_flags & M_EXT) == 0) {
 				printf("pppoe: Session out of mcls\n");
 				m_freem(neg->m);
@@ -1008,7 +1008,7 @@ AAA
 				 * Put it into a cluster.
 				 */
 				struct mbuf *n;
-				n = m_dup(m, M_NOWAIT);
+				n = m_dup(m, M_DONTWAIT);
 				m_freem(m);
 				m = n;
 				if (m) {
@@ -1350,7 +1350,7 @@ AAA
 			 * But first correct the length.
 			 */
 			sp->pkt_hdr.ph.length = htons((short)(m->m_pkthdr.len));
-			M_PREPEND(m, sizeof(*wh), M_NOWAIT);
+			M_PREPEND(m, sizeof(*wh), M_DONTWAIT);
 			if (m == NULL) {
 				LEAVE(ENOBUFS);
 			}
@@ -1525,7 +1525,7 @@ AAA
 				wh->eh.ether_type = ETHERTYPE_PPPOE_DISC;
 
 			/* generate a packet of that type */
-			MGETHDR(m, M_NOWAIT, MT_DATA);
+			MGETHDR(m, M_DONTWAIT, MT_DATA);
 			if(m == NULL)
 				printf("pppoe: Session out of mbufs\n");
 			else {
@@ -1596,7 +1596,7 @@ AAA
 	case	PPPOE_SINIT:
 	case	PPPOE_SREQ:
 		/* timeouts on these produce resends */
-		m0 = m_copypacket(sp->neg->m, M_NOWAIT);
+		m0 = m_copypacket(sp->neg->m, M_DONTWAIT);
 		NG_SEND_DATA_ONLY( error, privp->ethernet_hook, m0);
 		neg->timeout_handle = timeout(pppoe_ticker,
 					hook, neg->timeout * hz);
@@ -1642,7 +1642,7 @@ AAA
 
 	case	PPPOE_NEWCONNECTED:
 		/* send the PADS without a timeout - we're now connected */
-		m0 = m_copypacket(sp->neg->m, M_NOWAIT);
+		m0 = m_copypacket(sp->neg->m, M_DONTWAIT);
 		NG_SEND_DATA_ONLY( error, privp->ethernet_hook, m0);
 		break;
 
@@ -1657,7 +1657,7 @@ AAA
 		 * send the offer but if they don't respond
 		 * in PPPOE_OFFER_TIMEOUT seconds, forget about it.
 		 */
-		m0 = m_copypacket(sp->neg->m, M_NOWAIT);
+		m0 = m_copypacket(sp->neg->m, M_DONTWAIT);
 		NG_SEND_DATA_ONLY( error, privp->ethernet_hook, m0);
 		neg->timeout_handle = timeout(pppoe_ticker,
 					hook, PPPOE_OFFER_TIMEOUT * hz);
@@ -1665,7 +1665,7 @@ AAA
 
 	case	PPPOE_SINIT:
 	case	PPPOE_SREQ:
-		m0 = m_copypacket(sp->neg->m, M_NOWAIT);
+		m0 = m_copypacket(sp->neg->m, M_DONTWAIT);
 		NG_SEND_DATA_ONLY( error, privp->ethernet_hook, m0);
 		neg->timeout_handle = timeout(pppoe_ticker, hook,
 					(hz * PPPOE_INITIAL_TIMEOUT));
diff --git a/sys/netgraph/ng_pptpgre.c b/sys/netgraph/ng_pptpgre.c
index 4422b29cf60a..50811da57bee 100644
--- a/sys/netgraph/ng_pptpgre.c
+++ b/sys/netgraph/ng_pptpgre.c
@@ -522,7 +522,7 @@ ng_pptpgre_xmit(node_p node, item_p item)
 	/* Prepend GRE header to outgoing frame */
 	grelen = sizeof(*gre) + sizeof(u_int32_t) * (gre->hasSeq + gre->hasAck);
 	if (m == NULL) {
-		MGETHDR(m, M_NOWAIT, MT_DATA);
+		MGETHDR(m, M_DONTWAIT, MT_DATA);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			if (item)
@@ -532,7 +532,7 @@ ng_pptpgre_xmit(node_p node, item_p item)
 		m->m_len = m->m_pkthdr.len = grelen;
 		m->m_pkthdr.rcvif = NULL;
 	} else {
-		M_PREPEND(m, grelen, M_NOWAIT);
+		M_PREPEND(m, grelen, M_DONTWAIT);
 		if (m == NULL || (m->m_len < grelen
 		    && (m = m_pullup(m, grelen)) == NULL)) {
 			priv->stats.memoryFailures++;
diff --git a/sys/netgraph/ng_rfc1490.c b/sys/netgraph/ng_rfc1490.c
index b6c75eafb7c5..778d07b5e90b 100644
--- a/sys/netgraph/ng_rfc1490.c
+++ b/sys/netgraph/ng_rfc1490.c
@@ -278,14 +278,14 @@ ng_rfc1490_rcvdata(hook_p hook, item_p item)
 			break;
 		}
 	} else if (hook == priv->ppp) {
-		M_PREPEND(m, 2, M_NOWAIT);	/* Prepend PPP NLPID */
+		M_PREPEND(m, 2, M_DONTWAIT);	/* Prepend PPP NLPID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
 		mtod(m, u_char *)[1] = NLPID_PPP;
 		NG_FWD_NEW_DATA(error, item, priv->downlink, m);
 	} else if (hook == priv->inet) {
-		M_PREPEND(m, 2, M_NOWAIT);	/* Prepend IP NLPID */
+		M_PREPEND(m, 2, M_DONTWAIT);	/* Prepend IP NLPID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c
index f5a7643187b1..f841a0e70f18 100644
--- a/sys/netgraph/ng_socket.c
+++ b/sys/netgraph/ng_socket.c
@@ -224,7 +224,7 @@ ngc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
 	/* Allocate an expendable buffer for the path, chop off
 	 * the sockaddr header, and make sure it's NUL terminated */
 	len = sap->sg_len - 2;
-	MALLOC(path, char *, len + 1, M_NETGRAPH_PATH, 0);
+	MALLOC(path, char *, len + 1, M_NETGRAPH_PATH, M_WAITOK);
 	if (path == NULL) {
 		error = ENOMEM;
 		goto release;
@@ -239,7 +239,7 @@ ngc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
 
 	/* Move the data into a linear buffer as well. Messages are not
 	 * delivered in mbufs. */
-	MALLOC(msg, struct ng_mesg *, len + 1, M_NETGRAPH_MSG, 0);
+	MALLOC(msg, struct ng_mesg *, len + 1, M_NETGRAPH_MSG, M_WAITOK);
 	if (msg == NULL) {
 		error = ENOMEM;
 		goto release;
@@ -437,7 +437,7 @@ ng_setsockaddr(struct socket *so, struct sockaddr **addr)
 	if ( NG_NODE_HAS_NAME(pcbp->sockdata->node))
 		sg_len += namelen = strlen(NG_NODE_NAME(pcbp->sockdata->node));
 
-	MALLOC(sg, struct sockaddr_ng *, sg_len, M_SONAME, M_ZERO);
+	MALLOC(sg, struct sockaddr_ng *, sg_len, M_SONAME, M_WAITOK | M_ZERO);
 
 	if (NG_NODE_HAS_NAME(pcbp->sockdata->node))
 		bcopy(NG_NODE_NAME(pcbp->sockdata->node), sg->sg_data, namelen);
@@ -470,7 +470,7 @@ ng_attach_cntl(struct socket *so)
 
 	/* Allocate node private info */
 	MALLOC(privdata, struct ngsock *,
-	    sizeof(*privdata), M_NETGRAPH_SOCK, M_ZERO);
+	    sizeof(*privdata), M_NETGRAPH_SOCK, M_WAITOK | M_ZERO);
 	if (privdata == NULL) {
 		ng_detach_common(pcbp, NG_CONTROL);
 		return (ENOMEM);
@@ -513,7 +513,7 @@ ng_attach_common(struct socket *so, int type)
 		return (error);
 
 	/* Allocate the pcb */
-	MALLOC(pcbp, struct ngpcb *, sizeof(*pcbp), M_PCB, M_ZERO);
+	MALLOC(pcbp, struct ngpcb *, sizeof(*pcbp), M_PCB, M_WAITOK | M_ZERO);
 	if (pcbp == NULL)
 		return (ENOMEM);
 	pcbp->type = type;
diff --git a/sys/netgraph/ng_source.c b/sys/netgraph/ng_source.c
index 8ad0a704d4c2..78525e89672d 100644
--- a/sys/netgraph/ng_source.c
+++ b/sys/netgraph/ng_source.c
@@ -640,7 +640,7 @@ ng_source_send (sc_p sc, int tosend, int *sent_p)
 			break;
 
 		/* duplicate the packet */
-		m2 = m_copypacket(m, M_NOWAIT);
+		m2 = m_copypacket(m, M_DONTWAIT);
 		if (m2 == NULL) {
 			s = splnet();
 			IF_PREPEND(&sc->snd_queue, m);
diff --git a/sys/netgraph/ng_tee.c b/sys/netgraph/ng_tee.c
index 877ef169e9e1..fbe80ba6e65a 100644
--- a/sys/netgraph/ng_tee.c
+++ b/sys/netgraph/ng_tee.c
@@ -334,7 +334,7 @@ ngt_rcvdata(hook_p hook, item_p item)
 		meta_p meta2;
 
 		/* Copy packet (failure will not stop the original)*/
-		m2 = m_dup(m, M_NOWAIT);
+		m2 = m_dup(m, M_DONTWAIT);
 		if (m2) {
 
 			/* Copy meta info */
diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c
index a25ee9ed6874..9a0175e053a0 100644
--- a/sys/netgraph/ng_tty.c
+++ b/sys/netgraph/ng_tty.c
@@ -203,7 +203,7 @@ ngt_open(dev_t dev, struct tty *tp)
 	}
 
 	/* Initialize private struct */
-	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_ZERO);
+	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_WAITOK | M_ZERO);
 	if (sc == NULL) {
 		error = ENOMEM;
 		goto done;
@@ -368,7 +368,7 @@ ngt_input(int c, struct tty *tp)
 
 	/* Get a new header mbuf if we need one */
 	if (!(m = sc->m)) {
-		MGETHDR(m, M_NOWAIT, MT_DATA);
+		MGETHDR(m, M_DONTWAIT, MT_DATA);
 		if (!m) {
 			if (sc->flags & FLG_DEBUG)
 				log(LOG_ERR,
diff --git a/sys/netgraph/ng_vjc.c b/sys/netgraph/ng_vjc.c
index 14673ba03748..90d7d4d987c7 100644
--- a/sys/netgraph/ng_vjc.c
+++ b/sys/netgraph/ng_vjc.c
@@ -476,7 +476,7 @@ ng_vjc_rcvdata(hook_p hook, item_p item)
 		m_adj(m, vjlen);
 
 		/* Copy the reconstructed TCP/IP headers into a new mbuf */
-		MGETHDR(hm, M_NOWAIT, MT_DATA);
+		MGETHDR(hm, M_DONTWAIT, MT_DATA);
 		if (hm == NULL) {
 			priv->slc.sls_errorin++;
 			NG_FREE_M(m);
@@ -486,7 +486,7 @@ ng_vjc_rcvdata(hook_p hook, item_p item)
 		hm->m_len = 0;
 		hm->m_pkthdr.rcvif = NULL;
 		if (hlen > MHLEN) {		/* unlikely, but can happen */
-			MCLGET(hm, M_NOWAIT);
+			MCLGET(hm, M_DONTWAIT);
 			if ((hm->m_flags & M_EXT) == 0) {
 				m_freem(hm);
 				priv->slc.sls_errorin++;
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 4a4d91ff5b54..c463bf984a25 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -309,7 +309,7 @@ arprequest(ifp, sip, tip, enaddr)
 				   LLC_UI, 0x00, 0x00, 0x00, 0x08, 0x06 };
 	u_short ar_hrd;
 
-	if ((m = m_gethdr(M_NOWAIT, MT_DATA)) == NULL)
+	if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL)
 		return;
 	m->m_pkthdr.rcvif = (struct ifnet *)0;
 #ifdef MAC
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index bc5fe1169097..929d456ec66c 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -108,7 +108,7 @@ igmp_init()
 	/*
 	 * Construct a Router Alert option to use in outgoing packets
 	 */
-	MGET(router_alert, M_NOWAIT, MT_DATA);
+	MGET(router_alert, M_DONTWAIT, MT_DATA);
 	ra = mtod(router_alert, struct ipoption *);
 	ra->ipopt_dst.s_addr = 0;
 	ra->ipopt_list[0] = IPOPT_RA;	/* Router Alert Option */
@@ -445,7 +445,7 @@ igmp_sendpkt(inm, type, addr)
         struct ip *ip;
         struct ip_moptions imo;
 
-        MGETHDR(m, M_NOWAIT, MT_HEADER);
+        MGETHDR(m, M_DONTWAIT, MT_HEADER);
         if (m == NULL)
                 return;
 
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 56104912ec04..89c412313527 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -268,7 +268,7 @@ in_control(so, cmd, data, ifp, td)
 			return (EADDRNOTAVAIL);
 		if (ia == (struct in_ifaddr *)0) {
 			ia = (struct in_ifaddr *)
-				malloc(sizeof *ia, M_IFADDR, M_ZERO);
+				malloc(sizeof *ia, M_IFADDR, M_WAITOK | M_ZERO);
 			if (ia == (struct in_ifaddr *)NULL)
 				return (ENOBUFS);
 			/*
@@ -837,7 +837,7 @@ in_addmulti(ap, ifp)
 		return ifma->ifma_protospec;
 	}
 
-	/* XXX - if_addmulti does not use N_NOWAIT.  Can this really be called
+	/* XXX - if_addmulti uses M_WAITOK.  Can this really be called
 	   at interrupt time?  If so, need to fix if_addmulti. XXX */
 	inm = (struct in_multi *)malloc(sizeof(*inm), M_IPMADDR,
 	    M_NOWAIT | M_ZERO);
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 3e996d75b3cd..cdf094aafbdc 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -167,7 +167,7 @@ in_gif_output(ifp, family, m)
 		ip_ecn_ingress(ECN_NOCARE, &iphdr.ip_tos, &tos);
 
 	/* prepend new IP header */
-	M_PREPEND(m, sizeof(struct ip), M_NOWAIT);
+	M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
 	if (m && m->m_len < sizeof(struct ip))
 		m = m_pullup(m, sizeof(struct ip));
 	if (m == NULL) {
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index b0a66c617162..7f839175cf5a 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -660,7 +660,7 @@ in_sockaddr(port, addr_p)
 	struct sockaddr_in *sin;
 
 	MALLOC(sin, struct sockaddr_in *, sizeof *sin, M_SONAME,
-		M_ZERO);
+		M_WAITOK | M_ZERO);
 	sin->sin_family = AF_INET;
 	sin->sin_len = sizeof(*sin);
 	sin->sin_addr = *addr_p;
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index bd8ea4db0e89..162d7f78a9ae 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -489,7 +489,7 @@ div_pcblist(SYSCTL_HANDLER_ARGS)
 	if (error)
 		return error;
 
-	inp_list = malloc(n * sizeof *inp_list, M_TEMP, 0);
+	inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK);
 	if (inp_list == 0)
 		return ENOMEM;
 	
diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c
index a547c6619b6c..478cdfae3ed5 100644
--- a/sys/netinet/ip_encap.c
+++ b/sys/netinet/ip_encap.c
@@ -487,7 +487,7 @@ encap_fillarg(m, ep)
 {
 	struct m_tag *tag;
 
-	tag = m_tag_get(PACKET_TAG_ENCAP, sizeof (void*), M_NOWAIT);
+	tag = m_tag_get(PACKET_TAG_ENCAP, sizeof (void*), M_DONTWAIT);
 	if (tag) {
 		*(void**)(tag+1) = ep->arg;
 		m_tag_prepend(m, tag);
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index b5327665e255..26f4a0463bd5 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -875,7 +875,7 @@ add_dyn_rule(struct ipfw_flow_id *id, u_int8_t dyn_type, struct ip_fw *rule)
 	    if (ipfw_dyn_v != NULL)
 		free(ipfw_dyn_v, M_IPFW);
 	    ipfw_dyn_v = malloc(curr_dyn_buckets * sizeof r,
-                   M_IPFW, M_NOWAIT | M_ZERO);
+                   M_IPFW, M_DONTWAIT | M_ZERO);
 	    if (ipfw_dyn_v == NULL)
 		return NULL; /* failed ! */
 	}
@@ -2036,7 +2036,7 @@ ip_fw_ctl(struct sockopt *sopt)
 		 * bother filling up the buffer, just jump to the
 		 * sooptcopyout.
 		 */
-		buf = malloc(size, M_TEMP, 0);
+		buf = malloc(size, M_TEMP, M_WAITOK);
 		if (buf == 0) {
 		    splx(s);
 		    error = ENOBUFS;
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c
index e35078f8608f..eabcd67028ac 100644
--- a/sys/netinet/ip_fw2.c
+++ b/sys/netinet/ip_fw2.c
@@ -1057,7 +1057,7 @@ send_pkt(struct ipfw_flow_id *id, u_int32_t seq, u_int32_t ack, int flags)
 	struct tcphdr *tcp;
 	struct route sro;	/* fake route */
 
-	MGETHDR(m, M_NOWAIT, MT_HEADER);
+	MGETHDR(m, M_DONTWAIT, MT_HEADER);
 	if (m == 0)
 		return;
 	m->m_pkthdr.rcvif = (struct ifnet *)0;
@@ -2498,7 +2498,7 @@ ipfw_ctl(struct sockopt *sopt)
 		 * how much room is needed, do not bother filling up the
 		 * buffer, just jump to the sooptcopyout.
 		 */
-		buf = malloc(size, M_TEMP, 0);
+		buf = malloc(size, M_TEMP, M_WAITOK);
 		if (buf == 0) {
 			splx(s);
 			error = ENOBUFS;
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index a83dcbaa3fce..a15ece2b83ba 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -163,7 +163,7 @@ icmp_error(n, type, code, dest, destifp)
 	/*
 	 * First, formulate icmp message
 	 */
-	m = m_gethdr(M_NOWAIT, MT_HEADER);
+	m = m_gethdr(M_DONTWAIT, MT_HEADER);
 	if (m == NULL)
 		goto freeit;
 #ifdef MAC
@@ -656,7 +656,7 @@ match:
 		 */
 		cp = (u_char *) (ip + 1);
 		if ((opts = ip_srcroute()) == 0 &&
-		    (opts = m_gethdr(M_NOWAIT, MT_HEADER))) {
+		    (opts = m_gethdr(M_DONTWAIT, MT_HEADER))) {
 			opts->m_len = sizeof(struct in_addr);
 			mtod(opts, struct in_addr *)->s_addr = 0;
 		}
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 1965b025deab..3e1f8a508dc1 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -834,7 +834,7 @@ found:
 
 		/* Clone packet if we're doing a 'tee' */
 		if ((divert_info & IP_FW_PORT_TEE_FLAG) != 0)
-			clone = m_dup(m, M_NOWAIT);
+			clone = m_dup(m, M_DONTWAIT);
 
 		/* Restore packet header fields to original values */
 		ip->ip_len += hlen;
@@ -985,7 +985,7 @@ ip_reass(struct mbuf *m, struct ipqhead *head, struct ipq *fp,
 	 * If first fragment to arrive, create a reassembly queue.
 	 */
 	if (fp == 0) {
-		if ((t = m_get(M_NOWAIT, MT_FTABLE)) == NULL)
+		if ((t = m_get(M_DONTWAIT, MT_FTABLE)) == NULL)
 			goto dropfrag;
 		fp = mtod(t, struct ipq *);
 #ifdef MAC
@@ -1587,7 +1587,7 @@ ip_srcroute()
 
 	if (ip_nhops == 0)
 		return ((struct mbuf *)0);
-	m = m_get(M_NOWAIT, MT_HEADER);
+	m = m_get(M_DONTWAIT, MT_HEADER);
 	if (m == 0)
 		return ((struct mbuf *)0);
 
@@ -1762,8 +1762,8 @@ ip_forward(struct mbuf *m, int srcrt, struct sockaddr_in *next_hop)
 	 * assume exclusive access to the IP header in `m', so any
 	 * data in a cluster may change before we reach icmp_error().
 	 */
-	MGET(mcopy, M_NOWAIT, m->m_type);
-	if (mcopy != NULL && !m_dup_pkthdr(mcopy, m, M_NOWAIT)) {
+	MGET(mcopy, M_DONTWAIT, m->m_type);
+	if (mcopy != NULL && !m_dup_pkthdr(mcopy, m, M_DONTWAIT)) {
 		/*
 		 * It's probably ok if the pkthdr dup fails (because
 		 * the deep copy of the tag chain failed), but for now
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index d48ae3e3cba1..3caba6b3a115 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -1403,7 +1403,7 @@ encap_send(struct ip *ip, struct vif *vifp, struct mbuf *m)
      * new mbuf so we can modify it.  Try to fill the new
      * mbuf since if we don't the ethernet driver will.
      */
-    MGETHDR(mb_copy, M_NOWAIT, MT_HEADER);
+    MGETHDR(mb_copy, M_DONTWAIT, MT_HEADER);
     if (mb_copy == NULL)
 	return;
 #ifdef MAC
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index f61f61da6728..64e58e2547eb 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -802,7 +802,7 @@ spd_done:
 
 			/* Clone packet if we're doing a 'tee' */
 			if ((off & IP_FW_PORT_TEE_FLAG) != 0)
-				clone = m_dup(m, M_NOWAIT);
+				clone = m_dup(m, M_DONTWAIT);
 
 			/*
 			 * XXX
@@ -1108,7 +1108,7 @@ smart_frag_failure:
 	m0 = m;
 	mhlen = sizeof (struct ip);
 	for (; off < (u_short)ip->ip_len; off += len) {
-		MGETHDR(m, M_NOWAIT, MT_HEADER);
+		MGETHDR(m, M_DONTWAIT, MT_HEADER);
 		if (m == 0) {
 			error = ENOBUFS;
 			ipstat.ips_odropped++;
@@ -1274,7 +1274,7 @@ ip_insertoptions(m, opt, phlen)
 	if (p->ipopt_dst.s_addr)
 		ip->ip_dst = p->ipopt_dst;
 	if (m->m_flags & M_EXT || m->m_data - optlen < m->m_pktdat) {
-		MGETHDR(n, M_NOWAIT, MT_HEADER);
+		MGETHDR(n, M_DONTWAIT, MT_HEADER);
 		if (n == 0) {
 			*phlen = 0;
 			return (m);
@@ -1379,7 +1379,7 @@ ip_ctloutput(so, sopt)
 				error = EMSGSIZE;
 				break;
 			}
-			MGET(m, sopt->sopt_td ? 0 : M_NOWAIT, MT_HEADER);
+			MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_HEADER);
 			if (m == 0) {
 				error = ENOBUFS;
 				break;
@@ -1773,7 +1773,7 @@ ip_setmoptions(sopt, imop)
 		 * allocate one and initialize to default values.
 		 */
 		imo = (struct ip_moptions*)malloc(sizeof(*imo), M_IPMOPTS,
-		    0);
+		    M_WAITOK);
 
 		if (imo == NULL)
 			return (ENOBUFS);
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 8a90be059716..e4e4eb24d0ff 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -287,7 +287,7 @@ rip_output(m, so, dst)
 			m_freem(m);
 			return(EMSGSIZE);
 		}
-		M_PREPEND(m, sizeof(struct ip), 0);
+		M_PREPEND(m, sizeof(struct ip), M_TRYWAIT);
 		ip = mtod(m, struct ip *);
 		ip->ip_tos = inp->inp_ip_tos;
 		ip->ip_off = 0;
@@ -698,7 +698,7 @@ rip_pcblist(SYSCTL_HANDLER_ARGS)
 	if (error)
 		return error;
 
-	inp_list = malloc(n * sizeof *inp_list, M_TEMP, 0);
+	inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK);
 	if (inp_list == 0)
 		return ENOMEM;
 	
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 2e926d191ae4..34b0d844a94b 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -603,14 +603,14 @@ send:
 		m->m_len += hdrlen;
 		m->m_data -= hdrlen;
 #else
-		MGETHDR(m, M_NOWAIT, MT_HEADER);
+		MGETHDR(m, M_DONTWAIT, MT_HEADER);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
 		}
 #ifdef INET6
 		if (MHLEN < hdrlen + max_linkhdr) {
-			MCLGET(m, M_NOWAIT);
+			MCLGET(m, M_DONTWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_freem(m);
 				error = ENOBUFS;
@@ -651,7 +651,7 @@ send:
 		else
 			tcpstat.tcps_sndwinup++;
 
-		MGETHDR(m, M_NOWAIT, MT_HEADER);
+		MGETHDR(m, M_DONTWAIT, MT_HEADER);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index d12c8991e64b..844f279f081b 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -332,7 +332,7 @@ tcp_maketemplate(tp)
 	struct mbuf *m;
 	struct tcptemp *n;
 
-	m = m_get(M_NOWAIT, MT_HEADER);
+	m = m_get(M_DONTWAIT, MT_HEADER);
 	if (m == NULL)
 		return (0);
 	m->m_len = sizeof(struct tcptemp);
@@ -412,7 +412,7 @@ tcp_respond(tp, ipgen, th, m, ack, seq, flags)
 	      }
 	}
 	if (m == 0) {
-		m = m_gethdr(M_NOWAIT, MT_HEADER);
+		m = m_gethdr(M_DONTWAIT, MT_HEADER);
 		if (m == NULL)
 			return;
 		tlen = 0;
@@ -901,7 +901,7 @@ tcp_pcblist(SYSCTL_HANDLER_ARGS)
 	if (error)
 		return error;
 
-	inp_list = malloc(n * sizeof *inp_list, M_TEMP, 0);
+	inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK);
 	if (inp_list == 0)
 		return ENOMEM;
 	
@@ -1495,7 +1495,7 @@ ipsec_hdrsiz_tcp(tp)
 
 	if ((tp == NULL) || ((inp = tp->t_inpcb) == NULL))
 		return 0;
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (!m)
 		return 0;
 
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index daf6d8930b59..a8b031b3df26 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -247,7 +247,7 @@ syncache_init(void)
 	/* Allocate the hash table. */
 	MALLOC(tcp_syncache.hashbase, struct syncache_head *,
 	    tcp_syncache.hashsize * sizeof(struct syncache_head),
-	    M_SYNCACHE, 0);
+	    M_SYNCACHE, M_WAITOK);
 
 	/* Initialize the hash buckets. */
 	for (i = 0; i < tcp_syncache.hashsize; i++) {
@@ -1099,7 +1099,7 @@ syncache_respond(sc, m)
 	if (m)
 		m_freem(m);
 
-	m = m_gethdr(M_NOWAIT, MT_HEADER);
+	m = m_gethdr(M_DONTWAIT, MT_HEADER);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_data += max_linkhdr;
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index d12c8991e64b..844f279f081b 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -332,7 +332,7 @@ tcp_maketemplate(tp)
 	struct mbuf *m;
 	struct tcptemp *n;
 
-	m = m_get(M_NOWAIT, MT_HEADER);
+	m = m_get(M_DONTWAIT, MT_HEADER);
 	if (m == NULL)
 		return (0);
 	m->m_len = sizeof(struct tcptemp);
@@ -412,7 +412,7 @@ tcp_respond(tp, ipgen, th, m, ack, seq, flags)
 	      }
 	}
 	if (m == 0) {
-		m = m_gethdr(M_NOWAIT, MT_HEADER);
+		m = m_gethdr(M_DONTWAIT, MT_HEADER);
 		if (m == NULL)
 			return;
 		tlen = 0;
@@ -901,7 +901,7 @@ tcp_pcblist(SYSCTL_HANDLER_ARGS)
 	if (error)
 		return error;
 
-	inp_list = malloc(n * sizeof *inp_list, M_TEMP, 0);
+	inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK);
 	if (inp_list == 0)
 		return ENOMEM;
 	
@@ -1495,7 +1495,7 @@ ipsec_hdrsiz_tcp(tp)
 
 	if ((tp == NULL) || ((inp = tp->t_inpcb) == NULL))
 		return 0;
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (!m)
 		return 0;
 
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 7d2a9f37a8af..7c1d8d93baba 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -585,7 +585,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS)
 	if (error)
 		return error;
 
-	inp_list = malloc(n * sizeof *inp_list, M_TEMP, 0);
+	inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK);
 	if (inp_list == 0)
 		return ENOMEM;
 	
@@ -802,7 +802,7 @@ udp_output(inp, m, addr, control, td)
 	 * Calculate data length and get a mbuf
 	 * for UDP and IP headers.
 	 */
-	M_PREPEND(m, sizeof(struct udpiphdr), M_NOWAIT);
+	M_PREPEND(m, sizeof(struct udpiphdr), M_DONTWAIT);
 	if (m == 0) {
 		error = ENOBUFS;
 		goto release;
diff --git a/sys/netinet6/ah_core.c b/sys/netinet6/ah_core.c
index 4b7da313cb9e..cbb620647ff7 100644
--- a/sys/netinet6/ah_core.c
+++ b/sys/netinet6/ah_core.c
@@ -1244,9 +1244,9 @@ again:
 				error = EMSGSIZE;
 				goto fail;
 			}
-			MGET(n, M_NOWAIT, MT_DATA);
+			MGET(n, M_DONTWAIT, MT_DATA);
 			if (n && hlen > MLEN) {
-				MCLGET(n, M_NOWAIT);
+				MCLGET(n, M_DONTWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
@@ -1359,9 +1359,9 @@ again:
 				error = EMSGSIZE;
 				goto fail;
 			}
-			MGET(n, M_NOWAIT, MT_DATA);
+			MGET(n, M_DONTWAIT, MT_DATA);
 			if (n && totlen > MLEN) {
-				MCLGET(n, M_NOWAIT);
+				MCLGET(n, M_DONTWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
@@ -1510,9 +1510,9 @@ ah6_calccksum(m, ahdat, len, algo, sav)
 				error = EMSGSIZE;
 				goto fail;
 			}
-			MGET(n, M_NOWAIT, MT_DATA);
+			MGET(n, M_DONTWAIT, MT_DATA);
 			if (n && newoff - off > MLEN) {
-				MCLGET(n, M_NOWAIT);
+				MCLGET(n, M_DONTWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
@@ -1545,9 +1545,9 @@ ah6_calccksum(m, ahdat, len, algo, sav)
 			error = EMSGSIZE;
 			goto fail;
 		}
-		MGET(n, M_NOWAIT, MT_DATA);
+		MGET(n, M_DONTWAIT, MT_DATA);
 		if (n && newoff - off > MLEN) {
-			MCLGET(n, M_NOWAIT);
+			MCLGET(n, M_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				n = NULL;
diff --git a/sys/netinet6/ah_input.c b/sys/netinet6/ah_input.c
index 94cd6735ecb1..0afdfedc1513 100644
--- a/sys/netinet6/ah_input.c
+++ b/sys/netinet6/ah_input.c
@@ -494,7 +494,7 @@ ah4_input(m, off)
 			 */
 			struct mbuf *n;
 
-			n = m_split(m, off, M_NOWAIT);
+			n = m_split(m, off, M_DONTWAIT);
 			if (n == NULL) {
 				/* m is retained by m_split */
 				goto fail;
@@ -901,7 +901,7 @@ ah6_input(mp, offp, proto)
 			 */
 			struct mbuf *n;
 
-			n = m_split(m, off, M_NOWAIT);
+			n = m_split(m, off, M_DONTWAIT);
 			if (n == NULL) {
 				/* m is retained by m_split */
 				goto fail;
diff --git a/sys/netinet6/ah_output.c b/sys/netinet6/ah_output.c
index 00104ce4ac27..e85075225ce2 100644
--- a/sys/netinet6/ah_output.c
+++ b/sys/netinet6/ah_output.c
@@ -211,7 +211,7 @@ ah4_output(m, isr)
 		panic("ah4_output: assumption failed (first mbuf length)");
 	if (M_LEADINGSPACE(m->m_next) < ahlen) {
 		struct mbuf *n;
-		MGET(n, M_NOWAIT, MT_DATA);
+		MGET(n, M_DONTWAIT, MT_DATA);
 		if (!n) {
 			ipseclog((LOG_DEBUG, "ENOBUFS in ah4_output %d\n",
 			    __LINE__));
@@ -390,13 +390,13 @@ ah6_output(m, nexthdrp, md, isr)
 		return EINVAL;
 	}
 
-	MGET(mah, M_NOWAIT, MT_DATA);
+	MGET(mah, M_DONTWAIT, MT_DATA);
 	if (!mah) {
 		m_freem(m);
 		return ENOBUFS;
 	}
 	if (ahlen > MLEN) {
-		MCLGET(mah, M_NOWAIT);
+		MCLGET(mah, M_DONTWAIT);
 		if ((mah->m_flags & M_EXT) == 0) {
 			m_free(mah);
 			m_freem(m);
diff --git a/sys/netinet6/esp_core.c b/sys/netinet6/esp_core.c
index fe7d27b4319a..db09b9405c40 100644
--- a/sys/netinet6/esp_core.c
+++ b/sys/netinet6/esp_core.c
@@ -760,10 +760,10 @@ esp_cbc_decrypt(m, off, sav, algo, ivlen)
 		if (!d || dn + blocklen > d->m_len) {
 			if (d)
 				dp = d;
-			MGET(d, M_NOWAIT, MT_DATA);
+			MGET(d, M_DONTWAIT, MT_DATA);
 			i = m->m_pkthdr.len - (soff + sn);
 			if (d && i > MLEN) {
-				MCLGET(d, M_NOWAIT);
+				MCLGET(d, M_DONTWAIT);
 				if ((d->m_flags & M_EXT) == 0) {
 					m_free(d);
 					d = NULL;
@@ -970,10 +970,10 @@ esp_cbc_encrypt(m, off, plen, sav, algo, ivlen)
 		if (!d || dn + blocklen > d->m_len) {
 			if (d)
 				dp = d;
-			MGET(d, M_NOWAIT, MT_DATA);
+			MGET(d, M_DONTWAIT, MT_DATA);
 			i = m->m_pkthdr.len - (soff + sn);
 			if (d && i > MLEN) {
-				MCLGET(d, M_NOWAIT);
+				MCLGET(d, M_DONTWAIT);
 				if ((d->m_flags & M_EXT) == 0) {
 					m_free(d);
 					d = NULL;
diff --git a/sys/netinet6/esp_input.c b/sys/netinet6/esp_input.c
index 1584aa484aad..d8de60c0ddf5 100644
--- a/sys/netinet6/esp_input.c
+++ b/sys/netinet6/esp_input.c
@@ -788,7 +788,7 @@ noreplaycheck:
 			 */
 			struct mbuf *n;
 
-			n = m_split(m, off, M_NOWAIT);
+			n = m_split(m, off, M_DONTWAIT);
 			if (n == NULL) {
 				/* m is retained by m_split */
 				goto bad;
@@ -810,12 +810,12 @@ noreplaycheck:
 			struct mbuf *n = NULL;
 			int maxlen;
 
-			MGETHDR(n, M_NOWAIT, MT_HEADER);
+			MGETHDR(n, M_DONTWAIT, MT_HEADER);
 			maxlen = MHLEN;
 			if (n)
 				M_MOVE_PKTHDR(n, m);
 			if (n && n->m_pkthdr.len > maxlen) {
-				MCLGET(n, M_NOWAIT);
+				MCLGET(n, M_DONTWAIT);
 				maxlen = MCLBYTES;
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
diff --git a/sys/netinet6/esp_output.c b/sys/netinet6/esp_output.c
index 5a4932afd3ad..3e89c5d9a517 100644
--- a/sys/netinet6/esp_output.c
+++ b/sys/netinet6/esp_output.c
@@ -340,7 +340,7 @@ esp_output(m, nexthdrp, md, isr, af)
 	 * after:  IP ... ESP IV payload
 	 */
 	if (M_LEADINGSPACE(md) < esphlen || (md->m_flags & M_EXT) != 0) {
-		MGET(n, M_NOWAIT, MT_DATA);
+		MGET(n, M_DONTWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			error = ENOBUFS;
@@ -495,7 +495,7 @@ esp_output(m, nexthdrp, md, isr, af)
 	} else {
 		struct mbuf *nn;
 
-		MGET(nn, M_NOWAIT, MT_DATA);
+		MGET(nn, M_DONTWAIT, MT_DATA);
 		if (!nn) {
 			ipseclog((LOG_DEBUG, "esp%d_output: can't alloc mbuf",
 			    afnumber));
@@ -624,7 +624,7 @@ esp_output(m, nexthdrp, md, isr, af)
 	} else {
 		struct mbuf *nn;
 
-		MGET(nn, M_NOWAIT, MT_DATA);
+		MGET(nn, M_DONTWAIT, MT_DATA);
 		if (!nn) {
 			ipseclog((LOG_DEBUG, "can't alloc mbuf in esp%d_output",
 			    afnumber));
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index c57709a9e285..515a9fb6d6b1 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -233,7 +233,7 @@ frag6_input(mp, offp, proto)
 			goto dropfrag;
 		frag6_nfragpackets++;
 		q6 = (struct ip6q *)malloc(sizeof(struct ip6q), M_FTABLE,
-			M_NOWAIT);
+			M_DONTWAIT);
 		if (q6 == NULL)
 			goto dropfrag;
 		bzero(q6, sizeof(*q6));
@@ -325,7 +325,7 @@ frag6_input(mp, offp, proto)
 	}
 
 	ip6af = (struct ip6asfrag *)malloc(sizeof(struct ip6asfrag), M_FTABLE,
-	    M_NOWAIT);
+	    M_DONTWAIT);
 	if (ip6af == NULL)
 		goto dropfrag;
 	bzero(ip6af, sizeof(*ip6af));
@@ -489,7 +489,7 @@ insert:
 		m->m_len -= sizeof(struct ip6_frag);
 	} else {
 		/* this comes with no copy if the boundary is on cluster */
-		if ((t = m_split(m, offset, M_NOWAIT)) == NULL) {
+		if ((t = m_split(m, offset, M_DONTWAIT)) == NULL) {
 			frag6_remque(q6);
 			free(q6, M_FTABLE);
 			frag6_nfragpackets--;
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 4fa643472132..4cbef25bf73d 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -346,7 +346,7 @@ icmp6_error(m, type, code, param)
 		m_adj(m, ICMPV6_PLD_MAXLEN - m->m_pkthdr.len);
 
 	preplen = sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr);
-	M_PREPEND(m, preplen, M_NOWAIT);
+	M_PREPEND(m, preplen, M_DONTWAIT);
 	if (m && m->m_len < preplen)
 		m = m_pullup(m, preplen);
 	if (m == NULL) {
@@ -562,12 +562,12 @@ icmp6_input(mp, offp, proto)
 				m_freem(n0);
 				break;
 			}
-			MGETHDR(n, M_NOWAIT, n0->m_type);
+			MGETHDR(n, M_DONTWAIT, n0->m_type);
 			n0len = n0->m_pkthdr.len;	/* save for use below */
 			if (n)
 				M_MOVE_PKTHDR(n, n0);
 			if (n && maxlen >= MHLEN) {
-				MCLGET(n, M_NOWAIT);
+				MCLGET(n, M_DONTWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
@@ -624,7 +624,7 @@ icmp6_input(mp, offp, proto)
 			icmp6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_mldquery);
 		else
 			icmp6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_mldreport);
-		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 			/* give up local */
 			mld6_input(m, off);
 			m = NULL;
@@ -685,15 +685,15 @@ icmp6_input(mp, offp, proto)
 				/* Give up remote */
 				break;
 			}
-			MGETHDR(n, M_NOWAIT, m->m_type);
+			MGETHDR(n, M_DONTWAIT, m->m_type);
 			if (n && maxlen > MHLEN) {
-				MCLGET(n, M_NOWAIT);
+				MCLGET(n, M_DONTWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
 				}
 			}
-			if (!m_dup_pkthdr(n, m, M_NOWAIT)) {
+			if (!m_dup_pkthdr(n, m, M_DONTWAIT)) {
 				/*
 				 * Previous code did a blind M_COPY_PKTHDR
 				 * and said "just for rcvif".  If true, then
@@ -749,7 +749,7 @@ icmp6_input(mp, offp, proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_router_solicit))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 			/* give up local */
 			nd6_rs_input(m, off, icmp6len);
 			m = NULL;
@@ -765,7 +765,7 @@ icmp6_input(mp, offp, proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_router_advert))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 			/* give up local */
 			nd6_ra_input(m, off, icmp6len);
 			m = NULL;
@@ -781,7 +781,7 @@ icmp6_input(mp, offp, proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_neighbor_solicit))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 			/* give up local */
 			nd6_ns_input(m, off, icmp6len);
 			m = NULL;
@@ -797,7 +797,7 @@ icmp6_input(mp, offp, proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_neighbor_advert))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 			/* give up local */
 			nd6_na_input(m, off, icmp6len);
 			m = NULL;
@@ -813,7 +813,7 @@ icmp6_input(mp, offp, proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_redirect))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 			/* give up local */
 			icmp6_redirect_input(m, off);
 			m = NULL;
@@ -1395,7 +1395,7 @@ ni6_input(m, off)
 	}
 
 	/* allocate an mbuf to reply. */
-	MGETHDR(n, M_NOWAIT, m->m_type);
+	MGETHDR(n, M_DONTWAIT, m->m_type);
 	if (n == NULL) {
 		m_freem(m);
 		return(NULL);
@@ -1409,7 +1409,7 @@ ni6_input(m, off)
 			 */
 			goto bad;
 		}
-		MCLGET(n, M_NOWAIT);
+		MCLGET(n, M_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			goto bad;
 		}
@@ -1508,9 +1508,9 @@ ni6_nametodns(name, namelen, old)
 		len = MCLBYTES;
 
 	/* because MAXHOSTNAMELEN is usually 256, we use cluster mbuf */
-	MGET(m, M_NOWAIT, MT_DATA);
+	MGET(m, M_DONTWAIT, MT_DATA);
 	if (m && len > MLEN) {
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0)
 			goto fail;
 	}
@@ -2478,9 +2478,9 @@ icmp6_redirect_output(m0, rt)
 #if IPV6_MMTU >= MCLBYTES
 # error assumption failed about IPV6_MMTU and MCLBYTES
 #endif
-	MGETHDR(m, M_NOWAIT, MT_HEADER);
+	MGETHDR(m, M_DONTWAIT, MT_HEADER);
 	if (m && IPV6_MMTU >= MHLEN)
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 	if (!m)
 		goto fail;
 	m->m_pkthdr.rcvif = NULL;
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 8b4384566dfa..945ab65379ab 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1676,7 +1676,7 @@ in6_addmulti(maddr6, ifp, errorp)
 	if (ifma->ifma_protospec != 0)
 		return ifma->ifma_protospec;
 
-	/* XXX - if_addmulti does not use M_NOWAIT.  Can this really be called
+	/* XXX - if_addmulti uses M_WAITOK.  Can this really be called
 	   at interrupt time?  If so, need to fix if_addmulti. XXX */
 	in6m = (struct in6_multi *)malloc(sizeof(*in6m), M_IPMADDR, M_NOWAIT);
 	if (in6m == NULL) {
@@ -2447,7 +2447,7 @@ in6_sin_2_v4mapsin6_in_sock(struct sockaddr **nam)
 	struct sockaddr_in6 *sin6_p;
 
 	MALLOC(sin6_p, struct sockaddr_in6 *, sizeof *sin6_p, M_SONAME,
-	       0);
+	       M_WAITOK);
 	sin_p = (struct sockaddr_in *)*nam;
 	in6_sin_2_v4mapsin6(sin_p, sin6_p);
 	FREE(*nam, M_SONAME);
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index 7376d851cfd4..b5600750debb 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -145,7 +145,7 @@ in6_gif_output(ifp, family, m)
 	}
 	
 	/* prepend new IP header */
-	M_PREPEND(m, sizeof(struct ip6_hdr), M_NOWAIT);
+	M_PREPEND(m, sizeof(struct ip6_hdr), M_DONTWAIT);
 	if (m && m->m_len < sizeof(struct ip6_hdr))
 		m = m_pullup(m, sizeof(struct ip6_hdr));
 	if (m == NULL) {
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index e92fa79a203d..5abcca1b12aa 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -774,7 +774,7 @@ in6_ifattach(ifp, altifp)
 
 		/* grow in6_ifstat */
 		n = if_indexlim * sizeof(struct in6_ifstat *);
-		q = (caddr_t)malloc(n, M_IFADDR, 0);
+		q = (caddr_t)malloc(n, M_IFADDR, M_WAITOK);
 		bzero(q, n);
 		if (in6_ifstat) {
 			bcopy((caddr_t)in6_ifstat, q,
@@ -786,7 +786,7 @@ in6_ifattach(ifp, altifp)
 
 		/* grow icmp6_ifstat */
 		n = if_indexlim * sizeof(struct icmp6_ifstat *);
-		q = (caddr_t)malloc(n, M_IFADDR, 0);
+		q = (caddr_t)malloc(n, M_IFADDR, M_WAITOK);
 		bzero(q, n);
 		if (icmp6_ifstat) {
 			bcopy((caddr_t)icmp6_ifstat, q,
@@ -864,12 +864,12 @@ statinit:
 
 	if (in6_ifstat[ifp->if_index] == NULL) {
 		in6_ifstat[ifp->if_index] = (struct in6_ifstat *)
-			malloc(sizeof(struct in6_ifstat), M_IFADDR, 0);
+			malloc(sizeof(struct in6_ifstat), M_IFADDR, M_WAITOK);
 		bzero(in6_ifstat[ifp->if_index], sizeof(struct in6_ifstat));
 	}
 	if (icmp6_ifstat[ifp->if_index] == NULL) {
 		icmp6_ifstat[ifp->if_index] = (struct icmp6_ifstat *)
-			malloc(sizeof(struct icmp6_ifstat), M_IFADDR, 0);
+			malloc(sizeof(struct icmp6_ifstat), M_IFADDR, M_WAITOK);
 		bzero(icmp6_ifstat[ifp->if_index], sizeof(struct icmp6_ifstat));
 	}
 
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 4a5de69edcfd..963cd9a9a1bb 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -640,7 +640,7 @@ in6_sockaddr(port, addr_p)
 {
 	struct sockaddr_in6 *sin6;
 
-	MALLOC(sin6, struct sockaddr_in6 *, sizeof *sin6, M_SONAME, 0);
+	MALLOC(sin6, struct sockaddr_in6 *, sizeof *sin6, M_SONAME, M_WAITOK);
 	bzero(sin6, sizeof *sin6);
 	sin6->sin6_family = AF_INET6;
 	sin6->sin6_len = sizeof(*sin6);
@@ -671,7 +671,7 @@ in6_v4mapsin6_sockaddr(port, addr_p)
 	sin.sin_addr = *addr_p;
 
 	MALLOC(sin6_p, struct sockaddr_in6 *, sizeof *sin6_p, M_SONAME,
-		0);
+		M_WAITOK);
 	in6_sin_2_v4mapsin6(&sin, sin6_p);
 
 	return (struct sockaddr *)sin6_p;
diff --git a/sys/netinet6/ip6_fw.c b/sys/netinet6/ip6_fw.c
index b1eb2ff3267b..0ef2c52f2b47 100644
--- a/sys/netinet6/ip6_fw.c
+++ b/sys/netinet6/ip6_fw.c
@@ -1109,11 +1109,11 @@ ip6_fw_ctl(int stage, struct mbuf **mm)
 
 	if (stage == IPV6_FW_GET) {
 		struct ip6_fw_chain *fcp = ip6_fw_chain.lh_first;
-		*mm = m = m_get(0, MT_DATA); /* XXX */
+		*mm = m = m_get(M_TRYWAIT, MT_DATA); /* XXX */
 		if (!m)
 			return(ENOBUFS);
 		if (sizeof *(fcp->rule) > MLEN) {
-			MCLGET(m, 0);
+			MCLGET(m, M_TRYWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_free(m);
 				return(ENOBUFS);
@@ -1122,14 +1122,14 @@ ip6_fw_ctl(int stage, struct mbuf **mm)
 		for (; fcp; fcp = fcp->chain.le_next) {
 			bcopy(fcp->rule, m->m_data, sizeof *(fcp->rule));
 			m->m_len = sizeof *(fcp->rule);
-			m->m_next = m_get(0, MT_DATA); /* XXX */
+			m->m_next = m_get(M_TRYWAIT, MT_DATA); /* XXX */
 			if (!m->m_next) {
 				m_freem(*mm);
 				return(ENOBUFS);
 			}
 			m = m->m_next;
 			if (sizeof *(fcp->rule) > MLEN) {
-				MCLGET(m, 0);
+				MCLGET(m, M_TRYWAIT);
 				if ((m->m_flags & M_EXT) == 0) {
 					m_freem(*mm);
 					return(ENOBUFS);
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 01b923613198..1f37baec3873 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -317,11 +317,11 @@ ip6_input(m)
 	if (m && m->m_next != NULL && m->m_pkthdr.len < MCLBYTES) {
 		struct mbuf *n;
 
-		MGETHDR(n, M_NOWAIT, MT_HEADER);
+		MGETHDR(n, M_DONTWAIT, MT_HEADER);
 		if (n)
 			M_MOVE_PKTHDR(n, m);
 		if (n && n->m_pkthdr.len > MHLEN) {
-			MCLGET(n, M_NOWAIT);
+			MCLGET(n, M_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_freem(n);
 				n = NULL;
@@ -1433,9 +1433,9 @@ ip6_pullexthdr(m, off, nxt)
 	else
 		elen = (ip6e.ip6e_len + 1) << 3;
 
-	MGET(n, M_NOWAIT, MT_DATA);
+	MGET(n, M_DONTWAIT, MT_DATA);
 	if (n && elen >= MLEN) {
-		MCLGET(n, M_NOWAIT);
+		MCLGET(n, M_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_free(n);
 			n = NULL;
@@ -1623,7 +1623,7 @@ ip6_addaux(m)
 	if (!tag) {
 		tag = m_tag_get(PACKET_TAG_IPV6_INPUT,
 				sizeof (struct ip6aux),
-				M_NOWAIT);
+				M_DONTWAIT);
 		if (tag)
 			m_tag_prepend(m, tag);
 	}
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 20840651d7cd..f1257d35c550 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1531,7 +1531,7 @@ register_send(ip6, mif, m)
 	++pim6stat.pim6s_snd_registers;
 
 	/* Make a copy of the packet to send to the user level process */
-	MGETHDR(mm, M_NOWAIT, MT_HEADER);
+	MGETHDR(mm, M_DONTWAIT, MT_HEADER);
 	if (mm == NULL)
 		return ENOBUFS;
 	mm->m_pkthdr.rcvif = NULL;
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index b4f56a62463a..64b11aa36a26 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1040,7 +1040,7 @@ skip_ipsec2:;
 		 */
 		m0 = m;
 		for (off = hlen; off < tlen; off += len) {
-			MGETHDR(m, M_NOWAIT, MT_HEADER);
+			MGETHDR(m, M_DONTWAIT, MT_HEADER);
 			if (!m) {
 				error = ENOBUFS;
 				ip6stat.ip6s_odropped++;
@@ -1153,12 +1153,12 @@ ip6_copyexthdr(mp, hdr, hlen)
 	if (hlen > MCLBYTES)
 		return(ENOBUFS); /* XXX */
 
-	MGET(m, M_NOWAIT, MT_DATA);
+	MGET(m, M_DONTWAIT, MT_DATA);
 	if (!m)
 		return(ENOBUFS);
 
 	if (hlen > MLEN) {
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return(ENOBUFS);
@@ -1193,7 +1193,7 @@ ip6_insert_jumboopt(exthdrs, plen)
 	 * Otherwise, use it to store the options.
 	 */
 	if (exthdrs->ip6e_hbh == 0) {
-		MGET(mopt, M_NOWAIT, MT_DATA);
+		MGET(mopt, M_DONTWAIT, MT_DATA);
 		if (mopt == 0)
 			return(ENOBUFS);
 		mopt->m_len = JUMBOOPTLEN;
@@ -1225,9 +1225,9 @@ ip6_insert_jumboopt(exthdrs, plen)
 			 * As a consequence, we must always prepare a cluster
 			 * at this point.
 			 */
-			MGET(n, M_NOWAIT, MT_DATA);
+			MGET(n, M_DONTWAIT, MT_DATA);
 			if (n) {
-				MCLGET(n, M_NOWAIT);
+				MCLGET(n, M_DONTWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_freem(n);
 					n = NULL;
@@ -1282,7 +1282,7 @@ ip6_insertfraghdr(m0, m, hlen, frghdrp)
 
 	if (hlen > sizeof(struct ip6_hdr)) {
 		n = m_copym(m0, sizeof(struct ip6_hdr),
-			    hlen - sizeof(struct ip6_hdr), M_NOWAIT);
+			    hlen - sizeof(struct ip6_hdr), M_DONTWAIT);
 		if (n == 0)
 			return(ENOBUFS);
 		m->m_next = n;
@@ -1304,7 +1304,7 @@ ip6_insertfraghdr(m0, m, hlen, frghdrp)
 		/* allocate a new mbuf for the fragment header */
 		struct mbuf *mfrg;
 
-		MGET(mfrg, M_NOWAIT, MT_DATA);
+		MGET(mfrg, M_DONTWAIT, MT_DATA);
 		if (mfrg == 0)
 			return(ENOBUFS);
 		mfrg->m_len = sizeof(struct ip6_frag);
@@ -1496,7 +1496,7 @@ do { \
 					break;
 				}
 				/* XXX */
-				MGET(m, sopt->sopt_td ? 0 : M_NOWAIT, MT_HEADER);
+				MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_HEADER);
 				if (m == 0) {
 					error = ENOBUFS;
 					break;
@@ -1595,7 +1595,7 @@ do { \
 				if (in6p->in6p_options) {
 					struct mbuf *m;
 					m = m_copym(in6p->in6p_options,
-					    0, M_COPYALL, 0);
+					    0, M_COPYALL, M_TRYWAIT);
 					error = soopt_mcopyout(sopt, m);
 					if (error == 0)
 						m_freem(m);
@@ -1776,7 +1776,7 @@ ip6_pcbopts(pktopt, m, so, sopt)
 #endif
 		ip6_clearpktopts(opt, 1, -1);
 	} else
-		opt = malloc(sizeof(*opt), M_IP6OPT, 0);
+		opt = malloc(sizeof(*opt), M_IP6OPT, M_WAITOK);
 	*pktopt = NULL;
 
 	if (!m || m->m_len == 0) {
@@ -1959,7 +1959,7 @@ ip6_setmoptions(optname, im6op, m)
 		 * allocate one and initialize to default values.
 		 */
 		im6o = (struct ip6_moptions *)
-			malloc(sizeof(*im6o), M_IPMOPTS, 0);
+			malloc(sizeof(*im6o), M_IPMOPTS, M_WAITOK);
 
 		if (im6o == NULL)
 			return(ENOBUFS);
@@ -2129,7 +2129,7 @@ ip6_setmoptions(optname, im6op, m)
 		 * Everything looks good; add a new record to the multicast
 		 * address list for the given interface.
 		 */
-		imm = malloc(sizeof(*imm), M_IPMADDR, 0);
+		imm = malloc(sizeof(*imm), M_IPMADDR, M_WAITOK);
 		if (imm == NULL) {
 			error = ENOBUFS;
 			break;
@@ -2234,7 +2234,7 @@ ip6_getmoptions(optname, im6o, mp)
 {
 	u_int *hlim, *loop, *ifindex;
 
-	*mp = m_get(0, MT_HEADER);		/* XXX */
+	*mp = m_get(M_TRYWAIT, MT_HEADER);		/* XXX */
 
 	switch (optname) {
 
@@ -2333,7 +2333,7 @@ ip6_setpktoptions(control, opt, priv, needcopy)
 				/* XXX: Is it really WAITOK? */
 				opt->ip6po_pktinfo =
 					malloc(sizeof(struct in6_pktinfo),
-					       M_IP6OPT, 0);
+					       M_IP6OPT, M_WAITOK);
 				bcopy(CMSG_DATA(cm), opt->ip6po_pktinfo,
 				    sizeof(struct in6_pktinfo));
 			} else
@@ -2392,7 +2392,7 @@ ip6_setpktoptions(control, opt, priv, needcopy)
 			if (needcopy) {
 				opt->ip6po_nexthop =
 					malloc(*CMSG_DATA(cm),
-					       M_IP6OPT, 0);
+					       M_IP6OPT, M_WAITOK);
 				bcopy(CMSG_DATA(cm),
 				      opt->ip6po_nexthop,
 				      *CMSG_DATA(cm));
@@ -2415,7 +2415,7 @@ ip6_setpktoptions(control, opt, priv, needcopy)
 
 			if (needcopy) {
 				opt->ip6po_hbh =
-					malloc(hbhlen, M_IP6OPT, 0);
+					malloc(hbhlen, M_IP6OPT, M_WAITOK);
 				bcopy(hbh, opt->ip6po_hbh, hbhlen);
 			} else
 				opt->ip6po_hbh = hbh;
@@ -2453,7 +2453,7 @@ ip6_setpktoptions(control, opt, priv, needcopy)
 				newdest = &opt->ip6po_dest2;
 
 			if (needcopy) {
-				*newdest = malloc(destlen, M_IP6OPT, 0);
+				*newdest = malloc(destlen, M_IP6OPT, M_WAITOK);
 				bcopy(dest, *newdest, destlen);
 			} else
 				*newdest = dest;
@@ -2490,7 +2490,7 @@ ip6_setpktoptions(control, opt, priv, needcopy)
 
 			if (needcopy) {
 				opt->ip6po_rthdr = malloc(rthlen, M_IP6OPT,
-							  0);
+							  M_WAITOK);
 				bcopy(rth, opt->ip6po_rthdr, rthlen);
 			} else
 				opt->ip6po_rthdr = rth;
@@ -2570,7 +2570,7 @@ ip6_splithdr(m, exthdrs)
 
 	ip6 = mtod(m, struct ip6_hdr *);
 	if (m->m_len > sizeof(*ip6)) {
-		MGETHDR(mh, M_NOWAIT, MT_HEADER);
+		MGETHDR(mh, M_DONTWAIT, MT_HEADER);
 		if (mh == 0) {
 			m_freem(m);
 			return ENOBUFS;
diff --git a/sys/netinet6/ipcomp_core.c b/sys/netinet6/ipcomp_core.c
index e47779af9725..a6cdea5218ef 100644
--- a/sys/netinet6/ipcomp_core.c
+++ b/sys/netinet6/ipcomp_core.c
@@ -146,9 +146,9 @@ do { \
 	}							\
 								\
 	/* get a fresh reply buffer */				\
-	MGET(n, M_NOWAIT, MT_DATA);				\
+	MGET(n, M_DONTWAIT, MT_DATA);				\
 	if (n) {						\
-		MCLGET(n, M_NOWAIT);				\
+		MCLGET(n, M_DONTWAIT);				\
 	}							\
 	if (!n) {						\
 		error = ENOBUFS;				\
diff --git a/sys/netinet6/ipcomp_output.c b/sys/netinet6/ipcomp_output.c
index 17da4545101a..71e5755c986d 100644
--- a/sys/netinet6/ipcomp_output.c
+++ b/sys/netinet6/ipcomp_output.c
@@ -171,12 +171,12 @@ ipcomp_output(m, nexthdrp, md, isr, af)
 	 * compromise two m_copym().  we will be going through every byte of
 	 * the payload during compression process anyways.
 	 */
-	mcopy = m_copym(m, 0, M_COPYALL, M_NOWAIT);
+	mcopy = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
 	if (mcopy == NULL) {
 		error = ENOBUFS;
 		return 0;
 	}
-	md0 = m_copym(md, 0, M_COPYALL, M_NOWAIT);
+	md0 = m_copym(md, 0, M_COPYALL, M_DONTWAIT);
 	if (md0 == NULL) {
 		m_freem(mcopy);
 		error = ENOBUFS;
@@ -279,7 +279,7 @@ ipcomp_output(m, nexthdrp, md, isr, af)
 	 * after:  IP ... ipcomp payload
 	 */
 	if (M_LEADINGSPACE(md) < complen) {
-		MGET(n, M_NOWAIT, MT_DATA);
+		MGET(n, M_DONTWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			error = ENOBUFS;
diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c
index 4f795fe5f888..f898c0a1cf3c 100644
--- a/sys/netinet6/ipsec.c
+++ b/sys/netinet6/ipsec.c
@@ -2006,7 +2006,7 @@ ipsec4_encapsulate(m, sav)
 	 */
 	if (M_LEADINGSPACE(m->m_next) < hlen) {
 		struct mbuf *n;
-		MGET(n, M_NOWAIT, MT_DATA);
+		MGET(n, M_DONTWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			return ENOBUFS;
@@ -2105,7 +2105,7 @@ ipsec6_encapsulate(m, sav)
 		panic("ipsec6_encapsulate: assumption failed (first mbuf length)");
 	if (M_LEADINGSPACE(m->m_next) < sizeof(struct ip6_hdr)) {
 		struct mbuf *n;
-		MGET(n, M_NOWAIT, MT_DATA);
+		MGET(n, M_DONTWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			return ENOBUFS;
@@ -3119,7 +3119,7 @@ ipsec4_splithdr(m)
 	hlen = ip->ip_hl << 2;
 #endif
 	if (m->m_len > hlen) {
-		MGETHDR(mh, M_NOWAIT, MT_HEADER);
+		MGETHDR(mh, M_DONTWAIT, MT_HEADER);
 		if (!mh) {
 			m_freem(m);
 			return NULL;
@@ -3155,7 +3155,7 @@ ipsec6_splithdr(m)
 	ip6 = mtod(m, struct ip6_hdr *);
 	hlen = sizeof(struct ip6_hdr);
 	if (m->m_len > hlen) {
-		MGETHDR(mh, M_NOWAIT, MT_HEADER);
+		MGETHDR(mh, M_DONTWAIT, MT_HEADER);
 		if (!mh) {
 			m_freem(m);
 			return NULL;
@@ -3366,16 +3366,16 @@ ipsec_copypkt(m)
 				struct mbuf *mm;
 
 				if (n->m_flags & M_PKTHDR) {
-					MGETHDR(mnew, M_NOWAIT, MT_HEADER);
+					MGETHDR(mnew, M_DONTWAIT, MT_HEADER);
 					if (mnew == NULL)
 						goto fail;
-					if (!m_dup_pkthdr(mnew, n, M_NOWAIT)) {
+					if (!m_dup_pkthdr(mnew, n, M_DONTWAIT)) {
 						m_free(mnew);
 						goto fail;
 					}
 				}
 				else {
-					MGET(mnew, M_NOWAIT, MT_DATA);
+					MGET(mnew, M_DONTWAIT, MT_DATA);
 					if (mnew == NULL)
 						goto fail;
 				}
@@ -3399,7 +3399,7 @@ ipsec_copypkt(m)
 					if (remain <= (mm->m_flags & M_PKTHDR ? MHLEN : MLEN))
 						len = remain;
 					else { /* allocate a cluster */
-						MCLGET(mm, M_NOWAIT);
+						MCLGET(mm, M_DONTWAIT);
 						if (!(mm->m_flags & M_EXT)) {
 							m_free(mm);
 							goto fail;
@@ -3419,7 +3419,7 @@ ipsec_copypkt(m)
 						break;
 
 					/* need another mbuf */
-					MGETHDR(mn, M_NOWAIT, MT_HEADER);
+					MGETHDR(mn, M_DONTWAIT, MT_HEADER);
 					if (mn == NULL)
 						goto fail;
 					mn->m_pkthdr.rcvif = NULL;
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index fce6e1bc7b80..61c0e0c0a730 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -400,10 +400,10 @@ mld6_sendpkt(in6m, type, dst)
 	 * We allocate 2 mbufs and make chain in advance because
 	 * it is more convenient when inserting the hop-by-hop option later.
 	 */
-	MGETHDR(mh, M_NOWAIT, MT_HEADER);
+	MGETHDR(mh, M_DONTWAIT, MT_HEADER);
 	if (mh == NULL)
 		return;
-	MGET(md, M_NOWAIT, MT_DATA);
+	MGET(md, M_DONTWAIT, MT_DATA);
 	if (md == NULL) {
 		m_free(mh);
 		return;
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 3e1fccf82590..b14fc2446acb 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -164,7 +164,7 @@ nd6_ifattach(ifp)
 
 		/* grow nd_ifinfo */
 		n = nd_ifinfo_indexlim * sizeof(struct nd_ifinfo);
-		q = (caddr_t)malloc(n, M_IP6NDP, 0);
+		q = (caddr_t)malloc(n, M_IP6NDP, M_WAITOK);
 		bzero(q, n);
 		if (nd_ifinfo) {
 			bcopy((caddr_t)nd_ifinfo, q, n/2);
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index 4bf18200515e..16bfbb41aea8 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -362,9 +362,9 @@ nd6_ns_output(ifp, daddr6, taddr6, ln, dad)
 		return;
 	}
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m && max_linkhdr + maxlen >= MHLEN) {
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			m = NULL;
@@ -847,9 +847,9 @@ nd6_na_output(ifp, daddr6, taddr6, flags, tlladdr, sdl0)
 		return;
 	}
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m && max_linkhdr + maxlen >= MHLEN) {
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			m = NULL;
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index abb7358a5c9d..540533ba019a 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -372,7 +372,7 @@ rip6_output(m, va_alist)
 		code = icmp6->icmp6_code;
 	}
 
-	M_PREPEND(m, sizeof(*ip6), 0);
+	M_PREPEND(m, sizeof(*ip6), M_TRYWAIT);
 	ip6 = mtod(m, struct ip6_hdr *);
 
 	/*
diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c
index 10637e35444d..0c32da8c4761 100644
--- a/sys/netinet6/scope6.c
+++ b/sys/netinet6/scope6.c
@@ -75,7 +75,7 @@ scope6_ifattach(ifp)
 		/* grow scope index array */
 		n = if_indexlim * sizeof(struct scope6_id);
 		/* XXX: need new malloc type? */
-		q = (caddr_t)malloc(n, M_IFADDR, 0);
+		q = (caddr_t)malloc(n, M_IFADDR, M_WAITOK);
 		bzero(q, n);
 		if (scope6_ids) {
 			bcopy((caddr_t)scope6_ids, q, n/2);
diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index 659eb0da5ef3..1de45f0b6ddc 100644
--- a/sys/netinet6/udp6_output.c
+++ b/sys/netinet6/udp6_output.c
@@ -248,7 +248,7 @@ udp6_output(in6p, m, addr6, control, td)
 	 * Calculate data length and get a mbuf
 	 * for UDP and IP6 headers.
 	 */
-	M_PREPEND(m, hlen + sizeof(struct udphdr), M_NOWAIT);
+	M_PREPEND(m, hlen + sizeof(struct udphdr), M_DONTWAIT);
 	if (m == 0) {
 		error = ENOBUFS;
 		goto release;
diff --git a/sys/netipsec/ipsec_mbuf.c b/sys/netipsec/ipsec_mbuf.c
index 089a4b4e5ca4..7fa291b5a9c7 100644
--- a/sys/netipsec/ipsec_mbuf.c
+++ b/sys/netipsec/ipsec_mbuf.c
@@ -105,20 +105,20 @@ m_clone(struct mbuf *m0)
 			 * because M_MOVE_PKTHDR will smash the data
 			 * pointer and drop the M_EXT marker.
 			 */
-			MGETHDR(n, M_NOWAIT, m->m_type);
+			MGETHDR(n, M_DONTWAIT, m->m_type);
 			if (n == NULL) {
 				m_freem(m0);
 				return (NULL);
 			}
 			M_MOVE_PKTHDR(n, m);
-			MCLGET(n, M_NOWAIT);
+			MCLGET(n, M_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				m_freem(m0);
 				return (NULL);
 			}
 		} else {
-			n = m_getcl(M_NOWAIT, m->m_type, m->m_flags);
+			n = m_getcl(M_DONTWAIT, m->m_type, m->m_flags);
 			if (n == NULL) {
 				m_freem(m0);
 				return (NULL);
@@ -150,7 +150,7 @@ m_clone(struct mbuf *m0)
 				break;
 			off += cc;
 
-			n = m_getcl(M_NOWAIT, m->m_type, m->m_flags);
+			n = m_getcl(M_DONTWAIT, m->m_type, m->m_flags);
 			if (n == NULL) {
 				m_freem(mfirst);
 				m_freem(m0);
@@ -210,7 +210,7 @@ m_makespace(struct mbuf *m0, int skip, int hlen, int *off)
 		 *
 		 * NB: this ignores mbuf types.
 		 */
-		MGET(n, M_NOWAIT, MT_DATA);
+		MGET(n, M_DONTWAIT, MT_DATA);
 		if (n == NULL)
 			return (NULL);
 		n->m_next = m->m_next;		/* splice new mbuf */
@@ -238,7 +238,7 @@ m_makespace(struct mbuf *m0, int skip, int hlen, int *off)
 			if (remain + hlen > M_TRAILINGSPACE(n)) {
 				struct mbuf *n2;
 
-				MGET(n2, M_NOWAIT, MT_DATA);
+				MGET(n2, M_DONTWAIT, MT_DATA);
 				/* NB: new mbuf is on chain, let caller free */
 				if (n2 == NULL)
 					return (NULL);
@@ -328,7 +328,7 @@ KASSERT(m0->m_next != NULL, ("m_pad: m0 null, len %u m_len %u", len, m0->m_len))
 
 	if (pad > M_TRAILINGSPACE(m0)) {
 		/* Add an mbuf to the chain. */
-		MGET(m1, M_NOWAIT, MT_DATA);
+		MGET(m1, M_DONTWAIT, MT_DATA);
 		if (m1 == 0) {
 			m_freem(m0);
 			DPRINTF(("m_pad: unable to get extra mbuf\n"));
diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c
index aa53f9ca3eaa..3748747abe9e 100644
--- a/sys/netipsec/ipsec_output.c
+++ b/sys/netipsec/ipsec_output.c
@@ -469,7 +469,7 @@ ipsec6_splithdr(struct mbuf *m)
 	ip6 = mtod(m, struct ip6_hdr *);
 	hlen = sizeof(struct ip6_hdr);
 	if (m->m_len > hlen) {
-		MGETHDR(mh, M_NOWAIT, MT_HEADER);
+		MGETHDR(mh, M_DONTWAIT, MT_HEADER);
 		if (!mh) {
 			m_freem(m);
 			return NULL;
@@ -580,7 +580,7 @@ ipsec6_encapsulate(struct mbuf *m, struct secasvar *sav)
 	plen = m->m_pkthdr.len;
 	if (M_LEADINGSPACE(m->m_next) < sizeof(struct ip6_hdr)) {
 		struct mbuf *n;
-		MGET(n, M_NOWAIT, MT_DATA);
+		MGET(n, M_DONTWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			return ENOBUFS;
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index af525c305b65..de0362ef3ba1 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -1627,7 +1627,7 @@ key_gather_mbuf(m, mhp, ndeep, nitem, va_alist)
 			if (len > MHLEN)
 				panic("assumption failed");
 #endif
-			MGETHDR(n, M_NOWAIT, MT_DATA);
+			MGETHDR(n, M_DONTWAIT, MT_DATA);
 			if (!n)
 				goto fail;
 			n->m_len = len;
@@ -1646,7 +1646,7 @@ key_gather_mbuf(m, mhp, ndeep, nitem, va_alist)
 			    mtod(n, caddr_t));
 		} else {
 			n = m_copym(m, mhp->extoff[idx], mhp->extlen[idx],
-			    M_NOWAIT);
+			    M_DONTWAIT);
 		}
 		if (n == NULL)
 			goto fail;
@@ -2079,9 +2079,9 @@ key_spddelete2(so, m, mhp)
 
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
-	MGETHDR(n, M_NOWAIT, MT_DATA);
+	MGETHDR(n, M_DONTWAIT, MT_DATA);
 	if (n && len > MHLEN) {
-		MCLGET(n, M_NOWAIT);
+		MCLGET(n, M_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -2103,7 +2103,7 @@ key_spddelete2(so, m, mhp)
 #endif
 
 	n->m_next = m_copym(m, mhp->extoff[SADB_X_EXT_POLICY],
-	    mhp->extlen[SADB_X_EXT_POLICY], M_NOWAIT);
+	    mhp->extlen[SADB_X_EXT_POLICY], M_DONTWAIT);
 	if (!n->m_next) {
 		m_freem(n);
 		return key_senderror(so, m, ENOBUFS);
@@ -3329,7 +3329,7 @@ key_setdumpsa(sav, type, satype, seq, pid)
 		if ((!m && !p) || (m && p))
 			goto fail;
 		if (p && tres) {
-			M_PREPEND(tres, l, M_NOWAIT);
+			M_PREPEND(tres, l, M_DONTWAIT);
 			if (!tres)
 				goto fail;
 			bcopy(p, mtod(tres, caddr_t), l);
@@ -3388,9 +3388,9 @@ key_setsadbmsg(type, tlen, satype, seq, pid, reserved)
 	len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
 	if (len > MCLBYTES)
 		return NULL;
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m && len > MHLEN) {
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_freem(m);
 			m = NULL;
@@ -4501,9 +4501,9 @@ key_getspi(so, m, mhp)
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
 
-	MGETHDR(n, M_NOWAIT, MT_DATA);
+	MGETHDR(n, M_DONTWAIT, MT_DATA);
 	if (len > MHLEN) {
-		MCLGET(n, M_NOWAIT);
+		MCLGET(n, M_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -5390,7 +5390,7 @@ key_getcomb_esp()
 			KASSERT(l <= MLEN,
 				("key_getcomb_esp: l=%u > MLEN=%lu",
 				l, (u_long) MLEN));
-			MGET(m, M_NOWAIT, MT_DATA);
+			MGET(m, M_DONTWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
@@ -5492,14 +5492,14 @@ key_getcomb_ah()
 			KASSERT(l <= MLEN,
 				("key_getcomb_ah: l=%u > MLEN=%lu",
 				l, (u_long) MLEN));
-			MGET(m, M_NOWAIT, MT_DATA);
+			MGET(m, M_DONTWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, M_NOWAIT);
+			M_PREPEND(m, l, M_DONTWAIT);
 		if (!m)
 			return NULL;
 
@@ -5537,14 +5537,14 @@ key_getcomb_ipcomp()
 			KASSERT(l <= MLEN,
 				("key_getcomb_ipcomp: l=%u > MLEN=%lu",
 				l, (u_long) MLEN));
-			MGET(m, M_NOWAIT, MT_DATA);
+			MGET(m, M_DONTWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, M_NOWAIT);
+			M_PREPEND(m, l, M_DONTWAIT);
 		if (!m)
 			return NULL;
 
@@ -5588,7 +5588,7 @@ key_getprop(saidx)
 
 	if (!m)
 		return NULL;
-	M_PREPEND(m, l, M_NOWAIT);
+	M_PREPEND(m, l, M_DONTWAIT);
 	if (!m)
 		return NULL;
 
@@ -6093,9 +6093,9 @@ key_register(so, m, mhp)
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
 
-	MGETHDR(n, M_NOWAIT, MT_DATA);
+	MGETHDR(n, M_DONTWAIT, MT_DATA);
 	if (len > MHLEN) {
-		MCLGET(n, M_NOWAIT);
+		MCLGET(n, M_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -6659,9 +6659,9 @@ key_parse(m, so)
 	if (m->m_next) {
 		struct mbuf *n;
 
-		MGETHDR(n, M_NOWAIT, MT_DATA);
+		MGETHDR(n, M_DONTWAIT, MT_DATA);
 		if (n && m->m_pkthdr.len > MHLEN) {
-			MCLGET(n, M_NOWAIT);
+			MCLGET(n, M_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				n = NULL;
@@ -7259,9 +7259,9 @@ key_alloc_mbuf(l)
 
 	len = l;
 	while (len > 0) {
-		MGET(n, M_NOWAIT, MT_DATA);
+		MGET(n, M_DONTWAIT, MT_DATA);
 		if (n && len > MLEN)
-			MCLGET(n, M_NOWAIT);
+			MCLGET(n, M_DONTWAIT);
 		if (!n) {
 			m_freem(m);
 			return NULL;
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c
index 7ae835a21d8b..d61c15b4ba1a 100644
--- a/sys/netipsec/keysock.c
+++ b/sys/netipsec/keysock.c
@@ -152,7 +152,7 @@ key_sendup0(rp, m, promisc)
 	if (promisc) {
 		struct sadb_msg *pmsg;
 
-		M_PREPEND(m, sizeof(struct sadb_msg), M_NOWAIT);
+		M_PREPEND(m, sizeof(struct sadb_msg), M_DONTWAIT);
 		if (m && m->m_len < sizeof(struct sadb_msg))
 			m = m_pullup(m, sizeof(struct sadb_msg));
 		if (!m) {
@@ -223,10 +223,10 @@ key_sendup(so, msg, len, target)
 	m = mprev = NULL;
 	while (tlen > 0) {
 		if (tlen == len) {
-			MGETHDR(n, M_NOWAIT, MT_DATA);
+			MGETHDR(n, M_DONTWAIT, MT_DATA);
 			n->m_len = MHLEN;
 		} else {
-			MGET(n, M_NOWAIT, MT_DATA);
+			MGET(n, M_DONTWAIT, MT_DATA);
 			n->m_len = MLEN;
 		}
 		if (!n) {
@@ -234,7 +234,7 @@ key_sendup(so, msg, len, target)
 			return ENOBUFS;
 		}
 		if (tlen >= MCLBYTES) {	/*XXX better threshold? */
-			MCLGET(n, M_NOWAIT);
+			MCLGET(n, M_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				m_freem(m);
@@ -402,7 +402,7 @@ key_attach(struct socket *so, int proto, struct thread *td)
 
 	if (sotorawcb(so) != 0)
 		return EISCONN;	/* XXX panic? */
-	kp = (struct keycb *)malloc(sizeof *kp, M_PCB, M_ZERO); /* XXX */
+	kp = (struct keycb *)malloc(sizeof *kp, M_PCB, M_WAITOK|M_ZERO); /* XXX */
 	if (kp == 0)
 		return ENOBUFS;
 
diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c
index ece649d25496..f91d3cf54b82 100644
--- a/sys/netipsec/xform_esp.c
+++ b/sys/netipsec/xform_esp.c
@@ -190,7 +190,7 @@ esp_init(struct secasvar *sav, struct xformsw *xsp)
 	 *      compromise is to force it to zero here.
 	 */
 	sav->ivlen = (txform == &enc_xform_null ? 0 : txform->blocksize);
-	sav->iv = (caddr_t) malloc(sav->ivlen, M_XDATA, 0);
+	sav->iv = (caddr_t) malloc(sav->ivlen, M_XDATA, M_WAITOK);
 	if (sav->iv == NULL) {
 		DPRINTF(("esp_init: no memory for IV\n"));
 		return EINVAL;
diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c
index 6672b62de4c5..9d49a3e55948 100644
--- a/sys/netipsec/xform_ipip.c
+++ b/sys/netipsec/xform_ipip.c
@@ -441,7 +441,7 @@ ipip_output(
 			goto bad;
 		}
 
-		M_PREPEND(m, sizeof(struct ip), M_NOWAIT);
+		M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
 		if (m == 0) {
 			DPRINTF(("ipip_output: M_PREPEND failed\n"));
 			ipipstat.ipips_hdrops++;
@@ -529,7 +529,7 @@ ipip_output(
 		if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst))
 			ip6->ip6_dst.s6_addr16[1] = 0;
 
-		M_PREPEND(m, sizeof(struct ip6_hdr), M_NOWAIT);
+		M_PREPEND(m, sizeof(struct ip6_hdr), M_DONTWAIT);
 		if (m == 0) {
 			DPRINTF(("ipip_output: M_PREPEND failed\n"));
 			ipipstat.ipips_hdrops++;
diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c
index 3583670c6bd4..01628312c3bf 100644
--- a/sys/netipx/ipx.c
+++ b/sys/netipx/ipx.c
@@ -130,7 +130,7 @@ ipx_control(so, cmd, data, ifp, td)
 		if (ia == NULL) {
 			oia = (struct ipx_ifaddr *)
 				malloc(sizeof(*ia), M_IFADDR,
-				M_ZERO);
+				M_WAITOK | M_ZERO);
 			if (oia == NULL)
 				return (ENOBUFS);
 			if ((ia = ipx_ifaddr) != NULL) {
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index b3d95d214ad8..3410a41189d6 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -483,7 +483,7 @@ struct ifnet *ifp;
 		if (m0 != NULL) {
 			register struct ipx *ipx;
 
-			M_PREPEND(m0, sizeof(*ipx), M_NOWAIT);
+			M_PREPEND(m0, sizeof(*ipx), M_DONTWAIT);
 			if (m0 == NULL)
 				continue;
 			ipx = mtod(m0, struct ipx *);
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c
index 59e769ba1e2f..6f5d74c2ba87 100644
--- a/sys/netipx/ipx_ip.c
+++ b/sys/netipx/ipx_ip.c
@@ -175,7 +175,7 @@ ipxip_input(m, hlen)
 		if (ipxip_lastin != NULL) {
 			m_freem(ipxip_lastin);
 		}
-		ipxip_lastin = m_copym(m, 0, (int)M_COPYALL, M_NOWAIT);
+		ipxip_lastin = m_copym(m, 0, (int)M_COPYALL, M_DONTWAIT);
 	}
 	/*
 	 * Get IP and IPX header together in first mbuf.
@@ -256,7 +256,7 @@ ipxipoutput(ifp, m, dst, rt)
 	/* following clause not necessary on vax */
 	if (3 & (intptr_t)m->m_data) {
 		/* force longword alignment of ip hdr */
-		struct mbuf *m0 = m_gethdr(MT_HEADER, M_NOWAIT);
+		struct mbuf *m0 = m_gethdr(MT_HEADER, M_DONTWAIT);
 		if (m0 == NULL) {
 			m_freem(m);
 			return (ENOBUFS);
@@ -269,7 +269,7 @@ ipxipoutput(ifp, m, dst, rt)
 		m->m_flags &= ~M_PKTHDR;
 		m = m0;
 	} else {
-		M_PREPEND(m, sizeof(struct ip), M_NOWAIT);
+		M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
 		if (m == NULL)
 			return (ENOBUFS);
 	}
diff --git a/sys/netipx/ipx_outputfl.c b/sys/netipx/ipx_outputfl.c
index 0436847f237a..9f608dd42bdd 100644
--- a/sys/netipx/ipx_outputfl.c
+++ b/sys/netipx/ipx_outputfl.c
@@ -244,7 +244,7 @@ ipx_output_type20(m)
 			if(ipx->ipx_sum != 0xffff)
 				ipx->ipx_sum = ipx_cksum(m, ntohs(ipx->ipx_len));
 
-			m1 = m_copym(m, 0, M_COPYALL, M_NOWAIT);
+			m1 = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
 			if(m1) {
 				error = (*ifp->if_output)(ifp, m1,
 					(struct sockaddr *)&dst, NULL);
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index bf0580842bba..f0c803a90b9a 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -218,7 +218,7 @@ ipx_output(ipxp, m0)
 			(m->m_len + m->m_data < &m->m_dat[MLEN])) {
 			mtod(m, char*)[m->m_len++] = 0;
 		} else {
-			struct mbuf *m1 = m_get(M_NOWAIT, MT_DATA);
+			struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
 
 			if (m1 == NULL) {
 				m_freem(m0);
@@ -239,7 +239,7 @@ ipx_output(ipxp, m0)
 	if (ipxp->ipxp_flags & IPXP_RAWOUT) {
 		ipx = mtod(m, struct ipx *);
 	} else {
-		M_PREPEND(m, sizeof(struct ipx), M_NOWAIT);
+		M_PREPEND(m, sizeof(struct ipx), M_DONTWAIT);
 		if (m == NULL)
 			return (ENOBUFS);
 		ipx = mtod(m, struct ipx *);
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index 92402c81a8ec..189d741d09fa 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -579,7 +579,7 @@ present:
 				spx_newchecks[4]++;
 				if (dt != cb->s_rhdr.spx_dt) {
 					struct mbuf *mm =
-					   m_getclr(M_NOWAIT, MT_CONTROL);
+					   m_getclr(M_DONTWAIT, MT_CONTROL);
 					spx_newchecks[0]++;
 					if (mm != NULL) {
 						u_short *s =
@@ -755,7 +755,7 @@ spx_output(cb, m0)
 					 * from usrreq(), so it is OK to
 					 * block.
 					 */
-					m = m_copym(m0, 0, mtu, 0);
+					m = m_copym(m0, 0, mtu, M_TRYWAIT);
 					if (cb->s_flags & SF_NEWCALL) {
 					    struct mbuf *mm = m;
 					    spx_newchecks[7]++;
@@ -785,7 +785,7 @@ spx_output(cb, m0)
 			if (M_TRAILINGSPACE(m) >= 1)
 				m->m_len++;
 			else {
-				struct mbuf *m1 = m_get(M_NOWAIT, MT_DATA);
+				struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
 
 				if (m1 == NULL) {
 					m_freem(m0);
@@ -796,7 +796,7 @@ spx_output(cb, m0)
 				m->m_next = m1;
 			}
 		}
-		m = m_gethdr(M_NOWAIT, MT_HEADER);
+		m = m_gethdr(M_DONTWAIT, MT_HEADER);
 		if (m == NULL) {
 			m_freem(m0);
 			return (ENOBUFS);
@@ -1009,7 +1009,7 @@ send:
 			spxstat.spxs_sndprobe++;
 		if (cb->s_flags & SF_ACKNOW)
 			spxstat.spxs_sndacks++;
-		m = m_gethdr(M_NOWAIT, MT_HEADER);
+		m = m_gethdr(M_DONTWAIT, MT_HEADER);
 		if (m == NULL)
 			return (ENOBUFS);
 		/*
@@ -1342,7 +1342,7 @@ spx_attach(so, proto, td)
 	}
 	sb = &so->so_snd;
 
-	mm = m_getclr(M_NOWAIT, MT_HEADER);
+	mm = m_getclr(M_DONTWAIT, MT_HEADER);
 	if (mm == NULL) {
 		FREE(cb, M_PCB);
 		error = ENOBUFS;
diff --git a/sys/netkey/key.c b/sys/netkey/key.c
index b987a829e2b3..8a1bc16b3121 100644
--- a/sys/netkey/key.c
+++ b/sys/netkey/key.c
@@ -1662,7 +1662,7 @@ key_gather_mbuf(m, mhp, ndeep, nitem, va_alist)
 			if (len > MHLEN)
 				panic("assumption failed");
 #endif
-			MGETHDR(n, M_NOWAIT, MT_DATA);
+			MGETHDR(n, M_DONTWAIT, MT_DATA);
 			if (!n)
 				goto fail;
 			n->m_len = len;
@@ -1681,7 +1681,7 @@ key_gather_mbuf(m, mhp, ndeep, nitem, va_alist)
 			    mtod(n, caddr_t));
 		} else {
 			n = m_copym(m, mhp->extoff[idx], mhp->extlen[idx],
-			    M_NOWAIT);
+			    M_DONTWAIT);
 		}
 		if (n == NULL)
 			goto fail;
@@ -2117,9 +2117,9 @@ key_spddelete2(so, m, mhp)
 
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
-	MGETHDR(n, M_NOWAIT, MT_DATA);
+	MGETHDR(n, M_DONTWAIT, MT_DATA);
 	if (n && len > MHLEN) {
-		MCLGET(n, M_NOWAIT);
+		MCLGET(n, M_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -2141,7 +2141,7 @@ key_spddelete2(so, m, mhp)
 #endif
 
 	n->m_next = m_copym(m, mhp->extoff[SADB_X_EXT_POLICY],
-	    mhp->extlen[SADB_X_EXT_POLICY], M_NOWAIT);
+	    mhp->extlen[SADB_X_EXT_POLICY], M_DONTWAIT);
 	if (!n->m_next) {
 		m_freem(n);
 		return key_senderror(so, m, ENOBUFS);
@@ -3488,7 +3488,7 @@ key_setdumpsa(sav, type, satype, seq, pid)
 		if ((!m && !p) || (m && p))
 			goto fail;
 		if (p && tres) {
-			M_PREPEND(tres, l, M_NOWAIT);
+			M_PREPEND(tres, l, M_DONTWAIT);
 			if (!tres)
 				goto fail;
 			bcopy(p, mtod(tres, caddr_t), l);
@@ -3547,9 +3547,9 @@ key_setsadbmsg(type, tlen, satype, seq, pid, reserved)
 	len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
 	if (len > MCLBYTES)
 		return NULL;
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m && len > MHLEN) {
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_freem(m);
 			m = NULL;
@@ -4682,9 +4682,9 @@ key_getspi(so, m, mhp)
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
 
-	MGETHDR(n, M_NOWAIT, MT_DATA);
+	MGETHDR(n, M_DONTWAIT, MT_DATA);
 	if (len > MHLEN) {
-		MCLGET(n, M_NOWAIT);
+		MCLGET(n, M_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -5573,7 +5573,7 @@ key_getcomb_esp()
 			if (l > MLEN)
 				panic("assumption failed in key_getcomb_esp");
 #endif
-			MGET(m, M_NOWAIT, MT_DATA);
+			MGET(m, M_DONTWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
@@ -5657,14 +5657,14 @@ key_getcomb_ah()
 			if (l > MLEN)
 				panic("assumption failed in key_getcomb_ah");
 #endif
-			MGET(m, M_NOWAIT, MT_DATA);
+			MGET(m, M_DONTWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, M_NOWAIT);
+			M_PREPEND(m, l, M_DONTWAIT);
 		if (!m)
 			return NULL;
 
@@ -5703,14 +5703,14 @@ key_getcomb_ipcomp()
 			if (l > MLEN)
 				panic("assumption failed in key_getcomb_ipcomp");
 #endif
-			MGET(m, M_NOWAIT, MT_DATA);
+			MGET(m, M_DONTWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, M_NOWAIT);
+			M_PREPEND(m, l, M_DONTWAIT);
 		if (!m)
 			return NULL;
 
@@ -5756,7 +5756,7 @@ key_getprop(saidx)
 
 	if (!m)
 		return NULL;
-	M_PREPEND(m, l, M_NOWAIT);
+	M_PREPEND(m, l, M_DONTWAIT);
 	if (!m)
 		return NULL;
 
@@ -6273,9 +6273,9 @@ key_register(so, m, mhp)
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
 
-	MGETHDR(n, M_NOWAIT, MT_DATA);
+	MGETHDR(n, M_DONTWAIT, MT_DATA);
 	if (len > MHLEN) {
-		MCLGET(n, M_NOWAIT);
+		MCLGET(n, M_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -6847,9 +6847,9 @@ key_parse(m, so)
 	if (m->m_next) {
 		struct mbuf *n;
 
-		MGETHDR(n, M_NOWAIT, MT_DATA);
+		MGETHDR(n, M_DONTWAIT, MT_DATA);
 		if (n && m->m_pkthdr.len > MHLEN) {
-			MCLGET(n, M_NOWAIT);
+			MCLGET(n, M_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				n = NULL;
@@ -7474,9 +7474,9 @@ key_alloc_mbuf(l)
 
 	len = l;
 	while (len > 0) {
-		MGET(n, M_NOWAIT, MT_DATA);
+		MGET(n, M_DONTWAIT, MT_DATA);
 		if (n && len > MLEN)
-			MCLGET(n, M_NOWAIT);
+			MCLGET(n, M_DONTWAIT);
 		if (!n) {
 			m_freem(m);
 			return NULL;
diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c
index 13394ac24b06..dbc48a85e111 100644
--- a/sys/netkey/keysock.c
+++ b/sys/netkey/keysock.c
@@ -148,7 +148,7 @@ key_sendup0(rp, m, promisc)
 	if (promisc) {
 		struct sadb_msg *pmsg;
 
-		M_PREPEND(m, sizeof(struct sadb_msg), M_NOWAIT);
+		M_PREPEND(m, sizeof(struct sadb_msg), M_DONTWAIT);
 		if (m && m->m_len < sizeof(struct sadb_msg))
 			m = m_pullup(m, sizeof(struct sadb_msg));
 		if (!m) {
@@ -219,10 +219,10 @@ key_sendup(so, msg, len, target)
 	m = mprev = NULL;
 	while (tlen > 0) {
 		if (tlen == len) {
-			MGETHDR(n, M_NOWAIT, MT_DATA);
+			MGETHDR(n, M_DONTWAIT, MT_DATA);
 			n->m_len = MHLEN;
 		} else {
-			MGET(n, M_NOWAIT, MT_DATA);
+			MGET(n, M_DONTWAIT, MT_DATA);
 			n->m_len = MLEN;
 		}
 		if (!n) {
@@ -230,7 +230,7 @@ key_sendup(so, msg, len, target)
 			return ENOBUFS;
 		}
 		if (tlen >= MCLBYTES) {	/*XXX better threshold? */
-			MCLGET(n, M_NOWAIT);
+			MCLGET(n, M_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				m_freem(m);
@@ -398,7 +398,7 @@ key_attach(struct socket *so, int proto, struct thread *td)
 
 	if (sotorawcb(so) != 0)
 		return EISCONN;	/* XXX panic? */
-	kp = (struct keycb *)malloc(sizeof *kp, M_PCB, 0); /* XXX */
+	kp = (struct keycb *)malloc(sizeof *kp, M_PCB, M_WAITOK); /* XXX */
 	if (kp == 0)
 		return ENOBUFS;
 	bzero(kp, sizeof *kp);
diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c
index 24b65edee46c..e0535b6d5fbf 100644
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@@ -109,7 +109,7 @@ natm_usr_attach(struct socket *so, int proto, d_thread_t *p)
           goto out;
     }
 
-    so->so_pcb = (caddr_t) (npcb = npcb_alloc(0));
+    so->so_pcb = (caddr_t) (npcb = npcb_alloc(M_WAITOK));
     npcb->npcb_socket = so;
  out:
     splx(s);
@@ -300,7 +300,7 @@ natm_usr_send(struct socket *so, int flags, struct mbuf *m,
      * send the data.   we must put an atm_pseudohdr on first
      */
 
-    M_PREPEND(m, sizeof(*aph), 0);
+    M_PREPEND(m, sizeof(*aph), M_TRYWAIT);
     if (m == NULL) {
         error = ENOBUFS;
 	goto out;
@@ -469,7 +469,7 @@ struct proc *p;
           break;
       }
 
-      so->so_pcb = (caddr_t) (npcb = npcb_alloc(0));
+      so->so_pcb = (caddr_t) (npcb = npcb_alloc(M_WAITOK));
       npcb->npcb_socket = so;
 
       break;
@@ -599,7 +599,7 @@ struct proc *p;
        * send the data.   we must put an atm_pseudohdr on first
        */
 
-      M_PREPEND(m, sizeof(*aph), 0);
+      M_PREPEND(m, sizeof(*aph), M_TRYWAIT);
       if (m == NULL) {
         error = ENOBUFS;
 	break;
diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c
index 9fee1b0f2bfb..7016e33ec2bf 100644
--- a/sys/netnatm/natm_pcb.c
+++ b/sys/netnatm/natm_pcb.c
@@ -66,7 +66,7 @@ int wait;
   MALLOC(npcb, struct natmpcb *, sizeof(*npcb), M_PCB, wait | M_ZERO);
 
 #ifdef DIAGNOSTIC
-  if (wait == 0 && npcb == NULL) panic("npcb_alloc: malloc didn't wait");
+  if (wait == M_WAITOK && npcb == NULL) panic("npcb_alloc: malloc didn't wait");
 #endif
 
   if (npcb)
diff --git a/sys/netncp/ncp_conn.c b/sys/netncp/ncp_conn.c
index a3dbec376392..14b8d7b2d5bc 100644
--- a/sys/netncp/ncp_conn.c
+++ b/sys/netncp/ncp_conn.c
@@ -233,7 +233,7 @@ ncp_conn_alloc(struct ncp_conn_args *cap, struct proc *p, struct ucred *cred,
 	} else
 		owner = crhold(cred);
 	MALLOC(ncp, struct ncp_conn *, sizeof(struct ncp_conn), 
-	    M_NCPDATA, M_ZERO);
+	    M_NCPDATA, M_WAITOK | M_ZERO);
 	error = 0;
 	lockinit(&ncp->nc_lock, PZERO, "ncplck", 0, 0);
 	ncp_conn_cnt++;
@@ -522,7 +522,7 @@ ncp_conn_gethandle(struct ncp_conn *conn, struct proc *p, struct ncp_handle **ha
 		return 0;
 	}
 	MALLOC(refp,struct ncp_handle *,sizeof(struct ncp_handle),M_NCPDATA,
-	    M_ZERO);
+	    M_WAITOK | M_ZERO);
 	SLIST_INSERT_HEAD(&lhlist,refp,nh_next);
 	refp->nh_ref++;
 	refp->nh_proc = p;
diff --git a/sys/netncp/ncp_rq.c b/sys/netncp/ncp_rq.c
index 80d2fd0ca69c..ea707318862b 100644
--- a/sys/netncp/ncp_rq.c
+++ b/sys/netncp/ncp_rq.c
@@ -63,7 +63,7 @@ ncp_rq_alloc_any(u_int32_t ptype, u_int8_t fn, struct ncp_conn *ncp,
 	struct ncp_rq *rqp;
 	int error;
 
-	MALLOC(rqp, struct ncp_rq *, sizeof(*rqp), M_NCPRQ, 0);
+	MALLOC(rqp, struct ncp_rq *, sizeof(*rqp), M_NCPRQ, M_WAITOK);
 	error = ncp_rq_init_any(rqp, ptype, fn, ncp, p, cred);
 	rqp->nr_flags |= NCPR_ALLOCED;
 	if (error) {
diff --git a/sys/netncp/ncp_sock.c b/sys/netncp/ncp_sock.c
index d9351e5fe169..4a03565b953c 100644
--- a/sys/netncp/ncp_sock.c
+++ b/sys/netncp/ncp_sock.c
@@ -163,7 +163,7 @@ ncp_sock_send(struct socket *so, struct mbuf *top, struct ncp_rq *rqp)
 	int sendwait;
 
 	for(;;) {
-		m = m_copym(top, 0, M_COPYALL, 0);
+		m = m_copym(top, 0, M_COPYALL, M_TRYWAIT);
 /*		NCPDDEBUG(m);*/
 		error = so->so_proto->pr_usrreqs->pru_sosend(so, to, 0, m, 0, flags, p);
 		if (error == 0 || error == EINTR || error == ENETDOWN)
diff --git a/sys/netncp/ncp_subr.c b/sys/netncp/ncp_subr.c
index 4f7e5f07fdff..a55e53501e13 100644
--- a/sys/netncp/ncp_subr.c
+++ b/sys/netncp/ncp_subr.c
@@ -69,7 +69,7 @@ ncp_str_dup(char *s) {
 		len++;
 		if (bt == 0) break;
 	}
-	MALLOC(p, char*, len, M_NCPDATA, 0);
+	MALLOC(p, char*, len, M_NCPDATA, M_WAITOK);
 	copyin(s, p, len);
 	return p;
 }
diff --git a/sys/netns/idp_usrreq.c b/sys/netns/idp_usrreq.c
index be9dd5c91a86..2642d1a0b407 100644
--- a/sys/netns/idp_usrreq.c
+++ b/sys/netns/idp_usrreq.c
@@ -160,7 +160,7 @@ idp_output(nsp, m0)
 			(m->m_len + m->m_data < &m->m_dat[MLEN])) {
 			m->m_len++;
 		} else {
-			struct mbuf *m1 = m_get(M_NOWAIT, MT_DATA);
+			struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
 
 			if (m1 == 0) {
 				m_freem(m0);
@@ -181,7 +181,7 @@ idp_output(nsp, m0)
 	if (nsp->nsp_flags & NSP_RAWOUT) {
 		idp = mtod(m, struct idp *);
 	} else {
-		M_PREPEND(m, sizeof (struct idp), M_NOWAIT);
+		M_PREPEND(m, sizeof (struct idp), M_DONTWAIT);
 		if (m == 0)
 			return (ENOBUFS);
 		idp = mtod(m, struct idp *);
@@ -273,7 +273,7 @@ idp_ctloutput(req, so, level, name, value)
 	case PRCO_GETOPT:
 		if (value==NULL)
 			return (EINVAL);
-		m = m_get(M_NOWAIT, MT_DATA);
+		m = m_get(M_DONTWAIT, MT_DATA);
 		if (m==NULL)
 			return (ENOBUFS);
 		switch (name) {
diff --git a/sys/netns/ns.c b/sys/netns/ns.c
index 40a8b0c04df5..7af5acf12ac9 100644
--- a/sys/netns/ns.c
+++ b/sys/netns/ns.c
@@ -128,7 +128,7 @@ ns_control(so, cmd, data, ifp)
 	case SIOCSIFDSTADDR:
 		if (ia == (struct ns_ifaddr *)0) {
 			oia = (struct ns_ifaddr *)
-				malloc(sizeof *ia, M_IFADDR, 0);
+				malloc(sizeof *ia, M_IFADDR, M_WAITOK);
 			if (oia == (struct ns_ifaddr *)NULL)
 				return (ENOBUFS);
 			bzero((caddr_t)oia, sizeof(*oia));
diff --git a/sys/netns/ns_error.c b/sys/netns/ns_error.c
index 769edf864a34..fc4db94bd69e 100644
--- a/sys/netns/ns_error.c
+++ b/sys/netns/ns_error.c
@@ -135,7 +135,7 @@ ns_error(om, type, param)
 	/*
 	 * First, formulate ns_err message
 	 */
-	m = m_gethdr(M_NOWAIT, MT_HEADER);
+	m = m_gethdr(M_DONTWAIT, MT_HEADER);
 	if (m == NULL)
 		goto freeit;
 	m->m_len = sizeof(*ep);
diff --git a/sys/netns/ns_input.c b/sys/netns/ns_input.c
index 033eae6fb46a..22abe026347d 100644
--- a/sys/netns/ns_input.c
+++ b/sys/netns/ns_input.c
@@ -470,7 +470,7 @@ struct ifnet *ifp;
 		if (m0) {
 			register struct idp *idp;
 
-			M_PREPEND(m0, sizeof (*idp), M_NOWAIT);
+			M_PREPEND(m0, sizeof (*idp), M_DONTWAIT);
 			if (m0 == NULL)
 				continue;
 			idp = mtod(m0, struct idp *);
diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c
index b566196b1704..55d1a9f88b3c 100644
--- a/sys/netns/ns_ip.c
+++ b/sys/netns/ns_ip.c
@@ -168,7 +168,7 @@ idpip_input(m, ifp)
 		if (nsip_lastin) {
 			m_freem(nsip_lastin);
 		}
-		nsip_lastin = m_copym(m, 0, (int)M_COPYALL, M_NOWAIT);
+		nsip_lastin = m_copym(m, 0, (int)M_COPYALL, M_DONTWAIT);
 	}
 	/*
 	 * Get IP and IDP header together in first mbuf.
@@ -251,7 +251,7 @@ nsipoutput(ifn, m, dst)
 	/* following clause not necessary on vax */
 	if (3 & (int)m->m_data) {
 		/* force longword alignment of ip hdr */
-		struct mbuf *m0 = m_gethdr(MT_HEADER, M_NOWAIT);
+		struct mbuf *m0 = m_gethdr(MT_HEADER, M_DONTWAIT);
 		if (m0 == 0) {
 			m_freem(m);
 			return (ENOBUFS);
@@ -263,7 +263,7 @@ nsipoutput(ifn, m, dst)
 		m0->m_pkthdr.len = m0->m_len + m->m_len;
 		m->m_flags &= ~M_PKTHDR;
 	} else {
-		M_PREPEND(m, sizeof (struct ip), M_NOWAIT);
+		M_PREPEND(m, sizeof (struct ip), M_DONTWAIT);
 		if (m == 0)
 			return (ENOBUFS);
 	}
diff --git a/sys/netns/ns_pcb.c b/sys/netns/ns_pcb.c
index bcccc3a2db3a..01301c087827 100644
--- a/sys/netns/ns_pcb.c
+++ b/sys/netns/ns_pcb.c
@@ -58,7 +58,7 @@ ns_pcballoc(so, head)
 	struct mbuf *m;
 	register struct nspcb *nsp;
 
-	m = m_getclr(M_NOWAIT, MT_PCB);
+	m = m_getclr(M_DONTWAIT, MT_PCB);
 	if (m == NULL)
 		return (ENOBUFS);
 	nsp = mtod(m, struct nspcb *);
diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c
index 2191d1ab1087..c9428842b101 100644
--- a/sys/netns/spp_usrreq.c
+++ b/sys/netns/spp_usrreq.c
@@ -161,7 +161,7 @@ spp_input(m, nsp)
 			spp_istat.gonawy++;
 			goto dropwithreset;
 		}
-		am = m_get(M_NOWAIT, MT_SONAME);
+		am = m_get(M_DONTWAIT, MT_SONAME);
 		if (am == NULL)
 			goto drop;
 		am->m_len = sizeof (struct sockaddr_ns);
@@ -528,7 +528,7 @@ present:
 				spp_newchecks[4]++;
 				if (dt != cb->s_rhdr.sp_dt) {
 					struct mbuf *mm =
-					   m_getclr(M_NOWAIT, MT_CONTROL);
+					   m_getclr(M_DONTWAIT, MT_CONTROL);
 					spp_newchecks[0]++;
 					if (mm != NULL) {
 						u_short *s =
@@ -742,7 +742,7 @@ spp_output(cb, m0)
 					 * from usrreq(), so it is OK to
 					 * block.
 					 */
-					m = m_copym(m0, 0, mtu, 0);
+					m = m_copym(m0, 0, mtu, M_TRYWAIT);
 					if (cb->s_flags & SF_NEWCALL) {
 					    struct mbuf *mm = m;
 					    spp_newchecks[7]++;
@@ -772,7 +772,7 @@ spp_output(cb, m0)
 			if (M_TRAILINGSPACE(m) >= 1)
 				m->m_len++;
 			else {
-				struct mbuf *m1 = m_get(M_NOWAIT, MT_DATA);
+				struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
 
 				if (m1 == 0) {
 					m_freem(m0);
@@ -783,7 +783,7 @@ spp_output(cb, m0)
 				m->m_next = m1;
 			}
 		}
-		m = m_gethdr(M_NOWAIT, MT_HEADER);
+		m = m_gethdr(M_DONTWAIT, MT_HEADER);
 		if (m == 0) {
 			m_freem(m0);
 			return (ENOBUFS);
@@ -996,7 +996,7 @@ send:
 			sppstat.spps_sndprobe++;
 		if (cb->s_flags & SF_ACKNOW)
 			sppstat.spps_sndacks++;
-		m = m_gethdr(M_NOWAIT, MT_HEADER);
+		m = m_gethdr(M_DONTWAIT, MT_HEADER);
 		if (m == 0)
 			return (ENOBUFS);
 		/*
@@ -1156,7 +1156,7 @@ spp_ctloutput(req, so, level, name, value)
 	case PRCO_GETOPT:
 		if (value == NULL)
 			return (EINVAL);
-		m = m_get(M_NOWAIT, MT_DATA);
+		m = m_get(M_DONTWAIT, MT_DATA);
 		if (m == NULL)
 			return (ENOBUFS);
 		switch (name) {
@@ -1296,7 +1296,7 @@ spp_usrreq(so, req, m, nam, controlp)
 		}
 		nsp = sotonspcb(so);
 
-		mm = m_getclr(M_NOWAIT, MT_PCB);
+		mm = m_getclr(M_DONTWAIT, MT_PCB);
 		sb = &so->so_snd;
 
 		if (mm == NULL) {
@@ -1304,7 +1304,7 @@ spp_usrreq(so, req, m, nam, controlp)
 			break;
 		}
 		cb = mtod(mm, struct sppcb *);
-		mm = m_getclr(M_NOWAIT, MT_HEADER);
+		mm = m_getclr(M_DONTWAIT, MT_HEADER);
 		if (mm == NULL) {
 			(void) m_free(dtom(m));
 			error = ENOBUFS;
diff --git a/sys/netsmb/smb_conn.c b/sys/netsmb/smb_conn.c
index 2a1e913595e1..9c52571ed352 100644
--- a/sys/netsmb/smb_conn.c
+++ b/sys/netsmb/smb_conn.c
@@ -393,7 +393,7 @@ smb_vc_create(struct smb_vcspec *vcspec,
 	if (gid != SMBM_ANY_GROUP && !groupmember(gid, cred) && !isroot)
 		return EPERM;
 
-	vcp = smb_zmalloc(sizeof(*vcp), M_SMBCONN, 0);
+	vcp = smb_zmalloc(sizeof(*vcp), M_SMBCONN, M_WAITOK);
 	smb_co_init(VCTOCP(vcp), SMBL_VC, "smb_vc", td);
 	vcp->obj.co_free = smb_vc_free;
 	vcp->obj.co_gone = smb_vc_gone;
@@ -690,7 +690,7 @@ smb_share_create(struct smb_vc *vcp, struct smb_sharespec *shspec,
 		uid = realuid;
 	if (gid == SMBM_ANY_GROUP)
 		gid = cred->cr_groups[0];
-	ssp = smb_zmalloc(sizeof(*ssp), M_SMBCONN, 0);
+	ssp = smb_zmalloc(sizeof(*ssp), M_SMBCONN, M_WAITOK);
 	smb_co_init(SSTOCP(ssp), SMBL_SHARE, "smbss", td);
 	ssp->obj.co_free = smb_share_free;
 	ssp->obj.co_gone = smb_share_gone;
diff --git a/sys/netsmb/smb_crypt.c b/sys/netsmb/smb_crypt.c
index a6369324d794..8e35207eb64f 100644
--- a/sys/netsmb/smb_crypt.c
+++ b/sys/netsmb/smb_crypt.c
@@ -73,7 +73,7 @@ smb_E(const u_char *key, u_char *data, u_char *dest)
 	kk[5] = key[4] << 3 | (key[5] >> 5 & 0xfe);
 	kk[6] = key[5] << 2 | (key[6] >> 6 & 0xfe);
 	kk[7] = key[6] << 1;
-	ksp = malloc(sizeof(des_key_schedule), M_SMBTEMP, 0);
+	ksp = malloc(sizeof(des_key_schedule), M_SMBTEMP, M_WAITOK);
 	des_set_key((des_cblock *)kk, *ksp);
 	des_ecb_encrypt((des_cblock *)data, (des_cblock *)dest, *ksp, 1);
 	free(ksp, M_SMBTEMP);
@@ -87,7 +87,7 @@ smb_encrypt(const u_char *apwd, u_char *C8, u_char *RN)
 #ifdef NETSMBCRYPTO
 	u_char *p, *P14, *S21;
 
-	p = malloc(14 + 21, M_SMBTEMP, 0);
+	p = malloc(14 + 21, M_SMBTEMP, M_WAITOK);
 	bzero(p, 14 + 21);
 	P14 = p;
 	S21 = p + 14;
@@ -120,12 +120,12 @@ smb_ntencrypt(const u_char *apwd, u_char *C8, u_char *RN)
 	int len;
 
 	len = strlen(apwd);
-	unipwd = malloc((len + 1) * sizeof(u_int16_t), M_SMBTEMP, 0);
+	unipwd = malloc((len + 1) * sizeof(u_int16_t), M_SMBTEMP, M_WAITOK);
 	/*
 	 * S21 = concat(MD4(U(apwd)), zeros(5));
 	 */
 	smb_strtouni(unipwd, apwd);
-	ctxp = malloc(sizeof(MD4_CTX), M_SMBTEMP, 0);
+	ctxp = malloc(sizeof(MD4_CTX), M_SMBTEMP, M_WAITOK);
 	MD4Init(ctxp);
 	MD4Update(ctxp, (u_char*)unipwd, len * sizeof(u_int16_t));
 	free(unipwd, M_SMBTEMP);
diff --git a/sys/netsmb/smb_dev.c b/sys/netsmb/smb_dev.c
index 2fc6a2955dec..50b7e511fa26 100644
--- a/sys/netsmb/smb_dev.c
+++ b/sys/netsmb/smb_dev.c
@@ -132,7 +132,7 @@ nsmb_dev_open(dev_t dev, int oflags, int devtype, struct thread *td)
 	if (sdp && (sdp->sd_flags & NSMBFL_OPEN))
 		return EBUSY;
 	if (sdp == NULL) {
-		sdp = malloc(sizeof(*sdp), M_NSMBDEV, 0);
+		sdp = malloc(sizeof(*sdp), M_NSMBDEV, M_WAITOK);
 		dev->si_drv1 = (void*)sdp;
 	}
 	/*
diff --git a/sys/netsmb/smb_iod.c b/sys/netsmb/smb_iod.c
index 12c900015c76..5ae5f146e62b 100644
--- a/sys/netsmb/smb_iod.c
+++ b/sys/netsmb/smb_iod.c
@@ -248,7 +248,7 @@ smb_iod_sendrq(struct smbiod *iod, struct smb_rq *rqp)
 	}
 	SMBSDEBUG("M:%04x, P:%04x, U:%04x, T:%04x\n", rqp->sr_mid, 0, 0, 0);
 	m_dumpm(rqp->sr_rq.mb_top);
-	m = m_copym(rqp->sr_rq.mb_top, 0, M_COPYALL, 0);
+	m = m_copym(rqp->sr_rq.mb_top, 0, M_COPYALL, M_TRYWAIT);
 	error = rqp->sr_lerror = m ? SMB_TRAN_SEND(vcp, m, td) : ENOBUFS;
 	if (error == 0) {
 		getnanotime(&rqp->sr_timesent);
@@ -371,7 +371,7 @@ smb_iod_request(struct smbiod *iod, int event, void *ident)
 	int error;
 
 	SMBIODEBUG("\n");
-	evp = smb_zmalloc(sizeof(*evp), M_SMBIOD, 0);
+	evp = smb_zmalloc(sizeof(*evp), M_SMBIOD, M_WAITOK);
 	evp->ev_type = event;
 	evp->ev_ident = ident;
 	SMB_IOD_EVLOCK(iod);
@@ -663,7 +663,7 @@ smb_iod_create(struct smb_vc *vcp)
 	struct smbiod *iod;
 	int error;
 
-	iod = smb_zmalloc(sizeof(*iod), M_SMBIOD, 0);
+	iod = smb_zmalloc(sizeof(*iod), M_SMBIOD, M_WAITOK);
 	iod->iod_id = smb_iod_next++;
 	iod->iod_state = SMBIOD_ST_NOTCONN;
 	iod->iod_vc = vcp;
diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c
index 9fd14a6d5ad3..5e0c7a86d4f2 100644
--- a/sys/netsmb/smb_rq.c
+++ b/sys/netsmb/smb_rq.c
@@ -67,7 +67,7 @@ smb_rq_alloc(struct smb_connobj *layer, u_char cmd, struct smb_cred *scred,
 	struct smb_rq *rqp;
 	int error;
 
-	MALLOC(rqp, struct smb_rq *, sizeof(*rqp), M_SMBRQ, 0);
+	MALLOC(rqp, struct smb_rq *, sizeof(*rqp), M_SMBRQ, M_WAITOK);
 	if (rqp == NULL)
 		return ENOMEM;
 	error = smb_rq_init(rqp, layer, cmd, scred);
@@ -368,7 +368,7 @@ smb_t2_alloc(struct smb_connobj *layer, u_short setup, struct smb_cred *scred,
 	struct smb_t2rq *t2p;
 	int error;
 
-	MALLOC(t2p, struct smb_t2rq *, sizeof(*t2p), M_SMBRQ, 0);
+	MALLOC(t2p, struct smb_t2rq *, sizeof(*t2p), M_SMBRQ, M_WAITOK);
 	if (t2p == NULL)
 		return ENOMEM;
 	error = smb_t2_init(t2p, layer, setup, scred);
@@ -418,7 +418,7 @@ smb_t2_placedata(struct mbuf *mtop, u_int16_t offset, u_int16_t count,
 	struct mbuf *m, *m0;
 	int len;
 
-	m0 = m_split(mtop, offset, 0);
+	m0 = m_split(mtop, offset, M_TRYWAIT);
 	if (m0 == NULL)
 		return EBADRPC;
 	len = m_length(m0, &m);
diff --git a/sys/netsmb/smb_smb.c b/sys/netsmb/smb_smb.c
index 6a24de6e78c3..b5e7c2251989 100644
--- a/sys/netsmb/smb_smb.c
+++ b/sys/netsmb/smb_smb.c
@@ -280,8 +280,8 @@ again:
 	error = smb_rq_alloc(VCTOCP(vcp), SMB_COM_SESSION_SETUP_ANDX, scred, &rqp);
 	if (error)
 		return error;
-	pbuf = malloc(SMB_MAXPASSWORDLEN + 1, M_SMBTEMP, 0);
-	encpass = malloc(24, M_SMBTEMP, 0);
+	pbuf = malloc(SMB_MAXPASSWORDLEN + 1, M_SMBTEMP, M_WAITOK);
+	encpass = malloc(24, M_SMBTEMP, M_WAITOK);
 	if (vcp->vc_sopt.sv_sm & SMB_SM_USER) {
 		/*
 		 * We try w/o uppercasing first so Samba mixed case
@@ -302,7 +302,7 @@ again:
 		if (vcp->vc_sopt.sv_sm & SMB_SM_ENCRYPT) {
 			uniplen = plen = 24;
 			smb_encrypt(pbuf, vcp->vc_ch, encpass);
-			ntencpass = malloc(uniplen, M_SMBTEMP, 0);
+			ntencpass = malloc(uniplen, M_SMBTEMP, M_WAITOK);
 			if (SMB_UNICODE_STRINGS(vcp)) {
 				strncpy(pbuf, smb_vc_getpass(vcp),
 					SMB_MAXPASSWORDLEN);
@@ -318,7 +318,7 @@ again:
 			plen = strlen(pbuf) + 1;
 			pp = pbuf;
 			uniplen = plen * 2;
-			ntencpass = malloc(uniplen, M_SMBTEMP, 0);
+			ntencpass = malloc(uniplen, M_SMBTEMP, M_WAITOK);
 			smb_strtouni(ntencpass, smb_vc_getpass(vcp));
 			plen--;
 
@@ -500,8 +500,8 @@ again:
 		pbuf = NULL;
 		encpass = NULL;
 	} else {
-		pbuf = malloc(SMB_MAXPASSWORDLEN + 1, M_SMBTEMP, 0);
-		encpass = malloc(24, M_SMBTEMP, 0);
+		pbuf = malloc(SMB_MAXPASSWORDLEN + 1, M_SMBTEMP, M_WAITOK);
+		encpass = malloc(24, M_SMBTEMP, M_WAITOK);
 		/*
 		 * We try w/o uppercasing first so Samba mixed case
 		 * passwords work.  If that fails we come back and try
diff --git a/sys/netsmb/smb_subr.c b/sys/netsmb/smb_subr.c
index ae21133fda06..55c4c2665794 100644
--- a/sys/netsmb/smb_subr.c
+++ b/sys/netsmb/smb_subr.c
@@ -94,7 +94,7 @@ smb_strdup(const char *s)
 	int len;
 
 	len = s ? strlen(s) + 1 : 1;
-	p = malloc(len, M_SMBSTR, 0);
+	p = malloc(len, M_SMBSTR, M_WAITOK);
 	if (s)
 		bcopy(s, p, len);
 	else
@@ -120,7 +120,7 @@ smb_strdupin(char *s, int maxlen)
 		if (bt == 0)
 			break;
 	}
-	p = malloc(len, M_SMBSTR, 0);
+	p = malloc(len, M_SMBSTR, M_WAITOK);
 	copyin(s, p, len);
 	return p;
 }
@@ -135,7 +135,7 @@ smb_memdupin(void *umem, int len)
 
 	if (len > 8 * 1024)
 		return NULL;
-	p = malloc(len, M_SMBSTR, 0);
+	p = malloc(len, M_SMBSTR, M_WAITOK);
 	if (copyin(umem, p, len) == 0)
 		return p;
 	free(p, M_SMBSTR);
@@ -152,7 +152,7 @@ smb_memdup(const void *umem, int len)
 
 	if (len > 8 * 1024)
 		return NULL;
-	p = malloc(len, M_SMBSTR, 0);
+	p = malloc(len, M_SMBSTR, M_WAITOK);
 	if (p == NULL)
 		return NULL;
 	bcopy(umem, p, len);
diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c
index b631a52fa9d7..cf0adcbb3e99 100644
--- a/sys/netsmb/smb_trantcp.c
+++ b/sys/netsmb/smb_trantcp.c
@@ -514,7 +514,7 @@ smb_nbst_create(struct smb_vc *vcp, struct thread *td)
 {
 	struct nbpcb *nbp;
 
-	MALLOC(nbp, struct nbpcb *, sizeof *nbp, M_NBDATA, 0);
+	MALLOC(nbp, struct nbpcb *, sizeof *nbp, M_NBDATA, M_WAITOK);
 	bzero(nbp, sizeof *nbp);
 	nbp->nbp_timo.tv_sec = 15;	/* XXX: sysctl ? */
 	nbp->nbp_state = NBST_CLOSED;
@@ -648,7 +648,7 @@ smb_nbst_send(struct smb_vc *vcp, struct mbuf *m0, struct thread *td)
 		error = ENOTCONN;
 		goto abort;
 	}
-	M_PREPEND(m0, 4, 0);
+	M_PREPEND(m0, 4, M_TRYWAIT);
 	if (m0 == NULL)
 		return ENOBUFS;
 	nb_sethdr(m0, NB_SSN_MESSAGE, m_fixhdr(m0) - 4);
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index f2a26d90f776..b99c3b0fc388 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -191,7 +191,7 @@ nfsm_disct(struct mbuf **mdp, caddr_t *dposp, int siz, int left)
 	} else if (siz > MHLEN) {
 		panic("nfs S too big");
 	} else {
-		MGET(mp2, 0, MT_DATA);
+		MGET(mp2, M_TRYWAIT, MT_DATA);
 		mp2->m_next = mp->m_next;
 		mp->m_next = mp2;
 		mp->m_len -= left;
@@ -254,7 +254,7 @@ nfsm_build_xx(int s, struct mbuf **mb, caddr_t *bpos)
 	void *ret;
 
 	if (s > M_TRAILINGSPACE(*mb)) {
-		MGET(mb2, 0, MT_DATA);
+		MGET(mb2, M_TRYWAIT, MT_DATA);
 		if (s > MLEN)
 			panic("build > MLEN");
 		(*mb)->m_next = mb2;
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c
index 8bd86b2606a7..bfa419ee398c 100644
--- a/sys/nfsclient/bootp_subr.c
+++ b/sys/nfsclient/bootp_subr.c
@@ -433,7 +433,7 @@ allocifctx(struct bootpc_globalcontext *gctx)
 {
 	struct bootpc_ifcontext *ifctx;
 	ifctx = (struct bootpc_ifcontext *) malloc(sizeof(*ifctx),
-						   M_TEMP, 0);
+						   M_TEMP, M_WAITOK);
 	if (ifctx == NULL)
 		panic("Failed to allocate bootp interface context structure");
 
@@ -1675,7 +1675,7 @@ bootpc_init(void)
 	if (nfs_diskless_valid != 0)
 		return;
 
-	gctx = malloc(sizeof(*gctx), M_TEMP, 0);
+	gctx = malloc(sizeof(*gctx), M_TEMP, M_WAITOK);
 	if (gctx == NULL)
 		panic("Failed to allocate bootp global context structure");
 
@@ -1942,7 +1942,7 @@ md_lookup_swap(struct sockaddr_in *mdsin, char *path, u_char *fhp, int *fhsizep,
 		u_int32_t v3[21];
 	} fattribs;
 
-	m = m_get(0, MT_DATA);
+	m = m_get(M_TRYWAIT, MT_DATA);
 	if (m == NULL)
 	  	return ENOBUFS;
 
diff --git a/sys/nfsclient/krpc_subr.c b/sys/nfsclient/krpc_subr.c
index e470aebc1747..4690104797fe 100644
--- a/sys/nfsclient/krpc_subr.c
+++ b/sys/nfsclient/krpc_subr.c
@@ -149,7 +149,7 @@ krpc_portmap(struct sockaddr_in *sin, u_int prog, u_int vers, u_int16_t *portp,
 		return 0;
 	}
 
-	m = m_get(0, MT_DATA);
+	m = m_get(M_TRYWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOBUFS;
 	sdata = mtod(m, struct sdata *);
@@ -271,7 +271,7 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func,
 	/*
 	 * Prepend RPC message header.
 	 */
-	mhead = m_gethdr(0, MT_DATA);
+	mhead = m_gethdr(M_TRYWAIT, MT_DATA);
 	mhead->m_next = *data;
 	call = mtod(mhead, struct rpc_call *);
 	mhead->m_len = sizeof(*call);
@@ -311,7 +311,7 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func,
 	timo = 0;
 	for (;;) {
 		/* Send RPC request (or re-send). */
-		m = m_copym(mhead, 0, M_COPYALL, 0);
+		m = m_copym(mhead, 0, M_COPYALL, M_TRYWAIT);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
@@ -465,9 +465,9 @@ xdr_string_encode(char *str, int len)
 	if (mlen > MCLBYTES)		/* If too big, we just can't do it. */
 		return (NULL);
 
-	m = m_get(0, MT_DATA);
+	m = m_get(M_TRYWAIT, MT_DATA);
 	if (mlen > MLEN) {
-		MCLGET(m, 0);
+		MCLGET(m, M_TRYWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			(void) m_free(m);	/* There can be only one. */
 			return (NULL);
diff --git a/sys/nfsclient/nfs_lock.c b/sys/nfsclient/nfs_lock.c
index 1e098dbda4c0..67f049abb5b0 100644
--- a/sys/nfsclient/nfs_lock.c
+++ b/sys/nfsclient/nfs_lock.c
@@ -114,7 +114,7 @@ nfs_dolock(struct vop_advlock_args *ap)
 	 */
 	if (p->p_nlminfo == NULL) {
 		MALLOC(p->p_nlminfo, struct nlminfo *,
-			sizeof(struct nlminfo), M_LOCKF, M_ZERO);
+			sizeof(struct nlminfo), M_LOCKF, M_WAITOK | M_ZERO);
 		p->p_nlminfo->pid_start = p->p_stats->p_start;
 	}
 	msg.lm_msg_ident.pid_start = p->p_nlminfo->pid_start;
diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c
index b5ee0bdae094..30f4aff3eea9 100644
--- a/sys/nfsclient/nfs_node.c
+++ b/sys/nfsclient/nfs_node.c
@@ -224,7 +224,7 @@ loop:
 	 * might cause a bogus v_data pointer to get dereferenced
 	 * elsewhere if zalloc should block.
 	 */
-	np = uma_zalloc(nfsnode_zone, 0);
+	np = uma_zalloc(nfsnode_zone, M_WAITOK);
 
 	error = getnewvnode("nfs", mntp, nfsv2_vnodeop_p, &nvp);
 	if (error) {
@@ -255,7 +255,7 @@ loop:
 	}
 	LIST_INSERT_HEAD(nhpp, np, n_hash);
 	if (fhsize > NFS_SMALLFH) {
-		MALLOC(np->n_fhp, nfsfh_t *, fhsize, M_NFSBIGFH, 0);
+		MALLOC(np->n_fhp, nfsfh_t *, fhsize, M_NFSBIGFH, M_WAITOK);
 	} else
 		np->n_fhp = &np->n_fh;
 	bcopy((caddr_t)fhp, (caddr_t)np->n_fhp, fhsize);
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 12d78d61f2eb..612ed3329a61 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -525,7 +525,7 @@ tryagain:
 			goto tryagain;
 		}
 		while (rep->r_flags & R_MUSTRESEND) {
-			m = m_copym(rep->r_mreq, 0, M_COPYALL, 0);
+			m = m_copym(rep->r_mreq, 0, M_COPYALL, M_TRYWAIT);
 			nfsstats.rpcretries++;
 			error = nfs_send(so, rep->r_nmp->nm_nam, m, rep);
 			if (error) {
@@ -864,7 +864,7 @@ nfs_request(struct vnode *vp, struct mbuf *mrest, int procnum,
 		return (ESTALE);
 	}
 	nmp = VFSTONFS(vp->v_mount);
-	MALLOC(rep, struct nfsreq *, sizeof(struct nfsreq), M_NFSREQ, 0);
+	MALLOC(rep, struct nfsreq *, sizeof(struct nfsreq), M_NFSREQ, M_WAITOK);
 	rep->r_nmp = nmp;
 	rep->r_vp = vp;
 	rep->r_td = td;
@@ -887,7 +887,7 @@ nfs_request(struct vnode *vp, struct mbuf *mrest, int procnum,
 	 * For stream protocols, insert a Sun RPC Record Mark.
 	 */
 	if (nmp->nm_sotype == SOCK_STREAM) {
-		M_PREPEND(m, NFSX_UNSIGNED, 0);
+		M_PREPEND(m, NFSX_UNSIGNED, M_TRYWAIT);
 		*mtod(m, u_int32_t *) = htonl(0x80000000 |
 			 (m->m_pkthdr.len - NFSX_UNSIGNED));
 	}
@@ -928,7 +928,7 @@ tryagain:
 		if (nmp->nm_soflags & PR_CONNREQUIRED)
 			error = nfs_sndlock(rep);
 		if (!error) {
-			m2 = m_copym(m, 0, M_COPYALL, 0);
+			m2 = m_copym(m, 0, M_COPYALL, M_TRYWAIT);
 			error = nfs_send(nmp->nm_so, nmp->nm_nam, m2, rep);
 			if (nmp->nm_soflags & PR_CONNREQUIRED)
 				nfs_sndunlock(rep);
@@ -1127,7 +1127,7 @@ nfs_timer(void *arg)
 		   ((nmp->nm_flag & NFSMNT_DUMBTIMR) ||
 		    (rep->r_flags & R_SENT) ||
 		    nmp->nm_sent < nmp->nm_cwnd) &&
-		   (m = m_copym(rep->r_mreq, 0, M_COPYALL, M_NOWAIT))){
+		   (m = m_copym(rep->r_mreq, 0, M_COPYALL, M_DONTWAIT))){
 			if ((nmp->nm_flag & NFSMNT_NOCONN) == 0)
 			    error = (*so->so_proto->pr_usrreqs->pru_send)
 				    (so, 0, m, NULL, NULL, td);
@@ -1378,9 +1378,9 @@ nfs_realign(struct mbuf **pm, int hsiz)
 	++nfs_realign_test;
 	while ((m = *pm) != NULL) {
 		if ((m->m_len & 0x3) || (mtod(m, intptr_t) & 0x3)) {
-			MGET(n, 0, MT_DATA);
+			MGET(n, M_TRYWAIT, MT_DATA);
 			if (m->m_len >= MINCLSIZE) {
-				MCLGET(n, 0);
+				MCLGET(n, M_TRYWAIT);
 			}
 			n->m_len = 0;
 			break;
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 178cbbb38c81..2318a044892f 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -142,9 +142,9 @@ nfsm_reqhead(struct vnode *vp, u_long procid, int hsiz)
 {
 	struct mbuf *mb;
 
-	MGET(mb, 0, MT_DATA);
+	MGET(mb, M_TRYWAIT, MT_DATA);
 	if (hsiz >= MINCLSIZE)
-		MCLGET(mb, 0);
+		MCLGET(mb, M_TRYWAIT);
 	mb->m_len = 0;
 	return (mb);
 }
@@ -168,9 +168,9 @@ nfsm_rpchead(struct ucred *cr, int nmflag, int procid, int auth_type,
 	int grpsiz, authsiz;
 
 	authsiz = nfsm_rndup(auth_len);
-	MGETHDR(mb, 0, MT_DATA);
+	MGETHDR(mb, M_TRYWAIT, MT_DATA);
 	if ((authsiz + 10 * NFSX_UNSIGNED) >= MINCLSIZE) {
-		MCLGET(mb, 0);
+		MCLGET(mb, M_TRYWAIT);
 	} else if ((authsiz + 10 * NFSX_UNSIGNED) < MHLEN) {
 		MH_ALIGN(mb, authsiz + 10 * NFSX_UNSIGNED);
 	} else {
@@ -271,9 +271,9 @@ nfsm_uiotombuf(struct uio *uiop, struct mbuf **mq, int siz, caddr_t *bpos)
 		while (left > 0) {
 			mlen = M_TRAILINGSPACE(mp);
 			if (mlen == 0) {
-				MGET(mp, 0, MT_DATA);
+				MGET(mp, M_TRYWAIT, MT_DATA);
 				if (clflg)
-					MCLGET(mp, 0);
+					MCLGET(mp, M_TRYWAIT);
 				mp->m_len = 0;
 				mp2->m_next = mp;
 				mp2 = mp;
@@ -304,7 +304,7 @@ nfsm_uiotombuf(struct uio *uiop, struct mbuf **mq, int siz, caddr_t *bpos)
 	}
 	if (rem > 0) {
 		if (rem > M_TRAILINGSPACE(mp)) {
-			MGET(mp, 0, MT_DATA);
+			MGET(mp, M_TRYWAIT, MT_DATA);
 			mp->m_len = 0;
 			mp2->m_next = mp;
 		}
@@ -349,9 +349,9 @@ nfsm_strtmbuf(struct mbuf **mb, char **bpos, const char *cp, long siz)
 	}
 	/* Loop around adding mbufs */
 	while (siz > 0) {
-		MGET(m1, 0, MT_DATA);
+		MGET(m1, M_TRYWAIT, MT_DATA);
 		if (siz > MLEN)
-			MCLGET(m1, 0);
+			MCLGET(m1, M_TRYWAIT);
 		m1->m_len = NFSMSIZ(m1);
 		m2->m_next = m1;
 		m2 = m1;
@@ -716,7 +716,7 @@ nfs_getcookie(struct nfsnode *np, off_t off, int add)
 	if (!dp) {
 		if (add) {
 			MALLOC(dp, struct nfsdmap *, sizeof (struct nfsdmap),
-				M_NFSDIROFF, 0);
+				M_NFSDIROFF, M_WAITOK);
 			dp->ndm_eocookie = 0;
 			LIST_INSERT_HEAD(&np->n_cookies, dp, ndm_list);
 		} else
@@ -731,7 +731,7 @@ nfs_getcookie(struct nfsnode *np, off_t off, int add)
 			dp = LIST_NEXT(dp, ndm_list);
 		} else if (add) {
 			MALLOC(dp2, struct nfsdmap *, sizeof (struct nfsdmap),
-				M_NFSDIROFF, 0);
+				M_NFSDIROFF, M_WAITOK);
 			dp2->ndm_eocookie = 0;
 			LIST_INSERT_AFTER(dp, dp2, ndm_list);
 			dp = dp2;
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index 5d43af2465a1..cee1ec897f2c 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -823,7 +823,7 @@ mountnfs(struct nfs_args *argp, struct mount *mp, struct sockaddr *nam,
 		FREE(nam, M_SONAME);
 		return (0);
 	} else {
-		nmp = uma_zalloc(nfsmount_zone, 0);
+		nmp = uma_zalloc(nfsmount_zone, M_WAITOK);
 		bzero((caddr_t)nmp, sizeof (struct nfsmount));
 		TAILQ_INIT(&nmp->nm_bufq);
 		mp->mnt_data = (qaddr_t)nmp;
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index f47d9da9435d..919f2a3394f2 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -404,7 +404,7 @@ nfs_access(struct vop_access_args *ap)
 				error = nfs_readrpc(vp, &auio, ap->a_cred);
 			else if (vp->v_type == VDIR) {
 				char* bp;
-				bp = malloc(NFS_DIRBLKSIZ, M_TEMP, 0);
+				bp = malloc(NFS_DIRBLKSIZ, M_TEMP, M_WAITOK);
 				aiov.iov_base = bp;
 				aiov.iov_len = auio.uio_resid = NFS_DIRBLKSIZ;
 				error = nfs_readdirrpc(vp, &auio, ap->a_cred);
@@ -2370,7 +2370,7 @@ nfs_sillyrename(struct vnode *dvp, struct vnode *vp, struct componentname *cnp)
 		panic("nfs: sillyrename dir");
 #endif
 	MALLOC(sp, struct sillyrename *, sizeof (struct sillyrename),
-		M_NFSREQ, 0);
+		M_NFSREQ, M_WAITOK);
 	sp->s_cred = crhold(cnp->cn_cred);
 	sp->s_dvp = dvp;
 	VREF(dvp);
@@ -2438,7 +2438,7 @@ nfs_lookitup(struct vnode *dvp, const char *name, int len, struct ucred *cred,
 			free((caddr_t)np->n_fhp, M_NFSBIGFH);
 			np->n_fhp = &np->n_fh;
 		    } else if (np->n_fhsize <= NFS_SMALLFH && fhlen>NFS_SMALLFH)
-			np->n_fhp =(nfsfh_t *)malloc(fhlen, M_NFSBIGFH, 0);
+			np->n_fhp =(nfsfh_t *)malloc(fhlen, M_NFSBIGFH, M_WAITOK);
 		    bcopy((caddr_t)nfhp, (caddr_t)np->n_fhp, fhlen);
 		    np->n_fhsize = fhlen;
 		    newvp = NFSTOV(np);
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index 322b1d4ee008..1d953cd564f6 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -656,8 +656,8 @@ nfsrv_readlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 	len = 0;
 	i = 0;
 	while (len < NFS_MAXPATHLEN) {
-		MGET(nmp, 0, MT_DATA);
-		MCLGET(nmp, 0);
+		MGET(nmp, M_TRYWAIT, MT_DATA);
+		MCLGET(nmp, M_TRYWAIT);
 		nmp->m_len = NFSMSIZ(nmp);
 		if (len == 0)
 			mp3 = mp = nmp;
@@ -899,15 +899,15 @@ nfsrv_read(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 				i++;
 			}
 			if (left > 0) {
-				MGET(m, 0, MT_DATA);
-				MCLGET(m, 0);
+				MGET(m, M_TRYWAIT, MT_DATA);
+				MCLGET(m, M_TRYWAIT);
 				m->m_len = 0;
 				m2->m_next = m;
 				m2 = m;
 			}
 		}
 		MALLOC(iv, struct iovec *, i * sizeof (struct iovec),
-		       M_TEMP, 0);
+		       M_TEMP, M_WAITOK);
 		uiop->uio_iov = iv2 = iv;
 		m = mb;
 		left = len;
@@ -1107,7 +1107,7 @@ nfsrv_write(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 
 	if (len > 0) {
 	    MALLOC(ivp, struct iovec *, cnt * sizeof (struct iovec), M_TEMP,
-		0);
+		M_WAITOK);
 	    uiop->uio_iov = iv = ivp;
 	    uiop->uio_iovcnt = cnt;
 	    mp = mrep;
@@ -1404,7 +1404,7 @@ loop1:
 		    }
 		    uiop->uio_iovcnt = i;
 		    MALLOC(iov, struct iovec *, i * sizeof (struct iovec),
-			M_TEMP, 0);
+			M_TEMP, M_WAITOK);
 		    uiop->uio_iov = ivp = iov;
 		    mp = mrep;
 		    while (mp) {
@@ -2551,7 +2551,7 @@ nfsrv_symlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 	if (v3)
 		nfsm_srvsattr(vap);
 	nfsm_srvpathsiz(len2);
-	MALLOC(pathcp, caddr_t, len2 + 1, M_TEMP, 0);
+	MALLOC(pathcp, caddr_t, len2 + 1, M_TEMP, M_WAITOK);
 	iv.iov_base = pathcp;
 	iv.iov_len = len2;
 	io.uio_resid = len2;
@@ -3059,7 +3059,7 @@ nfsrv_readdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 	/*
 	 * end section.  Allocate rbuf and continue
 	 */
-	MALLOC(rbuf, caddr_t, siz, M_TEMP, 0);
+	MALLOC(rbuf, caddr_t, siz, M_TEMP, M_WAITOK);
 again:
 	iv.iov_base = rbuf;
 	iv.iov_len = fullsiz;
@@ -3337,7 +3337,7 @@ nfsrv_readdirplus(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 		goto nfsmout;
 	}
 	VOP_UNLOCK(vp, 0, td);
-	MALLOC(rbuf, caddr_t, siz, M_TEMP, 0);
+	MALLOC(rbuf, caddr_t, siz, M_TEMP, M_WAITOK);
 again:
 	iv.iov_base = rbuf;
 	iv.iov_len = fullsiz;
diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c
index a9e84e921167..1986c0b62857 100644
--- a/sys/nfsserver/nfs_srvcache.c
+++ b/sys/nfsserver/nfs_srvcache.c
@@ -193,7 +193,7 @@ loop:
 			} else if (rp->rc_flag & RC_REPMBUF) {
 				nfsrvstats.srvcache_nonidemdonehits++;
 				*repp = m_copym(rp->rc_reply, 0, M_COPYALL,
-						0);
+						M_TRYWAIT);
 				ret = RC_REPLY;
 			} else {
 				nfsrvstats.srvcache_idemdonehits++;
@@ -212,7 +212,7 @@ loop:
 	NFS_DPF(RC, ("M%03x", nd->nd_retxid & 0xfff));
 	if (numnfsrvcache < desirednfsrvcache) {
 		rp = (struct nfsrvcache *)malloc((u_long)sizeof *rp,
-		    M_NFSD, M_ZERO);
+		    M_NFSD, M_WAITOK | M_ZERO);
 		numnfsrvcache++;
 		rp->rc_flag = RC_LOCKED;
 	} else {
@@ -303,7 +303,7 @@ loop:
 					rp->rc_flag |= RC_REPSTATUS;
 				} else {
 					rp->rc_reply = m_copym(repmbuf,
-						0, M_COPYALL, 0);
+						0, M_COPYALL, M_TRYWAIT);
 					rp->rc_flag |= RC_REPMBUF;
 				}
 			}
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index e17e023e7af3..bf4e98566849 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -148,7 +148,7 @@ nfs_rephead(int siz, struct nfsrv_descript *nd, int err,
 	nd->nd_repstat = err;
 	if (err && (nd->nd_flag & ND_NFSV3) == 0)	/* XXX recheck */
 		siz = 0;
-	MGETHDR(mreq, 0, MT_DATA);
+	MGETHDR(mreq, M_TRYWAIT, MT_DATA);
 	mb = mreq;
 	/*
 	 * If this is a big reply, use a cluster else
@@ -157,7 +157,7 @@ nfs_rephead(int siz, struct nfsrv_descript *nd, int err,
 	mreq->m_len = 6 * NFSX_UNSIGNED;
 	siz += RPC_REPLYSIZ;
 	if ((max_hdr + siz) >= MINCLSIZE) {
-		MCLGET(mreq, 0);
+		MCLGET(mreq, M_TRYWAIT);
 	} else
 		mreq->m_data += min(max_hdr, M_TRAILINGSPACE(mreq));
 	tl = mtod(mreq, u_int32_t *);
@@ -244,9 +244,9 @@ nfs_realign(struct mbuf **pm, int hsiz)	/* XXX COMMON */
 	++nfs_realign_test;
 	while ((m = *pm) != NULL) {
 		if ((m->m_len & 0x3) || (mtod(m, intptr_t) & 0x3)) {
-			MGET(n, 0, MT_DATA);
+			MGET(n, M_TRYWAIT, MT_DATA);
 			if (m->m_len >= MINCLSIZE) {
-				MCLGET(n, 0);
+				MCLGET(n, M_TRYWAIT);
 			}
 			n->m_len = 0;
 			break;
@@ -403,7 +403,7 @@ nfsmout:
  * Socket upcall routine for the nfsd sockets.
  * The caddr_t arg is a pointer to the "struct nfssvc_sock".
  * Essentially do as much as possible non-blocking, else punt and it will
- * be called without M_NOWAIT from an nfsd.
+ * be called with M_TRYWAIT from an nfsd.
  */
 void
 nfsrv_rcv(struct socket *so, void *arg, int waitflag)
@@ -421,7 +421,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag)
 	/*
 	 * Define this to test for nfsds handling this under heavy load.
 	 */
-	if (waitflag == M_NOWAIT) {
+	if (waitflag == M_DONTWAIT) {
 		slp->ns_flag |= SLP_NEEDQ;
 		goto dorecs;
 	}
@@ -433,7 +433,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag)
 		 * to an nfsd so that there is feedback to the TCP layer that
 		 * the nfs servers are heavily loaded.
 		 */
-		if (STAILQ_FIRST(&slp->ns_rec) && waitflag == M_NOWAIT) {
+		if (STAILQ_FIRST(&slp->ns_rec) && waitflag == M_DONTWAIT) {
 			slp->ns_flag |= SLP_NEEDQ;
 			goto dorecs;
 		}
@@ -509,7 +509,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag)
 	 * Now try and process the request records, non-blocking.
 	 */
 dorecs:
-	if (waitflag == M_NOWAIT &&
+	if (waitflag == M_DONTWAIT &&
 		(STAILQ_FIRST(&slp->ns_rec)
 		 || (slp->ns_flag & (SLP_NEEDQ | SLP_DISCONN))))
 		nfsrv_wakenfsd(slp);
@@ -667,7 +667,7 @@ nfsrv_dorec(struct nfssvc_sock *slp, struct nfsd *nfsd,
 	m = rec->nr_packet;
 	free(rec, M_NFSRVDESC);
 	MALLOC(nd, struct nfsrv_descript *, sizeof (struct nfsrv_descript),
-		M_NFSRVDESC, 0);
+		M_NFSRVDESC, M_WAITOK);
 	nd->nd_md = nd->nd_mrep = m;
 	nd->nd_nam2 = nam;
 	nd->nd_dpos = mtod(m, caddr_t);
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 9ad6af12da67..5ac51ad7c1b6 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -605,7 +605,7 @@ nfs_namei(struct nameidata *ndp, fhandle_t *fhp, int len,
 
 	*retdirp = NULL;
 	cnp->cn_flags |= NOMACCHECK;
-	cnp->cn_pnbuf = uma_zalloc(namei_zone, 0);
+	cnp->cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
 
 	/*
 	 * Copy the name from the mbuf list to ndp->ni_pnbuf
@@ -670,7 +670,7 @@ nfs_namei(struct nameidata *ndp, fhandle_t *fhp, int len,
 		 * Oh joy. For WebNFS, handle those pesky '%' escapes,
 		 * and the 'native path' indicator.
 		 */
-		cp = uma_zalloc(namei_zone, 0);
+		cp = uma_zalloc(namei_zone, M_WAITOK);
 		fromcp = cnp->cn_pnbuf;
 		tocp = cp;
 		if ((unsigned char)*fromcp >= WEBNFS_SPECCHAR_START) {
@@ -779,7 +779,7 @@ nfs_namei(struct nameidata *ndp, fhandle_t *fhp, int len,
 			goto badlink2;
 		}
 		if (ndp->ni_pathlen > 1)
-			cp = uma_zalloc(namei_zone, 0);
+			cp = uma_zalloc(namei_zone, M_WAITOK);
 		else
 			cp = cnp->cn_pnbuf;
 		aiov.iov_base = cp;
@@ -1287,8 +1287,8 @@ nfsm_clget_xx(u_int32_t **tl, struct mbuf *mb, struct mbuf **mp,
 	if (*bp >= *be) {
 		if (*mp == mb)
 			(*mp)->m_len += *bp - bpos;
-		MGET(nmp, 0, MT_DATA);
-		MCLGET(nmp, 0);
+		MGET(nmp, M_TRYWAIT, MT_DATA);
+		MCLGET(nmp, M_TRYWAIT);
 		nmp->m_len = NFSMSIZ(nmp);
 		(*mp)->m_next = nmp;
 		*mp = nmp;
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index b41a5f706a86..cf9bf90b5058 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -262,7 +262,7 @@ nfssvc_addsock(struct file *fp, struct sockaddr *mynam, struct thread *td)
 
 	slp = (struct nfssvc_sock *)
 		malloc(sizeof (struct nfssvc_sock), M_NFSSVC,
-		M_ZERO);
+		M_WAITOK | M_ZERO);
 	STAILQ_INIT(&slp->ns_rec);
 	TAILQ_INSERT_TAIL(&nfssvc_sockhead, slp, ns_chain);
 
@@ -301,7 +301,7 @@ nfssvc_nfsd(struct thread *td)
 	writes_todo = 0;
 #endif
 	nfsd = (struct nfsd *)
-		malloc(sizeof (struct nfsd), M_NFSD, M_ZERO);
+		malloc(sizeof (struct nfsd), M_NFSD, M_WAITOK | M_ZERO);
 	s = splnet();
 	nfsd->nfsd_td = td;
 	TAILQ_INSERT_TAIL(&nfsd_head, nfsd, nfsd_chain);
@@ -345,7 +345,7 @@ nfssvc_nfsd(struct thread *td)
 					slp->ns_flag &= ~SLP_NEEDQ;
 					(void) nfs_slplock(slp, 1);
 					nfsrv_rcv(slp->ns_so, (caddr_t)slp,
-						0);
+						M_TRYWAIT);
 					nfs_slpunlock(slp);
 				}
 				error = nfsrv_dorec(slp, nfsd, &nd);
@@ -471,7 +471,7 @@ nfssvc_nfsd(struct thread *td)
 			 * Record Mark.
 			 */
 			if (sotype == SOCK_STREAM) {
-				M_PREPEND(m, NFSX_UNSIGNED, 0);
+				M_PREPEND(m, NFSX_UNSIGNED, M_TRYWAIT);
 				*mtod(m, u_int32_t *) = htonl(0x80000000 | siz);
 			}
 			if (slp->ns_so->so_proto->pr_flags & PR_CONNREQUIRED)
@@ -671,12 +671,12 @@ nfsrv_init(int terminating)
 
 #if 0
 	nfs_udpsock = (struct nfssvc_sock *)
-	    malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_ZERO);
+	    malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK | M_ZERO);
 	STAILQ_INIT(&nfs_udpsock->ns_rec);
 	TAILQ_INSERT_HEAD(&nfssvc_sockhead, nfs_udpsock, ns_chain);
 
 	nfs_cltpsock = (struct nfssvc_sock *)
-	    malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_ZERO);
+	    malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK | M_ZERO);
 	STAILQ_INIT(&nfs_cltpsock->ns_rec);
 	TAILQ_INSERT_TAIL(&nfssvc_sockhead, nfs_cltpsock, ns_chain);
 #endif
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c
index 1b8a3381775f..8b51d698a6c0 100644
--- a/sys/opencrypto/cryptodev.c
+++ b/sys/opencrypto/cryptodev.c
@@ -228,7 +228,7 @@ cryptof_ioctl(
 			}
 
 			MALLOC(crie.cri_key, u_int8_t *,
-			    crie.cri_klen / 8, M_XDATA, 0);
+			    crie.cri_klen / 8, M_XDATA, M_WAITOK);
 			if ((error = copyin(sop->key, crie.cri_key,
 			    crie.cri_klen / 8)))
 				goto bail;
@@ -246,7 +246,7 @@ cryptof_ioctl(
 
 			if (cria.cri_klen) {
 				MALLOC(cria.cri_key, u_int8_t *,
-				    cria.cri_klen / 8, M_XDATA, 0);
+				    cria.cri_klen / 8, M_XDATA, M_WAITOK);
 				if ((error = copyin(sop->mackey, cria.cri_key,
 				    cria.cri_klen / 8)))
 					goto bail;
@@ -332,7 +332,7 @@ cryptodev_op(
 	cse->uio.uio_iov = cse->iovec;
 	bzero(&cse->iovec, sizeof(cse->iovec));
 	cse->uio.uio_iov[0].iov_len = cop->len;
-	cse->uio.uio_iov[0].iov_base = malloc(cop->len, M_XDATA, 0);
+	cse->uio.uio_iov[0].iov_base = malloc(cop->len, M_XDATA, M_WAITOK);
 	for (i = 0; i < cse->uio.uio_iovcnt; i++)
 		cse->uio.uio_resid += cse->uio.uio_iov[0].iov_len;
 
@@ -512,7 +512,7 @@ cryptodev_key(struct crypt_kop *kop)
 		return (EINVAL);
 	}
 
-	krp = (struct cryptkop *)malloc(sizeof *krp, M_XDATA, 0);
+	krp = (struct cryptkop *)malloc(sizeof *krp, M_XDATA, M_WAITOK);
 	if (!krp)
 		return (ENOMEM);
 	bzero(krp, sizeof *krp);
@@ -529,7 +529,7 @@ cryptodev_key(struct crypt_kop *kop)
 		size = (krp->krp_param[i].crp_nbits + 7) / 8;
 		if (size == 0)
 			continue;
-		MALLOC(krp->krp_param[i].crp_p, caddr_t, size, M_XDATA, 0);
+		MALLOC(krp->krp_param[i].crp_p, caddr_t, size, M_XDATA, M_WAITOK);
 		if (i >= krp->krp_iparams)
 			continue;
 		error = copyin(kop->crk_param[i].crp_p, krp->krp_param[i].crp_p, size);
@@ -719,7 +719,7 @@ cryptoioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 	switch (cmd) {
 	case CRIOGET:
 		MALLOC(fcr, struct fcrypt *,
-		    sizeof(struct fcrypt), M_XDATA, 0);
+		    sizeof(struct fcrypt), M_XDATA, M_WAITOK);
 		TAILQ_INIT(&fcr->csessions);
 		fcr->sesn = 0;
 
diff --git a/sys/pc98/cbus/scvtb.c b/sys/pc98/cbus/scvtb.c
index 05d5e5e33042..2d0ea3f03284 100644
--- a/sys/pc98/cbus/scvtb.c
+++ b/sys/pc98/cbus/scvtb.c
@@ -103,7 +103,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait)
 			vtb->vtb_buffer =
 			    (vm_offset_t)malloc(cols*rows*sizeof(u_int16_t)*2,
 				M_DEVBUF, 
-				((wait) ? 0 : M_NOWAIT) | M_ZERO);
+				((wait) ? M_WAITOK : M_NOWAIT) | M_ZERO);
 			if (vtb->vtb_buffer != 0) {
 				vtb->vtb_flags |= VTB_ALLOCED;
 			}
diff --git a/sys/pc98/pc98/scvtbpc98.c b/sys/pc98/pc98/scvtbpc98.c
index 05d5e5e33042..2d0ea3f03284 100644
--- a/sys/pc98/pc98/scvtbpc98.c
+++ b/sys/pc98/pc98/scvtbpc98.c
@@ -103,7 +103,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait)
 			vtb->vtb_buffer =
 			    (vm_offset_t)malloc(cols*rows*sizeof(u_int16_t)*2,
 				M_DEVBUF, 
-				((wait) ? 0 : M_NOWAIT) | M_ZERO);
+				((wait) ? M_WAITOK : M_NOWAIT) | M_ZERO);
 			if (vtb->vtb_buffer != 0) {
 				vtb->vtb_flags |= VTB_ALLOCED;
 			}
diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c
index db60e82890c6..3e3f43767dd3 100644
--- a/sys/pc98/pc98/spkr.c
+++ b/sys/pc98/pc98/spkr.c
@@ -503,7 +503,7 @@ spkropen(dev, flags, fmt, td)
 	(void) printf("spkropen: about to perform play initialization\n");
 #endif /* DEBUG */
 	playinit();
-	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, 0);
+	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, M_WAITOK);
 	spkr_active = TRUE;
 	return(0);
     }
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index 847ec74954ca..55ce644e24c6 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/syscons.c
@@ -315,7 +315,7 @@ sc_attach_unit(int unit, int flags)
 	    /* assert(sc_console->ts != NULL); */
 	    kernel_console_ts = sc_console->ts;
 	    sc_console->ts = malloc(sc_console->tsw->te_size,
-				    M_DEVBUF, 0);
+				    M_DEVBUF, M_WAITOK);
 	    bcopy(kernel_console_ts, sc_console->ts, sc_console->tsw->te_size);
     	    (*sc_console->tsw->te_default_attr)(sc_console,
 						user_default.std_color,
@@ -2696,9 +2696,9 @@ scinit(int unit, int flags)
 	    sc->font_16 = font_16;
 	} else if (sc->font_8 == NULL) {
 	    /* assert(sc_malloc) */
-	    sc->font_8 = malloc(sizeof(font_8), M_DEVBUF, 0);
-	    sc->font_14 = malloc(sizeof(font_14), M_DEVBUF, 0);
-	    sc->font_16 = malloc(sizeof(font_16), M_DEVBUF, 0);
+	    sc->font_8 = malloc(sizeof(font_8), M_DEVBUF, M_WAITOK);
+	    sc->font_14 = malloc(sizeof(font_14), M_DEVBUF, M_WAITOK);
+	    sc->font_16 = malloc(sizeof(font_16), M_DEVBUF, M_WAITOK);
 	}
 #endif
 
@@ -2725,7 +2725,7 @@ scinit(int unit, int flags)
 					 kernel_default.rev_color);
 	} else {
 	    /* assert(sc_malloc) */
-	    sc->dev = malloc(sizeof(dev_t)*sc->vtys, M_DEVBUF, M_ZERO);
+	    sc->dev = malloc(sizeof(dev_t)*sc->vtys, M_DEVBUF, M_WAITOK|M_ZERO);
 	    sc->dev[0] = makedev(CDEV_MAJOR, unit*MAXCONS);
 	    sc->dev[0]->si_tty = ttymalloc(sc->dev[0]->si_tty);
 	    scp = alloc_scp(sc, sc->first_vty);
@@ -2945,7 +2945,7 @@ static scr_stat
 
     /* assert(sc_malloc) */
 
-    scp = (scr_stat *)malloc(sizeof(scr_stat), M_DEVBUF, 0);
+    scp = (scr_stat *)malloc(sizeof(scr_stat), M_DEVBUF, M_WAITOK);
     init_scp(sc, vty, scp);
 
     sc_alloc_scr_buffer(scp, TRUE, TRUE);
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index 17e8e9bd5b47..1baabf4152cc 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -214,7 +214,7 @@ allocate_driver(struct slot *slt, struct dev_desc *desc)
 	}
 	irq = ffs(desc->irqmask) - 1;
 	MALLOC(devi, struct pccard_devinfo *, sizeof(*devi), M_DEVBUF,
-	    M_ZERO);
+	    M_WAITOK | M_ZERO);
 	strcpy(devi->name, desc->name);
 	/*
 	 *	Create an entry for the device under this slot.
diff --git a/sys/pci/agp.c b/sys/pci/agp.c
index 293011c26245..f8210267ccba 100644
--- a/sys/pci/agp.c
+++ b/sys/pci/agp.c
@@ -357,7 +357,7 @@ agp_generic_alloc_memory(device_t dev, int type, vm_size_t size)
 		return 0;
 	}
 
-	mem = malloc(sizeof *mem, M_AGP, 0);
+	mem = malloc(sizeof *mem, M_AGP, M_WAITOK);
 	mem->am_id = sc->as_nextid++;
 	mem->am_size = size;
 	mem->am_type = 0;
diff --git a/sys/pci/agp_i810.c b/sys/pci/agp_i810.c
index 7590c501fe09..39890ac4cd64 100644
--- a/sys/pci/agp_i810.c
+++ b/sys/pci/agp_i810.c
@@ -567,7 +567,7 @@ agp_i810_alloc_memory(device_t dev, int type, vm_size_t size)
 			return 0;
 	}
 
-	mem = malloc(sizeof *mem, M_AGP, 0);
+	mem = malloc(sizeof *mem, M_AGP, M_WAITOK);
 	mem->am_id = sc->agp.as_nextid++;
 	mem->am_size = size;
 	mem->am_type = type;
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index 0fb625d83621..1570ea452602 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -2428,11 +2428,11 @@ dc_newbuf(sc, i, m)
 	c = &sc->dc_ldata->dc_rx_list[i];
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -3192,11 +3192,11 @@ dc_coal(sc, m_head)
 	struct mbuf		*m_new, *m;
 
 	m = *m_head;
-	MGETHDR(m_new, M_NOWAIT, MT_DATA);
+	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 	if (m_new == NULL)
 		return(ENOBUFS);
 	if (m->m_pkthdr.len > MHLEN) {
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 9e1e319b2f2b..d1865865a099 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -195,7 +195,7 @@ tulip_txprobe(
      * either is connected so the transmit is the only way
      * to verify the connectivity.
      */
-    MGETHDR(m, M_NOWAIT, MT_DATA);
+    MGETHDR(m, M_DONTWAIT, MT_DATA);
     if (m == NULL)
 	return 0;
     /*
@@ -3545,12 +3545,12 @@ tulip_rx_intr(
 	 */
 	if (accept || ms == NULL) {
 	    struct mbuf *m0;
-	    MGETHDR(m0, M_NOWAIT, MT_DATA);
+	    MGETHDR(m0, M_DONTWAIT, MT_DATA);
 	    if (m0 != NULL) {
 #if defined(TULIP_COPY_RXDATA)
 		if (!accept || total_len >= (MHLEN - 2)) {
 #endif
-		    MCLGET(m0, M_NOWAIT);
+		    MCLGET(m0, M_DONTWAIT);
 		    if ((m0->m_flags & M_EXT) == 0) {
 			m_freem(m0);
 			m0 = NULL;
@@ -4061,10 +4061,10 @@ tulip_mbuf_compress(
 {
     struct mbuf *m0;
 #if MCLBYTES >= ETHERMTU + 18 && !defined(BIG_PACKET)
-    MGETHDR(m0, M_NOWAIT, MT_DATA);
+    MGETHDR(m0, M_DONTWAIT, MT_DATA);
     if (m0 != NULL) {
 	if (m->m_pkthdr.len > MHLEN) {
-	    MCLGET(m0, M_NOWAIT);
+	    MCLGET(m0, M_DONTWAIT);
 	    if ((m0->m_flags & M_EXT) == 0) {
 		m_freem(m);
 		m_freem(m0);
@@ -4081,9 +4081,9 @@ tulip_mbuf_compress(
 
     while (len > 0) {
 	if (mlen == MHLEN) {
-	    MGETHDR(*mp, M_NOWAIT, MT_DATA);
+	    MGETHDR(*mp, M_DONTWAIT, MT_DATA);
 	} else {
-	    MGET(*mp, M_NOWAIT, MT_DATA);
+	    MGET(*mp, M_DONTWAIT, MT_DATA);
 	}
 	if (*mp == NULL) {
 	    m_freem(m0);
@@ -4091,7 +4091,7 @@ tulip_mbuf_compress(
 	    break;
 	}
 	if (len > MLEN) {
-	    MCLGET(*mp, M_NOWAIT);
+	    MCLGET(*mp, M_DONTWAIT);
 	    if (((*mp)->m_flags & M_EXT) == 0) {
 		m_freem(m0);
 		m0 = NULL;
diff --git a/sys/pci/if_mn.c b/sys/pci/if_mn.c
index 7ed07d112edd..b809d6bf8961 100644
--- a/sys/pci/if_mn.c
+++ b/sys/pci/if_mn.c
@@ -695,7 +695,7 @@ ngmn_connect(hook_p hook)
 	/* Setup a transmit chain with one descriptor */
 	/* XXX: we actually send a 1 byte packet */
 	dp = mn_alloc_desc();
-	MGETHDR(m, 0, MT_DATA);
+	MGETHDR(m, M_TRYWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOBUFS;
 	m->m_pkthdr.len = 0;
@@ -712,12 +712,12 @@ ngmn_connect(hook_p hook)
 
 	dp = mn_alloc_desc();
 	m = NULL;
-	MGETHDR(m, 0, MT_DATA);
+	MGETHDR(m, M_TRYWAIT, MT_DATA);
 	if (m == NULL) {
 		mn_free_desc(dp);
 		return (ENOBUFS);
 	}
-	MCLGET(m, 0);
+	MCLGET(m, M_TRYWAIT);
 	if ((m->m_flags & M_EXT) == 0) {
 		mn_free_desc(dp);
 		m_freem(m);
@@ -735,13 +735,13 @@ ngmn_connect(hook_p hook)
 		dp2 = dp;
 		dp = mn_alloc_desc();
 		m = NULL;
-		MGETHDR(m, 0, MT_DATA);
+		MGETHDR(m, M_TRYWAIT, MT_DATA);
 		if (m == NULL) {
 			mn_free_desc(dp);
 			m_freem(m);
 			return (ENOBUFS);
 		}
-		MCLGET(m, 0);
+		MCLGET(m, M_TRYWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			mn_free_desc(dp);
 			m_freem(m);
@@ -839,7 +839,7 @@ mn_create_channel(struct mn_softc *sc, int chan)
 	struct schan *sch;
 
 	sch = sc->ch[chan] = (struct schan *)malloc(sizeof *sc->ch[chan], 
-	    M_MN, M_ZERO);
+	    M_MN, M_WAITOK | M_ZERO);
 	sch->sc = sc;
 	sch->state = DOWN;
 	sch->chan = chan;
@@ -1183,12 +1183,12 @@ mn_rx_intr(struct mn_softc *sc, u_int32_t vector)
 
 		/* Replenish desc + mbuf supplies */
 		if (!m) {
-			MGETHDR(m, M_NOWAIT, MT_DATA);
+			MGETHDR(m, M_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				mn_free_desc(dp);
 				return; /* ENOBUFS */
 			}
-			MCLGET(m, M_NOWAIT);
+			MCLGET(m, M_DONTWAIT);
 			if((m->m_flags & M_EXT) == 0) {
 				mn_free_desc(dp);
 				m_freem(m);
@@ -1340,7 +1340,7 @@ mn_attach (device_t self)
 		once++;
 	}
 
-	sc = (struct mn_softc *)malloc(sizeof *sc, M_MN, M_ZERO);
+	sc = (struct mn_softc *)malloc(sizeof *sc, M_MN, M_WAITOK | M_ZERO);
 	device_set_softc(self, sc);
 
 	sc->dev = self;
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index 1bb5d1854155..c9f961b5e5eb 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -775,11 +775,11 @@ pcn_newbuf(sc, idx, m)
 	c = &sc->pcn_ldata->pcn_rx_list[idx];
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 39cc6e87306d..341770f41586 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -1500,11 +1500,11 @@ rl_encap(sc, m_head)
 	 * per packet. We have to copy pretty much all the time.
 	 */
 
-	MGETHDR(m_new, M_NOWAIT, MT_DATA);
+	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 	if (m_new == NULL)
 		return(1);
 	if (m_head->m_pkthdr.len > MHLEN) {
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(1);
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index 7b63a0120518..a148ba575862 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -924,11 +924,11 @@ sf_newbuf(sc, c, m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1304,14 +1304,14 @@ sf_encap(sc, c, m_head)
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("sf%d: no memory for tx list\n", sc->sf_unit);
 			return(1);
 		}
 
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_NOWAIT);
+			MCLGET(m_new, M_DONTWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				printf("sf%d: no memory for tx list\n",
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 3be4b3cfc930..7f72c39f4d3f 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -1544,7 +1544,7 @@ sis_newbuf(sc, c, m)
 		return(EINVAL);
 
 	if (m == NULL) {
-		m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
+		m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
 		if (m == NULL)
 			return(ENOBUFS);
 	} else
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 3aa40e797070..e58d1c4f2803 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -688,7 +688,7 @@ sk_newbuf(sc_if, c, m)
 	if (m == NULL) {
 		caddr_t			*buf = NULL;
 
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 4e5e9b77f83d..370b0f52ae7a 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -1142,10 +1142,10 @@ ste_newbuf(sc, c, m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1519,13 +1519,13 @@ encap_retry:
 		 * mbuf chain first. Bail out if we can't get the
 		 * new buffers. Code borrowed from if_fxp.c
 		 */
-		MGETHDR(mn, M_NOWAIT, MT_DATA);
+		MGETHDR(mn, M_DONTWAIT, MT_DATA);
 		if (mn == NULL) {
 			m_freem(m_head);
 			return ENOMEM;
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(mn, M_NOWAIT);
+			MCLGET(mn, M_DONTWAIT);
 			if ((mn->m_flags & M_EXT) == 0) {
 				m_freem(mn);
 				m_freem(m_head);
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index 894ac43559a5..a3843223270e 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -1130,11 +1130,11 @@ ti_newbuf_std(sc, i, m)
 	struct ti_rx_desc	*r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1174,7 +1174,7 @@ ti_newbuf_mini(sc, i, m)
 	struct ti_rx_desc	*r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
@@ -1218,7 +1218,7 @@ ti_newbuf_jumbo(sc, i, m)
 		caddr_t			*buf = NULL;
 
 		/* Allocate the mbuf. */
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
@@ -1300,19 +1300,19 @@ ti_newbuf_jumbo(sc, idx, m_old)
 		}
 	} else {
 		/* Allocate the mbufs. */
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("ti%d: mbuf allocation failed "
    			       "-- packet dropped!\n", sc->ti_unit);
 			goto nobufs;
 		}
-		MGET(m[NPAYLOAD], M_NOWAIT, MT_DATA);
+		MGET(m[NPAYLOAD], M_DONTWAIT, MT_DATA);
 		if (m[NPAYLOAD] == NULL) {
 			printf("ti%d: cluster mbuf allocation failed "
 			       "-- packet dropped!\n", sc->ti_unit);
 			goto nobufs;
 		}
-		MCLGET(m[NPAYLOAD], M_NOWAIT);
+		MCLGET(m[NPAYLOAD], M_DONTWAIT);
 		if ((m[NPAYLOAD]->m_flags & M_EXT) == 0) {
 			printf("ti%d: mbuf allocation failed "
 			       "-- packet dropped!\n", sc->ti_unit);
@@ -1321,7 +1321,7 @@ ti_newbuf_jumbo(sc, idx, m_old)
 		m[NPAYLOAD]->m_len = MCLBYTES;
 
 		for (i = 0; i < NPAYLOAD; i++){
-			MGET(m[i], M_NOWAIT, MT_DATA);
+			MGET(m[i], M_DONTWAIT, MT_DATA);
 			if (m[i] == NULL) {
 				printf("ti%d: mbuf allocation failed "
 				       "-- packet dropped!\n", sc->ti_unit);
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index 682bbef236f0..0fc990abe644 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -1459,11 +1459,11 @@ tl_newbuf(sc, c)
 {
 	struct mbuf		*m_new = NULL;
 
-	MGETHDR(m_new, M_NOWAIT, MT_DATA);
+	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 	if (m_new == NULL)
 		return(ENOBUFS);
 
-	MCLGET(m_new, M_NOWAIT);
+	MCLGET(m_new, M_DONTWAIT);
 	if (!(m_new->m_flags & M_EXT)) {
 		m_freem(m_new);
 		return(ENOBUFS);
@@ -1909,13 +1909,13 @@ tl_encap(sc, c, m_head)
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			if_printf(ifp, "no memory for tx list\n");
 			return(1);
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_NOWAIT);
+			MCLGET(m_new, M_DONTWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				if_printf(ifp, "no memory for tx list\n");
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index b6d472d622da..95e4670835a1 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -1041,11 +1041,11 @@ vr_newbuf(sc, c, m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_NOWAIT);
+		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1423,13 +1423,13 @@ vr_encap(sc, c, m_head)
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("vr%d: no memory for tx list\n", sc->vr_unit);
 			return(1);
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_NOWAIT);
+			MCLGET(m_new, M_DONTWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				printf("vr%d: no memory for tx list\n",
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index 0ceaecbb7938..30618af8cc70 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -1112,7 +1112,7 @@ wb_newbuf(sc, c, m)
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 		m_new->m_data = c->wb_buf;
@@ -1467,11 +1467,11 @@ wb_encap(sc, c, m_head)
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(1);
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_NOWAIT);
+			MCLGET(m_new, M_DONTWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				return(1);
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index c26718874dde..e4c7ad60aba0 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -930,7 +930,7 @@ xl_testpacket(sc)
 
 	ifp = &sc->arpcom.ac_if;
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 
 	if (m == NULL)
 		return;
@@ -1937,11 +1937,11 @@ xl_newbuf(sc, c)
 	int			error;
 	u_int32_t		baddr;
 
-	MGETHDR(m_new, M_NOWAIT, MT_DATA);
+	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 	if (m_new == NULL)
 		return(ENOBUFS);
 
-	MCLGET(m_new, M_NOWAIT);
+	MCLGET(m_new, M_DONTWAIT);
 	if (!(m_new->m_flags & M_EXT)) {
 		m_freem(m_new);
 		return(ENOBUFS);
@@ -2441,14 +2441,14 @@ xl_encap(sc, c, m_head)
 	if (error) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			m_freem(m_head);
 			printf("xl%d: no memory for tx list\n", sc->xl_unit);
 			return(1);
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_NOWAIT);
+			MCLGET(m_new, M_DONTWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				m_freem(m_head);
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index e91a39281258..bd7b5c318cd3 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -3602,7 +3602,7 @@ ncr_attach (device_t dev)
 			 0, 0xffffffff, PAGE_SIZE);
 	} else {
 		np->script  = (struct script *)
-			malloc (sizeof (struct script), M_DEVBUF, 0);
+			malloc (sizeof (struct script), M_DEVBUF, M_WAITOK);
 	}
 
 	/* XXX JGibbs - Use contigmalloc */
@@ -3613,7 +3613,7 @@ ncr_attach (device_t dev)
 	} else 
 		{
 		np->scripth = (struct scripth *)
-			malloc (sizeof (struct scripth), M_DEVBUF, 0);
+			malloc (sizeof (struct scripth), M_DEVBUF, M_WAITOK);
 	}
 
 #ifdef SCSI_NCR_PCI_CONFIG_FIXUP
diff --git a/sys/pci/simos.c b/sys/pci/simos.c
index 6b865dda828f..040e042c4fe3 100644
--- a/sys/pci/simos.c
+++ b/sys/pci/simos.c
@@ -111,7 +111,7 @@ simos_attach(pcici_t config_id, int unit)
 	struct simos_softc* sc;
 	struct cam_devq *devq;
 
-	sc = malloc(sizeof(struct simos_softc), M_DEVBUF, M_ZERO);
+	sc = malloc(sizeof(struct simos_softc), M_DEVBUF, M_WAITOK | M_ZERO);
 	simosp[unit] = sc;
 
 	sc->sc_unit = unit;
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index 7afa22c242ec..dc218965c189 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -164,7 +164,7 @@ xrpu_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct  thread *tdr)
 		/* Name SHALL be zero terminated */
 		xt->xt_name[sizeof xt->xt_name - 1] = '\0';
 		i = strlen(xt->xt_name);
-		sc->tc.tc_name = (char *)malloc(i + 1, M_XRPU, 0);
+		sc->tc.tc_name = (char *)malloc(i + 1, M_XRPU, M_WAITOK);
 		strcpy(sc->tc.tc_name, xt->xt_name);
 		sc->tc.tc_frequency = xt->xt_frequency;
 		sc->tc.tc_get_timecount = xrpu_get_timecount;
diff --git a/sys/posix4/posix4.h b/sys/posix4/posix4.h
index 033c1ec46f1b..b17e9270e675 100644
--- a/sys/posix4/posix4.h
+++ b/sys/posix4/posix4.h
@@ -56,7 +56,7 @@ int SC (struct thread *td, struct SC##_args *uap) \
 
 MALLOC_DECLARE(M_P31B);
 
-#define p31b_malloc(SIZE) malloc((SIZE), M_P31B, 0)
+#define p31b_malloc(SIZE) malloc((SIZE), M_P31B, M_WAITOK)
 #define p31b_free(P) free((P), M_P31B)
 
 int p31b_proc(struct proc *, pid_t, struct proc **);
diff --git a/sys/powerpc/aim/nexus.c b/sys/powerpc/aim/nexus.c
index 7172962c61d1..7472bbeac881 100644
--- a/sys/powerpc/aim/nexus.c
+++ b/sys/powerpc/aim/nexus.c
@@ -392,7 +392,7 @@ create_device_from_node(device_t parent, phandle_t node)
 	OF_getprop_alloc(node, "compatible", 1, (void **)&compatible);
 	cdev = device_add_child(parent, NULL, -1);
 	if (cdev != NULL) {
-		dinfo = malloc(sizeof(*dinfo), M_NEXUS, 0);
+		dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK);
 		dinfo->ndi_node = node;
 		dinfo->ndi_name = name;
 		dinfo->ndi_device_type = type;
diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c
index 0497ff46f4df..016643e9431c 100644
--- a/sys/powerpc/powermac/macio.c
+++ b/sys/powerpc/powermac/macio.c
@@ -280,7 +280,7 @@ macio_attach(device_t dev)
 
 		cdev = device_add_child(dev, NULL, -1);
 		if (cdev != NULL) {
-			dinfo = malloc(sizeof(*dinfo), M_MACIO, 0);
+			dinfo = malloc(sizeof(*dinfo), M_MACIO, M_WAITOK);
 			memset(dinfo, 0, sizeof(*dinfo));
 			resource_list_init(&dinfo->mdi_resources);
 			dinfo->mdi_node = child;
diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c
index 6ab1667af103..b7ff1de17c0e 100644
--- a/sys/powerpc/powerpc/busdma_machdep.c
+++ b/sys/powerpc/powerpc/busdma_machdep.c
@@ -210,7 +210,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 	
         if (dmat->maxsize <= PAGE_SIZE) {
                 *vaddr = malloc(dmat->maxsize, M_DEVBUF,
-                             (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0);
+                             (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
         } else {
                 /*
                  * XXX Use Contigmalloc until it is merged into this facility
@@ -218,7 +218,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
                  *     multi-seg allocations yet though.
                  */
                 *vaddr = contigmalloc(dmat->maxsize, M_DEVBUF,
-                    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
+                    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
                     0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
                     dmat->boundary);
         }
diff --git a/sys/powerpc/powerpc/extintr.c b/sys/powerpc/powerpc/extintr.c
index 345c593f73fd..48e893dbf5fd 100644
--- a/sys/powerpc/powerpc/extintr.c
+++ b/sys/powerpc/powerpc/extintr.c
@@ -452,7 +452,7 @@ intr_establish(int irq, int type, int level, int (*ih_fun)(void *),
 	irq = mapirq(irq);
 
 	/* no point in sleeping unless someone can free memory. */
-	ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : 0);
+	ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : M_WAITOK);
 	if (ih == NULL)
 		panic("intr_establish: can't malloc handler info");
 
diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c
index 7172962c61d1..7472bbeac881 100644
--- a/sys/powerpc/powerpc/nexus.c
+++ b/sys/powerpc/powerpc/nexus.c
@@ -392,7 +392,7 @@ create_device_from_node(device_t parent, phandle_t node)
 	OF_getprop_alloc(node, "compatible", 1, (void **)&compatible);
 	cdev = device_add_child(parent, NULL, -1);
 	if (cdev != NULL) {
-		dinfo = malloc(sizeof(*dinfo), M_NEXUS, 0);
+		dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK);
 		dinfo->ndi_node = node;
 		dinfo->ndi_name = name;
 		dinfo->ndi_device_type = type;
diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c
index 21534b3f9479..3428125835b6 100644
--- a/sys/powerpc/psim/iobus.c
+++ b/sys/powerpc/psim/iobus.c
@@ -215,7 +215,7 @@ iobus_attach(device_t dev)
 
                 cdev = device_add_child(dev, NULL, -1);
                 if (cdev != NULL) {
-                        dinfo = malloc(sizeof(*dinfo), M_IOBUS, 0);
+                        dinfo = malloc(sizeof(*dinfo), M_IOBUS, M_WAITOK);
 			memset(dinfo, 0, sizeof(*dinfo));
 			resource_list_init(&dinfo->id_resources);
                         dinfo->id_node = child;
diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c
index b4df06f8964f..e9d9eeb3b51a 100644
--- a/sys/security/mac/mac_framework.c
+++ b/sys/security/mac/mac_framework.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, 0);
+	mac_init_socket_label(&intlabel, M_WAITOK);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, 0);
+	    buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, 0);
+	    elements, buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, 0);
+	    elements, buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, 0);
+			    elements, buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, 0);
+		    buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index b4df06f8964f..e9d9eeb3b51a 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, 0);
+	mac_init_socket_label(&intlabel, M_WAITOK);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, 0);
+	    buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, 0);
+	    elements, buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, 0);
+	    elements, buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, 0);
+			    elements, buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, 0);
+		    buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c
index b4df06f8964f..e9d9eeb3b51a 100644
--- a/sys/security/mac/mac_net.c
+++ b/sys/security/mac/mac_net.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, 0);
+	mac_init_socket_label(&intlabel, M_WAITOK);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, 0);
+	    buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, 0);
+	    elements, buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, 0);
+	    elements, buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, 0);
+			    elements, buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, 0);
+		    buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c
index b4df06f8964f..e9d9eeb3b51a 100644
--- a/sys/security/mac/mac_pipe.c
+++ b/sys/security/mac/mac_pipe.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, 0);
+	mac_init_socket_label(&intlabel, M_WAITOK);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, 0);
+	    buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, 0);
+	    elements, buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, 0);
+	    elements, buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, 0);
+			    elements, buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, 0);
+		    buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c
index b4df06f8964f..e9d9eeb3b51a 100644
--- a/sys/security/mac/mac_process.c
+++ b/sys/security/mac/mac_process.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, 0);
+	mac_init_socket_label(&intlabel, M_WAITOK);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, 0);
+	    buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, 0);
+	    elements, buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, 0);
+	    elements, buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, 0);
+			    elements, buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, 0);
+		    buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c
index b4df06f8964f..e9d9eeb3b51a 100644
--- a/sys/security/mac/mac_syscalls.c
+++ b/sys/security/mac/mac_syscalls.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, 0);
+	mac_init_socket_label(&intlabel, M_WAITOK);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, 0);
+	    buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, 0);
+	    elements, buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, 0);
+	    elements, buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, 0);
+			    elements, buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, 0);
+		    buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index b4df06f8964f..e9d9eeb3b51a 100644
--- a/sys/security/mac/mac_system.c
+++ b/sys/security/mac/mac_system.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, 0);
+	mac_init_socket_label(&intlabel, M_WAITOK);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, 0);
+	    buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, 0);
+	    elements, buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, 0);
+	    elements, buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, 0);
+			    elements, buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, 0);
+		    buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c
index b4df06f8964f..e9d9eeb3b51a 100644
--- a/sys/security/mac/mac_vfs.c
+++ b/sys/security/mac/mac_vfs.c
@@ -758,7 +758,7 @@ mac_init_pipe(struct pipe *pipe)
 {
 	struct label *label;
 
-	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO);
+	label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK);
 	pipe->pipe_label = label;
 	pipe->pipe_peer->pipe_label = label;
 	mac_init_pipe_label(label);
@@ -1323,7 +1323,7 @@ mac_execve_enter(struct image_params *imgp, struct mac *mac_p,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2727,16 +2727,16 @@ mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -2763,7 +2763,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -2839,14 +2839,14 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
 		return (error);
 	}
 
-	mac_init_socket_label(&intlabel, 0);
+	mac_init_socket_label(&intlabel, M_WAITOK);
 	error = mac_internalize_socket_label(&intlabel, buffer);
 	free(buffer, M_MACTEMP);
 	if (error) {
@@ -2893,16 +2893,16 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_label(&so->so_label, elements,
-	    buffer, mac->m_buflen, 0);
+	    buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -2923,16 +2923,16 @@ mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
 	if (error)
 		return (error);
 
-	elements = malloc(mac->m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac->m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_socket_peer_label(&so->so_peerlabel,
-	    elements, buffer, mac->m_buflen, 0);
+	    elements, buffer, mac->m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac->m_string, strlen(buffer)+1);
 
@@ -3040,7 +3040,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3048,9 +3048,9 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&tcred->cr_label, elements,
-	    buffer, mac.m_buflen, 0);
+	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3078,16 +3078,16 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	error = mac_externalize_cred_label(&td->td_ucred->cr_label,
-	    elements, buffer, mac.m_buflen, 0);
+	    elements, buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
 
@@ -3117,7 +3117,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3194,14 +3194,14 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	error = fget(td, uap->fd, &fp);
 	if (error)
@@ -3241,12 +3241,12 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
 	case DTYPE_VNODE:
 		if (error == 0)
 			error = mac_externalize_vnode_label(&intlabel,
-			    elements, buffer, mac.m_buflen, 0);
+			    elements, buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_vnode_label(&intlabel);
 		break;
 	case DTYPE_PIPE:
 		error = mac_externalize_pipe_label(&intlabel, elements,
-		    buffer, mac.m_buflen, 0);
+		    buffer, mac.m_buflen, M_WAITOK);
 		mac_destroy_pipe_label(&intlabel);
 		break;
 	default:
@@ -3284,14 +3284,14 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3302,7 +3302,7 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
@@ -3339,14 +3339,14 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	if (error)
 		return (error);
 
-	elements = malloc(mac.m_buflen, M_MACTEMP, 0);
+	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
 		return (error);
 	}
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, M_ZERO);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3357,7 +3357,7 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
-	    mac.m_buflen, 0);
+	    mac.m_buflen, M_WAITOK);
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
@@ -3396,7 +3396,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3482,7 +3482,7 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3538,7 +3538,7 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
 	if (error)
 		return (error);
 
-	buffer = malloc(mac.m_buflen, M_MACTEMP, 0);
+	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c
index 83ba80409076..4674d0792f35 100644
--- a/sys/security/mac_biba/mac_biba.c
+++ b/sys/security/mac_biba/mac_biba.c
@@ -505,7 +505,7 @@ static void
 mac_biba_init_label(struct label *label)
 {
 
-	SLOT(label) = biba_alloc(0);
+	SLOT(label) = biba_alloc(M_WAITOK);
 }
 
 static int
diff --git a/sys/security/mac_bsdextended/mac_bsdextended.c b/sys/security/mac_bsdextended/mac_bsdextended.c
index 9231125e4a1e..ba357fffc9c0 100644
--- a/sys/security/mac_bsdextended/mac_bsdextended.c
+++ b/sys/security/mac_bsdextended/mac_bsdextended.c
@@ -164,7 +164,7 @@ sysctl_rule(SYSCTL_HANDLER_ARGS)
 		if (rules[index] == NULL) {
 			/* printf("addition\n"); */
 			MALLOC(ruleptr, struct mac_bsdextended_rule *,
-			    sizeof(*ruleptr), M_MACBSDEXTENDED,
+			    sizeof(*ruleptr), M_MACBSDEXTENDED, M_WAITOK |
 			    M_ZERO);
 			*ruleptr = temprule;
 			rules[index] = ruleptr;
diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c
index 8351c0004a3a..ef11d6332a1d 100644
--- a/sys/security/mac_lomac/mac_lomac.c
+++ b/sys/security/mac_lomac/mac_lomac.c
@@ -621,7 +621,7 @@ static void
 mac_lomac_init_label(struct label *label)
 {
 
-	SLOT(label) = lomac_alloc(0);
+	SLOT(label) = lomac_alloc(M_WAITOK);
 }
 
 static int
@@ -640,7 +640,7 @@ mac_lomac_init_proc_label(struct label *label)
 {
 
 	PSLOT(label) = malloc(sizeof(struct mac_lomac_proc), M_MACLOMAC,
-	    M_ZERO);
+	    M_ZERO | M_WAITOK);
 	mtx_init(&PSLOT(label)->mtx, "MAC/Lomac proc lock", NULL, MTX_DEF);
 }
 
diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c
index b4aa3e0c62d6..c9d89272e282 100644
--- a/sys/security/mac_mls/mac_mls.c
+++ b/sys/security/mac_mls/mac_mls.c
@@ -470,7 +470,7 @@ static void
 mac_mls_init_label(struct label *label)
 {
 
-	SLOT(label) = mls_alloc(0);
+	SLOT(label) = mls_alloc(M_WAITOK);
 }
 
 static int
diff --git a/sys/sparc64/ebus/ebus.c b/sys/sparc64/ebus/ebus.c
index 71470601ff32..42d78c858c1e 100644
--- a/sys/sparc64/ebus/ebus.c
+++ b/sys/sparc64/ebus/ebus.c
@@ -371,7 +371,7 @@ ebus_setup_dinfo(struct ebus_softc *sc, phandle_t node, char *name)
 	u_int64_t start;
 	int nreg, nintr, i;
 
-	edi = malloc(sizeof(*edi), M_DEVBUF, M_ZERO);
+	edi = malloc(sizeof(*edi), M_DEVBUF, M_ZERO | M_WAITOK);
 	if (edi == NULL)
 		return (NULL);
 	resource_list_init(&edi->edi_rl);
diff --git a/sys/sparc64/pci/ofw_pci.c b/sys/sparc64/pci/ofw_pci.c
index 3875a290dda1..3787a00bd0d1 100644
--- a/sys/sparc64/pci/ofw_pci.c
+++ b/sys/sparc64/pci/ofw_pci.c
@@ -94,7 +94,7 @@ ofw_pci_orb_callback(phandle_t node, u_int8_t *pintptr, int pintsz,
 		bcopy(pregptr, &preg, sizeof(preg));
 		intr = (OFW_PCI_PHYS_HI_DEVICE(preg.phys_hi) + pintr + 3) %
 		    4 + 1;
-		*rintr = malloc(sizeof(intr), M_OFWPROP, 0);
+		*rintr = malloc(sizeof(intr), M_OFWPROP, M_WAITOK);
 		bcopy(&intr, *rintr, sizeof(intr));
 		*terminate = 0;
 		return (sizeof(intr));
@@ -134,7 +134,7 @@ ofw_pci_alloc_busno(phandle_t node)
 		om = pci_bus_map;
 		pci_bus_map_sz = n + PCI_BUS_MAP_INC;
 		pci_bus_map = malloc(sizeof(*pci_bus_map) * pci_bus_map_sz,
-		    M_DEVBUF, M_ZERO);
+		    M_DEVBUF, M_WAITOK | M_ZERO);
 		if (om != NULL) {
 			bcopy(om, pci_bus_map, sizeof(*om) * osz);
 			free(om, M_DEVBUF);
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index 6413fd3e2a64..9fd83e222a41 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -617,7 +617,7 @@ psycho_attach(device_t dev)
 		 */
 		if (INTVEC(mr) != 0x7e6 && INTVEC(mr) != 0x7e7 &&
 		    INTVEC(mr) != 0) {
-			sclr = malloc(sizeof(*sclr), M_DEVBUF, 0);
+			sclr = malloc(sizeof(*sclr), M_DEVBUF, M_WAITOK);
 			sclr->psc_sc = sc;
 			sclr->psc_clr = clr;
 			intr_setup(PIL_LOW, intr_fast, INTVEC(mr),
diff --git a/sys/sparc64/sbus/sbus.c b/sys/sparc64/sbus/sbus.c
index 9df93a7d7179..46648291f4f8 100644
--- a/sys/sparc64/sbus/sbus.c
+++ b/sys/sparc64/sbus/sbus.c
@@ -486,7 +486,7 @@ sbus_setup_dinfo(struct sbus_softc *sc, phandle_t node, char *name)
 	u_int32_t base, iv, *intr;
 	int i, nreg, nintr, slot, rslot;
 
-	sdi = malloc(sizeof(*sdi), M_DEVBUF, M_ZERO);
+	sdi = malloc(sizeof(*sdi), M_DEVBUF, M_ZERO | M_WAITOK);
 	if (sdi == NULL)
 		return (NULL);
 	resource_list_init(&sdi->sdi_rl);
diff --git a/sys/sparc64/sparc64/bus_machdep.c b/sys/sparc64/sparc64/bus_machdep.c
index 0c26023a22d0..71e1d0b8f967 100644
--- a/sys/sparc64/sparc64/bus_machdep.c
+++ b/sys/sparc64/sparc64/bus_machdep.c
@@ -623,7 +623,7 @@ nexus_dmamem_alloc_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
 
 	if ((size <= PAGE_SIZE)) {
 		*vaddr = malloc(size, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0);
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
 	} else {
 		/*
 		 * XXX: Use contigmalloc until it is merged into this facility
@@ -631,7 +631,7 @@ nexus_dmamem_alloc_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
 		 * allocations yet though.
 		 */
 		*vaddr = contigmalloc(size, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
 		    0ul, ddmat->dt_lowaddr,
 		    ddmat->dt_alignment ? ddmat->dt_alignment : 1UL,
 		    ddmat->dt_boundary);
diff --git a/sys/sparc64/sparc64/counter.c b/sys/sparc64/sparc64/counter.c
index d90b89f286c3..19bffef94f43 100644
--- a/sys/sparc64/sparc64/counter.c
+++ b/sys/sparc64/sparc64/counter.c
@@ -83,8 +83,8 @@ sparc64_counter_init(bus_space_tag_t tag, bus_space_handle_t handle,
 	bus_space_write_8(tag, handle, offset + CTR_CT1 + CTR_LIMIT,
 	    COUNTER_MASK);
 	/* Register as a time counter. */
-	tc = malloc(sizeof(*tc), M_DEVBUF, 0);
-	sc = malloc(sizeof(*sc), M_DEVBUF, 0);
+	tc = malloc(sizeof(*tc), M_DEVBUF, M_WAITOK);
+	sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK);
 	sc->sc_tag = tag;
 	sc->sc_handle = handle;
 	sc->sc_offset = offset + CTR_CT0;
diff --git a/sys/sparc64/sparc64/iommu.c b/sys/sparc64/sparc64/iommu.c
index 6332ca996293..605946061af0 100644
--- a/sys/sparc64/sparc64/iommu.c
+++ b/sys/sparc64/sparc64/iommu.c
@@ -684,7 +684,7 @@ iommu_dvmamem_alloc_size(bus_dma_tag_t pt, bus_dma_tag_t dt,
 	if ((error = sparc64_dmamem_alloc_map(dt, mapp)) != 0)
 		return (error);
 	if ((*vaddr = malloc(size, M_IOMMU,
-	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0)) == NULL) {
+	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL) {
 		error = ENOMEM;
 		sparc64_dmamem_free_map(dt, *mapp);
 		return (error);
diff --git a/sys/sparc64/sparc64/mem.c b/sys/sparc64/sparc64/mem.c
index 1edb50e3b705..cb20e6a65450 100644
--- a/sys/sparc64/sparc64/mem.c
+++ b/sys/sparc64/sparc64/mem.c
@@ -150,7 +150,7 @@ mmrw(dev_t dev, struct uio *uio, int flags)
 		case 0:
 			/* mem (physical memory) */
 			if (buf == NULL) {
-				buf = malloc(PAGE_SIZE, M_DEVBUF, 0);
+				buf = malloc(PAGE_SIZE, M_DEVBUF, M_WAITOK);
 				if (buf == NULL) {
 					error = ENOMEM;
 					break;
diff --git a/sys/sparc64/sparc64/nexus.c b/sys/sparc64/sparc64/nexus.c
index 0a1ee91fced1..cf70ced52f70 100644
--- a/sys/sparc64/sparc64/nexus.c
+++ b/sys/sparc64/sparc64/nexus.c
@@ -234,7 +234,7 @@ nexus_probe(device_t dev)
 		}
 		cdev = device_add_child(dev, NULL, -1);
 		if (cdev != NULL) {
-			dinfo = malloc(sizeof(*dinfo), M_NEXUS, 0);
+			dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK);
 			dinfo->ndi_node = child;
 			dinfo->ndi_name = name;
 			dinfo->ndi_device_type = type;
diff --git a/sys/sparc64/sparc64/ofw_bus.c b/sys/sparc64/sparc64/ofw_bus.c
index 3d5736e7359d..605a347d7940 100644
--- a/sys/sparc64/sparc64/ofw_bus.c
+++ b/sys/sparc64/sparc64/ofw_bus.c
@@ -108,7 +108,7 @@ ofw_bus_find_intr(u_int8_t *intr, int intrsz, u_int8_t *regs, int physsz,
 	int i, rsz, tsz;
 
 	rsz = -1;
-	ref = malloc(physsz + intrsz, M_TEMP, 0);
+	ref = malloc(physsz + intrsz, M_TEMP, M_WAITOK);
 	if (imapmsk != NULL) {
 		for (i = 0; i < physsz; i++)
 			ref[i] = regs[i] & imapmsk[i];
@@ -131,7 +131,7 @@ ofw_bus_find_intr(u_int8_t *intr, int intrsz, u_int8_t *regs, int physsz,
 		KASSERT(i >= physsz + intrsz + sizeof(parent) +
 		    pintrsz, ("ofw_bus_find_intr: truncated map"));
 		if (bcmp(ref, mptr, physsz + intrsz) == 0) {
-			*result = malloc(pintrsz, M_OFWPROP, 0);
+			*result = malloc(pintrsz, M_OFWPROP, M_WAITOK);
 			bcopy(mptr + physsz + intrsz + sizeof(parent),
 			    *result, pintrsz);
 			rsz = pintrsz;
@@ -177,7 +177,7 @@ ofw_bus_route_intr(phandle_t node, int intrp, obr_callback_t *cb)
 	} else {
 		ic = intrp;
 		isz = sizeof(ic);
-		intr = malloc(isz, M_OFWPROP, 0);
+		intr = malloc(isz, M_OFWPROP, M_WAITOK);
 		bcopy(&ic, intr, isz);
 	}
 	/*
diff --git a/sys/sparc64/sparc64/sys_machdep.c b/sys/sparc64/sparc64/sys_machdep.c
index 4a0b51e11335..34be95acf580 100644
--- a/sys/sparc64/sparc64/sys_machdep.c
+++ b/sys/sparc64/sparc64/sys_machdep.c
@@ -117,7 +117,7 @@ sparc_utrap_install(struct thread *td, char *args)
 		if (ua.type != UTH_NOCHANGE) {
 			if (ut == NULL) {
 				ut = malloc(sizeof *ut, M_SUBPROC,
-				    M_ZERO);
+				    M_WAITOK | M_ZERO);
 				ut->ut_refcnt = 1;
 				td->td_proc->p_md.md_utrap = ut;
 			}
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index 57b3071df71f..f61043995af6 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -46,9 +46,8 @@
 /*
  * flags to malloc.
  */
-#ifndef M_NOWAIT
+#define	M_WAITOK	0x0000
 #define	M_NOWAIT	0x0001		/* do not block */
-#endif /* M_NOWAIT */
 #define	M_USE_RESERVE	0x0002		/* can alloc out of reserve memory */
 #define	M_ZERO		0x0004		/* bzero the allocation */
 #define	M_NOVM		0x0008		/* don't ask VM for pages */
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index a66c1fba81cb..0ad8664466ef 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -263,13 +263,13 @@ struct mbstat {
 
 /*
  * Flags specifying how an allocation should be made.
- * M_NOWAIT means "don't block if nothing is available" whereas
- * 0 means "block for mbuf_wait ticks at most if nothing is
+ * M_DONTWAIT means "don't block if nothing is available" whereas
+ * M_TRYWAIT means "block for mbuf_wait ticks at most if nothing is
  * available."
  */
-#ifndef M_NOWAIT	/* malloc.h also defines this. */
-#define	M_NOWAIT	0x0001
-#endif
+#define	M_DONTWAIT	1
+#define	M_TRYWAIT	0
+#define	M_WAIT		M_TRYWAIT	/* XXX: Deprecated. */
 
 #ifdef _KERNEL
 /*-
@@ -404,7 +404,7 @@ struct mbstat {
 #define	M_COPYALL	1000000000
 
 /* Compatibility with 4.3. */
-#define	m_copy(m, o, l)	m_copym((m), (o), (l), M_NOWAIT)
+#define	m_copy(m, o, l)	m_copym((m), (o), (l), M_DONTWAIT)
 
 extern	int max_datalen;		/* MHLEN - max_hdr */
 extern	int max_hdr;			/* Largest link + protocol header */
diff --git a/sys/sys/posix4.h b/sys/sys/posix4.h
index 033c1ec46f1b..b17e9270e675 100644
--- a/sys/sys/posix4.h
+++ b/sys/sys/posix4.h
@@ -56,7 +56,7 @@ int SC (struct thread *td, struct SC##_args *uap) \
 
 MALLOC_DECLARE(M_P31B);
 
-#define p31b_malloc(SIZE) malloc((SIZE), M_P31B, 0)
+#define p31b_malloc(SIZE) malloc((SIZE), M_P31B, M_WAITOK)
 #define p31b_free(P) free((P), M_P31B)
 
 int p31b_proc(struct proc *, pid_t, struct proc **);
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index 6b715f228fc1..6b22cfdf8413 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -253,7 +253,7 @@ struct xsocket {
  * Returns error without lock if sleep is interrupted.
  */
 #define sblock(sb, wf) ((sb)->sb_flags & SB_LOCK ? \
-		(((wf) == 0) ? sb_lock(sb) : EWOULDBLOCK) : \
+		(((wf) == M_WAITOK) ? sb_lock(sb) : EWOULDBLOCK) : \
 		((sb)->sb_flags |= SB_LOCK), 0)
 
 /* release lock on sockbuf sb */
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 7af8b6998583..ed4e04c461dc 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -573,7 +573,7 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
 	else
 		bap2 = (ufs2_daddr_t *)bp->b_data;
 	if (lastbn != -1) {
-		MALLOC(copy, caddr_t, fs->fs_bsize, M_TEMP, 0);
+		MALLOC(copy, caddr_t, fs->fs_bsize, M_TEMP, M_WAITOK);
 		bcopy((caddr_t)bp->b_data, copy, (u_int)fs->fs_bsize);
 		for (i = last + 1; i < NINDIR(fs); i++)
 			BAP(ip, i) = 0;
diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c
index b26d10bd70d6..7fe373d7bcaf 100644
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -269,7 +269,7 @@ restart:
 	 * the suspension period.
 	 */
 	len = howmany(fs->fs_ncg, NBBY);
-	MALLOC(fs->fs_active, int *, len, M_DEVBUF, 0);
+	MALLOC(fs->fs_active, int *, len, M_DEVBUF, M_WAITOK);
 	bzero(fs->fs_active, len);
 	for (cg = 0; cg < fs->fs_ncg; cg++) {
 		error = UFS_BALLOC(vp, (off_t)(cgtod(fs, cg)) << fs->fs_fshift,
@@ -359,7 +359,7 @@ restart:
 	size = blkroundup(fs, fs->fs_cssize);
 	if (fs->fs_contigsumsize > 0)
 		size += fs->fs_ncg * sizeof(int32_t);
-	space = malloc((u_long)size, M_UFSMNT, 0);
+	space = malloc((u_long)size, M_UFSMNT, M_WAITOK);
 	copy_fs->fs_csp = space;
 	bcopy(fs->fs_csp, copy_fs->fs_csp, fs->fs_cssize);
 	(char *)space += fs->fs_cssize;
@@ -473,7 +473,7 @@ loop:
 
 		VI_UNLOCK(devvp);
 		MALLOC(lkp, struct lock *, sizeof(struct lock), M_UFSMNT,
-		    0);
+		    M_WAITOK);
 		lockinit(lkp, PVFS, "snaplk", VLKTIMEOUT,
 		    LK_CANRECURSE | LK_NOPAUSE);
 		VI_LOCK(vp);
@@ -536,7 +536,7 @@ out1:
 	snaplistsize = fs->fs_ncg + howmany(fs->fs_cssize, fs->fs_bsize) +
 	    FSMAXSNAP + 1 /* superblock */ + 1 /* last block */ + 1 /* size */;
 	MALLOC(snapblklist, daddr_t *, snaplistsize * sizeof(daddr_t),
-	    M_UFSMNT, 0);
+	    M_UFSMNT, M_WAITOK);
 	ip->i_snapblklist = &snapblklist[1];
 	/*
 	 * Expunge the blocks used by the snapshots from the set of
@@ -872,7 +872,7 @@ indiracct_ufs1(snapvp, cancelvp, level, blkno, lbn, rlbn, remblks,
 	last = howmany(remblks, blksperindir);
 	if (last > NINDIR(fs))
 		last = NINDIR(fs);
-	MALLOC(bap, ufs1_daddr_t *, fs->fs_bsize, M_DEVBUF, 0);
+	MALLOC(bap, ufs1_daddr_t *, fs->fs_bsize, M_DEVBUF, M_WAITOK);
 	bcopy(bp->b_data, (caddr_t)bap, fs->fs_bsize);
 	bqrelse(bp);
 	error = (*acctfunc)(snapvp, &bap[0], &bap[last], fs,
@@ -1147,7 +1147,7 @@ indiracct_ufs2(snapvp, cancelvp, level, blkno, lbn, rlbn, remblks,
 	last = howmany(remblks, blksperindir);
 	if (last > NINDIR(fs))
 		last = NINDIR(fs);
-	MALLOC(bap, ufs2_daddr_t *, fs->fs_bsize, M_DEVBUF, 0);
+	MALLOC(bap, ufs2_daddr_t *, fs->fs_bsize, M_DEVBUF, M_WAITOK);
 	bcopy(bp->b_data, (caddr_t)bap, fs->fs_bsize);
 	bqrelse(bp);
 	error = (*acctfunc)(snapvp, &bap[0], &bap[last], fs,
@@ -1731,7 +1731,7 @@ ffs_snapshot_mount(mp)
 
 			VI_UNLOCK(devvp);
 			MALLOC(lkp, struct lock *, sizeof(struct lock),
-			    M_UFSMNT, 0);
+			    M_UFSMNT, M_WAITOK);
 			lockinit(lkp, PVFS, "snaplk", VLKTIMEOUT,
 			    LK_CANRECURSE | LK_NOPAUSE);
 			VI_LOCK(vp);
@@ -1779,7 +1779,7 @@ ffs_snapshot_mount(mp)
 		return;
 	}
 	MALLOC(snapblklist, void *, snaplistsize * sizeof(daddr_t),
-	    M_UFSMNT, 0);
+	    M_UFSMNT, M_WAITOK);
 	auio.uio_iovcnt = 1;
 	aiov.iov_base = snapblklist;
 	aiov.iov_len = snaplistsize * sizeof (daddr_t);
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index fcc892948b8c..872433d14461 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -96,7 +96,7 @@ static MALLOC_DEFINE(M_MKDIR, "mkdir","New directory");
 static MALLOC_DEFINE(M_DIRREM, "dirrem","Directory entry deleted");
 static MALLOC_DEFINE(M_NEWDIRBLK, "newdirblk","Unclaimed new directory block");
 
-#define M_SOFTDEP_FLAGS	(M_USE_RESERVE)
+#define M_SOFTDEP_FLAGS	(M_WAITOK | M_USE_RESERVE)
 
 #define	D_PAGEDEP	0
 #define	D_INODEDEP	1
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index de01977e8457..17e9a401253e 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -686,9 +686,9 @@ ffs_mountfs(devvp, mp, td)
 		fs->fs_pendingblocks = 0;
 		fs->fs_pendinginodes = 0;
 	}
-	ump = malloc(sizeof *ump, M_UFSMNT, M_ZERO);
+	ump = malloc(sizeof *ump, M_UFSMNT, M_WAITOK | M_ZERO);
 	ump->um_fs = malloc((u_long)fs->fs_sbsize, M_UFSMNT,
-	    0);
+	    M_WAITOK);
 	if (fs->fs_magic == FS_UFS1_MAGIC) {
 		ump->um_fstype = UFS1;
 		ump->um_balloc = ffs_balloc_ufs1;
@@ -715,7 +715,7 @@ ffs_mountfs(devvp, mp, td)
 	if (fs->fs_contigsumsize > 0)
 		size += fs->fs_ncg * sizeof(int32_t);
 	size += fs->fs_ncg * sizeof(u_int8_t);
-	space = malloc((u_long)size, M_UFSMNT, 0);
+	space = malloc((u_long)size, M_UFSMNT, M_WAITOK);
 	fs->fs_csp = space;
 	for (i = 0; i < blks; i += fs->fs_frag) {
 		size = fs->fs_bsize;
@@ -1248,7 +1248,7 @@ ffs_vget(mp, ino, flags, vpp)
 	 * which will cause a panic because ffs_sync() blindly
 	 * dereferences vp->v_data (as well it should).
 	 */
-	ip = uma_zalloc(uma_inode, 0);
+	ip = uma_zalloc(uma_inode, M_WAITOK);
 
 	/* Allocate a new vnode/inode. */
 	error = getnewvnode("ufs", mp, ffs_vnodeop_p, &vp);
@@ -1315,9 +1315,9 @@ ffs_vget(mp, ino, flags, vpp)
 		return (error);
 	}
 	if (ip->i_ump->um_fstype == UFS1)
-		ip->i_din1 = uma_zalloc(uma_ufs1, 0);
+		ip->i_din1 = uma_zalloc(uma_ufs1, M_WAITOK);
 	else
-		ip->i_din2 = uma_zalloc(uma_ufs2, 0);
+		ip->i_din2 = uma_zalloc(uma_ufs2, M_WAITOK);
 	ffs_load_inode(bp, ip, fs, ino);
 	if (DOINGSOFTDEP(vp))
 		softdep_load_inodeblock(ip);
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 4cba12f890c3..66fc2fe18513 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -1381,7 +1381,7 @@ ffs_rdextattr(u_char **p, struct vnode *vp, struct thread *td, int extra)
 	dp = ip->i_din2;
 	easize = dp->di_extsize;
 
-	eae = malloc(easize + extra, M_TEMP, 0);
+	eae = malloc(easize + extra, M_TEMP, M_WAITOK);
 
 	liovec.iov_base = eae;
 	liovec.iov_len = easize;
@@ -1706,7 +1706,7 @@ vop_setextattr {
 		ealength += eapad1 + ealen + eapad2;
 	}
 
-	eae = malloc(ip->i_ea_len + ealength, M_TEMP, 0);
+	eae = malloc(ip->i_ea_len + ealength, M_TEMP, M_WAITOK);
 	bcopy(ip->i_ea_area, eae, ip->i_ea_len);
 	easize = ip->i_ea_len;
 
diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c
index 27d32efc157d..f2d3a70ff914 100644
--- a/sys/ufs/ufs/ufs_dirhash.c
+++ b/sys/ufs/ufs/ufs_dirhash.c
@@ -187,7 +187,7 @@ ufsdirhash_build(struct inode *ip)
 		goto fail;
 	for (i = 0; i < narrays; i++) {
 		if ((dh->dh_hash[i] = uma_zalloc(ufsdirhash_zone,
-		    0)) == NULL)
+		    M_WAITOK)) == NULL)
 			goto fail;
 		for (j = 0; j < DH_NBLKOFF; j++)
 			dh->dh_hash[i][j] = DIRHASH_EMPTY;
diff --git a/sys/ufs/ufs/ufs_extattr.c b/sys/ufs/ufs/ufs_extattr.c
index 4d5ec66f3e83..b9d7b8941271 100644
--- a/sys/ufs/ufs/ufs_extattr.c
+++ b/sys/ufs/ufs/ufs_extattr.c
@@ -252,7 +252,7 @@ ufs_extattr_lookup(struct vnode *start_dvp, int lockparent, char *dirname,
 		cnp.cn_flags |= LOCKPARENT;
 	cnp.cn_thread = td;
 	cnp.cn_cred = td->td_ucred;
-	cnp.cn_pnbuf = uma_zalloc(namei_zone, 0);
+	cnp.cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
 	cnp.cn_nameptr = cnp.cn_pnbuf;
 	error = copystr(dirname, cnp.cn_pnbuf, MAXPATHLEN,
 	    (size_t *) &cnp.cn_namelen);
@@ -381,7 +381,7 @@ ufs_extattr_iterate_directory(struct ufsmount *ump, struct vnode *dvp,
 	if (dvp->v_type != VDIR)
 		return (ENOTDIR);
 
-	MALLOC(dirbuf, char *, DIRBLKSIZ, M_TEMP, 0);
+	MALLOC(dirbuf, char *, DIRBLKSIZ, M_TEMP, M_WAITOK);
 
 	auio.uio_iov = &aiov;
 	auio.uio_iovcnt = 1;
@@ -592,7 +592,7 @@ ufs_extattr_enable(struct ufsmount *ump, int attrnamespace,
 		return (EINVAL);
 
 	MALLOC(attribute, struct ufs_extattr_list_entry *,
-	    sizeof(struct ufs_extattr_list_entry), M_UFS_EXTATTR, 0);
+	    sizeof(struct ufs_extattr_list_entry), M_UFS_EXTATTR, M_WAITOK);
 	if (attribute == NULL)
 		return (ENOMEM);
 
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 683c6bd6139d..258241293e3f 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -822,7 +822,7 @@ dqget(vp, id, ump, type, dqp)
 		desireddquot += DQUOTINC;
 	if (numdquot < desireddquot) {
 		dq = (struct dquot *)malloc(sizeof *dq, M_DQUOT,
-		    M_ZERO);
+		    M_WAITOK | M_ZERO);
 		numdquot++;
 	} else {
 		if ((dq = TAILQ_FIRST(&dqfreelist)) == NULL) {
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index de56eece5285..af65b36d80be 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -368,7 +368,7 @@ ufs_access(ap)
 
 #ifdef UFS_ACL
 	if ((vp->v_mount->mnt_flag & MNT_ACLS) != 0) {
-		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, 0);
+		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, M_WAITOK);
 		len = sizeof(*acl);
 		error = VOP_GETACL(vp, ACL_TYPE_ACCESS, acl, ap->a_cred,
 		    ap->a_td);
@@ -1442,8 +1442,8 @@ ufs_mkdir(ap)
 #ifdef UFS_ACL
 	acl = dacl = NULL;
 	if ((dvp->v_mount->mnt_flag & MNT_ACLS) != 0) {
-		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, 0);
-		MALLOC(dacl, struct acl *, sizeof(*dacl), M_ACL, 0);
+		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, M_WAITOK);
+		MALLOC(dacl, struct acl *, sizeof(*dacl), M_ACL, M_WAITOK);
 
 		/*
 		 * Retrieve default ACL from parent, if any.
@@ -1845,7 +1845,7 @@ ufs_readdir(ap)
 			auio.uio_iovcnt = 1;
 			auio.uio_segflg = UIO_SYSSPACE;
 			aiov.iov_len = count;
-			MALLOC(dirbuf, caddr_t, count, M_TEMP, 0);
+			MALLOC(dirbuf, caddr_t, count, M_TEMP, M_WAITOK);
 			aiov.iov_base = dirbuf;
 			error = VOP_READ(ap->a_vp, &auio, 0, ap->a_cred);
 			if (error == 0) {
@@ -1889,7 +1889,7 @@ ufs_readdir(ap)
 		     dp = (struct dirent *)((caddr_t) dp + dp->d_reclen))
 			ncookies++;
 		MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP,
-		    0);
+		    M_WAITOK);
 		for (dp = dpStart, cookiep = cookies;
 		     dp < dpEnd;
 		     dp = (struct dirent *)((caddr_t) dp + dp->d_reclen)) {
@@ -2422,7 +2422,7 @@ ufs_makeinode(mode, dvp, vpp, cnp)
 #ifdef UFS_ACL
 	acl = NULL;
 	if ((dvp->v_mount->mnt_flag & MNT_ACLS) != 0) {
-		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, 0);
+		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, M_WAITOK);
 
 		/*
 		 * Retrieve default ACL for parent, if any.
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index a0cf5283fba7..e7acedcdbfb1 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -266,7 +266,7 @@ dev_pager_getfake(paddr)
 {
 	vm_page_t m;
 
-	m = uma_zalloc(fakepg_zone, 0);
+	m = uma_zalloc(fakepg_zone, M_WAITOK);
 
 	m->flags = PG_BUSY | PG_FICTITIOUS;
 	m->valid = VM_PAGE_BITS_ALL;
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 58568a2e0298..0fb5d2203113 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -337,7 +337,7 @@ swap_pager_swap_init()
 	 */
 	for (n = 1; n < n2 / 8; n *= 2)
 		;
-	swhash = malloc(sizeof(struct swblock *) * n, M_VMPGDATA, M_ZERO);
+	swhash = malloc(sizeof(struct swblock *) * n, M_VMPGDATA, M_WAITOK | M_ZERO);
 	swhash_mask = n - 1;
 }
 
diff --git a/sys/vm/uma.h b/sys/vm/uma.h
index 988b79f8867a..769d81af4d12 100644
--- a/sys/vm/uma.h
+++ b/sys/vm/uma.h
@@ -209,7 +209,7 @@ void uma_zdestroy(uma_zone_t zone);
  *
  * Returns:
  *	A non null pointer to an initialized element from the zone is
- *	garanteed if the wait flag is not M_NOWAIT, otherwise null may be
+ *	garanteed if the wait flag is M_WAITOK, otherwise a null pointer may be
  *	returned if the zone is empty or the ctor failed.
  */
 
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index e7c3f68b986b..1fa83df699a4 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -354,7 +354,7 @@ hash_alloc(struct uma_hash *hash)
 	} else {
 		alloc = sizeof(hash->uh_slab_hash[0]) * UMA_HASH_SIZE_INIT;
 		hash->uh_slab_hash = uma_zalloc_internal(hashzone, NULL,
-		    0);
+		    M_WAITOK);
 		hash->uh_hashsize = UMA_HASH_SIZE_INIT;
 	}
 	if (hash->uh_slab_hash) {
@@ -1300,7 +1300,7 @@ uma_zcreate(char *name, size_t size, uma_ctor ctor, uma_dtor dtor,
 	args.align = align;
 	args.flags = flags;
 
-	return (uma_zalloc_internal(zones, &args, 0));
+	return (uma_zalloc_internal(zones, &args, M_WAITOK));
 }
 
 /* See uma.h */
@@ -1326,7 +1326,7 @@ uma_zalloc_arg(uma_zone_t zone, void *udata, int flags)
 
 	if (!(flags & M_NOWAIT)) {
 		KASSERT(curthread->td_intr_nesting_level == 0,
-		   ("malloc without M_NOWAIT in interrupt context"));
+		   ("malloc(M_WAITOK) in interrupt context"));
 		WITNESS_SLEEP(1, NULL);
 	}
 
@@ -1609,7 +1609,7 @@ done:
  * Arguments
  *	zone   The zone to alloc for.
  *	udata  The data to be passed to the constructor.
- *	flags  M_NOWAIT, M_ZERO.
+ *	flags  M_WAITOK, M_NOWAIT, M_ZERO.
  *
  * Returns
  *	NULL if there is no memory and M_NOWAIT is set
@@ -1964,7 +1964,7 @@ uma_prealloc(uma_zone_t zone, int items)
 		slabs++;
 
 	while (slabs > 0) {
-		slab = slab_zalloc(zone, 0);
+		slab = slab_zalloc(zone, M_WAITOK);
 		LIST_INSERT_HEAD(&zone->uz_free_slab, slab, us_link);
 		slabs--;
 	}
@@ -2074,7 +2074,7 @@ sysctl_vm_zone(SYSCTL_HANDLER_ARGS)
 		cnt++;
 	mtx_unlock(&uma_mtx);
 	MALLOC(tmpbuf, char *, (cnt == 0 ? 1 : cnt) * linesize,
-			M_TEMP, 0);
+			M_TEMP, M_WAITOK);
 	len = snprintf(tmpbuf, linesize,
 	    "\nITEM            SIZE     LIMIT     USED    FREE  REQUESTS\n\n");
 	if (cnt == 0)
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 08828159f124..cd3b2e7e54eb 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -255,7 +255,7 @@ vmspace_alloc(min, max)
 	struct vmspace *vm;
 
 	GIANT_REQUIRED;
-	vm = uma_zalloc(vmspace_zone, 0);
+	vm = uma_zalloc(vmspace_zone, M_WAITOK);
 	CTR1(KTR_VM, "vmspace_alloc: %p", vm);
 	_vm_map_init(&vm->vm_map, min, max);
 	pmap_pinit(vmspace_pmap(vm));
@@ -513,7 +513,7 @@ vm_map_create(pmap_t pmap, vm_offset_t min, vm_offset_t max)
 {
 	vm_map_t result;
 
-	result = uma_zalloc(mapzone, 0);
+	result = uma_zalloc(mapzone, M_WAITOK);
 	CTR1(KTR_VM, "vm_map_create: %p", result);
 	_vm_map_init(result, min, max);
 	result->pmap = pmap;
@@ -572,7 +572,7 @@ vm_map_entry_create(vm_map_t map)
 	if (map->system_map)
 		new_entry = uma_zalloc(kmapentzone, M_NOWAIT);
 	else
-		new_entry = uma_zalloc(mapentzone, 0);
+		new_entry = uma_zalloc(mapentzone, M_WAITOK);
 	if (new_entry == NULL)
 		panic("vm_map_entry_create: kernel resources exhausted");
 	return (new_entry);
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 5f4a04c16678..2fe605d52e9d 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -353,7 +353,7 @@ vm_object_allocate_wait(objtype_t type, vm_pindex_t size, int flags)
 vm_object_t
 vm_object_allocate(objtype_t type, vm_pindex_t size)
 {
-	return(vm_object_allocate_wait(type, size, 0));
+	return(vm_object_allocate_wait(type, size, M_WAITOK));
 }
 
 
-- 
cgit v1.3


From 8763b97d37e05a2b7950c6b4feea6353e4685d42 Mon Sep 17 00:00:00 2001
From: Yoshihiro Takahashi <nyan@FreeBSD.org>
Date: Sun, 15 May 2005 08:59:00 +0000
Subject: - Mask an underline attribute on the pc98 console.  It enables to use
 the same   color on the pc98 and the others. - Remove old epson note support.

---
 sys/dev/syscons/daemon/daemon_saver.c | 77 +++++++++++++----------------------
 1 file changed, 28 insertions(+), 49 deletions(-)

(limited to 'sys/dev/syscons/daemon/daemon_saver.c')

diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 3cd58305cde5..92d807f9ed99 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -43,16 +43,15 @@
 #include <dev/fb/splashreg.h>
 #include <dev/syscons/syscons.h>
 
-#ifdef PC98
-#include <pc98/pc98/pc98_machdep.h>
-#endif
-
 #define DAEMON_MAX_WIDTH	32
 #define DAEMON_MAX_HEIGHT	19
 
 static u_char *message;
 static int messagelen;
 static int blanked;
+static int attr_mask;
+
+#define	ATTR(attr)	(((attr) & attr_mask) << 8)
 
 /* Who is the author of this ASCII pic? */
 
@@ -133,7 +132,7 @@ clear_daemon(sc_softc_t *sc, int xpos, int ypos, int dxdir, int xoff, int yoff,
 		sc_vtb_erase(&sc->cur_scp->scr,
 			     (ypos + y)*sc->cur_scp->xsize + xpos + xoff,
 			     xlen - xoff,
-			     sc->scr_map[0x20], (FG_LIGHTGREY | BG_BLACK) << 8);
+			     sc->scr_map[0x20], ATTR(FG_LIGHTGREY | BG_BLACK));
 	}
 }
 
@@ -154,35 +153,26 @@ draw_daemon(sc_softc_t *sc, int xpos, int ypos, int dxdir, int xoff, int yoff,
 			continue;
 		for (x = xoff; (x < xlen) && (daemon_pic[y][px] != '\0'); x++, px++) {
 			switch (daemon_attr[y][px]) {
-#ifndef PC98
-			case 'R': attr = (FG_LIGHTRED|BG_BLACK)<<8; break;
-			case 'Y': attr = (FG_YELLOW|BG_BLACK)<<8; break;
-			case 'B': attr = (FG_LIGHTBLUE|BG_BLACK)<<8; break;
-			case 'W': attr = (FG_LIGHTGREY|BG_BLACK)<<8; break;
-			case 'C': attr = (FG_CYAN|BG_BLACK)<<8; break;
-			default: attr = (FG_WHITE|BG_BLACK)<<8; break;
-#else /* PC98 */
-			case 'R': attr = (FG_RED|BG_BLACK)<<8; break;
-			case 'Y': attr = (FG_BROWN|BG_BLACK)<<8; break;
-			case 'B': attr = (FG_BLUE|BG_BLACK)<<8; break;
-			case 'W': attr = (FG_LIGHTGREY|BG_BLACK)<<8; break;
-			case 'C': attr = (FG_CYAN|BG_BLACK)<<8; break;
-			default: attr = (FG_LIGHTGREY|BG_BLACK)<<8; break;
-#endif /* PC98 */
+			case 'R': attr = FG_LIGHTRED | BG_BLACK; break;
+			case 'Y': attr = FG_YELLOW | BG_BLACK; break;
+			case 'B': attr = FG_LIGHTBLUE | BG_BLACK; break;
+			case 'W': attr = FG_LIGHTGREY | BG_BLACK; break;
+			case 'C': attr = FG_CYAN | BG_BLACK; break;
+			default: attr = FG_WHITE | BG_BLACK; break;
 			}
 			if (dxdir < 0) {	/* Moving left */
 				sc_vtb_putc(&sc->cur_scp->scr,
 					    (ypos + y)*sc->cur_scp->xsize
 						 + xpos + x,
 					    sc->scr_map[daemon_pic[y][px]],
-					    attr);
+					    ATTR(attr));
 			} else {		/* Moving right */
 				sc_vtb_putc(&sc->cur_scp->scr,
 					    (ypos + y)*sc->cur_scp->xsize
 						+ xpos + DAEMON_MAX_WIDTH 
 						- px - 1,
 					    sc->scr_map[xflip_symbol(daemon_pic[y][px])], 
-					    attr);
+					    ATTR(attr));
 			}
 		}
 	}
@@ -195,7 +185,7 @@ clear_string(sc_softc_t *sc, int xpos, int ypos, int xoff, char *s, int len)
 		return;
 	sc_vtb_erase(&sc->cur_scp->scr,
 		     ypos*sc->cur_scp->xsize + xpos + xoff, len - xoff,
-		     sc->scr_map[0x20], (FG_LIGHTGREY | BG_BLACK) << 8);
+		     sc->scr_map[0x20], ATTR(FG_LIGHTGREY | BG_BLACK));
 }
 
 static void
@@ -203,17 +193,10 @@ draw_string(sc_softc_t *sc, int xpos, int ypos, int xoff, u_char *s, int len)
 {
 	int x;
 
-	for (x = xoff; x < len; x++) {
-#ifdef PC98
-		sc_vtb_putc(&sc->cur_scp->scr,
-			    ypos*sc->cur_scp->xsize + xpos + x,
-			    sc->scr_map[s[x]], (FG_GREEN | BG_BLACK) << 8);
-#else
+	for (x = xoff; x < len; x++)
 		sc_vtb_putc(&sc->cur_scp->scr,
 			    ypos*sc->cur_scp->xsize + xpos + x,
-			    sc->scr_map[s[x]], (FG_LIGHTGREEN | BG_BLACK) << 8);
-#endif
-	}
+			    sc->scr_map[s[x]], ATTR(FG_LIGHTGREEN | BG_BLACK));
 }
 
 static int
@@ -239,16 +222,9 @@ daemon_saver(video_adapter_t *adp, int blank)
 		if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
 			return EAGAIN;
 		if (blanked == 0) {
-#ifdef PC98
-			if (epson_machine_id == 0x20) {
-				outb(0x43f, 0x42);
-				outb(0x0c17, inb(0xc17) & ~0x08);
-				outb(0x43f, 0x40);
-			}
-#endif /* PC98 */
 			/* clear the screen and set the border color */
 			sc_vtb_clear(&scp->scr, sc->scr_map[0x20],
-				     (FG_LIGHTGREY | BG_BLACK) << 8);
+				     ATTR(FG_LIGHTGREY | BG_BLACK));
 			(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
 			sc_set_border(scp, 0);
 			xlen = ylen = tlen = 0;
@@ -365,16 +341,9 @@ daemon_saver(video_adapter_t *adp, int blank)
 
  		draw_daemon(sc, dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
 		draw_string(sc, txpos, typos, toff, message, tlen);
-	} else {
-#ifdef PC98
-		if (epson_machine_id == 0x20) {
-			outb(0x43f, 0x42);
-			outb(0x0c17, inb(0xc17) | 0x08);
-			outb(0x43f, 0x40);
-		}
-#endif /* PC98 */
+	} else
 		blanked = 0;
-	}
+
 	return 0;
 }
 
@@ -386,6 +355,16 @@ daemon_init(video_adapter_t *adp)
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s - %s %s", hostname, ostype, osrelease);
 	blanked = 0;
+	switch (adp->va_mode) {
+	case M_PC98_80x25:
+	case M_PC98_80x30:
+		attr_mask = ~FG_UNDERLINE;
+		break;
+	default:
+		attr_mask = ~0;
+		break;
+	}
+
 	return 0;
 }
 
-- 
cgit v1.3