Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 666593137185dc0ad1ee8966c8d7fef8f4bb84b2

Authored by Randy Dunlap
Committed by Linus Torvalds
1 parent ffab10ec65
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 1 changed file with 17 additions and 8 deletions Side-by-side Diff

Documentation/accounting/getdelays.c
Diff comments   View file @ 6665931
... ... @@ -201,13 +201,19 @@
201 201 "RECLAIM %12s%15s\n"
202 202 " %15llu%15llu\n",
203 203 "count", "real total", "virtual total", "delay total",
204   - t->cpu_count, t->cpu_run_real_total, t->cpu_run_virtual_total,
205   - t->cpu_delay_total,
  204 + (unsigned long long)t->cpu_count,
  205 + (unsigned long long)t->cpu_run_real_total,
  206 + (unsigned long long)t->cpu_run_virtual_total,
  207 + (unsigned long long)t->cpu_delay_total,
206 208 "count", "delay total",
207   - t->blkio_count, t->blkio_delay_total,
208   - "count", "delay total", t->swapin_count, t->swapin_delay_total,
  209 + (unsigned long long)t->blkio_count,
  210 + (unsigned long long)t->blkio_delay_total,
209 211 "count", "delay total",
210   - t->freepages_count, t->freepages_delay_total);
  212 + (unsigned long long)t->swapin_count,
  213 + (unsigned long long)t->swapin_delay_total,
  214 + "count", "delay total",
  215 + (unsigned long long)t->freepages_count,
  216 + (unsigned long long)t->freepages_delay_total);
211 217 }
212 218  
213 219 void task_context_switch_counts(struct taskstats *t)
214 220  
... ... @@ -215,14 +221,17 @@
215 221 printf("\n\nTask %15s%15s\n"
216 222 " %15llu%15llu\n",
217 223 "voluntary", "nonvoluntary",
218   - t->nvcsw, t->nivcsw);
  224 + (unsigned long long)t->nvcsw, (unsigned long long)t->nivcsw);
219 225 }
220 226  
221 227 void print_cgroupstats(struct cgroupstats *c)
222 228 {
223 229 printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, "
224   - "uninterruptible %llu\n", c->nr_sleeping, c->nr_io_wait,
225   - c->nr_running, c->nr_stopped, c->nr_uninterruptible);
  230 + "uninterruptible %llu\n", (unsigned long long)c->nr_sleeping,
  231 + (unsigned long long)c->nr_io_wait,
  232 + (unsigned long long)c->nr_running,
  233 + (unsigned long long)c->nr_stopped,
  234 + (unsigned long long)c->nr_uninterruptible);
226 235 }
227 236  
228 237