summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/tsc.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2016-06-17 08:22:50 +0300
committerIngo Molnar <mingo@kernel.org>2016-07-11 22:30:12 +0300
commit02c0cd2dcf7fdc47d054b855b148ea8b82dbb7eb (patch)
treec7ef2757b0f34e1bec2f0058a9446e8308f85253 /arch/x86/include/asm/tsc.h
parent6fcb41cdaee5056c96de88ee095bddd27a7697de (diff)
downloadlinux-02c0cd2dcf7fdc47d054b855b148ea8b82dbb7eb.tar.xz
x86/tsc_msr: Remove irqoff around MSR-based TSC enumeration
Remove the irqoff/irqon around MSR-based TSC enumeration, as it is not necessary. Also rename: try_msr_calibrate_tsc() to cpu_khz_from_msr(), as that better describes what the routine does. Signed-off-by: Len Brown <len.brown@intel.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/a6b5c3ecd3b068175d2309599ab28163fc34215e.1466138954.git.len.brown@intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/tsc.h')
-rw-r--r--arch/x86/include/asm/tsc.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h
index 7428697c5b8d..db1f779a3766 100644
--- a/arch/x86/include/asm/tsc.h
+++ b/arch/x86/include/asm/tsc.h
@@ -52,7 +52,6 @@ extern int notsc_setup(char *);
extern void tsc_save_sched_clock_state(void);
extern void tsc_restore_sched_clock_state(void);
-/* MSR based TSC calibration for Intel Atom SoC platforms */
-unsigned long try_msr_calibrate_tsc(void);
+unsigned long cpu_khz_from_msr(void);
#endif /* _ASM_X86_TSC_H */