---

yaml --- r: 350042 b: refs/heads/master c: 5e67b51 h: refs/heads/master v: v3
git-mirror · Jan 30, 2013 · 265f69e · 265f69e
1 parent 87bf307
commit 265f69e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad964704ba9326d027fc10fd0099b7c880e50172
+refs/heads/master: 5e67b51e3fb22ad43faf9589e9019ad9c6a00413
diff --git a/trunk/kernel/trace/trace_clock.c b/trunk/kernel/trace/trace_clock.c
@@ -84,7 +84,7 @@ u64 notrace trace_clock_global(void)
 	local_irq_save(flags);
 
 	this_cpu = raw_smp_processor_id();
-	now = cpu_clock(this_cpu);
+	now = sched_clock_cpu(this_cpu);
 	/*
 	 * If in an NMI context then dont risk lockups and return the
 	 * cpu_clock() time: