[PATCH 18/43] drivers proc to use nr_irqs

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Yinghai Lu
Date: Sunday, August 10, 2008 - 12:36 am

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
---
 fs/proc/proc_misc.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index ded9698..1968251 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -503,7 +503,7 @@ static int show_stat(struct seq_file *p, void *v)
 	struct timespec boottime;
 	unsigned int *per_irq_sum;
 
-	per_irq_sum = kzalloc(sizeof(unsigned int)*NR_IRQS, GFP_KERNEL);
+	per_irq_sum = kzalloc(sizeof(unsigned int)*nr_irqs, GFP_KERNEL);
 	if (!per_irq_sum)
 		return -ENOMEM;
 
@@ -525,7 +525,7 @@ static int show_stat(struct seq_file *p, void *v)
 		softirq = cputime64_add(softirq, kstat_cpu(i).cpustat.softirq);
 		steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal);
 		guest = cputime64_add(guest, kstat_cpu(i).cpustat.guest);
-		for (j = 0; j < NR_IRQS; j++) {
+		for (j = 0; j < nr_irqs; j++) {
 			unsigned int temp = kstat_cpu(i).irqs[j];
 			sum += temp;
 			per_irq_sum[j] += temp;
@@ -571,7 +571,7 @@ static int show_stat(struct seq_file *p, void *v)
 	}
 	seq_printf(p, "intr %llu", (unsigned long long)sum);
 
-	for (i = 0; i < NR_IRQS; i++)
+	for (i = 0; i < nr_irqs; i++)
 		seq_printf(p, " %u", per_irq_sum[i]);
 
 	seq_printf(p,
@@ -625,13 +625,13 @@ static const struct file_operations proc_stat_operations = {
  */
 static void *int_seq_start(struct seq_file *f, loff_t *pos)
 {
-	return (*pos <= NR_IRQS) ? pos : NULL;
+	return (*pos <= 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 > nr_irqs)
 		return NULL;
 	return pos;
 }
-- 
1.5.4.5

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/43] dyn_array/nr_irqs/sparse_irq support v7, Yinghai Lu, (Sun Aug 10, 12:35 am)
[PATCH 02/43] 8250: Remove NR_IRQ usage, Yinghai Lu, (Sun Aug 10, 12:35 am)
[PATCH 03/43] x86: add after_bootmem for 32bit, Yinghai Lu, (Sun Aug 10, 12:35 am)
[PATCH 04/43] x86: remove irq_vectors_limits, Yinghai Lu, (Sun Aug 10, 12:35 am)
[PATCH 05/43] add dyn_array support, Yinghai Lu, (Sun Aug 10, 12:35 am)
[PATCH 06/43] add per_cpu_dyn_array support, Yinghai Lu, (Sun Aug 10, 12:35 am)
[PATCH 07/43] x86: alloc dyn_array all alltogether, Yinghai Lu, (Sun Aug 10, 12:35 am)
[PATCH 08/43] x86: enable dyn_array support, Yinghai Lu, (Sun Aug 10, 12:35 am)
[PATCH 09/43] introduce nr_irqs, Yinghai Lu, (Sun Aug 10, 12:35 am)
[PATCH 10/43] x86: using nr_irqs, Yinghai Lu, (Sun Aug 10, 12:35 am)
[PATCH 11/43] drivers/char to use nr_irqs, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 12/43] drivers/net to use nr_irqs, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 13/43] drivers intr remapping to use nr_irqs, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 14/43] drivers/pcmcia to use nr_irqs, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 15/43] drivers/rtc to use nr_irqs, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 16/43] drivers/scsi to use nr_irqs, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 17/43] drivers/serial to use nr_irqs, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 18/43] drivers proc to use nr_irqs, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 19/43] drivers xen events to use nr_irqs, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 20/43] make irq_timer_state to use dyn_array, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 21/43] make irq2_iommu to use dyn_array, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 22/43] make irq_desc to use dyn_array, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 24/43] x86: use dyn_array in io_apic_xx.c, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 25/43] x86: get mp_irqs from madt, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 26/43] x86: remove nr_irq_vectors, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 28/43] x86: add irq_cfg in io_apic_64.c, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 29/43] x86: put irq_2_pin pointer into irq_cfg, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 32/43] add irq_desc_without_new, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 34/43] replace loop with nr_irqs for proc/stat, Yinghai Lu, (Sun Aug 10, 12:36 am)
[PATCH 40/43] seperate irq_descX with irq_descX_free, Yinghai Lu, (Sun Aug 10, 12:36 am)