diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-23 15:06:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-23 15:06:06 +0100 |
| commit | b7f9d04cf684c197ef74ed8a38394d7bf7fda26f (patch) | |
| tree | 5309b3b1fca0d4de1a2600154578d524fa8d88b8 /drivers/platform | |
| parent | e6ac02baf8864fad4d1fd52e070d5ebd94296af7 (diff) | |
| parent | beca880f9e2dd9c4072538181633793f1c48a01c (diff) | |
| download | linux-next-b7f9d04cf684c197ef74ed8a38394d7bf7fda26f.tar.gz linux-next-b7f9d04cf684c197ef74ed8a38394d7bf7fda26f.zip | |
Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
# Conflicts:
# arch/x86/mm/pat/set_memory.c
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c | 2 |
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); |