summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/isa
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2018-07-09 19:38:34 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2018-07-09 19:38:34 +0000
commit0715e11b73b1be92baecab741c6023524f74a24c (patch)
tree301c4ffe56989c4fcf002a336c408bf237225577 /sys/arch/amd64/isa
parentc0465b49a5ac67ecadaac3f219ff68052dfe9597 (diff)
Mark the i8254 clock interrupt MPSAFE. It isn't, but it doesn't matter
as it is impossoble to run an anything but a single-CPU machine with it. ok mpi@, guenther@
Diffstat (limited to 'sys/arch/amd64/isa')
-rw-r--r--sys/arch/amd64/isa/clock.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/arch/amd64/isa/clock.c b/sys/arch/amd64/isa/clock.c
index 2aa35cf7767..0516e12b8d4 100644
--- a/sys/arch/amd64/isa/clock.c
+++ b/sys/arch/amd64/isa/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.26 2017/10/14 04:44:43 jsg Exp $ */
+/* $OpenBSD: clock.c,v 1.27 2018/07/09 19:38:33 kettenis Exp $ */
/* $NetBSD: clock.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */
/*-
@@ -304,10 +304,14 @@ i8254_initclocks(void)
stathz = 128;
profhz = 1024;
- isa_intr_establish(NULL, 0, IST_PULSE, IPL_CLOCK, clockintr,
- 0, "clock");
- isa_intr_establish(NULL, 8, IST_PULSE, IPL_STATCLOCK, rtcintr,
- 0, "rtc");
+ /*
+ * While the clock interrupt handler isn't really MPSAFE, the
+ * i8254 can't really be used as a clock on a true MP system.
+ */
+ isa_intr_establish(NULL, 0, IST_PULSE, IPL_CLOCK | IPL_MPSAFE,
+ clockintr, 0, "clock");
+ isa_intr_establish(NULL, 8, IST_PULSE, IPL_STATCLOCK | IPL_MPSAFE,
+ rtcintr, 0, "rtc");
rtcstart(); /* start the mc146818 clock */