Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[sfrench/cifs-2.6.git] / arch / m32r / kernel / smpboot.c

diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c
index 0f06b3722e960518bc275b1167b6948e5eb35914..655ea1c47a0f2efccb8d4f84c58d9c4284eb7138 100644 (file)
--- a/arch/m32r/kernel/smpboot.c
+++ b/arch/m32r/kernel/smpboot.c
@@ -213,7 +213,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
                if (!physid_isset(phys_id, phys_cpu_present_map))
                        continue;
 
-               if ((max_cpus >= 0) && (max_cpus <= cpucount + 1))
+               if (max_cpus <= cpucount + 1)
                        continue;
 
                do_boot_cpu(phys_id);
@@ -592,7 +592,7 @@ int setup_profiling_timer(unsigned int multiplier)
         * accounting. At that time they also adjust their APIC timers
         * accordingly.
         */
-       for (i = 0; i < NR_CPUS; ++i)
+       for_each_possible_cpu(i)
                per_cpu(prof_multiplier, i) = multiplier;
 
        return 0;