Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert previous for now: 

http://mail-index.netbsd.org/source-changes/2020/04/16/msg116278.html

The reasoning turned out to be wrong; __KERNEL_RCSID() in header files
does *not* overwrite RCSID in main source files. The real problem is that
it inserts its RCSID into *every* object files. However, it can be still
useful even if heavily duplicated.
This commit is contained in:
rin 2020-04-16 23:29:52 +00:00
parent b526449a3e
commit 72d26a2dda
31 changed files with 118 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/arm/omap/omap3_sdmareg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: omap3_sdmareg.h,v 1.5 2020/04/16 21:56:41 rin Exp $ */
/* $NetBSD: omap3_sdmareg.h,v 1.6 2020/04/16 23:29:52 rin Exp $ */
/*
* Copyright (c) 2012 Michael Lorenz
@ -26,6 +26,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: omap3_sdmareg.h,v 1.6 2020/04/16 23:29:52 rin Exp $");
#ifndef OMAPDMA_REG_H
#define OMAPDMA_REG_H

7
sys/arch/arm/omap/omap3_sdmavar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: omap3_sdmavar.h,v 1.2 2020/04/16 21:56:41 rin Exp $ */
/* $NetBSD: omap3_sdmavar.h,v 1.3 2020/04/16 23:29:52 rin Exp $ */
/*
* Copyright (c) 2012 Michael Lorenz
@ -26,6 +26,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: omap3_sdmavar.h,v 1.3 2020/04/16 23:29:52 rin Exp $");
#ifndef OMAPDMA_VAR_H
#define OMAPDMA_VAR_H
@ -35,4 +38,4 @@ void omapdma_write_ch_reg(int, int, uint32_t);
uint32_t omapdma_read_ch_reg(int, int);
#endif /* OMAPDMA_VAR_H */
#endif /* OMAPDMA_VAR_H */

