Messages in this thread Patch in this message | | | From | Kevin Winchester <> | Subject | [PATCH 1/2] Fix warning: 'calltime.tv64' may be used uninitialized in this function in init/main.c | Date | Wed, 7 Jul 2010 21:09:10 -0300 |
| |
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> --- init/main.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/init/main.c b/init/main.c index 3e0f4b5..828ffac 100644 --- a/init/main.c +++ b/init/main.c @@ -724,27 +724,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; -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |