Merge branches 'debug-choice', 'devel-stable' and 'misc' into for-linus
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
Reference in New Issue
Block a user