diff options
author | jhb <jhb@FreeBSD.org> | 2003-11-03 22:18:57 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2003-11-03 22:18:57 +0000 |
commit | 84abbca28e95334b664821f449657630b393c81d (patch) | |
tree | c6c03b6de1c2a83abde25d3163ec5e2fc01a5a9f /sys/i386/acpica | |
parent | 327da318828eafb923998bcfabad3a228e798d1e (diff) | |
download | FreeBSD-src-84abbca28e95334b664821f449657630b393c81d.zip FreeBSD-src-84abbca28e95334b664821f449657630b393c81d.tar.gz |
- Update includes.
- Use intr_suspend/resume() callouts to the interrupt code layer which
suspends and resumes all the known interrupt sources instead of calling
icu_reinit() directly.
Diffstat (limited to 'sys/i386/acpica')
-rw-r--r-- | sys/i386/acpica/acpi_wakeup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c index 5be0c2f..83e7c01 100644 --- a/sys/i386/acpica/acpi_wakeup.c +++ b/sys/i386/acpica/acpi_wakeup.c @@ -47,10 +47,9 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/cpufunc.h> +#include <machine/intr_machdep.h> #include <machine/segments.h> -#include <i386/isa/intr_machdep.h> - #include "acpi.h" #include <dev/acpica/acpivar.h> @@ -222,6 +221,8 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) ret_addr = 0; if (acpi_savecpu()) { /* Execute Sleep */ + intr_suspend(); + p_gdt = (struct region_descriptor *) (sc->acpi_wakeaddr + physical_gdt); p_gdt->rd_limit = r_gdt.rd_limit; @@ -271,7 +272,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) #if 0 initializecpu(); #endif - icu_reinit(); + intr_resume(); if (acpi_get_verbose(sc)) { acpi_savecpu(); |