Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$. We are not

ready for it yet.

sys/Makefile

@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 .if defined(MACHINE_PC98) && ${MACHINE_PC98} == "yes"
 SUBDIR=	pc98/boot

sys/alpha/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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef	_MACHINE_CONSOLE_H_

sys/alpha/include/mouse.h

@@ -19,7 +19,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_MOUSE_H_

sys/alpha/include/pc/display.h

@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 /* Color attributes for foreground text */

sys/alpha/include/pc/msdos.h

@@ -3,7 +3,7 @@
  * [obtained from mtools -wfj]
  * how to decipher DOS disk structures in coexisting with DOS
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #define MSECTOR_SIZE	512		/* MSDOS sector size in bytes */

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _I386_LINUX_LINUX_H_

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.
  *
- *  $FreeBSD$
+ *  $Id$
  */
 
 #include <sys/param.h>

sys/alpha/linux/linux_genassym.c

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/buf.h>

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.
  *
- *  $FreeBSD$
+ *  $Id$
  */
 
 /* XXX we use functions that might not exist. */

sys/alpha/linux/syscalls.conf

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 sysnames="/dev/null"
 sysproto="linux_proto.h"
 sysproto_h=_LINUX_SYSPROTO_H_

sys/alpha/linux/syscalls.master

@@ -1,4 +1,4 @@
-	$FreeBSD$
+	$Id$
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from LINUX).

sys/amd64/Makefile

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	7.3 (Berkeley) 6/9/91
-#	$FreeBSD$
+#	$Id$
 
 # Makefile for i386 tags file
 

sys/amd64/amd64/autoconf.c

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include "apm.h"

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/param.h>

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include "npx.h"				/* NNPX */

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include "npx.h"				/* NNPX */

sys/amd64/amd64/fpu.c

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include "npx.h"

sys/amd64/amd64/genassym.c

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <stdio.h>

sys/amd64/amd64/identcpu.c

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include "opt_cpu.h"

sys/amd64/amd64/locore.S

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$FreeBSD$
+ *	$Id$
  *
  *		originally from: locore.s, by William F. Jolitz
  *

sys/amd64/amd64/locore.s

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$FreeBSD$
+ *	$Id$
  *
  *		originally from: locore.s, by William F. Jolitz
  *

sys/amd64/amd64/machdep.c

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include "npx.h"

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
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

sys/amd64/amd64/pmap.c

@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifdef GUPROF

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include "opt_cpu.h"

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include "opt_cpu.h"

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include "apm.h"

sys/amd64/amd64/sys_machdep.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$FreeBSD$
+ *	$Id$
  *
  */
 

sys/amd64/amd64/trap.c

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

sys/amd64/amd64/tsc.c

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

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$
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include "npx.h"

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.
 #
-#	$FreeBSD$
+#	$Id$
 
 machine		"i386"
 cpu		"I386_CPU"

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_ASMACROS_H_

sys/amd64/include/clock.h

@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_CLOCK_H_

sys/amd64/include/cpu.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_CPU_H_

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_CPUTYPES_H_

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_DB_MACHDEP_H_

sys/amd64/include/exec.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $Id$
  */
 
 #ifndef	_EXEC_H_

sys/amd64/include/float.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_FLOAT_H_

sys/amd64/include/floatingpoint.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _FLOATINGPOINT_H_

sys/amd64/include/fpu.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

sys/amd64/include/frame.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_FRAME_H_

sys/amd64/include/ieeefp.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_MD_VAR_H_

sys/amd64/include/npx.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

sys/amd64/include/pc/display.h

@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 /* Color attributes for foreground text */

sys/amd64/include/pcb.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _I386_PCB_H_

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
- * 	$FreeBSD$
+ * 	$Id$
  */
 
 #ifndef _MACHINE_PMAP_H_

sys/amd64/include/proc.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_PROC_H_

sys/amd64/include/profile.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $Id$
  */
 
 #ifndef _MACHINE_PROFILE_H_

sys/amd64/include/psl.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_PSL_H_

sys/amd64/include/ptrace.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $Id$
  */
 
 #ifndef _MACHINE_PTRACE_H_

sys/amd64/include/reg.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_REG_H_

