[src/trunk]: src/sys/ufs/ext2fs Revert previous for now:

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/ufs/ext2fs Revert previous for now:
From: rin <rin%NetBSD.org@localhost>
Date: Sat, 01 May 2021 03:58:12 +0000
details:   https://anonhg.NetBSD.org/src/rev/8cfdea60e8b5
branches:  trunk
changeset: 971184:8cfdea60e8b5
user:      rin <rin%NetBSD.org@localhost>
date:      Thu Apr 16 23:29:52 2020 +0000

description:
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.

diffstat:

 sys/arch/arm/omap/omap3_sdmareg.h       |  5 ++++-
 sys/arch/arm/omap/omap3_sdmavar.h       |  7 +++++--
 sys/arch/arm/omap/omapfbreg.h           |  5 ++++-
 sys/arch/arm/ti/omap3_dssreg.h          |  5 ++++-
 sys/arch/macppc/dev/batteryvar.h        |  5 ++++-
 sys/arch/macppc/dev/cudavar.h           |  3 +++
 sys/arch/macppc/dev/deqvar.h            |  5 ++++-
 sys/arch/macppc/dev/obiovar.h           |  3 +++
 sys/arch/macppc/dev/platinumfbreg.h     |  3 +++
 sys/arch/macppc/dev/pmuvar.h            |  3 +++
 sys/arch/macppc/dev/valkyriefbreg.h     |  3 +++
 sys/arch/macppc/dev/videopllvar.h       |  3 +++
 sys/arch/mips/adm5120/dev/if_admswvar.h |  5 ++++-
 sys/arch/powerpc/include/intr.h         |  7 ++++++-
 sys/arch/powerpc/pic/ipivar.h           |  5 ++++-
 sys/arch/powerpc/pic/picvar.h           |  5 ++++-
 sys/dev/acpi/wmi/wmi_acpivar.h          |  5 ++++-
 sys/dev/adb/adbvar.h                    |  5 ++++-
 sys/dev/i2c/adm1026reg.h                |  3 +++
 sys/dev/i2c/dbcool_reg.h                |  5 ++++-
 sys/dev/i2c/dbcool_var.h                |  5 ++++-
 sys/dev/i2c/sgsmixvar.h                 |  5 ++++-
 sys/dev/ic/i128reg.h                    |  5 ++++-
 sys/dev/ic/i128var.h                    |  5 ++++-
 sys/dev/pci/gffbreg.h                   |  5 ++++-
 sys/dev/pci/ppbvar.h                    |  5 ++++-
 sys/dev/pci/voyagervar.h                |  5 ++++-
 sys/dev/qbus/rlvar.h                    |  5 ++++-
 sys/external/bsd/ena-com/ena_plat.h     |  2 ++
 sys/lib/libkern/crc16.h                 |  5 ++++-
 sys/ufs/ext2fs/ext2fs_xattr.h           |  5 ++++-
 31 files changed, 118 insertions(+), 24 deletions(-)

diffs (truncated from 552 to 300 lines):

diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/arm/omap/omap3_sdmareg.h
--- a/sys/arch/arm/omap/omap3_sdmareg.h Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/arm/omap/omap3_sdmareg.h Thu Apr 16 23:29:52 2020 +0000
@@ -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
 
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/arm/omap/omap3_sdmavar.h
--- a/sys/arch/arm/omap/omap3_sdmavar.h Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/arm/omap/omap3_sdmavar.h Thu Apr 16 23:29:52 2020 +0000
@@ -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 @@
 uint32_t omapdma_read_ch_reg(int, int);
 
 
