[src/trunk]: src/sys Revert "Include opt_diagnostic.h for DIAGNOSTIC."

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys Revert "Include opt_diagnostic.h for DIAGNOSTIC."
From: riastradh <riastradh%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 14:07:19 +0000
details:   https://anonhg.NetBSD.org/src/rev/62cfe5ce7b62
branches:  trunk
changeset: 849550:62cfe5ce7b62
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Mar 05 15:18:54 2020 +0000

description:
Revert "Include opt_diagnostic.h for DIAGNOSTIC."

This did not do what I thought it did.  opt_diagnostic.h is only for
the unused _DIAGNOSTIC, which seems like an abortive attempt to
incrementally convert DIAGNOSTIC to an opt_*.h option rather than a
command-line option.

diffstat:

 sys/arch/arm/cortex/gtmr_var.h                      |  6 +-----
 sys/arch/arm/include/arm32/machdep.h                |  6 +-----
 sys/arch/hppa/include/param.h                       |  6 +-----
 sys/arch/i386/include/param.h                       |  6 +-----
 sys/dev/audio/audiodef.h                            |  3 +--
 sys/dev/audio/audiovar.h                            |  6 +-----
 sys/dev/ic/dm9000var.h                              |  6 +-----
 sys/dev/ic/tcic2var.h                               |  6 +-----
 sys/dev/pci/eapvar.h                                |  6 +-----
 sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h |  6 +-----
 sys/fs/unionfs/unionfs.h                            |  4 ----
 sys/netinet/tcp_var.h                               |  4 ++--
 sys/sys/mbuf.h                                      |  3 +--
 sys/sys/vnode.h                                     |  6 +-----
 sys/ufs/ufs/ufs_wapbl.h                             |  3 +--
 15 files changed, 15 insertions(+), 62 deletions(-)

diffs (275 lines):

diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/arch/arm/cortex/gtmr_var.h
--- a/sys/arch/arm/cortex/gtmr_var.h    Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/arch/arm/cortex/gtmr_var.h    Thu Mar 05 15:18:54 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmr_var.h,v 1.13 2020/03/05 08:08:32 riastradh Exp $ */
+/* $NetBSD: gtmr_var.h,v 1.14 2020/03/05 15:18:54 riastradh Exp $ */
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -31,10 +31,6 @@
 #ifndef _ARM_CORTEX_GTMR_VAR_
 #define _ARM_CORTEX_GTMR_VAR_
 
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
-
 #include <sys/percpu.h>
 
 struct gtmr_softc {
diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/arch/arm/include/arm32/machdep.h
--- a/sys/arch/arm/include/arm32/machdep.h      Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/arch/arm/include/arm32/machdep.h      Thu Mar 05 15:18:54 2020 +0000
@@ -1,12 +1,8 @@
-/* $NetBSD: machdep.h,v 1.32 2020/03/05 08:08:32 riastradh Exp $ */
+/* $NetBSD: machdep.h,v 1.33 2020/03/05 15:18:54 riastradh Exp $ */
 
 #ifndef _ARM32_MACHDEP_H_
 #define _ARM32_MACHDEP_H_
 
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
-
 /* Define various stack sizes in pages */
 #ifndef IRQ_STACK_SIZE
 #define IRQ_STACK_SIZE 1
diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/arch/hppa/include/param.h
--- a/sys/arch/hppa/include/param.h     Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/arch/hppa/include/param.h     Thu Mar 05 15:18:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.24 2020/03/05 08:08:32 riastradh Exp $     */
+/*     $NetBSD: param.h,v 1.25 2020/03/05 15:18:54 riastradh Exp $     */
 
 /*     $OpenBSD: param.h,v 1.12 2001/07/06 02:07:41 provos Exp $       */
 
@@ -25,10 +25,6 @@
  *     Utah $Hdr$
  */
 
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
-
 #ifdef _KERNEL
 #include <machine/cpu.h>
 #endif
diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/arch/i386/include/param.h
--- a/sys/arch/i386/include/param.h     Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/arch/i386/include/param.h     Thu Mar 05 15:18:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.86 2020/03/05 08:08:33 riastradh Exp $     */
+/*     $NetBSD: param.h,v 1.87 2020/03/05 15:18:54 riastradh Exp $     */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,10 +37,6 @@
 #ifndef _I386_PARAM_H_
 #define _I386_PARAM_H_
 
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
-
 /*
  * Machine dependent constants for Intel 386.
  */
diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/dev/audio/audiodef.h
--- a/sys/dev/audio/audiodef.h  Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/dev/audio/audiodef.h  Thu Mar 05 15:18:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audiodef.h,v 1.11 2020/03/05 08:08:33 riastradh Exp $  */
+/*     $NetBSD: audiodef.h,v 1.12 2020/03/05 15:18:55 riastradh Exp $  */
 
 /*
  * Copyright (C) 2017 Tetsuya Isaki. All rights reserved.
@@ -31,7 +31,6 @@
 
 #ifdef _KERNEL_OPT
 #include "opt_audio.h"
-#include "opt_diagnostic.h"
 #endif
 
 /* Number of HW buffer's blocks. */
diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/dev/audio/audiovar.h
--- a/sys/dev/audio/audiovar.h  Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/dev/audio/audiovar.h  Thu Mar 05 15:18:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audiovar.h,v 1.9 2020/03/05 08:08:33 riastradh Exp $   */
+/*     $NetBSD: audiovar.h,v 1.10 2020/03/05 15:18:55 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -67,10 +67,6 @@
 #ifndef _SYS_DEV_AUDIO_AUDIOVAR_H_
 #define _SYS_DEV_AUDIO_AUDIOVAR_H_
 
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
-
 #include <sys/condvar.h>
 #include <sys/proc.h>
 #include <sys/pserialize.h>
diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/dev/ic/dm9000var.h
--- a/sys/dev/ic/dm9000var.h    Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/dev/ic/dm9000var.h    Thu Mar 05 15:18:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dm9000var.h,v 1.4 2020/03/05 08:08:33 riastradh Exp $  */
+/*     $NetBSD: dm9000var.h,v 1.5 2020/03/05 15:18:55 riastradh Exp $  */
 
 /*
  * Copyright (c) 2009 Paul Fleischer
@@ -63,10 +63,6 @@
 #ifndef _DEV_IC_DM9000VAR_H_
 #define _DEV_IC_DM9000VAR_H_
 
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
-
 #include <sys/callout.h>
 
 #define DM9000_MODE_8BIT 2
diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/dev/ic/tcic2var.h
--- a/sys/dev/ic/tcic2var.h     Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/dev/ic/tcic2var.h     Thu Mar 05 15:18:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcic2var.h,v 1.14 2020/03/05 08:08:33 riastradh Exp $  */
+/*     $NetBSD: tcic2var.h,v 1.15 2020/03/05 15:18:55 riastradh Exp $  */
 
 /*
  * Copyright (c) 1998, 1999 Christoph Badura.  All rights reserved.
@@ -33,10 +33,6 @@
 #ifndef _TCIC2VAR_H
 #define _TCIC2VAR_H
 
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
-
 #include <sys/device.h>
 
 #include <dev/pcmcia/pcmciareg.h>
diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/dev/pci/eapvar.h
--- a/sys/dev/pci/eapvar.h      Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/dev/pci/eapvar.h      Thu Mar 05 15:18:54 2020 +0000
@@ -1,8 +1,4 @@
-/* $NetBSD: eapvar.h,v 1.5 2020/03/05 08:08:33 riastradh Exp $ */
-
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
+/* $NetBSD: eapvar.h,v 1.6 2020/03/05 15:18:55 riastradh Exp $ */
 
 #include <dev/pci/pcivar.h>
 
diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h
--- a/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h       Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h       Thu Mar 05 15:18:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sljitConfig.h,v 1.16 2020/03/05 08:08:33 riastradh Exp $       */
+/*     $NetBSD: sljitConfig.h,v 1.17 2020/03/05 15:18:55 riastradh Exp $       */
 
 /*
  *    Stack-less Just-In-Time compiler
@@ -74,10 +74,6 @@
 
 #ifdef _KERNEL
 
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
-
 #ifdef DIAGNOSTIC
 #define SLJIT_DEBUG 1
 #else
diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/fs/unionfs/unionfs.h
--- a/sys/fs/unionfs/unionfs.h  Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/fs/unionfs/unionfs.h  Thu Mar 05 15:18:54 2020 +0000
@@ -39,10 +39,6 @@
 #ifndef _MISCFS_UNION_H_
 #define _MISCFS_UNION_H_
 
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
-
 #define        UNIONFS_DEBUG
 
 struct union_args {
diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/netinet/tcp_var.h
--- a/sys/netinet/tcp_var.h     Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/netinet/tcp_var.h     Thu Mar 05 15:18:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_var.h,v 1.191 2020/03/05 08:08:33 riastradh Exp $  */
+/*     $NetBSD: tcp_var.h,v 1.192 2020/03/05 15:18:55 riastradh Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -136,9 +136,9 @@
 #define _NETINET_TCP_VAR_H_
 
 #if defined(_KERNEL_OPT)
-#include "opt_diagnostic.h"
 #include "opt_inet.h"
 #include "opt_mbuftrace.h"
+
 #endif
 
 /*
diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/sys/mbuf.h
--- a/sys/sys/mbuf.h    Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/sys/mbuf.h    Thu Mar 05 15:18:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbuf.h,v 1.224 2020/03/05 08:08:33 riastradh Exp $     */
+/*     $NetBSD: mbuf.h,v 1.225 2020/03/05 15:18:55 riastradh Exp $     */
 
 /*
  * Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -65,7 +65,6 @@
 #define _SYS_MBUF_H_
 
 #ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
 #include "opt_mbuftrace.h"
 #endif
 
diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/sys/vnode.h
--- a/sys/sys/vnode.h   Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/sys/vnode.h   Thu Mar 05 15:18:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vnode.h,v 1.291 2020/03/05 08:08:33 riastradh Exp $    */
+/*     $NetBSD: vnode.h,v 1.292 2020/03/05 15:18:55 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -60,10 +60,6 @@
 #ifndef _SYS_VNODE_H_
 #define        _SYS_VNODE_H_
 
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
-
 #include <sys/event.h>
 #include <sys/queue.h>
 #include <sys/condvar.h>
diff -r ae7640fb8941 -r 62cfe5ce7b62 sys/ufs/ufs/ufs_wapbl.h
--- a/sys/ufs/ufs/ufs_wapbl.h   Thu Mar 05 14:24:46 2020 +0000
+++ b/sys/ufs/ufs/ufs_wapbl.h   Thu Mar 05 15:18:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_wapbl.h,v 1.17 2020/03/05 08:08:34 riastradh Exp $ */
+/*     $NetBSD: ufs_wapbl.h,v 1.18 2020/03/05 15:18:55 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,6 @@
 #define        _UFS_UFS_UFS_WAPBL_H_
 
 #if defined(_KERNEL_OPT)
-#include "opt_diagnostic.h"
 #include "opt_wapbl.h"
 #endif
Prev by Date: [src/trunk]: src/sys/arch/arm/dts #include_next confuses clang-cpp; use relat...
Next by Date: [src/trunk]: src/sys/dev/pci No functional change:
Previous by Thread: [src/trunk]: src/sys/arch/arm/dts #include_next confuses clang-cpp; use relat...
Next by Thread: [src/trunk]: src/sys/dev/pci No functional change:
Indexes:
Home | Main Index | Thread Index | Old Index