blob: ba9f483d8e944dc50bf7dfe75b38e67d125d4dcd [file] [log] [blame]
Arvind M8e87d852018-01-29 00:04:29 -08001From 1eff13748985d89cb9ca2ae6bd260548ddfa18d3 Mon Sep 17 00:00:00 2001
Allen Martin685e0f82016-07-26 19:34:29 -07002From: Ingo Molnar <mingo@elte.hu>
3Date: Fri, 3 Jul 2009 08:30:16 -0500
Arvind M10268e72017-12-04 22:18:06 -08004Subject: [PATCH 042/366] input: gameport: Do not disable interrupts on
Allen Martin685e0f82016-07-26 19:34:29 -07005 PREEMPT_RT
Allen Martin685e0f82016-07-26 19:34:29 -07006
7Use the _nort() primitives.
8
9Signed-off-by: Ingo Molnar <mingo@elte.hu>
10Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Allen Martin685e0f82016-07-26 19:34:29 -070011---
12 drivers/input/gameport/gameport.c | 12 ++++++------
13 1 file changed, 6 insertions(+), 6 deletions(-)
14
15diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
Ishan Mittalb7998262017-01-17 16:11:50 +053016index 4a2a9e3..e970d9a 100644
Allen Martin685e0f82016-07-26 19:34:29 -070017--- a/drivers/input/gameport/gameport.c
18+++ b/drivers/input/gameport/gameport.c
19@@ -91,13 +91,13 @@ static int gameport_measure_speed(struct gameport *gameport)
20 tx = ~0;
21
22 for (i = 0; i < 50; i++) {
23- local_irq_save(flags);
24+ local_irq_save_nort(flags);
25 t1 = ktime_get_ns();
26 for (t = 0; t < 50; t++)
27 gameport_read(gameport);
28 t2 = ktime_get_ns();
29 t3 = ktime_get_ns();
30- local_irq_restore(flags);
31+ local_irq_restore_nort(flags);
32 udelay(i * 10);
33 t = (t2 - t1) - (t3 - t2);
34 if (t < tx)
35@@ -124,12 +124,12 @@ static int old_gameport_measure_speed(struct gameport *gameport)
36 tx = 1 << 30;
37
38 for(i = 0; i < 50; i++) {
39- local_irq_save(flags);
40+ local_irq_save_nort(flags);
41 GET_TIME(t1);
42 for (t = 0; t < 50; t++) gameport_read(gameport);
43 GET_TIME(t2);
44 GET_TIME(t3);
45- local_irq_restore(flags);
46+ local_irq_restore_nort(flags);
47 udelay(i * 10);
48 if ((t = DELTA(t2,t1) - DELTA(t3,t2)) < tx) tx = t;
49 }
50@@ -148,11 +148,11 @@ static int old_gameport_measure_speed(struct gameport *gameport)
51 tx = 1 << 30;
52
53 for(i = 0; i < 50; i++) {
54- local_irq_save(flags);
55+ local_irq_save_nort(flags);
56 t1 = rdtsc();
57 for (t = 0; t < 50; t++) gameport_read(gameport);
58 t2 = rdtsc();
59- local_irq_restore(flags);
60+ local_irq_restore_nort(flags);
61 udelay(i * 10);
62 if (t2 - t1 < tx) tx = t2 - t1;
63 }
64--
Arvind M10268e72017-12-04 22:18:06 -0800651.9.1
Allen Martin685e0f82016-07-26 19:34:29 -070066