From e43be246ab21ef9f5bd5e5a8b837775b91f74eda Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sat, 27 Feb 2010 12:53:34 +0100 Subject: [PATCH] --- yaml --- r: 182125 b: refs/heads/master c: c45ef44f474a82fdec96704bece192e487dca373 h: refs/heads/master i: 182123: b8e06f1c4466d9ae8dd094ab42e082022288e784 v: v3 --- [refs] | 2 +- trunk/arch/mips/powertv/asic/asic_int.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b60c644d9f52..09f639df5d92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a963dc70a286898c91d021e53317ba3d485e0b93 +refs/heads/master: c45ef44f474a82fdec96704bece192e487dca373 diff --git a/trunk/arch/mips/powertv/asic/asic_int.c b/trunk/arch/mips/powertv/asic/asic_int.c index 80b2eed21ac3..325fab9685d1 100644 --- a/trunk/arch/mips/powertv/asic/asic_int.c +++ b/trunk/arch/mips/powertv/asic/asic_int.c @@ -39,21 +39,21 @@ #include -static DEFINE_SPINLOCK(asic_irq_lock); +static DEFINE_RAW_SPINLOCK(asic_irq_lock); static inline int get_int(void) { unsigned long flags; int irq; - spin_lock_irqsave(&asic_irq_lock, flags); + raw_spin_lock_irqsave(&asic_irq_lock, flags); irq = (asic_read(int_int_scan) >> 4) - 1; if (irq == 0 || irq >= NR_IRQS) irq = -1; - spin_unlock_irqrestore(&asic_irq_lock, flags); + raw_spin_unlock_irqrestore(&asic_irq_lock, flags); return irq; }