diff options
author | Len Brown <len.brown@intel.com> | 2016-06-17 01:22:43 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-07-10 11:00:12 -0400 |
commit | fc5f3ac24720012909c224a63ca3217f4759967d (patch) | |
tree | 266b5eb9b86e62bdc0c5aca2fdeee54faaafd389 | |
parent | ee40fb2948fc99096836995d4f3ddcc0efbac790 (diff) |
Revert "x86/tsc: Add missing Cherrytrail frequency to the table"
This reverts commit:
e2724e9d9692 ("x86/tsc: Add missing Cherrytrail frequency to the table")
... as it is incomplete, and is replaced by a more complete patch
later in this series.
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/2199d0e959f7f71a18827268b5d060f8d3831639.1466138954.git.len.brown@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/x86/kernel/tsc_msr.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c index 9911a0620f9a..6aa0f4d9eea6 100644 --- a/arch/x86/kernel/tsc_msr.c +++ b/arch/x86/kernel/tsc_msr.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <asm/param.h> | 23 | #include <asm/param.h> |
24 | 24 | ||
25 | /* CPU reference clock frequency: in KHz */ | 25 | /* CPU reference clock frequency: in KHz */ |
26 | #define FREQ_80 80000 | ||
27 | #define FREQ_83 83200 | 26 | #define FREQ_83 83200 |
28 | #define FREQ_100 99840 | 27 | #define FREQ_100 99840 |
29 | #define FREQ_133 133200 | 28 | #define FREQ_133 133200 |
@@ -57,8 +56,6 @@ static struct freq_desc freq_desc_tables[] = { | |||
57 | { 6, 0x37, 1, { FREQ_83, FREQ_100, FREQ_133, FREQ_166, 0, 0, 0, 0 } }, | 56 | { 6, 0x37, 1, { FREQ_83, FREQ_100, FREQ_133, FREQ_166, 0, 0, 0, 0 } }, |
58 | /* ANN */ | 57 | /* ANN */ |
59 | { 6, 0x5a, 1, { FREQ_83, FREQ_100, FREQ_133, FREQ_100, 0, 0, 0, 0 } }, | 58 | { 6, 0x5a, 1, { FREQ_83, FREQ_100, FREQ_133, FREQ_100, 0, 0, 0, 0 } }, |
60 | /* AIRMONT */ | ||
61 | { 6, 0x4c, 1, { FREQ_83, FREQ_100, FREQ_133, FREQ_166, FREQ_80, 0, 0, 0 } }, | ||
62 | }; | 59 | }; |
63 | 60 | ||
64 | static int match_cpu(u8 family, u8 model) | 61 | static int match_cpu(u8 family, u8 model) |