Author: jhb
Date: Wed Jun 4 17:50:47 2014
New Revision: 267068
URL: http://svnweb.freebsd.org/changeset/base/267068
Log:
MFC 263772: Fix build without SMP.
PR: 187854
Modified:
stable/10/sys/x86/xen/hvm.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/x86/xen/hvm.c
==============================================================================
--- stable/10/sys/x86/xen/hvm.c Wed Jun 4 17:17:30 2014 (r267067)
+++ stable/10/sys/x86/xen/hvm.c Wed Jun 4 17:50:47 2014 (r267068)
@@ -71,9 +71,9 @@ static driver_filter_t xen_ipi_bitmap_ha
static driver_filter_t xen_cpustop_handler;
static driver_filter_t xen_cpususpend_handler;
static driver_filter_t xen_cpustophard_handler;
-#endif
static void xen_ipi_vectored(u_int vector, int dest);
static void xen_hvm_cpu_resume(void);
+#endif
static void xen_hvm_cpu_init(void);
/*---------------------------- Extern Declarations
---------------------------*/
@@ -106,11 +106,13 @@ struct xen_ipi_handler
/*-------------------------------- Global Data
-------------------------------*/
enum xen_domain_type xen_domain_type = XEN_NATIVE;
+#ifdef SMP
struct cpu_ops xen_hvm_cpu_ops = {
.ipi_vectored = lapic_ipi_vectored,
.cpu_init = xen_hvm_cpu_init,
.cpu_resume = xen_hvm_cpu_resume
};
+#endif
static MALLOC_DEFINE(M_XENHVM, "xen_hvm", "Xen HVM PV Support");
@@ -526,7 +528,9 @@ xen_hvm_init(enum xen_hvm_init_type init
return;
setup_xen_features();
+#ifdef SMP
cpu_ops = xen_hvm_cpu_ops;
+#endif
vm_guest = VM_GUEST_XEN;
break;
case XEN_HVM_INIT_RESUME:
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
