Commit-ID: c48ec42d6eae08f55685ab660f0743ed33b9f22a
Gitweb: http://git.kernel.org/tip/c48ec42d6eae08f55685ab660f0743ed33b9f22a
Author: Wei Jiangang <weijg.f...@cn.fujitsu.com>
AuthorDate: Fri, 15 Jul 2016 16:12:10 +0800
Committer: Ingo Molnar <mi...@kernel.org>
CommitDate: Fri, 15 Jul 2016 10:35:08 +0200
x86/tsc: Remove the unused check_tsc_disabled()
check_tsc_disabled() was introduced by commit:
c73deb6aecda ("perf/x86: Add ability to calculate TSC from perf sample
timestamps")
The only caller was arch_perf_update_userpage(), which had been refactored
by commit:
d8b11a0cbd1c ("perf/x86: Clean up cap_user_time* setting")
... so no need keep and export it any more.
Signed-off-by: Wei Jiangang <weijg.f...@cn.fujitsu.com>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: a.p.zijls...@chello.nl
Cc: adrian.hun...@intel.com
Cc: b...@suse.de
Link:
http://lkml.kernel.org/r/1468570330-25810-1-git-send-email-weijg.f...@cn.fujitsu.com
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
arch/x86/include/asm/tsc.h | 1 -
arch/x86/kernel/tsc.c | 6 ------
2 files changed, 7 deletions(-)
diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h
index a30591e..33b6365 100644
--- a/arch/x86/include/asm/tsc.h
+++ b/arch/x86/include/asm/tsc.h
@@ -35,7 +35,6 @@ extern void tsc_init(void);
extern void mark_tsc_unstable(char *reason);
extern int unsynchronized_tsc(void);
extern int check_tsc_unstable(void);
-extern int check_tsc_disabled(void);
extern unsigned long native_calibrate_cpu(void);
extern unsigned long native_calibrate_tsc(void);
extern unsigned long long native_sched_clock_from_tsc(u64 tsc);
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 2a952fc..a804b5a 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -335,12 +335,6 @@ int check_tsc_unstable(void)
}
EXPORT_SYMBOL_GPL(check_tsc_unstable);
-int check_tsc_disabled(void)
-{
- return tsc_disabled;
-}
-EXPORT_SYMBOL_GPL(check_tsc_disabled);
-
#ifdef CONFIG_X86_TSC
int __init notsc_setup(char *str)
{
