[src/bouyer-xenpvh]: src/sys/arch Always patch spllower with cx8_spllower; it...

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

details:   https://anonhg.NetBSD.org/src/rev/c7d40f05a553
branches:  bouyer-xenpvh
changeset: 982932:c7d40f05a553
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue Apr 14 16:53:57 2020 +0000

description:
Always patch spllower with cx8_spllower; it works fine for Xen now
Include x86/x86/patch.c is !xenpv
While there, defopt XENPV

diffstat:

 sys/arch/x86/x86/patch.c    |  7 +++----
 sys/arch/xen/conf/files.xen |  5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 2bc14653319f -r c7d40f05a553 sys/arch/x86/x86/patch.c
--- a/sys/arch/x86/x86/patch.c  Tue Apr 14 16:52:35 2020 +0000
+++ b/sys/arch/x86/x86/patch.c  Tue Apr 14 16:53:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: patch.c,v 1.37.6.1 2020/04/10 14:37:54 bouyer Exp $    */
+/*     $NetBSD: patch.c,v 1.37.6.2 2020/04/14 16:53:57 bouyer Exp $    */
 
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: patch.c,v 1.37.6.1 2020/04/10 14:37:54 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: patch.c,v 1.37.6.2 2020/04/14 16:53:57 bouyer Exp $");
 
 #include "opt_lockdebug.h"
 #ifdef i386
@@ -250,8 +250,7 @@
 #endif /* i386 */
 
 #if !defined(SPLDEBUG)
-       if (!early && (cpu_feature[0] & CPUID_CX8) != 0 &&
-           !vm_guest_is_xenpv()) {
+       if (!early && (cpu_feature[0] & CPUID_CX8) != 0) {
                /* Faster splx(), mutex_spin_exit(). */
                patchfunc(
                    cx8_spllower, cx8_spllower_end,
diff -r 2bc14653319f -r c7d40f05a553 sys/arch/xen/conf/files.xen
--- a/sys/arch/xen/conf/files.xen       Tue Apr 14 16:52:35 2020 +0000
+++ b/sys/arch/xen/conf/files.xen       Tue Apr 14 16:53:57 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.xen,v 1.180.2.1 2020/04/11 18:26:07 bouyer Exp $
+#      $NetBSD: files.xen,v 1.180.2.2 2020/04/14 16:53:57 bouyer Exp $
 #      NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp 
 #      NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp 
 
@@ -150,6 +150,7 @@
 file   arch/x86/x86/intr.c             machdep & xenpvhvm
 file   arch/x86/x86/x86_softintr.c     machdep
 file   arch/x86/x86/ipi.c              xenpvhvm
+file   arch/x86/x86/patch.c            machdep & ! xenpv
 file   arch/x86/x86/pmap.c             machdep
 file   arch/x86/x86/x86_tlb.c          machdep
 file   arch/x86/x86/procfs_machdep.c   procfs
@@ -390,7 +391,7 @@
 include        "dev/pcmcia/files.pcmcia"
 
 # Domain-0 operations
-defflag        opt_xen.h                       DOM0OPS
+defflag        opt_xen.h                       DOM0OPS XENPV
 file   arch/xen/xen/privcmd.c          dom0ops
 file   arch/xen/x86/xen_shm_machdep.c  dom0ops
 file   arch/x86/pci/pci_machdep.c      (xenpvhvm | hypervisor) & pci & ( dom0ops | xenpvhvm )