diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2010-02-18 08:43:12 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2010-03-04 11:42:58 -0500 |
commit | 43a5a01bcc5b53c67878f043b4a1b31eaa87a360 (patch) | |
tree | 07710fadf2f196d252854c067db588a526f291fc | |
parent | 0e5d359cca2d685311c4eaeb570f2e7e7915da31 (diff) |
powerpc/qe: Convert qe_ic_lock to raw_spinlock
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>
-rw-r--r-- | arch/powerpc/sysdev/qe_lib/qe_ic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c index d927da893ec4..541ba9863647 100644 --- a/arch/powerpc/sysdev/qe_lib/qe_ic.c +++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | #include "qe_ic.h" | 34 | #include "qe_ic.h" |
35 | 35 | ||
36 | static DEFINE_SPINLOCK(qe_ic_lock); | 36 | static DEFINE_RAW_SPINLOCK(qe_ic_lock); |
37 | 37 | ||
38 | static struct qe_ic_info qe_ic_info[] = { | 38 | static struct qe_ic_info qe_ic_info[] = { |
39 | [1] = { | 39 | [1] = { |
@@ -201,13 +201,13 @@ static void qe_ic_unmask_irq(unsigned int virq) | |||
201 | unsigned long flags; | 201 | unsigned long flags; |
202 | u32 temp; | 202 | u32 temp; |
203 | 203 | ||
204 | spin_lock_irqsave(&qe_ic_lock, flags); | 204 | raw_spin_lock_irqsave(&qe_ic_lock, flags); |
205 | 205 | ||
206 | temp = qe_ic_read(qe_ic->regs, qe_ic_info[src].mask_reg); | 206 | temp = qe_ic_read(qe_ic->regs, qe_ic_info[src].mask_reg); |
207 | qe_ic_write(qe_ic->regs, qe_ic_info[src].mask_reg, | 207 | qe_ic_write(qe_ic->regs, qe_ic_info[src].mask_reg, |
208 | temp | qe_ic_info[src].mask); | 208 | temp | qe_ic_info[src].mask); |
209 | 209 | ||
210 | spin_unlock_irqrestore(&qe_ic_lock, flags); | 210 | raw_spin_unlock_irqrestore(&qe_ic_lock, flags); |
211 | } | 211 | } |
212 | 212 | ||
213 | static void qe_ic_mask_irq(unsigned int virq) | 213 | static void qe_ic_mask_irq(unsigned int virq) |
@@ -217,7 +217,7 @@ static void qe_ic_mask_irq(unsigned int virq) | |||
217 | unsigned long flags; | 217 | unsigned long flags; |
218 | u32 temp; | 218 | u32 temp; |
219 | 219 | ||
220 | spin_lock_irqsave(&qe_ic_lock, flags); | 220 | raw_spin_lock_irqsave(&qe_ic_lock, flags); |
221 | 221 | ||
222 | temp = qe_ic_read(qe_ic->regs, qe_ic_info[src].mask_reg); | 222 | temp = qe_ic_read(qe_ic->regs, qe_ic_info[src].mask_reg); |
223 | qe_ic_write(qe_ic->regs, qe_ic_info[src].mask_reg, | 223 | qe_ic_write(qe_ic->regs, qe_ic_info[src].mask_reg, |
@@ -233,7 +233,7 @@ static void qe_ic_mask_irq(unsigned int virq) | |||
233 | */ | 233 | */ |
234 | mb(); | 234 | mb(); |
235 | 235 | ||
236 | spin_unlock_irqrestore(&qe_ic_lock, flags); | 236 | raw_spin_unlock_irqrestore(&qe_ic_lock, flags); |
237 | } | 237 | } |
238 | 238 | ||
239 | static struct irq_chip qe_ic_irq_chip = { | 239 | static struct irq_chip qe_ic_irq_chip = { |