lkml.org 
[lkml]   [2008]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/25] drivers proc to use nr_irqs
    Date
    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


    \
     
     \ /
      Last update: 2008-08-03 05:09    [W:0.022 / U:120.904 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site