diff options
author | Gordon Willem Klok <gwk@cvs.openbsd.org> | 2007-01-31 23:30:52 +0000 |
---|---|---|
committer | Gordon Willem Klok <gwk@cvs.openbsd.org> | 2007-01-31 23:30:52 +0000 |
commit | 21863e52dc1f57db88c638692064e42cf6eb19be (patch) | |
tree | ecd20330ba66f373ec27b0e499a06b741629522b /sys/arch/i386 | |
parent | 63034cae876e861e61d3f799f694fd2113f446dc (diff) |
Introduce acpi_hasprocfvs thats "ACPI Has Processor Frequency and Voltage
Scalling" a global flag set by acicpu attach to indicate that ACPI is
handling fvs through the _PSS objects. This will fix disappearing
EST/powernow when booting kernels with acpi enabled, as acpicpu isnt
compiled into GENERIC yet. Also in cases where acpicpu is built in and
legacy EST/powernow work but acpi is missing the _PSS object, the legacy
routines will be used.
tested by dim@, and Nick Nauwelaerts <nick AT nauwelaerts.net>
ok marco@, dim@
Diffstat (limited to 'sys/arch/i386')
-rw-r--r-- | sys/arch/i386/i386/mainbus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c index b476f7e2c1b..5f25912c98e 100644 --- a/sys/arch/i386/i386/mainbus.c +++ b/sys/arch/i386/i386/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.31 2006/12/14 17:36:12 kettenis Exp $ */ +/* $OpenBSD: mainbus.c,v 1.32 2007/01/31 23:30:51 gwk Exp $ */ /* $NetBSD: mainbus.c,v 1.21 1997/06/06 23:14:20 thorpej Exp $ */ /* @@ -204,7 +204,7 @@ mainbus_attach(struct device *parent, struct device *self, void *aux) } #if NACPI > 0 - if (!acpi_attached) + if (!acpi_hasprocfvs) #endif { if (setperf_setup != NULL) @@ -212,7 +212,7 @@ mainbus_attach(struct device *parent, struct device *self, void *aux) } #if NVESABIOS > 0 - if (vbeprobe()) { + if (vbeprobe()) { mba.mba_busname = "vesabios"; config_found(self, &mba.mba_busname, NULL); } |