diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-17 17:34:18 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-17 17:34:18 -1000 |
| commit | 60ebc28b073bf8a146d37b9d6b03a409714a0a47 (patch) | |
| tree | cc97bdb1aa11aaf1530a1664fa975188b5ad6a0d /arch | |
| parent | 424e7d878cb7a51f446514826a0b9ddbc78ff1d0 (diff) | |
| parent | 71920ea97d6d1d800ee8b51951dc3fda3f5dc698 (diff) | |
Merge tag 'perf_urgent_for_v5.15_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fix from Borislav Petkov:
- Add Sapphire Rapids to the list of CPUs supporting the SMI count MSR
* tag 'perf_urgent_for_v5.15_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/msr: Add Sapphire Rapids CPU support
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/events/msr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c index c853b28efa33..96c775abe31f 100644 --- a/arch/x86/events/msr.c +++ b/arch/x86/events/msr.c @@ -68,6 +68,7 @@ static bool test_intel(int idx, void *data) case INTEL_FAM6_BROADWELL_D: case INTEL_FAM6_BROADWELL_G: case INTEL_FAM6_BROADWELL_X: + case INTEL_FAM6_SAPPHIRERAPIDS_X: case INTEL_FAM6_ATOM_SILVERMONT: case INTEL_FAM6_ATOM_SILVERMONT_D: |