[src/trunk]: src/sys/arch/xen/conf make CPU microcode loading dependent on bo...

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

details:   https://anonhg.NetBSD.org/src/rev/adc1770cb4b5
branches:  trunk
changeset: 815483:adc1770cb4b5
user:      jnemeth <jnemeth%NetBSD.org@localhost>
date:      Fri May 20 03:41:20 2016 +0000

description:
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 2ef5e105d519 -r adc1770cb4b5 sys/arch/xen/conf/files.xen
--- a/sys/arch/xen/conf/files.xen       Fri May 20 01:37:47 2016 +0000
+++ b/sys/arch/xen/conf/files.xen       Fri May 20 03:41:20 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.xen,v 1.140 2016/02/27 15:42:20 mlelstv Exp $
+#      $NetBSD: files.xen,v 1.141 2016/05/20 03:41:20 jnemeth 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 
 
@@ -93,9 +93,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