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

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

[PATCH] irq-flags: IA64: 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: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4879d77c

arch/ia64/hp/sim/simserial.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 


#define NR_PORTS	1	/* only one port for now */



#define IRQ_T(info) ((info->flags & ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT)

#define IRQ_T(info) ((info->flags & ASYNC_SHARE_IRQ) ? IRQF_SHARED : IRQF_DISABLED)



#define SSC_GETCHAR	21

arch/ia64/kernel/irq_ia64.c

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ extern irqreturn_t handle_IPI (int irq, void *dev_id, struct pt_regs *regs); 


static struct irqaction ipi_irqaction = {

	.handler =	handle_IPI,

	.flags =	SA_INTERRUPT,

	.flags =	IRQF_DISABLED,

	.name =		"IPI"

};

#endif

arch/ia64/kernel/mca.c

+6 −6
Original line number Diff line number Diff line
@@ -1457,38 +1457,38 @@ __setup("disable_cpe_poll", ia64_mca_disable_cpe_polling); 


static struct irqaction cmci_irqaction = {

	.handler =	ia64_mca_cmc_int_handler,

	.flags =	SA_INTERRUPT,

	.flags =	IRQF_DISABLED,

	.name =		"cmc_hndlr"

};



static struct irqaction cmcp_irqaction = {

	.handler =	ia64_mca_cmc_int_caller,

	.flags =	SA_INTERRUPT,

	.flags =	IRQF_DISABLED,

	.name =		"cmc_poll"

};



static struct irqaction mca_rdzv_irqaction = {

	.handler =	ia64_mca_rendez_int_handler,

	.flags =	SA_INTERRUPT,

	.flags =	IRQF_DISABLED,

	.name =		"mca_rdzv"

};



static struct irqaction mca_wkup_irqaction = {

	.handler =	ia64_mca_wakeup_int_handler,

	.flags =	SA_INTERRUPT,

	.flags =	IRQF_DISABLED,

	.name =		"mca_wkup"

};



#ifdef CONFIG_ACPI

static struct irqaction mca_cpe_irqaction = {

	.handler =	ia64_mca_cpe_int_handler,

	.flags =	SA_INTERRUPT,

	.flags =	IRQF_DISABLED,

	.name =		"cpe_hndlr"

};



static struct irqaction mca_cpep_irqaction = {

	.handler =	ia64_mca_cpe_int_caller,

	.flags =	SA_INTERRUPT,

	.flags =	IRQF_DISABLED,

	.name =		"cpe_poll"

};

#endif /* CONFIG_ACPI */

arch/ia64/kernel/perfmon.c

+1 −1
Original line number Diff line number Diff line
@@ -6439,7 +6439,7 @@ pfm_flush_pmds(struct task_struct *task, pfm_context_t *ctx) 


static struct irqaction perfmon_irqaction = {

	.handler = pfm_interrupt_handler,

	.flags   = SA_INTERRUPT,

	.flags   = IRQF_DISABLED,

	.name    = "perfmon"

};

arch/ia64/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ ia64_init_itm (void) 


static struct irqaction timer_irqaction = {

	.handler =	timer_interrupt,

	.flags =	SA_INTERRUPT,

	.flags =	IRQF_DISABLED,

	.name =		"timer"

};