UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

fs/proc: use nr_irqs 

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-08-19 20:49:56 -07:00 committed by Ingo Molnar
parent a62c413373
commit da27c118eb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/proc/proc_misc.c
View File

@ -509,7 +509,7 @@ static int show_stat(struct seq_file *p, void *v)
struct timespec boottime; struct timespec boottime;
unsigned int *per_irq_sum; 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) if (!per_irq_sum)
return -ENOMEM; return -ENOMEM;
@ -531,7 +531,7 @@ static int show_stat(struct seq_file *p, void *v)
softirq = cputime64_add(softirq, kstat_cpu(i).cpustat.softirq); softirq = cputime64_add(softirq, kstat_cpu(i).cpustat.softirq);
steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal); steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal);
guest = cputime64_add(guest, kstat_cpu(i).cpustat.guest); 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]; unsigned int temp = kstat_cpu(i).irqs[j];
sum += temp; sum += temp;
per_irq_sum[j] += temp; per_irq_sum[j] += temp;
@ -577,7 +577,7 @@ static int show_stat(struct seq_file *p, void *v)
} }
seq_printf(p, "intr %llu", (unsigned long long)sum); 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, " %u", per_irq_sum[i]);
seq_printf(p, seq_printf(p,
@ -631,13 +631,13 @@ static const struct file_operations proc_stat_operations = {
*/ */
static void *int_seq_start(struct seq_file *f, loff_t *pos) 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) static void *int_seq_next(struct seq_file *f, void *v, loff_t *pos)
{ {
(*pos)++; (*pos)++;
if (*pos > NR_IRQS) if (*pos > nr_irqs)
return NULL; return NULL;
return pos; return pos;
} }