diff options
| author | Linus Torvalds | 2014-12-16 22:54:16 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-12-16 22:54:16 +0100 |
| commit | 0db2812a5240f2663b92d8d4b761122dd2e0c6c3 (patch) | |
| tree | 4966ada2a4a75dc89b7038ac1694a8acc4d3aa3f /arch/tile/kernel/time.c | |
| parent | Merge tag 'stable/for-linus-3.19-rc0b-tag' of git://git.kernel.org/pub/scm/li... (diff) | |
| parent | arch/tile: update MAINTAINERS email to EZchip (diff) | |
| download | kernel-qcow2-linux-0db2812a5240f2663b92d8d4b761122dd2e0c6c3.tar.gz kernel-qcow2-linux-0db2812a5240f2663b92d8d4b761122dd2e0c6c3.tar.xz kernel-qcow2-linux-0db2812a5240f2663b92d8d4b761122dd2e0c6c3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile updates from Chris Metcalf:
"Note that one of the changes converts my old cmetcalf@tilera.com email
in MAINTAINERS to the cmetcalf@ezchip.com email that you see on this
email"
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: update MAINTAINERS email to EZchip
tile: avoid undefined behavior with regs[TREG_TP] etc
arch: tile: kernel: kgdb.c: Use memcpy() instead of pointer copy one by one
tile: Use the more common pr_warn instead of pr_warning
arch: tile: gxio: Export symbols for module using in 'mpipe.c'
arch: tile: kernel: signal.c: Use __copy_from/to_user() instead of __get/put_user()
Diffstat (limited to 'arch/tile/kernel/time.c')
| -rw-r--r-- | arch/tile/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c index b854a1cd0079..d412b0856c0a 100644 --- a/arch/tile/kernel/time.c +++ b/arch/tile/kernel/time.c @@ -98,8 +98,8 @@ void __init calibrate_delay(void) { loops_per_jiffy = get_clock_rate() / HZ; pr_info("Clock rate yields %lu.%02lu BogoMIPS (lpj=%lu)\n", - loops_per_jiffy/(500000/HZ), - (loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy); + loops_per_jiffy / (500000 / HZ), + (loops_per_jiffy / (5000 / HZ)) % 100, loops_per_jiffy); } /* Called fairly late in init/main.c, but before we go smp. */ |