[src/bouyer-xenpvh]: src/sys/arch/i386/i386 Call stipending() only on XenPV. ...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/791e60cc755a
branches:  bouyer-xenpvh
changeset: 1024981:791e60cc755a
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Apr 18 14:49:57 2020 +0000

description:
Call stipending() only on XenPV. Fix spurious fpudna from kernel mode

diffstat:

 sys/arch/i386/i386/i386_trap.S |  8 ++++----
 sys/arch/i386/i386/locore.S    |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 60004dcc13a3 -r 791e60cc755a sys/arch/i386/i386/i386_trap.S
--- a/sys/arch/i386/i386/i386_trap.S    Sat Apr 18 14:47:55 2020 +0000
+++ b/sys/arch/i386/i386/i386_trap.S    Sat Apr 18 14:49:57 2020 +0000
@@ -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 @@
 3:     CHECK_DEFERRED_SWITCH
        jnz     9f
 
-#ifdef XEN
+#ifdef XENPV
        STIC(%eax)
        jz      22f
        call    _C_LABEL(stipending)
@@ -456,7 +456,7 @@
 11:    movl    %ebx,CPUVAR(ILEVEL)     /* restore cpl */
        jmp     .Lalltraps_checkusr
 22:
-#endif
+#endif /* XEN */
 
        HANDLE_DEFERRED_FPU
 
diff -r 60004dcc13a3 -r 791e60cc755a sys/arch/i386/i386/locore.S
--- a/sys/arch/i386/i386/locore.S       Sat Apr 18 14:47:55 2020 +0000
+++ b/sys/arch/i386/i386/locore.S       Sat Apr 18 14:49:57 2020 +0000
@@ -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 @@
        orl     CPUVAR(WANT_PMAPLOAD), %eax
        jnz     9f
 
-#ifdef XEN
+#ifdef XENPV
        STIC(%eax)
        jz      14f
        call    _C_LABEL(stipending)
@@ -1500,7 +1500,7 @@
 17:    movl    %ebx, CPUVAR(ILEVEL)    /* restore cpl  */
        jmp     .Lsyscall_checkast
 14:
-#endif /* XEN */
+#endif /* XENPV */
 
 #ifdef DIAGNOSTIC
        cmpl    $IPL_NONE,CPUVAR(ILEVEL)