summaryrefslogtreecommitdiffstats
path: root/arch/xtensa/include
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2013-06-17 10:29:43 +0200
committerChris Zankel <chris@zankel.net>2013-07-08 10:11:37 +0200
commite504c4b6076d9ec1caccaac65803fe3fc29afec8 (patch)
tree9a068eafb50e22b431cdc2d02590c7a92ae36d70 /arch/xtensa/include
parentxtensa: timex.h: remove unused symbols (diff)
downloadlinux-e504c4b6076d9ec1caccaac65803fe3fc29afec8.tar.xz
linux-e504c4b6076d9ec1caccaac65803fe3fc29afec8.zip
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')
-rw-r--r--arch/xtensa/include/asm/timex.h5
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 @@
#endif
#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
-extern unsigned long ccount_per_jiffy;
-extern unsigned long nsec_per_ccount;
-#define CCOUNT_PER_JIFFY ccount_per_jiffy
+extern unsigned long ccount_freq;
+#define CCOUNT_PER_JIFFY (ccount_freq / HZ)
#else
#define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ))
#endif