Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d18ecedc021351ca432a5b7e28d8f91c00957dc7

Authored by Thomas Gleixner
Committed by Linus Torvalds
1 parent 6e21361619
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] irq-flags: ALPHA: Use the new IRQF_ constants 

Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 6 changed files with 12 additions and 14 deletions Side-by-side Diff

arch/alpha/kernel/irq.c
Diff comments   View file @ d18eced
... ... @@ -94,12 +94,12 @@
94 94 #endif
95 95 seq_printf(p, " %14s", irq_desc[irq].chip->typename);
96 96 seq_printf(p, " %c%s",
97   - (action->flags & SA_INTERRUPT)?'+':' ',
  97 + (action->flags & IRQF_DISABLED)?'+':' ',
98 98 action->name);
99 99  
100 100 for (action=action->next; action; action = action->next) {
101 101 seq_printf(p, ", %c%s",
102   - (action->flags & SA_INTERRUPT)?'+':' ',
  102 + (action->flags & IRQF_DISABLED)?'+':' ',
103 103 action->name);
104 104 }
105 105  
arch/alpha/kernel/irq_alpha.c
Diff comments   View file @ d18eced
... ... @@ -214,7 +214,7 @@
214 214  
215 215 struct irqaction timer_irqaction = {
216 216 .handler = timer_interrupt,
217   - .flags = SA_INTERRUPT,
  217 + .flags = IRQF_DISABLED,
218 218 .name = "timer",
219 219 };
220 220  
arch/alpha/kernel/sys_jensen.c
Diff comments   View file @ d18eced
... ... @@ -74,7 +74,7 @@
74 74 * the IPL from being dropped during handler processing.
75 75 */
76 76 if (irq_desc[irq].action)
77   - irq_desc[irq].action->flags |= SA_INTERRUPT;
  77 + irq_desc[irq].action->flags |= IRQF_DISABLED;
78 78 return 0;
79 79 }
80 80  
arch/alpha/kernel/sys_titan.c
Diff comments   View file @ d18eced
... ... @@ -279,15 +279,15 @@
279 279 * all reported to the kernel as machine checks, so the handler
280 280 * is a nop so it can be called to count the individual events.
281 281 */
282   - request_irq(63+16, titan_intr_nop, SA_INTERRUPT,
  282 + request_irq(63+16, titan_intr_nop, IRQF_DISABLED,
283 283 "CChip Error", NULL);
284   - request_irq(62+16, titan_intr_nop, SA_INTERRUPT,
  284 + request_irq(62+16, titan_intr_nop, IRQF_DISABLED,
285 285 "PChip 0 H_Error", NULL);
286   - request_irq(61+16, titan_intr_nop, SA_INTERRUPT,
  286 + request_irq(61+16, titan_intr_nop, IRQF_DISABLED,
287 287 "PChip 1 H_Error", NULL);
288   - request_irq(60+16, titan_intr_nop, SA_INTERRUPT,
  288 + request_irq(60+16, titan_intr_nop, IRQF_DISABLED,
289 289 "PChip 0 C_Error", NULL);
290   - request_irq(59+16, titan_intr_nop, SA_INTERRUPT,
  290 + request_irq(59+16, titan_intr_nop, IRQF_DISABLED,
291 291 "PChip 1 C_Error", NULL);
292 292  
293 293 /*
294 294  
... ... @@ -348,9 +348,9 @@
348 348 * Hook a couple of extra err interrupts that the
349 349 * common titan code won't.
350 350 */
351   - request_irq(53+16, titan_intr_nop, SA_INTERRUPT,
  351 + request_irq(53+16, titan_intr_nop, IRQF_DISABLED,
352 352 "NMI", NULL);
353   - request_irq(50+16, titan_intr_nop, SA_INTERRUPT,
  353 + request_irq(50+16, titan_intr_nop, IRQF_DISABLED,
354 354 "Temperature Warning", NULL);
355 355  
356 356 /*
include/asm-alpha/floppy.h
Diff comments   View file @ d18eced
... ... @@ -26,7 +26,7 @@
26 26 #define fd_disable_irq() disable_irq(FLOPPY_IRQ)
27 27 #define fd_cacheflush(addr,size) /* nothing */
28 28 #define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt,\
29   - SA_INTERRUPT, "floppy", NULL)
  29 + IRQF_DISABLED, "floppy", NULL)
30 30 #define fd_free_irq() free_irq(FLOPPY_IRQ, NULL);
31 31  
32 32 #ifdef CONFIG_PCI
include/asm-alpha/signal.h
Diff comments   View file @ d18eced
... ... @@ -77,7 +77,6 @@
77 77 * SA_FLAGS values:
78 78 *
79 79 * SA_ONSTACK indicates that a registered stack_t will be used.
80   - * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the
81 80 * SA_RESTART flag to get restarting signals (which were the default long ago)
82 81 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
83 82 * SA_RESETHAND clears the handler when the signal is delivered.
... ... @@ -98,7 +97,6 @@
98 97  
99 98 #define SA_ONESHOT SA_RESETHAND
100 99 #define SA_NOMASK SA_NODEFER
101   -#define SA_INTERRUPT 0x20000000 /* dummy -- ignored */
102 100  
103 101 /*
104 102 * sigaltstack controls