From e075d7ee1be539e2c37d027cca56372083f4d8f3 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 28 Mar 2011 13:50:50 +0200 Subject: [PATCH] --- yaml --- r: 243298 b: refs/heads/master c: 28a283aae3bdd5088246ca830247ec8393e3e06b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/trace.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 558e73ec2c3f..16a404cd1283 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43f2f1154aecce40e6ced16b46dab47fbb4de866 +refs/heads/master: 28a283aae3bdd5088246ca830247ec8393e3e06b diff --git a/trunk/arch/blackfin/kernel/trace.c b/trunk/arch/blackfin/kernel/trace.c index 05b550891ce5..050db44fe919 100644 --- a/trunk/arch/blackfin/kernel/trace.c +++ b/trunk/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); } }