From: Will Newton <will.newton@gmail.com>
Date: Fri, 21 Nov 2008 22:08:59 +0000 (-0800)
Subject: init/main.c: use ktime accessor function in initcall_debug code
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1d926f2756392c6909f60e0c9fe2a09d5462e376;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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>
---

diff --git a/init/main.c b/init/main.c
index e810196bf2f..79213c0785d 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);