ia64: use generic_handle_irq()
PATCH 3/4 ia64: use generic_handle_irq()
From: Ingo Molnar <[email protected]>
Use generic_handle_irq() to handle mixed-type irq handling.
[[email protected]: add missing conversion]
Signed-off-by Ingo Molnar <[email protected]>
Cc "Eric W. Biederman" <[email protected]>
Cc "Luck, Tony" <[email protected]>
Cc "Zhang, Yanmin" <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/ia64/kernel/irq.c | 2 +- arch/ia64/kernel/irq_ia64.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/ia64/kernel/irq.c renamed from arch/ia64/kernel/irq.c~ia64-use-generic_handle_irq +1 -1
@@ -197,7 +197,7 @@ void fixup_irqs(void)struct pt_regs *old_regs =set_irq_regs (NULL ); vectors_in_migration[irq]=0 ; -__do_IRQ (irq); +generic_handle_irq (irq);set_irq_regs (old_regs); } }
arch/ia64/kernel/irq_ia64.c renamed from arch/ia64/kernel/irq_ia64.c~ia64-use-generic_handle_irq +2 -2
@@ -186,7 +186,7 @@ ia64_handle_irq (ia64_vector vector, stria64_setreg (_IA64_REG_CR_TPR, vector);ia64_srlz_d (); -__do_IRQ (local_vector_to_irq (vector)); +generic_handle_irq (local_vector_to_irq (vector));/* * Disable interrupts and send EOI:
@@ -242,7 +242,7 @@ void ia64_process_pending_intr(void)* Probably could shared code. */ vectors_in_migration[local_vector_to_irq (vector)]=0 ; -__do_IRQ (local_vector_to_irq (vector)); +generic_handle_irq (local_vector_to_irq (vector));set_irq_regs (old_regs);/*
_