summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/conf/LOCKDOC12
-rw-r--r--sys/arch/i386/conf/files.i3863
2 files changed, 9 insertions, 6 deletions
diff --git a/sys/arch/i386/conf/LOCKDOC b/sys/arch/i386/conf/LOCKDOC
index a5f8b4c5ce9..955fa29fec2 100644
--- a/sys/arch/i386/conf/LOCKDOC
+++ b/sys/arch/i386/conf/LOCKDOC
@@ -111,21 +111,21 @@ options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # inexpensive kernel consistency checks
# XXX to be commented out on release branch
-#options DEBUG # expensive debugging checks/support
-#options LOCKDEBUG # expensive locking checks/support
-options DDB # in-kernel debugger
+options DEBUG # expensive debugging checks/support
+options LOCKDEBUG # expensive locking checks/support. Also triggers LOCKDOC experiments
+#options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
-options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+#options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options DDB_VERBOSE_HELP
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions DEBUG="-g" # compile full symbol table
+makeoptions DEBUG="-g" # compile full symbol table
#options KUBSAN # Kernel Undefined Behavior Sanitizer (kUBSan)
#options UBSAN_ALWAYS_FATAL # (optional) Panic on all kUBSan reports
#options SYSCALL_STATS # per syscall counts
#options SYSCALL_TIMES # per syscall times
#options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris)
-options KDTRACE_HOOKS # kernel DTrace hooks
+#options KDTRACE_HOOKS # kernel DTrace hooks
# Kernel Code Coverage Driver.
makeoptions KCOV=1
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index e6321081a00..628d792929a 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -47,6 +47,9 @@ defparam opt_beep.h BEEP_ONHALT_COUNT=3
defparam opt_beep.h BEEP_ONHALT_PITCH=1500
defparam opt_beep.h BEEP_ONHALT_PERIOD=250
+
+file lockdoc/log.c lockdebug
+
# Multiboot support
defflag opt_multiboot.h MULTIBOOT
obsolete defparam MULTIBOOT_SYMTAB_SPACE