system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-20 08:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

s/hint.acpi.0.disable/hint.acpi.0.disabled/

Browse source 
Fix device hints entry for disabling acpi(4).
This also should fix the arbitration with apm(4) when both drivers
are enabled.

Note that your /boot/device.hints needs to be updated if you want to
stop auto-loading acpi.ko or disable acpi(4).
This commit is contained in:
Mitsuru IWASAKI 2002-08-30 11:11:07 +00:00
parent 2281085897
commit 6c40705212
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=102612
5 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
share/man/man5/device.hints.5
View file

@ -145,7 +145,7 @@ hint.sio.0.irq="4"
The following example disables the ACPI driver
.Bd -literal -offset indent
hint.acpi.0.disable="1"
hint.acpi.0.disabled="1"
.Ed
.\" .Pp
.\" A control variable may look like:

2
sys/boot/common/loader.8
View file

@ -313,7 +313,7 @@ These are described below.
.It Va acpi_load
Unset this to disable automatic loading of the ACPI module.
See also
.Va hint.acpi.0.disable
.Va hint.acpi.0.disabled
in
.Xr device.hints 5 .
.It Va autoboot_delay

2
sys/boot/i386/libi386/i386_module.c
View file

@ -49,7 +49,7 @@ i386_autoload(void)
/* autoload ACPI support */
/* XXX should be in 4th keyed off acpi_load */
if ((getenv("acpi_load") && !getenv("hint.acpi.0.disable"))) {
if ((getenv("acpi_load") && !getenv("hint.acpi.0.disabled"))) {
error = mod_load("acpi", NULL, 0, NULL);
if (error != 0)
printf("ACPI autoload failed - %s\n", strerror(error));

2
sys/boot/i386/loader/help.i386
View file

@ -7,7 +7,7 @@
unset acpi_load
$hint.acpi.0.disable="1"
$hint.acpi.0.disabled="1"
If set, the ACPI module won't be loaded.

5
sys/dev/acpica/acpi.c
View file

@ -2118,6 +2118,11 @@ acpi_pm_func(u_long cmd, void *arg, ...)
static void
acpi_pm_register(void *arg)
{
int error;
if (!resource_int_value("acpi", 0, "disabled", &error) &&
(error != 0))
return;
power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, NULL);
}