Merge branch 'x86/uv' into x86/devel

1 files changed, 2 insertions, 3 deletions

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index ae0a7a200421..d3ad4e09455b 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));