diff options
Diffstat (limited to 'arch/blackfin/kernel')
-rw-r--r-- | arch/blackfin/kernel/irqchip.c | 6 | ||||
-rw-r--r-- | arch/blackfin/kernel/traps.c | 4 | ||||
-rw-r--r-- | arch/blackfin/kernel/vmlinux.lds.S | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c index db9f9c91f11..64cff54a8a5 100644 --- a/arch/blackfin/kernel/irqchip.c +++ b/arch/blackfin/kernel/irqchip.c | |||
@@ -23,7 +23,7 @@ void ack_bad_irq(unsigned int irq) | |||
23 | 23 | ||
24 | static struct irq_desc bad_irq_desc = { | 24 | static struct irq_desc bad_irq_desc = { |
25 | .handle_irq = handle_bad_irq, | 25 | .handle_irq = handle_bad_irq, |
26 | .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock), | 26 | .lock = __RAW_SPIN_LOCK_UNLOCKED(bad_irq_desc.lock), |
27 | }; | 27 | }; |
28 | 28 | ||
29 | #ifdef CONFIG_CPUMASK_OFFSTACK | 29 | #ifdef CONFIG_CPUMASK_OFFSTACK |
@@ -39,7 +39,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
39 | unsigned long flags; | 39 | unsigned long flags; |
40 | 40 | ||
41 | if (i < NR_IRQS) { | 41 | if (i < NR_IRQS) { |
42 | spin_lock_irqsave(&irq_desc[i].lock, flags); | 42 | raw_spin_lock_irqsave(&irq_desc[i].lock, flags); |
43 | action = irq_desc[i].action; | 43 | action = irq_desc[i].action; |
44 | if (!action) | 44 | if (!action) |
45 | goto skip; | 45 | 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_printf(p, "NMI: "); | 58 | seq_printf(p, "NMI: "); |
59 | for_each_online_cpu(j) | 59 | for_each_online_cpu(j) |
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c index e4fd516ce48..d3cbcd6bd98 100644 --- a/arch/blackfin/kernel/traps.c +++ b/arch/blackfin/kernel/traps.c | |||
@@ -1179,7 +1179,7 @@ void show_regs(struct pt_regs *fp) | |||
1179 | if (fp->ipend & ~0x3F) { | 1179 | if (fp->ipend & ~0x3F) { |
1180 | for (i = 0; i < (NR_IRQS - 1); i++) { | 1180 | for (i = 0; i < (NR_IRQS - 1); i++) { |
1181 | if (!in_atomic) | 1181 | if (!in_atomic) |
1182 | spin_lock_irqsave(&irq_desc[i].lock, flags); | 1182 | raw_spin_lock_irqsave(&irq_desc[i].lock, flags); |
1183 | 1183 | ||
1184 | action = irq_desc[i].action; | 1184 | action = irq_desc[i].action; |
1185 | if (!action) | 1185 | if (!action) |
@@ -1194,7 +1194,7 @@ void show_regs(struct pt_regs *fp) | |||
1194 | verbose_printk("\n"); | 1194 | verbose_printk("\n"); |
1195 | unlock: | 1195 | unlock: |
1196 | if (!in_atomic) | 1196 | if (!in_atomic) |
1197 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); | 1197 | raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags); |
1198 | } | 1198 | } |
1199 | } | 1199 | } |
1200 | 1200 | ||
diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S index 01682eed771..66799e763dc 100644 --- a/arch/blackfin/kernel/vmlinux.lds.S +++ b/arch/blackfin/kernel/vmlinux.lds.S | |||
@@ -4,8 +4,6 @@ | |||
4 | * Licensed under the GPL-2 or later | 4 | * Licensed under the GPL-2 or later |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #define VMLINUX_SYMBOL(_sym_) _##_sym_ | ||
8 | |||
9 | #include <asm-generic/vmlinux.lds.h> | 7 | #include <asm-generic/vmlinux.lds.h> |
10 | #include <asm/mem_map.h> | 8 | #include <asm/mem_map.h> |
11 | #include <asm/page.h> | 9 | #include <asm/page.h> |