diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:24:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:24:13 +0200 |
| commit | e3ae0acf59244ecf5b023ec99cef4b6b29d649bc (patch) | |
| tree | 02a8bfdcab61677430ecfe04e9e44e1007c35f0e /arch/x86/kernel/smpboot.c | |
| parent | 4b62ac9a2b859f932afd5625362c927111b7dd9b (diff) | |
| parent | e7eb8726d0e144f0925972c4ecee945e91a42753 (diff) | |
Merge branch 'x86/uv' into x86/devel
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index ae0a7a20042..d3ad4e09455 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1090,10 +1090,9 @@ static __init void disable_smp(void) smpboot_clear_io_apic_irqs(); #endif if (smp_found_config) - phys_cpu_present_map = - physid_mask_of_physid(boot_cpu_physical_apicid); + physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map); else - phys_cpu_present_map = physid_mask_of_physid(0); + physid_set_mask_of_physid(0, &phys_cpu_present_map); map_cpu_to_logical_apicid(); cpu_set(0, per_cpu(cpu_sibling_map, 0)); cpu_set(0, per_cpu(cpu_core_map, 0)); |