From b1f81a329ec3fd974dec2c08feada20a4b1a48fd Mon Sep 17 00:00:00 2001
From: David Vrabel <david.vrabel@citrix.com>
Date: Mon, 8 Oct 2012 13:07:30 +0100
Subject: [PATCH] --- yaml --- r: 338885 b: refs/heads/master c:
 ce37f400336a34bb6e72c4700f9dcc2a41ff7163 h: refs/heads/master i:   338883:
 545136e74a8e5503faef9818cbc8bbc7b29d1e5b v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/Makefile | 1 -
 trunk/arch/x86/kernel/rtc.c    | 6 ------
 trunk/arch/x86/kernel/tsc.c    | 6 ++++++
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 977564258cd4..d9235bd1378d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f3a20648797c3ff49c6ebfe10747ef0acd37c50
+refs/heads/master: ce37f400336a34bb6e72c4700f9dcc2a41ff7163
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
index 91ce48f05f9f..9fd5eed3f8f5 100644
--- a/trunk/arch/x86/kernel/Makefile
+++ b/trunk/arch/x86/kernel/Makefile
@@ -9,7 +9,6 @@ CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
 ifdef CONFIG_FUNCTION_TRACER
 # Do not profile debug and lowlevel utilities
 CFLAGS_REMOVE_tsc.o = -pg
-CFLAGS_REMOVE_rtc.o = -pg
 CFLAGS_REMOVE_paravirt-spinlocks.o = -pg
 CFLAGS_REMOVE_pvclock.o = -pg
 CFLAGS_REMOVE_kvmclock.o = -pg
diff --git a/trunk/arch/x86/kernel/rtc.c b/trunk/arch/x86/kernel/rtc.c
index 4929c1be0ac0..801602b5d745 100644
--- a/trunk/arch/x86/kernel/rtc.c
+++ b/trunk/arch/x86/kernel/rtc.c
@@ -195,12 +195,6 @@ void read_persistent_clock(struct timespec *ts)
 	ts->tv_nsec = 0;
 }
 
-unsigned long long native_read_tsc(void)
-{
-	return __native_read_tsc();
-}
-EXPORT_SYMBOL(native_read_tsc);
-
 
 static struct resource rtc_resources[] = {
 	[0] = {
diff --git a/trunk/arch/x86/kernel/tsc.c b/trunk/arch/x86/kernel/tsc.c
index cfa5d4f7ca56..06ccb5073a3f 100644
--- a/trunk/arch/x86/kernel/tsc.c
+++ b/trunk/arch/x86/kernel/tsc.c
@@ -77,6 +77,12 @@ unsigned long long
 sched_clock(void) __attribute__((alias("native_sched_clock")));
 #endif
 
+unsigned long long native_read_tsc(void)
+{
+	return __native_read_tsc();
+}
+EXPORT_SYMBOL(native_read_tsc);
+
 int check_tsc_unstable(void)
 {
 	return tsc_unstable;