Messages in this thread Patch in this message | | | From | Borislav Petkov <> | Subject | [PATCH 10/19] input/joystick/analog: Switch from rdtscl() to native_read_tsc() | Date | Thu, 25 Jun 2015 18:44:04 +0200 |
| |
From: Andy Lutomirski <luto@kernel.org>
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 <luto@kernel.org> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: Huang Rui <ray.huang@amd.com> Cc: John Stultz <john.stultz@linaro.org> Cc: kvm ML <kvm@vger.kernel.org> Cc: Len Brown <lenb@kernel.org> Cc: linux-input@vger.kernel.org Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: x86-ml <x86@kernel.org> Link: http://lkml.kernel.org/r/90d19b3cea0e05ca6f333d1598daa38afb993260.1434501121.git.luto@kernel.org Signed-off-by: Borislav Petkov <bp@suse.de> --- 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 4284080e481d..f871b4f00056 100644 --- a/drivers/input/joystick/analog.c +++ b/drivers/input/joystick/analog.c @@ -143,7 +143,7 @@ struct analog_port { #include <linux/i8253.h> -#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) -- 2.3.5
| |