summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/input/joystick/analog.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/input/joystick/analog.c')
-rw-r--r--kernel/drivers/input/joystick/analog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/drivers/input/joystick/analog.c b/kernel/drivers/input/joystick/analog.c
index 4284080e4..6f8b084e1 100644
--- a/kernel/drivers/input/joystick/analog.c
+++ b/kernel/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)rdtsc(); 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)rdtsc(); } 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)