diff options
| author | Kevin Winchester | 2010-08-09 17:20:32 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2010-08-09 20:45:06 -0700 |
| commit | 22c5c03b42c082ab57b5d24824769ada0d90f8dc (patch) | |
| tree | f3bb670ed467b05cba425e21625213de00dd9f0d /init | |
| parent | 459b37d423104f00e87d1934821bc8739979d0e4 (diff) | |
init/main.c: fix warning: 'calltime.tv64' may be used uninitialized
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>
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/init/main.c b/init/main.c index b8b6effe9ff4..dbee132923c5 100644 --- a/init/main.c +++ b/init/main.c @@ -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; |