svn commit: r268672 - head/sys/x86/xen
John Baldwin
jhb at FreeBSD.org
Tue Jul 15 15:40:34 UTC 2014
Author: jhb
Date: Tue Jul 15 15:40:33 2014
New Revision: 268672
URL: http://svnweb.freebsd.org/changeset/base/268672
Log:
Fix build with SMP disabled.
CR: https://phabric.freebsd.org/D407
Reviewed by: royger
Modified:
head/sys/x86/xen/pv.c
head/sys/x86/xen/xen_apic.c
Modified: head/sys/x86/xen/pv.c
==============================================================================
--- head/sys/x86/xen/pv.c Tue Jul 15 15:29:43 2014 (r268671)
+++ head/sys/x86/xen/pv.c Tue Jul 15 15:40:33 2014 (r268672)
@@ -51,6 +51,8 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_pager.h>
#include <vm/vm_param.h>
+#include <machine/intr_machdep.h>
+#include <x86/apicvar.h>
#include <x86/init.h>
#include <machine/pc/bios.h>
#include <machine/smp.h>
Modified: head/sys/x86/xen/xen_apic.c
==============================================================================
--- head/sys/x86/xen/xen_apic.c Tue Jul 15 15:29:43 2014 (r268671)
+++ head/sys/x86/xen/xen_apic.c Tue Jul 15 15:40:33 2014 (r268672)
@@ -40,9 +40,11 @@ __FBSDID("$FreeBSD$");
#include <machine/cpufunc.h>
#include <machine/cpu.h>
+#include <machine/intr_machdep.h>
#include <machine/smp.h>
#include <x86/apicreg.h>
+#include <x86/apicvar.h>
#include <xen/xen-os.h>
#include <xen/features.h>
@@ -256,6 +258,7 @@ xen_pv_lapic_enable_cmc(void)
}
+#ifdef SMP
static void
xen_pv_lapic_ipi_raw(register_t icrlo, u_int dest)
{
@@ -308,6 +311,7 @@ xen_pv_lapic_ipi_wait(int delay)
XEN_APIC_UNSUPPORTED;
return (0);
}
+#endif
static int
xen_pv_lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked)
@@ -363,9 +367,11 @@ struct apic_ops xen_apic_ops = {
.disable_pmc = xen_pv_lapic_disable_pmc,
.reenable_pmc = xen_pv_lapic_reenable_pmc,
.enable_cmc = xen_pv_lapic_enable_cmc,
+#ifdef SMP
.ipi_raw = xen_pv_lapic_ipi_raw,
.ipi_vectored = xen_pv_lapic_ipi_vectored,
.ipi_wait = xen_pv_lapic_ipi_wait,
+#endif
.set_lvt_mask = xen_pv_lapic_set_lvt_mask,
.set_lvt_mode = xen_pv_lapic_set_lvt_mode,
.set_lvt_polarity = xen_pv_lapic_set_lvt_polarity,
More information about the svn-src-head
mailing list