Removed all patch kit headers, sccsid and rcsid strings, put $Id$ in, some

minor cleanup.  Added $Id$ to files that did not have any version info, etc

22 files changed, 46 insertions, 232 deletions

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 84b0cce..9f06f75 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -33,18 +33,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         1       00117
- * --------------------         -----   ----------------------
- *
- * 09 Apr 93	???(From sun-lamp)	Fix to report sd when Julians
- *					scsi code is used, allow you to swap
- *					root floppies during a boot
+ *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
+ *	$Id$
  */
-static char rcsid[] = "$Header: /freefall/a/cvs/386BSD/src/sys/i386/i386/autoconf.c,v 1.2 1993/08/08 06:24:15 rgrimes Exp $";
 
 /*
  * Setup the system to run on the current machine.
diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c
index 3514f90..a8b98da 100644
--- a/sys/amd64/amd64/db_disasm.c
+++ b/sys/amd64/amd64/db_disasm.c
@@ -22,34 +22,8 @@
  * 
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- */
-/*
- * HISTORY
- * $Log: db_disasm.c,v $
- * Revision 1.1.1.1  1993/06/12  14:58:07  rgrimes
- * Initial import, 0.1 + pk 0.2.4-B1
- *
- * Revision 1.1  1992/03/25  21:42:01  pace
- * Initial revision
  *
- * Revision 2.3  91/02/05  17:11:03  mrt
- * 	Changed to new Mach copyright
- * 	[91/02/01  17:31:03  mrt]
- * 
- * Revision 2.2  90/08/27  21:55:56  dbg
- * 	Fix register operand for move to/from control/test/debug
- * 	register instructions.  Add i486 instructions.
- * 	[90/08/27            dbg]
- * 
- * 	Import db_sym.h.  Print instruction displacements in
- * 	current radix (signed).  Change calling sequence of
- * 	db_disasm.
- * 	[90/08/21            dbg]
- * 	Fix includes.
- * 	[90/08/08            dbg]
- * 	Created.
- * 	[90/07/25            dbg]
- * 
+ *	$Id$
  */
 
 /*
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index 31e7849..74c09dc 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/sys/amd64/amd64/db_interface.c
@@ -22,29 +22,8 @@
  * 
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- */
-/*
- * HISTORY
- * $Log: db_interface.c,v $
- * Revision 1.1  1992/03/25  21:42:03  pace
- * Initial revision
- *
- * Revision 2.4  91/02/05  17:11:13  mrt
- * 	Changed to new Mach copyright
- * 	[91/02/01  17:31:17  mrt]
- * 
- * Revision 2.3  90/12/04  14:45:55  jsb
- * 	Changes for merged intel/pmap.{c,h}.
- * 	[90/12/04  11:14:41  jsb]
- * 
- * Revision 2.2  90/10/25  14:44:43  rwd
- * 	Added watchpoint support.
- * 	[90/10/18            rpd]
- * 
- * 	Created.
- * 	[90/07/25            dbg]
- * 
  *
+ *	$Id$
  */
 
 /*
diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index cbffbbc..ffed283 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -22,38 +22,10 @@
  * 
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- */
-/*
- * HISTORY
- * $Log: db_trace.c,v $
- * Revision 1.1  1992/03/25  21:42:05  pace
- * Initial revision
  *
- * Revision 2.6  91/02/05  17:11:21  mrt
- * 	Changed to new Mach copyright
- * 	[91/02/01  17:31:32  mrt]
- * 
- * Revision 2.5  91/01/09  19:55:27  rpd
- * 	Fixed stack tracing for threads without kernel stacks.
- * 	[91/01/09            rpd]
- * 
- * Revision 2.4  91/01/08  15:10:22  rpd
- * 	Reorganized the pcb.
- * 	[90/12/11            rpd]
- * 
- * Revision 2.3  90/11/05  14:27:07  rpd
- * 	If we can not guess the number of args to a function, use 5 vs 0.
- * 	[90/11/02            rvb]
- * 
- * Revision 2.2  90/08/27  21:56:20  dbg
- * 	Import db_sym.h.
- * 	[90/08/21            dbg]
- * 	Fix includes.
- * 	[90/08/08            dbg]
- * 	Created from rvb's code for new debugger.
- * 	[90/07/11            dbg]
- * 
+ *	$Id$
  */
