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

[PATCH] irq-flags: PARISC: 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: Kyle McMartin <kyle@mcmartin.ca>
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
733ea869 f40298fd

+6 -8
+2 -2
arch/parisc/kernel/irq.c
··· 366 366 static struct irqaction timer_action = { 367 367 .handler = timer_interrupt, 368 368 .name = "timer", 369 - .flags = SA_INTERRUPT, 369 + .flags = IRQF_DISABLED, 370 370 }; 371 371 372 372 #ifdef CONFIG_SMP 373 373 static struct irqaction ipi_action = { 374 374 .handler = ipi_interrupt, 375 375 .name = "IPI", 376 - .flags = SA_INTERRUPT, 376 + .flags = IRQF_DISABLED, 377 377 }; 378 378 #endif 379 379
+4 -4
include/asm-parisc/floppy.h
··· 156 156 static int fd_request_irq(void) 157 157 { 158 158 if(can_use_virtual_dma) 159 - return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, 160 - "floppy", NULL); 159 + return request_irq(FLOPPY_IRQ, floppy_hardint, 160 + IRQF_DISABLED, "floppy", NULL); 161 161 else 162 - return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT, 163 - "floppy", NULL); 162 + return request_irq(FLOPPY_IRQ, floppy_interrupt, 163 + IRQF_DISABLED, "floppy", NULL); 164 164 } 165 165 166 166 static unsigned long dma_mem_alloc(unsigned long size)
-2
include/asm-parisc/signal.h
··· 48 48 * SA_FLAGS values: 49 49 * 50 50 * SA_ONSTACK indicates that a registered stack_t will be used. 51 - * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the 52 51 * SA_RESTART flag to get restarting signals (which were the default long ago) 53 52 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. 54 53 * SA_RESETHAND clears the handler when the signal is delivered. ··· 68 69 69 70 #define SA_NOMASK SA_NODEFER 70 71 #define SA_ONESHOT SA_RESETHAND 71 - #define SA_INTERRUPT 0x20000000 /* dummy -- ignored */ 72 72 73 73 #define SA_RESTORER 0x04000000 /* obsolete -- ignored */ 74 74