diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2002-06-30 17:53:12 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2002-06-30 17:53:12 +0000 |
| commit | e1150713a203c7b933939d575ea80f12c6877665 (patch) | |
| tree | e90efa2f0b6a55e4114028b09fc286948d8516ea /sys/dev/acpica/acpica_support.c | |
| parent | 5577165db58ddb7157c690a8eabdb3df64d3ca38 (diff) | |
| download | FreeBSD-src-e1150713a203c7b933939d575ea80f12c6877665.zip FreeBSD-src-e1150713a203c7b933939d575ea80f12c6877665.tar.gz | |
Resolve conflicts arising from the ACPI CA 20020404 import.
Diffstat (limited to 'sys/dev/acpica/acpica_support.c')
| -rw-r--r-- | sys/dev/acpica/acpica_support.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/acpica/acpica_support.c b/sys/dev/acpica/acpica_support.c index 749edbd..f0ab3a1 100644 --- a/sys/dev/acpica/acpica_support.c +++ b/sys/dev/acpica/acpica_support.c @@ -79,15 +79,13 @@ AcpiEnterSleepStateS4Bios ( AcpiHwBitRegisterWrite (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_LOCK); - acpi_disable_irqs (); + ACPI_DISABLE_IRQS (); AcpiHwDisableNonWakeupGpes(); /* flush caches */ -#ifdef __i386__ - wbinvd(); -#endif + ACPI_FLUSH_CPU_CACHE (); /* write the value to command port and wait until we enter sleep state */ do @@ -99,7 +97,7 @@ AcpiEnterSleepStateS4Bios ( AcpiHwEnableNonWakeupGpes(); - acpi_enable_irqs (); + ACPI_ENABLE_IRQS (); return_ACPI_STATUS (AE_OK); } |
