diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 10:28:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 10:28:17 -0700 |
| commit | 57b1494d2ba544c62673234da6115c21fac27ffc (patch) | |
| tree | 34f91f3187805fa034f8e63966d471ba2498d148 /init | |
| parent | 9fe3b64be3dc8313e9fa87255f169c608d074cbd (diff) | |
| parent | 8978b74253280d59e97cf49a3ec2c0cbccd5b801 (diff) | |
| download | linux-3.10-57b1494d2ba544c62673234da6115c21fac27ffc.tar.gz linux-3.10-57b1494d2ba544c62673234da6115c21fac27ffc.tar.bz2 linux-3.10-57b1494d2ba544c62673234da6115c21fac27ffc.zip | |
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()
Diffstat (limited to 'init')
| -rw-r--r-- | init/calibrate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/calibrate.c b/init/calibrate.c index 7963e3fc51d..a379c906119 100644 --- a/init/calibrate.c +++ b/init/calibrate.c @@ -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); } |