summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2006-03-14 12:25:21 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2006-03-14 12:25:21 +0000
commit9becf7b6453eb4985b4e72a14e4daa1affb6c20a (patch)
tree401062198b8e777a9a584081694dc2a8658ed8fa /sys
parentc818fa3b7823aa60ba30bf7a28e7df2b2b3c4c7b (diff)
prevent the faults on iret to run w/ disabled intrs and cause deadlocks; niklas toby tom ok
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/i386/locore.s3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s
index e61de0610e0..db544a01411 100644
--- a/sys/arch/i386/i386/locore.s
+++ b/sys/arch/i386/i386/locore.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.s,v 1.96 2006/01/12 15:59:03 mickey Exp $ */
+/* $OpenBSD: locore.s,v 1.97 2006/03/14 12:25:20 mickey Exp $ */
/* $NetBSD: locore.s,v 1.145 1996/05/03 19:41:19 christos Exp $ */
/*-
@@ -173,6 +173,7 @@
popl %edx ; \
popl %ecx ; \
popl %eax ; \
+ sti ; \
addl $8,%esp ; \
iret