diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-21 01:44:34 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-21 01:44:34 -0500 |
| commit | 4b4f887fb2780e39383c1f202b72f5a2780b2d4c (patch) | |
| tree | e790d89c2612d2464ac00063dac677653f4ac9cb /arch/sh/kernel/irq.c | |
| parent | 6424db52e24e8cdf89917fa3c10395116440160e (diff) | |
| parent | 76e7461a21dfe13565b2a323b53c8cc963541126 (diff) | |
Merge branch 'master' into sh/hw-breakpoints
Diffstat (limited to 'arch/sh/kernel/irq.c')
| -rw-r--r-- | arch/sh/kernel/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index e1913f28f418..d2d41d046657 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c | |||
| @@ -76,7 +76,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 76 | if (!desc) | 76 | if (!desc) |
| 77 | return 0; | 77 | return 0; |
| 78 | 78 | ||
| 79 | spin_lock_irqsave(&desc->lock, flags); | 79 | raw_spin_lock_irqsave(&desc->lock, flags); |
| 80 | for_each_online_cpu(j) | 80 | for_each_online_cpu(j) |
| 81 | any_count |= kstat_irqs_cpu(i, j); | 81 | any_count |= kstat_irqs_cpu(i, j); |
| 82 | action = desc->action; | 82 | action = desc->action; |
| @@ -97,7 +97,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 97 | 97 | ||
| 98 | seq_putc(p, '\n'); | 98 | seq_putc(p, '\n'); |
| 99 | out: | 99 | out: |
| 100 | spin_unlock_irqrestore(&desc->lock, flags); | 100 | raw_spin_unlock_irqrestore(&desc->lock, flags); |
| 101 | return 0; | 101 | return 0; |
| 102 | } | 102 | } |
| 103 | #endif | 103 | #endif |