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

Download as
Browse Code ยป

Commit 58763a297405024d23d8f1d0bba3e6603660c4b6

Authored by Andrew Morton
Committed by Linus Torvalds
1 parent 647802d6db
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

kernel/async.c: fix printk warnings 

alpha:

kernel/async.c: In function 'run_one_entry':
kernel/async.c:141: warning: format '%lli' expects type 'long long int', but argument 2 has type 'async_cookie_t'
kernel/async.c:149: warning: format '%lli' expects type 'long long int', but argument 2 has type 'async_cookie_t'
kernel/async.c:149: warning: format '%lld' expects type 'long long int', but argument 4 has type 's64'
kernel/async.c: In function 'async_synchronize_cookie_special':
kernel/async.c:250: warning: format '%lli' expects type 'long long int', but argument 3 has type 's64'

Cc: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

... ... @@ -138,15 +138,18 @@
138 138  
139 139 /* 3) run it (and print duration)*/
140 140 if (initcall_debug && system_state == SYSTEM_BOOTING) {
141   - printk("calling %lli_%pF @ %i\n", entry->cookie, entry->func, task_pid_nr(current));
  141 + printk("calling %lli_%pF @ %i\n", (long long)entry->cookie,
  142 + entry->func, task_pid_nr(current));
142 143 calltime = ktime_get();
143 144 }
144 145 entry->func(entry->data, entry->cookie);
145 146 if (initcall_debug && system_state == SYSTEM_BOOTING) {
146 147 rettime = ktime_get();
147 148 delta = ktime_sub(rettime, calltime);
148   - printk("initcall %lli_%pF returned 0 after %lld usecs\n", entry->cookie,
149   - entry->func, ktime_to_ns(delta) >> 10);
  149 + printk("initcall %lli_%pF returned 0 after %lld usecs\n",
  150 + (long long)entry->cookie,
  151 + entry->func,
  152 + (long long)ktime_to_ns(delta) >> 10);
150 153 }
151 154  
152 155 /* 4) remove it from the running queue */
... ... @@ -247,7 +250,8 @@
247 250 delta = ktime_sub(endtime, starttime);
248 251  
249 252 printk("async_continuing @ %i after %lli usec\n",
250   - task_pid_nr(current), ktime_to_ns(delta) >> 10);
  253 + task_pid_nr(current),
  254 + (long long)ktime_to_ns(delta) >> 10);
251 255 }
252 256 }
253 257 EXPORT_SYMBOL_GPL(async_synchronize_cookie_special);