Use __FBSDID().

16 files changed, 48 insertions, 155 deletions

diff --git a/sys/netatm/atm_aal5.c b/sys/netatm/atm_aal5.c
index ab6a95a..9c11b93 100644
--- a/sys/netatm/atm_aal5.c
+++ b/sys/netatm/atm_aal5.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -----------------
  *
  * ATM AAL5 socket protocol processing
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/protosw.h>
@@ -56,10 +54,6 @@
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 
 /*
  * Global variables
diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index b101abf..aeb32ca 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -----------------
  *
  * ATM Connection Manager
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
@@ -56,11 +54,6 @@
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Global variables
  */
diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c
index cc2a2a8..34d4ffb 100644
--- a/sys/netatm/atm_device.c
+++ b/sys/netatm/atm_device.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -----------------
  *
  * ATM device support functions
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
@@ -56,11 +54,6 @@
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Private structures for managing allocated kernel memory resources
  *
diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c
index 69c9082..14bc094 100644
--- a/sys/netatm/atm_if.c
+++ b/sys/netatm/atm_if.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -----------------
  *
  * ATM interface management
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -61,11 +59,6 @@
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/atm_proto.c b/sys/netatm/atm_proto.c
index 79a70cc..da9ef0f 100644
--- a/sys/netatm/atm_proto.c
+++ b/sys/netatm/atm_proto.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -----------------
  *
  * ATM socket protocol family support definitions
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/domain.h>
@@ -52,11 +50,6 @@
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 struct protosw atmsw[] = {
 {	SOCK_DGRAM,				/* ioctl()-only */
 	&atmdomain,
diff --git a/sys/netatm/atm_signal.c b/sys/netatm/atm_signal.c
index 9ed1064..1ff5e7f 100644
--- a/sys/netatm/atm_signal.c
+++ b/sys/netatm/atm_signal.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -----------------
  *
  * General ATM signalling management
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
@@ -52,10 +50,6 @@
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 
 /*
  * Local variables
diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c
index 6ff6abc..333c7d6 100644
--- a/sys/netatm/atm_socket.c
+++ b/sys/netatm/atm_socket.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -----------------
  *
  * ATM common socket protocol processing
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -54,10 +52,6 @@
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 
 /*
  * Local functions
diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c
index cd78aaf..4ee7e1a 100644
--- a/sys/netatm/atm_subr.c
+++ b/sys/netatm/atm_subr.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -----------------
  *
  * Miscellaneous ATM subroutines
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
@@ -57,11 +55,6 @@
 #include <netatm/atm_var.h>
 #include <vm/uma.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Global variables
  */
diff --git a/sys/netatm/atm_usrreq.c b/sys/netatm/atm_usrreq.c
index e050b6c..5a96ca6 100644
--- a/sys/netatm/atm_usrreq.c
+++ b/sys/netatm/atm_usrreq.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -----------------
  *
  * ATM DGRAM socket protocol processing
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -54,10 +52,6 @@
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 
 /*
  * Local functions
diff --git a/sys/netatm/ipatm/ipatm_event.c b/sys/netatm/ipatm/ipatm_event.c
index 5471ef2..7c68ca1 100644
--- a/sys/netatm/ipatm/ipatm_event.c
+++ b/sys/netatm/ipatm/ipatm_event.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -------------------
  *
  * IP VCC event handler
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -59,11 +57,6 @@
 #include <netatm/ipatm/ipatm_var.h>
 #include <netatm/ipatm/ipatm_serv.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Process an IP VCC timeout
  * 
diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index 49dbf48..08517c5 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -------------------
  *
  * Interface Manager
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -60,11 +58,6 @@
 #include <netatm/ipatm/ipatm_var.h>
 #include <netatm/ipatm/ipatm_serv.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/ipatm/ipatm_input.c b/sys/netatm/ipatm/ipatm_input.c
index 5be25e0..3f2eef6 100644
--- a/sys/netatm/ipatm/ipatm_input.c
+++ b/sys/netatm/ipatm/ipatm_input.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -------------------
  *
  * Process stack and data input
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
@@ -56,11 +54,6 @@
 
 #include <netatm/ipatm/ipatm_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Process VCC Input Data
  * 
diff --git a/sys/netatm/ipatm/ipatm_load.c b/sys/netatm/ipatm/ipatm_load.c
index 05e491a..3cab0c5a 100644
--- a/sys/netatm/ipatm/ipatm_load.c
+++ b/sys/netatm/ipatm/ipatm_load.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -------------------
  *
  * Support for running as a loadable kernel module
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #ifndef ATM_IP_MODULE
 #include "opt_atm.h"
 #endif
@@ -67,11 +65,6 @@
 
 #include <vm/uma.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Global variables
  */
diff --git a/sys/netatm/ipatm/ipatm_output.c b/sys/netatm/ipatm/ipatm_output.c
index be89be8..57ef6b3 100644
--- a/sys/netatm/ipatm/ipatm_output.c
+++ b/sys/netatm/ipatm/ipatm_output.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -------------------
  *
  * Output IP packets across an ATM VCC
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -59,11 +57,6 @@
 #include <netatm/ipatm/ipatm_var.h>
 #include <netatm/ipatm/ipatm_serv.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Output an IP Packet
  * 
diff --git a/sys/netatm/ipatm/ipatm_usrreq.c b/sys/netatm/ipatm/ipatm_usrreq.c
index 154f06b..df4721e 100644
--- a/sys/netatm/ipatm/ipatm_usrreq.c
+++ b/sys/netatm/ipatm/ipatm_usrreq.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -------------------
  *
  * Process user requests
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -60,11 +58,6 @@
 #include <netatm/ipatm/ipatm_var.h>
 #include <netatm/ipatm/ipatm_serv.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Process IP PF_ATM ioctls
  * 
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index 14cf7cc..35744cb 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * -------------------
  *
  * Virtual Channel Manager
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -61,10 +59,6 @@
 #include <netatm/ipatm/ipatm_var.h>
 #include <netatm/ipatm/ipatm_serv.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 
 Atm_attributes	ipatm_aal5llc = {
 	NULL,			/* nif */