@@ -45,11 +45,6 @@ static inline int multi_timer_check(int apic, int irq)
* really not sure why, since all local APICs should have distinct physical
* IDs, and we need to know what they are.
*/
-static inline int check_apicid_present(int apicid)
-{
- return physid_isset(apicid, phys_cpu_present_map);
-}
-
static inline void set_apicid(int phys_apicid, physid_mask_t *map)
{
physid_set(phys_apicid, *map);
@@ -20,6 +20,9 @@
#include <xen/serial.h>
#include <xen/numa.h>
#include <xen/cpu.h>
+
+#include <asm/apic.h>
+#include <asm/io_apic.h>
#include <asm/cpuidle.h>
#include <asm/current.h>
#include <asm/mc146818rtc.h>
@@ -37,7 +40,6 @@
#include <asm/tboot.h>
#include <asm/trampoline.h>
#include <irq_vectors.h>
-#include <mach_apic.h>
unsigned long __read_mostly trampoline_phys;
enum ap_boot_method __read_mostly ap_boot_method = AP_BOOT_NORMAL;
@@ -1193,7 +1195,7 @@ void __init smp_prepare_cpus(void)
* CPU too, but we do it for the sake of robustness anyway.
* Makes no sense to do this check in clustered apic mode, so skip it
*/
- if ( !check_apicid_present(boot_cpu_physical_apicid) )
+ if ( !physid_isset(boot_cpu_physical_apicid, phys_cpu_present_map) )
{
printk("weird, boot CPU (#%d) not listed by the BIOS.\n",
boot_cpu_physical_apicid);
It's an unnecessary wrapper. It's also the only reason that smpboot.c includes mach_apic.h, other than for transitive dependencies. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Jan Beulich <JBeulich@suse.com> CC: Roger Pau Monné <roger.pau@citrix.com> --- xen/arch/x86/include/asm/mach-generic/mach_apic.h | 5 ----- xen/arch/x86/smpboot.c | 6 ++++-- 2 files changed, 4 insertions(+), 7 deletions(-)