sys/amd64/include/reloc.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $Id$
  */
 
 #ifndef _I386_MACHINE_RELOC_H_

sys/amd64/include/segments.h

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_SEGMENTS_H_

sys/amd64/include/signal.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $Id$
  */
 
 #ifndef _MACHINE_SIGNAL_H_

sys/amd64/include/specialreg.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_SPECIALREG_H_

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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

sys/amd64/include/trap.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_TRAP_H_

sys/amd64/include/tss.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _MACHINE_TSS_H_

sys/amd64/include/varargs.h

@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $FreeBSD$
+ * $Id$
  */
 
 #ifndef _VARARGS_H_

sys/amd64/include/vmparam.h

@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 

sys/amd64/isa/clock.c

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

sys/amd64/isa/icu.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)icu.h	5.6 (Berkeley) 5/9/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

sys/amd64/isa/isa.c

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

sys/amd64/isa/isa.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifdef PC98

sys/amd64/isa/npx.c

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include "npx.h"

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
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

sys/amd64/isa/vector.S

@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

sys/amd64/isa/vector.s

@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*

sys/amd64/pci/pci_bus.c

@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $FreeBSD$
+**  $Id$
 **
 **  pci bus subroutines for i386 architecture.
 **

sys/amd64/pci/pci_cfgreg.c

@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $FreeBSD$
+**  $Id$
 **
 **  pci bus subroutines for i386 architecture.
 **

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.
  *
- *  $FreeBSD$
+ *  $Id$
  */
 
 #include <sys/param.h>

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.
  *
- *  $FreeBSD$
+ *  $Id$
  */
 
 #include <sys/param.h>

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.
  *
- *  $FreeBSD$
+ *  $Id$
  */
 
 

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.
  *
- *  $FreeBSD$
+ *  $Id$
  */
 
 #include <sys/param.h>

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.
  *
- *  $FreeBSD$
+ *  $Id$
  */
 
 #include <sys/param.h>

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.
  *
- *  $FreeBSD$
+ *  $Id$
  */
 
 /* XXX we use functions that might not exist. */

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.
  *
- *  $FreeBSD$
+ *  $Id$
  */
 
 #include <sys/param.h>

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
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/param.h>

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
- * $FreeBSD$
+ * $Id$
  */
 
 /*

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
-#	$FreeBSD$
+#	$Id$
 #
 # Makefile for FreeBSD
 #

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
-#	$FreeBSD$
+#	$Id$
 #
 # Makefile for FreeBSD
 #

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
-#	$FreeBSD$
+#	$Id$
 #
 # Makefile for FreeBSD
 #

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.
 #
-#	$FreeBSD$
+#	$Id$
 #
 # 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

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.
 #
-#	$FreeBSD$
+#	$Id$
 #
 aic7xxx_asm			optional	ahc	device-driver	   \
 	dependency 	"$S/dev/aic7xxx/aic7xxx_asm.c"			   \

sys/conf/files.pc98

@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-#	$FreeBSD$
+#	$Id$
 #
 aic7xxx_asm			optional	ahc	device-driver	   \
 	dependency 	"$S/dev/aic7xxx/aic7xxx_asm.c"			   \

sys/conf/majors

@@ -1,4 +1,4 @@
-$FreeBSD$
+$Id$
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.

sys/conf/newvers.sh

@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-#	$FreeBSD$
+#	$Id$
 
 TYPE="FreeBSD"
 REVISION="3.0"

sys/conf/nfsswapkernel.c

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * from: @(#)nfsswapvmunix.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $Id$
  */
 
 /*

sys/conf/options

@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 # Format:
 # Option name	filename

sys/conf/options.i386

@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h

sys/conf/options.pc98

@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h

sys/conf/param.c

@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.3 (Berkeley) 8/20/94
- * $FreeBSD$
+ * $Id$
  */
 
 #include "opt_sysvipc.h"

sys/conf/systags.sh

@@ -38,7 +38,7 @@
 #
 # First written May 16, 1992 by Van Jacobson, Lawrence Berkeley Laboratory.
 #
-# $FreeBSD$
+# $Id$
 
 rm -f tags tags.tmp tags.cfiles tags.sfiles tags.hfiles
 MACHINE=`machine`