Remove FBSDID.

ok deraadt@

21 files changed, 21 insertions, 97 deletions

diff --git a/lib/libc/arch/amd64/sys/tfork_thread.S b/lib/libc/arch/amd64/sys/tfork_thread.S
index 3477228a40b..84cf0ca790d 100644
--- a/lib/libc/arch/amd64/sys/tfork_thread.S
+++ b/lib/libc/arch/amd64/sys/tfork_thread.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tfork_thread.S,v 1.6 2016/05/07 19:05:21 guenther Exp $ */
+/*	$OpenBSD: tfork_thread.S,v 1.7 2019/03/15 05:42:38 kevlo Exp $ */
 /*-
  * Copyright (c) 2000 Peter Wemm <peter@FreeBSD.org>
  * Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
@@ -27,9 +27,6 @@
  */
 
 #include <machine/asm.h>
-#if 0
-__FBSDID("$FreeBSD: /repoman/r/ncvs/src/lib/libc/amd64/gen/rfork_thread.S,v 1.1 2003/10/13 20:32:33 alc Exp $");
-#endif
 
 /*
  * With thanks to John Dyson for the original version of this.
diff --git a/lib/libc/arch/i386/sys/tfork_thread.S b/lib/libc/arch/i386/sys/tfork_thread.S
index 97a515f0ae8..f1f82c30d5b 100644
--- a/lib/libc/arch/i386/sys/tfork_thread.S
+++ b/lib/libc/arch/i386/sys/tfork_thread.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tfork_thread.S,v 1.8 2016/05/07 19:05:21 guenther Exp $ */
+/*	$OpenBSD: tfork_thread.S,v 1.9 2019/03/15 05:42:38 kevlo Exp $ */
 /*-
  * Copyright (c) 2000 Peter Wemm <peter@FreeBSD.org>
  * All rights reserved.
@@ -26,9 +26,6 @@
  */
 
 #include <machine/asm.h>
-#if 0
-__FBSDID("$FreeBSD: /repoman/r/ncvs/src/lib/libc/i386/gen/rfork_thread.S,v 1.5 2003/05/07 17:23:25 jhb Exp $");
-#endif
 
 /*
  * With thanks to John Dyson for the original version of this.
diff --git a/lib/libc/arch/sparc64/fpu/fpu_add.c b/lib/libc/arch/sparc64/fpu/fpu_add.c
index dbc820f0240..4fc70e0cbde 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_add.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_add.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_add.c,v 1.2 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: fpu_add.c,v 1.3 2019/03/15 05:42:38 kevlo Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,10 +45,6 @@
  *	$NetBSD: fpu_add.c,v 1.3 1996/03/14 19:41:52 christos Exp $
  */
 
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_add.c,v 1.4 2002/04/27 21:56:28 jake Exp $");
-#endif
-
 /*
  * Perform an FPU add (return x + y).
  *
diff --git a/lib/libc/arch/sparc64/fpu/fpu_compare.c b/lib/libc/arch/sparc64/fpu/fpu_compare.c
index d6bac29c0d0..d5521f0aa85 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_compare.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_compare.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_compare.c,v 1.2 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: fpu_compare.c,v 1.3 2019/03/15 05:42:38 kevlo Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,10 +45,6 @@
  *	$NetBSD: fpu_compare.c,v 1.3 2001/08/26 05:46:31 eeh Exp $
  */
 
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_compare.c,v 1.4 2002/03/22 21:52:58 obrien Exp $");
-#endif
-
 /*
  * CMP and CMPE instructions.
  *
diff --git a/lib/libc/arch/sparc64/fpu/fpu_div.c b/lib/libc/arch/sparc64/fpu/fpu_div.c
index 197ac15b1bd..e86369bf2b9 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_div.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_div.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_div.c,v 1.3 2013/11/26 20:33:07 deraadt Exp $	*/
+/*	$OpenBSD: fpu_div.c,v 1.4 2019/03/15 05:42:38 kevlo Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,10 +45,6 @@
  *	$NetBSD: fpu_div.c,v 1.2 1994/11/20 20:52:38 deraadt Exp $
  */
 
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_div.c,v 1.3 2002/03/22 21:52:58 obrien Exp $");
-#endif
-
 /*
  * Perform an FPU divide (return x / y).
  */
