Merge branches 'debug-choice', 'devel-stable' and 'misc' into for-linus

[karo-tx-linux.git] / arch / arm / kernel / smp.c

diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 2dc19349eb19fc23feafa1a2b93db17eb5e6394a..92d10e503746b91b095276de4d234f85d3b9b7fd 100644 (file)
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -398,17 +398,8 @@ asmlinkage void secondary_start_kernel(void)
 
 void __init smp_cpus_done(unsigned int max_cpus)
 {
-       int cpu;
-       unsigned long bogosum = 0;
-
-       for_each_online_cpu(cpu)
-               bogosum += per_cpu(cpu_data, cpu).loops_per_jiffy;
-
-       printk(KERN_INFO "SMP: Total of %d processors activated "
-              "(%lu.%02lu BogoMIPS).\n",
-              num_online_cpus(),
-              bogosum / (500000/HZ),
-              (bogosum / (5000/HZ)) % 100);
+       printk(KERN_INFO "SMP: Total of %d processors activated.\n",
+              num_online_cpus());
 
        hyp_mode_check();
 }