Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu...

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kernel / irq_32.c

diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index cd74f5978ab97a4c7d2ee072d23d764ab49ca6dd..c80cf66996785bd5309eaf8c1831ee0fcf7ec9b3 100644 (file)
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -148,21 +148,21 @@ void do_softirq_own_stack(void)
        call_on_stack(__do_softirq, isp);
 }
 
-bool handle_irq(unsigned irq, struct pt_regs *regs)
+bool handle_irq(struct irq_desc *desc, struct pt_regs *regs)
 {
-       struct irq_desc *desc;
+       unsigned int irq;
        int overflow;
 
        overflow = check_stack_overflow();
 
-       desc = irq_to_desc(irq);
-       if (unlikely(!desc))
+       if (IS_ERR_OR_NULL(desc))
                return false;
 
+       irq = irq_desc_get_irq(desc);
        if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
                if (unlikely(overflow))
                        print_stack_overflow();
-               desc->handle_irq(irq, desc);
+               generic_handle_irq_desc(irq, desc);
        }
 
        return true;