From 605ea3fe8e44703f284fc7e78b6cef92d6d2f6fb Mon Sep 17 00:00:00 2001 From: jnemeth Date: Fri, 20 May 2016 03:41:20 +0000 Subject: [PATCH] make CPU microcode loading dependent on both DOM0OPS AND CPU_UCODE --- sys/arch/xen/conf/files.xen | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arch/xen/conf/files.xen b/sys/arch/xen/conf/files.xen index e3646b5404a6..19624388a629 100644 --- a/sys/arch/xen/conf/files.xen +++ b/sys/arch/xen/conf/files.xen @@ -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_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