From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756508AbYKGFtg (ORCPT ); Fri, 7 Nov 2008 00:49:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755419AbYKGFo4 (ORCPT ); Fri, 7 Nov 2008 00:44:56 -0500 Received: from smtp.polymtl.ca ([132.207.4.11]:32778 "EHLO smtp.polymtl.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755421AbYKGFoq (ORCPT ); Fri, 7 Nov 2008 00:44:46 -0500 Message-Id: <20081107053349.049953540@polymtl.ca> References: <20081107052336.652868737@polymtl.ca> User-Agent: quilt/0.46-1 Date: Fri, 07 Nov 2008 00:23:39 -0500 From: Mathieu Desnoyers To: Linus Torvalds , akpm@linux-foundation.org, Ingo Molnar , Peter Zijlstra , linux-kernel@vger.kernel.org Cc: Mathieu Desnoyers , "David S. Miller" , Ingo Molnar , Thomas Gleixner , Steven Rostedt , linux-arch@vger.kernel.org Subject: [RFC patch 03/18] get_cycles() : sparc64 HAVE_GET_CYCLES Content-Disposition: inline; filename=get-cycles-sparc64-have-get-cycles.patch X-Poly-FromMTA: (test.casi.polymtl.ca [132.207.72.60]) at Fri, 7 Nov 2008 05:43:22 +0000 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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-10-30 20:22:50.000000000 -0400 +++ linux.trees.git/arch/sparc64/Kconfig 2008-11-07 00:09:35.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-09-30 11:38:51.000000000 -0400 +++ linux.trees.git/arch/sparc/include/asm/timex_64.h 2008-11-07 00:09:35.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 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-07 00:06:06.000000000 -0500 +++ linux.trees.git/arch/sparc64/kernel/time.c 2008-11-07 00:09:35.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