summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Irofti <pirofti@cvs.openbsd.org>2009-11-22 22:00:26 +0000
committerPaul Irofti <pirofti@cvs.openbsd.org>2009-11-22 22:00:26 +0000
commitf8fb5eeb35a44ff60fd4b72482b44fdcc6ae24d9 (patch)
tree6dde21b6f6ad73383d017dfa2ae9a28848b8c788
parente77b0b834bacf5c44e7aff10e896a1d6edbdffdd (diff)
Check for ISA before calling the setup function.
Suggested by and okay mlarkin@.
-rw-r--r--sys/arch/amd64/amd64/acpi_machdep.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/arch/amd64/amd64/acpi_machdep.c b/sys/arch/amd64/amd64/acpi_machdep.c
index 026d3048ab1..cebccb1b3e3 100644
--- a/sys/arch/amd64/amd64/acpi_machdep.c
+++ b/sys/arch/amd64/amd64/acpi_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi_machdep.c,v 1.23 2009/11/22 21:41:37 pirofti Exp $ */
+/* $OpenBSD: acpi_machdep.c,v 1.24 2009/11/22 22:00:25 pirofti Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
*
@@ -242,7 +242,10 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state)
* last call instruction - after the call to acpi_savecpu.
*/
+#if NISA > 0
i8259_default_setup();
+#endif
+
intr_calculatemasks(curcpu());
#if NLAPIC > 0