Module Name: src
Committed By: chs
Date: Sat Jan 16 23:51:51 UTC 2021
Modified Files:
src/sys/arch/arm/arm: psci.c
src/sys/conf: files
src/sys/lib/libkern: libkern.h
src/sys/lib/libkern/arch/hppa: bcopy.S
src/sys/sys: cdefs.h queue.h
Log Message:
remove unused "_DIAGNOSTIC" option and opt_diagnostic.h.
note that this is unrelated to the widely used "DIAGNOSTIC" option.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/arm/psci.c
cvs rdiff -u -r1.1277 -r1.1278 src/sys/conf/files
cvs rdiff -u -r1.140 -r1.141 src/sys/lib/libkern/libkern.h
cvs rdiff -u -r1.15 -r1.16 src/sys/lib/libkern/arch/hppa/bcopy.S
cvs rdiff -u -r1.155 -r1.156 src/sys/sys/cdefs.h
cvs rdiff -u -r1.75 -r1.76 src/sys/sys/queue.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/arm/psci.c
diff -u src/sys/arch/arm/arm/psci.c:1.4 src/sys/arch/arm/arm/psci.c:1.5
--- src/sys/arch/arm/arm/psci.c:1.4 Fri Dec 4 08:00:53 2020
+++ src/sys/arch/arm/arm/psci.c Sat Jan 16 23:51:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: psci.c,v 1.4 2020/12/04 08:00:53 skrll Exp $ */
+/* $NetBSD: psci.c,v 1.5 2021/01/16 23:51:50 chs Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -26,10 +26,8 @@
* SUCH DAMAGE.
*/
-#include "opt_diagnostic.h"
-
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psci.c,v 1.4 2020/12/04 08:00:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psci.c,v 1.5 2021/01/16 23:51:50 chs Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1277 src/sys/conf/files:1.1278
--- src/sys/conf/files:1.1277 Tue Oct 27 08:57:11 2020
+++ src/sys/conf/files Sat Jan 16 23:51:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1277 2020/10/27 08:57:11 ryo Exp $
+# $NetBSD: files,v 1.1278 2021/01/16 23:51:50 chs Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -27,7 +27,6 @@ defflag opt_modular.h MODULAR
defflag opt_modular.h MODULAR_DEFAULT_AUTOLOAD
defflag KEYLOCK
defparam opt_syslimits.h CHILD_MAX OPEN_MAX
-defflag opt_diagnostic.h _DIAGNOSTIC
defflag GPROF
defflag KASAN
defflag opt_kasan.h KASAN_PANIC
Index: src/sys/lib/libkern/libkern.h
diff -u src/sys/lib/libkern/libkern.h:1.140 src/sys/lib/libkern/libkern.h:1.141
--- src/sys/lib/libkern/libkern.h:1.140 Fri Apr 17 17:24:46 2020
+++ src/sys/lib/libkern/libkern.h Sat Jan 16 23:51:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: libkern.h,v 1.140 2020/04/17 17:24:46 maxv Exp $ */
+/* $NetBSD: libkern.h,v 1.141 2021/01/16 23:51:51 chs Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -35,7 +35,6 @@
#define _LIB_LIBKERN_LIBKERN_H_
#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
#include "opt_kasan.h"
#include "opt_kcsan.h"
#include "opt_kmsan.h"
Index: src/sys/lib/libkern/arch/hppa/bcopy.S
diff -u src/sys/lib/libkern/arch/hppa/bcopy.S:1.15 src/sys/lib/libkern/arch/hppa/bcopy.S:1.16
--- src/sys/lib/libkern/arch/hppa/bcopy.S:1.15 Sun Aug 30 07:55:45 2015
+++ src/sys/lib/libkern/arch/hppa/bcopy.S Sat Jan 16 23:51:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopy.S,v 1.15 2015/08/30 07:55:45 uebayasi Exp $ */
+/* $NetBSD: bcopy.S,v 1.16 2021/01/16 23:51:51 chs Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,6 @@
#if defined(SPCOPY) && !defined(_STANDALONE)
-#include "opt_diagnostic.h"
#include "opt_multiprocessor.h"
#include <machine/cpu.h>
@@ -50,7 +49,7 @@
#include <machine/reg.h>
#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: bcopy.S,v 1.15 2015/08/30 07:55:45 uebayasi Exp $")
+RCSID("$NetBSD: bcopy.S,v 1.16 2021/01/16 23:51:51 chs Exp $")
#endif /* LIBC_SCCS and not lint */
/*
Index: src/sys/sys/cdefs.h
diff -u src/sys/sys/cdefs.h:1.155 src/sys/sys/cdefs.h:1.156
--- src/sys/sys/cdefs.h:1.155 Fri Dec 4 20:38:44 2020
+++ src/sys/sys/cdefs.h Sat Jan 16 23:51:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cdefs.h,v 1.155 2020/12/04 20:38:44 christos Exp $ */
+/* $NetBSD: cdefs.h,v 1.156 2021/01/16 23:51:51 chs Exp $ */
/* * Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -36,10 +36,6 @@
#ifndef _SYS_CDEFS_H_
#define _SYS_CDEFS_H_
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
-
/*
* Macro to test if we're using a GNU C compiler of a specific vintage
* or later, for e.g. features that appeared in a particular version
Index: src/sys/sys/queue.h
diff -u src/sys/sys/queue.h:1.75 src/sys/sys/queue.h:1.76
--- src/sys/sys/queue.h:1.75 Tue Oct 20 23:27:58 2020
+++ src/sys/sys/queue.h Sat Jan 16 23:51:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: queue.h,v 1.75 2020/10/20 23:27:58 kamil Exp $ */
+/* $NetBSD: queue.h,v 1.76 2021/01/16 23:51:51 chs Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -83,12 +83,9 @@
#include <sys/null.h>
#endif
-#if defined(_KERNEL) && defined(_KERNEL_OPT)
-#include "opt_diagnostic.h"
-#ifdef DIAGNOSTIC
+#if defined(_KERNEL) && defined(DIAGNOSTIC)
#define QUEUEDEBUG 1
#endif
-#endif
#if defined(QUEUEDEBUG)
# if defined(_KERNEL)
