p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: 615cd03373 ("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>
This commit is contained in:
Arnd Bergmann 2017-05-17 22:39:24 +02:00 committed by Ingo Molnar
parent 1c3c5eab17
commit 5c3c2ea688
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/kernel/tsc.c
View File

@ -137,7 +137,7 @@ static inline unsigned long long cycles_2_ns(unsigned long long cyc)
return ns;
}
static void __set_cyc2ns_scale(unsigned long khz, int cpu, unsigned long long tsc_now)
static void set_cyc2ns_scale(unsigned long khz, int cpu, unsigned long long tsc_now)
{
unsigned long long ns_now;
struct cyc2ns_data data;
@ -186,11 +186,6 @@ static void __set_cyc2ns_scale(unsigned long khz, int cpu, unsigned long long ts
local_irq_restore(flags);
}
static void set_cyc2ns_scale(unsigned long khz, int cpu)
{
__set_cyc2ns_scale(khz, cpu, rdtsc());
}
/*
* Scheduler clock - returns current time in nanosec units.
*/
@ -892,7 +887,6 @@ void tsc_restore_sched_clock_state(void)
}
#ifdef CONFIG_CPU_FREQ
/* Frequency scaling support. Adjust the TSC based timer when the cpu frequency
* changes.
*
@ -933,7 +927,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
if (!(freq->flags & CPUFREQ_CONST_LOOPS))
mark_tsc_unstable("cpufreq changes");
set_cyc2ns_scale(tsc_khz, freq->cpu);
set_cyc2ns_scale(tsc_khz, freq->cpu, rdtsc());
}
return 0;
@ -1224,7 +1218,7 @@ static void tsc_refine_calibration_work(struct work_struct *work)
/* Update the sched_clock() rate to match the clocksource one */
for_each_possible_cpu(cpu)
__set_cyc2ns_scale(tsc_khz, cpu, tsc_stop);
set_cyc2ns_scale(tsc_khz, cpu, tsc_stop);
out:
if (boot_cpu_has(X86_FEATURE_ART))
@ -1314,7 +1308,7 @@ void __init tsc_init(void)
cyc = rdtsc();
for_each_possible_cpu(cpu) {
cyc2ns_init(cpu);
__set_cyc2ns_scale(tsc_khz, cpu, cyc);
set_cyc2ns_scale(tsc_khz, cpu, cyc);
}
if (tsc_disabled > 0)