From 265f69e28736517b1830231afd3f09a57803a3b3 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung.kim@lge.com>
Date: Thu, 27 Dec 2012 11:49:45 +0900
Subject: [PATCH] --- yaml --- r: 350042 b: refs/heads/master c:
 5e67b51e3fb22ad43faf9589e9019ad9c6a00413 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/kernel/trace/trace_clock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 852722ea44a1..1ee1a7d9b707 100644
--- 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
index 22b638b28e48..24bf48eabfcc 100644
--- 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: