diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-09-06 07:30:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-09-06 07:30:23 +0200 |
| commit | 9326011edfcb7f7c3ad70f8a1cde6b391604808e (patch) | |
| tree | 2bcf0a42a4a1238ff032ec1255b33171d8491867 /arch/x86/kernel/cpu | |
| parent | 77e5517cb506c5b1e0a91bf4774cc95452659d77 (diff) | |
| parent | 32b1cbe380417f2ed80f758791179de6b05795ab (diff) | |
| download | linux-9326011edfcb7f7c3ad70f8a1cde6b391604808e.tar.bz2 | |
Merge branch 'x86/cleanups' into x86/cpu, to pick up dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu')
| -rw-r--r-- | arch/x86/kernel/cpu/intel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index f4b795ab1a9b..e2082ccccf13 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -265,9 +265,9 @@ static void early_init_intel(struct cpuinfo_x86 *c) /* Penwell and Cloverview have the TSC which doesn't sleep on S3 */ if (c->x86 == 6) { switch (c->x86_model) { - case 0x27: /* Penwell */ - case 0x35: /* Cloverview */ - case 0x4a: /* Merrifield */ + case INTEL_FAM6_ATOM_SALTWELL_MID: + case INTEL_FAM6_ATOM_SALTWELL_TABLET: + case INTEL_FAM6_ATOM_SILVERMONT_MID: set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3); break; default: |