diff options
author | Mark Brown <broonie@kernel.org> | 2018-06-19 12:30:33 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-06-19 12:30:33 +0100 |
commit | d9227958dc0e56976eaf452a213aee8415a9eb60 (patch) | |
tree | 1f31cfd333fce67c76e2693c4d55caac39744bee /arch/x86/kernel/cpu/perf_event_amd.c | |
parent | b0c2d653f718f3d56b4ffdca950aea247ee7dc99 (diff) | |
parent | 0bd2bedb3501db249b347e5acbfd3415bd7667a5 (diff) |
Merge tag 'v4.4.138' into linux-linaro-lsk-v4.4lsk-v4.4-18.06
This is the 4.4.138 stable release
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_amd.c')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_amd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_amd.c b/arch/x86/kernel/cpu/perf_event_amd.c index 1cee5d2d7ece..3ea177cb7366 100644 --- a/arch/x86/kernel/cpu/perf_event_amd.c +++ b/arch/x86/kernel/cpu/perf_event_amd.c @@ -160,7 +160,7 @@ static inline int amd_pmu_addr_offset(int index, bool eventsel) if (offset) return offset; - if (!cpu_has_perfctr_core) + if (!boot_cpu_has(X86_FEATURE_PERFCTR_CORE)) offset = index; else offset = index << 1; @@ -652,7 +652,7 @@ static __initconst const struct x86_pmu amd_pmu = { static int __init amd_core_pmu_init(void) { - if (!cpu_has_perfctr_core) + if (!boot_cpu_has(X86_FEATURE_PERFCTR_CORE)) return 0; switch (boot_cpu_data.x86) { |