Module Name: src
Committed By: riastradh
Date: Thu Mar 5 15:18:56 UTC 2020
Modified Files:
src/sys/arch/arm/cortex: gtmr_var.h
src/sys/arch/arm/include/arm32: machdep.h
src/sys/arch/hppa/include: param.h
src/sys/arch/i386/include: param.h
src/sys/dev/audio: audiodef.h audiovar.h
src/sys/dev/ic: dm9000var.h tcic2var.h
src/sys/dev/pci: eapvar.h
src/sys/external/bsd/sljit/dist/sljit_src: sljitConfig.h
src/sys/fs/unionfs: unionfs.h
src/sys/netinet: tcp_var.h
src/sys/sys: mbuf.h vnode.h
src/sys/ufs/ufs: ufs_wapbl.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/cortex/gtmr_var.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/include/arm32/machdep.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hppa/include/param.h
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/i386/include/param.h
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/audio/audiodef.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/audio/audiovar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/dm9000var.h
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/tcic2var.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/eapvar.h
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/unionfs/unionfs.h
cvs rdiff -u -r1.191 -r1.192 src/sys/netinet/tcp_var.h
cvs rdiff -u -r1.224 -r1.225 src/sys/sys/mbuf.h
cvs rdiff -u -r1.291 -r1.292 src/sys/sys/vnode.h
cvs rdiff -u -r1.17 -r1.18 src/sys/ufs/ufs/ufs_wapbl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gtmr_var.h
diff -u src/sys/arch/arm/cortex/gtmr_var.h:1.13 src/sys/arch/arm/cortex/gtmr_var.h:1.14
--- src/sys/arch/arm/cortex/gtmr_var.h:1.13 Thu Mar 5 08:08:32 2020
+++ src/sys/arch/arm/cortex/gtmr_var.h Thu Mar 5 15:18:54 2020
@@ -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 {
Index: src/sys/arch/arm/include/arm32/machdep.h
diff -u src/sys/arch/arm/include/arm32/machdep.h:1.32 src/sys/arch/arm/include/arm32/machdep.h:1.33
--- src/sys/arch/arm/include/arm32/machdep.h:1.32 Thu Mar 5 08:08:32 2020
+++ src/sys/arch/arm/include/arm32/machdep.h Thu Mar 5 15:18:54 2020
@@ -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
Index: src/sys/arch/hppa/include/param.h
diff -u src/sys/arch/hppa/include/param.h:1.24 src/sys/arch/hppa/include/param.h:1.25
--- src/sys/arch/hppa/include/param.h:1.24 Thu Mar 5 08:08:32 2020
+++ src/sys/arch/hppa/include/param.h Thu Mar 5 15:18:54 2020
@@ -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
Index: src/sys/arch/i386/include/param.h
diff -u src/sys/arch/i386/include/param.h:1.86 src/sys/arch/i386/include/param.h:1.87
--- src/sys/arch/i386/include/param.h:1.86 Thu Mar 5 08:08:33 2020
+++ src/sys/arch/i386/include/param.h Thu Mar 5 15:18:54 2020
@@ -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.
*/
Index: src/sys/dev/audio/audiodef.h
diff -u src/sys/dev/audio/audiodef.h:1.11 src/sys/dev/audio/audiodef.h:1.12
--- src/sys/dev/audio/audiodef.h:1.11 Thu Mar 5 08:08:33 2020
+++ src/sys/dev/audio/audiodef.h Thu Mar 5 15:18:55 2020
@@ -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. */
Index: src/sys/dev/audio/audiovar.h
diff -u src/sys/dev/audio/audiovar.h:1.9 src/sys/dev/audio/audiovar.h:1.10
--- src/sys/dev/audio/audiovar.h:1.9 Thu Mar 5 08:08:33 2020
+++ src/sys/dev/audio/audiovar.h Thu Mar 5 15:18:55 2020
@@ -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>
Index: src/sys/dev/ic/dm9000var.h
diff -u src/sys/dev/ic/dm9000var.h:1.4 src/sys/dev/ic/dm9000var.h:1.5
--- src/sys/dev/ic/dm9000var.h:1.4 Thu Mar 5 08:08:33 2020
+++ src/sys/dev/ic/dm9000var.h Thu Mar 5 15:18:55 2020
@@ -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
Index: src/sys/dev/ic/tcic2var.h
diff -u src/sys/dev/ic/tcic2var.h:1.14 src/sys/dev/ic/tcic2var.h:1.15
--- src/sys/dev/ic/tcic2var.h:1.14 Thu Mar 5 08:08:33 2020
+++ src/sys/dev/ic/tcic2var.h Thu Mar 5 15:18:55 2020
@@ -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>
Index: src/sys/dev/pci/eapvar.h
diff -u src/sys/dev/pci/eapvar.h:1.5 src/sys/dev/pci/eapvar.h:1.6
--- src/sys/dev/pci/eapvar.h:1.5 Thu Mar 5 08:08:33 2020
+++ src/sys/dev/pci/eapvar.h Thu Mar 5 15:18:55 2020
@@ -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>
Index: src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h
diff -u src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h:1.16 src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h:1.17
--- src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h:1.16 Thu Mar 5 08:08:33 2020
+++ src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h Thu Mar 5 15:18:55 2020
@@ -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
Index: src/sys/fs/unionfs/unionfs.h
diff -u src/sys/fs/unionfs/unionfs.h:1.3 src/sys/fs/unionfs/unionfs.h:1.4
--- src/sys/fs/unionfs/unionfs.h:1.3 Thu Mar 5 08:08:33 2020
+++ src/sys/fs/unionfs/unionfs.h Thu Mar 5 15:18:55 2020
@@ -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 {
Index: src/sys/netinet/tcp_var.h
diff -u src/sys/netinet/tcp_var.h:1.191 src/sys/netinet/tcp_var.h:1.192
--- src/sys/netinet/tcp_var.h:1.191 Thu Mar 5 08:08:33 2020
+++ src/sys/netinet/tcp_var.h Thu Mar 5 15:18:55 2020
@@ -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
/*
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.224 src/sys/sys/mbuf.h:1.225
--- src/sys/sys/mbuf.h:1.224 Thu Mar 5 08:08:33 2020
+++ src/sys/sys/mbuf.h Thu Mar 5 15:18:55 2020
@@ -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
Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.291 src/sys/sys/vnode.h:1.292
--- src/sys/sys/vnode.h:1.291 Thu Mar 5 08:08:33 2020
+++ src/sys/sys/vnode.h Thu Mar 5 15:18:55 2020
@@ -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>
Index: src/sys/ufs/ufs/ufs_wapbl.h
diff -u src/sys/ufs/ufs/ufs_wapbl.h:1.17 src/sys/ufs/ufs/ufs_wapbl.h:1.18
--- src/sys/ufs/ufs/ufs_wapbl.h:1.17 Thu Mar 5 08:08:34 2020
+++ src/sys/ufs/ufs/ufs_wapbl.h Thu Mar 5 15:18:55 2020
@@ -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
