summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/input/gameport
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/input/gameport')
-rw-r--r--kernel/drivers/input/gameport/gameport.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/drivers/input/gameport/gameport.c b/kernel/drivers/input/gameport/gameport.c
index 5b6aa39a1..e970d9afd 100644
--- a/kernel/drivers/input/gameport/gameport.c
+++ b/kernel/drivers/input/gameport/gameport.c
@@ -91,13 +91,13 @@ static int gameport_measure_speed(struct gameport *gameport)
tx = ~0;
for (i = 0; i < 50; i++) {
- local_irq_save(flags);
+ local_irq_save_nort(flags);
t1 = ktime_get_ns();
for (t = 0; t < 50; t++)
gameport_read(gameport);
t2 = ktime_get_ns();
t3 = ktime_get_ns();
- local_irq_restore(flags);
+ local_irq_restore_nort(flags);
udelay(i * 10);
t = (t2 - t1) - (t3 - t2);
if (t < tx)
@@ -149,9 +149,9 @@ static int old_gameport_measure_speed(struct gameport *gameport)
for(i = 0; i < 50; i++) {
local_irq_save_nort(flags);
- rdtscl(t1);
+ t1 = rdtsc();
for (t = 0; t < 50; t++) gameport_read(gameport);
- rdtscl(t2);
+ t2 = rdtsc();
local_irq_restore_nort(flags);
udelay(i * 10);
if (t2 - t1 < tx) tx = t2 - t1;