diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-01 02:55:20 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-01 02:55:20 -0500 |
| commit | 35858adbfca13678af99fb31618ef4428d6dedb0 (patch) | |
| tree | 3336feaa61324486945816cb52c347733e7c0821 /arch/um/kernel/irq.c | |
| parent | 197d4db752e67160d79fed09968c2140376a80a3 (diff) | |
| parent | 4b70858ba8d4537daf782defebe5f2ff80ccef2b (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/um/kernel/irq.c')
| -rw-r--r-- | arch/um/kernel/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index 039270b9b73b..89474ba0741e 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c | |||
| @@ -34,7 +34,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | if (i < NR_IRQS) { | 36 | if (i < NR_IRQS) { |
| 37 | spin_lock_irqsave(&irq_desc[i].lock, flags); | 37 | raw_spin_lock_irqsave(&irq_desc[i].lock, flags); |
| 38 | action = irq_desc[i].action; | 38 | action = irq_desc[i].action; |
| 39 | if (!action) | 39 | if (!action) |
| 40 | goto skip; | 40 | goto skip; |
| @@ -53,7 +53,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 53 | 53 | ||
| 54 | seq_putc(p, '\n'); | 54 | seq_putc(p, '\n'); |
| 55 | skip: | 55 | skip: |
| 56 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); | 56 | raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags); |
| 57 | } else if (i == NR_IRQS) | 57 | } else if (i == NR_IRQS) |
| 58 | seq_putc(p, '\n'); | 58 | seq_putc(p, '\n'); |
| 59 | 59 | ||