x86/acpi: Switch to irq_get_nr_irqs() and irq_set_nr_irqs()

Use the irq_get_nr_irqs() and irq_set_nr_irqs() functions instead of the
global variable 'nr_irqs'. Prepare for changing 'nr_irqs' from an
exported global variable into a variable with file scope.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20241015190953.1266194-7-bvanassche@acm.org

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 4efecac49863ec41e7d9bc6a2cf1a49265592f4a..3a44a9dc3fb7aeeb76b5030211d1d4ccd488d638 100644 (file)
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1171,7 +1171,8 @@ static int __init acpi_parse_madt_ioapic_entries(void)
        }
 
        count = acpi_table_parse_madt(ACPI_MADT_TYPE_INTERRUPT_OVERRIDE,
-                                     acpi_parse_int_src_ovr, nr_irqs);
+                                     acpi_parse_int_src_ovr,
+                                     irq_get_nr_irqs());
        if (count < 0) {
                pr_err("Error parsing interrupt source overrides entry\n");
                /* TBD: Cleanup to allow fallback to MPS */
@@ -1191,7 +1192,8 @@ static int __init acpi_parse_madt_ioapic_entries(void)
        mp_config_acpi_legacy_irqs();
 
        count = acpi_table_parse_madt(ACPI_MADT_TYPE_NMI_SOURCE,
-                                     acpi_parse_nmi_src, nr_irqs);
+                                     acpi_parse_nmi_src,
+                                     irq_get_nr_irqs());
        if (count < 0) {
                pr_err("Error parsing NMI SRC entry\n");
                /* TBD: Cleanup to allow fallback to MPS */

diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index 557318145038ece388de667760448c92128d14d4..736f62812f5c2bbe930cf2cc36f35421c2d1d666 100644 (file)
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -712,8 +712,8 @@ int __init arch_probe_nr_irqs(void)
 {
        int nr;
 
-       if (nr_irqs > (NR_VECTORS * nr_cpu_ids))
-               nr_irqs = NR_VECTORS * nr_cpu_ids;
+       if (irq_get_nr_irqs() > NR_VECTORS * nr_cpu_ids)
+               irq_set_nr_irqs(NR_VECTORS * nr_cpu_ids);
 
        nr = (gsi_top + nr_legacy_irqs()) + 8 * nr_cpu_ids;
 #if defined(CONFIG_PCI_MSI)
@@ -725,8 +725,8 @@ int __init arch_probe_nr_irqs(void)
        else
                nr += gsi_top * 16;
 #endif
-       if (nr < nr_irqs)
-               nr_irqs = nr;
+       if (nr < irq_get_nr_irqs())
+               irq_set_nr_irqs(nr);
 
        /*
         * We don't know if PIC is present at this point so we need to do