Merge tag 'powerpc-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / arch / powerpc / sysdev / xics / xics-common.c

diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c
index 7e4305c01bacd5e940fb2dbc4a0dff3a71bc035e..b14c502e56a8832c49bad5d1e1c1d5311dd469cb 100644 (file)
--- a/arch/powerpc/sysdev/xics/xics-common.c
+++ b/arch/powerpc/sysdev/xics/xics-common.c
@@ -201,7 +201,7 @@ void xics_migrate_irqs_away(void)
                struct ics *ics;
 
                /* We can't set affinity on ISA interrupts */
-               if (virq < NUM_ISA_INTERRUPTS)
+               if (virq < NR_IRQS_LEGACY)
                        continue;
                /* We only need to migrate enabled IRQS */
                if (!desc->action)
@@ -476,6 +476,8 @@ void __init xics_init(void)
        rc = ics_rtas_init();
        if (rc < 0)
                rc = ics_opal_init();
+       if (rc < 0)
+               rc = ics_native_init();
        if (rc < 0)
                pr_warn("XICS: Cannot find a Source Controller !\n");