fs/procfs: Switch to irq_get_nr_irqs()

Use the irq_get_nr_irqs() function 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-21-bvanassche@acm.org

diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
index cb0edc7cbf0920d033b806776a1bf35ab4cb3a67..714a22ded8a8f80057067a489585bd1f5054f8f4 100644 (file)
--- a/fs/proc/interrupts.c
+++ b/fs/proc/interrupts.c
@@ -11,13 +11,13 @@
  */
 static void *int_seq_start(struct seq_file *f, loff_t *pos)
 {
-       return (*pos <= nr_irqs) ? pos : NULL;
+       return *pos <= irq_get_nr_irqs() ? pos : NULL;
 }
 
 static void *int_seq_next(struct seq_file *f, void *v, loff_t *pos)
 {
        (*pos)++;
-       if (*pos > nr_irqs)
+       if (*pos > irq_get_nr_irqs())
                return NULL;
        return pos;
 }

diff --git a/fs/proc/stat.c b/fs/proc/stat.c
index da60956b29156451740530f9e37ba76b39849e56..8b444e862319caf585a395b04e162ec049dd5750 100644 (file)
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -76,7 +76,7 @@ static void show_all_irqs(struct seq_file *p)
                seq_put_decimal_ull(p, " ", kstat_irqs_usr(i));
                next = i + 1;
        }
-       show_irq_gap(p, nr_irqs - next);
+       show_irq_gap(p, irq_get_nr_irqs() - next);
 }
 
 static int show_stat(struct seq_file *p, void *v)
@@ -196,7 +196,7 @@ static int stat_open(struct inode *inode, struct file *file)
        unsigned int size = 1024 + 128 * num_online_cpus();
 
        /* minimum size to display an interrupt count : 2 bytes */
-       size += 2 * nr_irqs;
+       size += 2 * irq_get_nr_irqs();
        return single_open_size(file, show_stat, NULL, size);
 }