From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755461AbbGFPoC (ORCPT ); Mon, 6 Jul 2015 11:44:02 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49419 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751874AbbGFPn6 (ORCPT ); Mon, 6 Jul 2015 11:43:58 -0400 Date: Mon, 6 Jul 2015 08:42:50 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: john.stultz@linaro.org, hpa@zytor.com, dmitry.torokhov@gmail.com, bp@alien8.de, ray.huang@amd.com, luto@kernel.org, bp@suse.de, luto@amacapital.net, linux-kernel@vger.kernel.org, lenb@kernel.org, torvalds@linux-foundation.org, tglx@linutronix.de, kvm@vger.kernel.org, mingo@kernel.org, brgerst@gmail.com, peterz@infradead.org, ralf@linux-mips.org, dvlasenk@redhat.com Reply-To: bp@suse.de, luto@kernel.org, ray.huang@amd.com, bp@alien8.de, john.stultz@linaro.org, dmitry.torokhov@gmail.com, hpa@zytor.com, ralf@linux-mips.org, dvlasenk@redhat.com, peterz@infradead.org, brgerst@gmail.com, kvm@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, lenb@kernel.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, luto@amacapital.net In-Reply-To: <90d19b3cea0e05ca6f333d1598daa38afb993260.1434501121.git.luto@kernel.org> References: <90d19b3cea0e05ca6f333d1598daa38afb993260.1434501121.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/tsc, input/joystick/analog: Switch from rdtscl() to native_read_tsc() Git-Commit-ID: 016bfc449a88c833e949414a41748b359843dbb1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 016bfc449a88c833e949414a41748b359843dbb1 Gitweb: http://git.kernel.org/tip/016bfc449a88c833e949414a41748b359843dbb1 Author: Andy Lutomirski AuthorDate: Thu, 25 Jun 2015 18:44:04 +0200 Committer: Ingo Molnar CommitDate: Mon, 6 Jul 2015 15:23:28 +0200 x86/asm/tsc, input/joystick/analog: Switch from rdtscl() to native_read_tsc() This timing code is hideous, and this doesn't help. It gets rid of one of the last users of rdtscl(), though. Signed-off-by: Andy Lutomirski Signed-off-by: Borislav Petkov Acked-by: Dmitry Torokhov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Huang Rui Cc: John Stultz Cc: Len Brown Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Ralf Baechle Cc: Thomas Gleixner Cc: kvm ML Cc: linux-input@vger.kernel.org Link: http://lkml.kernel.org/r/90d19b3cea0e05ca6f333d1598daa38afb993260.1434501121.git.luto@kernel.org Signed-off-by: Ingo Molnar --- drivers/input/joystick/analog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c index 4284080..f871b4f 100644 --- a/drivers/input/joystick/analog.c +++ b/drivers/input/joystick/analog.c @@ -143,7 +143,7 @@ struct analog_port { #include -#define GET_TIME(x) do { if (cpu_has_tsc) rdtscl(x); else x = get_time_pit(); } while (0) +#define GET_TIME(x) do { if (cpu_has_tsc) x = (unsigned int)native_read_tsc(); else x = get_time_pit(); } while (0) #define DELTA(x,y) (cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? PIT_TICK_RATE / HZ : 0))) #define TIME_NAME (cpu_has_tsc?"TSC":"PIT") static unsigned int get_time_pit(void) @@ -160,7 +160,7 @@ static unsigned int get_time_pit(void) return count; } #elif defined(__x86_64__) -#define GET_TIME(x) rdtscl(x) +#define GET_TIME(x) do { x = (unsigned int)native_read_tsc(); } while (0) #define DELTA(x,y) ((y)-(x)) #define TIME_NAME "TSC" #elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_TILE)