From 4ae9ae8aed4819283291ac0efa7db22b89a65dc9 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Thu, 29 Jun 2017 17:36:17 +0000
Subject: kill RCSID macros; discussed with millert

---
 sys/arch/alpha/include/asm.h     | 21 +--------------------
 sys/arch/amd64/include/asm.h     |  6 +-----
 sys/arch/arm/include/asm.h       |  6 +-----
 sys/arch/arm64/include/asm.h     | 11 +----------
 sys/arch/i386/include/asm.h      |  6 +-----
 sys/arch/mips64/include/asm.h    |  6 +-----
 sys/arch/powerpc/include/asm.h   |  6 +-----
 sys/arch/sh/include/asm.h        |  5 +----
 sys/arch/sparc64/include/asm.h   |  7 +------
 sys/dev/ic/dwc_gmac.c            |  4 +---
 sys/dev/usb/dwc2/dwc2.c          |  7 +------
 sys/dev/usb/dwc2/dwc2_core.c     |  7 +------
 sys/dev/usb/dwc2/dwc2_coreintr.c |  7 +------
 sys/dev/usb/dwc2/dwc2_hcd.c      |  7 +------
 sys/dev/usb/dwc2/dwc2_hcdddma.c  |  6 +-----
 sys/dev/usb/dwc2/dwc2_hcdintr.c  |  6 +-----
 sys/dev/usb/dwc2/dwc2_hcdqueue.c |  7 +------
 17 files changed, 17 insertions(+), 108 deletions(-)

(limited to 'sys')

diff --git a/sys/arch/alpha/include/asm.h b/sys/arch/alpha/include/asm.h
index 409bce9ac00..c115cba4a97 100644
--- a/sys/arch/alpha/include/asm.h
+++ b/sys/arch/alpha/include/asm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm.h,v 1.13 2016/05/27 16:32:38 deraadt Exp $ */
+/* $OpenBSD: asm.h,v 1.14 2017/06/29 17:36:16 deraadt Exp $ */
 /* $NetBSD: asm.h,v 1.23 2000/06/23 12:18:45 kleink Exp $ */
 
 /* 
@@ -635,22 +635,3 @@ label:	ASCIZ msg;						\
 #define	WARN_REFERENCES(_sym,_msg)				\
 	.section .gnu.warning./**/_sym ; .ascii _msg ; .text
 #endif /* __STDC__ */
