diff --git a/[refs] b/[refs] index 846a4486a9d9..b8e373d86187 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fe401e38602e853e01376cdb670b0bc4d526a6d +refs/heads/master: 29d7b90c15035741d15421b36000509212b3e135 diff --git a/trunk/kernel/sched_debug.c b/trunk/kernel/sched_debug.c index 48ecc51e7701..26ed8e3d1c15 100644 --- a/trunk/kernel/sched_debug.c +++ b/trunk/kernel/sched_debug.c @@ -423,10 +423,11 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) #undef __P { + unsigned int this_cpu = raw_smp_processor_id(); u64 t0, t1; - t0 = sched_clock(); - t1 = sched_clock(); + t0 = cpu_clock(this_cpu); + t1 = cpu_clock(this_cpu); SEQ_printf(m, "%-35s:%21Ld\n", "clock-delta", (long long)(t1-t0)); }