diff options
| author | jhb <jhb@FreeBSD.org> | 2014-07-15 15:40:33 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2014-07-15 15:40:33 +0000 |
| commit | 17d78db27b825d89bdff258ca2162ea75b47df62 (patch) | |
| tree | 92b19c2586a578a77c492229c9eadf8e8e4bab98 /sys/x86 | |
| parent | 7eba29e60e5ac793a82952fdc308226e9f6bd900 (diff) | |
| download | FreeBSD-src-17d78db27b825d89bdff258ca2162ea75b47df62.zip FreeBSD-src-17d78db27b825d89bdff258ca2162ea75b47df62.tar.gz | |
Fix build with SMP disabled.
CR: https://phabric.freebsd.org/D407
Reviewed by: royger
Diffstat (limited to 'sys/x86')
| -rw-r--r-- | sys/x86/xen/pv.c | 2 | ||||
| -rw-r--r-- | sys/x86/xen/xen_apic.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index f008161..c98c8bc 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -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> diff --git a/sys/x86/xen/xen_apic.c b/sys/x86/xen/xen_apic.c index 1f7893d..53083ac 100644 --- a/sys/x86/xen/xen_apic.c +++ b/sys/x86/xen/xen_apic.c @@ -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, |