-#endif /* OMAPDMA_VAR_H */
+#endif /* OMAPDMA_VAR_H */
\ No newline at end of file
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/arm/omap/omapfbreg.h
--- a/sys/arch/arm/omap/omapfbreg.h     Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/arm/omap/omapfbreg.h     Thu Apr 16 23:29:52 2020 +0000
@@ -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
 
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/arm/ti/omap3_dssreg.h
--- a/sys/arch/arm/ti/omap3_dssreg.h    Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/arm/ti/omap3_dssreg.h    Thu Apr 16 23:29:52 2020 +0000
@@ -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
 
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/macppc/dev/batteryvar.h
--- a/sys/arch/macppc/dev/batteryvar.h  Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/macppc/dev/batteryvar.h  Thu Apr 16 23:29:52 2020 +0000
@@ -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
 
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/macppc/dev/cudavar.h
--- a/sys/arch/macppc/dev/cudavar.h     Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/macppc/dev/cudavar.h     Thu Apr 16 23:29:52 2020 +0000
@@ -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
 
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/macppc/dev/deqvar.h
--- a/sys/arch/macppc/dev/deqvar.h      Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/macppc/dev/deqvar.h      Thu Apr 16 23:29:52 2020 +0000
@@ -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>
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/macppc/dev/obiovar.h
--- a/sys/arch/macppc/dev/obiovar.h     Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/macppc/dev/obiovar.h     Thu Apr 16 23:29:52 2020 +0000
@@ -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
 
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/macppc/dev/platinumfbreg.h
--- a/sys/arch/macppc/dev/platinumfbreg.h       Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/macppc/dev/platinumfbreg.h       Thu Apr 16 23:29:52 2020 +0000
@@ -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
 
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/macppc/dev/pmuvar.h
--- a/sys/arch/macppc/dev/pmuvar.h      Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/macppc/dev/pmuvar.h      Thu Apr 16 23:29:52 2020 +0000
@@ -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
 
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/macppc/dev/valkyriefbreg.h
--- a/sys/arch/macppc/dev/valkyriefbreg.h       Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/macppc/dev/valkyriefbreg.h       Thu Apr 16 23:29:52 2020 +0000
@@ -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
 
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/macppc/dev/videopllvar.h
--- a/sys/arch/macppc/dev/videopllvar.h Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/macppc/dev/videopllvar.h Thu Apr 16 23:29:52 2020 +0000
@@ -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
 
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/mips/adm5120/dev/if_admswvar.h
--- a/sys/arch/mips/adm5120/dev/if_admswvar.h   Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/mips/adm5120/dev/if_admswvar.h   Thu Apr 16 23:29:52 2020 +0000
@@ -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>
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/powerpc/include/intr.h
--- a/sys/arch/powerpc/include/intr.h   Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/powerpc/include/intr.h   Thu Apr 16 23:29:52 2020 +0000
@@ -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_
 
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/powerpc/pic/ipivar.h
--- a/sys/arch/powerpc/pic/ipivar.h     Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/powerpc/pic/ipivar.h     Thu Apr 16 23:29:52 2020 +0000
@@ -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_
 
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/arch/powerpc/pic/picvar.h
--- a/sys/arch/powerpc/pic/picvar.h     Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/arch/powerpc/pic/picvar.h     Thu Apr 16 23:29:52 2020 +0000
@@ -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
 
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/dev/acpi/wmi/wmi_acpivar.h
--- a/sys/dev/acpi/wmi/wmi_acpivar.h    Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/dev/acpi/wmi/wmi_acpivar.h    Thu Apr 16 23:29:52 2020 +0000
@@ -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@localhost>
@@ -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 *);
diff -r 6a8bab26ddd3 -r 8cfdea60e8b5 sys/dev/adb/adbvar.h
--- a/sys/dev/adb/adbvar.h      Thu Apr 16 22:13:51 2020 +0000
+++ b/sys/dev/adb/adbvar.h      Thu Apr 16 23:29:52 2020 +0000
@@ -1,4 +1,4 @@
Prev by Date: [src/trunk]: src/sys/sys fix tense (Nelson Beebe)
Next by Date: [src/trunk]: src/usr.sbin/tprof/arch Fix typo in a comment.
Previous by Thread: [src/trunk]: src/sys/sys fix tense (Nelson Beebe)
Next by Thread: [src/trunk]: src/usr.sbin/tprof/arch Fix typo in a comment.
Indexes:
Home | Main Index | Thread Index | Old Index