diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-11-18 14:41:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-18 14:41:02 +0100 |
| commit | b21feab0b865c36b24d7a60b55a10c7033b03159 (patch) | |
| tree | 17085747485ffad55b90839b43646d453b8e5079 /arch/x86/kernel/cpu/intel.c | |
| parent | a9723389cc759c891d481de271ac73eeaa123bcb (diff) | |
| parent | af42d3466bdc8f39806b26f593604fdc54140bcb (diff) | |
Merge tag 'v5.4-rc8' into sched/core, to pick up fixes and dependencies
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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index c2fdc00df163..11d5c5950e2d 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -762,6 +762,11 @@ static void init_intel(struct cpuinfo_x86 *c) detect_tme(c); init_intel_misc_features(c); + + if (tsx_ctrl_state == TSX_CTRL_ENABLE) + tsx_enable(); + if (tsx_ctrl_state == TSX_CTRL_DISABLE) + tsx_disable(); } #ifdef CONFIG_X86_32 |