From: Ingo Molnar Date: Mon, 26 Aug 2019 09:20:55 +0000 (+0200) Subject: Merge tag 'v5.3-rc6' into x86/cpu, to pick up fixes X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b3e30c9884407599353e690a4eb36d0c4671bf62;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'v5.3-rc6' into x86/cpu, to pick up fixes Signed-off-by: Ingo Molnar --- b3e30c9884407599353e690a4eb36d0c4671bf62 diff --cc arch/x86/include/asm/msr-index.h index f9a01a04c708,271d837d69a8..695881ef682c --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@@ -382,10 -381,8 +382,11 @@@ #define MSR_AMD64_PATCH_LEVEL 0x0000008b #define MSR_AMD64_TSC_RATIO 0xc0000104 #define MSR_AMD64_NB_CFG 0xc001001f + #define MSR_AMD64_CPUID_FN_1 0xc0011004 #define MSR_AMD64_PATCH_LOADER 0xc0010020 +#define MSR_AMD_PERF_CTL 0xc0010062 +#define MSR_AMD_PERF_STATUS 0xc0010063 +#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 #define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 #define MSR_AMD64_OSVW_STATUS 0xc0010141 #define MSR_AMD64_LS_CFG 0xc0011020