Module Name: src
Committed By: cherry
Date: Wed Dec 26 06:37:31 UTC 2018
Modified Files:
src/sys/arch/i386/i386: locore.S
Log Message:
Missed a file during previous commit completing transition to
separate handler queues for i386.
This should fix the build (hopefully!)
Thanks to Robert Elz for pointing it out.
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 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.161 src/sys/arch/i386/i386/locore.S:1.162
--- src/sys/arch/i386/i386/locore.S:1.161 Wed Aug 1 13:35:01 2018
+++ src/sys/arch/i386/i386/locore.S Wed Dec 26 06:37:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.161 2018/08/01 13:35:01 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.162 2018/12/26 06:37:31 cherry Exp $ */
/*
* Copyright-o-rama!
@@ -128,7 +128,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.161 2018/08/01 13:35:01 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.162 2018/12/26 06:37:31 cherry Exp $");
#include "opt_copy_symtab.h"
#include "opt_ddb.h"
@@ -1288,12 +1288,12 @@ IDTVEC(syscall)
movl $.Lsyscall_resume, %esi /* address to resume loop at */
.Lsyscall_resume:
movl %ebx,%eax /* get cpl */
- movl CPUVAR(IUNMASK)(,%eax,4),%eax
- andl CPUVAR(IPENDING),%eax /* any non-masked bits left? */
+ movl CPUVAR(XUNMASK)(,%eax,4),%eax
+ andl CPUVAR(XPENDING),%eax /* any non-masked bits left? */
jz 17f
bsrl %eax,%eax
- btrl %eax,CPUVAR(IPENDING)
- movl CPUVAR(ISOURCES)(,%eax,4),%eax
+ btrl %eax,CPUVAR(XPENDING)
+ movl CPUVAR(XSOURCES)(,%eax,4),%eax
jmp *IS_RESUME(%eax)
17: movl %ebx, CPUVAR(ILEVEL) /* restore cpl */
jmp .Lsyscall_checkast
