Module Name: src
Committed By: snj
Date: Sun Dec 18 07:50:37 UTC 2016
Modified Files:
src/sys/arch/xen/conf [netbsd-7]: files.xen
Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #1326):
sys/arch/xen/conf/files.xen: revision 1.141
make CPU microcode loading dependent on both DOM0OPS AND CPU_UCODE
To generate a diff of this commit:
cvs rdiff -u -r1.133.4.1 -r1.133.4.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/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.133.4.1 src/sys/arch/xen/conf/files.xen:1.133.4.2
--- src/sys/arch/xen/conf/files.xen:1.133.4.1 Sun Sep 25 12:11:33 2016
+++ src/sys/arch/xen/conf/files.xen Sun Dec 18 07:50:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.xen,v 1.133.4.1 2016/09/25 12:11:33 bouyer Exp $
+# $NetBSD: files.xen,v 1.133.4.2 2016/12/18 07:50:37 snj 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
@@ -92,9 +92,9 @@ file arch/xen/x86/xen_pmap.c
file arch/xen/x86/xen_intr.c
file arch/xen/x86/xenfunc.c
-file arch/xen/xen/xen_ucode.c dom0ops | cpu_ucode needs-flag
-file arch/x86/x86/cpu_ucode_amd.c dom0ops | cpu_ucode needs-flag
-file arch/x86/x86/cpu_ucode_intel.c dom0ops | cpu_ucode needs-flag
+file arch/xen/xen/xen_ucode.c dom0ops & cpu_ucode needs-flag
+file arch/x86/x86/cpu_ucode_amd.c dom0ops & cpu_ucode needs-flag
+file arch/x86/x86/cpu_ucode_intel.c dom0ops & cpu_ucode needs-flag
file arch/xen/xen/xen_machdep.c
file arch/xen/xen/xen_debug.c
