summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2003-10-22 22:27:49 +0000
committernjl <njl@FreeBSD.org>2003-10-22 22:27:49 +0000
commit67f989102eee011901934c1698e4acd52f868f95 (patch)
tree2c73fb087cf8693979e9443b209916bf106ca087 /sys
parent966f1ed0b55b12505e5d036f34b61e0af17dcd04 (diff)
downloadFreeBSD-src-67f989102eee011901934c1698e4acd52f868f95.zip
FreeBSD-src-67f989102eee011901934c1698e4acd52f868f95.tar.gz
Add the ACPICA_PEDANTIC option which is off by default. Enabling it will
enable strict checks of the AML. Our default behavior will be to relax checks to work on as many platforms as possible. Also clean up and document other ACPI options while I'm here.
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/NOTES2
-rw-r--r--sys/conf/options3
-rw-r--r--sys/i386/conf/NOTES11
3 files changed, 13 insertions, 3 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 57db21a..ecc03d9 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2393,8 +2393,6 @@ options KSTACK_MAX_PAGES=32 # Maximum pages to give the kernel stack
# Yet more undocumented options for linting.
options AAC_DEBUG
-options ACPI_MAX_THREADS=1
-#!options ACPI_NO_SEMAPHORES
# Broken:
##options ASR_MEASURE_PERFORMANCE
# BKTR_ALLOC_PAGES has no effect except to cause warnings, and
diff --git a/sys/conf/options b/sys/conf/options
index d9af537..f08e6a8 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -594,8 +594,9 @@ WITNESS_SKIPSPIN opt_witness.h
# options for ACPI support
ACPI_DEBUG opt_acpi.h
-ACPI_NO_SEMAPHORES opt_acpi.h
ACPI_MAX_THREADS opt_acpi.h
+ACPI_NO_SEMAPHORES opt_acpi.h
+ACPICA_PEDANTIC opt_acpi.h
# options for DEVFS, see sys/fs/devfs/devfs.h
NDEVFSINO opt_devfs.h
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index ddb7da5..3dc0839 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -410,11 +410,22 @@ options TDFX_LINUX # Enable Linuxulator support
# Intel ACPICA code. (Note that the Intel code must also have USE_DEBUGGER
# defined when it is built).
#
+# ACPI_MAX_THREADS sets the number of task threads started.
+#
+# ACPI_NO_SEMAPHORES makes the AcpiOs*Semaphore routines a no-op.
+#
+# ACPICA_PEDANTIC enables strict checking of AML. Our default is to
+# relax these checks to allow code generated by the Microsoft compiler
+# to still execute.
+#
# Note that building ACPI into the kernel is deprecated; the module is
# normally loaded automatically by the loader.
#
device acpi
options ACPI_DEBUG
+options ACPI_MAX_THREADS=1
+#options ACPI_NO_SEMAPHORES
+#options ACPICA_PEDANTIC
# DRM options:
# mgadrm: AGP Matrox G200, G400, G450, G550
OpenPOWER on IntegriCloud