| Allen Martin | 685e0f8 | 2016-07-26 19:34:29 -0700 | [diff] [blame^] | 1 | From 7f8edbe9c31c1a614ea8da02ae953cb922105c00 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ingo Molnar <mingo@elte.hu> |
| 3 | Date: Fri, 3 Jul 2009 08:30:16 -0500 |
| 4 | Subject: [PATCH 082/317] input: gameport: Do not disable interrupts on |
| 5 | PREEMPT_RT |
| 6 | X-NVConfidentiality: public |
| 7 | |
| 8 | Use the _nort() primitives. |
| 9 | |
| 10 | Signed-off-by: Ingo Molnar <mingo@elte.hu> |
| 11 | Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| 12 | Signed-off-by: Allen Martin <amartin@nvidia.com> |
| 13 | --- |
| 14 | drivers/input/gameport/gameport.c | 12 ++++++------ |
| 15 | 1 file changed, 6 insertions(+), 6 deletions(-) |
| 16 | |
| 17 | diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c |
| 18 | index 4a2a9e370be7..e970d9afd179 100644 |
| 19 | --- a/drivers/input/gameport/gameport.c |
| 20 | +++ b/drivers/input/gameport/gameport.c |
| 21 | @@ -91,13 +91,13 @@ static int gameport_measure_speed(struct gameport *gameport) |
| 22 | tx = ~0; |
| 23 | |
| 24 | for (i = 0; i < 50; i++) { |
| 25 | - local_irq_save(flags); |
| 26 | + local_irq_save_nort(flags); |
| 27 | t1 = ktime_get_ns(); |
| 28 | for (t = 0; t < 50; t++) |
| 29 | gameport_read(gameport); |
| 30 | t2 = ktime_get_ns(); |
| 31 | t3 = ktime_get_ns(); |
| 32 | - local_irq_restore(flags); |
| 33 | + local_irq_restore_nort(flags); |
| 34 | udelay(i * 10); |
| 35 | t = (t2 - t1) - (t3 - t2); |
| 36 | if (t < tx) |
| 37 | @@ -124,12 +124,12 @@ static int old_gameport_measure_speed(struct gameport *gameport) |
| 38 | tx = 1 << 30; |
| 39 | |
| 40 | for(i = 0; i < 50; i++) { |
| 41 | - local_irq_save(flags); |
| 42 | + local_irq_save_nort(flags); |
| 43 | GET_TIME(t1); |
| 44 | for (t = 0; t < 50; t++) gameport_read(gameport); |
| 45 | GET_TIME(t2); |
| 46 | GET_TIME(t3); |
| 47 | - local_irq_restore(flags); |
| 48 | + local_irq_restore_nort(flags); |
| 49 | udelay(i * 10); |
| 50 | if ((t = DELTA(t2,t1) - DELTA(t3,t2)) < tx) tx = t; |
| 51 | } |
| 52 | @@ -148,11 +148,11 @@ static int old_gameport_measure_speed(struct gameport *gameport) |
| 53 | tx = 1 << 30; |
| 54 | |
| 55 | for(i = 0; i < 50; i++) { |
| 56 | - local_irq_save(flags); |
| 57 | + local_irq_save_nort(flags); |
| 58 | t1 = rdtsc(); |
| 59 | for (t = 0; t < 50; t++) gameport_read(gameport); |
| 60 | t2 = rdtsc(); |
| 61 | - local_irq_restore(flags); |
| 62 | + local_irq_restore_nort(flags); |
| 63 | udelay(i * 10); |
| 64 | if (t2 - t1 < tx) tx = t2 - t1; |
| 65 | } |
| 66 | -- |
| 67 | 2.9.3 |
| 68 | |