diff options
| author |   kettenis <kettenis@openbsd.org> | 2008-12-22 18:08:25 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2008-12-22 18:08:25 +0000 |
| commit | 34b0dd0c08c8018192abd823bd2f2859da69f328 (patch) | |
| tree | 2f22ec47f5169def40a6ef1bd44756f91af082a4 | |
| parent | Get rid of many arbitrary differences between the i386 and amd64 mpbios code. (diff) | |
| download | wireguard-openbsd-34b0dd0c08c8018192abd823bd2f2859da69f328.tar.xz wireguard-openbsd-34b0dd0c08c8018192abd823bd2f2859da69f328.zip | |
If we ever get an interrupt from userland with %otherwin set, we have a serious
bug. Don't try to fix things up; it's doomed to fail anyhow.
| -rw-r--r-- | sys/arch/sparc64/sparc64/locore.s | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/arch/sparc64/sparc64/locore.s b/sys/arch/sparc64/sparc64/locore.s index ddd1f06cec1..7e390aa4e3a 100644 --- a/sys/arch/sparc64/sparc64/locore.s +++ b/sys/arch/sparc64/sparc64/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.154 2008/12/13 23:39:30 kettenis Exp $ */ +/* $OpenBSD: locore.s,v 1.155 2008/12/22 18:08:25 kettenis Exp $ */ /* $NetBSD: locore.s,v 1.137 2001/08/13 06:10:10 jdolecek Exp $ */ /* @@ -1578,10 +1578,7 @@ intr_setup_msg: stx %i7, [%sp + CC64FSZ + BIAS + TF_O + (7*8)] ! came from user mode -- switch to kernel mode stack - rdpr %otherwin, %g5 ! Has this already been done? - brnz,pn %g5, 1f ! Don't set this twice - - rdpr %canrestore, %g5 ! Fixup register window state registers + rdpr %canrestore, %g5 ! Fixup register window state registers wrpr %g0, 0, %canrestore wrpr %g0, %g5, %otherwin wrpr %g0, WSTATE_KERN, %wstate ! Enable kernel mode window traps -- now we can trap again |