Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1d926f2756392c6909f60e0c9fe2a09d5462e376

Authored by Will Newton
Committed by Ingo Molnar
1 parent a0a70c735e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -723,7 +723,7 @@
723 723 disable_boot_trace();
724 724 rettime = ktime_get();
725 725 delta = ktime_sub(rettime, calltime);
726   - ret.duration = (unsigned long long) delta.tv64 >> 10;
  726 + ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
727 727 trace_boot_ret(&ret, fn);
728 728 printk("initcall %pF returned %d after %Ld usecs\n", fn,
729 729 ret.result, ret.duration);