diff options
author | obrien <obrien@FreeBSD.org> | 2002-08-09 06:07:33 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2002-08-09 06:07:33 +0000 |
commit | 60f8c41a919546caea6cffa295e98b5f21e9a4f0 (patch) | |
tree | 48bfd2ae4acf163f980466bca782deb3ce35239c /sys | |
parent | 1bb6530f3efbe0c060a4269111940205153e87a5 (diff) | |
download | FreeBSD-src-60f8c41a919546caea6cffa295e98b5f21e9a4f0.zip FreeBSD-src-60f8c41a919546caea6cffa295e98b5f21e9a4f0.tar.gz |
Restore autoloading of ACPI module.
Document the approved ways of disabling it.
Submitted by: Daniel O'Connor <doconnor@gsoft.com.au>
Diffstat (limited to 'sys')
-rw-r--r-- | sys/boot/common/loader.8 | 4 | ||||
-rw-r--r-- | sys/boot/i386/libi386/i386_module.c | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8 index 42131a6..ecdc688 100644 --- a/sys/boot/common/loader.8 +++ b/sys/boot/common/loader.8 @@ -310,6 +310,10 @@ While some of these may require a value, others define behavior just by being set. These are described below. .Bl -tag -width bootfile +.It Va acpi_load +Unset this to disable automatic loading of the ACPI module. +See also hint.acpi.0.disable in +.Xr device.hints 5 . .It Va autoboot_delay Number of seconds .Ic autoboot diff --git a/sys/boot/i386/libi386/i386_module.c b/sys/boot/i386/libi386/i386_module.c index a51a488..5c29aee 100644 --- a/sys/boot/i386/libi386/i386_module.c +++ b/sys/boot/i386/libi386/i386_module.c @@ -47,5 +47,13 @@ i386_autoload(void) /* XXX use PnP to locate stuff here */ + /* autoload ACPI support */ + /* XXX should be in 4th keyed off acpi_load */ + if ((getenv("acpi_load") && !getenv("hint.acpi.0.disable"))) { + error = mod_load("acpi", NULL, 0, NULL); + if (error != 0) + printf("ACPI autoload failed - %s\n", strerror(error)); + } + return(0); } |