kernel: bump 4.14 to 4.14.154

[openwrt/staging/rmilecki.git] / target / linux / x86 / config-4.14

diff --git a/target/linux/x86/config-4.14 b/target/linux/x86/config-4.14
index 1388a995b766d356f41348c481a1e72236cccddb..18b7de832f78cc698bf82a40a8797a16797f4dbd 100644 (file)
--- a/target/linux/x86/config-4.14
+++ b/target/linux/x86/config-4.14
@@ -475,7 +475,12 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
 CONFIG_X86_FEATURE_NAMES=y
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_GX_SUSPMOD is not set
+# CONFIG_X86_INTEL_MPX is not set
+# CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set
 # CONFIG_X86_INTEL_PSTATE is not set
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_IO_APIC=y