commit 5fbb004aba15bbca64c3fb611113295bda7ee9ea
tree 8b0dff076c62f6c68b5875e862e5981a4bbd92ef
parent 06344db3162323247e9ac8d76d5acdb79d05f3c0
author Ingo Molnar <[EMAIL PROTECTED]> 1163666587 -0800
committer Tony Luck <[EMAIL PROTECTED]> 1163698715 -0800

[IA64] use generic_handle_irq()

Use generic_handle_irq() to handle mixed-type irq handling.

Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Tony Luck <[EMAIL PROTECTED]>

 arch/ia64/kernel/irq.c      |    2 +-
 arch/ia64/kernel/irq_ia64.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
index 6fe404d..54d55e4 100644
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
@@ -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);
                }
        }
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index 9c6dafa..ba3ba8b 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -186,7 +186,7 @@ ia64_handle_irq (ia64_vector vector, str
                        ia64_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);
 
                        /*
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to