mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: generic, x86: fix add iommu_num_pages helper function x86: remove stray <6> in BogoMIPS printk x86: move dma32_reserve_bootmem() after reserve_crashkernel()
This commit is contained in:
commit
57b1494d2b
6 changed files with 20 additions and 14 deletions
|
|
@ -170,7 +170,7 @@ void __cpuinit calibrate_delay(void)
|
|||
loops_per_jiffy &= ~loopbit;
|
||||
}
|
||||
}
|
||||
printk(KERN_INFO "%lu.%02lu BogoMIPS (lpj=%lu)\n",
|
||||
printk(KERN_CONT "%lu.%02lu BogoMIPS (lpj=%lu)\n",
|
||||
loops_per_jiffy/(500000/HZ),
|
||||
(loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue