Skip to content

Commit

Permalink
powerpc/qe: Convert qe_ic_lock to raw_spinlock
Browse files Browse the repository at this point in the history
Interrupt controllers' hooks are executed in the atomic context, so
they are not permitted to sleep (with RT kernels non-raw spinlocks are
sleepable). So, qe_ic_lock has to be a real (non-sleepable) spinlock.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
  • Loading branch information
Anton Vorontsov authored and Kumar Gala committed Mar 4, 2010
1 parent 0e5d359 commit 43a5a01
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/powerpc/sysdev/qe_lib/qe_ic.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

#include "qe_ic.h"

static DEFINE_SPINLOCK(qe_ic_lock);
static DEFINE_RAW_SPINLOCK(qe_ic_lock);

static struct qe_ic_info qe_ic_info[] = {
[1] = {
Expand Down Expand Up @@ -201,13 +201,13 @@ static void qe_ic_unmask_irq(unsigned int virq)
unsigned long flags;
u32 temp;

spin_lock_irqsave(&qe_ic_lock, flags);
raw_spin_lock_irqsave(&qe_ic_lock, flags);

temp = qe_ic_read(qe_ic->regs, qe_ic_info[src].mask_reg);
qe_ic_write(qe_ic->regs, qe_ic_info[src].mask_reg,
temp | qe_ic_info[src].mask);

spin_unlock_irqrestore(&qe_ic_lock, flags);
raw_spin_unlock_irqrestore(&qe_ic_lock, flags);
}

static void qe_ic_mask_irq(unsigned int virq)
Expand All @@ -217,7 +217,7 @@ static void qe_ic_mask_irq(unsigned int virq)
unsigned long flags;
u32 temp;

spin_lock_irqsave(&qe_ic_lock, flags);
raw_spin_lock_irqsave(&qe_ic_lock, flags);

temp = qe_ic_read(qe_ic->regs, qe_ic_info[src].mask_reg);
qe_ic_write(qe_ic->regs, qe_ic_info[src].mask_reg,
Expand All @@ -233,7 +233,7 @@ static void qe_ic_mask_irq(unsigned int virq)
*/
mb();

spin_unlock_irqrestore(&qe_ic_lock, flags);
raw_spin_unlock_irqrestore(&qe_ic_lock, flags);
}

static struct irq_chip qe_ic_irq_chip = {
Expand Down

0 comments on commit 43a5a01

Please sign in to comment.