diff options
| author |   miod <miod@openbsd.org> | 2006-01-01 13:14:44 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2006-01-01 13:14:44 +0000 |
| commit | 0b05b972dd62a25a7b1401d2050fa6cc33d2e5e5 (patch) | |
| tree | b29f1e61ad7c958bc54d2297f3461b7c54d492f9 | |
| parent | Let cons_init() and cons_init_bell() initialize the whole consdev structure, (diff) | |
| download | wireguard-openbsd-0b05b972dd62a25a7b1401d2050fa6cc33d2e5e5.tar.xz wireguard-openbsd-0b05b972dd62a25a7b1401d2050fa6cc33d2e5e5.zip | |
Service clock interrupts at the computed splclock(), not spl2(); from NetBSD.
| -rw-r--r-- | sys/arch/mac68k/mac68k/genassym.cf | 3 | ||||
| -rw-r--r-- | sys/arch/mac68k/mac68k/locore.s | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/mac68k/mac68k/genassym.cf b/sys/arch/mac68k/mac68k/genassym.cf index 1cb40a265e1..65dc4faafc7 100644 --- a/sys/arch/mac68k/mac68k/genassym.cf +++ b/sys/arch/mac68k/mac68k/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.13 2003/06/02 23:27:49 millert Exp $ +# $OpenBSD: genassym.cf,v 1.14 2006/01/01 13:14:44 miod Exp $ # $NetBSD: genassym.cf,v 1.7 1998/01/06 08:46:16 thorpej Exp $ # @@ -61,7 +61,6 @@ export PSL_LOWIPL export PSL_USER define PSL_TS PSL_T | PSL_S define SPL1 PSL_S | PSL_IPL1 -define SPL2 PSL_S | PSL_IPL2 # pte/ste bits export PG_FRAME diff --git a/sys/arch/mac68k/mac68k/locore.s b/sys/arch/mac68k/mac68k/locore.s index 75ff583c082..a3b9d83136b 100644 --- a/sys/arch/mac68k/mac68k/locore.s +++ b/sys/arch/mac68k/mac68k/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.46 2005/11/13 23:14:34 miod Exp $ */ +/* $OpenBSD: locore.s,v 1.47 2006/01/01 13:14:44 miod Exp $ */ /* $NetBSD: locore.s,v 1.103 1998/07/09 06:02:50 scottr Exp $ */ /* @@ -914,7 +914,7 @@ ENTRY_NOPROFILE(lev7intr) ENTRY_NOPROFILE(rtclock_intr) movl d2,sp@- | save d2 movw sr,d2 | save SPL - movw #SPL2,sr | raise SPL to splclock() + movw _C_LABEL(mac68k_clockipl),sr | raise SPL to splclock() movl a6@(8),a1 | get pointer to frame in via1_intr movl a1@(64),sp@- | push ps movl a1@(68),sp@- | push pc |