67 lines
1.9 KiB
Diff
67 lines
1.9 KiB
Diff
|
From 831b7275afcaf948576b177185eb43be282a9249 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ingo Molnar <mingo@elte.hu>
|
||
|
|
Date: Fri, 3 Jul 2009 08:30:16 -0500
|
||
|
|
Subject: [PATCH 083/365] input: gameport: Do not disable interrupts on
|
||
|
|
PREEMPT_RT
|
||
|
|
|
||
|
|
Use the _nort() primitives.
|
||
|
|
|
||
|
|
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
||
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
---
|
||
|
|
drivers/input/gameport/gameport.c | 12 ++++++------
|
||
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
|
||
|
|
index 4a2a9e370be7..e970d9afd179 100644
|
||
|
|
--- a/drivers/input/gameport/gameport.c
|
||
|
|
+++ b/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)
|
||
|
|
@@ -124,12 +124,12 @@ static int old_gameport_measure_speed(struct gameport *gameport)
|
||
|
|
tx = 1 << 30;
|
||
|
|
|
||
|
|
for(i = 0; i < 50; i++) {
|
||
|
|
- local_irq_save(flags);
|
||
|
|
+ local_irq_save_nort(flags);
|
||
|
|
GET_TIME(t1);
|
||
|
|
for (t = 0; t < 50; t++) gameport_read(gameport);
|
||
|
|
GET_TIME(t2);
|
||
|
|
GET_TIME(t3);
|
||
|
|
- local_irq_restore(flags);
|
||
|
|
+ local_irq_restore_nort(flags);
|
||
|
|
udelay(i * 10);
|
||
|
|
if ((t = DELTA(t2,t1) - DELTA(t3,t2)) < tx) tx = t;
|
||
|
|
}
|
||
|
|
@@ -148,11 +148,11 @@ static int old_gameport_measure_speed(struct gameport *gameport)
|
||
|
|
tx = 1 << 30;
|
||
|
|
|
||
|
|
for(i = 0; i < 50; i++) {
|
||
|
|
- local_irq_save(flags);
|
||
|
|
+ local_irq_save_nort(flags);
|
||
|
|
t1 = rdtsc();
|
||
|
|
for (t = 0; t < 50; t++) gameport_read(gameport);
|
||
|
|
t2 = rdtsc();
|
||
|
|
- local_irq_restore(flags);
|
||
|
|
+ local_irq_restore_nort(flags);
|
||
|
|
udelay(i * 10);
|
||
|
|
if (t2 - t1 < tx) tx = t2 - t1;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|