Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/blackfin/kernel/trace.c b/arch/blackfin/kernel/trace.c
index 05b550891ce5..050db44fe919 100644
--- a/arch/blackfin/kernel/trace.c
+++ b/arch/blackfin/kernel/trace.c
@@ -912,10 +912,11 @@ void show_regs(struct pt_regs *fp)
         /* if no interrupts are going off, don't print this out */
         if (fp->ipend & ~0x3F) {
                 for (i = 0; i < (NR_IRQS - 1); i++) {
+                        struct irq_desc *desc = irq_to_desc(i);
                         if (!in_atomic)
-                                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
+                                raw_spin_lock_irqsave(&desc->lock, flags);
 
-                        action = irq_desc[i].action;
+                        action = desc->action;
                         if (!action)
                                 goto unlock;
 
@@ -928,7 +929,7 @@ void show_regs(struct pt_regs *fp)
                         pr_cont("\n");
 unlock:
                         if (!in_atomic)
-                                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                                raw_spin_unlock_irqrestore(&desc->lock, flags);
                 }
         }