diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2010-08-23 22:23:04 -0700 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-08-24 07:38:34 +0200 |
| commit | 159677c8842b985c9365b82178b97456ca8a1727 (patch) | |
| tree | 021f1c05591c18411bb0327f7273d8fbe443d71f | |
| parent | 7ff6836db383d74627b7e7a1bc222b4a80d3ce55 (diff) | |
Rename a struct member from "interrupt"
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>
| -rw-r--r-- | procps/mpstat.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/procps/mpstat.c b/procps/mpstat.c index 575c77e98..f1a0b00b8 100644 --- a/procps/mpstat.c +++ b/procps/mpstat.c @@ -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; } |