x86/tsc: Fold set_cyc2ns_scale() into caller
authorArnd Bergmann <arnd@arndb.de>
Wed, 17 May 2017 20:39:24 +0000 (22:39 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 23 May 2017 08:11:04 +0000 (10:11 +0200)
commit5c3c2ea6887176c5ae812c9f0350ff65b10e9485
tree57afed9cfde1659203658fd19394b2db75377706
parent1c3c5eab171590f86edd8d31389d61dd1efe3037
x86/tsc: Fold set_cyc2ns_scale() into caller

The newly introduced wrapper function only has one caller,
and this one is conditional, causing a harmless warning when
CONFIG_CPU_FREQ is disabled:

  arch/x86/kernel/tsc.c:189:13: error: 'set_cyc2ns_scale' defined but not used [-Werror=unused-function]

My first idea was to move the wrapper inside of that #ifdef,
but on second thought it seemed nicer to remove it completely
again and rename __set_cyc2ns_scale back to set_cyc2ns_scale,
but leaving the extra argument.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 615cd03373a0 ("x86/tsc: Fix sched_clock() sync")
Link: http://lkml.kernel.org/r/20170517203949.2052220-1-arnd@arndb.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/tsc.c