diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-05-02 14:31:29 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-05-02 14:31:29 +0300 |
| commit | 10ed2b118116b4b766c3b0a4f598809af8522b18 (patch) | |
| tree | df515fe75e83ea1834ee2a90d364c814519fdbef /arch/x86/kernel/cpu/intel.c | |
| parent | 690ca3a3067f760bef92ca5db1c42490498ab5de (diff) | |
| parent | 2eda374e883ad297bd9fe575a16c1dc850346075 (diff) | |
| download | linux-10ed2b118116b4b766c3b0a4f598809af8522b18.tar.xz | |
Merge branch 'x86/cpu' into perf/core, to pick up dependent commits
We are going to fix perf-events fallout of changes in tip:x86/cpu,
so merge in that branch first.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/intel.c')
| -rw-r--r-- | arch/x86/kernel/cpu/intel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index be30d7fa2e66..3c3e7e5695ba 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -228,6 +228,7 @@ static void detect_tme_early(struct cpuinfo_x86 *c) if (!TME_ACTIVATE_LOCKED(tme_activate) || !TME_ACTIVATE_ENABLED(tme_activate)) { pr_info_once("x86/tme: not enabled by BIOS\n"); mktme_status = MKTME_DISABLED; + clear_cpu_cap(c, X86_FEATURE_TME); return; } |