5
sys/arch/arm/omap/omapfbreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: omapfbreg.h,v 1.4 2020/04/16 21:56:41 rin Exp $ */
/* $NetBSD: omapfbreg.h,v 1.5 2020/04/16 23:29:52 rin Exp $ */
/*-
* Copyright (c) 2010 Michael Lorenz
@ -26,6 +26,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: omapfbreg.h,v 1.5 2020/04/16 23:29:52 rin Exp $");
#ifndef OMAPFB_REG_H
#define OMAPFB_REG_H

5
sys/arch/arm/ti/omap3_dssreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: omap3_dssreg.h,v 1.2 2020/04/16 21:56:41 rin Exp $ */
/* $NetBSD: omap3_dssreg.h,v 1.3 2020/04/16 23:29:52 rin Exp $ */
/*-
* Copyright (c) 2010 Michael Lorenz
@ -26,6 +26,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: omap3_dssreg.h,v 1.3 2020/04/16 23:29:52 rin Exp $");
#ifndef OMAP3_DSSREG_H
#define OMAP3_DSSREG_H

5
sys/arch/macppc/dev/batteryvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: batteryvar.h,v 1.3 2020/04/16 21:56:41 rin Exp $ */
/* $NetBSD: batteryvar.h,v 1.4 2020/04/16 23:29:52 rin Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@ -26,6 +26,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: batteryvar.h,v 1.4 2020/04/16 23:29:52 rin Exp $");
#ifndef BATTERY_VAR_H
#define BATTERY_VAR_H

3
sys/arch/macppc/dev/cudavar.h
View File

@ -24,6 +24,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cudavar.h,v 1.5 2020/04/16 23:29:52 rin Exp $");
#ifndef CUDAVAR_H
#define CUDAVAR_H

5
sys/arch/macppc/dev/deqvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: deqvar.h,v 1.4 2020/04/16 21:56:41 rin Exp $ */
/* $NetBSD: deqvar.h,v 1.5 2020/04/16 23:29:52 rin Exp $ */
/*-
* Copyright (C) 2005 Michael Lorenz
@ -34,6 +34,9 @@
#ifndef DEQVAR_H
#define DEQVAR_H
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: deqvar.h,v 1.5 2020/04/16 23:29:52 rin Exp $");
#include <sys/kernel.h>
#include <sys/device.h>
#include <dev/i2c/i2cvar.h>

3
sys/arch/macppc/dev/obiovar.h
View File

@ -24,6 +24,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: obiovar.h,v 1.5 2020/04/16 23:29:52 rin Exp $");
#ifndef OBIOVAR_H
#define OBIOVAR_H

3
sys/arch/macppc/dev/platinumfbreg.h
View File

@ -20,6 +20,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: platinumfbreg.h,v 1.3 2020/04/16 23:29:52 rin Exp $");
#ifndef PLATINUMFBREG_H
#define PLATINUMFBREG_H

3
sys/arch/macppc/dev/pmuvar.h
View File

@ -24,6 +24,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pmuvar.h,v 1.11 2020/04/16 23:29:52 rin Exp $");
#ifndef PMUVAR_H
#define PMUVAR_H

3
sys/arch/macppc/dev/valkyriefbreg.h
View File

@ -24,6 +24,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: valkyriefbreg.h,v 1.5 2020/04/16 23:29:52 rin Exp $");
#ifndef VALKYRIEFBREG_H
#define VALKYRIEFBREG_H

3
sys/arch/macppc/dev/videopllvar.h
View File

@ -24,6 +24,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: videopllvar.h,v 1.5 2020/04/16 23:29:52 rin Exp $");
#ifndef VIDEOPLLVAR_H
#define VIDEOPLLVAR_H

5
sys/arch/mips/adm5120/dev/if_admswvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_admswvar.h,v 1.7 2020/04/16 21:56:41 rin Exp $ */
/* $NetBSD: if_admswvar.h,v 1.8 2020/04/16 23:29:52 rin Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@ -33,6 +33,9 @@
#ifndef _IF_ADMSWVAR_H_
#define _IF_ADMSWVAR_H_
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_admswvar.h,v 1.8 2020/04/16 23:29:52 rin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/callout.h>

7
sys/arch/powerpc/include/intr.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.16 2020/04/16 21:56:42 rin Exp $ */
/* $NetBSD: intr.h,v 1.17 2020/04/16 23:29:52 rin Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@ -26,6 +26,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _LOCORE
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: intr.h,v 1.17 2020/04/16 23:29:52 rin Exp $");
#endif
#ifndef _POWERPC_INTR_MACHDEP_H_
#define _POWERPC_INTR_MACHDEP_H_

5
sys/arch/powerpc/pic/ipivar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ipivar.h,v 1.11 2020/04/16 21:56:42 rin Exp $ */
/* $NetBSD: ipivar.h,v 1.12 2020/04/16 23:29:52 rin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@ -28,6 +28,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ipivar.h,v 1.12 2020/04/16 23:29:52 rin Exp $");
#ifndef _IPI_VAR_H_
#define _IPI_VAR_H_

5
sys/arch/powerpc/pic/picvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: picvar.h,v 1.11 2020/04/16 21:56:42 rin Exp $ */
/* $NetBSD: picvar.h,v 1.12 2020/04/16 23:29:52 rin Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@ -26,6 +26,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: picvar.h,v 1.12 2020/04/16 23:29:52 rin Exp $");
#ifndef PIC_VAR_H
#define PIC_VAR_H

5
sys/dev/acpi/wmi/wmi_acpivar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: wmi_acpivar.h,v 1.6 2020/04/16 21:56:42 rin Exp $ */
/* $NetBSD: wmi_acpivar.h,v 1.7 2020/04/16 23:29:52 rin Exp $ */
/*-
* Copyright (c) 2009, 2010 Jukka Ruohonen <jruohonen@iki.fi>
@ -30,6 +30,9 @@
#ifndef _SYS_DEV_ACPI_WMI_WMI_ACPIVAR_H
#define _SYS_DEV_ACPI_WMI_WMI_ACPIVAR_H
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wmi_acpivar.h,v 1.7 2020/04/16 23:29:52 rin Exp $");
ACPI_STATUS acpi_wmi_event_register(device_t, ACPI_NOTIFY_HANDLER);
ACPI_STATUS acpi_wmi_event_deregister(device_t);
ACPI_STATUS acpi_wmi_event_get(device_t, uint32_t, ACPI_BUFFER *);

5
sys/dev/adb/adbvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: adbvar.h,v 1.3 2020/04/16 21:56:42 rin Exp $ */
/* $NetBSD: adbvar.h,v 1.4 2020/04/16 23:29:53 rin Exp $ */
/*-
* Copyright (c) 2006 Michael Lorenz
@ -26,6 +26,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: adbvar.h,v 1.4 2020/04/16 23:29:53 rin Exp $");
#ifndef ADBVAR_H
#define ADBVAR_H

3
sys/dev/i2c/adm1026reg.h
View File

@ -36,6 +36,9 @@
* http://www.onsemi.com/pub_link/Collateral/ADM1026-D.PDF
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: adm1026reg.h,v 1.5 2020/04/16 23:29:53 rin Exp $");
#define ADM1026_ADDR1 0x2c
#define ADM1026_CONF1 0x00

5
sys/dev/i2c/dbcool_reg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: dbcool_reg.h,v 1.8 2020/04/16 21:56:42 rin Exp $ */
/* $NetBSD: dbcool_reg.h,v 1.9 2020/04/16 23:29:53 rin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@ -36,6 +36,9 @@
#ifndef DBCOOLREG_H
#define DBCOOLREG_H
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dbcool_reg.h,v 1.9 2020/04/16 23:29:53 rin Exp $");
#define DBCOOL_ADDRMASK 0x3fc
#define DBCOOL_ADDR 0x2c /* Some chips have multiple addrs */

