Skip to content

Commit

Permalink
init/main.c: fix warning: 'calltime.tv64' may be used uninitialized
Browse files Browse the repository at this point in the history
Using:

	gcc (GCC) 4.5.0 20100610 (prerelease)

The following warning appears:

	init/main.c: In function `do_one_initcall':
	init/main.c:730:10: warning: `calltime.tv64' may be used uninitialized in this function

This warning is actually correct, as the global initcall_debug could
arguably be changed by the initcall.

Correct this warning by extracting a new function, do_one_initcall_debug,
that performs the initcall for the debug case.

Signed-off-by: Kevin Winchester <kjwinchester@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Kevin Winchester authored and Linus Torvalds committed Aug 10, 2010
1 parent 459b37d commit 22c5c03
Showing 1 changed file with 20 additions and 14 deletions.
34 changes: 20 additions & 14 deletions init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -721,27 +721,33 @@ core_param(initcall_debug, initcall_debug, bool, 0644);

static char msgbuf[64];

int do_one_initcall(initcall_t fn)
static int do_one_initcall_debug(initcall_t fn)
{
int count = preempt_count();
ktime_t calltime, delta, rettime;
unsigned long long duration;
int ret;

if (initcall_debug) {
printk("calling %pF @ %i\n", fn, task_pid_nr(current));
calltime = ktime_get();
}

printk(KERN_DEBUG "calling %pF @ %i\n", fn, task_pid_nr(current));
calltime = ktime_get();
ret = fn();
rettime = ktime_get();
delta = ktime_sub(rettime, calltime);
duration = (unsigned long long) ktime_to_ns(delta) >> 10;
printk(KERN_DEBUG "initcall %pF returned %d after %lld usecs\n", fn,
ret, duration);

if (initcall_debug) {
rettime = ktime_get();
delta = ktime_sub(rettime, calltime);
duration = (unsigned long long) ktime_to_ns(delta) >> 10;
printk("initcall %pF returned %d after %lld usecs\n", fn,
ret, duration);
}
return ret;
}

int do_one_initcall(initcall_t fn)
{
int count = preempt_count();
int ret;

if (initcall_debug)
ret = do_one_initcall_debug(fn);
else
ret = fn();

msgbuf[0] = 0;

Expand Down

0 comments on commit 22c5c03

Please sign in to comment.