From e1ca32a0a3351be7c5339ce4fec9ce7812f4f005 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 8 Nov 2008 17:05:38 +0100
Subject: [PATCH] --- yaml --- r: 118611 b: refs/heads/master c:
 7cbaef9c83e58bbd4bdd534b09052b6c5ec457d5 h: refs/heads/master i:   118609:
 d401c1d9d92471c0c5eba1c43efa89193eb024ce   118607:
 80aafcf12df6d3d0ff2a6169f3e5f396d6c85abc v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/kernel/tsc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3677d4a06d94..213d4665eb5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d12cdd5f883f508d33b85c1bae98fa28987c8c7
+refs/heads/master: 7cbaef9c83e58bbd4bdd534b09052b6c5ec457d5
diff --git a/trunk/arch/x86/kernel/tsc.c b/trunk/arch/x86/kernel/tsc.c
index 2ef80e301925..424093b157d3 100644
--- a/trunk/arch/x86/kernel/tsc.c
+++ b/trunk/arch/x86/kernel/tsc.c
@@ -55,7 +55,7 @@ u64 native_sched_clock(void)
 	rdtscll(this_offset);
 
 	/* return the value in ns */
-	return cycles_2_ns(this_offset);
+	return __cycles_2_ns(this_offset);
 }
 
 /* We need to define a real function for sched_clock, to override the