]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[IA64] Dont set NR_CPUS for cpu_possible_map when CPU hotplug is enabled.
authorAshok Raj <ashok.raj@intel.com>
Tue, 14 Feb 2006 23:01:11 +0000 (15:01 -0800)
committerTony Luck <tony.luck@intel.com>
Tue, 14 Feb 2006 23:35:10 +0000 (15:35 -0800)
Do not set cpu_possible_map for NR_CPUS when ACPI_CONFIG_HOTPLUG_CPU is set.

Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/kernel/smpboot.c

index 8f44e7d2df66eb8e0d052132ab8fe7a390587212..b681ef34a86e13a5ecab3a7e1ec2eb6b7378e847 100644 (file)
@@ -129,7 +129,7 @@ DEFINE_PER_CPU(int, cpu_state);
 /* Bitmasks of currently online, and possible CPUs */
 cpumask_t cpu_online_map;
 EXPORT_SYMBOL(cpu_online_map);
-cpumask_t cpu_possible_map;
+cpumask_t cpu_possible_map = CPU_MASK_NONE;
 EXPORT_SYMBOL(cpu_possible_map);
 
 cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned;
@@ -506,9 +506,6 @@ smp_build_cpu_map (void)
 
        for (cpu = 0; cpu < NR_CPUS; cpu++) {
                ia64_cpu_to_sapicid[cpu] = -1;
-#ifdef CONFIG_HOTPLUG_CPU
-               cpu_set(cpu, cpu_possible_map);
-#endif
        }
 
        ia64_cpu_to_sapicid[0] = boot_cpu_id;