Rename a struct member from "interrupt"
authorDan Fandrich <dan@coneharvesters.com>
Tue, 24 Aug 2010 05:23:04 +0000 (22:23 -0700)
committerDenys Vlasenko <vda.linux@googlemail.com>
Tue, 24 Aug 2010 05:38:34 +0000 (07:38 +0200)
This is nonstandard, but common, keyword in embedded compilers.

Signed-off-by: Dan Fandrich <dan@coneharvesters.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
procps/mpstat.c

index 575c77e98381b422e8f03b7857a55b840b457b3c..f1a0b00b8f2bc9f833064d62424ad510f7994b5c 100644 (file)
@@ -61,7 +61,7 @@ typedef long idata_t;
 
 
 struct stats_irqcpu {
-       unsigned interrupt;
+       unsigned interrupts;
        char irq_name[MAX_IRQNAME_LEN];
 };
 
@@ -265,7 +265,7 @@ static void write_irqcpu_stats(struct stats_irqcpu *per_cpu_stats[],
                                        p = &per_cpu_stats[current][(cpu - 1) * total_irqs + j];
                                        q = &per_cpu_stats[prev][(cpu - 1) * total_irqs + offset];
                                        printf("%"INTRATE_SCRWIDTH_STR".2f",
-                                               (double)(p->interrupt - q->interrupt) / itv * G.hz);
+                                               (double)(p->interrupts - q->interrupts) / itv * G.hz);
                                } else {
                                        printf("        N/A");
                                }
@@ -617,12 +617,12 @@ static void get_irqs_from_interrupts(const char *fname,
                        char *next;
                        ic = &per_cpu_stats[current][cpu_index[cpu] * irqs_per_cpu + irq];
                        irq_i = &G.st_irq[current][cpu_index[cpu] + 1];
-                       ic->interrupt = strtoul(cp, &next, 10);
+                       ic->interrupts = strtoul(cp, &next, 10);
                        /* Count only numerical IRQs */
                        if (isdigit(last_char)) {
-                               irq_i->irq_nr += ic->interrupt;
+                               irq_i->irq_nr += ic->interrupts;
                                //bb_error_msg("G.st_irq[%u][%u].irq_nr + %u = %lld",
-                               // current, cpu_index[cpu] + 1, ic->interrupt, irq_i->irq_nr);
+                               // current, cpu_index[cpu] + 1, ic->interrupts, irq_i->irq_nr);
                        }
                        cp = next;
                }