Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Mar 2014 17:40:13 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r263772 - head/sys/x86/xen
Message-ID:  <201403261740.s2QHeDwm001550@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhb
Date: Wed Mar 26 17:40:13 2014
New Revision: 263772
URL: http://svnweb.freebsd.org/changeset/base/263772

Log:
  Fix build without SMP.
  
  PR:		kern/187854
  MFC after:	1 week

Modified:
  head/sys/x86/xen/hvm.c

Modified: head/sys/x86/xen/hvm.c
==============================================================================
--- head/sys/x86/xen/hvm.c	Wed Mar 26 17:00:37 2014	(r263771)
+++ head/sys/x86/xen/hvm.c	Wed Mar 26 17:40:13 2014	(r263772)
@@ -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");
 
@@ -551,7 +553,9 @@ xen_hvm_init(enum xen_hvm_init_type init
 		}
 
 		setup_xen_features();
+#ifdef SMP
 		cpu_ops = xen_hvm_cpu_ops;
+#endif
 		break;
 	case XEN_HVM_INIT_RESUME:
 		if (error != 0)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403261740.s2QHeDwm001550>