svn commit: r297639 - head/sys/x86/xen

[Sepherosa Ziehau]

Author: sephe
Date: Thu Apr  7 07:00:00 2016
New Revision: 297639
URL: https://svnweb.freebsd.org/changeset/base/297639

Log:
  xen: Set ipi_{alloc,free} even for UP
  
  This keeps XEN apic_ops aligned w/ x86's.
  
  Suggested by:	kib, jhb
  Reviewed by:	jhb, royger
  Sponsored by:	Microsoft OSTC
  Differential Revision:	https://reviews.freebsd.org/D5871

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

Modified: head/sys/x86/xen/xen_apic.c
==============================================================================
--- head/sys/x86/xen/xen_apic.c	Thu Apr  7 06:36:03 2016	(r297638)
+++ head/sys/x86/xen/xen_apic.c	Thu Apr  7 07:00:00 2016	(r297639)
@@ -296,6 +296,7 @@ xen_pv_lapic_ipi_wait(int delay)
 	XEN_APIC_UNSUPPORTED;
 	return (0);
 }
+#endif	/* SMP */
 
 static int
 xen_pv_lapic_ipi_alloc(inthand_t *ipifunc)
@@ -311,7 +312,6 @@ xen_pv_lapic_ipi_free(int vector)
 
 	XEN_APIC_UNSUPPORTED;
 }
-#endif	/* SMP */
 
 static int
 xen_pv_lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked)
@@ -372,9 +372,9 @@ struct apic_ops xen_apic_ops = {
 	.ipi_raw		= xen_pv_lapic_ipi_raw,
 	.ipi_vectored		= xen_pv_lapic_ipi_vectored,
 	.ipi_wait		= xen_pv_lapic_ipi_wait,
+#endif
 	.ipi_alloc		= xen_pv_lapic_ipi_alloc,
 	.ipi_free		= xen_pv_lapic_ipi_free,
-#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,