diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-09 23:43:53 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-09 23:43:53 +0100 |
| commit | c488ea461359483976ff7d4838cce5c0138c6b3e (patch) | |
| tree | 3bee2239b14a33c4519db8e7ca673dea37185a68 /arch | |
| parent | d64c3b0bb9195d4de856d841337368d930cdb0ed (diff) | |
| parent | e7ddf4b7b3c5fe64902c4fb9edac92532c87cd75 (diff) | |
Merge branch 'sfi' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux into pm-cpufreq
Pull SFI-based cpufreq driver for v3.20 from Len Brown.
* 'sfi' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
cpufreq: Add SFI based cpufreq driver support
SFI: fix compiler warnings
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/uapi/asm/msr-index.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h index c8aa65d56027..d11e1c57cfc5 100644 --- a/arch/x86/include/uapi/asm/msr-index.h +++ b/arch/x86/include/uapi/asm/msr-index.h @@ -358,6 +358,7 @@ #define MSR_IA32_PERF_STATUS 0x00000198 #define MSR_IA32_PERF_CTL 0x00000199 +#define INTEL_PERF_CTL_MASK 0xffff #define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 #define MSR_AMD_PERF_STATUS 0xc0010063 #define MSR_AMD_PERF_CTL 0xc0010062 |