Module Name: src
Committed By: riz
Date: Wed Oct 31 17:19:49 UTC 2012
Modified Files:
src/sys/arch/i386/i386 [netbsd-6]: locore.S
Log Message:
Pull up following revision(s) (requested by chs in ticket #642):
sys/arch/i386/i386/locore.S: revision 1.103
in osyscall, set the PSL_I bit into the correct field of the trapframe.
it was going into tf_eip instead of tf_eflags, which would sometimes
corrupt %eip and always return to user mode with interrupts disabled.
this was found with a netbsd 1.0 binary, and dsl@ points out that
this should also fix PR 41342.
To generate a diff of this commit:
cvs rdiff -u -r1.95.10.2 -r1.95.10.3 src/sys/arch/i386/i386/locore.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.95.10.2 src/sys/arch/i386/i386/locore.S:1.95.10.3
--- src/sys/arch/i386/i386/locore.S:1.95.10.2 Fri Apr 20 23:32:14 2012
+++ src/sys/arch/i386/i386/locore.S Wed Oct 31 17:19:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.95.10.2 2012/04/20 23:32:14 riz Exp $ */
+/* $NetBSD: locore.S,v 1.95.10.3 2012/10/31 17:19:49 riz Exp $ */
/*
* Copyright-o-rama!
@@ -129,7 +129,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.95.10.2 2012/04/20 23:32:14 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.95.10.3 2012/10/31 17:19:49 riz Exp $");
#include "opt_compat_oldboot.h"
#include "opt_ddb.h"
@@ -1123,7 +1123,7 @@ IDTVEC(osyscall)
#endif
pushfl # set eflags in trap frame
popl 8(%esp)
- orl $PSL_I,(%esp) # re-enable ints on return to user
+ orl $PSL_I,8(%esp) # re-enable ints on return to user
pushl $7 # size of instruction for restart
jmp syscall1
IDTVEC_END(osyscall)
