UBUNTU: SAUCE: Clear Linux: fix initcall timestamps

Print more finegrained initcall timings

use the tsc instead of the jiffies clock for initcall_debug

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/init/main.c b/init/main.c
index 91f6ebb30ef041a8667c18b949ccf42e976174e1..7177dd762c11d8bd81d9d69b545e689efa442526 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -875,22 +875,22 @@ __setup("initcall_blacklist=", initcall_blacklist);
 static __init_or_module void
 trace_initcall_start_cb(void *data, initcall_t fn)
 {
-       ktime_t *calltime = (ktime_t *)data;
+       unsigned long *calltime = (unsigned long *)data;
 
        printk(KERN_DEBUG "calling  %pS @ %i\n", fn, task_pid_nr(current));
-       *calltime = ktime_get();
+       *calltime = local_clock();
 }
 
 static __init_or_module void
 trace_initcall_finish_cb(void *data, initcall_t fn, int ret)
 {
-       ktime_t *calltime = (ktime_t *)data;
-       ktime_t delta, rettime;
+       unsigned long *calltime = (unsigned long *)data;
+       unsigned long delta, rettime;
        unsigned long long duration;
 
-       rettime = ktime_get();
-       delta = ktime_sub(rettime, *calltime);
-       duration = (unsigned long long) ktime_to_ns(delta) >> 10;
+       rettime = local_clock();
+       delta = rettime - *calltime;
+       duration = delta >> 10;
        printk(KERN_DEBUG "initcall %pS returned %d after %lld usecs\n",
                 fn, ret, duration);
 }