diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-02-01 09:12:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-02-01 09:12:25 +0100 |
| commit | ed5c8c854f2b990dfa4d85c4995d115768a05d3c (patch) | |
| tree | a4a826795ec6784f25bebade98bdb20121d9c211 /arch/x86/kernel/tsc.c | |
| parent | sched/rt: Add a missing rescheduling point (diff) | |
| parent | Merge tag 'trace-4.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff) | |
| download | linux-ed5c8c854f2b990dfa4d85c4995d115768a05d3c.tar.xz linux-ed5c8c854f2b990dfa4d85c4995d115768a05d3c.zip | |
Merge branch 'linus' into sched/core, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/tsc.c')
| -rw-r--r-- | arch/x86/kernel/tsc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index c8174c815d83..cb60bbe093b2 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -694,6 +694,7 @@ unsigned long native_calibrate_tsc(void) crystal_khz = 24000; /* 24.0 MHz */ break; case INTEL_FAM6_SKYLAKE_X: + case INTEL_FAM6_ATOM_DENVERTON: crystal_khz = 25000; /* 25.0 MHz */ break; case INTEL_FAM6_ATOM_GOLDMONT: |