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

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

[PATCH] ARM: fixup irqflags breakage after ARM genirq merge 



The irgflags consolidation did conflict with the ARM to generic IRQ
conversion and was not applied for ARM. Fix it up.

Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d061daa0

arch/arm/common/time-acorn.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ ioc_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 


static struct irqaction ioc_timer_irq = {

	.name		= "timer",

	.flags		= SA_INTERRUPT,

	.flags		= IRQF_DISABLED,

	.handler	= ioc_timer_interrupt

};

arch/arm/mach-aaec2000/core.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ aaec2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 


static struct irqaction aaec2000_timer_irq = {

	.name		= "AAEC-2000 Timer Tick",

	.flags		= SA_INTERRUPT | SA_TIMER,

	.flags		= IRQF_DISABLED | IRQF_TIMER,

	.handler	= aaec2000_timer_interrupt,

};

arch/arm/mach-at91rm9200/at91rm9200_time.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id, struct pt_r 


static struct irqaction at91rm9200_timer_irq = {

	.name		= "at91_tick",

	.flags		= SA_SHIRQ | SA_INTERRUPT | SA_TIMER,

	.flags		= IRQF_SHARED | IRQF_DISABLED | IRQF_TIMER,

	.handler	= at91rm9200_timer_interrupt

};

arch/arm/mach-clps711x/time.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ p720t_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 


static struct irqaction clps711x_timer_irq = {

	.name		= "CLPS711x Timer Tick",

	.flags		= SA_INTERRUPT | SA_TIMER,

	.flags		= IRQF_DISABLED | IRQF_TIMER,

	.handler	= p720t_timer_interrupt,

};

arch/arm/mach-clps7500/core.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ clps7500_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 


static struct irqaction clps7500_timer_irq = {

	.name		= "CLPS7500 Timer Tick",

	.flags		= SA_INTERRUPT | SA_TIMER,

	.flags		= IRQF_DISABLED | IRQF_TIMER,

	.handler	= clps7500_timer_interrupt,

};