diff options
Diffstat (limited to 'arch/xtensa/kernel/time.c')
-rw-r--r-- | arch/xtensa/kernel/time.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index ffb474104311..a32bc2ea7982 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c | |||
@@ -28,8 +28,7 @@ | |||
28 | #include <asm/platform.h> | 28 | #include <asm/platform.h> |
29 | 29 | ||
30 | #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT | 30 | #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT |
31 | unsigned long ccount_per_jiffy; /* per 1/HZ */ | 31 | unsigned long ccount_freq; /* ccount Hz */ |
32 | unsigned long nsec_per_ccount; /* nsec per ccount increment */ | ||
33 | #endif | 32 | #endif |
34 | 33 | ||
35 | static cycle_t ccount_read(struct clocksource *cs) | 34 | static cycle_t ccount_read(struct clocksource *cs) |
@@ -57,8 +56,8 @@ void __init time_init(void) | |||
57 | #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT | 56 | #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT |
58 | printk("Calibrating CPU frequency "); | 57 | printk("Calibrating CPU frequency "); |
59 | platform_calibrate_ccount(); | 58 | platform_calibrate_ccount(); |
60 | printk("%d.%02d MHz\n", (int)ccount_per_jiffy/(1000000/HZ), | 59 | printk("%d.%02d MHz\n", (int)ccount_freq/1000000, |
61 | (int)(ccount_per_jiffy/(10000/HZ))%100); | 60 | (int)(ccount_freq/10000)%100); |
62 | #endif | 61 | #endif |
63 | clocksource_register_hz(&ccount_clocksource, CCOUNT_PER_JIFFY * HZ); | 62 | clocksource_register_hz(&ccount_clocksource, CCOUNT_PER_JIFFY * HZ); |
64 | 63 | ||