kernel/async.c: fix printk warnings (58763a29) · Commits · 戴 / test

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>

kernel/async.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -138,15 +138,18 @@ static void run_one_entry(void)

		/* 3) run it (and print duration)*/
		if (initcall_debug && system_state == SYSTEM_BOOTING) {
		printk("calling %lli_%pF @ %i\n", entry->cookie, entry->func, task_pid_nr(current));
		printk("calling %lli_%pF @ %i\n", (long long)entry->cookie,
		entry->func, task_pid_nr(current));
		calltime = ktime_get();
		}
		entry->func(entry->data, entry->cookie);
		if (initcall_debug && system_state == SYSTEM_BOOTING) {
		rettime = ktime_get();
		delta = ktime_sub(rettime, calltime);
		printk("initcall %lli_%pF returned 0 after %lld usecs\n", entry->cookie,
		entry->func, ktime_to_ns(delta) >> 10);
		printk("initcall %lli_%pF returned 0 after %lld usecs\n",
		(long long)entry->cookie,
		entry->func,
		(long long)ktime_to_ns(delta) >> 10);
		}

		/* 4) remove it from the running queue */
		@@ -247,7 +250,8 @@ void async_synchronize_cookie_special(async_cookie_t cookie, struct list_head *r
		delta = ktime_sub(endtime, starttime);

		printk("async_continuing @ %i after %lli usec\n",
		task_pid_nr(current), ktime_to_ns(delta) >> 10);
		task_pid_nr(current),
		(long long)ktime_to_ns(delta) >> 10);
		}
		}
		EXPORT_SYMBOL_GPL(async_synchronize_cookie_special);

Admin message