summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjmcneill <jmcneill@NetBSD.org>2009-03-14 13:56:41 +0000
committerjmcneill <jmcneill@NetBSD.org>2009-03-14 13:56:41 +0000
commit8cf7d77c2cb2977bbe803eab71cf94ba1d30d0d8 (patch)
treeea735ec3e8f11d3900b14fd7339e52dedab5eae9 /sys/dev
parent3e9233f0fef3055cdf76dc8cf015afcb6a5515e5 (diff)
Don't assume ACPI == x86, from kiyohara@kk.iij4u.or.jp
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpi_timer.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/acpi/acpi_timer.c b/sys/dev/acpi/acpi_timer.c
index 6dbd6ff3145..3614df4753e 100644
--- a/sys/dev/acpi/acpi_timer.c
+++ b/sys/dev/acpi/acpi_timer.c
@@ -1,7 +1,7 @@
-/* $NetBSD: acpi_timer.c,v 1.11 2008/05/11 22:16:45 ad Exp $ */
+/* $NetBSD: acpi_timer.c,v 1.12 2009/03/14 13:56:41 jmcneill Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_timer.c,v 1.11 2008/05/11 22:16:45 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_timer.c,v 1.12 2009/03/14 13:56:41 jmcneill Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -9,6 +9,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_timer.c,v 1.11 2008/05/11 22:16:45 ad Exp $");
#include <sys/timetc.h>
#include <dev/acpi/acpica.h>
#include <dev/acpi/acpi_timer.h>
+#include <machine/acpi_machdep.h>
static int acpitimer_test(void);
static uint32_t acpitimer_delta(uint32_t, uint32_t);
@@ -108,7 +109,7 @@ acpitimer_test()
minl = 10000000;
maxl = 0;
- x86_disable_intr();
+ acpi_md_OsDisableInterrupt();
AcpiGetTimer(&last);
for (n = 0; n < N; n++) {
AcpiGetTimer(&this);
@@ -119,7 +120,7 @@ acpitimer_test()
minl = delta;
last = this;
}
- x86_enable_intr();
+ acpi_md_OsEnableInterrupt();
if (maxl - minl > 2 )
n = 0;