From 430f81c3e8403e1b366018124c1bece2685f94b1 Mon Sep 17 00:00:00 2001
From: Mike Karels <karels@ucbvax.Berkeley.EDU>
Date: Sun, 22 May 1988 01:47:55 -0800
Subject: [PATCH] bring up to revision 7 for tahoe release

SCCS-vsn: sys/tahoe/if/if_ace.c 7.1
SCCS-vsn: sys/tahoe/if/if_acereg.h 7.1
SCCS-vsn: sys/tahoe/if/if_enp.c 7.1
SCCS-vsn: sys/tahoe/if/if_enpreg.h 7.1
SCCS-vsn: sys/tahoe/vba/cy.c 7.1
SCCS-vsn: sys/tahoe/vba/cyvar.h 7.1
SCCS-vsn: sys/tahoe/vba/dr.c 7.1
SCCS-vsn: sys/tahoe/vba/drreg.h 7.1
SCCS-vsn: sys/tahoe/vba/ik.c 7.1
SCCS-vsn: sys/tahoe/vba/ikreg.h 7.1
SCCS-vsn: sys/tahoe/vba/mp.c 7.1
SCCS-vsn: sys/tahoe/vba/mpreg.h 7.1
SCCS-vsn: sys/tahoe/vba/psproto.h 7.1
SCCS-vsn: sys/tahoe/vba/psreg.h 7.1
SCCS-vsn: sys/tahoe/vba/vba.c 7.1
SCCS-vsn: sys/tahoe/vba/vbaparam.h 7.1
SCCS-vsn: sys/tahoe/vba/vbavar.h 7.1
SCCS-vsn: sys/tahoe/vba/vd.c 7.1
SCCS-vsn: sys/tahoe/vba/vdreg.h 7.1
SCCS-vsn: sys/tahoe/vba/vx.c 7.1
SCCS-vsn: sys/tahoe/vba/vxreg.h 7.1
SCCS-vsn: sys/tahoe/tahoe/Locore.c 7.1
SCCS-vsn: sys/tahoe/tahoe/SYS.h 7.1
SCCS-vsn: sys/tahoe/tahoe/autoconf.c 7.1
SCCS-vsn: sys/tahoe/tahoe/clock.c 7.1
SCCS-vsn: sys/tahoe/include/clock.h 7.1
SCCS-vsn: sys/tahoe/tahoe/conf.c 7.1
SCCS-vsn: sys/tahoe/tahoe/cons.c 7.1
SCCS-vsn: sys/tahoe/tahoe/cp.h 7.1
SCCS-vsn: sys/tahoe/include/cpu.h 7.1
SCCS-vsn: sys/tahoe/include/frame.h 7.1
SCCS-vsn: sys/tahoe/tahoe/genassym.c 7.1
SCCS-vsn: sys/tahoe/tahoe/in_cksum.c 7.1
SCCS-vsn: sys/tahoe/tahoe/kdb_machdep.c 7.6
SCCS-vsn: sys/tahoe/tahoe/kdb_opset.c 7.4
SCCS-vsn: sys/tahoe/include/kdbparam.h 7.7
SCCS-vsn: sys/tahoe/tahoe/locore.s 7.1
SCCS-vsn: sys/tahoe/tahoe/machdep.c 7.1
SCCS-vsn: sys/tahoe/include/param.h 7.1
SCCS-vsn: sys/tahoe/tahoe/mem.c 7.1
SCCS-vsn: sys/tahoe/tahoe/mem.h 7.1
SCCS-vsn: sys/tahoe/include/misc.c 7.1
SCCS-vsn: sys/tahoe/include/mtpr.h 7.1
SCCS-vsn: sys/netns/ns_cksum.c 7.1
SCCS-vsn: sys/tahoe/include/pcb.h 7.1
SCCS-vsn: sys/tahoe/include/psl.h 7.1
SCCS-vsn: sys/tahoe/include/pte.h 7.1
SCCS-vsn: sys/tahoe/include/reg.h 7.1
SCCS-vsn: sys/tahoe/tahoe/rpb.h 7.1
SCCS-vsn: sys/tahoe/tahoe/scb.h 7.1
SCCS-vsn: sys/tahoe/tahoe/scb.s 7.1
SCCS-vsn: sys/tahoe/tahoe/swapgeneric.c 7.1
SCCS-vsn: sys/tahoe/tahoe/symbols.raw 7.1
SCCS-vsn: sys/tahoe/tahoe/sys_machdep.c 7.1
SCCS-vsn: sys/tahoe/tahoe/trap.c 7.1
SCCS-vsn: sys/tahoe/include/trap.h 7.1
SCCS-vsn: sys/tahoe/tahoe/udiv.s 7.1
SCCS-vsn: sys/tahoe/tahoe/urem.s 7.1
SCCS-vsn: sys/tahoe/tahoe/vm_machdep.c 7.1
SCCS-vsn: sys/tahoe/include/vmparam.h 7.1
SCCS-vsn: sys/tahoe/vba/scope.h 7.1
---
 usr/src/sys/netns/ns_cksum.c          |  2 +-
 usr/src/sys/tahoe/if/if_ace.c         | 14 +++++++++-
 usr/src/sys/tahoe/if/if_acereg.h      |  4 ++-
 usr/src/sys/tahoe/if/if_enp.c         |  2 +-
 usr/src/sys/tahoe/if/if_enpreg.h      |  2 +-
 usr/src/sys/tahoe/include/clock.h     | 14 +++++++++-
 usr/src/sys/tahoe/include/cpu.h       |  4 +--
 usr/src/sys/tahoe/include/frame.h     |  4 ++-
 usr/src/sys/tahoe/include/kdbparam.h  |  8 +++++-
 usr/src/sys/tahoe/include/misc.c      |  2 +-
 usr/src/sys/tahoe/include/mtpr.h      |  6 +++--
 usr/src/sys/tahoe/include/param.h     |  4 +--
 usr/src/sys/tahoe/include/pcb.h       |  8 +++++-
 usr/src/sys/tahoe/include/psl.h       |  4 ++-
 usr/src/sys/tahoe/include/pte.h       |  8 +++++-
 usr/src/sys/tahoe/include/reg.h       |  7 +++--
 usr/src/sys/tahoe/include/trap.h      |  8 +++++-
 usr/src/sys/tahoe/include/vmparam.h   |  8 +++++-
 usr/src/sys/tahoe/tahoe/Locore.c      |  2 +-
 usr/src/sys/tahoe/tahoe/SYS.h         | 14 +++++++++-
 usr/src/sys/tahoe/tahoe/autoconf.c    |  2 +-
 usr/src/sys/tahoe/tahoe/clock.c       |  2 +-
 usr/src/sys/tahoe/tahoe/conf.c        | 14 +++++++++-
 usr/src/sys/tahoe/tahoe/cons.c        | 20 ++++++++++-----
 usr/src/sys/tahoe/tahoe/cp.h          |  4 ++-
 usr/src/sys/tahoe/tahoe/genassym.c    | 26 ++++++++++++++++---
 usr/src/sys/tahoe/tahoe/in_cksum.c    |  2 +-
 usr/src/sys/tahoe/tahoe/kdb_machdep.c |  8 +++++-
 usr/src/sys/tahoe/tahoe/kdb_opset.c   |  8 +++++-
 usr/src/sys/tahoe/tahoe/locore.s      |  9 ++++++-
 usr/src/sys/tahoe/tahoe/machdep.c     |  2 +-
 usr/src/sys/tahoe/tahoe/mem.c         | 33 ++++++++++++++----------
 usr/src/sys/tahoe/tahoe/mem.h         |  4 ++-
 usr/src/sys/tahoe/tahoe/rpb.h         |  8 +++++-
 usr/src/sys/tahoe/tahoe/scb.h         |  4 ++-
 usr/src/sys/tahoe/tahoe/scb.s         |  4 ++-
 usr/src/sys/tahoe/tahoe/swapgeneric.c |  2 +-
 usr/src/sys/tahoe/tahoe/symbols.raw   |  2 +-
 usr/src/sys/tahoe/tahoe/sys_machdep.c | 37 +++++++++++++++------------
 usr/src/sys/tahoe/tahoe/trap.c        | 19 +++++++++-----
 usr/src/sys/tahoe/tahoe/udiv.s        |  5 +++-
 usr/src/sys/tahoe/tahoe/urem.s        |  4 ++-
 usr/src/sys/tahoe/tahoe/vm_machdep.c  |  2 +-
 usr/src/sys/tahoe/vba/cy.c            |  2 +-
 usr/src/sys/tahoe/vba/cyvar.h         |  2 +-
 usr/src/sys/tahoe/vba/dr.c            |  4 ++-
 usr/src/sys/tahoe/vba/drreg.h         |  4 ++-
 usr/src/sys/tahoe/vba/ik.c            |  2 +-
 usr/src/sys/tahoe/vba/ikreg.h         |  4 ++-
 usr/src/sys/tahoe/vba/mp.c            |  2 +-
 usr/src/sys/tahoe/vba/mpreg.h         |  2 +-
 usr/src/sys/tahoe/vba/psproto.h       |  4 ++-
 usr/src/sys/tahoe/vba/psreg.h         |  4 ++-
 usr/src/sys/tahoe/vba/scope.h         |  4 ++-
 usr/src/sys/tahoe/vba/vba.c           |  2 +-
 usr/src/sys/tahoe/vba/vbaparam.h      | 14 +++++++++-
 usr/src/sys/tahoe/vba/vbavar.h        | 14 +++++++++-
 usr/src/sys/tahoe/vba/vd.c            |  2 +-
 usr/src/sys/tahoe/vba/vdreg.h         | 14 +++++++++-
 usr/src/sys/tahoe/vba/vx.c            | 12 ++++++---
 usr/src/sys/tahoe/vba/vxreg.h         | 14 +++++++++-
 61 files changed, 343 insertions(+), 109 deletions(-)

