aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/Makefile2
-rw-r--r--sys/alpha/include/console.h2
-rw-r--r--sys/alpha/include/mouse.h2
-rw-r--r--sys/alpha/include/pc/display.h2
-rw-r--r--sys/alpha/include/pc/msdos.h2
-rw-r--r--sys/alpha/linux/linux.h2
-rw-r--r--sys/alpha/linux/linux_dummy.c2
-rw-r--r--sys/alpha/linux/linux_genassym.c2
-rw-r--r--sys/alpha/linux/linux_sysvec.c2
-rw-r--r--sys/alpha/linux/syscalls.conf2
-rw-r--r--sys/alpha/linux/syscalls.master2
-rw-r--r--sys/amd64/Makefile2
-rw-r--r--sys/amd64/amd64/autoconf.c2
-rw-r--r--sys/amd64/amd64/cpu_switch.S2
-rw-r--r--sys/amd64/amd64/db_disasm.c2
-rw-r--r--sys/amd64/amd64/db_interface.c2
-rw-r--r--sys/amd64/amd64/db_trace.c2
-rw-r--r--sys/amd64/amd64/exception.S2
-rw-r--r--sys/amd64/amd64/exception.s2
-rw-r--r--sys/amd64/amd64/fpu.c2
-rw-r--r--sys/amd64/amd64/genassym.c2
-rw-r--r--sys/amd64/amd64/identcpu.c2
-rw-r--r--sys/amd64/amd64/locore.S2
-rw-r--r--sys/amd64/amd64/locore.s2
-rw-r--r--sys/amd64/amd64/machdep.c2
-rw-r--r--sys/amd64/amd64/mem.c2
-rw-r--r--sys/amd64/amd64/pmap.c2
-rw-r--r--sys/amd64/amd64/prof_machdep.c2
-rw-r--r--sys/amd64/amd64/support.S2
-rw-r--r--sys/amd64/amd64/support.s2
-rw-r--r--sys/amd64/amd64/swtch.s2
-rw-r--r--sys/amd64/amd64/sys_machdep.c2
-rw-r--r--sys/amd64/amd64/trap.c2
-rw-r--r--sys/amd64/amd64/tsc.c2
-rw-r--r--sys/amd64/amd64/vm_machdep.c2
-rw-r--r--sys/amd64/conf/GENERIC2
-rw-r--r--sys/amd64/include/asmacros.h2
-rw-r--r--sys/amd64/include/clock.h2
-rw-r--r--sys/amd64/include/cpu.h2
-rw-r--r--sys/amd64/include/cpufunc.h2
-rw-r--r--sys/amd64/include/cputypes.h2
-rw-r--r--sys/amd64/include/db_machdep.h2
-rw-r--r--sys/amd64/include/exec.h2
-rw-r--r--sys/amd64/include/float.h2
-rw-r--r--sys/amd64/include/floatingpoint.h2
-rw-r--r--sys/amd64/include/fpu.h2
-rw-r--r--sys/amd64/include/frame.h2
-rw-r--r--sys/amd64/include/ieeefp.h2
-rw-r--r--sys/amd64/include/md_var.h2
-rw-r--r--sys/amd64/include/npx.h2
-rw-r--r--sys/amd64/include/pc/display.h2
-rw-r--r--sys/amd64/include/pcb.h2
-rw-r--r--sys/amd64/include/pmap.h2
-rw-r--r--sys/amd64/include/proc.h2
-rw-r--r--sys/amd64/include/profile.h2
-rw-r--r--sys/amd64/include/psl.h2
-rw-r--r--sys/amd64/include/ptrace.h2
-rw-r--r--sys/amd64/include/reg.h2
-rw-r--r--sys/amd64/include/reloc.h2
-rw-r--r--sys/amd64/include/segments.h2
-rw-r--r--sys/amd64/include/signal.h2
-rw-r--r--sys/amd64/include/specialreg.h2
-rw-r--r--sys/amd64/include/sysarch.h2
-rw-r--r--sys/amd64/include/trap.h2
-rw-r--r--sys/amd64/include/tss.h2
-rw-r--r--sys/amd64/include/varargs.h2
-rw-r--r--sys/amd64/include/vmparam.h2
-rw-r--r--sys/amd64/isa/clock.c2
-rw-r--r--sys/amd64/isa/icu.h2
-rw-r--r--sys/amd64/isa/isa.c2
-rw-r--r--sys/amd64/isa/isa.h2
-rw-r--r--sys/amd64/isa/npx.c2
-rw-r--r--sys/amd64/isa/timerreg.h2
-rw-r--r--sys/amd64/isa/vector.S2
-rw-r--r--sys/amd64/isa/vector.s2
-rw-r--r--sys/amd64/pci/pci_bus.c2
-rw-r--r--sys/amd64/pci/pci_cfgreg.c2
-rw-r--r--sys/compat/linux/linux_file.c2
-rw-r--r--sys/compat/linux/linux_ioctl.c2
-rw-r--r--sys/compat/linux/linux_ipc.c2
-rw-r--r--sys/compat/linux/linux_misc.c2
-rw-r--r--sys/compat/linux/linux_signal.c2
-rw-r--r--sys/compat/linux/linux_socket.c2
-rw-r--r--sys/compat/linux/linux_stats.c2
-rw-r--r--sys/compat/linux/linux_util.c2
-rw-r--r--sys/compat/linux/linux_util.h2
-rw-r--r--sys/conf/Makefile.i3862
-rw-r--r--sys/conf/Makefile.pc982
-rw-r--r--sys/conf/Makefile.powerpc2
-rw-r--r--sys/conf/NOTES2
-rw-r--r--sys/conf/files.i3862
-rw-r--r--sys/conf/files.pc982
-rw-r--r--sys/conf/majors2
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--sys/conf/nfsswapkernel.c2
-rw-r--r--sys/conf/options2
-rw-r--r--sys/conf/options.i3862
-rw-r--r--sys/conf/options.pc982
-rw-r--r--sys/conf/param.c2
-rw-r--r--sys/conf/systags.sh2
-rw-r--r--sys/ddb/db_access.c2
-rw-r--r--sys/ddb/db_access.h2
-rw-r--r--sys/ddb/db_aout.c2
-rw-r--r--sys/ddb/db_break.c2
-rw-r--r--sys/ddb/db_break.h2
-rw-r--r--sys/ddb/db_command.c2
-rw-r--r--sys/ddb/db_command.h2
-rw-r--r--sys/ddb/db_examine.c2
-rw-r--r--sys/ddb/db_expr.c2
-rw-r--r--sys/ddb/db_input.c2
-rw-r--r--sys/ddb/db_lex.c2
-rw-r--r--sys/ddb/db_lex.h2
-rw-r--r--sys/ddb/db_output.c2
-rw-r--r--sys/ddb/db_output.h2
-rw-r--r--sys/ddb/db_print.c2
-rw-r--r--sys/ddb/db_ps.c2
-rw-r--r--sys/ddb/db_run.c2
-rw-r--r--sys/ddb/db_sym.c2
-rw-r--r--sys/ddb/db_sym.h2
-rw-r--r--sys/ddb/db_trap.c2
-rw-r--r--sys/ddb/db_variables.c2
-rw-r--r--sys/ddb/db_variables.h2
-rw-r--r--sys/ddb/db_watch.c2
-rw-r--r--sys/ddb/db_watch.h2
-rw-r--r--sys/ddb/db_write_cmd.c2
-rw-r--r--sys/ddb/ddb.h2
-rw-r--r--sys/dev/advansys/adv_isa.c2
-rw-r--r--sys/dev/advansys/advlib.c2
-rw-r--r--sys/dev/advansys/advlib.h2
-rw-r--r--sys/dev/advansys/advmcode.c2
-rw-r--r--sys/dev/advansys/advmcode.h2
-rw-r--r--sys/dev/aic7xxx/aic7xxx.seq2
-rw-r--r--sys/dev/aic7xxx/aic7xxx_asm.c2
-rw-r--r--sys/dev/aic7xxx/aic7xxx_reg.h2
-rw-r--r--sys/dev/aic7xxx/aicasm.c2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm.c2
-rw-r--r--sys/dev/ar/if_ar.c2
-rw-r--r--sys/dev/ar/if_ar_isa.c2
-rw-r--r--sys/dev/ar/if_arregs.h2
-rw-r--r--sys/dev/ccd/ccd.c2
-rw-r--r--sys/dev/cy/cy.c2
-rw-r--r--sys/dev/cy/cy_isa.c2
-rw-r--r--sys/dev/cy/cy_pci.c2
-rw-r--r--sys/dev/cy/cyreg.h2
-rw-r--r--sys/dev/de/if_de.c2
-rw-r--r--sys/dev/dgb/dgb.c2
-rw-r--r--sys/dev/dgb/dgreg.h2
-rw-r--r--sys/dev/ed/if_ed.c2
-rw-r--r--sys/dev/ed/if_ed_pci.c2
-rw-r--r--sys/dev/ed/if_edreg.h2
-rw-r--r--sys/dev/eisa/eisaconf.c2
-rw-r--r--sys/dev/eisa/eisaconf.h2
-rw-r--r--sys/dev/ep/if_ep.c2
-rw-r--r--sys/dev/ep/if_ep_eisa.c2
-rw-r--r--sys/dev/ep/if_epreg.h2
-rw-r--r--sys/dev/fdc/fdc.c2
-rw-r--r--sys/dev/fdc/fdcreg.h2
-rw-r--r--sys/dev/fe/if_fe.c2
-rw-r--r--sys/dev/fe/if_fereg.h2
-rw-r--r--sys/dev/fxp/if_fxp.c2
-rw-r--r--sys/dev/fxp/if_fxpreg.h2
-rw-r--r--sys/dev/ic/cd1400.h2
-rw-r--r--sys/dev/ic/esp.h2
-rw-r--r--sys/dev/ic/hd64570.h2
-rw-r--r--sys/dev/ic/i8237.h2
-rw-r--r--sys/dev/ic/i82586.h2
-rw-r--r--sys/dev/ic/nec765.h2
-rw-r--r--sys/dev/ic/ns16550.h2
-rw-r--r--sys/dev/ie/if_ie.c2
-rw-r--r--sys/dev/ie/if_ie507.h2
-rw-r--r--sys/dev/ie/if_iereg.h2
-rw-r--r--sys/dev/kbd/kbdtables.h2
-rw-r--r--sys/dev/lnc/if_lnc_pci.c2
-rw-r--r--sys/dev/mcd/mcd.c2
-rw-r--r--sys/dev/mcd/mcdreg.h2
-rw-r--r--sys/dev/mse/mse.c2
-rw-r--r--sys/dev/pci/pci.c2
-rw-r--r--sys/dev/pci/pcireg.h2
-rw-r--r--sys/dev/pci/pcivar.h2
-rw-r--r--sys/dev/ppbus/lptio.h2
-rw-r--r--sys/dev/scd/scd.c2
-rw-r--r--sys/dev/scd/scdreg.h2
-rw-r--r--sys/dev/si/si.c2
-rw-r--r--sys/dev/si/si.h2
-rw-r--r--sys/dev/si/sireg.h2
-rw-r--r--sys/dev/sio/sio.c2
-rw-r--r--sys/dev/sio/sioreg.h2
-rw-r--r--sys/dev/speaker/speaker.h2
-rw-r--r--sys/dev/speaker/spkr.c2
-rw-r--r--sys/dev/sr/if_sr.c2
-rw-r--r--sys/dev/sr/if_sr_isa.c2
-rw-r--r--sys/dev/sr/if_sr_pci.c2
-rw-r--r--sys/dev/sr/if_srregs.h2
-rw-r--r--sys/dev/syscons/syscons.c2
-rw-r--r--sys/dev/syscons/syscons.h2
-rw-r--r--sys/dev/vn/vn.c2
-rw-r--r--sys/fs/cd9660/TODO2
-rw-r--r--sys/fs/cd9660/cd9660_bmap.c2
-rw-r--r--sys/fs/cd9660/cd9660_lookup.c2
-rw-r--r--sys/fs/cd9660/cd9660_node.c2
-rw-r--r--sys/fs/cd9660/cd9660_node.h2
-rw-r--r--sys/fs/cd9660/cd9660_rrip.c2
-rw-r--r--sys/fs/cd9660/cd9660_util.c2
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c2
-rw-r--r--sys/fs/cd9660/cd9660_vnops.c2
-rw-r--r--sys/fs/cd9660/iso.h2
-rw-r--r--sys/fs/cd9660/iso_rrip.h2
-rw-r--r--sys/fs/deadfs/dead_vnops.c2
-rw-r--r--sys/fs/fdescfs/fdesc.h2
-rw-r--r--sys/fs/fdescfs/fdesc_vfsops.c2
-rw-r--r--sys/fs/fdescfs/fdesc_vnops.c2
-rw-r--r--sys/fs/fifofs/fifo.h2
-rw-r--r--sys/fs/fifofs/fifo_vnops.c2
-rw-r--r--sys/fs/msdosfs/bootsect.h2
-rw-r--r--sys/fs/msdosfs/bpb.h2
-rw-r--r--sys/fs/msdosfs/denode.h2
-rw-r--r--sys/fs/msdosfs/direntry.h2
-rw-r--r--sys/fs/msdosfs/fat.h2
-rw-r--r--sys/fs/msdosfs/msdosfs_conv.c2
-rw-r--r--sys/fs/msdosfs/msdosfs_denode.c2
-rw-r--r--sys/fs/msdosfs/msdosfs_fat.c2
-rw-r--r--sys/fs/msdosfs/msdosfs_lookup.c2
-rw-r--r--sys/fs/msdosfs/msdosfs_vfsops.c2
-rw-r--r--sys/fs/msdosfs/msdosfs_vnops.c2
-rw-r--r--sys/fs/msdosfs/msdosfsmount.h2
-rw-r--r--sys/fs/nullfs/null.h2
-rw-r--r--sys/fs/nullfs/null_subr.c2
-rw-r--r--sys/fs/nullfs/null_vfsops.c2
-rw-r--r--sys/fs/nullfs/null_vnops.c4
-rw-r--r--sys/fs/portalfs/portal.h2
-rw-r--r--sys/fs/portalfs/portal_vfsops.c2
-rw-r--r--sys/fs/portalfs/portal_vnops.c2
-rw-r--r--sys/fs/procfs/README2
-rw-r--r--sys/fs/procfs/procfs.h2
-rw-r--r--sys/fs/procfs/procfs_ctl.c2
-rw-r--r--sys/fs/procfs/procfs_fpregs.c2
-rw-r--r--sys/fs/procfs/procfs_map.c2
-rw-r--r--sys/fs/procfs/procfs_mem.c2
-rw-r--r--sys/fs/procfs/procfs_note.c2
-rw-r--r--sys/fs/procfs/procfs_regs.c2
-rw-r--r--sys/fs/procfs/procfs_status.c2
-rw-r--r--sys/fs/procfs/procfs_subr.c2
-rw-r--r--sys/fs/procfs/procfs_type.c2
-rw-r--r--sys/fs/procfs/procfs_vfsops.c2
-rw-r--r--sys/fs/procfs/procfs_vnops.c2
-rw-r--r--sys/fs/specfs/spec_vnops.c2
-rw-r--r--sys/fs/umapfs/umap.h2
-rw-r--r--sys/fs/umapfs/umap_subr.c2
-rw-r--r--sys/fs/umapfs/umap_vfsops.c2
-rw-r--r--sys/fs/umapfs/umap_vnops.c2
-rw-r--r--sys/fs/unionfs/union.h2
-rw-r--r--sys/fs/unionfs/union_subr.c2
-rw-r--r--sys/fs/unionfs/union_vfsops.c2
-rw-r--r--sys/fs/unionfs/union_vnops.c2
-rw-r--r--sys/geom/geom_ccd.c2
-rw-r--r--sys/gnu/ext2fs/ext2_bmap.c2
-rw-r--r--sys/gnu/ext2fs/ext2_ihash.c2
-rw-r--r--sys/gnu/ext2fs/ext2_mount.h2
-rw-r--r--sys/gnu/ext2fs/inode.h2
-rw-r--r--sys/gnu/fs/ext2fs/ext2_bmap.c2
-rw-r--r--sys/gnu/fs/ext2fs/ext2_mount.h2
-rw-r--r--sys/gnu/fs/ext2fs/inode.h2
-rw-r--r--sys/gnu/i386/fpemul/control_w.h2
-rw-r--r--sys/gnu/i386/fpemul/div_small.s2
-rw-r--r--sys/gnu/i386/fpemul/errors.c2
-rw-r--r--sys/gnu/i386/fpemul/exception.h2
-rw-r--r--sys/gnu/i386/fpemul/fpu_arith.c2
-rw-r--r--sys/gnu/i386/fpemul/fpu_asm.h2
-rw-r--r--sys/gnu/i386/fpemul/fpu_aux.c2
-rw-r--r--sys/gnu/i386/fpemul/fpu_emu.h2
-rw-r--r--sys/gnu/i386/fpemul/fpu_entry.c2
-rw-r--r--sys/gnu/i386/fpemul/fpu_etc.c2
-rw-r--r--sys/gnu/i386/fpemul/fpu_proto.h2
-rw-r--r--sys/gnu/i386/fpemul/fpu_system.h2
-rw-r--r--sys/gnu/i386/fpemul/fpu_trig.c2
-rw-r--r--sys/gnu/i386/fpemul/get_address.c2
-rw-r--r--sys/gnu/i386/fpemul/load_store.c2
-rw-r--r--sys/gnu/i386/fpemul/math_emu.h2
-rw-r--r--sys/gnu/i386/fpemul/poly_2xm1.c2
-rw-r--r--sys/gnu/i386/fpemul/poly_atan.c2
-rw-r--r--sys/gnu/i386/fpemul/poly_div.s2
-rw-r--r--sys/gnu/i386/fpemul/poly_l2.c2
-rw-r--r--sys/gnu/i386/fpemul/poly_mul64.s2
-rw-r--r--sys/gnu/i386/fpemul/poly_sin.c2
-rw-r--r--sys/gnu/i386/fpemul/poly_tan.c2
-rw-r--r--sys/gnu/i386/fpemul/polynomial.s2
-rw-r--r--sys/gnu/i386/fpemul/reg_add_sub.c2
-rw-r--r--sys/gnu/i386/fpemul/reg_compare.c2
-rw-r--r--sys/gnu/i386/fpemul/reg_constant.h2
-rw-r--r--sys/gnu/i386/fpemul/reg_div.s2
-rw-r--r--sys/gnu/i386/fpemul/reg_ld_str.c2
-rw-r--r--sys/gnu/i386/fpemul/reg_mul.c2
-rw-r--r--sys/gnu/i386/fpemul/reg_norm.s2
-rw-r--r--sys/gnu/i386/fpemul/reg_round.s2
-rw-r--r--sys/gnu/i386/fpemul/reg_u_add.s2
-rw-r--r--sys/gnu/i386/fpemul/reg_u_div.s2
-rw-r--r--sys/gnu/i386/fpemul/reg_u_mul.s2
-rw-r--r--sys/gnu/i386/fpemul/reg_u_sub.s2
-rw-r--r--sys/gnu/i386/fpemul/status_w.h2
-rw-r--r--sys/gnu/i386/fpemul/version.h2
-rw-r--r--sys/gnu/i386/fpemul/wm_shrx.s2
-rw-r--r--sys/gnu/i386/fpemul/wm_sqrt.s2
-rw-r--r--sys/gnu/i386/isa/dgb.c2
-rw-r--r--sys/gnu/i386/isa/dgreg.h2
-rw-r--r--sys/i386/Makefile2
-rw-r--r--sys/i386/apm/apm.c2
-rw-r--r--sys/i386/apm/apm_init/Makefile2
-rw-r--r--sys/i386/apm/apm_init/apm_init.S2
-rw-r--r--sys/i386/apm/apm_init/bin2asm.c2
-rw-r--r--sys/i386/apm/apm_init/real_prot.S2
-rw-r--r--sys/i386/apm/apm_init/real_prot.h2
-rw-r--r--sys/i386/apm/apm_init/rmaouthdr2
-rw-r--r--sys/i386/apm/apm_init/table.c2
-rw-r--r--sys/i386/apm/apm_setup.h2
-rw-r--r--sys/i386/apm/apm_setup.s2
-rw-r--r--sys/i386/bios/apm.c2
-rw-r--r--sys/i386/bios/apm_init/Makefile2
-rw-r--r--sys/i386/bios/apm_init/apm_init.S2
-rw-r--r--sys/i386/bios/apm_init/bin2asm.c2
-rw-r--r--sys/i386/bios/apm_init/real_prot.S2
-rw-r--r--sys/i386/bios/apm_init/real_prot.h2
-rw-r--r--sys/i386/bios/apm_init/rmaouthdr2
-rw-r--r--sys/i386/bios/apm_init/table.c2
-rw-r--r--sys/i386/bios/apm_setup.h2
-rw-r--r--sys/i386/bios/apm_setup.s2
-rw-r--r--sys/i386/boot/Makefile2
-rw-r--r--sys/i386/boot/biosboot/Makefile2
-rw-r--r--sys/i386/boot/biosboot/README.386BSD2
-rw-r--r--sys/i386/boot/biosboot/README.MACH2
-rw-r--r--sys/i386/boot/biosboot/README.serial2
-rw-r--r--sys/i386/boot/biosboot/asm.S2
-rw-r--r--sys/i386/boot/biosboot/asm.h2
-rw-r--r--sys/i386/boot/biosboot/bios.S2
-rw-r--r--sys/i386/boot/biosboot/boot.c2
-rw-r--r--sys/i386/boot/biosboot/boot.h2
-rw-r--r--sys/i386/boot/biosboot/boot2.S2
-rw-r--r--sys/i386/boot/biosboot/disk.c2
-rw-r--r--sys/i386/boot/biosboot/io.c2
-rw-r--r--sys/i386/boot/biosboot/probe_keyboard.c2
-rw-r--r--sys/i386/boot/biosboot/serial.S2
-rw-r--r--sys/i386/boot/biosboot/start.S2
-rw-r--r--sys/i386/boot/biosboot/sys.c2
-rw-r--r--sys/i386/boot/biosboot/table.c2
-rw-r--r--sys/i386/boot/dosboot/Makefile2
-rw-r--r--sys/i386/boot/dosboot/ansi.h2
-rw-r--r--sys/i386/boot/dosboot/boot.c2
-rw-r--r--sys/i386/boot/dosboot/boot.h2
-rw-r--r--sys/i386/boot/dosboot/bootinfo.h2
-rw-r--r--sys/i386/boot/dosboot/cdefs.h2
-rw-r--r--sys/i386/boot/dosboot/dinode.h2
-rw-r--r--sys/i386/boot/dosboot/dir.h2
-rw-r--r--sys/i386/boot/dosboot/disk.c2
-rw-r--r--sys/i386/boot/dosboot/disklabe.h2
-rw-r--r--sys/i386/boot/dosboot/dkbad.h2
-rw-r--r--sys/i386/boot/dosboot/endian.h2
-rw-r--r--sys/i386/boot/dosboot/exec.h2
-rw-r--r--sys/i386/boot/dosboot/fs.h2
-rw-r--r--sys/i386/boot/dosboot/imgact.h2
-rw-r--r--sys/i386/boot/dosboot/inode.h2
-rw-r--r--sys/i386/boot/dosboot/mexec.h2
-rw-r--r--sys/i386/boot/dosboot/param.h2
-rw-r--r--sys/i386/boot/dosboot/quota.h2
-rw-r--r--sys/i386/boot/dosboot/reboot.h2
-rw-r--r--sys/i386/boot/dosboot/sys.c2
-rw-r--r--sys/i386/boot/dosboot/syslimit.h2
-rw-r--r--sys/i386/boot/dosboot/sysparam.h2
-rw-r--r--sys/i386/boot/dosboot/types.h2
-rw-r--r--sys/i386/boot/kzipboot/Makefile2
-rw-r--r--sys/i386/boot/netboot/3c509.c2
-rw-r--r--sys/i386/boot/rawboot/Makefile2
-rw-r--r--sys/i386/conf/GENERIC2
-rw-r--r--sys/i386/conf/LINT2
-rw-r--r--sys/i386/conf/Makefile.i3862
-rw-r--r--sys/i386/conf/NOTES2
-rw-r--r--sys/i386/conf/devices.i3862
-rw-r--r--sys/i386/conf/files.i3862
-rw-r--r--sys/i386/conf/majors.i3862
-rw-r--r--sys/i386/conf/options.i3862
-rw-r--r--sys/i386/eisa/3c5x9.c2
-rw-r--r--sys/i386/eisa/aha1742.c2
-rw-r--r--sys/i386/eisa/aic7770.c2
-rw-r--r--sys/i386/eisa/bt74x.c2
-rw-r--r--sys/i386/eisa/eisaconf.c2
-rw-r--r--sys/i386/eisa/eisaconf.h2
-rw-r--r--sys/i386/i386/autoconf.c2
-rw-r--r--sys/i386/i386/cons.c2
-rw-r--r--sys/i386/i386/cons.h2
-rw-r--r--sys/i386/i386/db_disasm.c2
-rw-r--r--sys/i386/i386/db_interface.c2
-rw-r--r--sys/i386/i386/db_trace.c2
-rw-r--r--sys/i386/i386/exception.s2
-rw-r--r--sys/i386/i386/genassym.c2
-rw-r--r--sys/i386/i386/identcpu.c2
-rw-r--r--sys/i386/i386/in_cksum.c2
-rw-r--r--sys/i386/i386/locore.s2
-rw-r--r--sys/i386/i386/machdep.c2
-rw-r--r--sys/i386/i386/math_emu.h2
-rw-r--r--sys/i386/i386/math_emulate.c2
-rw-r--r--sys/i386/i386/mem.c2
-rw-r--r--sys/i386/i386/microtime.s2
-rw-r--r--sys/i386/i386/perfmon.c2
-rw-r--r--sys/i386/i386/pmap.c2
-rw-r--r--sys/i386/i386/procfs_machdep.c2
-rw-r--r--sys/i386/i386/support.s2
-rw-r--r--sys/i386/i386/swapgeneric.c2
-rw-r--r--sys/i386/i386/swtch.s2
-rw-r--r--sys/i386/i386/symbols.raw2
-rw-r--r--sys/i386/i386/sys_machdep.c2
-rw-r--r--sys/i386/i386/trap.c2
-rw-r--r--sys/i386/i386/tsc.c2
-rw-r--r--sys/i386/i386/userconfig.c4
-rw-r--r--sys/i386/i386/vm_machdep.c2
-rw-r--r--sys/i386/ibcs2/coff.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_fcntl.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_ipc.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_ipc.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_isc.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_misc.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_msg.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_other.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_poll.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_signal.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_sysvec.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_xenix.c2
-rw-r--r--sys/i386/ibcs2/imgact_coff.c2
-rw-r--r--sys/i386/ibcs2/syscalls.conf2
-rw-r--r--sys/i386/ibcs2/syscalls.isc2
-rw-r--r--sys/i386/ibcs2/syscalls.isc.conf2
-rw-r--r--sys/i386/ibcs2/syscalls.master2
-rw-r--r--sys/i386/ibcs2/syscalls.xenix2
-rw-r--r--sys/i386/ibcs2/syscalls.xenix.conf2
-rw-r--r--sys/i386/include/_limits.h2
-rw-r--r--sys/i386/include/ansi.h2
-rw-r--r--sys/i386/include/apm_bios.h2
-rw-r--r--sys/i386/include/apm_segments.h2
-rw-r--r--sys/i386/include/asmacros.h2
-rw-r--r--sys/i386/include/bootinfo.h2
-rw-r--r--sys/i386/include/cdk.h2
-rw-r--r--sys/i386/include/clock.h2
-rw-r--r--sys/i386/include/comstats.h2
-rw-r--r--sys/i386/include/cons.h2
-rw-r--r--sys/i386/include/console.h2
-rw-r--r--sys/i386/include/cpu.h2
-rw-r--r--sys/i386/include/cpufunc.h2
-rw-r--r--sys/i386/include/cputypes.h2
-rw-r--r--sys/i386/include/db_machdep.h2
-rw-r--r--sys/i386/include/endian.h2
-rw-r--r--sys/i386/include/exec.h2
-rw-r--r--sys/i386/include/float.h2
-rw-r--r--sys/i386/include/floatingpoint.h2
-rw-r--r--sys/i386/include/frame.h2
-rw-r--r--sys/i386/include/ieeefp.h2
-rw-r--r--sys/i386/include/in_cksum.h2
-rw-r--r--sys/i386/include/ioctl_ctx.h2
-rw-r--r--sys/i386/include/ioctl_fd.h2
-rw-r--r--sys/i386/include/ipl.h2
-rw-r--r--sys/i386/include/limits.h2
-rw-r--r--sys/i386/include/lpt.h2
-rw-r--r--sys/i386/include/md_var.h2
-rw-r--r--sys/i386/include/mouse.h2
-rw-r--r--sys/i386/include/mtpr.h2
-rw-r--r--sys/i386/include/npx.h2
-rw-r--r--sys/i386/include/param.h2
-rw-r--r--sys/i386/include/pc/display.h2
-rw-r--r--sys/i386/include/pc/msdos.h2
-rw-r--r--sys/i386/include/pcaudioio.h2
-rw-r--r--sys/i386/include/pcb.h2
-rw-r--r--sys/i386/include/perfmon.h2
-rw-r--r--sys/i386/include/pmap.h2
-rw-r--r--sys/i386/include/proc.h2
-rw-r--r--sys/i386/include/profile.h2
-rw-r--r--sys/i386/include/psl.h2
-rw-r--r--sys/i386/include/ptrace.h2
-rw-r--r--sys/i386/include/random.h2
-rw-r--r--sys/i386/include/reg.h2
-rw-r--r--sys/i386/include/reloc.h2
-rw-r--r--sys/i386/include/segments.h2
-rw-r--r--sys/i386/include/si.h2
-rw-r--r--sys/i386/include/signal.h2
-rw-r--r--sys/i386/include/speaker.h2
-rw-r--r--sys/i386/include/specialreg.h2
-rw-r--r--sys/i386/include/spl.h2
-rw-r--r--sys/i386/include/stdarg.h2
-rw-r--r--sys/i386/include/sysarch.h2
-rw-r--r--sys/i386/include/trap.h2
-rw-r--r--sys/i386/include/tss.h2
-rw-r--r--sys/i386/include/types.h2
-rw-r--r--sys/i386/include/varargs.h2
-rw-r--r--sys/i386/include/vmparam.h2
-rw-r--r--sys/i386/include/wtio.h2
-rw-r--r--sys/i386/isa/README.le2
-rw-r--r--sys/i386/isa/adv_isa.c2
-rw-r--r--sys/i386/isa/aha1542.c2
-rw-r--r--sys/i386/isa/aic6360.c2
-rw-r--r--sys/i386/isa/asc.c2
-rw-r--r--sys/i386/isa/ascreg.h2
-rw-r--r--sys/i386/isa/bt5xx-445.c2
-rw-r--r--sys/i386/isa/clock.c2
-rw-r--r--sys/i386/isa/ctx.c2
-rw-r--r--sys/i386/isa/ctxreg.h2
-rw-r--r--sys/i386/isa/cy.c2
-rw-r--r--sys/i386/isa/cyreg.h2
-rw-r--r--sys/i386/isa/diskslice_machdep.c2
-rw-r--r--sys/i386/isa/elink.c2
-rw-r--r--sys/i386/isa/elink.h2
-rw-r--r--sys/i386/isa/fd.c2
-rw-r--r--sys/i386/isa/fdc.h2
-rw-r--r--sys/i386/isa/fdreg.h2
-rw-r--r--sys/i386/isa/ft.c2
-rw-r--r--sys/i386/isa/ic/cd1400.h2
-rw-r--r--sys/i386/isa/ic/esp.h2
-rw-r--r--sys/i386/isa/ic/hd64570.h2
-rw-r--r--sys/i386/isa/ic/i8042.h2
-rw-r--r--sys/i386/isa/ic/i8237.h2
-rw-r--r--sys/i386/isa/ic/i82586.h2
-rw-r--r--sys/i386/isa/ic/lemac.h2
-rw-r--r--sys/i386/isa/ic/nec765.h2
-rw-r--r--sys/i386/isa/ic/ns16450.h2
-rw-r--r--sys/i386/isa/ic/ns16550.h2
-rw-r--r--sys/i386/isa/ic/scd1400.h2
-rw-r--r--sys/i386/isa/icu.h2
-rw-r--r--sys/i386/isa/icu.s2
-rw-r--r--sys/i386/isa/if_ar.c2
-rw-r--r--sys/i386/isa/if_arregs.h2
-rw-r--r--sys/i386/isa/if_ed.c2
-rw-r--r--sys/i386/isa/if_edreg.h2
-rw-r--r--sys/i386/isa/if_eg.c2
-rw-r--r--sys/i386/isa/if_el.c2
-rw-r--r--sys/i386/isa/if_elreg.h2
-rw-r--r--sys/i386/isa/if_ep.c2
-rw-r--r--sys/i386/isa/if_epreg.h2
-rw-r--r--sys/i386/isa/if_fe.c2
-rw-r--r--sys/i386/isa/if_fereg.h2
-rw-r--r--sys/i386/isa/if_ie.c2
-rw-r--r--sys/i386/isa/if_ie507.h2
-rw-r--r--sys/i386/isa/if_iereg.h2
-rw-r--r--sys/i386/isa/if_ix.c2
-rw-r--r--sys/i386/isa/if_ixreg.h2
-rw-r--r--sys/i386/isa/if_le.c2
-rw-r--r--sys/i386/isa/if_sr.c2
-rw-r--r--sys/i386/isa/if_srregs.h2
-rw-r--r--sys/i386/isa/if_ze.c2
-rw-r--r--sys/i386/isa/if_zp.c2
-rw-r--r--sys/i386/isa/if_zpreg.h2
-rw-r--r--sys/i386/isa/isa.c2
-rw-r--r--sys/i386/isa/isa.h2
-rw-r--r--sys/i386/isa/isa_device.h2
-rw-r--r--sys/i386/isa/istallion.c2
-rw-r--r--sys/i386/isa/kbdio.c2
-rw-r--r--sys/i386/isa/kbdio.h2
-rw-r--r--sys/i386/isa/kbdtables.h2
-rw-r--r--sys/i386/isa/lpt.c2
-rw-r--r--sys/i386/isa/lptreg.h2
-rw-r--r--sys/i386/isa/matcd/matcd.c2
-rw-r--r--sys/i386/isa/mcd.c2
-rw-r--r--sys/i386/isa/mcdreg.h2
-rw-r--r--sys/i386/isa/mse.c2
-rw-r--r--sys/i386/isa/npx.c2
-rw-r--r--sys/i386/isa/pcaudio.c2
-rw-r--r--sys/i386/isa/pcibus.c2
-rw-r--r--sys/i386/isa/prof_machdep.c2
-rw-r--r--sys/i386/isa/psm.c2
-rw-r--r--sys/i386/isa/random_machdep.c2
-rw-r--r--sys/i386/isa/rtc.h2
-rw-r--r--sys/i386/isa/scd.c2
-rw-r--r--sys/i386/isa/scdreg.h2
-rw-r--r--sys/i386/isa/seagate.c2
-rw-r--r--sys/i386/isa/si.c2
-rw-r--r--sys/i386/isa/si_code.c2
-rw-r--r--sys/i386/isa/sio.c2
-rw-r--r--sys/i386/isa/sioreg.h2
-rw-r--r--sys/i386/isa/sireg.h2
-rw-r--r--sys/i386/isa/sound/pcm86.c2
-rw-r--r--sys/i386/isa/sound/sound.doc2
-rw-r--r--sys/i386/isa/sound/soundcard.c2
-rw-r--r--sys/i386/isa/spkr.c2
-rw-r--r--sys/i386/isa/stallion.c2
-rw-r--r--sys/i386/isa/syscons.c2
-rw-r--r--sys/i386/isa/syscons.h2
-rw-r--r--sys/i386/isa/timerreg.h2
-rw-r--r--sys/i386/isa/ultra14f.c2
-rw-r--r--sys/i386/isa/vector.s2
-rw-r--r--sys/i386/isa/wd.c2
-rw-r--r--sys/i386/isa/wdreg.h2
-rw-r--r--sys/i386/isa/wt.c2
-rw-r--r--sys/i386/isa/wtreg.h2
-rw-r--r--sys/i386/linux/imgact_linux.c2
-rw-r--r--sys/i386/linux/linux.h2
-rw-r--r--sys/i386/linux/linux_dummy.c2
-rw-r--r--sys/i386/linux/linux_file.c2
-rw-r--r--sys/i386/linux/linux_genassym.c2
-rw-r--r--sys/i386/linux/linux_ioctl.c2
-rw-r--r--sys/i386/linux/linux_ipc.c2
-rw-r--r--sys/i386/linux/linux_misc.c2
-rw-r--r--sys/i386/linux/linux_signal.c2
-rw-r--r--sys/i386/linux/linux_socket.c2
-rw-r--r--sys/i386/linux/linux_stats.c2
-rw-r--r--sys/i386/linux/linux_sysvec.c2
-rw-r--r--sys/i386/linux/linux_util.c2
-rw-r--r--sys/i386/linux/linux_util.h2
-rw-r--r--sys/i386/linux/syscalls.conf2
-rw-r--r--sys/i386/linux/syscalls.master2
-rw-r--r--sys/i386/pci/pci_bus.c2
-rw-r--r--sys/i386/pci/pci_cfgreg.c2
-rw-r--r--sys/i386/pci/pci_pir.c2
-rw-r--r--sys/i386/scsi/93cx6.c2
-rw-r--r--sys/i386/scsi/93cx6.h2
-rw-r--r--sys/i386/scsi/advansys.c2
-rw-r--r--sys/i386/scsi/advansys.h2
-rw-r--r--sys/i386/scsi/aic7xxx.c2
-rw-r--r--sys/i386/scsi/aic7xxx.h2
-rw-r--r--sys/i386/scsi/bt.c2
-rw-r--r--sys/i386/scsi/btreg.h2
-rw-r--r--sys/isa/atrtc.c2
-rw-r--r--sys/isa/fd.c2
-rw-r--r--sys/isa/fdc.h2
-rw-r--r--sys/isa/fdreg.h2
-rw-r--r--sys/isa/ic/esp.h2
-rw-r--r--sys/isa/ic/nec765.h2
-rw-r--r--sys/isa/ic/ns16550.h2
-rw-r--r--sys/isa/kbdio.c2
-rw-r--r--sys/isa/kbdio.h2
-rw-r--r--sys/isa/kbdtables.h2
-rw-r--r--sys/isa/rtc.h2
-rw-r--r--sys/isa/sio.c2
-rw-r--r--sys/isa/sioreg.h2
-rw-r--r--sys/isa/syscons.c2
-rw-r--r--sys/isa/syscons.h2
-rw-r--r--sys/isa/timerreg.h2
-rw-r--r--sys/isofs/cd9660/TODO2
-rw-r--r--sys/isofs/cd9660/cd9660_bmap.c2
-rw-r--r--sys/isofs/cd9660/cd9660_lookup.c2
-rw-r--r--sys/isofs/cd9660/cd9660_node.c2
-rw-r--r--sys/isofs/cd9660/cd9660_node.h2
-rw-r--r--sys/isofs/cd9660/cd9660_rrip.c2
-rw-r--r--sys/isofs/cd9660/cd9660_util.c2
-rw-r--r--sys/isofs/cd9660/cd9660_vfsops.c2
-rw-r--r--sys/isofs/cd9660/cd9660_vnops.c2
-rw-r--r--sys/isofs/cd9660/iso.h2
-rw-r--r--sys/isofs/cd9660/iso_rrip.h2
-rw-r--r--sys/kern/Make.tags.inc2
-rw-r--r--sys/kern/imgact_aout.c2
-rw-r--r--sys/kern/imgact_elf.c2
-rw-r--r--sys/kern/imgact_gzip.c2
-rw-r--r--sys/kern/imgact_shell.c2
-rw-r--r--sys/kern/inflate.c2
-rw-r--r--sys/kern/init_main.c2
-rw-r--r--sys/kern/init_sysvec.c2
-rw-r--r--sys/kern/kern_acct.c2
-rw-r--r--sys/kern/kern_clock.c2
-rw-r--r--sys/kern/kern_conf.c2
-rw-r--r--sys/kern/kern_descrip.c2
-rw-r--r--sys/kern/kern_exec.c2
-rw-r--r--sys/kern/kern_exit.c2
-rw-r--r--sys/kern/kern_fork.c2
-rw-r--r--sys/kern/kern_ktrace.c2
-rw-r--r--sys/kern/kern_lkm.c2
-rw-r--r--sys/kern/kern_lockf.c2
-rw-r--r--sys/kern/kern_malloc.c2
-rw-r--r--sys/kern/kern_mib.c2
-rw-r--r--sys/kern/kern_physio.c2
-rw-r--r--sys/kern/kern_proc.c2
-rw-r--r--sys/kern/kern_prot.c2
-rw-r--r--sys/kern/kern_random.c2
-rw-r--r--sys/kern/kern_resource.c2
-rw-r--r--sys/kern/kern_shutdown.c2
-rw-r--r--sys/kern/kern_sig.c2
-rw-r--r--sys/kern/kern_subr.c2
-rw-r--r--sys/kern/kern_synch.c2
-rw-r--r--sys/kern/kern_sysctl.c2
-rw-r--r--sys/kern/kern_tc.c2
-rw-r--r--sys/kern/kern_time.c2
-rw-r--r--sys/kern/kern_timeout.c2
-rw-r--r--sys/kern/kern_xxx.c2
-rw-r--r--sys/kern/makesyscalls.sh4
-rw-r--r--sys/kern/md5c.c2
-rw-r--r--sys/kern/subr_autoconf.c2
-rw-r--r--sys/kern/subr_clist.c2
-rw-r--r--sys/kern/subr_disklabel.c2
-rw-r--r--sys/kern/subr_diskmbr.c2
-rw-r--r--sys/kern/subr_diskslice.c2
-rw-r--r--sys/kern/subr_dkbad.c2
-rw-r--r--sys/kern/subr_log.c2
-rw-r--r--sys/kern/subr_param.c2
-rw-r--r--sys/kern/subr_prf.c2
-rw-r--r--sys/kern/subr_prof.c2
-rw-r--r--sys/kern/subr_rlist.c2
-rw-r--r--sys/kern/subr_trap.c2
-rw-r--r--sys/kern/subr_xxx.c2
-rw-r--r--sys/kern/sys_generic.c2
-rw-r--r--sys/kern/sys_pipe.c2
-rw-r--r--sys/kern/sys_process.c2
-rw-r--r--sys/kern/sys_socket.c2
-rw-r--r--sys/kern/syscalls.master2
-rw-r--r--sys/kern/sysv_ipc.c2
-rw-r--r--sys/kern/sysv_msg.c2
-rw-r--r--sys/kern/sysv_sem.c2
-rw-r--r--sys/kern/sysv_shm.c2
-rw-r--r--sys/kern/tty.c2
-rw-r--r--sys/kern/tty_compat.c2
-rw-r--r--sys/kern/tty_conf.c2
-rw-r--r--sys/kern/tty_cons.c2
-rw-r--r--sys/kern/tty_pty.c2
-rw-r--r--sys/kern/tty_subr.c2
-rw-r--r--sys/kern/tty_tb.c2
-rw-r--r--sys/kern/tty_tty.c2
-rw-r--r--sys/kern/uipc_domain.c2
-rw-r--r--sys/kern/uipc_proto.c2
-rw-r--r--sys/kern/uipc_socket.c2
-rw-r--r--sys/kern/uipc_syscalls.c2
-rw-r--r--sys/kern/uipc_usrreq.c2
-rw-r--r--sys/kern/vfs_bio.c2
-rw-r--r--sys/kern/vfs_cache.c2
-rw-r--r--sys/kern/vfs_cluster.c2
-rw-r--r--sys/kern/vfs_conf.c2
-rw-r--r--sys/kern/vfs_export.c2
-rw-r--r--sys/kern/vfs_extattr.c2
-rw-r--r--sys/kern/vfs_init.c2
-rw-r--r--sys/kern/vfs_lookup.c2
-rw-r--r--sys/kern/vfs_mount.c2
-rw-r--r--sys/kern/vfs_subr.c2
-rw-r--r--sys/kern/vfs_syscalls.c2
-rw-r--r--sys/kern/vfs_vnops.c2
-rw-r--r--sys/kern/vnode_if.pl2
-rw-r--r--sys/kern/vnode_if.sh2
-rw-r--r--sys/libkern/adddi3.c2
-rw-r--r--sys/libkern/anddi3.c2
-rw-r--r--sys/libkern/ashldi3.c2
-rw-r--r--sys/libkern/ashrdi3.c2
-rw-r--r--sys/libkern/bcmp.c2
-rw-r--r--sys/libkern/cmpdi2.c2
-rw-r--r--sys/libkern/divdi3.c2
-rw-r--r--sys/libkern/ffs.c2
-rw-r--r--sys/libkern/index.c2
-rw-r--r--sys/libkern/iordi3.c2
-rw-r--r--sys/libkern/locc.c2
-rw-r--r--sys/libkern/lshldi3.c2
-rw-r--r--sys/libkern/lshrdi3.c2
-rw-r--r--sys/libkern/mcount.c2
-rw-r--r--sys/libkern/moddi3.c2
-rw-r--r--sys/libkern/muldi3.c2
-rw-r--r--sys/libkern/negdi2.c2
-rw-r--r--sys/libkern/notdi2.c2
-rw-r--r--sys/libkern/qdivrem.c2
-rw-r--r--sys/libkern/qsort.c2
-rw-r--r--sys/libkern/quad.h2
-rw-r--r--sys/libkern/random.c2
-rw-r--r--sys/libkern/rindex.c2
-rw-r--r--sys/libkern/scanc.c2
-rw-r--r--sys/libkern/skpc.c2
-rw-r--r--sys/libkern/strcat.c2
-rw-r--r--sys/libkern/strcmp.c2
-rw-r--r--sys/libkern/strcpy.c2
-rw-r--r--sys/libkern/strlen.c2
-rw-r--r--sys/libkern/strncmp.c2
-rw-r--r--sys/libkern/strncpy.c2
-rw-r--r--sys/libkern/subdi3.c2
-rw-r--r--sys/libkern/ucmpdi2.c2
-rw-r--r--sys/libkern/udivdi3.c2
-rw-r--r--sys/libkern/umoddi3.c2
-rw-r--r--sys/libkern/xordi3.c2
-rw-r--r--sys/miscfs/deadfs/dead_vnops.c2
-rw-r--r--sys/miscfs/fdesc/fdesc.h2
-rw-r--r--sys/miscfs/fdesc/fdesc_vfsops.c2
-rw-r--r--sys/miscfs/fdesc/fdesc_vnops.c2
-rw-r--r--sys/miscfs/fifofs/fifo.h2
-rw-r--r--sys/miscfs/fifofs/fifo_vnops.c2
-rw-r--r--sys/miscfs/kernfs/kernfs.h2
-rw-r--r--sys/miscfs/kernfs/kernfs_vfsops.c2
-rw-r--r--sys/miscfs/kernfs/kernfs_vnops.c2
-rw-r--r--sys/miscfs/nullfs/null.h2
-rw-r--r--sys/miscfs/nullfs/null_subr.c2
-rw-r--r--sys/miscfs/nullfs/null_vfsops.c2
-rw-r--r--sys/miscfs/nullfs/null_vnops.c4
-rw-r--r--sys/miscfs/portal/portal.h2
-rw-r--r--sys/miscfs/portal/portal_vfsops.c2
-rw-r--r--sys/miscfs/portal/portal_vnops.c2
-rw-r--r--sys/miscfs/procfs/README2
-rw-r--r--sys/miscfs/procfs/procfs.h2
-rw-r--r--sys/miscfs/procfs/procfs_ctl.c2
-rw-r--r--sys/miscfs/procfs/procfs_fpregs.c2
-rw-r--r--sys/miscfs/procfs/procfs_map.c2
-rw-r--r--sys/miscfs/procfs/procfs_mem.c2
-rw-r--r--sys/miscfs/procfs/procfs_note.c2
-rw-r--r--sys/miscfs/procfs/procfs_regs.c2
-rw-r--r--sys/miscfs/procfs/procfs_status.c2
-rw-r--r--sys/miscfs/procfs/procfs_subr.c2
-rw-r--r--sys/miscfs/procfs/procfs_type.c2
-rw-r--r--sys/miscfs/procfs/procfs_vfsops.c2
-rw-r--r--sys/miscfs/procfs/procfs_vnops.c2
-rw-r--r--sys/miscfs/specfs/spec_vnops.c2
-rw-r--r--sys/miscfs/specfs/specdev.h2
-rw-r--r--sys/miscfs/umapfs/umap.h2
-rw-r--r--sys/miscfs/umapfs/umap_subr.c2
-rw-r--r--sys/miscfs/umapfs/umap_vfsops.c2
-rw-r--r--sys/miscfs/umapfs/umap_vnops.c2
-rw-r--r--sys/miscfs/union/libc.opendir.c2
-rw-r--r--sys/miscfs/union/union.h2
-rw-r--r--sys/miscfs/union/union_subr.c2
-rw-r--r--sys/miscfs/union/union_vfsops.c2
-rw-r--r--sys/miscfs/union/union_vnops.c2
-rw-r--r--sys/msdosfs/bootsect.h2
-rw-r--r--sys/msdosfs/bpb.h2
-rw-r--r--sys/msdosfs/denode.h2
-rw-r--r--sys/msdosfs/direntry.h2
-rw-r--r--sys/msdosfs/fat.h2
-rw-r--r--sys/msdosfs/msdosfs_conv.c2
-rw-r--r--sys/msdosfs/msdosfs_denode.c2
-rw-r--r--sys/msdosfs/msdosfs_fat.c2
-rw-r--r--sys/msdosfs/msdosfs_lookup.c2
-rw-r--r--sys/msdosfs/msdosfs_vfsops.c2
-rw-r--r--sys/msdosfs/msdosfs_vnops.c2
-rw-r--r--sys/msdosfs/msdosfsmount.h2
-rw-r--r--sys/net/bpf.c2
-rw-r--r--sys/net/bpf.h2
-rw-r--r--sys/net/bpf_compat.h2
-rw-r--r--sys/net/bpf_filter.c2
-rw-r--r--sys/net/bpfdesc.h2
-rw-r--r--sys/net/bsd_comp.c2
-rw-r--r--sys/net/ethernet.h2
-rw-r--r--sys/net/fddi.h2
-rw-r--r--sys/net/if.h2
-rw-r--r--sys/net/if_arp.h2
-rw-r--r--sys/net/if_disc.c2
-rw-r--r--sys/net/if_dl.h2
-rw-r--r--sys/net/if_ethersubr.c2
-rw-r--r--sys/net/if_fddisubr.c2
-rw-r--r--sys/net/if_llc.h2
-rw-r--r--sys/net/if_loop.c2
-rw-r--r--sys/net/if_mib.c2
-rw-r--r--sys/net/if_mib.h2
-rw-r--r--sys/net/if_ppp.c2
-rw-r--r--sys/net/if_ppp.h2
-rw-r--r--sys/net/if_pppvar.h2
-rw-r--r--sys/net/if_sl.c2
-rw-r--r--sys/net/if_slvar.h2
-rw-r--r--sys/net/if_spppsubr.c2
-rw-r--r--sys/net/if_types.h2
-rw-r--r--sys/net/if_var.h2
-rw-r--r--sys/net/netisr.h2
-rw-r--r--sys/net/ppp_comp.h2
-rw-r--r--sys/net/ppp_defs.h2
-rw-r--r--sys/net/ppp_tty.c2
-rw-r--r--sys/net/radix.c2
-rw-r--r--sys/net/radix.h2
-rw-r--r--sys/net/raw_cb.c2
-rw-r--r--sys/net/raw_cb.h2
-rw-r--r--sys/net/raw_usrreq.c2
-rw-r--r--sys/net/route.c2
-rw-r--r--sys/net/route.h2
-rw-r--r--sys/net/rtsock.c2
-rw-r--r--sys/net/slcompress.c2
-rw-r--r--sys/net/slcompress.h2
-rw-r--r--sys/net/slip.h2
-rw-r--r--sys/netinet/icmp_var.h2
-rw-r--r--sys/netinet/if_ether.c2
-rw-r--r--sys/netinet/if_ether.h2
-rw-r--r--sys/netinet/if_fddi.h2
-rw-r--r--sys/netinet/igmp.c2
-rw-r--r--sys/netinet/igmp.h2
-rw-r--r--sys/netinet/igmp_var.h2
-rw-r--r--sys/netinet/in.c2
-rw-r--r--sys/netinet/in.h2
-rw-r--r--sys/netinet/in_cksum.c2
-rw-r--r--sys/netinet/in_pcb.c2
-rw-r--r--sys/netinet/in_pcb.h2
-rw-r--r--sys/netinet/in_systm.h2
-rw-r--r--sys/netinet/in_var.h2
-rw-r--r--sys/netinet/ip.h2
-rw-r--r--sys/netinet/ip_divert.c2
-rw-r--r--sys/netinet/ip_fw.c2
-rw-r--r--sys/netinet/ip_fw.h2
-rw-r--r--sys/netinet/ip_icmp.c2
-rw-r--r--sys/netinet/ip_icmp.h2
-rw-r--r--sys/netinet/ip_input.c2
-rw-r--r--sys/netinet/ip_mroute.h2
-rw-r--r--sys/netinet/ip_output.c2
-rw-r--r--sys/netinet/ip_var.h2
-rw-r--r--sys/netinet/tcp.h2
-rw-r--r--sys/netinet/tcp_debug.c2
-rw-r--r--sys/netinet/tcp_debug.h2
-rw-r--r--sys/netinet/tcp_fsm.h2
-rw-r--r--sys/netinet/tcp_input.c2
-rw-r--r--sys/netinet/tcp_output.c2
-rw-r--r--sys/netinet/tcp_reass.c2
-rw-r--r--sys/netinet/tcp_seq.h2
-rw-r--r--sys/netinet/tcp_subr.c2
-rw-r--r--sys/netinet/tcp_timer.c2
-rw-r--r--sys/netinet/tcp_timer.h2
-rw-r--r--sys/netinet/tcp_timewait.c2
-rw-r--r--sys/netinet/tcp_var.h2
-rw-r--r--sys/netinet/tcpip.h2
-rw-r--r--sys/netinet/udp.h2
-rw-r--r--sys/netinet/udp_var.h2
-rw-r--r--sys/netipx/ipx.c2
-rw-r--r--sys/netipx/ipx.h2
-rw-r--r--sys/netipx/ipx_cksum.c2
-rw-r--r--sys/netipx/ipx_error.c2
-rw-r--r--sys/netipx/ipx_error.h2
-rw-r--r--sys/netipx/ipx_if.h2
-rw-r--r--sys/netipx/ipx_input.c2
-rw-r--r--sys/netipx/ipx_ip.c2
-rw-r--r--sys/netipx/ipx_ip.h2
-rw-r--r--sys/netipx/ipx_outputfl.c2
-rw-r--r--sys/netipx/ipx_pcb.c2
-rw-r--r--sys/netipx/ipx_pcb.h2
-rw-r--r--sys/netipx/ipx_proto.c2
-rw-r--r--sys/netipx/ipx_tun.c2
-rw-r--r--sys/netipx/ipx_usrreq.c2
-rw-r--r--sys/netipx/ipx_var.h2
-rw-r--r--sys/netipx/spx.h2
-rw-r--r--sys/netipx/spx_debug.c2
-rw-r--r--sys/netipx/spx_debug.h2
-rw-r--r--sys/netipx/spx_timer.h2
-rw-r--r--sys/netipx/spx_usrreq.c2
-rw-r--r--sys/netipx/spx_var.h2
-rw-r--r--sys/netns/idp.h2
-rw-r--r--sys/netns/idp_usrreq.c2
-rw-r--r--sys/netns/idp_var.h2
-rw-r--r--sys/netns/ns.c2
-rw-r--r--sys/netns/ns.h2
-rw-r--r--sys/netns/ns_cksum.c2
-rw-r--r--sys/netns/ns_error.c2
-rw-r--r--sys/netns/ns_error.h2
-rw-r--r--sys/netns/ns_if.h2
-rw-r--r--sys/netns/ns_input.c2
-rw-r--r--sys/netns/ns_ip.c2
-rw-r--r--sys/netns/ns_output.c2
-rw-r--r--sys/netns/ns_pcb.c2
-rw-r--r--sys/netns/ns_pcb.h2
-rw-r--r--sys/netns/ns_proto.c2
-rw-r--r--sys/netns/sp.h2
-rw-r--r--sys/netns/spidp.h2
-rw-r--r--sys/netns/spp_debug.c2
-rw-r--r--sys/netns/spp_debug.h2
-rw-r--r--sys/netns/spp_timer.h2
-rw-r--r--sys/netns/spp_usrreq.c2
-rw-r--r--sys/netns/spp_var.h2
-rw-r--r--sys/nfs/nfs.h2
-rw-r--r--sys/nfs/nfs_bio.c2
-rw-r--r--sys/nfs/nfs_common.c2
-rw-r--r--sys/nfs/nfs_common.h2
-rw-r--r--sys/nfs/nfs_node.c2
-rw-r--r--sys/nfs/nfs_nqlease.c2
-rw-r--r--sys/nfs/nfs_serv.c2
-rw-r--r--sys/nfs/nfs_socket.c2
-rw-r--r--sys/nfs/nfs_srvcache.c2
-rw-r--r--sys/nfs/nfs_subs.c2
-rw-r--r--sys/nfs/nfs_syscalls.c2
-rw-r--r--sys/nfs/nfs_vfsops.c2
-rw-r--r--sys/nfs/nfs_vnops.c2
-rw-r--r--sys/nfs/nfsdiskless.h2
-rw-r--r--sys/nfs/nfsm_subs.h2
-rw-r--r--sys/nfs/nfsmount.h2
-rw-r--r--sys/nfs/nfsnode.h2
-rw-r--r--sys/nfs/nfsproto.h2
-rw-r--r--sys/nfs/nfsrtt.h2
-rw-r--r--sys/nfs/nfsrvcache.h2
-rw-r--r--sys/nfs/nfsv2.h2
-rw-r--r--sys/nfs/nqnfs.h2
-rw-r--r--sys/nfs/rpcv2.h2
-rw-r--r--sys/nfs/xdr_subs.h2
-rw-r--r--sys/nfsclient/nfs.h2
-rw-r--r--sys/nfsclient/nfs_bio.c2
-rw-r--r--sys/nfsclient/nfs_nfsiod.c2
-rw-r--r--sys/nfsclient/nfs_node.c2
-rw-r--r--sys/nfsclient/nfs_socket.c2
-rw-r--r--sys/nfsclient/nfs_subs.c2
-rw-r--r--sys/nfsclient/nfs_vfsops.c2
-rw-r--r--sys/nfsclient/nfs_vnops.c2
-rw-r--r--sys/nfsclient/nfsargs.h2
-rw-r--r--sys/nfsclient/nfsdiskless.h2
-rw-r--r--sys/nfsclient/nfsm_subs.h2
-rw-r--r--sys/nfsclient/nfsmount.h2
-rw-r--r--sys/nfsclient/nfsnode.h2
-rw-r--r--sys/nfsclient/nfsstats.h2
-rw-r--r--sys/nfsserver/nfs.h2
-rw-r--r--sys/nfsserver/nfs_serv.c2
-rw-r--r--sys/nfsserver/nfs_srvcache.c2
-rw-r--r--sys/nfsserver/nfs_srvsock.c2
-rw-r--r--sys/nfsserver/nfs_srvsubs.c2
-rw-r--r--sys/nfsserver/nfs_syscalls.c2
-rw-r--r--sys/nfsserver/nfsm_subs.h2
-rw-r--r--sys/nfsserver/nfsproto.h2
-rw-r--r--sys/nfsserver/nfsrvcache.h2
-rw-r--r--sys/nfsserver/nfsrvstats.h2
-rw-r--r--sys/pc98/boot/Makefile2
-rw-r--r--sys/pc98/boot/biosboot/Makefile2
-rw-r--r--sys/pc98/boot/biosboot/README.386BSD2
-rw-r--r--sys/pc98/boot/biosboot/README.MACH2
-rw-r--r--sys/pc98/boot/biosboot/README.serial2
-rw-r--r--sys/pc98/boot/biosboot/asm.S2
-rw-r--r--sys/pc98/boot/biosboot/asm.h2
-rw-r--r--sys/pc98/boot/biosboot/bios.S2
-rw-r--r--sys/pc98/boot/biosboot/boot.c2
-rw-r--r--sys/pc98/boot/biosboot/boot.h2
-rw-r--r--sys/pc98/boot/biosboot/disk.c2
-rw-r--r--sys/pc98/boot/biosboot/io.c2
-rw-r--r--sys/pc98/boot/biosboot/serial.S2
-rw-r--r--sys/pc98/boot/biosboot/start.S2
-rw-r--r--sys/pc98/boot/biosboot/sys.c2
-rw-r--r--sys/pc98/boot/biosboot/table.c2
-rw-r--r--sys/pc98/boot/kzipboot/Makefile2
-rw-r--r--sys/pc98/boot/rawboot/Makefile2
-rw-r--r--sys/pc98/cbus/cbus.h2
-rw-r--r--sys/pc98/cbus/clock.c2
-rw-r--r--sys/pc98/cbus/fdc.c2
-rw-r--r--sys/pc98/cbus/fdcreg.h2
-rw-r--r--sys/pc98/cbus/pcrtc.c2
-rw-r--r--sys/pc98/cbus/sio.c2
-rw-r--r--sys/pc98/conf/GENERIC2
-rw-r--r--sys/pc98/conf/GENERIC982
-rw-r--r--sys/pc98/conf/Makefile.pc982
-rw-r--r--sys/pc98/conf/devices.pc982
-rw-r--r--sys/pc98/conf/files.pc982
-rw-r--r--sys/pc98/conf/majors.pc982
-rw-r--r--sys/pc98/conf/options.pc982
-rw-r--r--sys/pc98/i386/locore.s2
-rw-r--r--sys/pc98/i386/machdep.c2
-rw-r--r--sys/pc98/i386/microtime.s2
-rw-r--r--sys/pc98/i386/trap.c2
-rw-r--r--sys/pc98/i386/userconfig.c4
-rw-r--r--sys/pc98/pc98/atcompat_diskslice.c2
-rw-r--r--sys/pc98/pc98/clock.c2
-rw-r--r--sys/pc98/pc98/diskslice_machdep.c2
-rw-r--r--sys/pc98/pc98/fd.c2
-rw-r--r--sys/pc98/pc98/fdreg.h2
-rw-r--r--sys/pc98/pc98/ft.c2
-rw-r--r--sys/pc98/pc98/if_ed.c2
-rw-r--r--sys/pc98/pc98/if_fe.c2
-rw-r--r--sys/pc98/pc98/lpt.c2
-rw-r--r--sys/pc98/pc98/machdep.c2
-rw-r--r--sys/pc98/pc98/mse.c2
-rw-r--r--sys/pc98/pc98/npx.c2
-rw-r--r--sys/pc98/pc98/pc98.c2
-rw-r--r--sys/pc98/pc98/pc98.h2
-rw-r--r--sys/pc98/pc98/pcaudio.c2
-rw-r--r--sys/pc98/pc98/sio.c2
-rw-r--r--sys/pc98/pc98/sioreg.h2
-rw-r--r--sys/pc98/pc98/spkr.c2
-rw-r--r--sys/pc98/pc98/syscons.c2
-rw-r--r--sys/pc98/pc98/syscons.h2
-rw-r--r--sys/pc98/pc98/wd.c2
-rw-r--r--sys/pci/README.de2
-rw-r--r--sys/pci/README.de-le2
-rw-r--r--sys/pci/aic7870.c2
-rw-r--r--sys/pci/bt9xx.c2
-rw-r--r--sys/pci/cy_pci.c2
-rw-r--r--sys/pci/cy_pcireg.h2
-rw-r--r--sys/pci/dc21040.h2
-rw-r--r--sys/pci/if_de.c2
-rw-r--r--sys/pci/if_ed_p.c2
-rw-r--r--sys/pci/if_fxp.c2
-rw-r--r--sys/pci/if_fxpreg.h2
-rw-r--r--sys/pci/if_lnc_p.c2
-rw-r--r--sys/pci/if_sr_p.c2
-rw-r--r--sys/pci/ncr.c4
-rw-r--r--sys/pci/ncrreg.h2
-rw-r--r--sys/pci/pci.c2
-rw-r--r--sys/pci/pcibus.h2
-rw-r--r--sys/pci/pcireg.h2
-rw-r--r--sys/pci/pcisupport.c2
-rw-r--r--sys/pci/pcivar.h2
-rw-r--r--sys/pci/wd82371.c2
-rw-r--r--sys/pci/wd82371reg.h2
-rw-r--r--sys/powerpc/include/_limits.h2
-rw-r--r--sys/powerpc/include/limits.h2
-rw-r--r--sys/powerpc/include/ptrace.h2
-rw-r--r--sys/scsi/cd.c2
-rw-r--r--sys/scsi/ch.c2
-rw-r--r--sys/scsi/od.c2
-rw-r--r--sys/scsi/pt.c2
-rw-r--r--sys/scsi/scsi_all.h2
-rw-r--r--sys/scsi/scsi_base.c2
-rw-r--r--sys/scsi/scsi_cd.h2
-rw-r--r--sys/scsi/scsi_changer.h2
-rw-r--r--sys/scsi/scsi_debug.h2
-rw-r--r--sys/scsi/scsi_disk.h2
-rw-r--r--sys/scsi/scsi_driver.c2
-rw-r--r--sys/scsi/scsi_driver.h2
-rw-r--r--sys/scsi/scsi_generic.h2
-rw-r--r--sys/scsi/scsi_ioctl.c2
-rw-r--r--sys/scsi/scsi_tape.h2
-rw-r--r--sys/scsi/scsiconf.c2
-rw-r--r--sys/scsi/scsiconf.h2
-rw-r--r--sys/scsi/sctarg.c2
-rw-r--r--sys/scsi/sd.c2
-rw-r--r--sys/scsi/ssc.c2
-rw-r--r--sys/scsi/st.c2
-rw-r--r--sys/scsi/su.c2
-rw-r--r--sys/scsi/uk.c2
-rw-r--r--sys/scsi/worm.c2
-rw-r--r--sys/sys/_sigset.h2
-rw-r--r--sys/sys/acct.h2
-rw-r--r--sys/sys/bio.h2
-rw-r--r--sys/sys/buf.h2
-rw-r--r--sys/sys/callout.h2
-rw-r--r--sys/sys/ccdvar.h2
-rw-r--r--sys/sys/cdefs.h2
-rw-r--r--sys/sys/cdio.h2
-rw-r--r--sys/sys/chio.h2
-rw-r--r--sys/sys/clist.h2
-rw-r--r--sys/sys/conf.h2
-rw-r--r--sys/sys/cons.h2
-rw-r--r--sys/sys/devfsext.h2
-rw-r--r--sys/sys/device.h2
-rw-r--r--sys/sys/dir.h2
-rw-r--r--sys/sys/dirent.h2
-rw-r--r--sys/sys/disk.h2
-rw-r--r--sys/sys/disklabel.h2
-rw-r--r--sys/sys/diskmbr.h2
-rw-r--r--sys/sys/diskpc98.h2
-rw-r--r--sys/sys/diskslice.h2
-rw-r--r--sys/sys/dkbad.h2
-rw-r--r--sys/sys/dkstat.h2
-rw-r--r--sys/sys/dmap.h2
-rw-r--r--sys/sys/domain.h2
-rw-r--r--sys/sys/errno.h2
-rw-r--r--sys/sys/exec.h2
-rw-r--r--sys/sys/fbio.h2
-rw-r--r--sys/sys/fcntl.h2
-rw-r--r--sys/sys/fdcio.h2
-rw-r--r--sys/sys/file.h2
-rw-r--r--sys/sys/filedesc.h2
-rw-r--r--sys/sys/filio.h2
-rw-r--r--sys/sys/gmon.h2
-rw-r--r--sys/sys/imgact.h2
-rw-r--r--sys/sys/imgact_aout.h2
-rw-r--r--sys/sys/imgact_elf.h2
-rw-r--r--sys/sys/inflate.h2
-rw-r--r--sys/sys/ioccom.h2
-rw-r--r--sys/sys/ioctl.h2
-rw-r--r--sys/sys/ioctl_compat.h2
-rw-r--r--sys/sys/ipc.h2
-rw-r--r--sys/sys/kernel.h2
-rw-r--r--sys/sys/ktrace.h2
-rw-r--r--sys/sys/libkern.h2
-rw-r--r--sys/sys/linedisc.h2
-rw-r--r--sys/sys/lkm.h2
-rw-r--r--sys/sys/lockf.h2
-rw-r--r--sys/sys/malloc.h2
-rw-r--r--sys/sys/mbuf.h2
-rw-r--r--sys/sys/md5.h2
-rw-r--r--sys/sys/mman.h2
-rw-r--r--sys/sys/mount.h2
-rw-r--r--sys/sys/mouse.h2
-rw-r--r--sys/sys/msg.h2
-rw-r--r--sys/sys/msgbuf.h2
-rw-r--r--sys/sys/mtio.h2
-rw-r--r--sys/sys/namei.h2
-rw-r--r--sys/sys/param.h2
-rw-r--r--sys/sys/pipe.h2
-rw-r--r--sys/sys/proc.h2
-rw-r--r--sys/sys/protosw.h2
-rw-r--r--sys/sys/ptrace.h2
-rw-r--r--sys/sys/queue.h2
-rw-r--r--sys/sys/random.h2
-rw-r--r--sys/sys/reboot.h2
-rw-r--r--sys/sys/resource.h2
-rw-r--r--sys/sys/resourcevar.h2
-rw-r--r--sys/sys/rlist.h2
-rw-r--r--sys/sys/rtprio.h2
-rw-r--r--sys/sys/scsiio.h2
-rw-r--r--sys/sys/select.h2
-rw-r--r--sys/sys/selinfo.h2
-rw-r--r--sys/sys/sem.h2
-rw-r--r--sys/sys/shm.h2
-rw-r--r--sys/sys/signal.h2
-rw-r--r--sys/sys/signalvar.h2
-rw-r--r--sys/sys/socket.h2
-rw-r--r--sys/sys/socketvar.h2
-rw-r--r--sys/sys/sockio.h2
-rw-r--r--sys/sys/stat.h2
-rw-r--r--sys/sys/sysctl.h2
-rw-r--r--sys/sys/sysent.h2
-rw-r--r--sys/sys/syslimits.h2
-rw-r--r--sys/sys/syslog.h2
-rw-r--r--sys/sys/systm.h2
-rw-r--r--sys/sys/tablet.h2
-rw-r--r--sys/sys/termios.h2
-rw-r--r--sys/sys/time.h2
-rw-r--r--sys/sys/timeb.h2
-rw-r--r--sys/sys/timers.h2
-rw-r--r--sys/sys/times.h2
-rw-r--r--sys/sys/timetc.h2
-rw-r--r--sys/sys/tprintf.h2
-rw-r--r--sys/sys/tty.h2
-rw-r--r--sys/sys/ttychars.h2
-rw-r--r--sys/sys/ttycom.h2
-rw-r--r--sys/sys/ttydefaults.h2
-rw-r--r--sys/sys/ttydev.h2
-rw-r--r--sys/sys/types.h2
-rw-r--r--sys/sys/ucred.h2
-rw-r--r--sys/sys/uio.h2
-rw-r--r--sys/sys/un.h2
-rw-r--r--sys/sys/unistd.h2
-rw-r--r--sys/sys/unpcb.h2
-rw-r--r--sys/sys/user.h2
-rw-r--r--sys/sys/utsname.h2
-rw-r--r--sys/sys/vadvise.h2
-rw-r--r--sys/sys/vcmd.h2
-rw-r--r--sys/sys/vlimit.h2
-rw-r--r--sys/sys/vmmeter.h2
-rw-r--r--sys/sys/vnode.h2
-rw-r--r--sys/sys/vsio.h2
-rw-r--r--sys/sys/wait.h2
-rw-r--r--sys/tools/vnode_if.awk2
-rw-r--r--sys/ufs/ffs/ffs_alloc.c2
-rw-r--r--sys/ufs/ffs/ffs_balloc.c2
-rw-r--r--sys/ufs/ffs/ffs_extern.h2
-rw-r--r--sys/ufs/ffs/ffs_inode.c2
-rw-r--r--sys/ufs/ffs/ffs_subr.c2
-rw-r--r--sys/ufs/ffs/ffs_tables.c2
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c2
-rw-r--r--sys/ufs/ffs/ffs_vnops.c2
-rw-r--r--sys/ufs/ffs/fs.h2
-rw-r--r--sys/ufs/lfs/lfs.h2
-rw-r--r--sys/ufs/lfs/lfs_alloc.c2
-rw-r--r--sys/ufs/lfs/lfs_balloc.c2
-rw-r--r--sys/ufs/lfs/lfs_bio.c2
-rw-r--r--sys/ufs/lfs/lfs_cksum.c2
-rw-r--r--sys/ufs/lfs/lfs_debug.c2
-rw-r--r--sys/ufs/lfs/lfs_extern.h2
-rw-r--r--sys/ufs/lfs/lfs_inode.c2
-rw-r--r--sys/ufs/lfs/lfs_segment.c2
-rw-r--r--sys/ufs/lfs/lfs_subr.c2
-rw-r--r--sys/ufs/lfs/lfs_syscalls.c2
-rw-r--r--sys/ufs/lfs/lfs_vfsops.c2
-rw-r--r--sys/ufs/lfs/lfs_vnops.c2
-rw-r--r--sys/ufs/mfs/mfs_extern.h2
-rw-r--r--sys/ufs/mfs/mfs_vfsops.c2
-rw-r--r--sys/ufs/mfs/mfs_vnops.c2
-rw-r--r--sys/ufs/mfs/mfsiom.h2
-rw-r--r--sys/ufs/mfs/mfsnode.h2
-rw-r--r--sys/ufs/ufs/dinode.h2
-rw-r--r--sys/ufs/ufs/dir.h2
-rw-r--r--sys/ufs/ufs/inode.h2
-rw-r--r--sys/ufs/ufs/quota.h2
-rw-r--r--sys/ufs/ufs/ufs_bmap.c2
-rw-r--r--sys/ufs/ufs/ufs_disksubr.c2
-rw-r--r--sys/ufs/ufs/ufs_extern.h2
-rw-r--r--sys/ufs/ufs/ufs_ihash.c2
-rw-r--r--sys/ufs/ufs/ufs_inode.c2
-rw-r--r--sys/ufs/ufs/ufs_lookup.c2
-rw-r--r--sys/ufs/ufs/ufs_quota.c2
-rw-r--r--sys/ufs/ufs/ufs_readwrite.c2
-rw-r--r--sys/ufs/ufs/ufs_vfsops.c2
-rw-r--r--sys/ufs/ufs/ufs_vnops.c2
-rw-r--r--sys/ufs/ufs/ufsmount.h2
-rw-r--r--sys/vm/default_pager.c2
-rw-r--r--sys/vm/default_pager.h2
-rw-r--r--sys/vm/device_pager.c2
-rw-r--r--sys/vm/device_pager.h2
-rw-r--r--sys/vm/kern_lock.c2
-rw-r--r--sys/vm/lock.h2
-rw-r--r--sys/vm/pmap.h2
-rw-r--r--sys/vm/swap_pager.c2
-rw-r--r--sys/vm/swap_pager.h2
-rw-r--r--sys/vm/vm.h2
-rw-r--r--sys/vm/vm_extern.h2
-rw-r--r--sys/vm/vm_fault.c2
-rw-r--r--sys/vm/vm_glue.c2
-rw-r--r--sys/vm/vm_inherit.h2
-rw-r--r--sys/vm/vm_init.c2
-rw-r--r--sys/vm/vm_kern.c2
-rw-r--r--sys/vm/vm_kern.h2
-rw-r--r--sys/vm/vm_map.c2
-rw-r--r--sys/vm/vm_map.h2
-rw-r--r--sys/vm/vm_meter.c2
-rw-r--r--sys/vm/vm_mmap.c2
-rw-r--r--sys/vm/vm_object.c2
-rw-r--r--sys/vm/vm_object.h2
-rw-r--r--sys/vm/vm_page.c2
-rw-r--r--sys/vm/vm_page.h2
-rw-r--r--sys/vm/vm_pageout.c2
-rw-r--r--sys/vm/vm_pageout.h2
-rw-r--r--sys/vm/vm_pager.c2
-rw-r--r--sys/vm/vm_pager.h2
-rw-r--r--sys/vm/vm_param.h2
-rw-r--r--sys/vm/vm_prot.h2
-rw-r--r--sys/vm/vm_swap.c2
-rw-r--r--sys/vm/vm_unix.c2
-rw-r--r--sys/vm/vnode_pager.c2
-rw-r--r--sys/vm/vnode_pager.h2
1284 files changed, 1290 insertions, 1290 deletions
diff --git a/sys/Makefile b/sys/Makefile
index 0cf0f7abe71b..c91202d8a302 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
.if defined(MACHINE_PC98) && ${MACHINE_PC98} == "yes"
SUBDIR= pc98/boot
diff --git a/sys/alpha/include/console.h b/sys/alpha/include/console.h
index aee3b9dad840..6abf63e50c13 100644
--- a/sys/alpha/include/console.h
+++ b/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_
diff --git a/sys/alpha/include/mouse.h b/sys/alpha/include/mouse.h
index 786bf1370c09..a9396f10f2ae 100644
--- a/sys/alpha/include/mouse.h
+++ b/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_
diff --git a/sys/alpha/include/pc/display.h b/sys/alpha/include/pc/display.h
index 5484d46e9973..9e64a3f13307 100644
--- a/sys/alpha/include/pc/display.h
+++ b/sys/alpha/include/pc/display.h
@@ -1,7 +1,7 @@
/*
* IBM PC display definitions
*
- * $FreeBSD$
+ * $Id$
*/
/* Color attributes for foreground text */
diff --git a/sys/alpha/include/pc/msdos.h b/sys/alpha/include/pc/msdos.h
index 1a02bf9d5873..ea221c7954a5 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
*
- * $FreeBSD$
+ * $Id$
*/
#define MSECTOR_SIZE 512 /* MSDOS sector size in bytes */
diff --git a/sys/alpha/linux/linux.h b/sys/alpha/linux/linux.h
index f7bc682fcd2a..ca724477a612 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_LINUX_LINUX_H_
diff --git a/sys/alpha/linux/linux_dummy.c b/sys/alpha/linux/linux_dummy.c
index 544f53ceb3c4..6cfae05485a8 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/alpha/linux/linux_genassym.c b/sys/alpha/linux/linux_genassym.c
index 40b9113faefe..c8b503ba82c3 100644
--- a/sys/alpha/linux/linux_genassym.c
+++ b/sys/alpha/linux/linux_genassym.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
#include <stdio.h>
#include <sys/param.h>
#include <sys/buf.h>
diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index 459783321197..f61f32103207 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.
*
- * $FreeBSD$
+ * $Id$
*/
/* XXX we use functions that might not exist. */
diff --git a/sys/alpha/linux/syscalls.conf b/sys/alpha/linux/syscalls.conf
index 0a0b11cd45d4..d5922abbca7b 100644
--- a/sys/alpha/linux/syscalls.conf
+++ b/sys/alpha/linux/syscalls.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
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 e5e0d0595d3e..7eb0983775a4 100644
--- a/sys/alpha/linux/syscalls.master
+++ b/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).
diff --git a/sys/amd64/Makefile b/sys/amd64/Makefile
index 23156b9b6196..4ad5a34556fb 100644
--- a/sys/amd64/Makefile
+++ b/sys/amd64/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 7.3 (Berkeley) 6/9/91
-# $FreeBSD$
+# $Id$
# Makefile for i386 tags file
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index c39f5893d792..5d297bfa953f 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index 91bff27d02c3..092e1b7dfedd 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "apm.h"
diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c
index d5da23594491..cf86f8ac88e8 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index a06f421cee06..6e56a9f523b6 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index 93078a8c01f1..4e58144717f6 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index 5155caac8a1b..4f53156f227a 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "npx.h" /* NNPX */
diff --git a/sys/amd64/amd64/exception.s b/sys/amd64/amd64/exception.s
index 5155caac8a1b..4f53156f227a 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "npx.h" /* NNPX */
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index fa024ad02223..52d37adcb4a8 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
- * $FreeBSD$
+ * $Id$
*/
#include "npx.h"
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index c993129c0e68..f8f0018df9c4 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
- * $FreeBSD$
+ * $Id$
*/
#include <stdio.h>
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index 4b644b4bf289..b4b8af85b660 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/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"
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 8a7912b2df6f..95930feeab1a 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
- * $FreeBSD$
+ * $Id$
*
* originally from: locore.s, by William F. Jolitz
*
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index 8a7912b2df6f..95930feeab1a 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
- * $FreeBSD$
+ * $Id$
*
* originally from: locore.s, by William F. Jolitz
*
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index b95b0ff860fb..729a2b9fc269 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
- * $FreeBSD$
+ * $Id$
*/
#include "npx.h"
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index 5275e7d2e6aa..a6e4cc5f25bf 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 0159c32914a8..540f85ed1be9 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c
index af535d397c26..5f6684ddd923 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifdef GUPROF
diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index f1f0c8a87588..f700c7e71691 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "opt_cpu.h"
diff --git a/sys/amd64/amd64/support.s b/sys/amd64/amd64/support.s
index f1f0c8a87588..f700c7e71691 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "opt_cpu.h"
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index 91bff27d02c3..092e1b7dfedd 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "apm.h"
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 8506cfc8888a..ef8c023d87f8 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
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index c866f32254c4..9dca84275078 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index 60aa95c21546..a37022e68acb 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index f6c1606d33f3..18fda31016f2 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$
- * $FreeBSD$
+ * $Id$
*/
#include "npx.h"
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 82abc8f39bca..6d0afebdc156 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.
#
-# $FreeBSD$
+# $Id$
machine "i386"
cpu "I386_CPU"
diff --git a/sys/amd64/include/asmacros.h b/sys/amd64/include/asmacros.h
index f16995775625..592c2bee5002 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_ASMACROS_H_
diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h
index 867e2ee09f6f..30ff97a7f80f 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_CLOCK_H_
diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h
index 83723c27b730..ff0c70cde09a 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_CPU_H_
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index 7f8269fdd8ee..5dd24b1ecc3d 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/include/cputypes.h b/sys/amd64/include/cputypes.h
index e82eddd8e6de..4905900a26bc 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/amd64/include/db_machdep.h b/sys/amd64/include/db_machdep.h
index 633f4f3e3bb1..644f266c2cc4 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/amd64/include/exec.h b/sys/amd64/include/exec.h
index c233b09655b2..7670fd1cee1a 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _EXEC_H_
diff --git a/sys/amd64/include/float.h b/sys/amd64/include/float.h
index a785b9b21739..a0296ecc8c05 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_FLOAT_H_
diff --git a/sys/amd64/include/floatingpoint.h b/sys/amd64/include/floatingpoint.h
index b2b5cb959756..b6adce5f3555 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _FLOATINGPOINT_H_
diff --git a/sys/amd64/include/fpu.h b/sys/amd64/include/fpu.h
index ede1c184ae8b..33c6a232fd36 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/include/frame.h b/sys/amd64/include/frame.h
index 0d51e12339e4..43201f22edf2 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_FRAME_H_
diff --git a/sys/amd64/include/ieeefp.h b/sys/amd64/include/ieeefp.h
index 5160ab9b7277..f81ff31bf7df 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h
index 533131f069f5..c74313f69409 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/amd64/include/npx.h b/sys/amd64/include/npx.h
index ede1c184ae8b..33c6a232fd36 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/include/pc/display.h b/sys/amd64/include/pc/display.h
index 5484d46e9973..9e64a3f13307 100644
--- a/sys/amd64/include/pc/display.h
+++ b/sys/amd64/include/pc/display.h
@@ -1,7 +1,7 @@
/*
* IBM PC display definitions
*
- * $FreeBSD$
+ * $Id$
*/
/* Color attributes for foreground text */
diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h
index 83e352265142..35a61adef94d 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_PCB_H_
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 9d52dfdb8089..8290e0d0057e 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_PMAP_H_
diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index 7628c2d35576..512c9b628acf 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_PROC_H_
diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h
index 3247d1486616..50da5fedee39 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_PROFILE_H_
diff --git a/sys/amd64/include/psl.h b/sys/amd64/include/psl.h
index 04d5ca3efc62..5f1733587f8e 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_PSL_H_
diff --git a/sys/amd64/include/ptrace.h b/sys/amd64/include/ptrace.h
index 4d9724e41cfb..a8f7e715f6a6 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_PTRACE_H_
diff --git a/sys/amd64/include/reg.h b/sys/amd64/include/reg.h
index d392438c1a7d..93cc4b563eec 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_REG_H_
diff --git a/sys/amd64/include/reloc.h b/sys/amd64/include/reloc.h
index ef4b8dbc3e8c..ead0334ee221 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_MACHINE_RELOC_H_
diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h
index f532e2710621..27525889053d 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/amd64/include/signal.h b/sys/amd64/include/signal.h
index 71bfed4bf17c..0e860ba4cc08 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h
index 27515eba18e8..7344d8fa9bfb 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_SPECIALREG_H_
diff --git a/sys/amd64/include/sysarch.h b/sys/amd64/include/sysarch.h
index 78c98a9d75e1..746cef1011fe 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/include/trap.h b/sys/amd64/include/trap.h
index a9ae9e0d781b..9d49054208f1 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_TRAP_H_
diff --git a/sys/amd64/include/tss.h b/sys/amd64/include/tss.h
index 3145d2fb7a91..565defab8cb7 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_TSS_H_
diff --git a/sys/amd64/include/varargs.h b/sys/amd64/include/varargs.h
index b213d88327af..57034fb28f74 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _VARARGS_H_
diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h
index 781b9119d5ad..c2d0d9715ea0 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
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 60aa95c21546..a37022e68acb 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/isa/icu.h b/sys/amd64/isa/icu.h
index 9d1891ad92ba..ba721727f340 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index fe12a85f036d..0b49bba47e70 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/isa/isa.h b/sys/amd64/isa/isa.h
index 964730cb2d41..6ec3ae276d41 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
- * $FreeBSD$
+ * $Id$
*/
#ifdef PC98
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index fa024ad02223..52d37adcb4a8 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
- * $FreeBSD$
+ * $Id$
*/
#include "npx.h"
diff --git a/sys/amd64/isa/timerreg.h b/sys/amd64/isa/timerreg.h
index 7bd619762d8f..ff27bacc24a4 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/isa/vector.S b/sys/amd64/isa/vector.S
index 7ffa885da57c..fa2fd42afb54 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/isa/vector.s b/sys/amd64/isa/vector.s
index 7ffa885da57c..fa2fd42afb54 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c
index 3ca7ca144cd0..dfddb43e6ad5 100644
--- a/sys/amd64/pci/pci_bus.c
+++ b/sys/amd64/pci/pci_bus.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $FreeBSD$
+** $Id$
**
** pci bus subroutines for i386 architecture.
**
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index 3ca7ca144cd0..dfddb43e6ad5 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $FreeBSD$
+** $Id$
**
** pci bus subroutines for i386 architecture.
**
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index addfbefe46e9..e4400af6d735 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 4a495261ecee..c2e8780d86bc 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index 8b66da9a4a2b..dd4007b684e8 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.
*
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 7e99f0290556..0fb8085b14b2 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
index 62d9238a79bf..25a56e5ab53f 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index 43cc0d775e9a..81b975305a1d 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.
*
- * $FreeBSD$
+ * $Id$
*/
/* 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 909dff8e7dd8..2505d742c8df 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c
index c89982671f12..76cbfd637657 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h
index f70011642660..7760e8d6ca05 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index bd573a88ca6b..15d7cfd96245 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
-# $FreeBSD$
+# $Id$
#
# Makefile for FreeBSD
#
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 0d157d5e9acf..8fe080c18c18 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
-# $FreeBSD$
+# $Id$
#
# Makefile for FreeBSD
#
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index bd573a88ca6b..15d7cfd96245 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
-# $FreeBSD$
+# $Id$
#
# Makefile for FreeBSD
#
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 5516716b4ad7..79be523d62d1 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.
#
-# $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
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 82795b0f83db..41235be1b991 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.
#
-# $FreeBSD$
+# $Id$
#
aic7xxx_asm optional ahc device-driver \
dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index abc7e99e1701..4e7c09838c15 100644
--- a/sys/conf/files.pc98
+++ b/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" \
diff --git a/sys/conf/majors b/sys/conf/majors
index 22ca6ab7cb5d..66cca8386d94 100644
--- a/sys/conf/majors
+++ b/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.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index b4cf4ed040b1..e3e30f31ac04 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
-# $FreeBSD$
+# $Id$
TYPE="FreeBSD"
REVISION="3.0"
diff --git a/sys/conf/nfsswapkernel.c b/sys/conf/nfsswapkernel.c
index 3a3fb36d6bd7..432109cb3933 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/conf/options b/sys/conf/options
index 9f977aaea715..4fe0c0a96ef7 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
# Format:
# Option name filename
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 6d9de82187c9..e62814c7c192 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
BOUNCEPAGES opt_bounce.h
USER_LDT
MATH_EMULATE opt_math_emulate.h
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 6d9de82187c9..e62814c7c192 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
BOUNCEPAGES opt_bounce.h
USER_LDT
MATH_EMULATE opt_math_emulate.h
diff --git a/sys/conf/param.c b/sys/conf/param.c
index 0fbbdb590acd..f7d41bfc0b2f 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
- * $FreeBSD$
+ * $Id$
*/
#include "opt_sysvipc.h"
diff --git a/sys/conf/systags.sh b/sys/conf/systags.sh
index 68bfea449aad..4cda02af41d8 100644
--- a/sys/conf/systags.sh
+++ b/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`
diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index e44ec7e72aad..2f4f9064eed9 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h
index 2c0eba1b32f1..ca1b7f9e43cf 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _DDB_DB_ACCESS_H_
diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c
index 9586246d6d61..cfceb15c2c99 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index 70a103276346..a404a3b5f8ff 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index 4a484cc40ead..1de8727af7a6 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index f5b3050101f5..f2e0b0ce8a7c 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h
index 68586c03835b..89e3bc4a5838 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _DDB_DB_COMMAND_H_
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index dbeef6bbef2c..4b0451dea72d 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 3b2b68275866..4372e71b2f24 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index 12609e73161d..4c42a138e8cc 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index c0c41bb814c6..62f86ebbdf7d 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h
index 4b16bc146155..1ca4cb8a6ffd 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _DDB_DB_LEX_H_
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index 7257898eca32..4d4b67f431c5 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index 6f96bf469025..73305d5e31d1 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _DDB_DB_OUTPUT_H_
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index bde1bd5082af..cbc5ab17f7d3 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index bcc7de830eee..cad4f92e6887 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index 5d85c8db5c27..dfd4f1265f27 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index 7974825758a2..f8628beddaca 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index 37c840e1b183..70e552b98167 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _DDB_DB_SYM_H_
diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c
index ef21cbef3fde..913e5e66cd92 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index fc95092b830e..2bb58c7e359c 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h
index c2b2ee7afa5c..62cdb8ce51df 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index d42fb97e3b54..8846ad0c27a7 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index aebecb7ac65d..58f4f6a2792c 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index 890aca0132a8..09000666e3a7 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index 1d44c0ae7817..6376a2000e1f 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index 066836a73500..e7c89151f762 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -40,7 +40,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index f7df66f7ec45..9921cc81dc5c 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
* Ported from:
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index ebb24c390047..9e18137c3368 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
* Ported from:
diff --git a/sys/dev/advansys/advmcode.c b/sys/dev/advansys/advmcode.c
index ce23ca0b0228..37fd53ce80ba 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
*
- * $FreeBSD$
+ * $Id$
*
* 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 37d4bc90a49c..c5688e579cf5 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
*
- * $FreeBSD$
+ * $Id$
*
* Obtained from:
*
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index bc71319ed02a..0baa037c5e84 100644
--- a/sys/dev/aic7xxx/aic7xxx.seq
+++ b/sys/dev/aic7xxx/aic7xxx.seq
@@ -39,7 +39,7 @@
*
*-M************************************************************************/
-VERSION AIC7XXX_SEQ_VER "$FreeBSD$"
+VERSION AIC7XXX_SEQ_VER "$Id$"
#if defined(__NetBSD__)
#include "../../../../dev/ic/aic7xxxreg.h"
diff --git a/sys/dev/aic7xxx/aic7xxx_asm.c b/sys/dev/aic7xxx/aic7xxx_asm.c
index cfaebb3bae97..d3e09f6aeba0 100644
--- a/sys/dev/aic7xxx/aic7xxx_asm.c
+++ b/sys/dev/aic7xxx/aic7xxx_asm.c
@@ -43,7 +43,7 @@
* are token separators.
*
*-M*************************************************************************/
-static char id[] = "$FreeBSD$";
+static char id[] = "$Id$";
#include <ctype.h>
#include <stdio.h>
#include <string.h>
diff --git a/sys/dev/aic7xxx/aic7xxx_reg.h b/sys/dev/aic7xxx/aic7xxx_reg.h
index 520b67749900..523923f192bb 100644
--- a/sys/dev/aic7xxx/aic7xxx_reg.h
+++ b/sys/dev/aic7xxx/aic7xxx_reg.h
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/aic7xxx/aicasm.c b/sys/dev/aic7xxx/aicasm.c
index cfaebb3bae97..d3e09f6aeba0 100644
--- a/sys/dev/aic7xxx/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm.c
@@ -43,7 +43,7 @@
* are token separators.
*
*-M*************************************************************************/
-static char id[] = "$FreeBSD$";
+static char id[] = "$Id$";
#include <ctype.h>
#include <stdio.h>
#include <string.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c
index cfaebb3bae97..d3e09f6aeba0 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm.c
@@ -43,7 +43,7 @@
* are token separators.
*
*-M*************************************************************************/
-static char id[] = "$FreeBSD$";
+static char id[] = "$Id$";
#include <ctype.h>
#include <stdio.h>
#include <string.h>
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index d95303588dd3..a0fad0f5c3e8 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index d95303588dd3..a0fad0f5c3e8 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/ar/if_arregs.h b/sys/dev/ar/if_arregs.h
index 6c5b020908e2..974b76127962 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _IF_ARREGS_H_
#define _IF_ARREGS_H_
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 782cb3092188..3b8e6a408367 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 928b9a686fc5..1bbc540060ab 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "cy.h"
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 928b9a686fc5..1bbc540060ab 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "cy.h"
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index a29c32a45c50..cdef3f50cd55 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/cy/cyreg.h b/sys/dev/cy/cyreg.h
index 545de360bda3..6aa66329e035 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 878d09b6af36..b81f00ec2f96 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.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.
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index af5e6e797eb2..af4fcc24952d 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
/*-
- * dgb.c $FreeBSD$
+ * dgb.c $Id$
*
* Digiboard driver.
*
diff --git a/sys/dev/dgb/dgreg.h b/sys/dev/dgb/dgreg.h
index 7c76b4177292..9d339e582d52 100644
--- a/sys/dev/dgb/dgreg.h
+++ b/sys/dev/dgb/dgreg.h
@@ -1,5 +1,5 @@
/*-
- * dgreg.h $FreeBSD$
+ * dgreg.h $Id$
*
* Digiboard driver.
*
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index c5d74d543aae..c33b9da6939c 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index b4728bdd1cc8..45c04b9d7eab 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "pci.h"
diff --git a/sys/dev/ed/if_edreg.h b/sys/dev/ed/if_edreg.h
index db1a89d9f7ec..a6d611c0cd10 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
* National Semiconductor DS8390 NIC register definitions
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index d9a915f524e8..657b9b3be9ce 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index 6d211827872f..1f2cca38a2ac 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_EISA_EISACONF_H_
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 25da73185daf..304620bb9233 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
*/
/*
- * $FreeBSD$
+ * $Id$
*
* 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 87192e769402..ded45383aede 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "eisa.h"
diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h
index 0f440632f066..a104e8a85af7 100644
--- a/sys/dev/ep/if_epreg.h
+++ b/sys/dev/ep/if_epreg.h
@@ -31,7 +31,7 @@
*/
/*
- * $FreeBSD$
+ * $Id$
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index c2d495db4bc7..e08c63791088 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/dev/fdc/fdcreg.h b/sys/dev/fdc/fdcreg.h
index a98bda7902fd..5ceb73f43301 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 5dce7788180b..d1f91b42a73c 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
*/
/*
- * $FreeBSD$
+ * $Id$
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 2.x
diff --git a/sys/dev/fe/if_fereg.h b/sys/dev/fe/if_fereg.h
index da5da5b4bce3..2a26cbea10f1 100644
--- a/sys/dev/fe/if_fereg.h
+++ b/sys/dev/fe/if_fereg.h
@@ -24,7 +24,7 @@
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
+/* $Id$ */
/*
* 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 8c16d6c58685..ff4fef7f8a4f 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h
index 7e78c415ce21..e62e727e33a7 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.
*
- * $FreeBSD$
+ * $Id$
*/
#define FXP_VENDORID_INTEL 0x8086
diff --git a/sys/dev/ic/cd1400.h b/sys/dev/ic/cd1400.h
index 4e95518c6b53..52081fe9b836 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/ic/esp.h b/sys/dev/ic/esp.h
index 72367141b0b2..6621e6503917 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _IC_ESP_H_
diff --git a/sys/dev/ic/hd64570.h b/sys/dev/ic/hd64570.h
index b676e25a9cd5..e26e89fb789c 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _HD64570_H_
#define _HD64570_H_
diff --git a/sys/dev/ic/i8237.h b/sys/dev/ic/i8237.h
index a7c45c5f3456..e955a33b833d 100644
--- a/sys/dev/ic/i8237.h
+++ b/sys/dev/ic/i8237.h
@@ -1,7 +1,7 @@
/*
* Intel 8237 DMA Controller
*
- * $FreeBSD$
+ * $Id$
*/
#define DMA37MD_SINGLE 0x40 /* single pass mode */
diff --git a/sys/dev/ic/i82586.h b/sys/dev/ic/i82586.h
index 980c13a0627d..736df1ea1eeb 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/ic/nec765.h b/sys/dev/ic/nec765.h
index 3d2cdac6e6bc..7af3c21b2725 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/ic/ns16550.h b/sys/dev/ic/ns16550.h
index 1733d18962ea..ba338886c764 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index beb9184e183e..c43283c8d267 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -43,7 +43,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/ie/if_ie507.h b/sys/dev/ie/if_ie507.h
index 9be1396cf49e..7583ffd0a037 100644
--- a/sys/dev/ie/if_ie507.h
+++ b/sys/dev/ie/if_ie507.h
@@ -1,5 +1,5 @@
/*
- * $FreeBSD$
+ * $Id$
* Definitions for 3C507
*/
diff --git a/sys/dev/ie/if_iereg.h b/sys/dev/ie/if_iereg.h
index 875f63ca9dbb..3588b8414058 100644
--- a/sys/dev/ie/if_iereg.h
+++ b/sys/dev/ie/if_iereg.h
@@ -1,5 +1,5 @@
/*
- * $FreeBSD$
+ * $Id$
* definitions for AT&T StarLAN 10 etc...
*/
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index 9c66fa521225..7c65fd4993fd 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.
*
- * $FreeBSD$
+ * $Id$
*/
#define SET8 0x80 /* set eight bit on */
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index ccee850fb92f..341bd4bb6255 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "pci.h"
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 4049bd905c63..4fa60863a9a5 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.
*
- * $FreeBSD$
+ * $Id$
*/
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 2004a9d890dc..219e119d5a87 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef MCD_H
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index e9f34ad520a9..e00037fa87d3 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
* Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 399cfe6de652..67ef727d8564 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $FreeBSD$
+** $Id$
**
** General subroutines for the PCI bus.
** pci_configure ()
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index 049fca77077d..2f1fcb5a3b48 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.h
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $FreeBSD$
+** $Id$
**
** Names for PCI configuration space registers.
**
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index af389ff91f9c..cb85100646fa 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $FreeBSD$
+** $Id$
**
** Declarations for pci device drivers.
**
diff --git a/sys/dev/ppbus/lptio.h b/sys/dev/ppbus/lptio.h
index 56d196a62fef..2d70d7ee3397 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>
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_LPT_H_
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 54a050e2ba7e..eef043fdc8b2 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
*/
-/* $FreeBSD$ */
+/* $Id$ */
/* Please send any comments to micke@dynas.se */
diff --git a/sys/dev/scd/scdreg.h b/sys/dev/scd/scdreg.h
index e9ce3b15a23f..d04dc6919e2e 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.
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 68662435146f..c2ae76c1badb 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/sys/dev/si/si.h b/sys/dev/si/si.h
index 336eda4427a7..8e6f0abb2342 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/si/sireg.h b/sys/dev/si/sireg.h
index 1a7cdfe30944..cbbfe9c9caad 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index a9de446416dd..0c835f048bd5 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $FreeBSD$
+ * $Id$
*/
#include "opt_comconsole.h"
diff --git a/sys/dev/sio/sioreg.h b/sys/dev/sio/sioreg.h
index b447b61bb5df..4c369074c81b 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
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/dev/speaker/speaker.h b/sys/dev/speaker/speaker.h
index 78b55b6135e3..0d204bfe2f07 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>
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_SPEAKER_H_
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index e11b9e29e667..6ea703277fd2 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>
*
- * $FreeBSD$
+ * $Id$
*/
#include "speaker.h"
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 323085a5da3b..21c0f48cae2e 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 323085a5da3b..21c0f48cae2e 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index ffe4e5314daf..a7bc08cb1919 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "pci.h"
diff --git a/sys/dev/sr/if_srregs.h b/sys/dev/sr/if_srregs.h
index 64d9ba11c50e..689b6abecf2d 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _IF_SRREGS_H_
#define _IF_SRREGS_H_
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 8a85268a251b..1065c16156be 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "sc.h"
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index e920b8c3f7b9..333fd86b2ba7 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_ISA_SYSCONS_H_
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index f03b7c14ea1c..e1011ffba4f4 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/cd9660/TODO b/sys/fs/cd9660/TODO
index 433eaa837bb6..cf3fadc5d882 100644
--- a/sys/fs/cd9660/TODO
+++ b/sys/fs/cd9660/TODO
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
2) should understand Rock Ridge
diff --git a/sys/fs/cd9660/cd9660_bmap.c b/sys/fs/cd9660/cd9660_bmap.c
index 71dfb9e540a8..043e8062aafe 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index e5846527de69..9d8ef1b5acc0 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index ba89cddfe87b..7881de037acd 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index de538fb74461..9205fa68e98b 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
index 521094fd0a30..b54a1d0fc589 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_util.c b/sys/fs/cd9660/cd9660_util.c
index 71c9208a69a8..f79c79c2278c 100644
--- a/sys/fs/cd9660/cd9660_util.c
+++ b/sys/fs/cd9660/cd9660_util.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_util.c 8.3 (Berkeley) 12/5/94
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 466dfcadb47c..8ee2b8eee828 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 203c5a2e8da1..de9d2beef818 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index c8ff135652c6..d7fc57998d53 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
- * $FreeBSD$
+ * $Id$
*/
#define ISODCL(from, to) (to - from + 1)
diff --git a/sys/fs/cd9660/iso_rrip.h b/sys/fs/cd9660/iso_rrip.h
index 9b14979e476a..031aaa37358b 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
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index 6d83c618fe20..b2d2278e1439 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index b4eff1fc4aa4..25cc3d35e677 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
*
- * $FreeBSD$
+ * $Id$
*/
#ifdef KERNEL
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index 135052e5b6a5..214a8985af67 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
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 795dfd8947d4..3e849b5ce035 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
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h
index 65621595b6e7..0a42690e3144 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
- * $FreeBSD$
+ * $Id$
*/
extern vop_t **fifo_vnodeop_p;
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 4cc83bd73e87..599697c3c164 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/msdosfs/bootsect.h b/sys/fs/msdosfs/bootsect.h
index 47151268e924..86fc415770c0 100644
--- a/sys/fs/msdosfs/bootsect.h
+++ b/sys/fs/msdosfs/bootsect.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/* $NetBSD: bootsect.h,v 1.4 1994/06/29 06:35:28 cgd Exp $ */
/*
diff --git a/sys/fs/msdosfs/bpb.h b/sys/fs/msdosfs/bpb.h
index 3b77aed1c12e..33e1eb69e00c 100644
--- a/sys/fs/msdosfs/bpb.h
+++ b/sys/fs/msdosfs/bpb.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/* $NetBSD: bpb.h,v 1.3 1994/06/29 06:35:29 cgd Exp $ */
/*
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h
index eb2de97e7088..a6ed18515ae0 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/* $NetBSD: denode.h,v 1.8 1994/08/21 18:43:49 ws Exp $ */
/*-
diff --git a/sys/fs/msdosfs/direntry.h b/sys/fs/msdosfs/direntry.h
index a5d9ce8d7344..b97a1055f402 100644
--- a/sys/fs/msdosfs/direntry.h
+++ b/sys/fs/msdosfs/direntry.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/* $NetBSD: direntry.h,v 1.7 1994/08/21 18:43:54 ws Exp $ */
/*-
diff --git a/sys/fs/msdosfs/fat.h b/sys/fs/msdosfs/fat.h
index 79b95ab79982..f8fdb6fd1eeb 100644
--- a/sys/fs/msdosfs/fat.h
+++ b/sys/fs/msdosfs/fat.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/* $NetBSD: fat.h,v 1.4 1994/08/21 18:43:57 ws Exp $ */
/*-
diff --git a/sys/fs/msdosfs/msdosfs_conv.c b/sys/fs/msdosfs/msdosfs_conv.c
index 90fe907d009f..e35f52bcef81 100644
--- a/sys/fs/msdosfs/msdosfs_conv.c
+++ b/sys/fs/msdosfs/msdosfs_conv.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/* $NetBSD: msdosfs_conv.c,v 1.6.2.1 1994/08/30 02:27:57 cgd Exp $ */
/*
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index a868b66fd0a9..0f40e1899722 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/* $NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $ */
/*-
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index 1427c54ecdc9..be51ed5af02c 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/* $NetBSD: msdosfs_fat.c,v 1.12 1994/08/21 18:44:04 ws Exp $ */
/*-
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index 6617f9e9c9f0..fdd4ec935899 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/* $NetBSD: msdosfs_lookup.c,v 1.14 1994/08/21 18:44:07 ws Exp $ */
/*-
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index d0c8cdb1a0d4..0f28b44dae5f 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/* $NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $ */
/*-
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index b11ba5c01c1b..65e87256a31f 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */
/*-
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index 44732c7f2ba2..1c316e31aad3 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/* $NetBSD: msdosfsmount.h,v 1.7 1994/08/21 18:44:17 ws Exp $ */
/*-
diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h
index cf0b62b2c691..8e886f7281e0 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
*
- * $FreeBSD$
+ * $Id$
*/
struct null_args {
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index 441863198773..8e4716872367 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
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index badab6637268..2d52f1ffc7c7 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index b942df630c12..5ff5af240987 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.14 1997/02/12 14:55:01 mpp Exp $
+ * $Id: null_vnops.c,v 1.15 1997/02/12 18:06:08 mpp Exp $
* ...and...
* @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/portalfs/portal.h b/sys/fs/portalfs/portal.h
index cd3c8057f50b..3d85d8ee646e 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
*
- * $FreeBSD$
+ * $Id$
*/
struct portal_args {
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 3557e0bd8ceb..6b0be7d84cec 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
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index 19b439c33ae3..c46668f1f8f5 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
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/procfs/README b/sys/fs/procfs/README
index f816b321b432..5f1b6cc7229b 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.
-$FreeBSD$
+$Id$
diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index ef0d7eb89bf1..2821aa268a68 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:
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index 30dd929536ee..3f079e393085 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:
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_fpregs.c b/sys/fs/procfs/procfs_fpregs.c
index 841cf76dd19c..1930141ffcb7 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:
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index 40c40d821bf2..1211747ebee7 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
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index 06364e5cb6af..838004228978 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
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/procfs/procfs_note.c b/sys/fs/procfs/procfs_note.c
index 810a4e956df5..aca4727f11e7 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
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_regs.c b/sys/fs/procfs/procfs_regs.c
index 56ef233b8274..cc00319af0bb 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:
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index 76974b54c088..70fc4cc62155 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:
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_subr.c b/sys/fs/procfs/procfs_subr.c
index 5ee78f020c58..e6e8ada04fa5 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
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_type.c b/sys/fs/procfs/procfs_type.c
index b355e6c1080e..fc74b36982b8 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_vfsops.c b/sys/fs/procfs/procfs_vfsops.c
index 538712643cef..dfd7611668c7 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
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index 34dc165ed6bc..8aaa015feb7a 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
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 2e8cc04e0f84..cd61b6edf994 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index 2b1e5cf66c73..54b7502df5e5 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
*
- * $FreeBSD$
+ * $Id$
*/
#define MAPFILEENTRIES 64
diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index 3b3629d26ed5..6f5296ebc234 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
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index eb6cd17fcf53..511970fb63c2 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
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index 83e03fe5d529..c90e3088f597 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index c7ae2c13afd2..192aa7d33c65 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
- * $FreeBSD$
+ * $Id$
*/
struct union_args {
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index 7527533b1903..063cd44d3108 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 029596185e21..2f5837da6958 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 6dfcefd1ef72..ae6a71256d05 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index 782cb3092188..3b8e6a408367 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/* $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 aef2b838425b..10c0f21c052a 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_ihash.c b/sys/gnu/ext2fs/ext2_ihash.c
index ea8330898b46..5ff8f341c172 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_mount.h b/sys/gnu/ext2fs/ext2_mount.h
index 87041a6bfdbc..8c25f03ac401 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _UFS_UFS_UFSMOUNT_H_
diff --git a/sys/gnu/ext2fs/inode.h b/sys/gnu/ext2fs/inode.h
index 438471fb3d93..75fb3d5ce443 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _UFS_UFS_INODE_H_
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index aef2b838425b..10c0f21c052a 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_mount.h b/sys/gnu/fs/ext2fs/ext2_mount.h
index 87041a6bfdbc..8c25f03ac401 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _UFS_UFS_UFSMOUNT_H_
diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index 438471fb3d93..75fb3d5ce443 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _UFS_UFS_INODE_H_
diff --git a/sys/gnu/i386/fpemul/control_w.h b/sys/gnu/i386/fpemul/control_w.h
index 810dfd9b3f9a..9ab4345b876d 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/div_small.s b/sys/gnu/i386/fpemul/div_small.s
index bea4b1168b20..d38d921ec4d0 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/errors.c b/sys/gnu/i386/fpemul/errors.c
index 38939121bb6e..89890520eb38 100644
--- a/sys/gnu/i386/fpemul/errors.c
+++ b/sys/gnu/i386/fpemul/errors.c
@@ -56,7 +56,7 @@
* W. Metzenthen June 1994.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/exception.h b/sys/gnu/i386/fpemul/exception.h
index bab7446edf93..f7d860fe11c8 100644
--- a/sys/gnu/i386/fpemul/exception.h
+++ b/sys/gnu/i386/fpemul/exception.h
@@ -54,7 +54,7 @@
* W. Metzenthen June 1994.
*
*
- * $FreeBSD$
+ * $Id$
*
*
*/
diff --git a/sys/gnu/i386/fpemul/fpu_arith.c b/sys/gnu/i386/fpemul/fpu_arith.c
index 96b81d299cd7..cfc78fa1c03f 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/fpu_asm.h b/sys/gnu/i386/fpemul/fpu_asm.h
index 45e0b5c475f9..6a647b62b8ad 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/fpu_aux.c b/sys/gnu/i386/fpemul/fpu_aux.c
index 8b383a9efe6a..ddfae949a9a7 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/fpu_emu.h b/sys/gnu/i386/fpemul/fpu_emu.h
index a8b5afd63e23..8571c8bbda6b 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/fpu_entry.c b/sys/gnu/i386/fpemul/fpu_entry.c
index dbb747ac8fcc..8fc715332af1 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.
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/fpu_etc.c b/sys/gnu/i386/fpemul/fpu_etc.c
index b48fddcf0ae8..3ba4cbdb3827 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/fpu_proto.h b/sys/gnu/i386/fpemul/fpu_proto.h
index f82423723c09..6e87579e39fd 100644
--- a/sys/gnu/i386/fpemul/fpu_proto.h
+++ b/sys/gnu/i386/fpemul/fpu_proto.h
@@ -1,6 +1,6 @@
/*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/fpu_system.h b/sys/gnu/i386/fpemul/fpu_system.h
index dcbfc4cac7fa..dc3efe28e4a4 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/fpu_trig.c b/sys/gnu/i386/fpemul/fpu_trig.c
index 9504ea024b6f..c54c9074c3af 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/get_address.c b/sys/gnu/i386/fpemul/get_address.c
index b6395a6eb282..84ac5311841e 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/load_store.c b/sys/gnu/i386/fpemul/load_store.c
index 62d6529713d9..f48d019423e0 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/math_emu.h b/sys/gnu/i386/fpemul/math_emu.h
index 89b43f18e305..f57a427f5ed1 100644
--- a/sys/gnu/i386/fpemul/math_emu.h
+++ b/sys/gnu/i386/fpemul/math_emu.h
@@ -1,6 +1,6 @@
/*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/poly_2xm1.c b/sys/gnu/i386/fpemul/poly_2xm1.c
index ab80e6a198f8..11025cbec921 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/poly_atan.c b/sys/gnu/i386/fpemul/poly_atan.c
index 419399e3c8df..bdd1d0635422 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/poly_div.s b/sys/gnu/i386/fpemul/poly_div.s
index b15e65ab0493..4a1fdb7d8f31 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/poly_l2.c b/sys/gnu/i386/fpemul/poly_l2.c
index 6ec44f81b2b9..18503e169a8a 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/poly_mul64.s b/sys/gnu/i386/fpemul/poly_mul64.s
index c475f1050005..417739e2ccc3 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/poly_sin.c b/sys/gnu/i386/fpemul/poly_sin.c
index 6f9460236064..1c12419a9dcf 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/poly_tan.c b/sys/gnu/i386/fpemul/poly_tan.c
index bb9555e9f128..ee88da754e7d 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/polynomial.s b/sys/gnu/i386/fpemul/polynomial.s
index 378afc379af2..79e7876038b2 100644
--- a/sys/gnu/i386/fpemul/polynomial.s
+++ b/sys/gnu/i386/fpemul/polynomial.s
@@ -64,7 +64,7 @@
* W. Metzenthen June 1994.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/reg_add_sub.c b/sys/gnu/i386/fpemul/reg_add_sub.c
index f0b3435d0c06..17865309fd97 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/reg_compare.c b/sys/gnu/i386/fpemul/reg_compare.c
index 9d403d3769f7..3434e038c45c 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/reg_constant.h b/sys/gnu/i386/fpemul/reg_constant.h
index baa70c409d6e..2c63cfa3c074 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/reg_div.s b/sys/gnu/i386/fpemul/reg_div.s
index 2227acf71740..d1a5a585c675 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/reg_ld_str.c b/sys/gnu/i386/fpemul/reg_ld_str.c
index e536ed199fb9..84b502e889bd 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/reg_mul.c b/sys/gnu/i386/fpemul/reg_mul.c
index 522416162ab6..c3d265767339 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/reg_norm.s b/sys/gnu/i386/fpemul/reg_norm.s
index 5963fcbb212b..c8313c1d633c 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/reg_round.s b/sys/gnu/i386/fpemul/reg_round.s
index dc7a65bda21d..a716157f8d7d 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/reg_u_add.s b/sys/gnu/i386/fpemul/reg_u_add.s
index 3f767d6255a9..b8ae1c67eb18 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/reg_u_div.s b/sys/gnu/i386/fpemul/reg_u_div.s
index 5979219cbef5..f8639167fe19 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/reg_u_mul.s b/sys/gnu/i386/fpemul/reg_u_mul.s
index 9e68b21dc850..c05e346d0989 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/reg_u_sub.s b/sys/gnu/i386/fpemul/reg_u_sub.s
index f0e834be83b4..3cb89e237c70 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/status_w.h b/sys/gnu/i386/fpemul/status_w.h
index 2edbec7b10f3..cf82a12974b3 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/version.h b/sys/gnu/i386/fpemul/version.h
index bb81399fa16f..98830e111bfe 100644
--- a/sys/gnu/i386/fpemul/version.h
+++ b/sys/gnu/i386/fpemul/version.h
@@ -54,7 +54,7 @@
* W. Metzenthen June 1994.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/wm_shrx.s b/sys/gnu/i386/fpemul/wm_shrx.s
index 417ff85444ce..9631c327ce53 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/fpemul/wm_sqrt.s b/sys/gnu/i386/fpemul/wm_sqrt.s
index 0ff308f20a42..42412b1be79c 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.
*
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index af5e6e797eb2..af4fcc24952d 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
/*-
- * dgb.c $FreeBSD$
+ * dgb.c $Id$
*
* Digiboard driver.
*
diff --git a/sys/gnu/i386/isa/dgreg.h b/sys/gnu/i386/isa/dgreg.h
index 7c76b4177292..9d339e582d52 100644
--- a/sys/gnu/i386/isa/dgreg.h
+++ b/sys/gnu/i386/isa/dgreg.h
@@ -1,5 +1,5 @@
/*-
- * dgreg.h $FreeBSD$
+ * dgreg.h $Id$
*
* Digiboard driver.
*
diff --git a/sys/i386/Makefile b/sys/i386/Makefile
index 23156b9b6196..4ad5a34556fb 100644
--- a/sys/i386/Makefile
+++ b/sys/i386/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 7.3 (Berkeley) 6/9/91
-# $FreeBSD$
+# $Id$
# Makefile for i386 tags file
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index 8a14b90bdda0..a84a6065869a 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -14,7 +14,7 @@
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/apm/apm_init/Makefile b/sys/i386/apm/apm_init/Makefile
index 2ff300e30eaf..4d8d618dd712 100644
--- a/sys/i386/apm/apm_init/Makefile
+++ b/sys/i386/apm/apm_init/Makefile
@@ -12,7 +12,7 @@
#
# Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
#
-# $FreeBSD$
+# $Id$
#
OBJS = apm_init.o real_prot.o table.o
diff --git a/sys/i386/apm/apm_init/apm_init.S b/sys/i386/apm/apm_init/apm_init.S
index 461968069688..bf8c2c6c08fa 100644
--- a/sys/i386/apm/apm_init/apm_init.S
+++ b/sys/i386/apm/apm_init/apm_init.S
@@ -12,7 +12,7 @@
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/apm/apm_init/bin2asm.c b/sys/i386/apm/apm_init/bin2asm.c
index 18a335d4f51f..5eba12814c49 100644
--- a/sys/i386/apm/apm_init/bin2asm.c
+++ b/sys/i386/apm/apm_init/bin2asm.c
@@ -12,7 +12,7 @@
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $FreeBSD$
+ * $Id$
*/
#include <stdio.h>
diff --git a/sys/i386/apm/apm_init/real_prot.S b/sys/i386/apm/apm_init/real_prot.S
index 3b05223bdfc8..d3ab801f255b 100644
--- a/sys/i386/apm/apm_init/real_prot.S
+++ b/sys/i386/apm/apm_init/real_prot.S
@@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, Revision 2.2 92/04/04 11:34:13 rpd
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/i386/apm/apm_init/real_prot.h b/sys/i386/apm/apm_init/real_prot.h
index 0284b4bacc4f..2fc2321a4a9c 100644
--- a/sys/i386/apm/apm_init/real_prot.h
+++ b/sys/i386/apm/apm_init/real_prot.h
@@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, Revision 2.7 92/02/29 15:33:41 rpd
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/apm/apm_init/rmaouthdr b/sys/i386/apm/apm_init/rmaouthdr
index 7830df3b346e..4bb9c84924d1 100644
--- a/sys/i386/apm/apm_init/rmaouthdr
+++ b/sys/i386/apm/apm_init/rmaouthdr
@@ -1,6 +1,6 @@
#!/bin/csh -f
#
# from: Mach, Revision 2.2 92/04/04 11:36:01 rpd
-# $FreeBSD$
+# $Id$
#
dd if=$1 of=$2 ibs=32 skip=1 obs=1024b
diff --git a/sys/i386/apm/apm_init/table.c b/sys/i386/apm/apm_init/table.c
index dd352b407d89..9935bf732eda 100644
--- a/sys/i386/apm/apm_init/table.c
+++ b/sys/i386/apm/apm_init/table.c
@@ -12,7 +12,7 @@
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $FreeBSD$
+ * $Id$
*/
#include <apm_bios.h>
diff --git a/sys/i386/apm/apm_setup.h b/sys/i386/apm/apm_setup.h
index 8ceff4bbfe96..4223ffd35d53 100644
--- a/sys/i386/apm/apm_setup.h
+++ b/sys/i386/apm/apm_setup.h
@@ -10,7 +10,7 @@
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $FreeBSD$
+ * $Id$
*/
extern u_long apm_version;
diff --git a/sys/i386/apm/apm_setup.s b/sys/i386/apm/apm_setup.s
index 7e7ea2484a2a..aa1dc1ecadd8 100644
--- a/sys/i386/apm/apm_setup.s
+++ b/sys/i386/apm/apm_setup.s
@@ -10,7 +10,7 @@
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $FreeBSD$
+ * $Id$
*/
#include "apm.h"
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 8a14b90bdda0..a84a6065869a 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -14,7 +14,7 @@
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/bios/apm_init/Makefile b/sys/i386/bios/apm_init/Makefile
index 2ff300e30eaf..4d8d618dd712 100644
--- a/sys/i386/bios/apm_init/Makefile
+++ b/sys/i386/bios/apm_init/Makefile
@@ -12,7 +12,7 @@
#
# Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
#
-# $FreeBSD$
+# $Id$
#
OBJS = apm_init.o real_prot.o table.o
diff --git a/sys/i386/bios/apm_init/apm_init.S b/sys/i386/bios/apm_init/apm_init.S
index 461968069688..bf8c2c6c08fa 100644
--- a/sys/i386/bios/apm_init/apm_init.S
+++ b/sys/i386/bios/apm_init/apm_init.S
@@ -12,7 +12,7 @@
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/bios/apm_init/bin2asm.c b/sys/i386/bios/apm_init/bin2asm.c
index 18a335d4f51f..5eba12814c49 100644
--- a/sys/i386/bios/apm_init/bin2asm.c
+++ b/sys/i386/bios/apm_init/bin2asm.c
@@ -12,7 +12,7 @@
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $FreeBSD$
+ * $Id$
*/
#include <stdio.h>
diff --git a/sys/i386/bios/apm_init/real_prot.S b/sys/i386/bios/apm_init/real_prot.S
index 3b05223bdfc8..d3ab801f255b 100644
--- a/sys/i386/bios/apm_init/real_prot.S
+++ b/sys/i386/bios/apm_init/real_prot.S
@@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, Revision 2.2 92/04/04 11:34:13 rpd
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/i386/bios/apm_init/real_prot.h b/sys/i386/bios/apm_init/real_prot.h
index 0284b4bacc4f..2fc2321a4a9c 100644
--- a/sys/i386/bios/apm_init/real_prot.h
+++ b/sys/i386/bios/apm_init/real_prot.h
@@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, Revision 2.7 92/02/29 15:33:41 rpd
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/bios/apm_init/rmaouthdr b/sys/i386/bios/apm_init/rmaouthdr
index 7830df3b346e..4bb9c84924d1 100644
--- a/sys/i386/bios/apm_init/rmaouthdr
+++ b/sys/i386/bios/apm_init/rmaouthdr
@@ -1,6 +1,6 @@
#!/bin/csh -f
#
# from: Mach, Revision 2.2 92/04/04 11:36:01 rpd
-# $FreeBSD$
+# $Id$
#
dd if=$1 of=$2 ibs=32 skip=1 obs=1024b
diff --git a/sys/i386/bios/apm_init/table.c b/sys/i386/bios/apm_init/table.c
index dd352b407d89..9935bf732eda 100644
--- a/sys/i386/bios/apm_init/table.c
+++ b/sys/i386/bios/apm_init/table.c
@@ -12,7 +12,7 @@
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $FreeBSD$
+ * $Id$
*/
#include <apm_bios.h>
diff --git a/sys/i386/bios/apm_setup.h b/sys/i386/bios/apm_setup.h
index 8ceff4bbfe96..4223ffd35d53 100644
--- a/sys/i386/bios/apm_setup.h
+++ b/sys/i386/bios/apm_setup.h
@@ -10,7 +10,7 @@
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $FreeBSD$
+ * $Id$
*/
extern u_long apm_version;
diff --git a/sys/i386/bios/apm_setup.s b/sys/i386/bios/apm_setup.s
index 7e7ea2484a2a..aa1dc1ecadd8 100644
--- a/sys/i386/bios/apm_setup.s
+++ b/sys/i386/bios/apm_setup.s
@@ -10,7 +10,7 @@
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $FreeBSD$
+ * $Id$
*/
#include "apm.h"
diff --git a/sys/i386/boot/Makefile b/sys/i386/boot/Makefile
index 25c0b8357597..94f4c7d68d7b 100644
--- a/sys/i386/boot/Makefile
+++ b/sys/i386/boot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
SUBDIR= biosboot dosboot kzipboot netboot rawboot
diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile
index fe4400bd16ba..f9fc3f5d1c6c 100644
--- a/sys/i386/boot/biosboot/Makefile
+++ b/sys/i386/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
#
PROG= boot
diff --git a/sys/i386/boot/biosboot/README.386BSD b/sys/i386/boot/biosboot/README.386BSD
index 01e22541162d..2849238aa2a2 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.
-$FreeBSD$
+$Id$
diff --git a/sys/i386/boot/biosboot/README.MACH b/sys/i386/boot/biosboot/README.MACH
index 2c3e714b0edd..cb6232936e28 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
- * $FreeBSD$
+ * $Id$
*/
********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 2d071ad26d84..b37a21268756 100644
--- a/sys/i386/boot/biosboot/README.serial
+++ b/sys/i386/boot/biosboot/README.serial
@@ -161,4 +161,4 @@ CAVEATS:
from the new kernel.
-$FreeBSD$
+$Id$
diff --git a/sys/i386/boot/biosboot/asm.S b/sys/i386/boot/biosboot/asm.S
index d7b3057b2ce5..b0f66daa4c82 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
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/i386/boot/biosboot/asm.h b/sys/i386/boot/biosboot/asm.h
index 3619b5ef7856..b90bbcebf158 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
- * $FreeBSD$
+ * $Id$
*/
#define S_ARG0 4(%esp)
diff --git a/sys/i386/boot/biosboot/bios.S b/sys/i386/boot/biosboot/bios.S
index bf53c9a15d00..3bce01125f73 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c
index 84cd4a720ad6..d9a34423216b 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]
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/i386/boot/biosboot/boot.h b/sys/i386/boot/biosboot/boot.h
index 9e69202baa4c..8d4bef85a195 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/boot/biosboot/boot2.S b/sys/i386/boot/biosboot/boot2.S
index 7e035eda2ed9..e199b5f6ed69 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
- * $FreeBSD$
+ * $Id$
*/
#include "asm.h"
diff --git a/sys/i386/boot/biosboot/disk.c b/sys/i386/boot/biosboot/disk.c
index aa312f96910d..e166258752f2 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/boot/biosboot/io.c b/sys/i386/boot/biosboot/io.c
index 0fe09e8fcf45..6ba25efce82c 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
- * $FreeBSD$
+ * $Id$
*/
#include "boot.h"
diff --git a/sys/i386/boot/biosboot/probe_keyboard.c b/sys/i386/boot/biosboot/probe_keyboard.c
index 44ffedd2c9c0..3c0324ed47ab 100644
--- a/sys/i386/boot/biosboot/probe_keyboard.c
+++ b/sys/i386/boot/biosboot/probe_keyboard.c
@@ -42,7 +42,7 @@
*
* This grody hack brought to you by Bill Paul (wpaul@ctr.columbia.edu)
*
- * $FreeBSD$
+ * $Id$
*/
#ifdef PROBE_KEYBOARD
diff --git a/sys/i386/boot/biosboot/serial.S b/sys/i386/boot/biosboot/serial.S
index bdedba5c0e0c..90356a0599ce 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/boot/biosboot/start.S b/sys/i386/boot/biosboot/start.S
index 55dc9e8f4267..ba01cd5e4885 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/boot/biosboot/sys.c b/sys/i386/boot/biosboot/sys.c
index ed6b2f6b0f38..4ac397838069 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
- * $FreeBSD$
+ * $Id$
*/
#include "boot.h"
diff --git a/sys/i386/boot/biosboot/table.c b/sys/i386/boot/biosboot/table.c
index 5f57ac4ac7d8..ae0a2f092794 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/boot/dosboot/Makefile b/sys/i386/boot/dosboot/Makefile
index 30f6138e3c74..d73363f3eb52 100644
--- a/sys/i386/boot/dosboot/Makefile
+++ b/sys/i386/boot/dosboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
#
MPROG= fbsdboot.exe
diff --git a/sys/i386/boot/dosboot/ansi.h b/sys/i386/boot/dosboot/ansi.h
index 8de8fca14fe8..3a112073c675 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _ANSI_H_
diff --git a/sys/i386/boot/dosboot/boot.c b/sys/i386/boot/dosboot/boot.c
index e98eece88fe1..635781e81827 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]
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/i386/boot/dosboot/boot.h b/sys/i386/boot/dosboot/boot.h
index dbb7b77e5ebc..c1bd09700662 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
- * $FreeBSD$
+ * $Id$
*/
#include "types.h"
diff --git a/sys/i386/boot/dosboot/bootinfo.h b/sys/i386/boot/dosboot/bootinfo.h
index b6b5d0524017..d1a6fb68412e 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_BOOTINFO_H_
diff --git a/sys/i386/boot/dosboot/cdefs.h b/sys/i386/boot/dosboot/cdefs.h
index fec95758ae12..1b2205fbd5f4 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _CDEFS_H_
diff --git a/sys/i386/boot/dosboot/dinode.h b/sys/i386/boot/dosboot/dinode.h
index 34499c62073c..6c9fbd42fecc 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _UFS_DINODE_H_
diff --git a/sys/i386/boot/dosboot/dir.h b/sys/i386/boot/dosboot/dir.h
index add37a29ba7f..5d9cd1d3613c 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/boot/dosboot/disk.c b/sys/i386/boot/dosboot/disk.c
index 55e73b7b5162..f990a33a3fb3 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
- * $FreeBSD$
+ * $Id$
*/
#include <stdio.h>
#include <memory.h>
diff --git a/sys/i386/boot/dosboot/disklabe.h b/sys/i386/boot/dosboot/disklabe.h
index 8adb07c9c657..d550d47bcc1f 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _SYS_DISKLABEL_H_
diff --git a/sys/i386/boot/dosboot/dkbad.h b/sys/i386/boot/dosboot/dkbad.h
index 1aea5ded055c..f461d229aab2 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _SYS_DKBAD_H_
diff --git a/sys/i386/boot/dosboot/endian.h b/sys/i386/boot/dosboot/endian.h
index ae04f8a49c2a..1d52a1b419b3 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/i386/boot/dosboot/exec.h b/sys/i386/boot/dosboot/exec.h
index d64f63b77489..5033235ae74f 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _SYS_EXEC_H_
diff --git a/sys/i386/boot/dosboot/fs.h b/sys/i386/boot/dosboot/fs.h
index 22a773135013..f2c38b4269d5 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _UFS_FS_H_
diff --git a/sys/i386/boot/dosboot/imgact.h b/sys/i386/boot/dosboot/imgact.h
index 3857fb553e1f..f9cc403977e6 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _IMGACT_AOUT_H_
diff --git a/sys/i386/boot/dosboot/inode.h b/sys/i386/boot/dosboot/inode.h
index 5d89561e4cb9..61cc95708e68 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _UFS_INODE_H_
diff --git a/sys/i386/boot/dosboot/mexec.h b/sys/i386/boot/dosboot/mexec.h
index b045a235ece3..e978510b9b76 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _EXEC_H_
diff --git a/sys/i386/boot/dosboot/param.h b/sys/i386/boot/dosboot/param.h
index 72f3c59b7c4f..61a82419b108 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_PARAM_H_
diff --git a/sys/i386/boot/dosboot/quota.h b/sys/i386/boot/dosboot/quota.h
index 592013cc8ead..425066e91d88 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _QUOTA_
diff --git a/sys/i386/boot/dosboot/reboot.h b/sys/i386/boot/dosboot/reboot.h
index 65453b05e51f..f0dcfd244a79 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _SYS_REBOOT_H_
diff --git a/sys/i386/boot/dosboot/sys.c b/sys/i386/boot/dosboot/sys.c
index 6eba3581185e..f9d2f9be9a08 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
- * $FreeBSD$
+ * $Id$
*/
#include <stdio.h>
#include <string.h>
diff --git a/sys/i386/boot/dosboot/syslimit.h b/sys/i386/boot/dosboot/syslimit.h
index 45b9b45633de..3d691b7cbc08 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _SYS_SYSLIMITS_H_
diff --git a/sys/i386/boot/dosboot/sysparam.h b/sys/i386/boot/dosboot/sysparam.h
index 4f93f2cc0266..a9a5f35aabb9 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _SYS_PARAM_H_
diff --git a/sys/i386/boot/dosboot/types.h b/sys/i386/boot/dosboot/types.h
index 85b64942897a..ee013c053202 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _SYS_TYPES_H_
diff --git a/sys/i386/boot/kzipboot/Makefile b/sys/i386/boot/kzipboot/Makefile
index ab614bc33286..bf3e19422866 100644
--- a/sys/i386/boot/kzipboot/Makefile
+++ b/sys/i386/boot/kzipboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
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 accc948c6b4f..adf721c3ec19 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)
-$FreeBSD$
+$Id$
***************************************************************************/
diff --git a/sys/i386/boot/rawboot/Makefile b/sys/i386/boot/rawboot/Makefile
index ad3c4168c17a..f2c6ba41f872 100644
--- a/sys/i386/boot/rawboot/Makefile
+++ b/sys/i386/boot/rawboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
#
PROG= boot
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 82abc8f39bca..6d0afebdc156 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.
#
-# $FreeBSD$
+# $Id$
machine "i386"
cpu "I386_CPU"
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 5516716b4ad7..79be523d62d1 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.
#
-# $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
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index bd573a88ca6b..15d7cfd96245 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
-# $FreeBSD$
+# $Id$
#
# Makefile for FreeBSD
#
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 5516716b4ad7..79be523d62d1 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.
#
-# $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
diff --git a/sys/i386/conf/devices.i386 b/sys/i386/conf/devices.i386
index 4abc7ccff173..6e93c0c4ad9d 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.
#
-# $FreeBSD$
+# $Id$
#
wd 0
dk 1
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 82795b0f83db..41235be1b991 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.
#
-# $FreeBSD$
+# $Id$
#
aic7xxx_asm optional ahc device-driver \
dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \
diff --git a/sys/i386/conf/majors.i386 b/sys/i386/conf/majors.i386
index 22ca6ab7cb5d..66cca8386d94 100644
--- a/sys/i386/conf/majors.i386
+++ b/sys/i386/conf/majors.i386
@@ -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.
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 6d9de82187c9..e62814c7c192 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
BOUNCEPAGES opt_bounce.h
USER_LDT
MATH_EMULATE opt_math_emulate.h
diff --git a/sys/i386/eisa/3c5x9.c b/sys/i386/eisa/3c5x9.c
index 87192e769402..ded45383aede 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "eisa.h"
diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c
index 04247f39e437..e2b9955a2013 100644
--- a/sys/i386/eisa/aha1742.c
+++ b/sys/i386/eisa/aha1742.c
@@ -14,7 +14,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/types.h>
diff --git a/sys/i386/eisa/aic7770.c b/sys/i386/eisa/aic7770.c
index 95ae719d86e5..0bab5146a2e3 100644
--- a/sys/i386/eisa/aic7770.c
+++ b/sys/i386/eisa/aic7770.c
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#if defined(__FreeBSD__)
diff --git a/sys/i386/eisa/bt74x.c b/sys/i386/eisa/bt74x.c
index 6f9a13bec3a7..fc25bf6e4cca 100644
--- a/sys/i386/eisa/bt74x.c
+++ b/sys/i386/eisa/bt74x.c
@@ -19,7 +19,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $FreeBSD$
+ * $Id$
*/
#include "eisa.h"
diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c
index d9a915f524e8..657b9b3be9ce 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/i386/eisa/eisaconf.h b/sys/i386/eisa/eisaconf.h
index 6d211827872f..1f2cca38a2ac 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_EISA_EISACONF_H_
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index c39f5893d792..5d297bfa953f 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index 70dabd88f5c0..1a56c85e14e1 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/i386/cons.h b/sys/i386/i386/cons.h
index 4ab29f179473..80182c6036d8 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_CONS_H_
diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c
index d5da23594491..cf86f8ac88e8 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index a06f421cee06..6e56a9f523b6 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index 93078a8c01f1..4e58144717f6 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s
index 5155caac8a1b..4f53156f227a 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "npx.h" /* NNPX */
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index c993129c0e68..f8f0018df9c4 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
- * $FreeBSD$
+ * $Id$
*/
#include <stdio.h>
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index 4b644b4bf289..b4b8af85b660 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/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"
diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c
index 5ca3b8f6ccdb..42737b382c52 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 8a7912b2df6f..95930feeab1a 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
- * $FreeBSD$
+ * $Id$
*
* originally from: locore.s, by William F. Jolitz
*
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index b95b0ff860fb..729a2b9fc269 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
- * $FreeBSD$
+ * $Id$
*/
#include "npx.h"
diff --git a/sys/i386/i386/math_emu.h b/sys/i386/i386/math_emu.h
index 83cff8734ae1..a348b40801c5 100644
--- a/sys/i386/i386/math_emu.h
+++ b/sys/i386/i386/math_emu.h
@@ -3,7 +3,7 @@
*
* (C) 1991 Linus Torvalds
*
- * $FreeBSD$
+ * $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 7a773a8a4f6b..0841ad0cab9b 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 5275e7d2e6aa..a6e4cc5f25bf 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/i386/microtime.s b/sys/i386/i386/microtime.s
index 7daa85900222..6da8b78ed5be 100644
--- a/sys/i386/i386/microtime.s
+++ b/sys/i386/i386/microtime.s
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: Steve McCanne's microtime code
- * $FreeBSD$
+ * $Id$
*/
#include "opt_cpu.h"
diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c
index 332cf0932c77..0c13773b7ddf 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "opt_cpu.h"
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 0159c32914a8..540f85ed1be9 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/i386/procfs_machdep.c b/sys/i386/i386/procfs_machdep.c
index 78eb796fb328..7c408e888792 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:
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s
index f1f0c8a87588..f700c7e71691 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "opt_cpu.h"
diff --git a/sys/i386/i386/swapgeneric.c b/sys/i386/i386/swapgeneric.c
index 44cfbe4d8a57..4a1f57605c12 100644
--- a/sys/i386/i386/swapgeneric.c
+++ b/sys/i386/i386/swapgeneric.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)swapgeneric.c 5.5 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index 91bff27d02c3..092e1b7dfedd 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "apm.h"
diff --git a/sys/i386/i386/symbols.raw b/sys/i386/i386/symbols.raw
index 509fc9e2909c..d757e391e969 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
#
-# $FreeBSD$
+# $Id$
#
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 8506cfc8888a..ef8c023d87f8 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
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index c866f32254c4..9dca84275078 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index 60aa95c21546..a37022e68acb 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 416e10227254..1d330d362e7c 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.
**
- ** $FreeBSD$
+ ** $Id$
**/
/**
@@ -2358,7 +2358,7 @@ visuserconfig(void)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#include "scbus.h"
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index f6c1606d33f3..18fda31016f2 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$
- * $FreeBSD$
+ * $Id$
*/
#include "npx.h"
diff --git a/sys/i386/ibcs2/coff.h b/sys/i386/ibcs2/coff.h
index 8530a0a981c6..c4868fcfdacd 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _COFF_H
diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c
index 8a781909c5dc..a53f282084a1 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index 812f3749d3d3..2a64eafda3ec 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_ipc.h b/sys/i386/ibcs2/ibcs2_ipc.h
index 29ba971be0f6..1fe2750fb48d 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.
*
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c
index af737b50d35f..54fc6cba84b5 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index bf25c2192d70..321d0fa166ae 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
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/ibcs2/ibcs2_msg.c b/sys/i386/ibcs2/ibcs2_msg.c
index eee72442fda0..3a13a3f4da27 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/ibcs2/ibcs2_other.c b/sys/i386/ibcs2/ibcs2_other.c
index 472b565f7715..a0df3bbee539 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/ibcs2/ibcs2_poll.h b/sys/i386/ibcs2/ibcs2_poll.h
index 6bd86ced28fd..d04fce1bc453 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.
*
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c
index 19069be7d006..e3bca1e4afc8 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_sysvec.c b/sys/i386/ibcs2/ibcs2_sysvec.c
index 3cb977e9498c..b7ecbca0e027 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index 4b844649e7de..6af6be36dd32 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index 29b77538b1d9..34850b5649a8 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/ibcs2/syscalls.conf b/sys/i386/ibcs2/syscalls.conf
index 657c29ab970a..4474f6e7ccde 100644
--- a/sys/i386/ibcs2/syscalls.conf
+++ b/sys/i386/ibcs2/syscalls.conf
@@ -1,4 +1,4 @@
-# syscalls.conf $FreeBSD$
+# syscalls.conf $Id$
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 cbf5364f32d5..e0572903e843 100644
--- a/sys/i386/ibcs2/syscalls.isc
+++ b/sys/i386/ibcs2/syscalls.isc
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $Id$
#include <sys/types.h>
#include <sys/param.h>
diff --git a/sys/i386/ibcs2/syscalls.isc.conf b/sys/i386/ibcs2/syscalls.isc.conf
index 2b3f447c66ae..fc52716386c2 100644
--- a/sys/i386/ibcs2/syscalls.isc.conf
+++ b/sys/i386/ibcs2/syscalls.isc.conf
@@ -1,4 +1,4 @@
-# syscalls.conf $FreeBSD$
+# syscalls.conf $Id$
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 6132936748ff..c769eeb6f977 100644
--- a/sys/i386/ibcs2/syscalls.master
+++ b/sys/i386/ibcs2/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 IBCS2).
diff --git a/sys/i386/ibcs2/syscalls.xenix b/sys/i386/ibcs2/syscalls.xenix
index aefda474ccf7..8db2f20f769c 100644
--- a/sys/i386/ibcs2/syscalls.xenix
+++ b/sys/i386/ibcs2/syscalls.xenix
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $Id$
#include <sys/types.h>
#include <sys/param.h>
diff --git a/sys/i386/ibcs2/syscalls.xenix.conf b/sys/i386/ibcs2/syscalls.xenix.conf
index 77ad5dd4c368..742080ec747f 100644
--- a/sys/i386/ibcs2/syscalls.xenix.conf
+++ b/sys/i386/ibcs2/syscalls.xenix.conf
@@ -1,4 +1,4 @@
-# syscalls.conf $FreeBSD$
+# syscalls.conf $Id$
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 cfaefcee4c3a..602bb61b362b 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_LIMITS_H_
diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h
index db8d56f08811..421cc766b91d 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_ANSI_H_
diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h
index c68f315e69d4..830005a28c38 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)
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_APM_BIOS_H_
diff --git a/sys/i386/include/apm_segments.h b/sys/i386/include/apm_segments.h
index d65af5560947..03355374e93a 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)
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_APM_SEGMENTS_H
diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h
index f16995775625..592c2bee5002 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_ASMACROS_H_
diff --git a/sys/i386/include/bootinfo.h b/sys/i386/include/bootinfo.h
index 593cfae6ee66..3ad09dbe0760 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_BOOTINFO_H_
diff --git a/sys/i386/include/cdk.h b/sys/i386/include/cdk.h
index 8080f2b469f2..f49aa32cf16c 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*****************************************************************************/
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
index 867e2ee09f6f..30ff97a7f80f 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_CLOCK_H_
diff --git a/sys/i386/include/comstats.h b/sys/i386/include/comstats.h
index 0b8fc4e0de3f..f332eebcfb19 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*****************************************************************************/
diff --git a/sys/i386/include/cons.h b/sys/i386/include/cons.h
index 1f578c4cd69b..faa17d12332c 100644
--- a/sys/i386/include/cons.h
+++ b/sys/i386/include/cons.h
@@ -3,6 +3,6 @@
* needs to access these functions. In the mean time, just include the
* header where it sits.
*
- * $FreeBSD$
+ * $Id$
*/
#include <i386/i386/cons.h>
diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h
index aee3b9dad840..6abf63e50c13 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_CONSOLE_H_
diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index 83723c27b730..ff0c70cde09a 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_CPU_H_
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index 7f8269fdd8ee..5dd24b1ecc3d 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h
index e82eddd8e6de..4905900a26bc 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/i386/include/db_machdep.h b/sys/i386/include/db_machdep.h
index 633f4f3e3bb1..644f266c2cc4 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h
index 82853c06df04..c4f2d84b1f60 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/i386/include/exec.h b/sys/i386/include/exec.h
index c233b09655b2..7670fd1cee1a 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _EXEC_H_
diff --git a/sys/i386/include/float.h b/sys/i386/include/float.h
index a785b9b21739..a0296ecc8c05 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_FLOAT_H_
diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h
index b2b5cb959756..b6adce5f3555 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _FLOATINGPOINT_H_
diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h
index 0d51e12339e4..43201f22edf2 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_FRAME_H_
diff --git a/sys/i386/include/ieeefp.h b/sys/i386/include/ieeefp.h
index 5160ab9b7277..f81ff31bf7df 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/include/in_cksum.h b/sys/i386/include/in_cksum.h
index 616eb8e244c2..49932f5ff89a 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/i386/include/ioctl_ctx.h b/sys/i386/include/ioctl_ctx.h
index 8eac1c7385b4..5d7a5c57a332 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
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/include/ioctl_fd.h b/sys/i386/include/ioctl_fd.h
index 3b4da37da238..891d8f0a22a9 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_IOCTL_FD_H_
diff --git a/sys/i386/include/ipl.h b/sys/i386/include/ipl.h
index 042796dda4bf..773fa9c700c6 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _ISA_IPL_H_
diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h
index cfaefcee4c3a..602bb61b362b 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_LIMITS_H_
diff --git a/sys/i386/include/lpt.h b/sys/i386/include/lpt.h
index 56d196a62fef..2d70d7ee3397 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>
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_LPT_H_
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index 533131f069f5..c74313f69409 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/i386/include/mouse.h b/sys/i386/include/mouse.h
index 786bf1370c09..a9396f10f2ae 100644
--- a/sys/i386/include/mouse.h
+++ b/sys/i386/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_
diff --git a/sys/i386/include/mtpr.h b/sys/i386/include/mtpr.h
index 3ddb5ead8d3c..e8347e677541 100644
--- a/sys/i386/include/mtpr.h
+++ b/sys/i386/include/mtpr.h
@@ -1,4 +1,4 @@
/*
* Unused in 386BSD port
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h
index ede1c184ae8b..33c6a232fd36 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index 01d8615bbe59..cd11d85c1a3b 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_PARAM_H_
diff --git a/sys/i386/include/pc/display.h b/sys/i386/include/pc/display.h
index 5484d46e9973..9e64a3f13307 100644
--- a/sys/i386/include/pc/display.h
+++ b/sys/i386/include/pc/display.h
@@ -1,7 +1,7 @@
/*
* IBM PC display definitions
*
- * $FreeBSD$
+ * $Id$
*/
/* Color attributes for foreground text */
diff --git a/sys/i386/include/pc/msdos.h b/sys/i386/include/pc/msdos.h
index 1a02bf9d5873..ea221c7954a5 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
*
- * $FreeBSD$
+ * $Id$
*/
#define MSECTOR_SIZE 512 /* MSDOS sector size in bytes */
diff --git a/sys/i386/include/pcaudioio.h b/sys/i386/include/pcaudioio.h
index f76bf8070552..bae4564ee009 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_PCAUDIOIO_H_
diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h
index 83e352265142..35a61adef94d 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_PCB_H_
diff --git a/sys/i386/include/perfmon.h b/sys/i386/include/perfmon.h
index 203134252298..bee8ff21088b 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 9d52dfdb8089..8290e0d0057e 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_PMAP_H_
diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h
index 7628c2d35576..512c9b628acf 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_PROC_H_
diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h
index 3247d1486616..50da5fedee39 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_PROFILE_H_
diff --git a/sys/i386/include/psl.h b/sys/i386/include/psl.h
index 04d5ca3efc62..5f1733587f8e 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_PSL_H_
diff --git a/sys/i386/include/ptrace.h b/sys/i386/include/ptrace.h
index 4d9724e41cfb..a8f7e715f6a6 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_PTRACE_H_
diff --git a/sys/i386/include/random.h b/sys/i386/include/random.h
index 949e858f885e..83b28e55bfc5 100644
--- a/sys/i386/include/random.h
+++ b/sys/i386/include/random.h
@@ -1,7 +1,7 @@
/*
* random.h -- A strong random number generator
*
- * $FreeBSD$
+ * $Id$
*
* Version 0.95, last modified 18-Oct-95
*
diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h
index d392438c1a7d..93cc4b563eec 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_REG_H_
diff --git a/sys/i386/include/reloc.h b/sys/i386/include/reloc.h
index ef4b8dbc3e8c..ead0334ee221 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_MACHINE_RELOC_H_
diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h
index f532e2710621..27525889053d 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/i386/include/si.h b/sys/i386/include/si.h
index 336eda4427a7..8e6f0abb2342 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h
index 71bfed4bf17c..0e860ba4cc08 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/i386/include/speaker.h b/sys/i386/include/speaker.h
index 78b55b6135e3..0d204bfe2f07 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>
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_SPEAKER_H_
diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h
index 27515eba18e8..7344d8fa9bfb 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_SPECIALREG_H_
diff --git a/sys/i386/include/spl.h b/sys/i386/include/spl.h
index ffaefa3b508d..6f305acc2d56 100644
--- a/sys/i386/include/spl.h
+++ b/sys/i386/include/spl.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_IPL_H_
diff --git a/sys/i386/include/stdarg.h b/sys/i386/include/stdarg.h
index f231c218d477..cf84be32990f 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _STDARG_H_
diff --git a/sys/i386/include/sysarch.h b/sys/i386/include/sysarch.h
index 78c98a9d75e1..746cef1011fe 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/include/trap.h b/sys/i386/include/trap.h
index a9ae9e0d781b..9d49054208f1 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_TRAP_H_
diff --git a/sys/i386/include/tss.h b/sys/i386/include/tss.h
index 3145d2fb7a91..565defab8cb7 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_TSS_H_
diff --git a/sys/i386/include/types.h b/sys/i386/include/types.h
index 3eee8a777c1d..313084ed9f11 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _MACHINE_TYPES_H_
diff --git a/sys/i386/include/varargs.h b/sys/i386/include/varargs.h
index b213d88327af..57034fb28f74 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _VARARGS_H_
diff --git a/sys/i386/include/vmparam.h b/sys/i386/include/vmparam.h
index 781b9119d5ad..c2d0d9715ea0 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
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/i386/include/wtio.h b/sys/i386/include/wtio.h
index 8262a01e093c..868e34774b8a 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.
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/i386/isa/README.le b/sys/i386/isa/README.le
index 9afb68ce6494..52e4df590588 100644
--- a/sys/i386/isa/README.le
+++ b/sys/i386/isa/README.le
@@ -1,4 +1,4 @@
-$FreeBSD$
+$Id$
----------------
diff --git a/sys/i386/isa/adv_isa.c b/sys/i386/isa/adv_isa.c
index 066836a73500..e7c89151f762 100644
--- a/sys/i386/isa/adv_isa.c
+++ b/sys/i386/isa/adv_isa.c
@@ -40,7 +40,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index 4c50020f4836..c6c955062e69 100644
--- a/sys/i386/isa/aha1542.c
+++ b/sys/i386/isa/aha1542.c
@@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c
index 072edde3126d..84a4c4bac719 100644
--- a/sys/i386/isa/aic6360.c
+++ b/sys/i386/isa/aic6360.c
@@ -31,7 +31,7 @@
*/
/*
- * $FreeBSD$
+ * $Id$
*
* 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/asc.c b/sys/i386/isa/asc.c
index 85ed29c85a21..7edb12349ac5 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.
*/
/*
- * $FreeBSD$
+ * $Id$
*/
#include "asc.h"
diff --git a/sys/i386/isa/ascreg.h b/sys/i386/isa/ascreg.h
index 9fcb9a353908..41803004dc34 100644
--- a/sys/i386/isa/ascreg.h
+++ b/sys/i386/isa/ascreg.h
@@ -31,7 +31,7 @@
*/
/*
- * $FreeBSD$
+ * $Id$
*/
/*** Registers (base=3EB): ************/
diff --git a/sys/i386/isa/bt5xx-445.c b/sys/i386/isa/bt5xx-445.c
index a7d42acc8ec6..0877a411bd38 100644
--- a/sys/i386/isa/bt5xx-445.c
+++ b/sys/i386/isa/bt5xx-445.c
@@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 60aa95c21546..a37022e68acb 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 60f99bd209fb..8a00299c1c8a 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/ctxreg.h b/sys/i386/isa/ctxreg.h
index e20f9583300a..836239bac689 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
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 928b9a686fc5..1bbc540060ab 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "cy.h"
diff --git a/sys/i386/isa/cyreg.h b/sys/i386/isa/cyreg.h
index 545de360bda3..6aa66329e035 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/diskslice_machdep.c b/sys/i386/isa/diskslice_machdep.c
index fd74372ceabe..8983e950cbfc 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 $
- * $FreeBSD$
+ * $Id$
*/
#include <stddef.h>
diff --git a/sys/i386/isa/elink.c b/sys/i386/isa/elink.c
index d5bf0f828846..f9c88d92bb32 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/elink.h b/sys/i386/isa/elink.h
index 4ea939c76d61..ca3b1bceba12 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifdef PC98
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index c2d495db4bc7..e08c63791088 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/i386/isa/fdc.h b/sys/i386/isa/fdc.h
index 7be93e3f5fa3..99b33bb90f36 100644
--- a/sys/i386/isa/fdc.h
+++ b/sys/i386/isa/fdc.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/i386/isa/fdreg.h b/sys/i386/isa/fdreg.h
index a98bda7902fd..5ceb73f43301 100644
--- a/sys/i386/isa/fdreg.h
+++ b/sys/i386/isa/fdreg.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)fdreg.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/ft.c b/sys/i386/isa/ft.c
index c9f5c2795e6a..22927dfcd210 100644
--- a/sys/i386/isa/ft.c
+++ b/sys/i386/isa/ft.c
@@ -17,7 +17,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* ft.c - QIC-40/80 floppy tape driver
- * $FreeBSD$
+ * $Id$
*
* 01/19/95 ++sg
* Cleaned up recalibrate/seek code at attach time for FreeBSD 2.x.
diff --git a/sys/i386/isa/ic/cd1400.h b/sys/i386/isa/ic/cd1400.h
index 4e95518c6b53..52081fe9b836 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/ic/esp.h b/sys/i386/isa/ic/esp.h
index 72367141b0b2..6621e6503917 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _IC_ESP_H_
diff --git a/sys/i386/isa/ic/hd64570.h b/sys/i386/isa/ic/hd64570.h
index b676e25a9cd5..e26e89fb789c 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _HD64570_H_
#define _HD64570_H_
diff --git a/sys/i386/isa/ic/i8042.h b/sys/i386/isa/ic/i8042.h
index 9054d995a133..84ee90f08e62 100644
--- a/sys/i386/isa/ic/i8042.h
+++ b/sys/i386/isa/ic/i8042.h
@@ -1,5 +1,5 @@
/*
- * $FreeBSD$
+ * $Id$
*/
#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 a7c45c5f3456..e955a33b833d 100644
--- a/sys/i386/isa/ic/i8237.h
+++ b/sys/i386/isa/ic/i8237.h
@@ -1,7 +1,7 @@
/*
* Intel 8237 DMA Controller
*
- * $FreeBSD$
+ * $Id$
*/
#define DMA37MD_SINGLE 0x40 /* single pass mode */
diff --git a/sys/i386/isa/ic/i82586.h b/sys/i386/isa/ic/i82586.h
index 980c13a0627d..736df1ea1eeb 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/ic/lemac.h b/sys/i386/isa/ic/lemac.h
index b5b6ccc62f16..f222f1ad7181 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _LEMAC_H_
#define _LEMAC_H_
diff --git a/sys/i386/isa/ic/nec765.h b/sys/i386/isa/ic/nec765.h
index 3d2cdac6e6bc..7af3c21b2725 100644
--- a/sys/i386/isa/ic/nec765.h
+++ b/sys/i386/isa/ic/nec765.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)nec765.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/ic/ns16450.h b/sys/i386/isa/ic/ns16450.h
index 145c96773cd8..e3b0cc65d451 100644
--- a/sys/i386/isa/ic/ns16450.h
+++ b/sys/i386/isa/ic/ns16450.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)ns16450.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/ic/ns16550.h b/sys/i386/isa/ic/ns16550.h
index 1733d18962ea..ba338886c764 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/ic/scd1400.h b/sys/i386/isa/ic/scd1400.h
index 272e56c9e4eb..c651a3014ad7 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*****************************************************************************/
diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h
index 9d1891ad92ba..ba721727f340 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/icu.s b/sys/i386/isa/icu.s
index 4abe7afdb10d..a326740c8dcf 100644
--- a/sys/i386/isa/icu.s
+++ b/sys/i386/isa/icu.s
@@ -36,7 +36,7 @@
*
* @(#)icu.s 7.2 (Berkeley) 5/21/91
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index d95303588dd3..a0fad0f5c3e8 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/if_arregs.h b/sys/i386/isa/if_arregs.h
index 6c5b020908e2..974b76127962 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _IF_ARREGS_H_
#define _IF_ARREGS_H_
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index c5d74d543aae..c33b9da6939c 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/if_edreg.h b/sys/i386/isa/if_edreg.h
index db1a89d9f7ec..a6d611c0cd10 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
* National Semiconductor DS8390 NIC register definitions
diff --git a/sys/i386/isa/if_eg.c b/sys/i386/isa/if_eg.c
index aa3706453d24..1ccdc291482e 100644
--- a/sys/i386/isa/if_eg.c
+++ b/sys/i386/isa/if_eg.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.
*
- * $FreeBSD$
+ * $Id$
*
* Support for 3Com 3c505 Etherlink+ card.
*/
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 439367eb53d7..f09bf14b572e 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.
*
- * $FreeBSD$
+ * $Id$
*/
/* 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 3fb3f15a295f..8b133b3bd6d7 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.
*
- * $FreeBSD$
+ * $Id$
*/
/* 3COM Etherlink 3C501 Register Definitions */
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index 25da73185daf..304620bb9233 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
*/
/*
- * $FreeBSD$
+ * $Id$
*
* 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 0f440632f066..a104e8a85af7 100644
--- a/sys/i386/isa/if_epreg.h
+++ b/sys/i386/isa/if_epreg.h
@@ -31,7 +31,7 @@
*/
/*
- * $FreeBSD$
+ * $Id$
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 5dce7788180b..d1f91b42a73c 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
*/
/*
- * $FreeBSD$
+ * $Id$
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 2.x
diff --git a/sys/i386/isa/if_fereg.h b/sys/i386/isa/if_fereg.h
index da5da5b4bce3..2a26cbea10f1 100644
--- a/sys/i386/isa/if_fereg.h
+++ b/sys/i386/isa/if_fereg.h
@@ -24,7 +24,7 @@
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
+/* $Id$ */
/*
* 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 beb9184e183e..c43283c8d267 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -43,7 +43,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/if_ie507.h b/sys/i386/isa/if_ie507.h
index 9be1396cf49e..7583ffd0a037 100644
--- a/sys/i386/isa/if_ie507.h
+++ b/sys/i386/isa/if_ie507.h
@@ -1,5 +1,5 @@
/*
- * $FreeBSD$
+ * $Id$
* Definitions for 3C507
*/
diff --git a/sys/i386/isa/if_iereg.h b/sys/i386/isa/if_iereg.h
index 875f63ca9dbb..3588b8414058 100644
--- a/sys/i386/isa/if_iereg.h
+++ b/sys/i386/isa/if_iereg.h
@@ -1,5 +1,5 @@
/*
- * $FreeBSD$
+ * $Id$
* definitions for AT&T StarLAN 10 etc...
*/
diff --git a/sys/i386/isa/if_ix.c b/sys/i386/isa/if_ix.c
index 05151e360836..461b5a96786f 100644
--- a/sys/i386/isa/if_ix.c
+++ b/sys/i386/isa/if_ix.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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "ix.h"
diff --git a/sys/i386/isa/if_ixreg.h b/sys/i386/isa/if_ixreg.h
index e48ba6976cde..8b22c73ea8b6 100644
--- a/sys/i386/isa/if_ixreg.h
+++ b/sys/i386/isa/if_ixreg.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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index a82ed3e6498c..2fdac2037382 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c
index 323085a5da3b..21c0f48cae2e 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/if_srregs.h b/sys/i386/isa/if_srregs.h
index 64d9ba11c50e..689b6abecf2d 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _IF_SRREGS_H_
#define _IF_SRREGS_H_
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index ae12c737346f..6af3880e48a2 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
*/
/*
- * $FreeBSD$
+ * $Id$
*/
/* 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 1099d8faffdb..62732a2b60ec 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 $
- * $FreeBSD$
+ * $Id$
*/
/*-
* TODO:
diff --git a/sys/i386/isa/if_zpreg.h b/sys/i386/isa/if_zpreg.h
index 65eeebd8be2f..31720b5f5a37 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.
*
- * $FreeBSD$
+ * $Id$
*/
/**************************************************************************
* *
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index fe12a85f036d..0b49bba47e70 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h
index 964730cb2d41..6ec3ae276d41 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
- * $FreeBSD$
+ * $Id$
*/
#ifdef PC98
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index 8f77f96df932..3daa6540b427 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_ISA_ISA_DEVICE_H_
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index 17a7530a4f0a..1c33e93ea88f 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*****************************************************************************/
diff --git a/sys/i386/isa/kbdio.c b/sys/i386/isa/kbdio.c
index 88c3f2b7969a..fe8b3fbb544c 100644
--- a/sys/i386/isa/kbdio.c
+++ b/sys/i386/isa/kbdio.c
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#include "sc.h"
diff --git a/sys/i386/isa/kbdio.h b/sys/i386/isa/kbdio.h
index 37034439573a..a25edc5490bb 100644
--- a/sys/i386/isa/kbdio.h
+++ b/sys/i386/isa/kbdio.h
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_ISA_KBDIO_H_
diff --git a/sys/i386/isa/kbdtables.h b/sys/i386/isa/kbdtables.h
index 9c66fa521225..7c65fd4993fd 100644
--- a/sys/i386/isa/kbdtables.h
+++ b/sys/i386/isa/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.
*
- * $FreeBSD$
+ * $Id$
*/
#define SET8 0x80 /* set eight bit on */
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index 844d88af21a3..12d0b923b3b4 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
* SUCH DAMAGE.
*
* from: unknown origin, 386BSD 0.1
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/lptreg.h b/sys/i386/isa/lptreg.h
index 78bba0081561..db970a2788ee 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 9b0d9ca078b4..f256d444d3fb 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*/
-/* $FreeBSD$ */
+/* $Id$ */
/*---------------------------------------------------------------------------
Include declarations
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 4049bd905c63..4fa60863a9a5 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.
*
- * $FreeBSD$
+ * $Id$
*/
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 2004a9d890dc..219e119d5a87 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef MCD_H
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index e9f34ad520a9..e00037fa87d3 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
* Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index fa024ad02223..52d37adcb4a8 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
- * $FreeBSD$
+ * $Id$
*/
#include "npx.h"
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index 21fa481f87b9..c371055932aa 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "pca.h"
diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c
index 3ca7ca144cd0..dfddb43e6ad5 100644
--- a/sys/i386/isa/pcibus.c
+++ b/sys/i386/isa/pcibus.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $FreeBSD$
+** $Id$
**
** pci bus subroutines for i386 architecture.
**
diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c
index af535d397c26..5f6684ddd923 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifdef GUPROF
diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c
index 9aaed74e88b8..ea3e22472d6d 100644
--- a/sys/i386/isa/psm.c
+++ b/sys/i386/isa/psm.c
@@ -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$
*/
/*
diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c
index a927956da532..64c215c687e3 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
*
- * $FreeBSD$
+ * $Id$
*
* Version 0.95, last modified 18-Oct-95
*
diff --git a/sys/i386/isa/rtc.h b/sys/i386/isa/rtc.h
index 40024b46d864..d8b9c149bc18 100644
--- a/sys/i386/isa/rtc.h
+++ b/sys/i386/isa/rtc.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)rtc.h 7.1 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_ISA_RTC_H_
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index 54a050e2ba7e..eef043fdc8b2 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
*/
-/* $FreeBSD$ */
+/* $Id$ */
/* Please send any comments to micke@dynas.se */
diff --git a/sys/i386/isa/scdreg.h b/sys/i386/isa/scdreg.h
index e9ce3b15a23f..d04dc6919e2e 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.
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/i386/isa/seagate.c b/sys/i386/isa/seagate.c
index 36f981726734..2bdc48c5a4fd 100644
--- a/sys/i386/isa/seagate.c
+++ b/sys/i386/isa/seagate.c
@@ -60,7 +60,7 @@
* that category, with the possible exception of scanners and
* some of the older MO drives.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index 68662435146f..c2ae76c1badb 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/sys/i386/isa/si_code.c b/sys/i386/isa/si_code.c
index b9d39996c65a..474020fa033f 100644
--- a/sys/i386/isa/si_code.c
+++ b/sys/i386/isa/si_code.c
@@ -30,7 +30,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHORS BE LIABLE.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index a9de446416dd..0c835f048bd5 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $FreeBSD$
+ * $Id$
*/
#include "opt_comconsole.h"
diff --git a/sys/i386/isa/sioreg.h b/sys/i386/isa/sioreg.h
index b447b61bb5df..4c369074c81b 100644
--- a/sys/i386/isa/sioreg.h
+++ b/sys/i386/isa/sioreg.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)comreg.h 7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/i386/isa/sireg.h b/sys/i386/isa/sireg.h
index 1a7cdfe30944..cbbfe9c9caad 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/sound/pcm86.c b/sys/i386/isa/sound/pcm86.c
index c79cb0a58945..74fb8f378514 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/sound/sound.doc b/sys/i386/isa/sound/sound.doc
index b609355ac124..0b43822fa382 100644
--- a/sys/i386/isa/sound/sound.doc
+++ b/sys/i386/isa/sound/sound.doc
@@ -1,4 +1,4 @@
-$FreeBSD$
+$Id$
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/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index 0b88f1c7519d..177f73b464ce 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#include <i386/isa/sound/sound_config.h>
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index e11b9e29e667..6ea703277fd2 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>
*
- * $FreeBSD$
+ * $Id$
*/
#include "speaker.h"
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 2b05947a0606..1ef9667e3b07 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*****************************************************************************/
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index 8a85268a251b..1065c16156be 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "sc.h"
diff --git a/sys/i386/isa/syscons.h b/sys/i386/isa/syscons.h
index e920b8c3f7b9..333fd86b2ba7 100644
--- a/sys/i386/isa/syscons.h
+++ b/sys/i386/isa/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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_ISA_SYSCONS_H_
diff --git a/sys/i386/isa/timerreg.h b/sys/i386/isa/timerreg.h
index 7bd619762d8f..ff27bacc24a4 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c
index dd49128748e9..08204cdfcadd 100644
--- a/sys/i386/isa/ultra14f.c
+++ b/sys/i386/isa/ultra14f.c
@@ -22,7 +22,7 @@
* today: Fri Jun 2 17:21:03 EST 1994
* added 24F support ++sg
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/types.h>
diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s
index 7ffa885da57c..fa2fd42afb54 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 842a4c71f9c1..3f978a6c99a0 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
- * $FreeBSD$
+ * $Id$
*/
/* TODO:
diff --git a/sys/i386/isa/wdreg.h b/sys/i386/isa/wdreg.h
index d4b60a95d1b5..3ad2403aa9e7 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index ced49bd66c8a..f084f82f1bb2 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
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/i386/isa/wtreg.h b/sys/i386/isa/wtreg.h
index 33f0ee478750..67836c50d8a7 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
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c
index 2d593b1a6d91..2d01d1d5f342 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef LKM
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index f7bc682fcd2a..ca724477a612 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_LINUX_LINUX_H_
diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c
index 544f53ceb3c4..6cfae05485a8 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/linux/linux_file.c b/sys/i386/linux/linux_file.c
index addfbefe46e9..e4400af6d735 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/linux/linux_genassym.c b/sys/i386/linux/linux_genassym.c
index 40b9113faefe..c8b503ba82c3 100644
--- a/sys/i386/linux/linux_genassym.c
+++ b/sys/i386/linux/linux_genassym.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
#include <stdio.h>
#include <sys/param.h>
#include <sys/buf.h>
diff --git a/sys/i386/linux/linux_ioctl.c b/sys/i386/linux/linux_ioctl.c
index 4a495261ecee..c2e8780d86bc 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/linux/linux_ipc.c b/sys/i386/linux/linux_ipc.c
index 8b66da9a4a2b..dd4007b684e8 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.
*
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c
index 7e99f0290556..0fb8085b14b2 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/linux/linux_signal.c b/sys/i386/linux/linux_signal.c
index 62d9238a79bf..25a56e5ab53f 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/linux/linux_socket.c b/sys/i386/linux/linux_socket.c
index 43cc0d775e9a..81b975305a1d 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.
*
- * $FreeBSD$
+ * $Id$
*/
/* 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 909dff8e7dd8..2505d742c8df 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 459783321197..f61f32103207 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.
*
- * $FreeBSD$
+ * $Id$
*/
/* 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 c89982671f12..76cbfd637657 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/linux/linux_util.h b/sys/i386/linux/linux_util.h
index f70011642660..7760e8d6ca05 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/linux/syscalls.conf b/sys/i386/linux/syscalls.conf
index 0a0b11cd45d4..d5922abbca7b 100644
--- a/sys/i386/linux/syscalls.conf
+++ b/sys/i386/linux/syscalls.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
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 e5e0d0595d3e..7eb0983775a4 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/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).
diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c
index 3ca7ca144cd0..dfddb43e6ad5 100644
--- a/sys/i386/pci/pci_bus.c
+++ b/sys/i386/pci/pci_bus.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $FreeBSD$
+** $Id$
**
** pci bus subroutines for i386 architecture.
**
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index 3ca7ca144cd0..dfddb43e6ad5 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $FreeBSD$
+** $Id$
**
** pci bus subroutines for i386 architecture.
**
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index 3ca7ca144cd0..dfddb43e6ad5 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $FreeBSD$
+** $Id$
**
** pci bus subroutines for i386 architecture.
**
diff --git a/sys/i386/scsi/93cx6.c b/sys/i386/scsi/93cx6.c
index 1215a7d76c30..06e67223f003 100644
--- a/sys/i386/scsi/93cx6.c
+++ b/sys/i386/scsi/93cx6.c
@@ -18,7 +18,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/scsi/93cx6.h b/sys/i386/scsi/93cx6.h
index 2ca5a354993c..c1ae8d29ae48 100644
--- a/sys/i386/scsi/93cx6.h
+++ b/sys/i386/scsi/93cx6.h
@@ -20,7 +20,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/i386/scsi/advansys.c b/sys/i386/scsi/advansys.c
index 6736b827c987..e48362e9fd0b 100644
--- a/sys/i386/scsi/advansys.c
+++ b/sys/i386/scsi/advansys.c
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
/*
* Ported from:
diff --git a/sys/i386/scsi/advansys.h b/sys/i386/scsi/advansys.h
index 6b83fe96cf3a..47bca6aad6ed 100644
--- a/sys/i386/scsi/advansys.h
+++ b/sys/i386/scsi/advansys.h
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _ADVANSYS_H_
diff --git a/sys/i386/scsi/aic7xxx.c b/sys/i386/scsi/aic7xxx.c
index 0788cc288a01..09d92c341d53 100644
--- a/sys/i386/scsi/aic7xxx.c
+++ b/sys/i386/scsi/aic7xxx.c
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
/*
* TODO:
diff --git a/sys/i386/scsi/aic7xxx.h b/sys/i386/scsi/aic7xxx.h
index 79d890443c16..ea566098164b 100644
--- a/sys/i386/scsi/aic7xxx.h
+++ b/sys/i386/scsi/aic7xxx.h
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _AIC7XXX_H_
diff --git a/sys/i386/scsi/bt.c b/sys/i386/scsi/bt.c
index bb7c760c1269..48bc7759aabb 100644
--- a/sys/i386/scsi/bt.c
+++ b/sys/i386/scsi/bt.c
@@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/i386/scsi/btreg.h b/sys/i386/scsi/btreg.h
index 15a5dbb569de..7563bb03af70 100644
--- a/sys/i386/scsi/btreg.h
+++ b/sys/i386/scsi/btreg.h
@@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _BTREG_H_
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index 60aa95c21546..a37022e68acb 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index c2d495db4bc7..e08c63791088 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/isa/fdc.h b/sys/isa/fdc.h
index 7be93e3f5fa3..99b33bb90f36 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
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/sys/isa/fdreg.h b/sys/isa/fdreg.h
index a98bda7902fd..5ceb73f43301 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/isa/ic/esp.h b/sys/isa/ic/esp.h
index 72367141b0b2..6621e6503917 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _IC_ESP_H_
diff --git a/sys/isa/ic/nec765.h b/sys/isa/ic/nec765.h
index 3d2cdac6e6bc..7af3c21b2725 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/isa/ic/ns16550.h b/sys/isa/ic/ns16550.h
index 1733d18962ea..ba338886c764 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/isa/kbdio.c b/sys/isa/kbdio.c
index 88c3f2b7969a..fe8b3fbb544c 100644
--- a/sys/isa/kbdio.c
+++ b/sys/isa/kbdio.c
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#include "sc.h"
diff --git a/sys/isa/kbdio.h b/sys/isa/kbdio.h
index 37034439573a..a25edc5490bb 100644
--- a/sys/isa/kbdio.h
+++ b/sys/isa/kbdio.h
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_ISA_KBDIO_H_
diff --git a/sys/isa/kbdtables.h b/sys/isa/kbdtables.h
index 9c66fa521225..7c65fd4993fd 100644
--- a/sys/isa/kbdtables.h
+++ b/sys/isa/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.
*
- * $FreeBSD$
+ * $Id$
*/
#define SET8 0x80 /* set eight bit on */
diff --git a/sys/isa/rtc.h b/sys/isa/rtc.h
index 40024b46d864..d8b9c149bc18 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
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_ISA_RTC_H_
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index a9de446416dd..0c835f048bd5 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $FreeBSD$
+ * $Id$
*/
#include "opt_comconsole.h"
diff --git a/sys/isa/sioreg.h b/sys/isa/sioreg.h
index b447b61bb5df..4c369074c81b 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
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index 8a85268a251b..1065c16156be 100644
--- a/sys/isa/syscons.c
+++ b/sys/isa/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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "sc.h"
diff --git a/sys/isa/syscons.h b/sys/isa/syscons.h
index e920b8c3f7b9..333fd86b2ba7 100644
--- a/sys/isa/syscons.h
+++ b/sys/isa/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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _I386_ISA_SYSCONS_H_
diff --git a/sys/isa/timerreg.h b/sys/isa/timerreg.h
index 7bd619762d8f..ff27bacc24a4 100644
--- a/sys/isa/timerreg.h
+++ b/sys/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$
*/
/*
diff --git a/sys/isofs/cd9660/TODO b/sys/isofs/cd9660/TODO
index 433eaa837bb6..cf3fadc5d882 100644
--- a/sys/isofs/cd9660/TODO
+++ b/sys/isofs/cd9660/TODO
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
2) should understand Rock Ridge
diff --git a/sys/isofs/cd9660/cd9660_bmap.c b/sys/isofs/cd9660/cd9660_bmap.c
index 71dfb9e540a8..043e8062aafe 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index e5846527de69..9d8ef1b5acc0 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index ba89cddfe87b..7881de037acd 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index de538fb74461..9205fa68e98b 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index 521094fd0a30..b54a1d0fc589 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_util.c b/sys/isofs/cd9660/cd9660_util.c
index 71c9208a69a8..f79c79c2278c 100644
--- a/sys/isofs/cd9660/cd9660_util.c
+++ b/sys/isofs/cd9660/cd9660_util.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_util.c 8.3 (Berkeley) 12/5/94
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 466dfcadb47c..8ee2b8eee828 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 203c5a2e8da1..de9d2beef818 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index c8ff135652c6..d7fc57998d53 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
- * $FreeBSD$
+ * $Id$
*/
#define ISODCL(from, to) (to - from + 1)
diff --git a/sys/isofs/cd9660/iso_rrip.h b/sys/isofs/cd9660/iso_rrip.h
index 9b14979e476a..031aaa37358b 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
- * $FreeBSD$
+ * $Id$
*/
diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc
index e81caa525819..a09e4848a08d 100644
--- a/sys/kern/Make.tags.inc
+++ b/sys/kern/Make.tags.inc
@@ -1,5 +1,5 @@
# @(#)Make.tags.inc 8.1 (Berkeley) 6/11/93
-# $FreeBSD$
+# $Id$
# Common files for "make tags".
# Included by the Makefile for each architecture.
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 07302536eeb7..4adbd05e3bc5 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "opt_rlimit.h"
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 47caf98f7707..5867fde6f7a9 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include "opt_rlimit.h"
diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c
index 9186749c8d49..9a3237fc41d2 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
* ----------------------------------------------------------------------------
*
- * $FreeBSD$
+ * $Id$
*
* 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 79b7209f8170..fb030113aecc 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index e7b9f66b2bcf..2024bc150097 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
* ----------------------------------------------------------------------------
*
- * $FreeBSD$
+ * $Id$
*
*
*/
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 589a4c5c6547..6711bdb3b8ef 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
- * $FreeBSD$
+ * $Id$
*/
#include "opt_rlimit.h"
diff --git a/sys/kern/init_sysvec.c b/sys/kern/init_sysvec.c
index e1628d4c0eca..379a1bf2f871 100644
--- a/sys/kern/init_sysvec.c
+++ b/sys/kern/init_sysvec.c
@@ -1,7 +1,7 @@
/*
* sysentvec for native FreeBSD a.out executable format.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/types.h>
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index 59d0d35c5a86..662562b7cc13 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 938e3df58f7d..341c00eaf103 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $Id$
*/
/* Portions of this software are covered by the following: */
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index c6a9e141c59f..bee8b87bb2a7 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 3fbfd692420f..a5c6d948e841 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index e3b1da951d27..21049a398d7c 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index f65419f4e600..bd67d8b6dfcf 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
- * $FreeBSD$
+ * $Id$
*/
#include "opt_ktrace.h"
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 40f12f36c311..8327b8125559 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
- * $FreeBSD$
+ * $Id$
*/
#include "opt_ktrace.h"
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 3ed8013ca7a0..b2f73ed537bd 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
- * $FreeBSD$
+ * $Id$
*/
#include "opt_ktrace.h"
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index b42d60896e5a..2a5fc5258dba 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index 550417c6b531..fb1a8a04e87e 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 47107eca0b29..94c6b4e63413 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index e8f10d8fd638..65e975f836a4 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index 60d74b679e30..42d1d21a1104 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 37d99e4753fd..a49a1dec62b1 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 29f5635342a4..b3906ea2443c 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/kern/kern_random.c b/sys/kern/kern_random.c
index a927956da532..64c215c687e3 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
*
- * $FreeBSD$
+ * $Id$
*
* Version 0.95, last modified 18-Oct-95
*
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index d9381a61ac5a..fe50cf913be3 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
- * $FreeBSD$
+ * $Id$
*/
#include "opt_rlimit.h"
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 35f7e6520a3b..c4922d0afadc 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
- * $FreeBSD$
+ * $Id$
*/
#include "opt_ddb.h"
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 0f6c9e5a884a..772e054458f0 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
- * $FreeBSD$
+ * $Id$
*/
#include "opt_ktrace.h"
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 252930327e21..d0097dff46c6 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 43f9e5de4a3d..8c8a436b1d09 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
- * $FreeBSD$
+ * $Id$
*/
#include "opt_ktrace.h"
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index a41e1d4d82f0..fb07f1838e4f 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 938e3df58f7d..341c00eaf103 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $Id$
*/
/* Portions of this software are covered by the following: */
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index baa878954245..4a0db6adfa31 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 938e3df58f7d..341c00eaf103 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $Id$
*/
/* Portions of this software are covered by the following: */
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index 3da900c0788d..17550b645da4 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index a7ded79d9618..dc78413589ac 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
-# $FreeBSD$
+# $Id$
set -e
@@ -87,7 +87,7 @@ s/\$//g
printf " * DO NOT EDIT-- this file is automatically generated.\n" > syshide
}
NR == 1 {
- gsub("[$]FreeBSD: ", "", $0)
+ gsub("[$]Id: ", "", $0)
gsub(" [$]", "", $0)
printf " * created from%s\n */\n\n", $0 > sysinc
diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c
index af27e73d1d8e..583d009d97f1 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.
*
- * $FreeBSD$
+ * $Id$
*
* 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 36448e061db8..f48ce99f0a37 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
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c
index c956d51de8ce..7203e029153f 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.
*
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index cd66e6338623..94315de05b8f 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index fd74372ceabe..8983e950cbfc 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 $
- * $FreeBSD$
+ * $Id$
*/
#include <stddef.h>
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 303e33b93b91..f9648e0e7d57 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 $
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/subr_dkbad.c b/sys/kern/subr_dkbad.c
index 0336795a4a6a..8fef8635a013 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 $
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index 6171338a4980..d76bd6cc6b1c 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index 0fbbdb590acd..f7d41bfc0b2f 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
- * $FreeBSD$
+ * $Id$
*/
#include "opt_sysvipc.h"
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index bd03cae6460f..4b3ed36a606c 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
- * $FreeBSD$
+ * $Id$
*/
#include "opt_ddb.h"
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 35ef5832b789..08ba35f30db0 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c
index 66d4c80a2b9a..ef29ce3799ba 100644
--- a/sys/kern/subr_rlist.c
+++ b/sys/kern/subr_rlist.c
@@ -54,7 +54,7 @@
* functioning of this software, nor does the author assume any responsibility
* for damages incurred with its use.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index c866f32254c4..9dca84275078 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c
index fcb951fe1b96..5ff7dccda7db 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
- * $FreeBSD$
+ * $Id$
*/
/*
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 8389293461a7..9e40e0de2521 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
- * $FreeBSD$
+ * $Id$
*/
#include "opt_ktrace.h"
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 6d9a56673875..8be483bcf563 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.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef OLD_PIPE
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 72e95e738531..7a538b672e1f 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.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index d147bc5b9478..eab70deac31e 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
- * $FreeBSD$
+ * $Id$
*/
#include <sys/param.h>
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index cacaf426f053..b0921d4172aa 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $Id$
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
;
;