forked from Minki/linux
docsrc: fix getdelays printk formats
Fix printf format type warnings (seen on alpha & ia64): Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 6 has type '__u64' Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 7 has type '__u64' Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 8 has type '__u64' Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 9 has type '__u64' Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 12 has type '__u64' Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 13 has type '__u64' Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 16 has type '__u64' Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 17 has type '__u64' Documentation/accounting/getdelays.c:214: warning: format '%15llu' expects type 'long long unsigned int', but argument 4 has type '__u64' Documentation/accounting/getdelays.c:214: warning: format '%15llu' expects type 'long long unsigned int', but argument 5 has type '__u64' Documentation/accounting/getdelays.c:221: warning: format '%llu' expects type 'long long unsigned int', but argument 2 has type '__u64' Documentation/accounting/getdelays.c:221: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type '__u64' Documentation/accounting/getdelays.c:221: warning: format '%llu' expects type 'long long unsigned int', but argument 4 has type '__u64' Documentation/accounting/getdelays.c:221: warning: format '%llu' expects type 'long long unsigned int', but argument 5 has type '__u64' Documentation/accounting/getdelays.c:221: warning: format '%llu' expects type 'long long unsigned int', but argument 6 has type '__u64' Documentation/accounting/getdelays.c:236: warning: 'cmd_type' may be used uninitialized in this function Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Balbir Singh <balbir@in.ibm.com> Cc: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
ffab10ec65
commit
6665931371
@ -201,13 +201,19 @@ void print_delayacct(struct taskstats *t)
|
|||||||
"RECLAIM %12s%15s\n"
|
"RECLAIM %12s%15s\n"
|
||||||
" %15llu%15llu\n",
|
" %15llu%15llu\n",
|
||||||
"count", "real total", "virtual total", "delay total",
|
"count", "real total", "virtual total", "delay total",
|
||||||
t->cpu_count, t->cpu_run_real_total, t->cpu_run_virtual_total,
|
(unsigned long long)t->cpu_count,
|
||||||
t->cpu_delay_total,
|
(unsigned long long)t->cpu_run_real_total,
|
||||||
|
(unsigned long long)t->cpu_run_virtual_total,
|
||||||
|
(unsigned long long)t->cpu_delay_total,
|
||||||
"count", "delay total",
|
"count", "delay total",
|
||||||
t->blkio_count, t->blkio_delay_total,
|
(unsigned long long)t->blkio_count,
|
||||||
"count", "delay total", t->swapin_count, t->swapin_delay_total,
|
(unsigned long long)t->blkio_delay_total,
|
||||||
"count", "delay total",
|
"count", "delay total",
|
||||||
t->freepages_count, t->freepages_delay_total);
|
(unsigned long long)t->swapin_count,
|
||||||
|
(unsigned long long)t->swapin_delay_total,
|
||||||
|
"count", "delay total",
|
||||||
|
(unsigned long long)t->freepages_count,
|
||||||
|
(unsigned long long)t->freepages_delay_total);
|
||||||
}
|
}
|
||||||
|
|
||||||
void task_context_switch_counts(struct taskstats *t)
|
void task_context_switch_counts(struct taskstats *t)
|
||||||
@ -215,14 +221,17 @@ void task_context_switch_counts(struct taskstats *t)
|
|||||||
printf("\n\nTask %15s%15s\n"
|
printf("\n\nTask %15s%15s\n"
|
||||||
" %15llu%15llu\n",
|
" %15llu%15llu\n",
|
||||||
"voluntary", "nonvoluntary",
|
"voluntary", "nonvoluntary",
|
||||||
t->nvcsw, t->nivcsw);
|
(unsigned long long)t->nvcsw, (unsigned long long)t->nivcsw);
|
||||||
}
|
}
|
||||||
|
|
||||||
void print_cgroupstats(struct cgroupstats *c)
|
void print_cgroupstats(struct cgroupstats *c)
|
||||||
{
|
{
|
||||||
printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, "
|
printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, "
|
||||||
"uninterruptible %llu\n", c->nr_sleeping, c->nr_io_wait,
|
"uninterruptible %llu\n", (unsigned long long)c->nr_sleeping,
|
||||||
c->nr_running, c->nr_stopped, c->nr_uninterruptible);
|
(unsigned long long)c->nr_io_wait,
|
||||||
|
(unsigned long long)c->nr_running,
|
||||||
|
(unsigned long long)c->nr_stopped,
|
||||||
|
(unsigned long long)c->nr_uninterruptible);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user