diff --git a/lib/libc/arch/sparc64/fpu/fpu_explode.c b/lib/libc/arch/sparc64/fpu/fpu_explode.c
index 81418ac43f2..e16eff95ecd 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_explode.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_explode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_explode.c,v 1.8 2016/05/08 18:41:17 guenther Exp $	*/
+/*	$OpenBSD: fpu_explode.c,v 1.9 2019/03/15 05:42:38 kevlo Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,10 +45,6 @@
  *	$NetBSD: fpu_explode.c,v 1.5 2000/08/03 18:32:08 eeh Exp $
  */
 
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_explode.c,v 1.5 2002/05/11 21:20:04 jake Exp $");
-#endif
-
 /*
  * FPU subroutines: `explode' the machine's `packed binary' format numbers
  * into our internal format.
diff --git a/lib/libc/arch/sparc64/fpu/fpu_implode.c b/lib/libc/arch/sparc64/fpu/fpu_implode.c
index ce57a84e954..98118a937a1 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_implode.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_implode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_implode.c,v 1.5 2015/11/15 22:41:43 guenther Exp $	*/
+/*	$OpenBSD: fpu_implode.c,v 1.6 2019/03/15 05:42:38 kevlo Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,10 +45,6 @@
  *	$NetBSD: fpu_implode.c,v 1.8 2001/08/26 05:44:46 eeh Exp $
  */
 
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_implode.c,v 1.5 2002/04/27 21:56:28 jake Exp $");
-#endif
-
 /*
  * FPU subroutines: `implode' internal format numbers into the machine's
  * `packed binary' format.
diff --git a/lib/libc/arch/sparc64/fpu/fpu_mul.c b/lib/libc/arch/sparc64/fpu/fpu_mul.c
index 7dbc24f113e..6f2092d385c 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_mul.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_mul.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_mul.c,v 1.2 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: fpu_mul.c,v 1.3 2019/03/15 05:42:38 kevlo Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,10 +45,6 @@
  *	$NetBSD: fpu_mul.c,v 1.2 1994/11/20 20:52:44 deraadt Exp $
  */
 
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_mul.c,v 1.3 2002/03/22 21:52:58 obrien Exp $");
-#endif
-
 /*
  * Perform an FPU multiply (return x * y).
  */
diff --git a/lib/libc/arch/sparc64/fpu/fpu_qp.c b/lib/libc/arch/sparc64/fpu/fpu_qp.c
index c9c34499aaa..8c7a088b007 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_qp.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_qp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_qp.c,v 1.6 2016/05/08 18:41:17 guenther Exp $	*/
+/*	$OpenBSD: fpu_qp.c,v 1.7 2019/03/15 05:42:38 kevlo Exp $	*/
 
 /*-
  * Copyright (c) 2002 Jake Burkholder.
@@ -26,10 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.3 2002/09/02 02:30:20 jake Exp $");
-#endif
-
 #include <sys/types.h>
 #include <machine/fsr.h>
 
diff --git a/lib/libc/arch/sparc64/fpu/fpu_sqrt.c b/lib/libc/arch/sparc64/fpu/fpu_sqrt.c
index 5318f2dac0a..7de1f1adbf8 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_sqrt.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_sqrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_sqrt.c,v 1.4 2014/09/12 22:04:18 kettenis Exp $	*/
+/*	$OpenBSD: fpu_sqrt.c,v 1.5 2019/03/15 05:42:38 kevlo Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,10 +45,6 @@
  *	$NetBSD: fpu_sqrt.c,v 1.2 1994/11/20 20:52:46 deraadt Exp $
  */
 
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_sqrt.c,v 1.3 2002/03/22 21:52:58 obrien Exp $");
-#endif
-
 /*
  * Perform an FPU square root (return sqrt(x)).
  */
diff --git a/lib/libc/arch/sparc64/fpu/fpu_subr.c b/lib/libc/arch/sparc64/fpu/fpu_subr.c
index a3560336637..8e06eacb788 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_subr.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_subr.c,v 1.2 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: fpu_subr.c,v 1.3 2019/03/15 05:42:38 kevlo Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,10 +45,6 @@
  *	$NetBSD: fpu_subr.c,v 1.3 1996/03/14 19:42:01 christos Exp $
  */
 
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_subr.c,v 1.4 2002/04/27 21:56:28 jake Exp $");
-#endif
-
 /*
  * FPU subroutines.
  */
