irq: mips: stop (ab)using handle_domain_irq()

[sfrench/cifs-2.6.git] / arch / mips / cavium-octeon / octeon-irq.c

diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
index be5d4afcd30f930e6eb828d55a05099be8402a5d..844f882096e6a29007280ce8f7c438f5ab7ab53b 100644 (file)
--- a/arch/mips/cavium-octeon/octeon-irq.c
+++ b/arch/mips/cavium-octeon/octeon-irq.c
@@ -2609,7 +2609,10 @@ static void octeon_irq_ciu3_ip2(void)
                else
                        hw = intsn;
 
-               ret = handle_domain_irq(domain, hw, NULL);
+               irq_enter();
+               ret = generic_handle_domain_irq(domain, hw);
+               irq_exit();
+
                if (ret < 0) {
                        union cvmx_ciu3_iscx_w1c isc_w1c;
                        u64 isc_w1c_addr = ciu3_addr + CIU3_ISC_W1C(intsn);