diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-03-28 12:33:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:41:33 +0200 |
| commit | e937fcf2fa0c1d21f9c0008ab600d46c240a984c (patch) | |
| tree | 11a2613794afc3e02f701924f5806d1c8628bcae | |
| parent | x86: merge smp_32.h and smp_64.h into smp.h (diff) | |
| download | linux-e937fcf2fa0c1d21f9c0008ab600d46c240a984c.tar.xz linux-e937fcf2fa0c1d21f9c0008ab600d46c240a984c.zip | |
x86: mpparse: 64-bit fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/mpparse_64.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c index d62294003036..5e789bdb34fa 100644 --- a/arch/x86/kernel/mpparse_64.c +++ b/arch/x86/kernel/mpparse_64.c @@ -63,6 +63,20 @@ void *x86_bios_cpu_apicid_early_ptr; DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID; EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid); +/* Make it easy to share the UP and SMP code: */ +#ifndef CONFIG_X86_SMP +unsigned int num_processors; +unsigned disabled_cpus __cpuinitdata; +#ifndef CONFIG_X86_LOCAL_APIC +unsigned int boot_cpu_physical_apicid = -1U; +#endif +#endif + +/* Make it easy to share the UP and SMP code: */ +#ifndef CONFIG_X86_SMP +physid_mask_t phys_cpu_present_map; +#endif + /* * Intel MP BIOS table parsing routines: */ |