diff options
| author | jhb <jhb@FreeBSD.org> | 2009-08-20 19:17:53 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2009-08-20 19:17:53 +0000 |
| commit | 9b0755de9f1e9517732f96a37f0ef30b8db23811 (patch) | |
| tree | ee9b2a74c07c732ee357d4810494c3b6aecd6e71 /sys/i386/acpica | |
| parent | ab0b6203abac22f7fa981c24cf452d3dab032727 (diff) | |
| download | FreeBSD-src-9b0755de9f1e9517732f96a37f0ef30b8db23811.zip FreeBSD-src-9b0755de9f1e9517732f96a37f0ef30b8db23811.tar.gz | |
Temporarily revert the new-bus locking for 8.0 release. It will be
reintroduced after HEAD is reopened for commits by re@.
Approved by: re (kib), attilio
Diffstat (limited to 'sys/i386/acpica')
| -rw-r--r-- | sys/i386/acpica/acpi_machdep.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c index 4568671..e26cce9 100644 --- a/sys/i386/acpica/acpi_machdep.c +++ b/sys/i386/acpica/acpi_machdep.c @@ -164,7 +164,6 @@ acpi_capm_get_info(apm_info_t aip) else aip->ai_acline = acline; /* on/off */ - newbus_slock(); if (acpi_battery_get_battinfo(NULL, &batt) != 0) { aip->ai_batt_stat = APM_UNKNOWN; aip->ai_batt_life = APM_UNKNOWN; @@ -176,7 +175,6 @@ acpi_capm_get_info(apm_info_t aip) aip->ai_batt_time = (batt.min == -1) ? -1 : batt.min * 60; aip->ai_batteries = acpi_battery_get_units(); } - newbus_sunlock(); return (0); } @@ -192,7 +190,6 @@ acpi_capm_get_pwstatus(apm_pwstatus_t app) (app->ap_device < PMDV_BATT0 || app->ap_device > PMDV_BATT_ALL)) return (1); - newbus_slock(); if (app->ap_device == PMDV_ALLDEV) error = acpi_battery_get_battinfo(NULL, &batt); else { @@ -203,7 +200,6 @@ acpi_capm_get_pwstatus(apm_pwstatus_t app) else error = ENXIO; } - newbus_sunlock(); if (error) return (1); @@ -287,9 +283,7 @@ apmopen(struct cdev *dev, int flag, int fmt, struct thread *td) struct acpi_softc *acpi_sc; struct apm_clone_data *clone; - newbus_slock(); acpi_sc = devclass_get_softc(devclass_find("acpi"), 0); - newbus_sunlock(); clone = apm_create_clone(dev, acpi_sc); dev->si_drv1 = clone; |