diff --git a/lib/libm/src/s_lrintl.c b/lib/libm/src/s_lrintl.c
index 6c8fd6b31af..62b3155c2b5 100644
--- a/lib/libm/src/s_lrintl.c
+++ b/lib/libm/src/s_lrintl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_lrintl.c,v 1.2 2012/12/05 23:20:04 deraadt Exp $	*/
+/*	$OpenBSD: s_lrintl.c,v 1.3 2019/03/15 05:42:38 kevlo Exp $	*/
 
 /*-
  * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
@@ -30,9 +30,6 @@
 #include <math.h>
 
 #ifndef type
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_lrint.c,v 1.1 2005/01/11 23:12:55 das Exp $");
-#endif
 #define type		long double
 #define	roundit		rintl
 #define dtype		long
diff --git a/lib/libm/src/s_lroundl.c b/lib/libm/src/s_lroundl.c
index a82c7d3e900..d0264b31327 100644
--- a/lib/libm/src/s_lroundl.c
+++ b/lib/libm/src/s_lroundl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_lroundl.c,v 1.2 2012/12/05 23:20:04 deraadt Exp $	*/
+/*	$OpenBSD: s_lroundl.c,v 1.3 2019/03/15 05:42:38 kevlo Exp $	*/
 
 /*-
  * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
@@ -31,9 +31,6 @@
 #include <math.h>
 
 #ifndef type
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_lround.c,v 1.2 2005/04/08 00:52:16 das Exp $");
-#endif
 #define type		long double
 #define	roundit		roundl
 #define dtype		long
diff --git a/sys/arch/arm64/arm64/cpufunc_asm.S b/sys/arch/arm64/arm64/cpufunc_asm.S
index 44c5272a48c..b36dbc94465 100644
--- a/sys/arch/arm64/arm64/cpufunc_asm.S
+++ b/sys/arch/arm64/arm64/cpufunc_asm.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpufunc_asm.S,v 1.5 2018/08/12 17:15:10 mortimer Exp $ */
+/* $OpenBSD: cpufunc_asm.S,v 1.6 2019/03/15 05:42:38 kevlo Exp $ */
 /*-
  * Copyright (c) 2014 Robin Randhawa
  * Copyright (c) 2015 The FreeBSD Foundation
@@ -27,12 +27,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.
- *
  */
 
 #include <machine/asm.h>
 #include <machine/param.h>
-//__FBSDID("$FreeBSD: head/sys/arm64/arm64/cpufunc_asm.S 305546 2016-09-07 16:46:54Z andrew $");
 
 /*
  * FIXME:
diff --git a/sys/arch/arm64/arm64/exception.S b/sys/arch/arm64/arm64/exception.S
index ee8b7454ed8..682066b5eb1 100644
--- a/sys/arch/arm64/arm64/exception.S
+++ b/sys/arch/arm64/arm64/exception.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: exception.S,v 1.8 2018/08/03 18:36:01 kettenis Exp $ */
+/* $OpenBSD: exception.S,v 1.9 2019/03/15 05:42:38 kevlo Exp $ */
 /*-
  * Copyright (c) 2014 Andrew Turner
  * All rights reserved.
@@ -23,14 +23,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.
- *
  */
 
 #include <machine/asm.h>
-#if 0
-__FBSDID("$FreeBSD: head/sys/arm64/arm64/exception.S 297028 2016-03-18 16:18:29Z andrew $");
-#endif
-
 #include <machine/armreg.h>
 
 #include "assym.h"
diff --git a/sys/arch/arm64/arm64/support.S b/sys/arch/arm64/arm64/support.S
index da4dbb74583..a08d11d64c4 100644
--- a/sys/arch/arm64/arm64/support.S
+++ b/sys/arch/arm64/arm64/support.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: support.S,v 1.8 2018/09/07 01:32:01 mortimer Exp $ */
+/* $OpenBSD: support.S,v 1.9 2019/03/15 05:42:38 kevlo Exp $ */
 /*-
  * Copyright (c) 2014 Andrew Turner
  * Copyright (c) 2014-2015 The FreeBSD Foundation
@@ -27,13 +27,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.
- *
  */
 
 #include <machine/asm.h>
