diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2009-04-02 05:43:14 +0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2009-04-02 05:43:14 +0400 |
| commit | 7cec2ef4a298605b010f1c80041de884e777ea67 (patch) | |
| tree | ea0e947f07d8818a955e8d257aba92c47d92ba12 /arch/parisc/kernel/processor.c | |
| parent | 91400ac365da35b18036b46bdda27ddbcee4a663 (diff) | |
| parent | 9bc181d8d7cb6462de0c315e364780ad275f7c57 (diff) | |
| download | linux-7cec2ef4a298605b010f1c80041de884e777ea67.tar.xz | |
Merge branch 'rusty-cpumask-parisc' into parisc
Diffstat (limited to 'arch/parisc/kernel/processor.c')
| -rw-r--r-- | arch/parisc/kernel/processor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c index df5e28c7a829..e09d0f7fb6b0 100644 --- a/arch/parisc/kernel/processor.c +++ b/arch/parisc/kernel/processor.c @@ -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 |