[PATCH] x86/tsc: remove the unused check_tsc_disabled()

[PATCH] x86/tsc: remove the unused check_tsc_disabled()

[Wei Jiangang]

check_tsc_disabled() was introduced by commit c73deb6aecda ("perf/x86:
Add ability to calculate TSC from perf sample timestamps").
The only caller arch_perf_update_userpage() had been refactored
by commit fa9cbf320e99 ("perf/x86: Move perf_event.c ...............
=> x86/events/core.c").
so no need keep and export it any more.

Signed-off-by: Wei Jiangang <weijg.fnst@cn.fujitsu.com>
---
 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 7428697c5b8d..a2828127afe0 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_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 38ba6de56ede..67ca51438af2 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)
 {
-- 
1.9.3

Re: [PATCH] x86/tsc: remove the unused check_tsc_disabled()

[Ingo Molnar]

* Wei Jiangang <weijg.fnst@cn.fujitsu.com> wrote:

> check_tsc_disabled() was introduced by commit c73deb6aecda ("perf/x86:
> Add ability to calculate TSC from perf sample timestamps").
> The only caller arch_perf_update_userpage() had been refactored
> by commit fa9cbf320e99 ("perf/x86: Move perf_event.c ...............
> => x86/events/core.c").
> so no need keep and export it any more.

No, it wasn't refactored by fa9cbf320e99, but by:

  d8b11a0cbd1c perf/x86: Clean up cap_user_time* setting

I've fixed the changelog.

Thanks,

	Ingo

Re: [PATCH] x86/tsc: remove the unused check_tsc_disabled()

[Wei, Jiangang]

On Fri, 2016-07-15 at 10:34 +0200, Ingo Molnar wrote:
> * Wei Jiangang <weijg.fnst@cn.fujitsu.com> wrote:
> 
> > check_tsc_disabled() was introduced by commit c73deb6aecda ("perf/x86:
> > Add ability to calculate TSC from perf sample timestamps").
> > The only caller arch_perf_update_userpage() had been refactored
> > by commit fa9cbf320e99 ("perf/x86: Move perf_event.c ...............
> > => x86/events/core.c").
> > so no need keep and export it any more.
> 
> No, it wasn't refactored by fa9cbf320e99, but by:
> 
>   d8b11a0cbd1c perf/x86: Clean up cap_user_time* setting
> 
> I've fixed the changelog.

Thanks for your correction and quick reply.
wei
> 
> Thanks,
> 
> 	Ingo
> 
> 

[tip:x86/timers] x86/tsc: Remove the unused check_tsc_disabled()

[tip-bot for Wei Jiangang]

Commit-ID:  c48ec42d6eae08f55685ab660f0743ed33b9f22a
Gitweb:     http://git.kernel.org/tip/c48ec42d6eae08f55685ab660f0743ed33b9f22a
Author:     Wei Jiangang <weijg.fnst@cn.fujitsu.com>
AuthorDate: Fri, 15 Jul 2016 16:12:10 +0800
Committer:  Ingo Molnar <mingo@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.fnst@cn.fujitsu.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: a.p.zijlstra@chello.nl
Cc: adrian.hunter@intel.com
Cc: bp@suse.de
Link: http://lkml.kernel.org/r/1468570330-25810-1-git-send-email-weijg.fnst@cn.fujitsu.com
Signed-off-by: Ingo Molnar <mingo@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)
 {