-
-/*
- * Kernel RCS ID tag and copyright macros
- */
-
-#ifdef _KERNEL
-
-#define	__KERNEL_SECTIONSTRING(_sec, _str)				\
-	.section _sec ; .asciz _str ; .text
-
-#define	__KERNEL_RCSID(_n, _s)		__KERNEL_SECTIONSTRING(.ident, _s)
-#define	__KERNEL_COPYRIGHT(_n, _s)	__KERNEL_SECTIONSTRING(.copyright, _s)
-
-#ifdef NO_KERNEL_RCSIDS
-#undef __KERNEL_RCSID
-#define	__KERNEL_RCSID(_n, _s)		/* nothing */
-#endif
-
-#endif /* _KERNEL */
diff --git a/sys/arch/amd64/include/asm.h b/sys/arch/amd64/include/asm.h
index 26156035ca3..f64e5338f07 100644
--- a/sys/arch/amd64/include/asm.h
+++ b/sys/arch/amd64/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.7 2017/06/23 09:55:10 mpi Exp $	*/
+/*	$OpenBSD: asm.h,v 1.8 2017/06/29 17:36:16 deraadt Exp $	*/
 /*	$NetBSD: asm.h,v 1.2 2003/05/02 18:05:47 yamt Exp $	*/
 
 /*-
@@ -97,10 +97,6 @@
 #define	ASENTRY(y)	_ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE
 #define	END(y)		.size y, . - y
 
-#define	ASMSTR		.asciz
-
-#define RCSID(x)	.text; .asciz x
-
 #define	STRONG_ALIAS(alias,sym)						\
 	.global alias;							\
 	alias = sym
diff --git a/sys/arch/arm/include/asm.h b/sys/arch/arm/include/asm.h
index bc48fe6e23e..e1e5bbc4dd2 100644
--- a/sys/arch/arm/include/asm.h
+++ b/sys/arch/arm/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.8 2017/06/23 09:55:10 mpi Exp $	*/
+/*	$OpenBSD: asm.h,v 1.9 2017/06/29 17:36:16 deraadt Exp $	*/
 /*	$NetBSD: asm.h,v 1.4 2001/07/16 05:43:32 matt Exp $	*/
 
 /*
@@ -77,8 +77,6 @@
 #define	ASENTRY_NP(y)	_ENTRY(_ASM_LABEL(y))
 #define	END(y)		.size y, . - y
 
-#define	ASMSTR		.asciz
-
 #if defined(__PIC__)
 #ifdef __STDC__
 #define	PIC_SYM(x,y)	x ## ( ## y ## )
@@ -89,8 +87,6 @@
 #define	PIC_SYM(x,y)	x
 #endif
 
-#define RCSID(x)	.section ".ident"; .asciz x
-
 #define	STRONG_ALIAS(alias,sym)						\
 	.global alias;							\
 	alias = sym
diff --git a/sys/arch/arm64/include/asm.h b/sys/arch/arm64/include/asm.h
index 84afdbfc29f..35c911f7cf5 100644
--- a/sys/arch/arm64/include/asm.h
+++ b/sys/arch/arm64/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.2 2017/06/23 09:55:10 mpi Exp $	*/
+/*	$OpenBSD: asm.h,v 1.3 2017/06/29 17:36:16 deraadt Exp $	*/
 /*	$NetBSD: asm.h,v 1.4 2001/07/16 05:43:32 matt Exp $	*/
 
 /*
@@ -90,9 +90,6 @@
 #define EENTRY(sym)	 .globl  sym; sym:
 #define EEND(sym)
 
-
-#define	ASMSTR		.asciz
-
 #if defined(__ELF__) && defined(__PIC__)
 #ifdef __STDC__
 #define	PIC_SYM(x,y)	x ## ( ## y ## )
@@ -103,12 +100,6 @@
 #define	PIC_SYM(x,y)	x
 #endif
 
-#ifdef __ELF__
-#define RCSID(x)	.section ".ident"; .asciz x
-#else
-#define RCSID(x)	.text; .asciz x
-#endif
-
 #ifdef __ELF__
 #define	STRONG_ALIAS(alias,sym)						\
 	.global alias;							\
diff --git a/sys/arch/i386/include/asm.h b/sys/arch/i386/include/asm.h
index 53dc46f3cdd..4ed74fa1dfb 100644
--- a/sys/arch/i386/include/asm.h
+++ b/sys/arch/i386/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.14 2015/08/30 10:19:49 guenther Exp $	*/
+/*	$OpenBSD: asm.h,v 1.15 2017/06/29 17:36:16 deraadt Exp $	*/
 /*	$NetBSD: asm.h,v 1.7 1994/10/27 04:15:56 cgd Exp $	*/
 
 /*-
@@ -111,10 +111,6 @@
 
 #define	ALTENTRY(name)	.globl _C_LABEL(name); _C_LABEL(name):
 
-#define	ASMSTR		.asciz
-
-#define RCSID(x)	.text; .asciz x
-
 #ifdef _KERNEL
 
 #ifdef MULTIPROCESSOR
diff --git a/sys/arch/mips64/include/asm.h b/sys/arch/mips64/include/asm.h
index cf055095288..2aa0124a33f 100644
--- a/sys/arch/mips64/include/asm.h
+++ b/sys/arch/mips64/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.23 2017/01/21 14:45:29 visa Exp $ */
+/*	$OpenBSD: asm.h,v 1.24 2017/06/29 17:36:16 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -321,10 +321,6 @@ x: ;				\
 9:	.asciiz	msg; \
 	.text
 
-#define ASMSTR(str) \
-	.asciiz str; \
-	.align	3
-
 #define	LOAD_XKPHYS(reg, cca) \
 	li	reg, cca | 0x10; \
 	dsll	reg, reg, 59
diff --git a/sys/arch/powerpc/include/asm.h b/sys/arch/powerpc/include/asm.h
index 532c2f1adb9..467c8724c29 100644
--- a/sys/arch/powerpc/include/asm.h
+++ b/sys/arch/powerpc/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.13 2017/06/23 09:55:10 mpi Exp $	*/
+/*	$OpenBSD: asm.h,v 1.14 2017/06/29 17:36:16 deraadt Exp $	*/
 /*	$NetBSD: asm.h,v 1.1 1996/09/30 16:34:20 ws Exp $	*/
 
 /*
@@ -92,10 +92,6 @@ _TMP_LABEL(y):; \
 #define	ASENTRY(y)	_ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE(y)
 #define	END(y)		.size y, . - y
 
-#define	ASMSTR		.asciz
-
-#define RCSID(x)	.text; .asciz x
-
 #define STRONG_ALIAS(alias,sym) \
 	.global alias; .set alias,sym
 #define WEAK_ALIAS(alias,sym) \
diff --git a/sys/arch/sh/include/asm.h b/sys/arch/sh/include/asm.h
index 01468d29e7b..2ed7ce2eb2f 100644
--- a/sys/arch/sh/include/asm.h
+++ b/sys/arch/sh/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.6 2017/06/23 09:55:10 mpi Exp $	*/
+/*	$OpenBSD: asm.h,v 1.7 2017/06/29 17:36:16 deraadt Exp $	*/
 /*	$NetBSD: asm.h,v 1.25 2006/01/20 22:02:40 christos Exp $	*/
 
 /*-
@@ -179,9 +179,6 @@
 
 #endif /* !PIC */
 
