Module Name: src Committed By: chs Date: Fri Oct 26 14:46:44 UTC 2012
Modified Files: src/sys/arch/i386/i386: locore.S Log Message: 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.102 -r1.103 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.102 src/sys/arch/i386/i386/locore.S:1.103 --- src/sys/arch/i386/i386/locore.S:1.102 Sat Sep 1 23:19:46 2012 +++ src/sys/arch/i386/i386/locore.S Fri Oct 26 14:46:44 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.102 2012/09/01 23:19:46 cherry Exp $ */ +/* $NetBSD: locore.S,v 1.103 2012/10/26 14:46:44 chs Exp $ */ /* * Copyright-o-rama! @@ -129,7 +129,7 @@ */ #include <machine/asm.h> -__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.102 2012/09/01 23:19:46 cherry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.103 2012/10/26 14:46:44 chs Exp $"); #include "opt_compat_oldboot.h" #include "opt_ddb.h" @@ -1130,7 +1130,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)