diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-12 03:01:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-12 03:01:50 -0400 |
| commit | 5629d41d5ce255802cd3c350fbadfe5f3aa5f279 (patch) | |
| tree | e00fcb33fd2e25305b3243e060e01cd346d4af94 /arch/powerpc/platforms/powermac/time.c | |
| parent | 3eac8c69d1ac1266327f4e29deb23716a12c6d30 (diff) | |
powerpc: Bring in some changes made to arch/ppc and include/asm-ppc64
Recent commits upstream have changed files which are currently
duplicated in arch/powerpc and include/asm-powerpc. This updates
them with the corresponding changes.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/powermac/time.c')
| -rw-r--r-- | arch/powerpc/platforms/powermac/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c index ff6adff36cb8..edb9fcc64790 100644 --- a/arch/powerpc/platforms/powermac/time.c +++ b/arch/powerpc/platforms/powermac/time.c | |||
| @@ -195,7 +195,7 @@ via_calibrate_decr(void) | |||
| 195 | ; | 195 | ; |
| 196 | dend = get_dec(); | 196 | dend = get_dec(); |
| 197 | 197 | ||
| 198 | tb_ticks_per_jiffy = (dstart - dend) / (6 * (HZ/100)); | 198 | tb_ticks_per_jiffy = (dstart - dend) / ((6 * HZ)/100); |
| 199 | tb_to_us = mulhwu_scale_factor(dstart - dend, 60000); | 199 | tb_to_us = mulhwu_scale_factor(dstart - dend, 60000); |
| 200 | 200 | ||
| 201 | printk(KERN_INFO "via_calibrate_decr: ticks per jiffy = %u (%u ticks)\n", | 201 | printk(KERN_INFO "via_calibrate_decr: ticks per jiffy = %u (%u ticks)\n", |