This patch selects HAVE_GET_CYCLES and makes sure get_cycles_barrier() and get_cycles_rate() are implemented. Changelog : - Use tb_ticks_per_usec * 1000000 in get_cycles_rate(). Signed-off-by: Mathieu Desnoyers Acked-by: David S. Miller CC: Linus Torvalds CC: Andrew Morton CC: Ingo Molnar CC: Peter Zijlstra CC: Thomas Gleixner CC: Steven Rostedt CC: linux-arch@vger.kernel.org --- arch/sparc/include/asm/timex_64.h | 19 ++++++++++++++++++- arch/sparc64/Kconfig | 1 + arch/sparc64/kernel/time.c | 3 ++- 3 files changed, 21 insertions(+), 2 deletions(-) Index: linux.trees.git/arch/sparc64/Kconfig =================================================================== --- linux.trees.git.orig/arch/sparc64/Kconfig 2008-11-12 18:15:48.000000000 -0500 +++ linux.trees.git/arch/sparc64/Kconfig 2008-11-26 06:48:52.000000000 -0500 @@ -13,6 +13,7 @@ config SPARC64 default y select HAVE_FUNCTION_TRACER select HAVE_IDE + select HAVE_GET_CYCLES select HAVE_LMB select HAVE_ARCH_KGDB select USE_GENERIC_SMP_HELPERS if SMP Index: linux.trees.git/arch/sparc/include/asm/timex_64.h =================================================================== --- linux.trees.git.orig/arch/sparc/include/asm/timex_64.h 2008-11-12 18:15:48.000000000 -0500 +++ linux.trees.git/arch/sparc/include/asm/timex_64.h 2008-11-26 06:48:52.000000000 -0500 @@ -12,7 +12,24 @@ /* Getting on the cycle counter on sparc64. */ typedef unsigned long cycles_t; -#define get_cycles() tick_ops->get_tick() + +static inline cycles_t get_cycles(void) +{ + return tick_ops->get_tick(); +} + +/* get_cycles instruction is synchronized on sparc64 */ +static inline void get_cycles_barrier(void) +{ + return; +} + +extern unsigned long tb_ticks_per_usec; + +static inline cycles_t get_cycles_rate(void) +{ + return (cycles_t)tb_ticks_per_usec * 1000000UL; +} #define ARCH_HAS_READ_CURRENT_TIMER Index: linux.trees.git/arch/sparc64/kernel/time.c =================================================================== --- linux.trees.git.orig/arch/sparc64/kernel/time.c 2008-11-12 18:15:48.000000000 -0500 +++ linux.trees.git/arch/sparc64/kernel/time.c 2008-11-26 06:48:52.000000000 -0500 @@ -793,7 +793,8 @@ static void __init setup_clockevent_mult sparc64_clockevent.mult = mult; } -static unsigned long tb_ticks_per_usec __read_mostly; +unsigned long tb_ticks_per_usec __read_mostly; +EXPORT_SYMBOL_GPL(tb_ticks_per_usec); void __delay(unsigned long loops) { -- Mathieu Desnoyers OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/