Module Name: src
Committed By: bouyer
Date: Sat Apr 25 10:52:26 UTC 2020
Modified Files:
src/sys/arch/xen/conf [bouyer-xenpvh]: files.compat files.xen
files.xen.pv
Log Message:
Include again xen/conf/files.compat for PV kernels, and make it build.
My build.sh -u used stale opt_*.h files ...
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.10.1 src/sys/arch/xen/conf/files.compat
cvs rdiff -u -r1.180.2.6 -r1.180.2.7 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/xen/conf/files.xen.pv
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/xen/conf/files.compat
diff -u src/sys/arch/xen/conf/files.compat:1.32 src/sys/arch/xen/conf/files.compat:1.32.10.1
--- src/sys/arch/xen/conf/files.compat:1.32 Sun Dec 9 00:45:18 2018
+++ src/sys/arch/xen/conf/files.compat Sat Apr 25 10:52:26 2020
@@ -1,16 +1,10 @@
-# $NetBSD: files.compat,v 1.32 2018/12/09 00:45:18 mrg Exp $
+# $NetBSD: files.compat,v 1.32.10.1 2020/04/25 10:52:26 bouyer Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# options for MP configuration through the MP spec
#defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
#defflag opt_mpacpi.h MPACPI MPACPI_SCANPCI
-# MTRR support
-defflag MTRR
-
-defflag opt_xen.h XEN PAE
-
-
# XXX define fake options to make config create the .h files
defflag lapic.h XXXLAPIC
defflag apm.h XXXAPM
Index: src/sys/arch/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.180.2.6 src/sys/arch/xen/conf/files.xen:1.180.2.7
--- src/sys/arch/xen/conf/files.xen:1.180.2.6 Mon Apr 20 19:40:24 2020
+++ src/sys/arch/xen/conf/files.xen Sat Apr 25 10:52:26 2020
@@ -1,6 +1,6 @@
-# $NetBSD: files.xen,v 1.180.2.6 2020/04/20 19:40:24 bouyer Exp $
+# $NetBSD: files.xen,v 1.180.2.7 2020/04/25 10:52:26 bouyer Exp $
-defflag opt_xen.h XEN XENPVH XENPVHVM
+defflag opt_xen.h XEN XENPVH XENPVHVM PAE
file arch/xen/x86/hypervisor_machdep.c xen
file arch/xen/x86/xen_intr.c xen
Index: src/sys/arch/xen/conf/files.xen.pv
diff -u src/sys/arch/xen/conf/files.xen.pv:1.1.2.4 src/sys/arch/xen/conf/files.xen.pv:1.1.2.5
--- src/sys/arch/xen/conf/files.xen.pv:1.1.2.4 Mon Apr 20 19:40:24 2020
+++ src/sys/arch/xen/conf/files.xen.pv Sat Apr 25 10:52:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.xen.pv,v 1.1.2.4 2020/04/20 19:40:24 bouyer Exp $
+# $NetBSD: files.xen.pv,v 1.1.2.5 2020/04/25 10:52:26 bouyer Exp $
file arch/xen/x86/autoconf.c xenpv
file arch/xen/x86/x86_xpmap.c xenpv
@@ -11,6 +11,8 @@ file arch/xen/x86/pintr.c machdep & dom
file arch/xen/x86/xen_ipi.c multiprocessor & xenpv
+include "arch/xen/conf/files.compat"
+
#
# System bus types
#
