Page MenuHomeFreeBSD

D28152.id82276.diff
No OneTemporary

D28152.id82276.diff

diff --git a/sys/amd64/conf/GENERIC-NODEBUG b/sys/amd64/conf/GENERIC-NODEBUG
--- a/sys/amd64/conf/GENERIC-NODEBUG
+++ b/sys/amd64/conf/GENERIC-NODEBUG
@@ -27,17 +27,6 @@
# $FreeBSD$
include GENERIC
+include "../../conf/std.nodebug"
ident GENERIC-NODEBUG
-
-nooptions INVARIANTS
-nooptions INVARIANT_SUPPORT
-nooptions WITNESS
-nooptions WITNESS_SKIPSPIN
-nooptions BUF_TRACKING
-nooptions DEADLKRES
-nooptions FULL_BUF_TRACKING
-nooptions COVERAGE
-nooptions KCOV
-nooptions MALLOC_DEBUG_MAXZONES
-nooptions QUEUE_MACRO_DEBUG_TRASH
diff --git a/sys/arm/conf/GENERIC-NODEBUG b/sys/arm/conf/GENERIC-NODEBUG
--- a/sys/arm/conf/GENERIC-NODEBUG
+++ b/sys/arm/conf/GENERIC-NODEBUG
@@ -27,12 +27,6 @@
# $FreeBSD$
include GENERIC
+include "../../conf/std.nodebug"
ident GENERIC-NODEBUG
-
-nooptions INVARIANTS
-nooptions INVARIANT_SUPPORT
-nooptions WITNESS
-nooptions WITNESS_SKIPSPIN
-nooptions DEADLKRES
-nooptions MALLOC_DEBUG_MAXZONES
diff --git a/sys/arm64/conf/GENERIC-NODEBUG b/sys/arm64/conf/GENERIC-NODEBUG
--- a/sys/arm64/conf/GENERIC-NODEBUG
+++ b/sys/arm64/conf/GENERIC-NODEBUG
@@ -27,16 +27,6 @@
# $FreeBSD$
include GENERIC
+include "../../conf/std.nodebug"
ident GENERIC-NODEBUG
-
-nooptions INVARIANTS
-nooptions INVARIANT_SUPPORT
-nooptions WITNESS
-nooptions WITNESS_SKIPSPIN
-nooptions DEADLKRES
-nooptions USB_DEBUG
-nooptions HID_DEBUG
-nooptions COVERAGE
-nooptions KCOV
-nooptions MALLOC_DEBUG_MAXZONES
diff --git a/sys/conf/std.nodebug b/sys/conf/std.nodebug
new file mode 100644
--- /dev/null
+++ b/sys/conf/std.nodebug
@@ -0,0 +1,23 @@
+#
+# std.nodebug -- Disable the debug options found in the GENERIC kernel config.
+#
+
+nooptions INVARIANTS
+nooptions INVARIANT_SUPPORT
+nooptions WITNESS
+nooptions WITNESS_SKIPSPIN
+nooptions BUF_TRACKING
+nooptions FULL_BUF_TRACKING
+nooptions DEADLKRES
+nooptions COVERAGE
+nooptions KCOV
+nooptions MALLOC_DEBUG_MAXZONES
+nooptions QUEUE_MACRO_DEBUG_TRASH
+
+# USB debugging
+nooptions USB_DEBUG
+nooptions HID_DEBUG
+
+# CAM debugging
+nooptions CAMDEBUG
+nooptions CAM_DEBUG_FLAGS
diff --git a/sys/i386/conf/GENERIC-NODEBUG b/sys/i386/conf/GENERIC-NODEBUG
--- a/sys/i386/conf/GENERIC-NODEBUG
+++ b/sys/i386/conf/GENERIC-NODEBUG
@@ -27,12 +27,6 @@
# $FreeBSD$
include GENERIC
+include "../../conf/std.nodebug"
ident GENERIC-NODEBUG
-
-nooptions INVARIANTS
-nooptions INVARIANT_SUPPORT
-nooptions WITNESS
-nooptions WITNESS_SKIPSPIN
-nooptions DEADLKRES
-nooptions MALLOC_DEBUG_MAXZONES
diff --git a/sys/powerpc/conf/GENERIC-NODEBUG b/sys/powerpc/conf/GENERIC-NODEBUG
--- a/sys/powerpc/conf/GENERIC-NODEBUG
+++ b/sys/powerpc/conf/GENERIC-NODEBUG
@@ -27,12 +27,6 @@
# $FreeBSD$
include GENERIC
+include "../../conf/std.nodebug"
ident GENERIC-NODEBUG
-
-nooptions INVARIANTS
-nooptions INVARIANT_SUPPORT
-nooptions WITNESS
-nooptions WITNESS_SKIPSPIN
-nooptions DEADLKRES
-nooptions MALLOC_DEBUG_MAXZONES
diff --git a/sys/riscv/conf/GENERIC-NODEBUG b/sys/riscv/conf/GENERIC-NODEBUG
--- a/sys/riscv/conf/GENERIC-NODEBUG
+++ b/sys/riscv/conf/GENERIC-NODEBUG
@@ -27,16 +27,6 @@
# $FreeBSD$
include GENERIC
+include "../../conf/std.nodebug"
ident GENERIC-NODEBUG
-
-nooptions INVARIANTS
-nooptions INVARIANT_SUPPORT
-nooptions WITNESS
-nooptions WITNESS_SKIPSPIN
-nooptions BUF_TRACKING
-nooptions DEADLKRES
-nooptions FULL_BUF_TRACKING
-nooptions COVERAGE
-nooptions KCOV
-nooptions MALLOC_DEBUG_MAXZONES

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 20, 12:37 PM (11 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31819096
Default Alt Text
D28152.id82276.diff (3 KB)

Event Timeline