-
-#define	ASMSTR		.asciz
-
 #define	STRONG_ALIAS(alias,sym)						\
 	.global _C_LABEL(alias);					\
 	_C_LABEL(alias) = _C_LABEL(sym)
diff --git a/sys/arch/sparc64/include/asm.h b/sys/arch/sparc64/include/asm.h
index 21fda1a9c8d..45c79b88aa6 100644
--- a/sys/arch/sparc64/include/asm.h
+++ b/sys/arch/sparc64/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.12 2017/06/23 09:55:10 mpi Exp $	*/
+/*	$OpenBSD: asm.h,v 1.13 2017/06/29 17:36:16 deraadt Exp $	*/
 /*	$NetBSD: asm.h,v 1.15 2000/08/02 22:24:39 eeh Exp $ */
 
 /*
@@ -98,11 +98,6 @@
 #define RODATA(name)		.align 4; .text; .globl _C_LABEL(name); \
 				OTYPE(_C_LABEL(name)); _C_LABEL(name):
 
-
-#define ASMSTR			.asciz
-
-#define RCSID(name)		.asciz name
-
 #define	STRONG_ALIAS(alias,sym)						\
 	.global alias;							\
 	alias = sym
diff --git a/sys/dev/ic/dwc_gmac.c b/sys/dev/ic/dwc_gmac.c
index 6ee76dee6de..4a511a0cb0f 100644
--- a/sys/dev/ic/dwc_gmac.c
+++ b/sys/dev/ic/dwc_gmac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc_gmac.c,v 1.7 2017/05/21 11:52:04 kettenis Exp $	*/
+/*	$OpenBSD: dwc_gmac.c,v 1.8 2017/06/29 17:36:16 deraadt Exp $	*/
 /* $NetBSD: dwc_gmac.c,v 1.34 2015/08/21 20:12:29 jmcneill Exp $ */
 
 /*-
@@ -40,8 +40,6 @@
  *  http://www.synopsys.com/dw/ipdir.php?ds=dwc_ether_mac10_100_1000_unive
  */
 
-/*__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.34 2015/08/21 20:12:29 jmcneill Exp $");*/
-
 /* #define	DWC_GMAC_DEBUG	1 */
 
 #include <sys/param.h>
diff --git a/sys/dev/usb/dwc2/dwc2.c b/sys/dev/usb/dwc2/dwc2.c
index adfa69c9f85..1c0ccba0e25 100644
--- a/sys/dev/usb/dwc2/dwc2.c
+++ b/sys/dev/usb/dwc2/dwc2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc2.c,v 1.45 2017/05/15 10:52:08 mpi Exp $	*/
+/*	$OpenBSD: dwc2.c,v 1.46 2017/06/29 17:36:16 deraadt Exp $	*/
 /*	$NetBSD: dwc2.c,v 1.32 2014/09/02 23:26:20 macallan Exp $	*/
 
 /*-
@@ -30,11 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if 0
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32 2014/09/02 23:26:20 macallan Exp $");
-#endif
-
 #if 0
 #include "opt_usb.h"
 #endif
diff --git a/sys/dev/usb/dwc2/dwc2_core.c b/sys/dev/usb/dwc2/dwc2_core.c
index 3071ec35614..87ffe9207d6 100644
--- a/sys/dev/usb/dwc2/dwc2_core.c
+++ b/sys/dev/usb/dwc2/dwc2_core.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc2_core.c,v 1.7 2017/01/29 16:44:11 stsp Exp $	*/
+/*	$OpenBSD: dwc2_core.c,v 1.8 2017/06/29 17:36:16 deraadt Exp $	*/
 /*	$NetBSD: dwc2_core.c,v 1.6 2014/04/03 06:34:58 skrll Exp $	*/
 
 /*
@@ -43,11 +43,6 @@
  * Driver and the Peripheral Controller Driver.
  */
 
