projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
tsc.c
diff --git
a/arch/x86/kernel/tsc.c
b/arch/x86/kernel/tsc.c
index 6d5dc5dabfd7ec71532c9a48e00c6a70da950a35..03b7529333a679f1d9b3ac505f04a1bf82de4caf 100644
(file)
--- a/
arch/x86/kernel/tsc.c
+++ b/
arch/x86/kernel/tsc.c
@@
-636,7
+636,7
@@
unsigned long native_calibrate_tsc(void)
case INTEL_FAM6_KABYLAKE_DESKTOP:
crystal_khz = 24000; /* 24.0 MHz */
break;
- case INTEL_FAM6_ATOM_
DENVERTON
:
+ case INTEL_FAM6_ATOM_
GOLDMONT_X
:
crystal_khz = 25000; /* 25.0 MHz */
break;
case INTEL_FAM6_ATOM_GOLDMONT: