Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/parisc/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -366,14 +366,14 @@ void do_cpu_irq_mask(struct pt_regs *regs) 
static struct irqaction timer_action = {

	.handler = timer_interrupt,

	.name = "timer",

	.flags = SA_INTERRUPT,

	.flags = IRQF_DISABLED,

};



#ifdef CONFIG_SMP

static struct irqaction ipi_action = {

	.handler = ipi_interrupt,

	.name = "IPI",

	.flags = SA_INTERRUPT,

	.flags = IRQF_DISABLED,

};

#endif

include/asm-parisc/floppy.h

+4 −4
Original line number Diff line number Diff line
@@ -156,11 +156,11 @@ static int vdma_get_dma_residue(unsigned int dummy) 
static int fd_request_irq(void)

{

	if(can_use_virtual_dma)

		return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,

						   "floppy", NULL);

		return request_irq(FLOPPY_IRQ, floppy_hardint,

				   IRQF_DISABLED, "floppy", NULL);

	else

		return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT,

				   "floppy", NULL);

		return request_irq(FLOPPY_IRQ, floppy_interrupt,

				   IRQF_DISABLED, "floppy", NULL);

}



static unsigned long dma_mem_alloc(unsigned long size)

include/asm-parisc/signal.h

+0 −2
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
 * SA_FLAGS values:

 *

 * 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_NOCLDSTOP flag to turn off SIGCHLD when children stop.

 * SA_RESETHAND clears the handler when the signal is delivered.
@@ -69,7 +68,6 @@ 


#define SA_NOMASK	SA_NODEFER

#define SA_ONESHOT	SA_RESETHAND

#define SA_INTERRUPT	0x20000000 /* dummy -- ignored */



#define SA_RESTORER	0x04000000 /* obsolete -- ignored */