Module Name: src
Committed By: riastradh
Date: Thu Mar 5 08:08:34 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:
Include opt_diagnostic.h for DIAGNOSTIC.
...at least, in header files, which may not have already included
libkern.h.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/cortex/gtmr_var.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/include/arm32/machdep.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hppa/include/param.h
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/i386/include/param.h
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/audio/audiodef.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/audio/audiovar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/dm9000var.h
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/tcic2var.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/eapvar.h
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/unionfs/unionfs.h
cvs rdiff -u -r1.190 -r1.191 src/sys/netinet/tcp_var.h
cvs rdiff -u -r1.223 -r1.224 src/sys/sys/mbuf.h
cvs rdiff -u -r1.290 -r1.291 src/sys/sys/vnode.h
cvs rdiff -u -r1.16 -r1.17 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.12 src/sys/arch/arm/cortex/gtmr_var.h:1.13
--- src/sys/arch/arm/cortex/gtmr_var.h:1.12 Mon Aug 12 23:31:48 2019
+++ src/sys/arch/arm/cortex/gtmr_var.h Thu Mar 5 08:08:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmr_var.h,v 1.12 2019/08/12 23:31:48 jmcneill Exp $ */
+/* $NetBSD: gtmr_var.h,v 1.13 2020/03/05 08:08:32 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -31,6 +31,10 @@
#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.31 src/sys/arch/arm/include/arm32/machdep.h:1.32
--- src/sys/arch/arm/include/arm32/machdep.h:1.31 Sat Feb 15 08:16:11 2020
+++ src/sys/arch/arm/include/arm32/machdep.h Thu Mar 5 08:08:32 2020
@@ -1,8 +1,12 @@
-/* $NetBSD: machdep.h,v 1.31 2020/02/15 08:16:11 skrll Exp $ */
+/* $NetBSD: machdep.h,v 1.32 2020/03/05 08:08:32 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.23 src/sys/arch/hppa/include/param.h:1.24
--- src/sys/arch/hppa/include/param.h:1.23 Tue Apr 16 12:25:17 2019
+++ src/sys/arch/hppa/include/param.h Thu Mar 5 08:08:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.23 2019/04/16 12:25:17 skrll Exp $ */
+/* $NetBSD: param.h,v 1.24 2020/03/05 08:08:32 riastradh Exp $ */
/* $OpenBSD: param.h,v 1.12 2001/07/06 02:07:41 provos Exp $ */
@@ -22,9 +22,13 @@
* CSL requests users of this software to return to [email protected] any
* improvements that they make and grant CSL redistribution rights.
*
- * Utah $Hdr: param.h 1.18 94/12/16$
+ * 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.85 src/sys/arch/i386/include/param.h:1.86
--- src/sys/arch/i386/include/param.h:1.85 Tue Aug 20 12:33:04 2019
+++ src/sys/arch/i386/include/param.h Thu Mar 5 08:08:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.85 2019/08/20 12:33:04 riastradh Exp $ */
+/* $NetBSD: param.h,v 1.86 2020/03/05 08:08:33 riastradh Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -37,6 +37,10 @@
#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.10 src/sys/dev/audio/audiodef.h:1.11
--- src/sys/dev/audio/audiodef.h:1.10 Sun Feb 23 07:17:01 2020
+++ src/sys/dev/audio/audiodef.h Thu Mar 5 08:08:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: audiodef.h,v 1.10 2020/02/23 07:17:01 isaki Exp $ */
+/* $NetBSD: audiodef.h,v 1.11 2020/03/05 08:08:33 riastradh Exp $ */
/*
* Copyright (C) 2017 Tetsuya Isaki. All rights reserved.
@@ -31,6 +31,7 @@
#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.8 src/sys/dev/audio/audiovar.h:1.9
--- src/sys/dev/audio/audiovar.h:1.8 Sun Feb 23 07:17:01 2020
+++ src/sys/dev/audio/audiovar.h Thu Mar 5 08:08:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: audiovar.h,v 1.8 2020/02/23 07:17:01 isaki Exp $ */
+/* $NetBSD: audiovar.h,v 1.9 2020/03/05 08:08:33 riastradh Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -67,6 +67,10 @@
#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.3 src/sys/dev/ic/dm9000var.h:1.4
--- src/sys/dev/ic/dm9000var.h:1.3 Thu Apr 19 21:50:08 2018
+++ src/sys/dev/ic/dm9000var.h Thu Mar 5 08:08:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dm9000var.h,v 1.3 2018/04/19 21:50:08 christos Exp $ */
+/* $NetBSD: dm9000var.h,v 1.4 2020/03/05 08:08:33 riastradh Exp $ */
/*
* Copyright (c) 2009 Paul Fleischer
@@ -63,6 +63,10 @@
#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.13 src/sys/dev/ic/tcic2var.h:1.14
--- src/sys/dev/ic/tcic2var.h:1.13 Sat Oct 27 17:18:23 2012
+++ src/sys/dev/ic/tcic2var.h Thu Mar 5 08:08:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2var.h,v 1.13 2012/10/27 17:18:23 chs Exp $ */
+/* $NetBSD: tcic2var.h,v 1.14 2020/03/05 08:08:33 riastradh Exp $ */
/*
* Copyright (c) 1998, 1999 Christoph Badura. All rights reserved.
@@ -33,6 +33,10 @@
#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.4 src/sys/dev/pci/eapvar.h:1.5
--- src/sys/dev/pci/eapvar.h:1.4 Wed Nov 23 23:07:35 2011
+++ src/sys/dev/pci/eapvar.h Thu Mar 5 08:08:33 2020
@@ -1,4 +1,8 @@
-/* $NetBSD: eapvar.h,v 1.4 2011/11/23 23:07:35 jmcneill Exp $ */
+/* $NetBSD: eapvar.h,v 1.5 2020/03/05 08:08:33 riastradh Exp $ */
+
+#ifdef _KERNEL_OPT
+#include "opt_diagnostic.h"
+#endif
#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.15 src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h:1.16
--- src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h:1.15 Sun Jan 20 23:14:16 2019
+++ src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h Thu Mar 5 08:08:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sljitConfig.h,v 1.15 2019/01/20 23:14:16 alnsn Exp $ */
+/* $NetBSD: sljitConfig.h,v 1.16 2020/03/05 08:08:33 riastradh Exp $ */
/*
* Stack-less Just-In-Time compiler
@@ -74,6 +74,10 @@
#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.2 src/sys/fs/unionfs/unionfs.h:1.3
--- src/sys/fs/unionfs/unionfs.h:1.2 Sat Jun 28 01:34:05 2008
+++ src/sys/fs/unionfs/unionfs.h Thu Mar 5 08:08:33 2020
@@ -39,6 +39,10 @@
#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.190 src/sys/netinet/tcp_var.h:1.191
--- src/sys/netinet/tcp_var.h:1.190 Thu Dec 27 16:59:17 2018
+++ src/sys/netinet/tcp_var.h Thu Mar 5 08:08:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_var.h,v 1.190 2018/12/27 16:59:17 maxv Exp $ */
+/* $NetBSD: tcp_var.h,v 1.191 2020/03/05 08:08:33 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.223 src/sys/sys/mbuf.h:1.224
--- src/sys/sys/mbuf.h:1.223 Sat Feb 29 16:59:00 2020
+++ src/sys/sys/mbuf.h Thu Mar 5 08:08:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.223 2020/02/29 16:59:00 mlelstv Exp $ */
+/* $NetBSD: mbuf.h,v 1.224 2020/03/05 08:08:33 riastradh Exp $ */
/*
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -65,6 +65,7 @@
#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.290 src/sys/sys/vnode.h:1.291
--- src/sys/sys/vnode.h:1.290 Thu Feb 27 22:12:54 2020
+++ src/sys/sys/vnode.h Thu Mar 5 08:08:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode.h,v 1.290 2020/02/27 22:12:54 ad Exp $ */
+/* $NetBSD: vnode.h,v 1.291 2020/03/05 08:08:33 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -60,6 +60,10 @@
#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.16 src/sys/ufs/ufs/ufs_wapbl.h:1.17
--- src/sys/ufs/ufs/ufs_wapbl.h:1.16 Mon Dec 10 20:48:34 2018
+++ src/sys/ufs/ufs/ufs_wapbl.h Thu Mar 5 08:08:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_wapbl.h,v 1.16 2018/12/10 20:48:34 jdolecek Exp $ */
+/* $NetBSD: ufs_wapbl.h,v 1.17 2020/03/05 08:08:34 riastradh Exp $ */
/*-
* Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc.
@@ -34,6 +34,7 @@
#define _UFS_UFS_UFS_WAPBL_H_
#if defined(_KERNEL_OPT)
+#include "opt_diagnostic.h"
#include "opt_wapbl.h"
#endif
