diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-03-25 15:20:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-03-25 15:20:44 +0100 |
| commit | 629b3df7ecb01fddfdf71cb5d3c563d143117c33 (patch) | |
| tree | a2e5ad1266c9660c934b9bf7a1621f6a3a48e28b /drivers/cpufreq/amd_freq_sensitivity.c | |
| parent | 3442a9ecb8e72a33c28a2b969b766c659830e410 (diff) | |
| parent | d97828072d0bcecb6655f0966efc38a2647d3dfb (diff) | |
| download | linux-629b3df7ecb01fddfdf71cb5d3c563d143117c33.tar.gz | |
Merge branch 'x86/cpu' into perf/core, to resolve conflict
Conflicts: arch/x86/events/intel/uncore.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/cpufreq/amd_freq_sensitivity.c')
| -rw-r--r-- | drivers/cpufreq/amd_freq_sensitivity.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_freq_sensitivity.c index e2df9d112106..f7c4206d4c90 100644 --- a/drivers/cpufreq/amd_freq_sensitivity.c +++ b/drivers/cpufreq/amd_freq_sensitivity.c @@ -18,6 +18,7 @@ #include <asm/msr.h> #include <asm/cpufeature.h> +#include <asm/cpu_device_id.h> #include "cpufreq_ondemand.h" @@ -144,7 +145,7 @@ static void __exit amd_freq_sensitivity_exit(void) module_exit(amd_freq_sensitivity_exit); static const struct x86_cpu_id amd_freq_sensitivity_ids[] = { - X86_FEATURE_MATCH(X86_FEATURE_PROC_FEEDBACK), + X86_MATCH_FEATURE(X86_FEATURE_PROC_FEEDBACK, NULL), {} }; MODULE_DEVICE_TABLE(x86cpu, amd_freq_sensitivity_ids); |