Commit 733ea869 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds

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

Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: default avatarThomas 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f40298fd
...@@ -366,14 +366,14 @@ void do_cpu_irq_mask(struct pt_regs *regs) ...@@ -366,14 +366,14 @@ void do_cpu_irq_mask(struct pt_regs *regs)
static struct irqaction timer_action = { static struct irqaction timer_action = {
.handler = timer_interrupt, .handler = timer_interrupt,
.name = "timer", .name = "timer",
.flags = SA_INTERRUPT, .flags = IRQF_DISABLED,
}; };
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static struct irqaction ipi_action = { static struct irqaction ipi_action = {
.handler = ipi_interrupt, .handler = ipi_interrupt,
.name = "IPI", .name = "IPI",
.flags = SA_INTERRUPT, .flags = IRQF_DISABLED,
}; };
#endif #endif
......
...@@ -156,11 +156,11 @@ static int vdma_get_dma_residue(unsigned int dummy) ...@@ -156,11 +156,11 @@ static int vdma_get_dma_residue(unsigned int dummy)
static int fd_request_irq(void) static int fd_request_irq(void)
{ {
if(can_use_virtual_dma) if(can_use_virtual_dma)
return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, return request_irq(FLOPPY_IRQ, floppy_hardint,
"floppy", NULL); IRQF_DISABLED, "floppy", NULL);
else else
return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT, return request_irq(FLOPPY_IRQ, floppy_interrupt,
"floppy", NULL); IRQF_DISABLED, "floppy", NULL);
} }
static unsigned long dma_mem_alloc(unsigned long size) static unsigned long dma_mem_alloc(unsigned long size)
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
* SA_FLAGS values: * SA_FLAGS values:
* *
* SA_ONSTACK indicates that a registered stack_t will be used. * SA_ONSTACK indicates that a registered stack_t will be used.
* SA_INTERRUPT is a no-op, but left due to historical reasons. Use the
* SA_RESTART flag to get restarting signals (which were the default long ago) * SA_RESTART flag to get restarting signals (which were the default long ago)
* SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
* SA_RESETHAND clears the handler when the signal is delivered. * SA_RESETHAND clears the handler when the signal is delivered.
...@@ -69,7 +68,6 @@ ...@@ -69,7 +68,6 @@
#define SA_NOMASK SA_NODEFER #define SA_NOMASK SA_NODEFER
#define SA_ONESHOT SA_RESETHAND #define SA_ONESHOT SA_RESETHAND
#define SA_INTERRUPT 0x20000000 /* dummy -- ignored */
#define SA_RESTORER 0x04000000 /* obsolete -- ignored */ #define SA_RESTORER 0x04000000 /* obsolete -- ignored */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment