Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22c5c03b authored by Kevin Winchester's avatar Kevin Winchester Committed by Linus Torvalds
Browse files

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: default avatarKevin Winchester <kjwinchester@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 459b37d4

init/main.c

+20 −14
Original line number Diff line number Diff line
@@ -721,28 +721,34 @@ 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));

	printk(KERN_DEBUG "calling  %pF @ %i\n", fn, task_pid_nr(current));

	calltime = ktime_get();

	}



	ret = fn();



	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,

	printk(KERN_DEBUG "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;



	if (ret && ret != -ENODEV && initcall_debug)