summaryrefslogtreecommitdiff
path: root/include/asm-x86/smp.h
diff options
context:
space:
mode:
authorMike Travis <travis@sgi.com>2008-03-25 15:06:51 -0700
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:34 +0200
commitb447a468fcd130aa8951672b6115c673c274e888 (patch)
tree3824624df1191cb1e6abbf9f9dbeca3f9d8c17f8 /include/asm-x86/smp.h
parenta24eae88ad3767d0a4a940a10e4a9cec849b7778 (diff)
x86: clean up non-smp usage of cpu maps
Cleanup references to the early cpu maps for the non-SMP configuration and remove some functions called for SMP configurations only. Cc: Andi Kleen <ak@suse.de> Cc: Christoph Lameter <clameter@sgi.com> Signed-off-by: Mike Travis <travis@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/smp.h')
-rw-r--r--include/asm-x86/smp.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index 654724c58f5b..d973c11688ce 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -29,10 +29,15 @@ extern int smp_num_siblings;
extern unsigned int num_processors;
extern cpumask_t cpu_initialized;
+#ifdef CONFIG_SMP
extern u16 x86_cpu_to_apicid_init[];
extern u16 x86_bios_cpu_apicid_init[];
extern void *x86_cpu_to_apicid_early_ptr;
extern void *x86_bios_cpu_apicid_early_ptr;
+#else
+#define x86_cpu_to_apicid_early_ptr NULL
+#define x86_bios_cpu_apicid_early_ptr NULL
+#endif
DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
DECLARE_PER_CPU(cpumask_t, cpu_core_map);