Merge branch 'for-linus' of git://repo.or.cz/cris-mirror

[~andy/linux] / arch / cris / kernel / irq.c

diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c
index 48fbdbdb58a8e4f50d560715d4a8f44687404c87..6d7b9eda40367c87c4f9e76540e04eab3442f8c8 100644 (file)
--- a/arch/cris/kernel/irq.c
+++ b/arch/cris/kernel/irq.c
@@ -52,7 +52,7 @@ int show_interrupts(struct seq_file *p, void *v)
        }
 
        if (i < NR_IRQS) {
-               spin_lock_irqsave(&irq_desc[i].lock, flags);
+               raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                action = irq_desc[i].action;
                if (!action)
                        goto skip;
@@ -71,7 +71,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                seq_putc(p, '\n');
 skip:
-               spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+               raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
        }
        return 0;
 }