diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2013-07-15 08:03:38 +0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2013-09-06 20:48:51 +0400 |
| commit | fedc21dce814b500e2a9b3cc51f5f802d39e22e5 (patch) | |
| tree | c74999661656c2d74808cd49b800b7d5e5fc9bfe /arch/xtensa/include/asm/timex.h | |
| parent | 123f15e669d5a5a2e2f260ba4a5fc2efd93df20e (diff) | |
| download | linux-fedc21dce814b500e2a9b3cc51f5f802d39e22e5.tar.xz | |
xtensa: fix !CONFIG_XTENSA_CALIBRATE_CCOUNT build failure
Commits 925f5532 (xtensa: ccount based clockevent implementation) and e3f43291
(xtensa: ccount based sched_clock) introduced users of ccount_freq. This
variable doesn't exist when CONFIG_XTENSA_CALIBRATE_CCOUNT is disabled. Add
ccount_freq definition in this case.
Reported-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa/include/asm/timex.h')
| -rw-r--r-- | arch/xtensa/include/asm/timex.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/xtensa/include/asm/timex.h b/arch/xtensa/include/asm/timex.h index 69f901713fb6..86aca77339f2 100644 --- a/arch/xtensa/include/asm/timex.h +++ b/arch/xtensa/include/asm/timex.h @@ -35,13 +35,8 @@ # error "Bad timer number for Linux configurations!" #endif -#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT extern unsigned long ccount_freq; #define CCOUNT_PER_JIFFY (ccount_freq / HZ) -#else -#define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ)) -#endif - typedef unsigned long long cycles_t; |