Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d15f05eb authored by Oskar Schirmer's avatar Oskar Schirmer Committed by Chris Zankel
Browse files

xtensa: fix wrong extern declaration renamed in code using it 



The variable ccount_nsec has been renamed to nsec_per_ccount
in arch/xtensa/kernel/time.c in 2b8aea74 (2007-08-05),
but the fix failed to rename the variable in
arch/xtensa/include/asm/timex.h as well.

Signed-off-by: default avatarOskar Schirmer <os@emlix.com>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent 1fb137c1

arch/xtensa/include/asm/timex.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -39,9 +39,9 @@ 




#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT

#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT

extern unsigned long ccount_per_jiffy;

extern unsigned long ccount_per_jiffy;

extern unsigned long ccount_nsec;

extern unsigned long nsec_per_ccount;

#define CCOUNT_PER_JIFFY ccount_per_jiffy

#define CCOUNT_PER_JIFFY ccount_per_jiffy

#define NSEC_PER_CCOUNT  ccount_nsec

#define NSEC_PER_CCOUNT  nsec_per_ccount

#else

#else

#define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ))

#define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ))

#define NSEC_PER_CCOUNT (1000UL / CONFIG_XTENSA_CPU_CLOCK)

#define NSEC_PER_CCOUNT (1000UL / CONFIG_XTENSA_CPU_CLOCK)