diff options
author | Wu Zhangjin <wuzhangjin@gmail.com> | 2011-07-23 08:41:24 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2011-09-21 11:52:15 -0400 |
commit | 5a4a4ad851dd8db2d888fb86c8bd946b2ae79f60 (patch) | |
tree | 2c0e09bcbdb784c7b94af8ae06c1beea1c803aee | |
parent | 4d85f6afa43d366868fdaa19595722309e4843f6 (diff) |
MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD
Mark interrupts with no_action handler, cascade interrupts, low level
interrupts (bus error, halt ..) with IRQF_NO_THREAD to exclude them
from forced threading.
Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mips@linux-mips.org
Cc: Wu Zhangjin <wuzhangjin@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/ar7/irq.c | 3 | ||||
-rw-r--r-- | arch/mips/bcm63xx/irq.c | 1 | ||||
-rw-r--r-- | arch/mips/cobalt/irq.c | 1 | ||||
-rw-r--r-- | arch/mips/dec/setup.c | 4 | ||||
-rw-r--r-- | arch/mips/emma/markeins/irq.c | 2 | ||||
-rw-r--r-- | arch/mips/lasat/interrupt.c | 1 | ||||
-rw-r--r-- | arch/mips/mti-malta/malta-int.c | 6 | ||||
-rw-r--r-- | arch/mips/pmc-sierra/msp71xx/msp_irq.c | 2 | ||||
-rw-r--r-- | arch/mips/pnx8550/common/int.c | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip22/ip22-int.c | 10 | ||||
-rw-r--r-- | arch/mips/sni/rm200.c | 1 | ||||
-rw-r--r-- | arch/mips/vr41xx/common/irq.c | 1 |
12 files changed, 24 insertions, 10 deletions
diff --git a/arch/mips/ar7/irq.c b/arch/mips/ar7/irq.c index 03db3daadbd8..88c4babfdb5d 100644 --- a/arch/mips/ar7/irq.c +++ b/arch/mips/ar7/irq.c | |||
@@ -98,7 +98,8 @@ static struct irq_chip ar7_sec_irq_type = { | |||
98 | 98 | ||
99 | static struct irqaction ar7_cascade_action = { | 99 | static struct irqaction ar7_cascade_action = { |
100 | .handler = no_action, | 100 | .handler = no_action, |
101 | .name = "AR7 cascade interrupt" | 101 | .name = "AR7 cascade interrupt", |
102 | .flags = IRQF_NO_THREAD, | ||
102 | }; | 103 | }; |
103 | 104 | ||
104 | static void __init ar7_irq_init(int base) | 105 | static void __init ar7_irq_init(int base) |
diff --git a/arch/mips/bcm63xx/irq.c b/arch/mips/bcm63xx/irq.c index cea6021cb8d7..162e11b4ed75 100644 --- a/arch/mips/bcm63xx/irq.c +++ b/arch/mips/bcm63xx/irq.c | |||
@@ -222,6 +222,7 @@ static struct irq_chip bcm63xx_external_irq_chip = { | |||
222 | static struct irqaction cpu_ip2_cascade_action = { | 222 | static struct irqaction cpu_ip2_cascade_action = { |
223 | .handler = no_action, | 223 | .handler = no_action, |
224 | .name = "cascade_ip2", | 224 | .name = "cascade_ip2", |
225 | .flags = IRQF_NO_THREAD, | ||
225 | }; | 226 | }; |
226 | 227 | ||
227 | void __init arch_init_irq(void) | 228 | void __init arch_init_irq(void) |
diff --git a/arch/mips/cobalt/irq.c b/arch/mips/cobalt/irq.c index cb9bf820fe53..965c777d3561 100644 --- a/arch/mips/cobalt/irq.c +++ b/arch/mips/cobalt/irq.c | |||
@@ -48,6 +48,7 @@ asmlinkage void plat_irq_dispatch(void) | |||
48 | static struct irqaction cascade = { | 48 | static struct irqaction cascade = { |
49 | .handler = no_action, | 49 | .handler = no_action, |
50 | .name = "cascade", | 50 | .name = "cascade", |
51 | .flags = IRQF_NO_THREAD, | ||
51 | }; | 52 | }; |
52 | 53 | ||
53 | void __init arch_init_irq(void) | 54 | void __init arch_init_irq(void) |
diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c index fa45e924be05..f7b7ba6d5c45 100644 --- a/arch/mips/dec/setup.c +++ b/arch/mips/dec/setup.c | |||
@@ -101,20 +101,24 @@ int cpu_fpu_mask = DEC_CPU_IRQ_MASK(DEC_CPU_INR_FPU); | |||
101 | static struct irqaction ioirq = { | 101 | static struct irqaction ioirq = { |
102 | .handler = no_action, | 102 | .handler = no_action, |
103 | .name = "cascade", | 103 | .name = "cascade", |
104 | .flags = IRQF_NO_THREAD, | ||
104 | }; | 105 | }; |
105 | static struct irqaction fpuirq = { | 106 | static struct irqaction fpuirq = { |
106 | .handler = no_action, | 107 | .handler = no_action, |
107 | .name = "fpu", | 108 | .name = "fpu", |
109 | .flags = IRQF_NO_THREAD, | ||
108 | }; | 110 | }; |
109 | 111 | ||
110 | static struct irqaction busirq = { | 112 | static struct irqaction busirq = { |
111 | .flags = IRQF_DISABLED, | 113 | .flags = IRQF_DISABLED, |
112 | .name = "bus error", | 114 | .name = "bus error", |
115 | .flags = IRQF_NO_THREAD, | ||
113 | }; | 116 | }; |
114 | 117 | ||
115 | static struct irqaction haltirq = { | 118 | static struct irqaction haltirq = { |
116 | .handler = dec_intr_halt, | 119 | .handler = dec_intr_halt, |
117 | .name = "halt", | 120 | .name = "halt", |
121 | .flags = IRQF_NO_THREAD, | ||
118 | }; | 122 | }; |
119 | 123 | ||
120 | 124 | ||
diff --git a/arch/mips/emma/markeins/irq.c b/arch/mips/emma/markeins/irq.c index 3dbd7a5a6ad3..7798887a1288 100644 --- a/arch/mips/emma/markeins/irq.c +++ b/arch/mips/emma/markeins/irq.c | |||
@@ -169,7 +169,7 @@ void emma2rh_gpio_irq_init(void) | |||
169 | 169 | ||
170 | static struct irqaction irq_cascade = { | 170 | static struct irqaction irq_cascade = { |
171 | .handler = no_action, | 171 | .handler = no_action, |
172 | .flags = 0, | 172 | .flags = IRQF_NO_THREAD, |
173 | .name = "cascade", | 173 | .name = "cascade", |
174 | .dev_id = NULL, | 174 | .dev_id = NULL, |
175 | .next = NULL, | 175 | .next = NULL, |
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c index de4c165515d7..d608b6ef0edd 100644 --- a/arch/mips/lasat/interrupt.c +++ b/arch/mips/lasat/interrupt.c | |||
@@ -105,6 +105,7 @@ asmlinkage void plat_irq_dispatch(void) | |||
105 | static struct irqaction cascade = { | 105 | static struct irqaction cascade = { |
106 | .handler = no_action, | 106 | .handler = no_action, |
107 | .name = "cascade", | 107 | .name = "cascade", |
108 | .flags = IRQF_NO_THREAD, | ||
108 | }; | 109 | }; |
109 | 110 | ||
110 | void __init arch_init_irq(void) | 111 | void __init arch_init_irq(void) |
diff --git a/arch/mips/mti-malta/malta-int.c b/arch/mips/mti-malta/malta-int.c index 1d36c511a7a5..d53ff91b277c 100644 --- a/arch/mips/mti-malta/malta-int.c +++ b/arch/mips/mti-malta/malta-int.c | |||
@@ -350,12 +350,14 @@ unsigned int plat_ipi_resched_int_xlate(unsigned int cpu) | |||
350 | 350 | ||
351 | static struct irqaction i8259irq = { | 351 | static struct irqaction i8259irq = { |
352 | .handler = no_action, | 352 | .handler = no_action, |
353 | .name = "XT-PIC cascade" | 353 | .name = "XT-PIC cascade", |
354 | .flags = IRQF_NO_THREAD, | ||
354 | }; | 355 | }; |
355 | 356 | ||
356 | static struct irqaction corehi_irqaction = { | 357 | static struct irqaction corehi_irqaction = { |
357 | .handler = no_action, | 358 | .handler = no_action, |
358 | .name = "CoreHi" | 359 | .name = "CoreHi", |
360 | .flags = IRQF_NO_THREAD, | ||
359 | }; | 361 | }; |
360 | 362 | ||
361 | static msc_irqmap_t __initdata msc_irqmap[] = { | 363 | static msc_irqmap_t __initdata msc_irqmap[] = { |
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq.c b/arch/mips/pmc-sierra/msp71xx/msp_irq.c index 4531c4a514bc..42a4c04e21d5 100644 --- a/arch/mips/pmc-sierra/msp71xx/msp_irq.c +++ b/arch/mips/pmc-sierra/msp71xx/msp_irq.c | |||
@@ -109,11 +109,13 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs) | |||
109 | static struct irqaction cic_cascade_msp = { | 109 | static struct irqaction cic_cascade_msp = { |
110 | .handler = no_action, | 110 | .handler = no_action, |
111 | .name = "MSP CIC cascade" | 111 | .name = "MSP CIC cascade" |
112 | .flags = IRQF_NO_THREAD, | ||
112 | }; | 113 | }; |
113 | 114 | ||
114 | static struct irqaction per_cascade_msp = { | 115 | static struct irqaction per_cascade_msp = { |
115 | .handler = no_action, | 116 | .handler = no_action, |
116 | .name = "MSP PER cascade" | 117 | .name = "MSP PER cascade" |
118 | .flags = IRQF_NO_THREAD, | ||
117 | }; | 119 | }; |
118 | 120 | ||
119 | void __init arch_init_irq(void) | 121 | void __init arch_init_irq(void) |
diff --git a/arch/mips/pnx8550/common/int.c b/arch/mips/pnx8550/common/int.c index 6b93c81779c1..1ebe22bdadc8 100644 --- a/arch/mips/pnx8550/common/int.c +++ b/arch/mips/pnx8550/common/int.c | |||
@@ -167,7 +167,7 @@ static struct irq_chip level_irq_type = { | |||
167 | 167 | ||
168 | static struct irqaction gic_action = { | 168 | static struct irqaction gic_action = { |
169 | .handler = no_action, | 169 | .handler = no_action, |
170 | .flags = IRQF_DISABLED, | 170 | .flags = IRQF_DISABLED | IRQF_NO_THREAD, |
171 | .name = "GIC", | 171 | .name = "GIC", |
172 | }; | 172 | }; |
173 | 173 | ||
diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c index b4d08e4d2ea9..f72c336ea27b 100644 --- a/arch/mips/sgi-ip22/ip22-int.c +++ b/arch/mips/sgi-ip22/ip22-int.c | |||
@@ -155,32 +155,32 @@ static void __irq_entry indy_buserror_irq(void) | |||
155 | 155 | ||
156 | static struct irqaction local0_cascade = { | 156 | static struct irqaction local0_cascade = { |
157 | .handler = no_action, | 157 | .handler = no_action, |
158 | .flags = IRQF_DISABLED, | 158 | .flags = IRQF_DISABLED | IRQF_NO_THREAD, |
159 | .name = "local0 cascade", | 159 | .name = "local0 cascade", |
160 | }; | 160 | }; |
161 | 161 | ||
162 | static struct irqaction local1_cascade = { | 162 | static struct irqaction local1_cascade = { |
163 | .handler = no_action, | 163 | .handler = no_action, |
164 | .flags = IRQF_DISABLED, | 164 | .flags = IRQF_DISABLED | IRQF_NO_THREAD, |
165 | .name = "local1 cascade", | 165 | .name = "local1 cascade", |
166 | }; | 166 | }; |
167 | 167 | ||
168 | static struct irqaction buserr = { | 168 | static struct irqaction buserr = { |
169 | .handler = no_action, | 169 | .handler = no_action, |
170 | .flags = IRQF_DISABLED, | 170 | .flags = IRQF_DISABLED | IRQF_NO_THREAD, |
171 | .name = "Bus Error", | 171 | .name = "Bus Error", |
172 | }; | 172 | }; |
173 | 173 | ||
174 | static struct irqaction map0_cascade = { | 174 | static struct irqaction map0_cascade = { |
175 | .handler = no_action, | 175 | .handler = no_action, |
176 | .flags = IRQF_DISABLED, | 176 | .flags = IRQF_DISABLED | IRQF_NO_THREAD, |
177 | .name = "mapable0 cascade", | 177 | .name = "mapable0 cascade", |
178 | }; | 178 | }; |
179 | 179 | ||
180 | #ifdef USE_LIO3_IRQ | 180 | #ifdef USE_LIO3_IRQ |
181 | static struct irqaction map1_cascade = { | 181 | static struct irqaction map1_cascade = { |
182 | .handler = no_action, | 182 | .handler = no_action, |
183 | .flags = IRQF_DISABLED, | 183 | .flags = IRQF_DISABLED | IRQF_NO_THREAD, |
184 | .name = "mapable1 cascade", | 184 | .name = "mapable1 cascade", |
185 | }; | 185 | }; |
186 | #define SGI_INTERRUPTS SGINT_END | 186 | #define SGI_INTERRUPTS SGINT_END |
diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c index a7e5a6d917b1..3ab5b5d25b0a 100644 --- a/arch/mips/sni/rm200.c +++ b/arch/mips/sni/rm200.c | |||
@@ -359,6 +359,7 @@ void sni_rm200_init_8259A(void) | |||
359 | static struct irqaction sni_rm200_irq2 = { | 359 | static struct irqaction sni_rm200_irq2 = { |
360 | .handler = no_action, | 360 | .handler = no_action, |
361 | .name = "cascade", | 361 | .name = "cascade", |
362 | .flags = IRQF_NO_THREAD, | ||
362 | }; | 363 | }; |
363 | 364 | ||
364 | static struct resource sni_rm200_pic1_resource = { | 365 | static struct resource sni_rm200_pic1_resource = { |
diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c index 70a3b85f3757..fad2bef432cd 100644 --- a/arch/mips/vr41xx/common/irq.c +++ b/arch/mips/vr41xx/common/irq.c | |||
@@ -34,6 +34,7 @@ static irq_cascade_t irq_cascade[NR_IRQS] __cacheline_aligned; | |||
34 | static struct irqaction cascade_irqaction = { | 34 | static struct irqaction cascade_irqaction = { |
35 | .handler = no_action, | 35 | .handler = no_action, |
36 | .name = "cascade", | 36 | .name = "cascade", |
37 | .flags = IRQF_NO_THREAD, | ||
37 | }; | 38 | }; |
38 | 39 | ||
39 | int cascade_irq(unsigned int irq, int (*get_irq)(unsigned int)) | 40 | int cascade_irq(unsigned int irq, int (*get_irq)(unsigned int)) |