diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-02-15 15:17:57 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-02-15 15:17:57 -0800 |
| commit | 72166c35f0e15e5081e51304de48e73f8fdf5498 (patch) | |
| tree | 0515dfa0fc442f92ecbb9add2bc53ca86016a8d6 /arch/ia64/kernel/smpboot.c | |
| parent | b05de01ae1c76b7d61da21bbcc26345bf7a9052f (diff) | |
| parent | a6b14fa6fdc01ab3519c2729624f808677539b59 (diff) | |
| download | talos-op-linux-72166c35f0e15e5081e51304de48e73f8fdf5498.tar.gz talos-op-linux-72166c35f0e15e5081e51304de48e73f8fdf5498.zip | |
Pull fix-cpu-possible-map into release branch
Diffstat (limited to 'arch/ia64/kernel/smpboot.c')
| -rw-r--r-- | arch/ia64/kernel/smpboot.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 8f44e7d2df66..b681ef34a86e 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c @@ -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; |
