diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-17 16:47:10 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-03-02 10:28:38 +0100 |
| commit | ced918eb748ce30b3aace549fd17540e40ffdca0 (patch) | |
| tree | f7c194d56e799508e090ef016bfc2dc0152a4244 /drivers/input/joystick/analog.c | |
| parent | 13dda80e48439b446d0bc9bab34b91484bc8f533 (diff) | |
| download | linux-stable-ced918eb748ce30b3aace549fd17540e40ffdca0.tar.gz linux-stable-ced918eb748ce30b3aace549fd17540e40ffdca0.tar.bz2 linux-stable-ced918eb748ce30b3aace549fd17540e40ffdca0.zip | |
i8253: Convert i8253_lock to raw_spinlock
i8253_lock needs to be a real spinlock in preempt-rt, i.e. it can
not be converted to a sleeping lock.
Convert it to raw_spinlock and fix up all users.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
Cc: Jens Axboe <jens.axboe@oracle.com>
LKML-Reference: <20100217163751.030764372@linutronix.de>
Diffstat (limited to 'drivers/input/joystick/analog.c')
| -rw-r--r-- | drivers/input/joystick/analog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c index 1c0b529c06aa..4afe0a3b4884 100644 --- a/drivers/input/joystick/analog.c +++ b/drivers/input/joystick/analog.c @@ -146,11 +146,11 @@ static unsigned int get_time_pit(void) unsigned long flags; unsigned int count; - spin_lock_irqsave(&i8253_lock, flags); + raw_spin_lock_irqsave(&i8253_lock, flags); outb_p(0x00, 0x43); count = inb_p(0x40); count |= inb_p(0x40) << 8; - spin_unlock_irqrestore(&i8253_lock, flags); + raw_spin_unlock_irqrestore(&i8253_lock, flags); return count; } |