Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/i386/i386 Missed a file during previous commit comp...
details: https://anonhg.NetBSD.org/src/rev/2720816b066c
branches: trunk
changeset: 446940:2720816b066c
user: cherry <cherry%NetBSD.org@localhost>
date: Wed Dec 26 06:37:31 2018 +0000
description:
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.
diffstat:
sys/arch/i386/i386/locore.S | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diffs (35 lines):
diff -r 427679ffb927 -r 2720816b066c sys/arch/i386/i386/locore.S
--- a/sys/arch/i386/i386/locore.S Wed Dec 26 02:06:02 2018 +0000
+++ b/sys/arch/i386/i386/locore.S Wed Dec 26 06:37:31 2018 +0000
@@ -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 @@
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
Home |
Main Index |
Thread Index |
Old Index