Commit 93bc5d1d authored by Ingo Molnar's avatar Ingo Molnar Committed by Thomas Gleixner

input: Do not disable interrupts on PREEMPT_RT

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 343c8c9a
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/interrupt.h>
#include <linux/sched.h> /* HZ */ #include <linux/sched.h> /* HZ */
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/freezer.h> #include <linux/freezer.h>
...@@ -87,12 +88,12 @@ static int gameport_measure_speed(struct gameport *gameport) ...@@ -87,12 +88,12 @@ static int gameport_measure_speed(struct gameport *gameport)
tx = 1 << 30; tx = 1 << 30;
for(i = 0; i < 50; i++) { for(i = 0; i < 50; i++) {
local_irq_save(flags); local_irq_save_nort(flags);
GET_TIME(t1); GET_TIME(t1);
for (t = 0; t < 50; t++) gameport_read(gameport); for (t = 0; t < 50; t++) gameport_read(gameport);
GET_TIME(t2); GET_TIME(t2);
GET_TIME(t3); GET_TIME(t3);
local_irq_restore(flags); local_irq_restore_nort(flags);
udelay(i * 10); udelay(i * 10);
if ((t = DELTA(t2,t1) - DELTA(t3,t2)) < tx) tx = t; if ((t = DELTA(t2,t1) - DELTA(t3,t2)) < tx) tx = t;
} }
...@@ -111,11 +112,11 @@ static int gameport_measure_speed(struct gameport *gameport) ...@@ -111,11 +112,11 @@ static int gameport_measure_speed(struct gameport *gameport)
tx = 1 << 30; tx = 1 << 30;
for(i = 0; i < 50; i++) { for(i = 0; i < 50; i++) {
local_irq_save(flags); local_irq_save_nort(flags);
rdtscl(t1); rdtscl(t1);
for (t = 0; t < 50; t++) gameport_read(gameport); for (t = 0; t < 50; t++) gameport_read(gameport);
rdtscl(t2); rdtscl(t2);
local_irq_restore(flags); local_irq_restore_nort(flags);
udelay(i * 10); udelay(i * 10);
if (t2 - t1 < tx) tx = t2 - t1; if (t2 - t1 < tx) tx = t2 - t1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment