diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-11-12 19:47:52 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-11-12 19:47:52 +0100 |
| commit | 07da4948c5d1a82a9885c9520f8fe8571d9c236b (patch) | |
| tree | b6ae149a7bb4caf65ed8c8be95357f702aa2d142 /kernel-i686.config | |
| parent | 75ae98e45a6535247e942d13f1c186eb0b24f375 (diff) | |
| parent | 6dfe5c1ffbd3d03349b35a4d5f6536aa4a253bbb (diff) | |
| download | kernel-07da4948c5d1a82a9885c9520f8fe8571d9c236b.tar.gz kernel-07da4948c5d1a82a9885c9520f8fe8571d9c236b.tar.xz kernel-07da4948c5d1a82a9885c9520f8fe8571d9c236b.zip | |
Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedorakernel-5.3.11-350.vanilla.knurd.1.fc31
Diffstat (limited to 'kernel-i686.config')
| -rw-r--r-- | kernel-i686.config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel-i686.config b/kernel-i686.config index 61869e292..a89417761 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -6540,6 +6540,9 @@ CONFIG_X86_INTEL_LPSS=y CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_PSTATE=y # CONFIG_X86_INTEL_QUARK is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set # CONFIG_X86_LEGACY_VM86 is not set # CONFIG_X86_LONGHAUL is not set CONFIG_X86_LONGRUN=y |