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) | |
download | busybox-w32-159677c8842b985c9365b82178b97456ca8a1727.tar.gz busybox-w32-159677c8842b985c9365b82178b97456ca8a1727.tar.bz2 busybox-w32-159677c8842b985c9365b82178b97456ca8a1727.zip |
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; | |||
61 | 61 | ||
62 | 62 | ||
63 | struct stats_irqcpu { | 63 | struct stats_irqcpu { |
64 | unsigned interrupt; | 64 | unsigned interrupts; |
65 | char irq_name[MAX_IRQNAME_LEN]; | 65 | char irq_name[MAX_IRQNAME_LEN]; |
66 | }; | 66 | }; |
67 | 67 | ||
@@ -265,7 +265,7 @@ static void write_irqcpu_stats(struct stats_irqcpu *per_cpu_stats[], | |||
265 | p = &per_cpu_stats[current][(cpu - 1) * total_irqs + j]; | 265 | p = &per_cpu_stats[current][(cpu - 1) * total_irqs + j]; |
266 | q = &per_cpu_stats[prev][(cpu - 1) * total_irqs + offset]; | 266 | q = &per_cpu_stats[prev][(cpu - 1) * total_irqs + offset]; |
267 | printf("%"INTRATE_SCRWIDTH_STR".2f", | 267 | printf("%"INTRATE_SCRWIDTH_STR".2f", |
268 | (double)(p->interrupt - q->interrupt) / itv * G.hz); | 268 | (double)(p->interrupts - q->interrupts) / itv * G.hz); |
269 | } else { | 269 | } else { |
270 | printf(" N/A"); | 270 | printf(" N/A"); |
271 | } | 271 | } |
@@ -617,12 +617,12 @@ static void get_irqs_from_interrupts(const char *fname, | |||
617 | char *next; | 617 | char *next; |
618 | ic = &per_cpu_stats[current][cpu_index[cpu] * irqs_per_cpu + irq]; | 618 | ic = &per_cpu_stats[current][cpu_index[cpu] * irqs_per_cpu + irq]; |
619 | irq_i = &G.st_irq[current][cpu_index[cpu] + 1]; | 619 | irq_i = &G.st_irq[current][cpu_index[cpu] + 1]; |
620 | ic->interrupt = strtoul(cp, &next, 10); | 620 | ic->interrupts = strtoul(cp, &next, 10); |
621 | /* Count only numerical IRQs */ | 621 | /* Count only numerical IRQs */ |
622 | if (isdigit(last_char)) { | 622 | if (isdigit(last_char)) { |
623 | irq_i->irq_nr += ic->interrupt; | 623 | irq_i->irq_nr += ic->interrupts; |
624 | //bb_error_msg("G.st_irq[%u][%u].irq_nr + %u = %lld", | 624 | //bb_error_msg("G.st_irq[%u][%u].irq_nr + %u = %lld", |
625 | // current, cpu_index[cpu] + 1, ic->interrupt, irq_i->irq_nr); | 625 | // current, cpu_index[cpu] + 1, ic->interrupts, irq_i->irq_nr); |
626 | } | 626 | } |
627 | cp = next; | 627 | cp = next; |
628 | } | 628 | } |