diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-01-16 09:14:57 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-01-16 09:14:57 +0800 |
| commit | c8e95ac690b37fd1a469c685d716e24abae26992 (patch) | |
| tree | 62593c6b574ff9cf08cabbcb7d4fc943b5377718 /drivers/cpufreq/intel_pstate.c | |
| parent | 3dad43721441f1cf8ed1a3a975bc939007686589 (diff) | |
| parent | 1071ea6e68ead40df739b223e9013d99c23c19ab (diff) | |
Merge remote-tracking branch 'stable/linux-3.10.y' 3.10.27 into linux-linaro-lsk
Diffstat (limited to 'drivers/cpufreq/intel_pstate.c')
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 7054c579d45..a22fb3e4725 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -516,7 +516,8 @@ static void intel_pstate_timer_func(unsigned long __data) } #define ICPU(model, policy) \ - { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&policy } + { X86_VENDOR_INTEL, 6, model, X86_FEATURE_APERFMPERF,\ + (unsigned long)&policy } static const struct x86_cpu_id intel_pstate_cpu_ids[] = { ICPU(0x2a, default_policy), |