-#if 0
-__FBSDID("$FreeBSD: head/sys/arm64/arm64/support.S 297615 2016-04-06 14:08:10Z andrew $");
-#endif
 
 #include <machine/setjmp.h>
 #include <machine/param.h>
diff --git a/sys/arch/arm64/arm64/trap.c b/sys/arch/arm64/arm64/trap.c
index d36e91b049c..893d5ad388b 100644
--- a/sys/arch/arm64/arm64/trap.c
+++ b/sys/arch/arm64/arm64/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.21 2018/10/08 15:57:53 kettenis Exp $ */
+/* $OpenBSD: trap.c,v 1.22 2019/03/15 05:42:38 kevlo Exp $ */
 /*-
  * Copyright (c) 2014 Andrew Turner
  * All rights reserved.
@@ -23,13 +23,8 @@
  * 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.
- *
  */
 
-#if 0
-__FBSDID("$FreeBSD: head/sys/arm64/arm64/trap.c 281654 2015-04-17 12:58:09Z andrew $");
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/pci/if_bnxt.c b/sys/dev/pci/if_bnxt.c
index cd27eaf5ade..23604b8dce4 100644
--- a/sys/dev/pci/if_bnxt.c
+++ b/sys/dev/pci/if_bnxt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bnxt.c,v 1.18 2019/01/22 02:04:30 jmatthew Exp $	*/
+/*	$OpenBSD: if_bnxt.c,v 1.19 2019/03/15 05:42:38 kevlo Exp $	*/
 /*-
  * Broadcom NetXtreme-C/E network driver.
  *
@@ -62,7 +62,6 @@
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
-#define __FBSDID(x)
 #include <dev/pci/if_bnxtreg.h>
 
 #include <net/if.h>
diff --git a/sys/dev/pci/if_bnxtreg.h b/sys/dev/pci/if_bnxtreg.h
index ba03c933e3a..ffd95870340 100644
--- a/sys/dev/pci/if_bnxtreg.h
+++ b/sys/dev/pci/if_bnxtreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bnxtreg.h,v 1.1 2018/07/09 10:46:15 jmatthew Exp $	*/
+/*	$OpenBSD: if_bnxtreg.h,v 1.2 2019/03/15 05:42:38 kevlo Exp $	*/
 /*-
  *   BSD LICENSE
  *
@@ -28,9 +28,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/bnxt/hsi_struct_def.h 323233 2017-09-06 20:19:30Z shurd $");
-
 /****************************************************************************
  *
  * Description: Definition of HSI data structures
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index 3b7f0cd852e..6105f9b01dd 100644
--- a/sys/kern/subr_witness.c
+++ b/sys/kern/subr_witness.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_witness.c,v 1.29 2019/02/07 15:11:38 visa Exp $	*/
+/*	$OpenBSD: subr_witness.c,v 1.30 2019/03/15 05:42:38 kevlo Exp $	*/
 
 /*-
  * Copyright (c) 2008 Isilon Systems, Inc.
@@ -86,10 +86,6 @@
  * will not result in a lock order reversal.
  */
 
-#if 0
-__FBSDID("$FreeBSD: head/sys/kern/subr_witness.c 313261 2017-02-05 02:27:04Z markj $");
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c
index 720ebc4604c..664e61fe0d5 100644
--- a/sys/ufs/ufs/ufs_dirhash.c
+++ b/sys/ufs/ufs/ufs_dirhash.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_dirhash.c,v 1.41 2019/03/06 00:34:08 tedu Exp $	*/
+/* $OpenBSD: ufs_dirhash.c,v 1.42 2019/03/15 05:42:38 kevlo Exp $	*/
 /*
  * Copyright (c) 2001, 2002 Ian Dowse.  All rights reserved.
  *
@@ -28,10 +28,6 @@
  * This implements a hash-based lookup scheme for UFS directories.
  */
 
-#if 0
-__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_dirhash.c,v 1.18 2004/02/15 21:39:35 dwmalone Exp $");
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>