summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorWill Newton <will.newton@gmail.com>2008-11-21 14:08:59 -0800
committerIngo Molnar <mingo@elte.hu>2008-11-23 11:10:15 +0100
commit1d926f2756392c6909f60e0c9fe2a09d5462e376 (patch)
tree32e6cafbdf007b7d9872846a705aa772de68d43b /init
parenta0a70c735ef714fe1b6777b571630c3d50c7b008 (diff)
downloadop-kernel-dev-1d926f2756392c6909f60e0c9fe2a09d5462e376.zip
op-kernel-dev-1d926f2756392c6909f60e0c9fe2a09d5462e376.tar.gz
init/main.c: use ktime accessor function in initcall_debug code
Impact: fix initcall debug output on non-scalar ktime platforms (32-bit embedded) The initcall_debug code access the tv64 member of ktime. This won't work correctly for large deltas on platforms that don't use the scalar ktime implementation. Signed-off-by: Will Newton <will.newton@gmail.com> Acked-by: Tim Bird <tim.bird@am.sony.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init')
-rw-r--r--init/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index e810196..79213c0 100644
--- a/init/main.c
+++ b/init/main.c
@@ -723,7 +723,7 @@ int do_one_initcall(initcall_t fn)
disable_boot_trace();
rettime = ktime_get();
delta = ktime_sub(rettime, calltime);
- ret.duration = (unsigned long long) delta.tv64 >> 10;
+ ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
trace_boot_ret(&ret, fn);
printk("initcall %pF returned %d after %Ld usecs\n", fn,
ret.result, ret.duration);
OpenPOWER on IntegriCloud