diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-11-12 19:59:12 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-11-12 19:59:12 +0100 |
| commit | 3eed9c686f3b907ef1949e99c93d07e4e4bffc84 (patch) | |
| tree | 4d9391a9eb6bb46c71a5a8a864478e248c654819 /kernel-x86_64-debug.config | |
| parent | b6931d0d092b795ce27f86e47c5fb8d36e04fbcb (diff) | |
| parent | c200d4abc043c9e759e6511c3ec0f1a5014001c7 (diff) | |
| download | kernel-5.3.11-250.vanilla.knurd.1.fc30.tar.gz kernel-5.3.11-250.vanilla.knurd.1.fc30.tar.xz kernel-5.3.11-250.vanilla.knurd.1.fc30.zip | |
Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedorakernel-5.3.11-250.vanilla.knurd.1.fc30
Diffstat (limited to 'kernel-x86_64-debug.config')
| -rw-r--r-- | kernel-x86_64-debug.config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 1e7e74847..132d17a99 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -6618,6 +6618,9 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y # CONFIG_X86_INTEL_MID is not set CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_PSTATE=y +# 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_MCE_AMD=y CONFIG_X86_MCE_INJECT=m |