diff options
author | njl <njl@FreeBSD.org> | 2003-09-08 06:22:54 +0000 |
---|---|---|
committer | njl <njl@FreeBSD.org> | 2003-09-08 06:22:54 +0000 |
commit | 6e452678be44b116f644b1132c92ea48b0a75baa (patch) | |
tree | 0d33d3d782f9aff917642610fde97c11bbd01df3 /sys | |
parent | 81a5dc108d0dbc8195066d40a5551a64f03bd689 (diff) | |
download | FreeBSD-src-6e452678be44b116f644b1132c92ea48b0a75baa.zip FreeBSD-src-6e452678be44b116f644b1132c92ea48b0a75baa.tar.gz |
Don't disable interrupts a second time. Remove an extraneous interrupt
enable (that happens elsewhere). Clarify the interrupt disabling point
by using ACPI_DISABLE_IRQS().
Tested by: Kevin Oberman
Diffstat (limited to 'sys')
-rw-r--r-- | sys/i386/acpica/acpi_wakeup.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c index 106df55..0024287 100644 --- a/sys/i386/acpica/acpi_wakeup.c +++ b/sys/i386/acpica/acpi_wakeup.c @@ -199,7 +199,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) AcpiSetFirmwareWakingVector(sc->acpi_wakephys); ef = read_eflags(); - disable_intr(); + ACPI_DISABLE_IRQS(); /* Create Identity Mapping */ if ((p = curproc) == NULL) @@ -254,13 +254,10 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) acpi_printcpu(); /* Call ACPICA to enter the desired sleep state */ - ACPI_DISABLE_IRQS(); - ACPI_FLUSH_CPU_CACHE(); if (state == ACPI_STATE_S4 && sc->acpi_s4bios) status = AcpiEnterSleepStateS4bios(); else status = AcpiEnterSleepState(state); - ACPI_ENABLE_IRQS(); if (status != AE_OK) { device_printf(sc->acpi_dev, |