Module Name: src
Committed By: bouyer
Date: Sat Apr 18 14:49:57 UTC 2020
Modified Files:
src/sys/arch/i386/i386 [bouyer-xenpvh]: i386_trap.S locore.S
Log Message:
Call stipending() only on XenPV. Fix spurious fpudna from kernel mode
To generate a diff of this commit:
cvs rdiff -u -r1.20.6.1 -r1.20.6.2 src/sys/arch/i386/i386/i386_trap.S
cvs rdiff -u -r1.179.2.2 -r1.179.2.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/i386_trap.S
diff -u src/sys/arch/i386/i386/i386_trap.S:1.20.6.1 src/sys/arch/i386/i386/i386_trap.S:1.20.6.2
--- src/sys/arch/i386/i386/i386_trap.S:1.20.6.1 Sun Apr 12 17:25:52 2020
+++ src/sys/arch/i386/i386/i386_trap.S Sat Apr 18 14:49:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: i386_trap.S,v 1.20.6.1 2020/04/12 17:25:52 bouyer Exp $ */
+/* $NetBSD: i386_trap.S,v 1.20.6.2 2020/04/18 14:49:57 bouyer Exp $ */
/*
* Copyright 2002 (c) Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
#if 0
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: i386_trap.S,v 1.20.6.1 2020/04/12 17:25:52 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i386_trap.S,v 1.20.6.2 2020/04/18 14:49:57 bouyer Exp $");
#endif
/*
@@ -434,7 +434,7 @@ calltrap:
3: CHECK_DEFERRED_SWITCH
jnz 9f
-#ifdef XEN
+#ifdef XENPV
STIC(%eax)
jz 22f
call _C_LABEL(stipending)
@@ -456,7 +456,7 @@ calltrap:
11: movl %ebx,CPUVAR(ILEVEL) /* restore cpl */
jmp .Lalltraps_checkusr
22:
-#endif
+#endif /* XEN */
HANDLE_DEFERRED_FPU
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.179.2.2 src/sys/arch/i386/i386/locore.S:1.179.2.3
--- src/sys/arch/i386/i386/locore.S:1.179.2.2 Sun Apr 12 17:25:52 2020
+++ src/sys/arch/i386/i386/locore.S Sat Apr 18 14:49:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.179.2.2 2020/04/12 17:25:52 bouyer Exp $ */
+/* $NetBSD: locore.S,v 1.179.2.3 2020/04/18 14:49:57 bouyer Exp $ */
/*
* Copyright-o-rama!
@@ -128,7 +128,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.179.2.2 2020/04/12 17:25:52 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.179.2.3 2020/04/18 14:49:57 bouyer Exp $");
#include "opt_copy_symtab.h"
#include "opt_ddb.h"
@@ -1478,7 +1478,7 @@ IDTVEC(syscall)
orl CPUVAR(WANT_PMAPLOAD), %eax
jnz 9f
-#ifdef XEN
+#ifdef XENPV
STIC(%eax)
jz 14f
call _C_LABEL(stipending)
@@ -1500,7 +1500,7 @@ IDTVEC(syscall)
17: movl %ebx, CPUVAR(ILEVEL) /* restore cpl */
jmp .Lsyscall_checkast
14:
-#endif /* XEN */
+#endif /* XENPV */
#ifdef DIAGNOSTIC
cmpl $IPL_NONE,CPUVAR(ILEVEL)
