summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/sparc64/sparc64/locore.s7
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