Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Thomas Gleixner and committed by
Linus Torvalds
d18ecedc 6e213616

+12 -14
+2 -2
arch/alpha/kernel/irq.c
··· 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
+1 -1
arch/alpha/kernel/irq_alpha.c
··· 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
+1 -1
arch/alpha/kernel/sys_jensen.c
··· 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
+7 -7
arch/alpha/kernel/sys_titan.c
··· 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 /* ··· 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 /*
+1 -1
include/asm-alpha/floppy.h
··· 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
-2
include/asm-alpha/signal.h
··· 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. ··· 97 98 98 99 #define SA_ONESHOT SA_RESETHAND 99 100 #define SA_NOMASK SA_NODEFER 100 - #define SA_INTERRUPT 0x20000000 /* dummy -- ignored */ 101 101 102 102 /* 103 103 * sigaltstack controls