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

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

[PATCH] irq-flags: ALPHA: 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: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6e213616

arch/alpha/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -94,12 +94,12 @@ show_interrupts(struct seq_file *p, void *v) 
#endif

		seq_printf(p, " %14s", irq_desc[irq].chip->typename);

		seq_printf(p, "  %c%s",

			(action->flags & SA_INTERRUPT)?'+':' ',

			(action->flags & IRQF_DISABLED)?'+':' ',

			action->name);



		for (action=action->next; action; action = action->next) {

			seq_printf(p, ", %c%s",

				  (action->flags & SA_INTERRUPT)?'+':' ',

				  (action->flags & IRQF_DISABLED)?'+':' ',

				   action->name);

		}

arch/alpha/kernel/irq_alpha.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static unsigned int rtc_startup(unsigned int irq) { return 0; } 


struct irqaction timer_irqaction = {

	.handler	= timer_interrupt,

	.flags		= SA_INTERRUPT,

	.flags		= IRQF_DISABLED,

	.name		= "timer",

};

arch/alpha/kernel/sys_jensen.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ jensen_local_startup(unsigned int irq) 
		 * the IPL from being dropped during handler processing.

		 */

		if (irq_desc[irq].action)

			irq_desc[irq].action->flags |= SA_INTERRUPT;

			irq_desc[irq].action->flags |= IRQF_DISABLED;

	return 0;

}

arch/alpha/kernel/sys_titan.c

+7 −7
Original line number Diff line number Diff line
@@ -279,15 +279,15 @@ titan_late_init(void) 
	 * all reported to the kernel as machine checks, so the handler

	 * is a nop so it can be called to count the individual events.

	 */

	request_irq(63+16, titan_intr_nop, SA_INTERRUPT, 

	request_irq(63+16, titan_intr_nop, IRQF_DISABLED,

		    "CChip Error", NULL);

	request_irq(62+16, titan_intr_nop, SA_INTERRUPT, 

	request_irq(62+16, titan_intr_nop, IRQF_DISABLED,

		    "PChip 0 H_Error", NULL);

	request_irq(61+16, titan_intr_nop, SA_INTERRUPT, 

	request_irq(61+16, titan_intr_nop, IRQF_DISABLED,

		    "PChip 1 H_Error", NULL);

	request_irq(60+16, titan_intr_nop, SA_INTERRUPT, 

	request_irq(60+16, titan_intr_nop, IRQF_DISABLED,

		    "PChip 0 C_Error", NULL);

	request_irq(59+16, titan_intr_nop, SA_INTERRUPT, 

	request_irq(59+16, titan_intr_nop, IRQF_DISABLED,

		    "PChip 1 C_Error", NULL);



	/*
@@ -348,9 +348,9 @@ privateer_init_pci(void) 
	 * Hook a couple of extra err interrupts that the

	 * common titan code won't.

	 */

	request_irq(53+16, titan_intr_nop, SA_INTERRUPT, 

	request_irq(53+16, titan_intr_nop, IRQF_DISABLED,

		    "NMI", NULL);

	request_irq(50+16, titan_intr_nop, SA_INTERRUPT, 

	request_irq(50+16, titan_intr_nop, IRQF_DISABLED,

		    "Temperature Warning", NULL);



	/*

include/asm-alpha/floppy.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#define fd_disable_irq()        disable_irq(FLOPPY_IRQ)

#define fd_cacheflush(addr,size) /* nothing */

#define fd_request_irq()        request_irq(FLOPPY_IRQ, floppy_interrupt,\

					    SA_INTERRUPT, "floppy", NULL)

					    IRQF_DISABLED, "floppy", NULL)

#define fd_free_irq()           free_irq(FLOPPY_IRQ, NULL);



#ifdef CONFIG_PCI