diff options
| author |   miod <miod@openbsd.org> | 2014-10-23 19:09:04 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-10-23 19:09:04 +0000 |
| commit | 1c71725bbdaf7a9d88e1476e6bbc7f1c722603f7 (patch) | |
| tree | 98b22c0ca40efb14bc72c938ffea04b901ba6c3d | |
| parent | mention hw.perfpolicy; Daniel Jakots (diff) | |
| download | wireguard-openbsd-1c71725bbdaf7a9d88e1476e6bbc7f1c722603f7.tar.xz wireguard-openbsd-1c71725bbdaf7a9d88e1476e6bbc7f1c722603f7.zip | |
Correctly mask IE_ALLIE during sun4/4c/4e NMI; from NetBSD
| -rw-r--r-- | sys/arch/sparc/sparc/locore.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/sparc/sparc/locore.s b/sys/arch/sparc/sparc/locore.s index a748abf4a3c..229f3e0226a 100644 --- a/sys/arch/sparc/sparc/locore.s +++ b/sys/arch/sparc/sparc/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.94 2013/06/13 19:33:59 deraadt Exp $ */ +/* $OpenBSD: locore.s,v 1.95 2014/10/23 19:09:04 miod Exp $ */ /* $NetBSD: locore.s,v 1.73 1997/09/13 20:36:48 pk Exp $ */ /* @@ -2534,7 +2534,7 @@ nmi_sun4: */ sethi %hi(INTRREG_VA), %o0 ldub [%o0 + %lo(INTRREG_VA)], %o1 - andn %o0, IE_ALLIE, %o1 + andn %o1, IE_ALLIE, %o1 stb %o1, [%o0 + %lo(INTRREG_VA)] wr %l0, PSR_ET, %psr ! okay, turn traps on again @@ -2560,7 +2560,7 @@ nmi_sun4c: */ sethi %hi(INTRREG_VA), %o0 ldub [%o0 + %lo(INTRREG_VA)], %o1 - andn %o0, IE_ALLIE, %o1 + andn %o1, IE_ALLIE, %o1 stb %o1, [%o0 + %lo(INTRREG_VA)] wr %l0, PSR_ET, %psr ! okay, turn traps on again |