[src/netbsd-7]: src/sys/arch/xen/conf Pull up following revision(s) (requeste...

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

details:   https://anonhg.NetBSD.org/src/rev/66554d4fae6d
branches:  netbsd-7
changeset: 800080:66554d4fae6d
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Dec 18 07:50:37 2016 +0000

description:
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

diffstat:

 sys/arch/xen/conf/files.xen |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (22 lines):

diff -r ba35368cc40b -r 66554d4fae6d sys/arch/xen/conf/files.xen
--- a/sys/arch/xen/conf/files.xen       Sun Dec 18 07:47:22 2016 +0000
+++ b/sys/arch/xen/conf/files.xen       Sun Dec 18 07:50:37 2016 +0000
@@ -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_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