diff options
author | Mark Brown <broonie@kernel.org> | 2020-03-11 21:45:26 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-03-11 21:45:26 +0300 |
commit | 4d90a4e677c5c45c787a774c84442e75c7ddd5be (patch) | |
tree | 50312d13362dd49615148661ae7e6d91ac349719 /arch/x86/events/msr.c | |
parent | 9032cdd96a2d4b0ef2f43499328f8a68050be2ec (diff) | |
parent | 2c523b344dfa65a3738e7039832044aa133c75fb (diff) | |
download | linux-4d90a4e677c5c45c787a774c84442e75c7ddd5be.tar.xz |
Merge tag 'v5.6-rc5' into asoc-5.7
Linux 5.6-rc5
Diffstat (limited to 'arch/x86/events/msr.c')
-rw-r--r-- | arch/x86/events/msr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c index 6f86650b3f77..a949f6f55991 100644 --- a/arch/x86/events/msr.c +++ b/arch/x86/events/msr.c @@ -75,8 +75,9 @@ static bool test_intel(int idx, void *data) case INTEL_FAM6_ATOM_GOLDMONT: case INTEL_FAM6_ATOM_GOLDMONT_D: - case INTEL_FAM6_ATOM_GOLDMONT_PLUS: + case INTEL_FAM6_ATOM_TREMONT_D: + case INTEL_FAM6_ATOM_TREMONT: case INTEL_FAM6_XEON_PHI_KNL: case INTEL_FAM6_XEON_PHI_KNM: |