diff options
| author | Ingo Molnar <mingo@kernel.org> | 2026-07-28 10:08:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-07-28 10:08:49 +0200 |
| commit | eb610545f051208dc951537a91f4baeaf0162ee8 (patch) | |
| tree | 71f0af8ba825bf69e358ee6e38fdeeb82cc71349 /arch/x86/kernel/cpu/cacheinfo.c | |
| parent | cc1d9185119f6eecfe01b9e701271d62eb1b4f2f (diff) | |
| parent | bec89bf9eacbfdcaead88e9a611215fcad3c5cf4 (diff) | |
| download | linux-next-eb610545f051208dc951537a91f4baeaf0162ee8.tar.gz linux-next-eb610545f051208dc951537a91f4baeaf0162ee8.zip | |
Merge branch 'x86/cpu' into x86/merge, to resolve conflict
Conflicts:
arch/x86/kernel/cpu/transmeta.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/cacheinfo.c')
| -rw-r--r-- | arch/x86/kernel/cpu/cacheinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/cacheinfo.c b/arch/x86/kernel/cpu/cacheinfo.c index 51a95b07831f..13ed16527905 100644 --- a/arch/x86/kernel/cpu/cacheinfo.c +++ b/arch/x86/kernel/cpu/cacheinfo.c @@ -654,7 +654,7 @@ static DEFINE_RAW_SPINLOCK(cache_disable_lock); */ static void maybe_flush_caches(void) { - if (!static_cpu_has(X86_FEATURE_SELFSNOOP)) + if (!cpu_feature_enabled(X86_FEATURE_SELFSNOOP)) wbinvd(); } |