Merge branch into tip/master: 'perf/merge'

 # New commits in perf/merge:
    3eaa50e1e255 ("x86/cpu: Hide and rename static_cpu_has()")
    edda9051e267 ("perf/x86/amd/uncore: Add group validation")
    d7ebbae57de3 ("selftests/bpf: Add tests for forked/cloned optimized uprobes")
    eccf368562bb ("selftests/bpf: Add tests for uprobe nop10 red zone clobbering")
    28d57db3e8d4 ("selftests/bpf: Add reattach tests for uprobe syscall")
    b2cf7c41e4f1 ("selftests/bpf: Change uprobe/usdt trigger bench code to use nop10")
    ec0596a02083 ("selftests/bpf: Change uprobe syscall tests to use nop10")
    6d91200bcbb5 ("selftests/bpf: Emit nop,nop10 instructions combo for x86_64 arch")
    8cae54c58608 ("libbpf: Detect uprobe syscall with new error")
    ee2862439e5c ("libbpf: Change has_nop_combo to work on top of nop10")
    554ba38456da ("uprobes/x86: Move optimized uprobe from nop5 to nop10")
    d9a48e77f6fe ("uprobes/x86: Allow to copy uprobe trampolines on fork")
    07c308eb2bcf ("uprobes/x86: Do not leak trampoline vma mapping on optimization failure")
    38af0dd6a266 ("uprobes/x86: Remove struct uprobe_trampoline object")
    a4573a3838ae ("perf/core: Check kernel access when kernel callchains are requested")
    166f10836a65 ("perf/core: Fix kernel register info leak via hardware skid")
    a6b5fbc33172 ("perf/x86/intel: Drop fixed-counter PEBS constraints for baseline PEBS")
    01c153956b44 ("perf/x86/intel: Validate the return value of intel_pmu_init_hybrid()")
    e2b0575900ff ("perf/x86/intel: Fix kernel address leakages in LBR stack")
    170cc6b02e3d ("perf/x86/intel: Fallback to sw branch type decoding if no hw decoding")
    3c4ec9b2a5db ("perf/x86/intel: Keep cap_user_rdpmc in sync with RDPMC user-disable state")
    8767b4d73018 ("perf/x86/intel: Remove anythread_deprecated bit from perf_capabilities")
    b25813b17944 ("perf/x86/intel/uncore: Implement lazy setup for MSR/MMIO PMUs")
    174f0582e38a ("perf/x86/intel/uncore: Fix uncore_box ref/unref ordering")
    30c0a1095652 ("perf/x86/intel/uncore: Introduce PMU flags and broken state")
    ae7ca8796dda ("perf/x86/intel/uncore: Factor out box setup code")
    3012af7df343 ("perf/x86/intel/uncore: Keep PCI PMUs working when MMIO/MSR setup fails")
    cbbc25209ce3 ("perf/x86/intel/uncore: Let init_box() callback report failures")
    7d3a9ff98898 ("perf/x86/intel/uncore: Fix refcnt and other cleanups")
    003267cb94e2 ("perf/x86/intel/uncore: Fix PCI PMU cleanup on setup failure")

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c b/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
index 24334ae70d82..5ded0e25b6c7 100644
--- a/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
+++ b/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
@@ -558,7 +558,7 @@ static bool disable_dynamic_sst_features(void)
 {
 	u64 value;
 
-	if (!static_cpu_has(X86_FEATURE_HWP))
+	if (!cpu_feature_enabled(X86_FEATURE_HWP))
 		return true;
 
 	rdmsrq(MSR_PM_ENABLE, value);