x86: Do not include apic.h/io_apic.h from asm/smp.h

...and fix up the ensuing fall-out of implicit dependencies

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c
index 650835ff1f..239dde6fb7 100644
--- a/xen/arch/x86/smp.c
+++ b/xen/arch/x86/smp.c
@@ -22,6 +22,16 @@
 #include <asm/hvm/support.h>
 #include <mach_apic.h>
 
+int hard_smp_processor_id(void)
+{
+    return get_apic_id();
+}
+
+int logical_smp_processor_id(void)
+{
+    return get_logical_apic_id();
+}
+
 /*
  * send_IPI_mask(cpumask, vector): sends @vector IPI to CPUs in @cpumask,
  * excluding the local CPU. @cpumask may be empty.