diff options
| author | Len Brown <len.brown@intel.com> | 2016-06-17 01:22:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-11 21:30:12 +0200 |
| commit | 02c0cd2dcf7fdc47d054b855b148ea8b82dbb7eb (patch) | |
| tree | c7ef2757b0f34e1bec2f0058a9446e8308f85253 /arch/x86/kernel/tsc_msr.c | |
| parent | 6fcb41cdaee5056c96de88ee095bddd27a7697de (diff) | |
| download | linux-stable-02c0cd2dcf7fdc47d054b855b148ea8b82dbb7eb.tar.gz linux-stable-02c0cd2dcf7fdc47d054b855b148ea8b82dbb7eb.tar.bz2 linux-stable-02c0cd2dcf7fdc47d054b855b148ea8b82dbb7eb.zip | |
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/kernel/tsc_msr.c')
| -rw-r--r-- | arch/x86/kernel/tsc_msr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c index 65b3d8cb8325..0fe720d64fef 100644 --- a/arch/x86/kernel/tsc_msr.c +++ b/arch/x86/kernel/tsc_msr.c @@ -68,7 +68,7 @@ static int match_cpu(u8 family, u8 model) * Set global "lapic_timer_frequency" to bus_clock_cycles/jiffy * Return processor base frequency in KHz, or 0 on failure. */ -unsigned long try_msr_calibrate_tsc(void) +unsigned long cpu_khz_from_msr(void) { u32 lo, hi, ratio, freq_id, freq; unsigned long res; |