From 677b542ea243380af64822b30e4ef5f7a6d978ee Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Wed, 11 Jun 2003 00:56:59 +0000 Subject: [PATCH] Use __FBSDID(). --- sys/kern/imgact_aout.c | 5 +++-- sys/kern/imgact_elf.c | 5 +++-- sys/kern/imgact_elf32.c | 5 +++-- sys/kern/imgact_elf64.c | 5 +++-- sys/kern/imgact_gzip.c | 4 +++- sys/kern/imgact_shell.c | 5 +++-- sys/kern/inflate.c | 7 +++---- sys/kern/init_main.c | 4 +++- sys/kern/kern_acct.c | 4 +++- sys/kern/kern_acl.c | 5 +++-- sys/kern/kern_alq.c | 6 +++--- sys/kern/kern_clock.c | 4 +++- sys/kern/kern_condvar.c | 5 +++-- sys/kern/kern_conf.c | 5 +++-- sys/kern/kern_context.c | 7 +++---- sys/kern/kern_descrip.c | 4 +++- sys/kern/kern_environment.c | 5 +++-- sys/kern/kern_event.c | 5 +++-- sys/kern/kern_exec.c | 5 +++-- sys/kern/kern_exit.c | 4 +++- sys/kern/kern_fork.c | 4 +++- sys/kern/kern_idle.c | 4 +++- sys/kern/kern_intr.c | 5 ++--- sys/kern/kern_jail.c | 6 +++--- sys/kern/kern_kse.c | 5 +++-- sys/kern/kern_kthread.c | 5 +++-- sys/kern/kern_ktr.c | 5 +++-- sys/kern/kern_ktrace.c | 4 +++- sys/kern/kern_linker.c | 5 +++-- sys/kern/kern_lock.c | 4 +++- sys/kern/kern_lockf.c | 4 +++- sys/kern/kern_mac.c | 8 ++++---- sys/kern/kern_malloc.c | 4 +++- sys/kern/kern_mib.c | 4 +++- sys/kern/kern_module.c | 5 +++-- sys/kern/kern_mtxpool.c | 5 +++-- sys/kern/kern_mutex.c | 4 +++- sys/kern/kern_ntptime.c | 5 +++-- sys/kern/kern_physio.c | 5 +++-- sys/kern/kern_poll.c | 5 +++-- sys/kern/kern_proc.c | 4 +++- sys/kern/kern_prot.c | 4 +++- sys/kern/kern_resource.c | 4 +++- sys/kern/kern_sema.c | 5 +++-- sys/kern/kern_shutdown.c | 4 +++- sys/kern/kern_sig.c | 4 +++- sys/kern/kern_subr.c | 4 +++- sys/kern/kern_switch.c | 9 ++++----- sys/kern/kern_sx.c | 5 +++-- sys/kern/kern_synch.c | 4 +++- sys/kern/kern_syscalls.c | 5 +++-- sys/kern/kern_sysctl.c | 4 +++- sys/kern/kern_tc.c | 5 +++-- sys/kern/kern_thr.c | 6 +++--- sys/kern/kern_thread.c | 5 +++-- sys/kern/kern_time.c | 4 +++- sys/kern/kern_timeout.c | 4 +++- sys/kern/kern_umtx.c | 6 +++--- sys/kern/kern_uuid.c | 5 +++-- sys/kern/kern_xxx.c | 4 +++- sys/kern/link_elf.c | 5 +++-- sys/kern/link_elf_obj.c | 5 +++-- sys/kern/md4c.c | 4 +++- sys/kern/sched_4bsd.c | 5 +++-- sys/kern/sched_ule.c | 5 +++-- sys/kern/subr_acl_posix1e.c | 5 +++-- sys/kern/subr_autoconf.c | 4 +++- sys/kern/subr_blist.c | 6 +++--- sys/kern/subr_bus.c | 5 +++-- sys/kern/subr_clist.c | 5 +++-- sys/kern/subr_clock.c | 6 ++++-- sys/kern/subr_devstat.c | 5 +++-- sys/kern/subr_disk.c | 6 +++--- sys/kern/subr_eventhandler.c | 5 +++-- sys/kern/subr_hints.c | 5 +++-- sys/kern/subr_kobj.c | 5 +++-- sys/kern/subr_log.c | 4 +++- sys/kern/subr_mbuf.c | 5 +++-- sys/kern/subr_mchain.c | 5 +++-- sys/kern/subr_module.c | 5 +++-- sys/kern/subr_param.c | 4 +++- sys/kern/subr_pcpu.c | 5 +++-- sys/kern/subr_power.c | 5 +++-- sys/kern/subr_prf.c | 4 +++- sys/kern/subr_prof.c | 4 +++- sys/kern/subr_rman.c | 5 +++-- sys/kern/subr_rtc.c | 6 ++++-- sys/kern/subr_sbuf.c | 5 +++-- sys/kern/subr_scanf.c | 4 +++- sys/kern/subr_smp.c | 5 +++-- sys/kern/subr_taskqueue.c | 5 +++-- sys/kern/subr_trap.c | 4 +++- sys/kern/subr_turnstile.c | 4 +++- sys/kern/subr_witness.c | 4 +++- sys/kern/subr_xxx.c | 5 ++++- sys/kern/sys_generic.c | 4 +++- sys/kern/sys_pipe.c | 5 +++-- sys/kern/sys_process.c | 5 +++-- sys/kern/sys_socket.c | 4 +++- sys/kern/sysv_ipc.c | 5 +++-- sys/kern/sysv_msg.c | 5 +++-- sys/kern/sysv_sem.c | 5 +++-- sys/kern/sysv_shm.c | 5 +++-- sys/kern/tty.c | 4 +++- sys/kern/tty_compat.c | 4 +++- sys/kern/tty_conf.c | 4 +++- sys/kern/tty_cons.c | 4 +++- sys/kern/tty_pty.c | 4 +++- sys/kern/tty_subr.c | 5 +++-- sys/kern/tty_tty.c | 5 +++-- sys/kern/uipc_accf.c | 5 +++-- sys/kern/uipc_cow.c | 6 ++++-- sys/kern/uipc_domain.c | 4 +++- sys/kern/uipc_jumbo.c | 6 ++++-- sys/kern/uipc_mbuf.c | 4 +++- sys/kern/uipc_mbuf2.c | 5 +++-- sys/kern/uipc_proto.c | 4 +++- sys/kern/uipc_sem.c | 5 +++-- sys/kern/uipc_sockbuf.c | 4 +++- sys/kern/uipc_socket.c | 4 +++- sys/kern/uipc_socket2.c | 4 +++- sys/kern/uipc_syscalls.c | 4 +++- sys/kern/uipc_usrreq.c | 4 +++- sys/kern/vfs_acl.c | 5 +++-- sys/kern/vfs_aio.c | 5 +++-- sys/kern/vfs_bio.c | 5 +++-- sys/kern/vfs_cache.c | 4 +++- sys/kern/vfs_cluster.c | 4 +++- sys/kern/vfs_default.c | 6 +++--- sys/kern/vfs_export.c | 4 +++- sys/kern/vfs_extattr.c | 4 +++- sys/kern/vfs_init.c | 3 ++- sys/kern/vfs_lookup.c | 4 +++- sys/kern/vfs_mount.c | 5 +++-- sys/kern/vfs_subr.c | 5 ++++- sys/kern/vfs_syscalls.c | 4 +++- sys/kern/vfs_vnops.c | 4 +++- sys/security/mac/mac_framework.c | 8 ++++---- sys/security/mac/mac_internal.h | 8 ++++---- sys/security/mac/mac_net.c | 8 ++++---- sys/security/mac/mac_pipe.c | 8 ++++---- sys/security/mac/mac_process.c | 8 ++++---- sys/security/mac/mac_syscalls.c | 8 ++++---- sys/security/mac/mac_system.c | 8 ++++---- sys/security/mac/mac_vfs.c | 8 ++++---- 145 files changed, 449 insertions(+), 263 deletions(-) diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index e96054a19bed..37e9fe2a9916 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 9c36d802bc4b..349078b6baba 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -26,10 +26,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/imgact_elf32.c b/sys/kern/imgact_elf32.c index 3ce6d544a5f2..b286f315e1ba 100644 --- a/sys/kern/imgact_elf32.c +++ b/sys/kern/imgact_elf32.c @@ -22,9 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #define __ELF_WORD_SIZE 32 #include diff --git a/sys/kern/imgact_elf64.c b/sys/kern/imgact_elf64.c index a356591fd482..db2470dd915a 100644 --- a/sys/kern/imgact_elf64.c +++ b/sys/kern/imgact_elf64.c @@ -22,9 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #define __ELF_WORD_SIZE 64 #include diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c index 4e0d6bc73208..76602f9b4702 100644 --- a/sys/kern/imgact_gzip.c +++ b/sys/kern/imgact_gzip.c @@ -6,7 +6,6 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD$ * * This module handles execution of a.out files which have been run through * "gzip". This saves diskspace, but wastes cpu-cycles and VM. @@ -21,6 +20,9 @@ * tidy up unnecesary includes */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c index 7151f6c86e0f..42a42724eb5e 100644 --- a/sys/kern/imgact_shell.c +++ b/sys/kern/imgact_shell.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c index 2a16ba2c2d08..9ac6364ca6b0 100644 --- a/sys/kern/inflate.c +++ b/sys/kern/inflate.c @@ -6,12 +6,11 @@ * can do whatever you want with this stuff. If we meet some day, and you think * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- - * - * $FreeBSD$ - * - * */ +#include +__FBSDID("$FreeBSD$"); + #include #include #ifdef _KERNEL diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index b3920bde2b6c..9af07a9db39f 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -39,9 +39,11 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_init_path.h" #include "opt_mac.h" diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c index 19e5b1c038a9..58bdbf462138 100644 --- a/sys/kern/kern_acct.c +++ b/sys/kern/kern_acct.c @@ -37,9 +37,11 @@ * SUCH DAMAGE. * * @(#)kern_acct.c 8.1 (Berkeley) 6/14/93 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include diff --git a/sys/kern/kern_acl.c b/sys/kern/kern_acl.c index 6b9f942ff54b..d1bce92f7136 100644 --- a/sys/kern/kern_acl.c +++ b/sys/kern/kern_acl.c @@ -24,14 +24,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * Developed by the TrustedBSD Project. * Support for POSIX.1e access control lists. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include diff --git a/sys/kern/kern_alq.c b/sys/kern/kern_alq.c index 77b2ac4afd62..5335393fdf01 100644 --- a/sys/kern/kern_alq.c +++ b/sys/kern/kern_alq.c @@ -22,11 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - * */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 0482d53f34f9..15626c44beac 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ntp.h" #include diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c index 7852234f8c26..f43018c37835 100644 --- a/sys/kern/kern_condvar.c +++ b/sys/kern/kern_condvar.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ktrace.h" #include diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index d1f88b946898..acdf85e1aefd 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_context.c b/sys/kern/kern_context.c index ed30a8b3e184..ca3e2b11b9a3 100644 --- a/sys/kern/kern_context.c +++ b/sys/kern/kern_context.c @@ -22,12 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - */ -/* - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index cc7be0769224..8be3ec01f86e 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" #include diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c index 98f5fc64a807..9511c90c9658 100644 --- a/sys/kern/kern_environment.c +++ b/sys/kern/kern_environment.c @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* @@ -36,6 +34,9 @@ * the kernel. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index c8501a28f73b..87bdca003ca0 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 5dd8d6ec40dc..669bdf167046 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ktrace.h" #include "opt_mac.h" diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index e4550635f8d7..283a8bd482d2 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" #include "opt_ktrace.h" #include "opt_mac.h" diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 1de3dc8d0dd7..e9e38ab3025f 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)kern_fork.c 8.6 (Berkeley) 4/8/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ktrace.h" #include "opt_mac.h" diff --git a/sys/kern/kern_idle.c b/sys/kern/kern_idle.c index 825b2f04189e..b4d43af0f042 100644 --- a/sys/kern/kern_idle.c +++ b/sys/kern/kern_idle.c @@ -1,9 +1,11 @@ /*- * Copyright (c) 2000, All rights reserved. See /usr/src/COPYRIGHT * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ktrace.h" #include diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 6fd17f680036..ef1cfc1a0d40 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -22,11 +22,10 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - * */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 819c9260ce90..2241dd6caec2 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -5,11 +5,11 @@ * can do whatever you want with this stuff. If we meet some day, and you think * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- - * - * $FreeBSD$ - * */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_kse.c b/sys/kern/kern_kse.c index 4c2f592ea42f..367f97b77df7 100644 --- a/sys/kern/kern_kse.c +++ b/sys/kern/kern_kse.c @@ -24,10 +24,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index 7d38520e4382..87661dbe7966 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_ktr.c b/sys/kern/kern_ktr.c index 7c5079008523..27f3896a7a81 100644 --- a/sys/kern/kern_ktr.c +++ b/sys/kern/kern_ktr.c @@ -25,8 +25,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ /* @@ -34,6 +32,9 @@ * function that does the actual tracing. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ddb.h" #include "opt_ktr.h" #include "opt_alq.h" diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index ecb2421ea84f..42a358166785 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)kern_ktrace.c 8.2 (Berkeley) 9/23/93 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ktrace.h" #include "opt_mac.h" diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index 29672bc9f853..c6d46caf6891 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ddb.h" #include "opt_mac.h" diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index c74167b64eed..475ebaa7ea0a 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -38,9 +38,11 @@ * SUCH DAMAGE. * * @(#)kern_lock.c 8.18 (Berkeley) 5/21/95 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index ca2ba302fe07..4126cf754513 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -34,9 +34,11 @@ * SUCH DAMAGE. * * @(#)ufs_lockf.c 8.3 (Berkeley) 1/6/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_debug_lockf.h" #include diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c index fb06edea3012..e5e25dc520c1 100644 --- a/sys/kern/kern_mac.c +++ b/sys/kern/kern_mac.c @@ -32,16 +32,16 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ + /* - * Developed by the TrustedBSD Project. - * * Framework for extensible kernel access control. Kernel and userland * interface to the framework, policy registration and composition. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include "opt_devfs.h" diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index dc83772b5b07..4b8465921dfe 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_vm.h" #include diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index 9fed2d2d96be..6084a4124231 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -37,9 +37,11 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_posix.h" #include diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c index 677d9f15fe4c..3832922f5961 100644 --- a/sys/kern/kern_module.c +++ b/sys/kern/kern_module.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_mtxpool.c b/sys/kern/kern_mtxpool.c index 3d4aa1ca4b2f..87e4adbc772d 100644 --- a/sys/kern/kern_mtxpool.c +++ b/sys/kern/kern_mtxpool.c @@ -21,10 +21,11 @@ * - should generally only be used as leaf mutexes * - pool/pool dependancy ordering cannot be depended on. * - possible L1 cache mastersip contention between cpus - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index a139d53b9f14..fb7b88f2950e 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -27,13 +27,15 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD$ */ /* * Machine independent bits of mutex implementation. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_adaptive_mutexes.h" #include "opt_ddb.h" diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c index 016c1d67207d..6490cbd0b587 100644 --- a/sys/kern/kern_ntptime.c +++ b/sys/kern/kern_ntptime.c @@ -27,10 +27,11 @@ * Only minor changes done to interface with the timecounters over in * sys/kern/kern_clock.c. Some of the comments below may be (even more) * confusing and/or plain wrong in that context. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ntp.h" #include diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c index 2e03cf751cc7..ee89dd16c853 100644 --- a/sys/kern/kern_physio.c +++ b/sys/kern/kern_physio.c @@ -15,10 +15,11 @@ * John S. Dyson. * 4. Modifications may be freely made to this file if the above conditions * are met. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c index aeb5f57bcf71..b5e657e41b51 100644 --- a/sys/kern/kern_poll.c +++ b/sys/kern/kern_poll.c @@ -23,10 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 766567453493..b6b56f40a1a9 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ktrace.h" #include "opt_kstack_pages.h" diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 0af90b8a7d57..6836954abd35 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -37,13 +37,15 @@ * SUCH DAMAGE. * * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 - * $FreeBSD$ */ /* * System calls related to processes and protection */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" #include "opt_mac.h" diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index 196aeee40896..c9341bbe917c 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)kern_resource.c 8.5 (Berkeley) 1/21/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" #include diff --git a/sys/kern/kern_sema.c b/sys/kern/kern_sema.c index 61435bddcb47..0ee350a84e9c 100644 --- a/sys/kern/kern_sema.c +++ b/sys/kern/kern_sema.c @@ -23,8 +23,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. - * - * $FreeBSD$ */ /* @@ -35,6 +33,9 @@ * upon in combination with semaphores. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index abcf113309fe..714e744ae57d 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ddb.h" #include "opt_ddb_trace.h" #include "opt_ddb_unattended.h" diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 6126f5f7ccb0..4a7156749be1 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" #include "opt_ktrace.h" diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index 1962eaded1e2..769dd1dbccb2 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_zero.h" #include diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c index 873e8d27d405..f25a8daebb5f 100644 --- a/sys/kern/kern_switch.c +++ b/sys/kern/kern_switch.c @@ -22,12 +22,9 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /*** - Here is the logic.. If there are N processors, then there are at most N KSEs (kernel @@ -86,8 +83,10 @@ The result of this scheme is that the M available KSEs are always queued at the priorities they have inherrited from the M highest priority threads for that KSEGROUP. If this situation changes, the KSEs are reassigned to keep this true. - -*/ +***/ + +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index 2f69a0094e89..7db9e723a222 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -23,8 +23,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. - * - * $FreeBSD$ */ /* @@ -35,6 +33,9 @@ * so should not be relied upon in combination with sx locks. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index c64864ef142e..0142fad62f39 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ddb.h" #include "opt_ktrace.h" #ifdef __i386__ diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c index 2867bc920e9d..3f8a38b37f0c 100644 --- a/sys/kern/kern_syscalls.c +++ b/sys/kern/kern_syscalls.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index ab585e182db9..9195e4363695 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -37,9 +37,11 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" #include "opt_mac.h" diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 87ec87dc2156..f74777bf8b10 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -5,10 +5,11 @@ * can do whatever you want with this stuff. If we meet some day, and you think * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ntp.h" #include diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index dc991aa7e2be..dcc084785c77 100644 --- a/sys/kern/kern_thr.c +++ b/sys/kern/kern_thr.c @@ -22,11 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - * */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 4c2f592ea42f..367f97b77df7 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -24,10 +24,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index 772edc387af9..96ed21c2c2f2 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)kern_time.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 8d4be83cbef3..d789476f2598 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * From: @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index dcaddf996101..b13772cd801b 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -22,11 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - * */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_uuid.c b/sys/kern/kern_uuid.c index 337d33bffb1e..0ff5bd5e310f 100644 --- a/sys/kern/kern_uuid.c +++ b/sys/kern/kern_uuid.c @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index 3c95b7877e78..f3d81544c184 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)kern_xxx.c 8.2 (Berkeley) 11/14/93 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" #include diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 31a6c79f00fa..015d5ba7c939 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ddb.h" #include "opt_mac.h" diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 31a6c79f00fa..015d5ba7c939 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ddb.h" #include "opt_mac.h" diff --git a/sys/kern/md4c.c b/sys/kern/md4c.c index e3a0bfa9c497..69ff8e8e8622 100644 --- a/sys/kern/md4c.c +++ b/sys/kern/md4c.c @@ -1,5 +1,4 @@ /* MD4C.C - RSA Data Security, Inc., MD4 message-digest algorithm - * $FreeBSD$ */ /* Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved. @@ -23,6 +22,9 @@ documentation and/or software. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index 9ba03bfc3531..fa8f62746f0a 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -34,10 +34,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index defe98166b1e..72bf3d3ffeb4 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_acl_posix1e.c b/sys/kern/subr_acl_posix1e.c index 6b9f942ff54b..d1bce92f7136 100644 --- a/sys/kern/subr_acl_posix1e.c +++ b/sys/kern/subr_acl_posix1e.c @@ -24,14 +24,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * Developed by the TrustedBSD Project. * Support for POSIX.1e access control lists. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c index 5132e024a12e..34c60bcae97b 100644 --- a/sys/kern/subr_autoconf.c +++ b/sys/kern/subr_autoconf.c @@ -41,9 +41,11 @@ * * @(#)subr_autoconf.c 8.1 (Berkeley) 6/10/93 * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c index a58e548401fe..a1ecea99f93e 100644 --- a/sys/kern/subr_blist.c +++ b/sys/kern/subr_blist.c @@ -1,4 +1,3 @@ - /* * BLIST.C - Bitmap allocator/deallocator, using a radix tree with hinting * @@ -59,10 +58,11 @@ * ranges. * * This code can be compiled stand-alone for debugging. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #ifdef _KERNEL #include diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 740066e70056..daabd8dcf8a4 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_bus.h" #include diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c index 165f628e256f..cc4b32aa3cf2 100644 --- a/sys/kern/subr_clist.c +++ b/sys/kern/subr_clist.c @@ -23,14 +23,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * clist support routines */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_clock.c b/sys/kern/subr_clock.c index 19df90d75c19..cc2686093001 100644 --- a/sys/kern/subr_clock.c +++ b/sys/kern/subr_clock.c @@ -40,8 +40,6 @@ * from: NetBSD: clock_subr.c,v 1.6 2001/07/07 17:04:02 thorpej Exp * and * from: src/sys/i386/isa/clock.c,v 1.176 2001/09/04 - * - * $FreeBSD$ */ /* @@ -58,6 +56,10 @@ * (seconds since 1/1/1970) and yr/mo/day/hr/min/sec * Derived from NetBSD arch/hp300/hp300/clock.c */ + +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c index 978fa6b48785..f7a52ffebaef 100644 --- a/sys/kern/subr_devstat.c +++ b/sys/kern/subr_devstat.c @@ -24,10 +24,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index d2b7935b3eb8..47ed36e456ea 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -5,11 +5,11 @@ * can do whatever you want with this stuff. If we meet some day, and you think * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- - * - * $FreeBSD$ - * */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_geom.h" #include diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c index a56f1e4f3c6f..b1c6f65e3565 100644 --- a/sys/kern/subr_eventhandler.c +++ b/sys/kern/subr_eventhandler.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_hints.c b/sys/kern/subr_hints.c index c68d60727b90..93a1391bddab 100644 --- a/sys/kern/subr_hints.c +++ b/sys/kern/subr_hints.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c index b5bfa1f4ca69..c02662a095cb 100644 --- a/sys/kern/subr_kobj.c +++ b/sys/kern/subr_kobj.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index 97644c138859..229529acbe70 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -31,13 +31,15 @@ * SUCH DAMAGE. * * @(#)subr_log.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD$ */ /* * Error log buffer for kernel printf's. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_mbuf.c b/sys/kern/subr_mbuf.c index c7714ae66695..1ab92409efe3 100644 --- a/sys/kern/subr_mbuf.c +++ b/sys/kern/subr_mbuf.c @@ -24,10 +24,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include "opt_param.h" diff --git a/sys/kern/subr_mchain.c b/sys/kern/subr_mchain.c index c998a23c1b43..0911fa35e66c 100644 --- a/sys/kern/subr_mchain.c +++ b/sys/kern/subr_mchain.c @@ -28,10 +28,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c index ce74eca99d20..1517129c81a1 100644 --- a/sys/kern/subr_module.c +++ b/sys/kern/subr_module.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index 5055c7c1a49e..7d048a4dd622 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)param.c 8.3 (Berkeley) 8/20/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_param.h" #include "opt_maxusers.h" diff --git a/sys/kern/subr_pcpu.c b/sys/kern/subr_pcpu.c index 132e95780fcb..b7fcc60d5cdb 100644 --- a/sys/kern/subr_pcpu.c +++ b/sys/kern/subr_pcpu.c @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* @@ -44,6 +42,9 @@ * sole CPU as 0. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ddb.h" #include diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c index d5d823d1e375..5ab03ad8ed80 100644 --- a/sys/kern/subr_power.c +++ b/sys/kern/subr_power.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 641ed7201d4f..ed2c28030e61 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)subr_prf.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ddb.h" #include diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index 1ef54c7d8269..b31e516bcc86 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)subr_prof.c 8.3 (Berkeley) 9/23/93 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c index 714dd9eabf73..b068af31687a 100644 --- a/sys/kern/subr_rman.c +++ b/sys/kern/subr_rman.c @@ -25,8 +25,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* @@ -57,6 +55,9 @@ * permitted. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_rtc.c b/sys/kern/subr_rtc.c index 19df90d75c19..cc2686093001 100644 --- a/sys/kern/subr_rtc.c +++ b/sys/kern/subr_rtc.c @@ -40,8 +40,6 @@ * from: NetBSD: clock_subr.c,v 1.6 2001/07/07 17:04:02 thorpej Exp * and * from: src/sys/i386/isa/clock.c,v 1.176 2001/09/04 - * - * $FreeBSD$ */ /* @@ -58,6 +56,10 @@ * (seconds since 1/1/1970) and yr/mo/day/hr/min/sec * Derived from NetBSD arch/hp300/hp300/clock.c */ + +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c index 80947a454bc0..f3e7b68dc830 100644 --- a/sys/kern/subr_sbuf.c +++ b/sys/kern/subr_sbuf.c @@ -24,10 +24,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #ifdef _KERNEL diff --git a/sys/kern/subr_scanf.c b/sys/kern/subr_scanf.c index 675f14565260..9d0c38669755 100644 --- a/sys/kern/subr_scanf.c +++ b/sys/kern/subr_scanf.c @@ -33,12 +33,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ * From: Id: vfscanf.c,v 1.13 1998/09/25 12:20:27 obrien Exp * From: static char sccsid[] = "@(#)strtol.c 8.1 (Berkeley) 6/4/93"; * From: static char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93"; */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 897e0f0bb213..9b91d6ac1182 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -25,8 +25,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ /* @@ -34,6 +32,9 @@ * used for the kernel SMP support. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c index 8cccc8d61593..fa32be622331 100644 --- a/sys/kern/subr_taskqueue.c +++ b/sys/kern/subr_taskqueue.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 9eaa5b80307b..15bc58f4f113 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -35,9 +35,11 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #ifdef __i386__ #include "opt_npx.h" diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c index a139d53b9f14..fb7b88f2950e 100644 --- a/sys/kern/subr_turnstile.c +++ b/sys/kern/subr_turnstile.c @@ -27,13 +27,15 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD$ */ /* * Machine independent bits of mutex implementation. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_adaptive_mutexes.h" #include "opt_ddb.h" diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index 30188278434c..48b6a1393394 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -27,7 +27,6 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD$ */ /* @@ -82,6 +81,9 @@ * will not result in a lock order reversal. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ddb.h" #include "opt_witness.h" #ifdef __i386__ diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c index ce92a9b5c28f..186cc0b9e9f4 100644 --- a/sys/kern/subr_xxx.c +++ b/sys/kern/subr_xxx.c @@ -31,12 +31,15 @@ * SUCH DAMAGE. * * @(#)subr_xxx.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD$ */ /* * Miscellaneous trivial functions. */ + +#include +__FBSDID("$FreeBSD$"); + #include #include diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 98506f39a3d3..0f3e3a93f0b0 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)sys_generic.c 8.5 (Berkeley) 1/21/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ktrace.h" #include diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 3cbd65afb691..4f62e9206d4b 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -15,8 +15,6 @@ * John S. Dyson. * 4. Modifications may be freely made to this file if the above conditions * are met. - * - * $FreeBSD$ */ /* @@ -49,6 +47,9 @@ * amount of kernel virtual memory. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index c281cee6fe9c..89bd35b7285f 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -27,10 +27,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 9eb7d8bf43d5..7fe1b86006e0 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)sys_socket.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c index bf91258fb15d..cc8531dcbab6 100644 --- a/sys/kern/sysv_ipc.c +++ b/sys/kern/sysv_ipc.c @@ -1,6 +1,4 @@ -/* $FreeBSD$ */ /* $NetBSD: sysv_ipc.c,v 1.7 1994/06/29 06:33:11 cgd Exp $ */ - /* * Copyright (c) 1994 Herb Peyerl * All rights reserved. @@ -31,6 +29,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_sysvipc.h" #include diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index 47e629c3b246..51a0c5c39c0e 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -1,5 +1,3 @@ -/* $FreeBSD$ */ - /* * Implementation of SVID messages * @@ -19,6 +17,9 @@ * This software is provided ``AS IS'' without any warranties of any kind. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_sysvipc.h" #include diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index bf1eae3bf664..58e502d39a36 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -1,5 +1,3 @@ -/* $FreeBSD$ */ - /* * Implementation of SVID semaphores * @@ -8,6 +6,9 @@ * This software is provided ``AS IS'' without any warranties of any kind. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_sysvipc.h" #include diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 3600ebe8bdca..4077b6b13d7f 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,6 +1,4 @@ -/* $FreeBSD$ */ /* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */ - /* * Copyright (c) 1994 Adam Glass and Charles Hannum. All rights reserved. * @@ -31,6 +29,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" #include "opt_sysvipc.h" diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 2367cd34b766..685c13d0cb51 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -44,7 +44,6 @@ * SUCH DAMAGE. * * @(#)tty.c 8.8 (Berkeley) 1/21/94 - * $FreeBSD$ */ /*- @@ -75,6 +74,9 @@ * only when _all_ openers leave open(). */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" #include "opt_tty.h" diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c index 01628ff29267..25b4d341b1e5 100644 --- a/sys/kern/tty_compat.c +++ b/sys/kern/tty_compat.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)tty_compat.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" /* diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c index 0609dc92b22a..c7b52ed655d1 100644 --- a/sys/kern/tty_conf.c +++ b/sys/kern/tty_conf.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)tty_conf.c 8.4 (Berkeley) 1/21/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" #include diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index 47fffa3f0d22..fe723e691bf9 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ddb.h" #include diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index ef914df358c1..ee2fead310d5 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)tty_pty.c 8.4 (Berkeley) 2/20/95 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + /* * Pseudo-teletype Driver * (Actually two drivers, requiring two entries in 'cdevsw') diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c index 165f628e256f..cc4b32aa3cf2 100644 --- a/sys/kern/tty_subr.c +++ b/sys/kern/tty_subr.c @@ -23,14 +23,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * clist support routines */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c index cdeaa41a0fd5..2b3b76a3f48f 100644 --- a/sys/kern/tty_tty.c +++ b/sys/kern/tty_tty.c @@ -21,10 +21,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/uipc_accf.c b/sys/kern/uipc_accf.c index b31026af3b68..a8d4f63f1c35 100644 --- a/sys/kern/uipc_accf.c +++ b/sys/kern/uipc_accf.c @@ -23,10 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #define ACCEPT_FILTER_MOD #include "opt_param.h" diff --git a/sys/kern/uipc_cow.c b/sys/kern/uipc_cow.c index 561167247ec8..88d0f9f80cd9 100644 --- a/sys/kern/uipc_cow.c +++ b/sys/kern/uipc_cow.c @@ -28,14 +28,16 @@ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ + /* * This is a set of routines for enabling and disabling copy on write * protection for data written into sockets. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index ee1e1e086f7c..0fa21aca4b94 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)uipc_domain.c 8.2 (Berkeley) 10/18/93 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/uipc_jumbo.c b/sys/kern/uipc_jumbo.c index 7c70539cdfe2..0956a86c8e9e 100644 --- a/sys/kern/uipc_jumbo.c +++ b/sys/kern/uipc_jumbo.c @@ -28,15 +28,17 @@ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ + /* * This is a set of routines for allocating large-sized mbuf payload * areas, and is primarily intended for use in receive side mbuf * allocation. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 8810358ed9c3..6cfa22dadd76 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include "opt_param.h" #include "opt_mbuf_stress_test.h" diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c index 000bb243db41..215fc68658ca 100644 --- a/sys/kern/uipc_mbuf2.c +++ b/sys/kern/uipc_mbuf2.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $KAME: uipc_mbuf2.c,v 1.31 2001/11/28 11:08:53 itojun Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.40 1999/04/01 00:23:25 thorpej Exp $ */ @@ -30,7 +29,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - /* * Copyright (c) 1982, 1986, 1988, 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -66,6 +64,9 @@ * @(#)uipc_mbuf.c 8.4 (Berkeley) 2/14/95 */ +#include +__FBSDID("$FreeBSD$"); + /*#define PULLDOWN_DEBUG*/ #include "opt_mac.h" diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c index 74dab7864a9a..948f5cab8c90 100644 --- a/sys/kern/uipc_proto.c +++ b/sys/kern/uipc_proto.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)uipc_proto.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c index 9f5962618fd5..81a12398d23d 100644 --- a/sys/kern/uipc_sem.c +++ b/sys/kern/uipc_sem.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_posix.h" #include diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index e2a125f2c0d2..b0d366a4dcf0 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include "opt_param.h" diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index f50f59f502ac..1d79246080d0 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_inet.h" #include "opt_mac.h" #include "opt_zero.h" diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index e2a125f2c0d2..b0d366a4dcf0 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include "opt_param.h" diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 1df7853c4cae..aa687eb661dc 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -34,9 +34,11 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" #include "opt_ktrace.h" #include "opt_mac.h" diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index fd6e0641fcfc..fec40504bf81 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c index 6b9f942ff54b..d1bce92f7136 100644 --- a/sys/kern/vfs_acl.c +++ b/sys/kern/vfs_acl.c @@ -24,14 +24,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * Developed by the TrustedBSD Project. * Support for POSIX.1e access control lists. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index f9a3fbe26235..8795e415ec88 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -12,14 +12,15 @@ * DISCLAIMER: This code isn't warranted to do anything useful. Anything * bad that happens because of using this software isn't the responsibility * of the author. This software is distributed AS-IS. - * - * $FreeBSD$ */ /* * This file contains support for the POSIX 1003.1B AIO/LIO facility. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index e1c0f9eb9413..bcc3897f7dc8 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -10,8 +10,6 @@ * this list of conditions, and the following disclaimer. * 2. Absolutely no warranty of function or purpose is made by the author * John S. Dyson. - * - * $FreeBSD$ */ /* @@ -27,6 +25,9 @@ * see man buf(9) for more info. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index cac844e4269d..57e45a026746 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -34,9 +34,11 @@ * SUCH DAMAGE. * * @(#)vfs_cache.c 8.5 (Berkeley) 3/22/95 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 72e80d63ece7..ad0b55dd2c0a 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -33,9 +33,11 @@ * SUCH DAMAGE. * * @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_debug_cluster.h" #include diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 6587752f2817..87faee89be4f 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -34,11 +34,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index b909b8304246..b1a536b4dcde 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index fed094c2df39..2d123efad751 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + /* For 4.3 integer FS ID compatibility */ #include "opt_compat.h" #include "opt_mac.h" diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index b221cd3aa3cb..8fceb392bbf5 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -36,9 +36,10 @@ * SUCH DAMAGE. * * @(#)vfs_init.c 8.3 (Berkeley) 1/4/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index f064b6460ad9..e8b2b20361c2 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)vfs_lookup.c 8.4 (Berkeley) 2/16/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_ktrace.h" #include "opt_mac.h" diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index f9cc52a3762f..02997c3d1ca1 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -60,10 +60,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 1608cde18ccb..cf0f0fb9f918 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -36,12 +36,15 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD$ */ /* * External virtual filesystem routines */ + +#include +__FBSDID("$FreeBSD$"); + #include "opt_ddb.h" #include "opt_mac.h" diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index fed094c2df39..2d123efad751 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + /* For 4.3 integer FS ID compatibility */ #include "opt_compat.h" #include "opt_mac.h" diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 8048ecbc7255..e1b4379383e7 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index fb06edea3012..e5e25dc520c1 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -32,16 +32,16 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ + /* - * Developed by the TrustedBSD Project. - * * Framework for extensible kernel access control. Kernel and userland * interface to the framework, policy registration and composition. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include "opt_devfs.h" diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index fb06edea3012..e5e25dc520c1 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -32,16 +32,16 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ + /* - * Developed by the TrustedBSD Project. - * * Framework for extensible kernel access control. Kernel and userland * interface to the framework, policy registration and composition. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include "opt_devfs.h" diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c index fb06edea3012..e5e25dc520c1 100644 --- a/sys/security/mac/mac_net.c +++ b/sys/security/mac/mac_net.c @@ -32,16 +32,16 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ + /* - * Developed by the TrustedBSD Project. - * * Framework for extensible kernel access control. Kernel and userland * interface to the framework, policy registration and composition. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include "opt_devfs.h" diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c index fb06edea3012..e5e25dc520c1 100644 --- a/sys/security/mac/mac_pipe.c +++ b/sys/security/mac/mac_pipe.c @@ -32,16 +32,16 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ + /* - * Developed by the TrustedBSD Project. - * * Framework for extensible kernel access control. Kernel and userland * interface to the framework, policy registration and composition. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include "opt_devfs.h" diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c index fb06edea3012..e5e25dc520c1 100644 --- a/sys/security/mac/mac_process.c +++ b/sys/security/mac/mac_process.c @@ -32,16 +32,16 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ + /* - * Developed by the TrustedBSD Project. - * * Framework for extensible kernel access control. Kernel and userland * interface to the framework, policy registration and composition. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include "opt_devfs.h" diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index fb06edea3012..e5e25dc520c1 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -32,16 +32,16 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ + /* - * Developed by the TrustedBSD Project. - * * Framework for extensible kernel access control. Kernel and userland * interface to the framework, policy registration and composition. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include "opt_devfs.h" diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c index fb06edea3012..e5e25dc520c1 100644 --- a/sys/security/mac/mac_system.c +++ b/sys/security/mac/mac_system.c @@ -32,16 +32,16 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ + /* - * Developed by the TrustedBSD Project. - * * Framework for extensible kernel access control. Kernel and userland * interface to the framework, policy registration and composition. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include "opt_devfs.h" diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c index fb06edea3012..e5e25dc520c1 100644 --- a/sys/security/mac/mac_vfs.c +++ b/sys/security/mac/mac_vfs.c @@ -32,16 +32,16 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ + /* - * Developed by the TrustedBSD Project. - * * Framework for extensible kernel access control. Kernel and userland * interface to the framework, policy registration and composition. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include "opt_devfs.h"