diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2013-06-17 04:29:43 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2013-07-08 04:11:37 -0400 |
| commit | e504c4b6076d9ec1caccaac65803fe3fc29afec8 (patch) | |
| tree | 9a068eafb50e22b431cdc2d02590c7a92ae36d70 /arch/xtensa/include/asm | |
| parent | ed9dfed62c6c057c1c51295d4373ae55c9284a10 (diff) | |
xtensa: cleanup ccount frequency tracking
Remove unused nsec_per_ccount, and rename ccount_per_jiffy to ccount_preq.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa/include/asm')
| -rw-r--r-- | arch/xtensa/include/asm/timex.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/xtensa/include/asm/timex.h b/arch/xtensa/include/asm/timex.h index c47989a0e3ad..69f901713fb6 100644 --- a/arch/xtensa/include/asm/timex.h +++ b/arch/xtensa/include/asm/timex.h | |||
| @@ -36,9 +36,8 @@ | |||
| 36 | #endif | 36 | #endif |
| 37 | 37 | ||
| 38 | #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT | 38 | #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT |
| 39 | extern unsigned long ccount_per_jiffy; | 39 | extern unsigned long ccount_freq; |
| 40 | extern unsigned long nsec_per_ccount; | 40 | #define CCOUNT_PER_JIFFY (ccount_freq / HZ) |
| 41 | #define CCOUNT_PER_JIFFY ccount_per_jiffy | ||
| 42 | #else | 41 | #else |
| 43 | #define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ)) | 42 | #define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ)) |
| 44 | #endif | 43 | #endif |