Module Name: src
Committed By: bouyer
Date: Tue Apr 14 16:53:57 UTC 2020
Modified Files:
src/sys/arch/x86/x86 [bouyer-xenpvh]: patch.c
src/sys/arch/xen/conf [bouyer-xenpvh]: files.xen
Log Message:
Always patch spllower with cx8_spllower; it works fine for Xen now
Include x86/x86/patch.c is !xenpv
While there, defopt XENPV
To generate a diff of this commit:
cvs rdiff -u -r1.37.6.1 -r1.37.6.2 src/sys/arch/x86/x86/patch.c
cvs rdiff -u -r1.180.2.1 -r1.180.2.2 src/sys/arch/xen/conf/files.xen
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/x86/x86/patch.c
diff -u src/sys/arch/x86/x86/patch.c:1.37.6.1 src/sys/arch/x86/x86/patch.c:1.37.6.2
--- src/sys/arch/x86/x86/patch.c:1.37.6.1 Fri Apr 10 14:37:54 2020
+++ src/sys/arch/x86/x86/patch.c Tue Apr 14 16:53:57 2020
@@ -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 @@ x86_patch(bool early)
#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,
Index: src/sys/arch/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.180.2.1 src/sys/arch/xen/conf/files.xen:1.180.2.2
--- src/sys/arch/xen/conf/files.xen:1.180.2.1 Sat Apr 11 18:26:07 2020
+++ src/sys/arch/xen/conf/files.xen Tue Apr 14 16:53:57 2020
@@ -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/idt.c machdep
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 @@ endif
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 )