5
sys/dev/i2c/dbcool_var.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: dbcool_var.h,v 1.15 2020/04/16 21:56:42 rin Exp $ */
/* $NetBSD: dbcool_var.h,v 1.16 2020/04/16 23:29:53 rin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@ -40,6 +40,9 @@
#define DBCOOL_DEBUG
#endif
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dbcool_var.h,v 1.16 2020/04/16 23:29:53 rin Exp $");
#include <dev/i2c/i2cvar.h>
#include <dev/sysmon/sysmonvar.h>

5
sys/dev/i2c/sgsmixvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: sgsmixvar.h,v 1.3 2020/04/16 21:56:42 rin Exp $ */
/* $NetBSD: sgsmixvar.h,v 1.4 2020/04/16 23:29:53 rin Exp $ */
/*-
* Copyright (C) 2005 Michael Lorenz.
@ -26,6 +26,9 @@
#ifndef SGSMIXVAR_H
#define SGSMIXVAR_H
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sgsmixvar.h,v 1.4 2020/04/16 23:29:53 rin Exp $");
void sgsmix_set_speaker_vol(void *, int, int);
void sgsmix_set_headphone_vol(void *, int, int);
void sgsmix_set_bass_treble(void *, int, int);

5
sys/dev/ic/i128reg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: i128reg.h,v 1.4 2020/04/16 21:56:42 rin Exp $ */
/* $NetBSD: i128reg.h,v 1.5 2020/04/16 23:29:53 rin Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@ -26,6 +26,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i128reg.h,v 1.5 2020/04/16 23:29:53 rin Exp $");
/*
* register definition for Number Nine Imagine 128 graphics controllers
*

5
sys/dev/ic/i128var.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: i128var.h,v 1.4 2020/04/16 21:56:42 rin Exp $ */
/* $NetBSD: i128var.h,v 1.5 2020/04/16 23:29:53 rin Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@ -26,6 +26,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i128var.h,v 1.5 2020/04/16 23:29:53 rin Exp $");
/*
* register definition for Number Nine Imagine 128 graphics controllers
*

5
sys/dev/pci/gffbreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: gffbreg.h,v 1.4 2020/04/16 21:56:42 rin Exp $ */
/* $NetBSD: gffbreg.h,v 1.5 2020/04/16 23:29:53 rin Exp $ */
/*
* Copyright (c) 2013 Michael Lorenz
@ -31,6 +31,9 @@
* register definitions are mostly from the xf86-video-nv driver
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gffbreg.h,v 1.5 2020/04/16 23:29:53 rin Exp $");
#ifndef GFFBREG_H
#define GFFBREG_H

5
sys/dev/pci/ppbvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ppbvar.h,v 1.3 2020/04/16 21:56:42 rin Exp $ */
/* $NetBSD: ppbvar.h,v 1.4 2020/04/16 23:29:53 rin Exp $ */
/*
* Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved.
@ -30,6 +30,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ppbvar.h,v 1.4 2020/04/16 23:29:53 rin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>

5
sys/dev/pci/voyagervar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: voyagervar.h,v 1.6 2020/04/16 21:56:42 rin Exp $ */
/* $NetBSD: voyagervar.h,v 1.7 2020/04/16 23:29:53 rin Exp $ */
/*
* Copyright (c) 2011 Michael Lorenz
@ -25,6 +25,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: voyagervar.h,v 1.7 2020/04/16 23:29:53 rin Exp $");
#ifndef VOYAGERVAR_H
#define VOYAGERVAR_H

5
sys/dev/qbus/rlvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: rlvar.h,v 1.10 2020/04/16 21:56:43 rin Exp $ */
/* $NetBSD: rlvar.h,v 1.11 2020/04/16 23:29:53 rin Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@ -29,6 +29,9 @@
* RL01/RL02 disk device driver.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rlvar.h,v 1.11 2020/04/16 23:29:53 rin Exp $");
struct rlc_softc {
device_t sc_dev;
struct uba_softc *sc_uh;

2
sys/external/bsd/ena-com/ena_plat.h vendored
View File

@ -34,9 +34,11 @@
#ifndef ENA_PLAT_H_
#define ENA_PLAT_H_
#include <sys/cdefs.h>
#if 0
__FBSDID("$FreeBSD: head/sys/contrib/ena-com/ena_plat.h 333453 2018-05-10 09:25:51Z mw $");
#endif
__KERNEL_RCSID(0, "$NetBSD: ena_plat.h,v 1.6 2020/04/16 23:29:53 rin Exp $");
#include <sys/param.h>
#include <sys/systm.h>

5
sys/lib/libkern/crc16.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: crc16.h,v 1.2 2020/04/16 21:56:43 rin Exp $ */
/* $NetBSD: crc16.h,v 1.3 2020/04/16 23:29:53 rin Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@ -29,6 +29,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: crc16.h,v 1.3 2020/04/16 23:29:53 rin Exp $");
/* CRC table for standard ANSI CRC-16 with polynom 0x8005 */
static const uint16_t crc16_lookup[] = {
0x0000, 0xc0c1, 0xc181, 0x0140, 0xc301, 0x03c0, 0x0280, 0xc241,

5
sys/ufs/ext2fs/ext2fs_xattr.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_xattr.h,v 1.3 2020/04/16 21:56:43 rin Exp $ */
/* $NetBSD: ext2fs_xattr.h,v 1.4 2020/04/16 23:29:53 rin Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@ -32,6 +32,9 @@
#ifndef _UFS_EXT2FS_EXT2FS_XATTR_H_
#define _UFS_EXT2FS_EXT2FS_XATTR_H_
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ext2fs_xattr.h,v 1.4 2020/04/16 23:29:53 rin Exp $");
#ifdef _KERNEL
#define EXT2FS_XATTR_MAGIC 0xEA020000