diff --git a/usr/src/sys/netns/ns_cksum.c b/usr/src/sys/netns/ns_cksum.c
index 893c57feed..bda3f926df 100644
--- a/usr/src/sys/netns/ns_cksum.c
+++ b/usr/src/sys/netns/ns_cksum.c
@@ -9,7 +9,7 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  *
- *      @(#)ns_cksum.c	1.3 (Berkeley) %G%
+ *      @(#)ns_cksum.c	7.1 (Berkeley) %G%
  */
 #include "types.h"
 #include "mbuf.h"
diff --git a/usr/src/sys/tahoe/if/if_ace.c b/usr/src/sys/tahoe/if/if_ace.c
index 14df47de80..5a32321997 100644
--- a/usr/src/sys/tahoe/if/if_ace.c
+++ b/usr/src/sys/tahoe/if/if_ace.c
@@ -1,4 +1,16 @@
-/*	if_ace.c	1.13	87/06/30	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *	@(#)if_ace.c	7.1 (Berkeley) %G%
+ */
 
 /*
  * ACC VERSAbus Ethernet controller
diff --git a/usr/src/sys/tahoe/if/if_acereg.h b/usr/src/sys/tahoe/if/if_acereg.h
index f5b54be56c..10f91d58ae 100644
--- a/usr/src/sys/tahoe/if/if_acereg.h
+++ b/usr/src/sys/tahoe/if/if_acereg.h
@@ -1,4 +1,6 @@
-/*	if_acereg.h	1.1	85/07/21	*/
+/*
+ *	@(#)if_acereg.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * VERSAbus ACC ethernet controller definitions
diff --git a/usr/src/sys/tahoe/if/if_enp.c b/usr/src/sys/tahoe/if/if_enp.c
index bc49b0a20f..d73cf5d19d 100644
--- a/usr/src/sys/tahoe/if/if_enp.c
+++ b/usr/src/sys/tahoe/if/if_enp.c
@@ -1,4 +1,4 @@
-/*	if_enp.c	1.5	87/04/29	*/
+/*	if_enp.c	7.1	88/05/21	*/
 
 #include "enp.h"
 #if NENP > 0
diff --git a/usr/src/sys/tahoe/if/if_enpreg.h b/usr/src/sys/tahoe/if/if_enpreg.h
index f7d826e06f..fe98f4c0b4 100644
--- a/usr/src/sys/tahoe/if/if_enpreg.h
+++ b/usr/src/sys/tahoe/if/if_enpreg.h
@@ -1,4 +1,4 @@
-/*	if_enpreg.h	1.4	87/12/22	*/
+/*	if_enpreg.h	7.1	88/05/21	*/
 
 /*	Copyright (c) 1984 by Communication Machinery Corporation
  *
diff --git a/usr/src/sys/tahoe/include/clock.h b/usr/src/sys/tahoe/include/clock.h
index 1cf04fb235..81f27c62ac 100644
--- a/usr/src/sys/tahoe/include/clock.h
+++ b/usr/src/sys/tahoe/include/clock.h
@@ -1,4 +1,16 @@
-/*	clock.h	1.3	86/12/06	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *	@(#)clock.h	7.1 (Berkeley) %G%
+ */
 
 #define	SECDAY		((unsigned)(24*60*60))		/* seconds per day */
 #define	SECYR		((unsigned)(365*SECDAY))	/* per common year */
diff --git a/usr/src/sys/tahoe/include/cpu.h b/usr/src/sys/tahoe/include/cpu.h
index 1a2776431a..71ecc789bb 100644
--- a/usr/src/sys/tahoe/include/cpu.h
+++ b/usr/src/sys/tahoe/include/cpu.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 1986 Regents of the University of California.
+ * Copyright (c) 1986, 1988 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)cpu.h	1.2 (Berkeley) %G%
+ *	@(#)cpu.h	7.1 (Berkeley) %G%
  */
 
 /*
diff --git a/usr/src/sys/tahoe/include/frame.h b/usr/src/sys/tahoe/include/frame.h
index e59f7fcf73..353fcd64e7 100644
--- a/usr/src/sys/tahoe/include/frame.h
+++ b/usr/src/sys/tahoe/include/frame.h
@@ -1,4 +1,6 @@
-/*	frame.h	1.1	86/01/05	*/
+/*
+ *	@(#)frame.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * Definition of the tahoe call frame.
diff --git a/usr/src/sys/tahoe/include/kdbparam.h b/usr/src/sys/tahoe/include/kdbparam.h
index 805c77fb8e..fb5615445a 100644
--- a/usr/src/sys/tahoe/include/kdbparam.h
+++ b/usr/src/sys/tahoe/include/kdbparam.h
@@ -1,4 +1,10 @@
-/*	kdbparam.h	7.6	87/03/13	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *	@(#)kdbparam.h	7.7 (Berkeley) %G%
+ */
 
 #define DBNAME "kdb\n"
 #define LPRMODE "%R"
diff --git a/usr/src/sys/tahoe/include/misc.c b/usr/src/sys/tahoe/include/misc.c
index d1d51bd848..773f0bb4bb 100644
--- a/usr/src/sys/tahoe/include/misc.c
+++ b/usr/src/sys/tahoe/include/misc.c
@@ -1,4 +1,4 @@
-/*	misc.c	1.2	85/07/29	*/
+/*	misc.c	7.1	88/05/21	*/
 
 #include "../h/types.h"
 #include "../tahoe/mtpr.h"
diff --git a/usr/src/sys/tahoe/include/mtpr.h b/usr/src/sys/tahoe/include/mtpr.h
index 7c3616f92a..edbfc56043 100644
--- a/usr/src/sys/tahoe/include/mtpr.h
+++ b/usr/src/sys/tahoe/include/mtpr.h
@@ -1,5 +1,7 @@
-/*	mtpr.h	1.1	86/01/05	*/
-/*	mtpr.h	4.5	82/11/05	*/
+/*
+ *	@(#)mtpr.h	7.1 (Berkeley) %G%
+ *	from mtpr.h	4.5	82/11/05
+ */
 
 /*
  * TAHOE processor register numbers
diff --git a/usr/src/sys/tahoe/include/param.h b/usr/src/sys/tahoe/include/param.h
index 356886928b..36a2e3f9dc 100644
--- a/usr/src/sys/tahoe/include/param.h
+++ b/usr/src/sys/tahoe/include/param.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 1982, 1986 Regents of the University of California.
+ * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)param.h	1.12 (Berkeley) %G%
+ *	@(#)param.h	7.1 (Berkeley) %G%
  */
 
 /*
diff --git a/usr/src/sys/tahoe/include/pcb.h b/usr/src/sys/tahoe/include/pcb.h
index 4099e1106e..57272f5aae 100644
--- a/usr/src/sys/tahoe/include/pcb.h
+++ b/usr/src/sys/tahoe/include/pcb.h
@@ -1,4 +1,10 @@
-/*	pcb.h	1.2	86/01/05	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *	@(#)pcb.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * TAHOE process control block
diff --git a/usr/src/sys/tahoe/include/psl.h b/usr/src/sys/tahoe/include/psl.h
index 8e9bd3ea55..24bc18b4e5 100644
--- a/usr/src/sys/tahoe/include/psl.h
+++ b/usr/src/sys/tahoe/include/psl.h
@@ -1,4 +1,6 @@
-/*	psl.h	1.2	86/01/05	*/
+/*
+ *	@(#)psl.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * TAHOE processor status longword.
diff --git a/usr/src/sys/tahoe/include/pte.h b/usr/src/sys/tahoe/include/pte.h
index 0771972d0b..1efbcc2d84 100644
--- a/usr/src/sys/tahoe/include/pte.h
+++ b/usr/src/sys/tahoe/include/pte.h
@@ -1,4 +1,10 @@
-/*	pte.h	1.6	88/05/02	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *	@(#)pte.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * Tahoe page table entry
diff --git a/usr/src/sys/tahoe/include/reg.h b/usr/src/sys/tahoe/include/reg.h
index dc3838377b..dd700e6290 100644
--- a/usr/src/sys/tahoe/include/reg.h
+++ b/usr/src/sys/tahoe/include/reg.h
@@ -1,5 +1,8 @@
-/*	reg.h	1.2	87/01/13	*/
-/*	reg.h	4.2	81/02/19	*/
+/*
+ *	@(#)reg.h	7.1 (Berkeley) %G%
+ *	from reg.h	4.2	81/02/19
+ */
+
 /*
  * Location of the users' stored
  * registers relative to PSL of 'trap' and 'syscall'.
diff --git a/usr/src/sys/tahoe/include/trap.h b/usr/src/sys/tahoe/include/trap.h
index 46eb8f0511..433905c3f2 100644
--- a/usr/src/sys/tahoe/include/trap.h
+++ b/usr/src/sys/tahoe/include/trap.h
@@ -1,4 +1,10 @@
-/*	trap.h	1.3	87/07/11	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *	@(#)trap.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * Trap type values
diff --git a/usr/src/sys/tahoe/include/vmparam.h b/usr/src/sys/tahoe/include/vmparam.h
index 80dd0c94bd..8872f26ec6 100644
--- a/usr/src/sys/tahoe/include/vmparam.h
+++ b/usr/src/sys/tahoe/include/vmparam.h
@@ -1,4 +1,10 @@
-/*	vmparam.h	1.8	88/01/07	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *	@(#)vmparam.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * Machine dependent constants for tahoe.
diff --git a/usr/src/sys/tahoe/tahoe/Locore.c b/usr/src/sys/tahoe/tahoe/Locore.c
index 71c9589c19..1369b1b9f9 100644
--- a/usr/src/sys/tahoe/tahoe/Locore.c
+++ b/usr/src/sys/tahoe/tahoe/Locore.c
@@ -1,4 +1,4 @@
-/*	Locore.c	1.5	87/06/06	*/
+/*	Locore.c	7.1	88/05/21	*/
 
 #include "../tahoe/mtpr.h"
 #include "../tahoe/trap.h"
diff --git a/usr/src/sys/tahoe/tahoe/SYS.h b/usr/src/sys/tahoe/tahoe/SYS.h
index d2b19de59e..0c6f6cb010 100644
--- a/usr/src/sys/tahoe/tahoe/SYS.h
+++ b/usr/src/sys/tahoe/tahoe/SYS.h
@@ -1,4 +1,16 @@
-/*	SYS.h	1.2	86/01/24	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *	@(#)SYS.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * Macros used to define entry points
diff --git a/usr/src/sys/tahoe/tahoe/autoconf.c b/usr/src/sys/tahoe/tahoe/autoconf.c
index afd90323bd..7cab7997fb 100644
--- a/usr/src/sys/tahoe/tahoe/autoconf.c
+++ b/usr/src/sys/tahoe/tahoe/autoconf.c
@@ -1,4 +1,4 @@
-/*	autoconf.c	1.17	88/05/02	*/
+/*	autoconf.c	7.1	88/05/21	*/
 
 /*
  * Setup the system to run on the current machine.
diff --git a/usr/src/sys/tahoe/tahoe/clock.c b/usr/src/sys/tahoe/tahoe/clock.c
index 26a3a36698..74965b3065 100644
--- a/usr/src/sys/tahoe/tahoe/clock.c
+++ b/usr/src/sys/tahoe/tahoe/clock.c
@@ -1,4 +1,4 @@
-/*	clock.c	1.4	86/12/23	*/
+/*	clock.c	7.1	88/05/21	*/
 
 #include "param.h"
 #include "time.h"
diff --git a/usr/src/sys/tahoe/tahoe/conf.c b/usr/src/sys/tahoe/tahoe/conf.c
index 43404af2b7..04e44453aa 100644
--- a/usr/src/sys/tahoe/tahoe/conf.c
+++ b/usr/src/sys/tahoe/tahoe/conf.c
@@ -1,4 +1,16 @@
-/*	conf.c	1.11	88/05/14	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *	@(#)conf.c	7.1 (Berkeley) %G%
+ */
 
 #include "param.h"
 #include "systm.h"
diff --git a/usr/src/sys/tahoe/tahoe/cons.c b/usr/src/sys/tahoe/tahoe/cons.c
index 9b12b5a2fd..d93165ebc3 100644
--- a/usr/src/sys/tahoe/tahoe/cons.c
+++ b/usr/src/sys/tahoe/tahoe/cons.c
@@ -1,4 +1,10 @@
-/*	cons.c	1.10	87/05/27	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *	@(#)cons.c	7.1 (Berkeley) %G%
+ */
 
 /*
  * Tahoe console processor driver
@@ -21,9 +27,9 @@
 #include "kernel.h"
 #include "syslog.h"
 
-#include "../tahoe/cp.h"
-#include "../tahoe/cpu.h"
-#include "../tahoe/mtpr.h"
+#include "cp.h"
+#include "cpu.h"
+#include "mtpr.h"
 
 int	cnrestart();
 int	timeout();
@@ -175,7 +181,7 @@ cnrint(dev)
 	cnlast = &consin[unit].cp_hdr;
 
 	tp = cntty[unit];
-#ifdef KDB
+#ifdef KADB
 	if (unit == CPCONS && kdbrintr(c, tp))
 		return;
 #endif
@@ -329,7 +335,7 @@ cnputchar(c, tp)
 	cnlast = &current->cp_hdr;
 }
 
-#if defined(KDB) || defined(GENERIC)
+#if defined(KADB) || defined(GENERIC)
 cngetc()
 {
 	register int c, s;
@@ -454,7 +460,7 @@ cnparams(tp)
 	cnpostread(unit);
 }
 
-#ifdef KDB
+#ifdef KADB
 /*
  * Turn input polling on/off (used by debugger).
  */
diff --git a/usr/src/sys/tahoe/tahoe/cp.h b/usr/src/sys/tahoe/tahoe/cp.h
index b84507f316..bbf95efaee 100644
--- a/usr/src/sys/tahoe/tahoe/cp.h
+++ b/usr/src/sys/tahoe/tahoe/cp.h
@@ -1,4 +1,6 @@
-/*	cp.h	1.3	87/02/16	*/
+/*
+ *	@(#)cp.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * Tahoe console processor interface
diff --git a/usr/src/sys/tahoe/tahoe/genassym.c b/usr/src/sys/tahoe/tahoe/genassym.c
index c1408ad2f5..6251e2a1a8 100644
--- a/usr/src/sys/tahoe/tahoe/genassym.c
+++ b/usr/src/sys/tahoe/tahoe/genassym.c
@@ -1,9 +1,24 @@
+/*
+ * Copyright (c) 1983, 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+
 #ifndef lint
-static char sccsid[] = "@(#)genassym.c	1.7 (Berkeley) %G%";
-#endif
+char copyright[] =
+"@(#) Copyright (c) 1983, 1988 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
 
-#include "../tahoe/pte.h"
-#include "../tahoe/scb.h"
+#ifndef lint
+static char sccsid[] = "@(#)genassym.c	7.1 (Berkeley) %G%";
+#endif /* not lint */
 
 #include "param.h"
 #include "vmmeter.h"
@@ -18,6 +33,9 @@ static char sccsid[] = "@(#)genassym.c	1.7 (Berkeley) %G%";
 #include "mbuf.h"
 #include "msgbuf.h"
 
+#include "pte.h"
+#include "scb.h"
+
 #include "../tahoevba/vbaparam.h"
 
 main()
diff --git a/usr/src/sys/tahoe/tahoe/in_cksum.c b/usr/src/sys/tahoe/tahoe/in_cksum.c
index 3abc895a6e..2fb355237c 100644
--- a/usr/src/sys/tahoe/tahoe/in_cksum.c
+++ b/usr/src/sys/tahoe/tahoe/in_cksum.c
@@ -9,7 +9,7 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  *
- *      @(#)in_cksum.c	1.4 (Berkeley) %G%
+ *      @(#)in_cksum.c	7.1 (Berkeley) %G%
  */
 #include "types.h"
 #include "mbuf.h"
diff --git a/usr/src/sys/tahoe/tahoe/kdb_machdep.c b/usr/src/sys/tahoe/tahoe/kdb_machdep.c
index c748a34ee3..f8664ac957 100644
--- a/usr/src/sys/tahoe/tahoe/kdb_machdep.c
+++ b/usr/src/sys/tahoe/tahoe/kdb_machdep.c
@@ -1,4 +1,10 @@
-/*	kdb_machdep.c	7.5	87/12/26	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *	@(#)kdb_machdep.c	7.6 (Berkeley) %G%
+ */
 
 #include "param.h"
 #include "conf.h"
diff --git a/usr/src/sys/tahoe/tahoe/kdb_opset.c b/usr/src/sys/tahoe/tahoe/kdb_opset.c
index ebd5c5d741..c686698779 100644
--- a/usr/src/sys/tahoe/tahoe/kdb_opset.c
+++ b/usr/src/sys/tahoe/tahoe/kdb_opset.c
@@ -1,4 +1,10 @@
-/*	kdb_opset.c	7.3	86/12/15	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *	@(#)kdb_opset.c	7.4 (Berkeley) %G%
+ */
 
 #include "../kdb/defs.h"
 
diff --git a/usr/src/sys/tahoe/tahoe/locore.s b/usr/src/sys/tahoe/tahoe/locore.s
index 04ec675348..fba27a9701 100644
--- a/usr/src/sys/tahoe/tahoe/locore.s
+++ b/usr/src/sys/tahoe/tahoe/locore.s
@@ -1,4 +1,10 @@
-/*	locore.s	1.26	88/05/19	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *	@(#)locore.s	7.1 (Berkeley) %G%
+ */
 
 #include "../tahoe/mtpr.h"
 #include "../tahoe/trap.h"
@@ -7,6 +13,7 @@
 #include "../tahoe/cp.h"
 #include "../tahoe/mem.h"
 #include "../tahoe/SYS.h"
+
 #include "../tahoemath/fp.h"
 
 #include "errno.h"
diff --git a/usr/src/sys/tahoe/tahoe/machdep.c b/usr/src/sys/tahoe/tahoe/machdep.c
index 1445df4acf..309785ff60 100644
--- a/usr/src/sys/tahoe/tahoe/machdep.c
+++ b/usr/src/sys/tahoe/tahoe/machdep.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)machdep.c	1.18 (Berkeley) %G%
+ *	@(#)machdep.c	7.1 (Berkeley) %G%
  */
 
 #include "param.h"
diff --git a/usr/src/sys/tahoe/tahoe/mem.c b/usr/src/sys/tahoe/tahoe/mem.c
index c32a5d165e..5a492f0621 100644
--- a/usr/src/sys/tahoe/tahoe/mem.c
+++ b/usr/src/sys/tahoe/tahoe/mem.c
@@ -1,22 +1,27 @@
-/*	mem.c	1.4	86/12/15	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *	@(#)mem.c	7.1 (Berkeley) %G%
+ */
 
 /*
  * Memory special file
  */
 
-#include "../machine/pte.h"
-
-#include "../h/param.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
-#include "../h/systm.h"
-#include "../h/vm.h"
-#include "../h/cmap.h"
-#include "../h/uio.h"
-
-#include "../tahoe/mtpr.h"
+#include "param.h"
+#include "dir.h"
+#include "user.h"
+#include "conf.h"
+#include "buf.h"
+#include "systm.h"
+#include "vm.h"
+#include "cmap.h"
+#include "uio.h"
+
+#include "pte.h"
+#include "mtpr.h"
 
 mmread(dev, uio)
 	dev_t dev;
diff --git a/usr/src/sys/tahoe/tahoe/mem.h b/usr/src/sys/tahoe/tahoe/mem.h
index 43eca19357..6c67c34ba8 100644
--- a/usr/src/sys/tahoe/tahoe/mem.h
+++ b/usr/src/sys/tahoe/tahoe/mem.h
@@ -1,4 +1,6 @@
-/*	mem.h	1.1	86/01/05	*/
+/*
+ *	@(#)mem.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * Memory controller registers
diff --git a/usr/src/sys/tahoe/tahoe/rpb.h b/usr/src/sys/tahoe/tahoe/rpb.h
index 6d47880560..6db4f0ddb5 100644
--- a/usr/src/sys/tahoe/tahoe/rpb.h
+++ b/usr/src/sys/tahoe/tahoe/rpb.h
@@ -1,4 +1,10 @@
-/*	rpb.h	1.1	86/01/05	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *	@(#)rpb.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * The restart parameter block, which is a page in (very) low
diff --git a/usr/src/sys/tahoe/tahoe/scb.h b/usr/src/sys/tahoe/tahoe/scb.h
index 9977d4984b..f9d796434a 100644
--- a/usr/src/sys/tahoe/tahoe/scb.h
+++ b/usr/src/sys/tahoe/tahoe/scb.h
@@ -1,4 +1,6 @@
-/*	scb.h	1.2	86/01/12	*/
+/*
+ *	@(#)scb.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * System control block.
diff --git a/usr/src/sys/tahoe/tahoe/scb.s b/usr/src/sys/tahoe/tahoe/scb.s
index 374e2a21e8..192c81ded7 100644
--- a/usr/src/sys/tahoe/tahoe/scb.s
+++ b/usr/src/sys/tahoe/tahoe/scb.s
@@ -1,4 +1,6 @@
-/*	scb.s	1.3	86/11/25	*/
+/*
+ *	@(#)scb.s	7.1 (Berkeley) %G%
+ */
 
 /*
  * System control block
diff --git a/usr/src/sys/tahoe/tahoe/swapgeneric.c b/usr/src/sys/tahoe/tahoe/swapgeneric.c
index 92c0741efc..3eaa0ddb10 100644
--- a/usr/src/sys/tahoe/tahoe/swapgeneric.c
+++ b/usr/src/sys/tahoe/tahoe/swapgeneric.c
@@ -1,4 +1,4 @@
-/*	swapgeneric.c	1.6	88/02/08	*/
+/*	swapgeneric.c	7.1	88/05/21	*/
 
 #include "../machine/pte.h"
 
diff --git a/usr/src/sys/tahoe/tahoe/symbols.raw b/usr/src/sys/tahoe/tahoe/symbols.raw
index 997092f493..b2f4dda7c2 100644
--- a/usr/src/sys/tahoe/tahoe/symbols.raw
+++ b/usr/src/sys/tahoe/tahoe/symbols.raw
@@ -1,4 +1,4 @@
-#	symbols.raw	1.1	86/01/05
+#	symbols.raw	7.1	88/05/21
 	_version
 #dmesg
 	_msgbuf
diff --git a/usr/src/sys/tahoe/tahoe/sys_machdep.c b/usr/src/sys/tahoe/tahoe/sys_machdep.c
index 6dce57c276..26daf6a830 100644
--- a/usr/src/sys/tahoe/tahoe/sys_machdep.c
+++ b/usr/src/sys/tahoe/tahoe/sys_machdep.c
@@ -1,19 +1,24 @@
-/*	sys_machdep.c	1.1	86/01/05	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/ioctl.h"
-#include "../h/file.h"
-#include "../h/proc.h"
-#include "../h/uio.h"
-#include "../h/kernel.h"
-#include "../h/mtio.h"
-#include "../h/buf.h"
-
-#include "../machine/dkio.h"
-#include "../machine/pte.h"
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *	@(#)sys_machdep.c	7.1 (Berkeley) %G%
+ */
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "ioctl.h"
+#include "file.h"
+#include "proc.h"
+#include "uio.h"
+#include "kernel.h"
+#include "mtio.h"
+#include "buf.h"
+
+#include "pte.h"
 
 #ifdef TRACE
 int	nvualarm;
diff --git a/usr/src/sys/tahoe/tahoe/trap.c b/usr/src/sys/tahoe/tahoe/trap.c
index 675d5221ad..29bc8ab202 100644
--- a/usr/src/sys/tahoe/tahoe/trap.c
+++ b/usr/src/sys/tahoe/tahoe/trap.c
@@ -1,9 +1,10 @@
-/*	trap.c	1.8	88/05/21	*/
-
-#include "../tahoe/psl.h"
-#include "../tahoe/reg.h"
-#include "../tahoe/pte.h"
-#include "../tahoe/mtpr.h"
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *	@(#)trap.c	7.1 (Berkeley) %G%
+ */
 
 #include "param.h"
 #include "systm.h"
@@ -13,6 +14,12 @@
 #include "seg.h"
 #include "acct.h"
 #include "kernel.h"
+
+#include "psl.h"
+#include "reg.h"
+#include "pte.h"
+#include "mtpr.h"
+
 #define	SYSCALLTRACE
 #ifdef SYSCALLTRACE
 #include "../sys/syscalls.c"
diff --git a/usr/src/sys/tahoe/tahoe/udiv.s b/usr/src/sys/tahoe/tahoe/udiv.s
index f57196adac..7881b7a037 100644
--- a/usr/src/sys/tahoe/tahoe/udiv.s
+++ b/usr/src/sys/tahoe/tahoe/udiv.s
@@ -1,6 +1,9 @@
-/*	udiv.s	1.1	86/01/05	*/
+/*
+ *	@(#)udiv.s	7.1 (Berkeley) %G%
+ */
 
 #include "../tahoe/SYS.h"
+
 /*
  * result = udiv(dividend, divisor)
  *
diff --git a/usr/src/sys/tahoe/tahoe/urem.s b/usr/src/sys/tahoe/tahoe/urem.s
index 0731acc772..5b34bb460b 100644
--- a/usr/src/sys/tahoe/tahoe/urem.s
+++ b/usr/src/sys/tahoe/tahoe/urem.s
@@ -1,4 +1,6 @@
-/*	urem.s	1.1	88/02/08	*/
+/*
+ *	@(#)urem.s	7.1 (Berkeley) %G%
+ */
 
 /*
  * Unsigned remainder.
diff --git a/usr/src/sys/tahoe/tahoe/vm_machdep.c b/usr/src/sys/tahoe/tahoe/vm_machdep.c
index e9d5ecc8be..c26eb60d2c 100644
--- a/usr/src/sys/tahoe/tahoe/vm_machdep.c
+++ b/usr/src/sys/tahoe/tahoe/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	vm_machdep.c	1.11	88/05/06	*/
+/*	vm_machdep.c	7.1	88/05/21	*/
 
 #include "param.h"
 #include "systm.h"
diff --git a/usr/src/sys/tahoe/vba/cy.c b/usr/src/sys/tahoe/vba/cy.c
index ae97563511..34a467eabf 100644
--- a/usr/src/sys/tahoe/vba/cy.c
+++ b/usr/src/sys/tahoe/vba/cy.c
@@ -1,4 +1,4 @@
-/*	cy.c	1.15	88/05/14	*/
+/*	cy.c	7.1	88/05/21	*/
 
 #include "yc.h"
 #if NCY > 0
diff --git a/usr/src/sys/tahoe/vba/cyvar.h b/usr/src/sys/tahoe/vba/cyvar.h
index b038f15bdb..3dde98c1c0 100644
--- a/usr/src/sys/tahoe/vba/cyvar.h
+++ b/usr/src/sys/tahoe/vba/cyvar.h
@@ -1,4 +1,4 @@
-/*	cyvar.h	1.1	85/07/21	*/
+/*	cyvar.h	7.1	88/05/21	*/
 
 #define TM_ATTENTION(addr,x) 	movob(x,addr)	/* also known as: GO */
 
diff --git a/usr/src/sys/tahoe/vba/dr.c b/usr/src/sys/tahoe/vba/dr.c
index 22e34fb173..03cd458f4e 100644
--- a/usr/src/sys/tahoe/vba/dr.c
+++ b/usr/src/sys/tahoe/vba/dr.c
@@ -1,4 +1,6 @@
-/*	dr.c	1.6	86/12/15	*/
+/*
+ *	@(#)dr.c	7.1 (Berkeley) %G%
+ */
 
 #include "dr.h"
 #if NDR > 0
diff --git a/usr/src/sys/tahoe/vba/drreg.h b/usr/src/sys/tahoe/vba/drreg.h
index 5090aeeb10..4b39b88fa7 100644
--- a/usr/src/sys/tahoe/vba/drreg.h
+++ b/usr/src/sys/tahoe/vba/drreg.h
@@ -1,4 +1,6 @@
-/*	drreg.h	1.3	87/12/22	*/
+/*
+ *	@(#)drreg.h	7.1 (Berkeley) %G%
+ */
 
 /*
     ------------------------------------------
diff --git a/usr/src/sys/tahoe/vba/ik.c b/usr/src/sys/tahoe/vba/ik.c
index e6f59e5078..2294ec13c3 100644
--- a/usr/src/sys/tahoe/vba/ik.c
+++ b/usr/src/sys/tahoe/vba/ik.c
@@ -1,4 +1,4 @@
-/*	ik.c	1.5	86/12/23	*/
+/*	ik.c	7.1	88/05/21	*/
 
 #include "ik.h"
 #if NIK > 0
diff --git a/usr/src/sys/tahoe/vba/ikreg.h b/usr/src/sys/tahoe/vba/ikreg.h
index 3465c11444..0b5201d9c3 100644
--- a/usr/src/sys/tahoe/vba/ikreg.h
+++ b/usr/src/sys/tahoe/vba/ikreg.h
@@ -1,4 +1,6 @@
-/*	ikreg.h	1.2	86/12/11	*/
+/*
+ *	@(#)ikreg.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * IKON DR-11W register definitions.
diff --git a/usr/src/sys/tahoe/vba/mp.c b/usr/src/sys/tahoe/vba/mp.c
index 1aaf4530f1..b43adcade3 100644
--- a/usr/src/sys/tahoe/vba/mp.c
+++ b/usr/src/sys/tahoe/vba/mp.c
@@ -1,4 +1,4 @@
-/*	mp.c	1.5	88/05/14	*/
+/*	mp.c	7.1	88/05/21	*/
 
 #include "mp.h"
 #if NMP > 0
diff --git a/usr/src/sys/tahoe/vba/mpreg.h b/usr/src/sys/tahoe/vba/mpreg.h
index 7ec6198f4e..e3d4ce8325 100644
--- a/usr/src/sys/tahoe/vba/mpreg.h
+++ b/usr/src/sys/tahoe/vba/mpreg.h
@@ -1,4 +1,4 @@
-/*	mpreg.h	1.2	87/12/22	*/
+/*	mpreg.h	7.1	88/05/21	*/
 
 /*
  * MPCC Asynchronous Communications Interface.
diff --git a/usr/src/sys/tahoe/vba/psproto.h b/usr/src/sys/tahoe/vba/psproto.h
index 2e182b701f..a7d82a47ed 100644
--- a/usr/src/sys/tahoe/vba/psproto.h
+++ b/usr/src/sys/tahoe/vba/psproto.h
@@ -1,4 +1,6 @@
-/*	psproto.h	1.1	86/11/29	*/
+/*
+ *	@(#)psproto.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * PS300-Host Handshake Protocol Definitions.
diff --git a/usr/src/sys/tahoe/vba/psreg.h b/usr/src/sys/tahoe/vba/psreg.h
index 6f9d92c3c1..e462cfecd2 100644
--- a/usr/src/sys/tahoe/vba/psreg.h
+++ b/usr/src/sys/tahoe/vba/psreg.h
@@ -1,4 +1,6 @@
-/*	psreg.h	1.2	87/12/22	*/
+/*
+ *	@(#)psreg.h	7.1 (Berkeley) %G%
+ */
 
 #ifndef _PSREG_
 #define _PSREG_
diff --git a/usr/src/sys/tahoe/vba/scope.h b/usr/src/sys/tahoe/vba/scope.h
index 8827f40e0a..64add8c50a 100644
--- a/usr/src/sys/tahoe/vba/scope.h
+++ b/usr/src/sys/tahoe/vba/scope.h
@@ -1,4 +1,6 @@
-/*	scope.h	1.3	86/01/12	*/
+/*
+ *	@(#)scope.h	7.1 (Berkeley) %G%
+ */
 
 #ifdef DOSCOPE
 /*  some i/o addresses used to generate pulses for scopes */
diff --git a/usr/src/sys/tahoe/vba/vba.c b/usr/src/sys/tahoe/vba/vba.c
index 0548ee8508..c00411f365 100644
--- a/usr/src/sys/tahoe/vba/vba.c
+++ b/usr/src/sys/tahoe/vba/vba.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)vba.c	1.12 (Berkeley) %G%
+ *	@(#)vba.c	7.1 (Berkeley) %G%
  */
 
 /*
diff --git a/usr/src/sys/tahoe/vba/vbaparam.h b/usr/src/sys/tahoe/vba/vbaparam.h
index 9222813f8b..8ebefce538 100644
--- a/usr/src/sys/tahoe/vba/vbaparam.h
+++ b/usr/src/sys/tahoe/vba/vbaparam.h
@@ -1,4 +1,16 @@
-/*	vbaparam.h	1.4	87/06/30	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *	@(#)vbaparam.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * Parameters related to the VERSAbus i/o configuration.
diff --git a/usr/src/sys/tahoe/vba/vbavar.h b/usr/src/sys/tahoe/vba/vbavar.h
index 50496f3938..2ad9af52ab 100644
--- a/usr/src/sys/tahoe/vba/vbavar.h
+++ b/usr/src/sys/tahoe/vba/vbavar.h
@@ -1,4 +1,16 @@
-/*	vbavar.h	1.6	87/04/01	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *	@(#)vbavar.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * This file contains definitions related to the kernel structures
diff --git a/usr/src/sys/tahoe/vba/vd.c b/usr/src/sys/tahoe/vba/vd.c
index 6cbb0fc8e7..61f772bc3a 100644
--- a/usr/src/sys/tahoe/vba/vd.c
+++ b/usr/src/sys/tahoe/vba/vd.c
@@ -1,4 +1,4 @@
-/*	vd.c	1.25	88/05/21	*/
+/*	vd.c	7.1	88/05/21	*/
 
 #include "dk.h"
 #if NVD > 0
diff --git a/usr/src/sys/tahoe/vba/vdreg.h b/usr/src/sys/tahoe/vba/vdreg.h
index 7821086f3c..55c6f2912e 100644
--- a/usr/src/sys/tahoe/vba/vdreg.h
+++ b/usr/src/sys/tahoe/vba/vdreg.h
@@ -1,4 +1,16 @@
-/*	vdreg.h	1.12	88/05/21	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *	@(#)vdreg.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * Versabus VDDC/SMDE disk controller definitions.
diff --git a/usr/src/sys/tahoe/vba/vx.c b/usr/src/sys/tahoe/vba/vx.c
index 957c41a690..b7e35dbf5a 100644
--- a/usr/src/sys/tahoe/vba/vx.c
+++ b/usr/src/sys/tahoe/vba/vx.c
@@ -1,4 +1,10 @@
-/*	vx.c	1.11	87/09/06	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *	@(#)vx.c	7.1 (Berkeley) %G%
+ */
 
 #include "vx.h"
 #if NVX > 0
@@ -9,8 +15,6 @@
 #define	DOSCOPE
 #endif
 
-#include "../tahoe/pte.h"
-
 #include "param.h"
 #include "ioctl.h"
 #include "tty.h"
@@ -26,6 +30,8 @@
 #include "kernel.h"
 #include "syslog.h"
 
+#include "../tahoe/pte.h"
+
 #include "../tahoevba/vbavar.h"
 #include "../tahoevba/vxreg.h"
 #include "../tahoevba/scope.h"
diff --git a/usr/src/sys/tahoe/vba/vxreg.h b/usr/src/sys/tahoe/vba/vxreg.h
index ac923f11c1..9edf661ace 100644
--- a/usr/src/sys/tahoe/vba/vxreg.h
+++ b/usr/src/sys/tahoe/vba/vxreg.h
@@ -1,4 +1,16 @@
-/*	vxreg.h	1.5	87/01/11	*/
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *	@(#)vxreg.h	7.1 (Berkeley) %G%
+ */
 
 /*
  * Vioc hardware interface structure.
-- 
2.20.1