+
 #include "param.h"
 #include "proc.h"
 #include <machine/db_machdep.h>
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index 72232ad..51c62ca 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -36,8 +36,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * from: Utah $Hdr: mem.c 1.13 89/10/08$
- *	@(#)mem.c	7.2 (Berkeley) 5/9/91
+ *	from: Utah $Hdr: mem.c 1.13 89/10/08$
+ *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 96c0119..2b63cee 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -1,4 +1,3 @@
-
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,7 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
+ *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
+ *	$Id$
  */
 
 #include "param.h"
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 84b0cce..9f06f75 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -33,18 +33,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         1       00117
- * --------------------         -----   ----------------------
- *
- * 09 Apr 93	???(From sun-lamp)	Fix to report sd when Julians
- *					scsi code is used, allow you to swap
- *					root floppies during a boot
+ *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
+ *	$Id$
  */
-static char rcsid[] = "$Header: /freefall/a/cvs/386BSD/src/sys/i386/i386/autoconf.c,v 1.2 1993/08/08 06:24:15 rgrimes Exp $";
 
 /*
  * Setup the system to run on the current machine.
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index a0e92f1..eae9ffc 100644
--- a/sys/i386/i386/cons.c
+++ b/sys/i386/i386/cons.c
@@ -35,15 +35,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)cons.c	7.2 (Berkeley) 5/9/91
- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         1       00083
- * --------------------         -----   ----------------------
- *
- * 16 Aug 92	Pace Willisson		/dev/console redirect (xterm -C, etc.)
- * 14 Mar 93	Chris G. Demetriou	Moved pg() here from isa/pccons.c
+ *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 
diff --git a/sys/i386/i386/cons.h b/sys/i386/i386/cons.h
index b3c7064..e8a9812 100644
--- a/sys/i386/i386/cons.h
+++ b/sys/i386/i386/cons.h
@@ -35,7 +35,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)cons.h	7.2 (Berkeley) 5/9/91
+ *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 
diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c
index 3514f90..a8b98da 100644
--- a/sys/i386/i386/db_disasm.c
+++ b/sys/i386/i386/db_disasm.c
@@ -22,34 +22,8 @@
  * 
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- */
-/*
- * HISTORY
- * $Log: db_disasm.c,v $
- * Revision 1.1.1.1  1993/06/12  14:58:07  rgrimes
- * Initial import, 0.1 + pk 0.2.4-B1
- *
- * Revision 1.1  1992/03/25  21:42:01  pace
- * Initial revision
  *
- * Revision 2.3  91/02/05  17:11:03  mrt
- * 	Changed to new Mach copyright
- * 	[91/02/01  17:31:03  mrt]
- * 
- * Revision 2.2  90/08/27  21:55:56  dbg
- * 	Fix register operand for move to/from control/test/debug
- * 	register instructions.  Add i486 instructions.
- * 	[90/08/27            dbg]
- * 
- * 	Import db_sym.h.  Print instruction displacements in
- * 	current radix (signed).  Change calling sequence of
- * 	db_disasm.
- * 	[90/08/21            dbg]
- * 	Fix includes.
- * 	[90/08/08            dbg]
- * 	Created.
- * 	[90/07/25            dbg]
- * 
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index 31e7849..74c09dc 100644
--- a/sys/i386/i386/db_interface.c
+++ b/sys/i386/i386/db_interface.c
@@ -22,29 +22,8 @@
  * 
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- */
-/*
- * HISTORY
- * $Log: db_interface.c,v $
- * Revision 1.1  1992/03/25  21:42:03  pace
- * Initial revision
- *
- * Revision 2.4  91/02/05  17:11:13  mrt
- * 	Changed to new Mach copyright
- * 	[91/02/01  17:31:17  mrt]
- * 
- * Revision 2.3  90/12/04  14:45:55  jsb
- * 	Changes for merged intel/pmap.{c,h}.
- * 	[90/12/04  11:14:41  jsb]
- * 
- * Revision 2.2  90/10/25  14:44:43  rwd
- * 	Added watchpoint support.
- * 	[90/10/18            rpd]
- * 
- * 	Created.
- * 	[90/07/25            dbg]
- * 
  *
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index cbffbbc..ffed283 100644
--- a/sys/i386/i386/db_trace.c
+++ b/sys/i386/i386/db_trace.c
@@ -22,38 +22,10 @@
  * 
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- */
-/*
- * HISTORY
- * $Log: db_trace.c,v $
- * Revision 1.1  1992/03/25  21:42:05  pace
- * Initial revision
  *
- * Revision 2.6  91/02/05  17:11:21  mrt
- * 	Changed to new Mach copyright
- * 	[91/02/01  17:31:32  mrt]
- * 
- * Revision 2.5  91/01/09  19:55:27  rpd
- * 	Fixed stack tracing for threads without kernel stacks.
- * 	[91/01/09            rpd]
- * 
- * Revision 2.4  91/01/08  15:10:22  rpd
- * 	Reorganized the pcb.
- * 	[90/12/11            rpd]
- * 
- * Revision 2.3  90/11/05  14:27:07  rpd
- * 	If we can not guess the number of args to a function, use 5 vs 0.
- * 	[90/11/02            rvb]
- * 
- * Revision 2.2  90/08/27  21:56:20  dbg
- * 	Import db_sym.h.
- * 	[90/08/21            dbg]
- * 	Fix includes.
- * 	[90/08/08            dbg]
- * 	Created from rvb's code for new debugger.
- * 	[90/07/11            dbg]
- * 
+ *	$Id$
  */
+
 #include "param.h"
 #include "proc.h"
 #include <machine/db_machdep.h>
diff --git a/sys/i386/i386/dkbad.c b/sys/i386/i386/dkbad.c
index 6974af1..0e9aca3 100644
--- a/sys/i386/i386/dkbad.c
+++ b/sys/i386/i386/dkbad.c
@@ -33,7 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)dkbad.c	5.4 (Berkeley) 1/19/91
+ *	from: @(#)dkbad.c	5.4 (Berkeley) 1/19/91
+ *	$Id$
  */
 
 
diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c
index 335dd35..3bea1c1 100644
--- a/sys/i386/i386/in_cksum.c
+++ b/sys/i386/i386/in_cksum.c
@@ -30,17 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * from tahoe:	in_cksum.c	1.2	86/01/05
- *	@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         1       00104
- * --------------------         -----   ----------------------
- *
- * 24 Jul 92	Bakul Shah		Optimized some more
- *
- * 920724 	i386 changes by Bakul Shah <bvs@bitblocks.com>
+ *	from tahoe:	in_cksum.c	1.2	86/01/05
+ *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
+ *	$Id$
  */
 
 #include "param.h"
diff --git a/sys/i386/i386/math_emu.h b/sys/i386/i386/math_emu.h
index 537fba5..453a903 100644
--- a/sys/i386/i386/math_emu.h
+++ b/sys/i386/i386/math_emu.h
@@ -2,6 +2,8 @@
  * linux/include/linux/math_emu.h
  *
  * (C) 1991 Linus Torvalds
+ *
+ *	$Id$
  */
 #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 efe407f..f7fa88e 100644
--- a/sys/i386/i386/math_emulate.c
+++ b/sys/i386/i386/math_emulate.c
@@ -1,8 +1,12 @@
-/* [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj] */
 /*
  * linux/kernel/math/math_emulate.c
  *
  * (C) 1991 Linus Torvalds
+ *
+ * [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj]
+ *
+ *	from: 386BSD 0.1
+ *	$Id$
  */
 
 /*
@@ -30,15 +34,6 @@
  * to 80-bit temporary reals, and do with them as they please. I wanted to
  * hide most of the 387-specific things here.
  *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         2       00060
- * --------------------         -----   ----------------------
- *
- * 19 Sep 92	Ishii Masahiro		Fix 0x1fd instruction
- *		kym@bingsuns.cc.binghamton.edu		Fix fscale
- * 28 Nov 92	Poul-Henning Kamp	Reduce kernel size if you have
- *					a 387 or 486 chip
  */
 
 #include "machine/cpu.h"
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 72232ad..51c62ca 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -36,8 +36,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * from: Utah $Hdr: mem.c 1.13 89/10/08$
- *	@(#)mem.c	7.2 (Berkeley) 5/9/91
+ *	from: Utah $Hdr: mem.c 1.13 89/10/08$
+ *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/i386/microtime.s b/sys/i386/i386/microtime.s
index 4af938b..99f8601 100644
--- a/sys/i386/i386/microtime.s
+++ b/sys/i386/i386/microtime.s
@@ -30,7 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Header$
+ *	from: Steve McCanne's microtime code
+ *	$Id$
  */
 
 #include "asm.h"
diff --git a/sys/i386/i386/swapgeneric.c b/sys/i386/i386/swapgeneric.c
index 0d76e72..8aa78a6 100644
--- a/sys/i386/i386/swapgeneric.c
+++ b/sys/i386/i386/swapgeneric.c
@@ -33,7 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)swapgeneric.c	5.5 (Berkeley) 5/9/91
+ *	from: @(#)swapgeneric.c	5.5 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 #include "machine/pte.h"
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 96c0119..2b63cee 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -1,4 +1,3 @@
-
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,7 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
+ *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
+ *	$Id$
  */
 
 #include "param.h"
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index a0e92f1..eae9ffc 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -35,15 +35,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)cons.c	7.2 (Berkeley) 5/9/91
- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         1       00083
- * --------------------         -----   ----------------------
- *
- * 16 Aug 92	Pace Willisson		/dev/console redirect (xterm -C, etc.)
- * 14 Mar 93	Chris G. Demetriou	Moved pg() here from isa/pccons.c
+ *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 
diff --git a/sys/sys/cons.h b/sys/sys/cons.h
index b3c7064..e8a9812 100644
--- a/sys/sys/cons.h
+++ b/sys/sys/cons.h
@@ -35,7 +35,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)cons.h	7.2 (Berkeley) 5/9/91
+ *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
+ *	$Id$
  */