From 9f28e22644be7c8bf309fe5669c4449ce1235f53 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 18 Feb 2008 17:19:08 +0000 Subject: [PATCH] Fix x86 SMP non-ACPI build. Signed-off-by: Keir Fraser linux-2.6.18-xen changeset: 425:9dea529497fe546d25b5dc965d8161494c27d127 linux-2.6.18-xen date: Mon Feb 18 17:16:52 2008 +0000 --- linux-2.6-xen-sparse/drivers/xen/core/smpboot.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c index 320af8911..304b960cb 100644 --- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c +++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c @@ -72,6 +72,13 @@ EXPORT_SYMBOL(x86_cpu_to_apicid); unsigned int maxcpus = NR_CPUS; #endif +#ifdef CONFIG_ACPI +#define set_x86_acpiid_to_apicid(acpiid, apicid) \ + (x86_acpiid_to_apicid[acpiid] = apicid) +#else +#define set_x86_acpiid_to_apicid(acpiid, apicid) ((void)0) +#endif + void __init prefill_possible_map(void) { int i, rc; @@ -270,7 +277,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) cpu_2_logical_apicid[0] = 0; x86_cpu_to_apicid[0] = 0; - x86_acpiid_to_apicid[0] = 0; + set_x86_acpiid_to_apicid(0, 0); current_thread_info()->cpu = 0; @@ -319,7 +326,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) cpu_2_logical_apicid[cpu] = cpu; x86_cpu_to_apicid[cpu] = cpu; - x86_acpiid_to_apicid[cpu] = cpu; + set_x86_acpiid_to_apicid(cpu, cpu); idle = fork_idle(cpu); if (IS_ERR(idle)) -- 2.39.5