Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / powerpc / kernel / setup_64.c

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 532054f..aebef13 100644 (file)
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -74,7 +74,7 @@
 #endif
 
 int boot_cpuid = 0;
-int __initdata boot_cpu_count;
+int __initdata spinning_secondaries;
 u64 ppc64_pft_size;
 
 /* Pick defaults since we might want to patch instructions
@@ -254,11 +254,11 @@ void smp_release_cpus(void)
        for (i = 0; i < 100000; i++) {
                mb();
                HMT_low();
-               if (boot_cpu_count == 0)
+               if (spinning_secondaries == 0)
                        break;
                udelay(1);
        }
-       DBG("boot_cpu_count = %d\n", boot_cpu_count);
+       DBG("spinning_secondaries = %d\n", spinning_secondaries);
 
        DBG(" <- smp_release_cpus()\n");
 }