summaryrefslogtreecommitdiffstats
path: root/sys/x86
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2014-12-22 21:32:39 +0000
committerjhb <jhb@FreeBSD.org>2014-12-22 21:32:39 +0000
commit5ae50f92a8ff8229d56cc9462a1c3df5032d186b (patch)
tree3fa3dcfc9a65568b6d8ac45849bc58c6d2d9af7a /sys/x86
parent2194e370615972dfe133b82534e6c48764ab9d27 (diff)
downloadFreeBSD-src-5ae50f92a8ff8229d56cc9462a1c3df5032d186b.zip
FreeBSD-src-5ae50f92a8ff8229d56cc9462a1c3df5032d186b.tar.gz
MFC 273988,273989,273995,274057:
MFamd64: Add support for extended FPU states on i386. This includes support for AVX on i386.
Diffstat (limited to 'sys/x86')
-rw-r--r--sys/x86/acpica/acpi_wakeup.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/x86/acpica/acpi_wakeup.c b/sys/x86/acpica/acpi_wakeup.c
index 3d5e1fe..74522be 100644
--- a/sys/x86/acpica/acpi_wakeup.c
+++ b/sys/x86/acpica/acpi_wakeup.c
@@ -211,7 +211,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state)
#ifdef __amd64__
fpususpend(susppcbs[0]->sp_fpususpend);
#elif defined(DEV_NPX)
- npxsuspend(&susppcbs[0]->sp_fpususpend);
+ npxsuspend(susppcbs[0]->sp_fpususpend);
#endif
#ifdef SMP
if (!CPU_EMPTY(&suspcpus) && suspend_cpus(suspcpus) == 0) {
@@ -248,7 +248,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state)
#ifdef __amd64__
fpuresume(susppcbs[0]->sp_fpususpend);
#elif defined(DEV_NPX)
- npxresume(&susppcbs[0]->sp_fpususpend);
+ npxresume(susppcbs[0]->sp_fpususpend);
#endif
}
@@ -327,9 +327,7 @@ acpi_alloc_wakeup_handler(void)
susppcbs = malloc(mp_ncpus * sizeof(*susppcbs), M_DEVBUF, M_WAITOK);
for (i = 0; i < mp_ncpus; i++) {
susppcbs[i] = malloc(sizeof(**susppcbs), M_DEVBUF, M_WAITOK);
-#ifdef __amd64__
susppcbs[i]->sp_fpususpend = alloc_fpusave(M_WAITOK);
-#endif
}
return (wakeaddr);
OpenPOWER on IntegriCloud