-#if 0
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2_core.c,v 1.6 2014/04/03 06:34:58 skrll Exp $");
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
diff --git a/sys/dev/usb/dwc2/dwc2_coreintr.c b/sys/dev/usb/dwc2/dwc2_coreintr.c
index c1f65fea945..a1e5aa18226 100644
--- a/sys/dev/usb/dwc2/dwc2_coreintr.c
+++ b/sys/dev/usb/dwc2/dwc2_coreintr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc2_coreintr.c,v 1.9 2017/02/12 17:41:17 visa Exp $	*/
+/*	$OpenBSD: dwc2_coreintr.c,v 1.10 2017/06/29 17:36:16 deraadt Exp $	*/
 /*	$NetBSD: dwc2_coreintr.c,v 1.8 2014/04/04 05:40:57 skrll Exp $	*/
 
 /*
@@ -41,11 +41,6 @@
  * This file contains the common interrupt handlers
  */
 
-#if 0
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2_coreintr.c,v 1.8 2014/04/04 05:40:57 skrll Exp $");
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/usb/dwc2/dwc2_hcd.c b/sys/dev/usb/dwc2/dwc2_hcd.c
index e42e6d427c4..1264bfe8d6c 100644
--- a/sys/dev/usb/dwc2/dwc2_hcd.c
+++ b/sys/dev/usb/dwc2/dwc2_hcd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc2_hcd.c,v 1.18 2017/04/11 14:43:49 dhill Exp $	*/
+/*	$OpenBSD: dwc2_hcd.c,v 1.19 2017/06/29 17:36:16 deraadt Exp $	*/
 /*	$NetBSD: dwc2_hcd.c,v 1.15 2014/11/24 10:14:14 skrll Exp $	*/
 
 /*
@@ -42,11 +42,6 @@
  * API
  */
 
-#if 0
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2_hcd.c,v 1.15 2014/11/24 10:14:14 skrll Exp $");
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
diff --git a/sys/dev/usb/dwc2/dwc2_hcdddma.c b/sys/dev/usb/dwc2/dwc2_hcdddma.c
index 3628a8bcd11..09d8de19aa7 100644
--- a/sys/dev/usb/dwc2/dwc2_hcdddma.c
+++ b/sys/dev/usb/dwc2/dwc2_hcdddma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc2_hcdddma.c,v 1.12 2017/04/09 18:09:41 dhill Exp $	*/
+/*	$OpenBSD: dwc2_hcdddma.c,v 1.13 2017/06/29 17:36:16 deraadt Exp $	*/
 /*	$NetBSD: dwc2_hcdddma.c,v 1.6 2014/04/03 06:34:58 skrll Exp $	*/
 
 /*
@@ -40,10 +40,6 @@
 /*
  * This file contains the Descriptor DMA implementation for Host mode
  */
-#if 0
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2_hcdddma.c,v 1.6 2014/04/03 06:34:58 skrll Exp $");
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/dwc2/dwc2_hcdintr.c b/sys/dev/usb/dwc2/dwc2_hcdintr.c
index 3735c811838..98855cdb019 100644
--- a/sys/dev/usb/dwc2/dwc2_hcdintr.c
+++ b/sys/dev/usb/dwc2/dwc2_hcdintr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc2_hcdintr.c,v 1.8 2017/06/20 15:49:00 visa Exp $	*/
+/*	$OpenBSD: dwc2_hcdintr.c,v 1.9 2017/06/29 17:36:16 deraadt Exp $	*/
 /*	$NetBSD: dwc2_hcdintr.c,v 1.11 2014/11/24 10:14:14 skrll Exp $	*/
 
 /*
@@ -40,10 +40,6 @@
 /*
  * This file contains the interrupt handlers for Host mode
  */
-#if 0
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2_hcdintr.c,v 1.11 2014/11/24 10:14:14 skrll Exp $");
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/dwc2/dwc2_hcdqueue.c b/sys/dev/usb/dwc2/dwc2_hcdqueue.c
index 31bd3826254..bbecd3d50f2 100644
--- a/sys/dev/usb/dwc2/dwc2_hcdqueue.c
+++ b/sys/dev/usb/dwc2/dwc2_hcdqueue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc2_hcdqueue.c,v 1.7 2015/06/28 11:48:18 jmatthew Exp $	*/
+/*	$OpenBSD: dwc2_hcdqueue.c,v 1.8 2017/06/29 17:36:16 deraadt Exp $	*/
 /*	$NetBSD: dwc2_hcdqueue.c,v 1.11 2014/09/03 10:00:08 skrll Exp $	*/
 
 /*
@@ -42,11 +42,6 @@
  * Transfer Descriptors for Host mode
  */
 
-#if 0
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2_hcdqueue.c,v 1.11 2014/09/03 10:00:08 skrll Exp $");
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
-- 
cgit v1.2.3