diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-26 02:41:35 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-26 02:41:35 (GMT) |
commit | 5f22004ba9b4cf740773777ea7b74586743f6051 (patch) | |
tree | 4d26c7f8c2ac3f30a252eaf746825792deda92fd /kernel | |
parent | 8e466955d6f78896cc6519b6f07e89173d3ba58b (diff) | |
parent | c48ec42d6eae08f55685ab660f0743ed33b9f22a (diff) | |
download | linux-5f22004ba9b4cf740773777ea7b74586743f6051.tar.xz |
Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 timer updates from Ingo Molnar:
"The main change in this tree is the reworking, fixing and extension of
the TSC frequency enumeration code (by Len Brown)"
* 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/tsc: Remove the unused check_tsc_disabled()
x86/tsc: Enumerate BXT tsc_khz via CPUID
x86/tsc: Enumerate SKL cpu_khz and tsc_khz via CPUID
x86/tsc_msr: Remove irqoff around MSR-based TSC enumeration
x86/tsc_msr: Add Airmont reference clock values
x86/tsc_msr: Correct Silvermont reference clock values
x86/tsc_msr: Update comments, expand definitions
x86/tsc_msr: Remove debugging messages
x86/tsc_msr: Identify Intel-specific code
Revert "x86/tsc: Add missing Cherrytrail frequency to the table"
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions