forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'rusty-cpumask-parisc' into parisc

Browse source
This commit is contained in:
Kyle McMartin 2009-04-02 01:43:14 +00:00
commit 7cec2ef4a2
4 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/parisc/kernel/processor.c
View file

@ -100,8 +100,8 @@ static int __cpuinit processor_probe(struct parisc_device *dev)
struct cpuinfo_parisc *p;
#ifdef CONFIG_SMP
if (num_online_cpus() >= NR_CPUS) {
printk(KERN_INFO "num_online_cpus() >= NR_CPUS\n");
if (num_online_cpus() >= nr_cpu_ids) {
printk(KERN_INFO "num_online_cpus() >= nr_cpu_ids\n");
return 1;
}
#else
@ -214,7 +214,7 @@ static int __cpuinit processor_probe(struct parisc_device *dev)
*/
#ifdef CONFIG_SMP
if (cpuid) {
cpu_set(cpuid, cpu_present_map);
set_cpu_present(cpuid, true);
cpu_up(cpuid);
}
#endif