aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-18 10:24:38 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-19 15:03:17 +0100
commit0a9147be6a5e920ea190c9a2bc35fe8e5d772693 (patch)
treeff08162ba173a8cfd9cb973d0ada77b2b74d6704 /target/linux/x86
parentb9e685eed53e1ac98a080ed5d2516949d90467c9 (diff)
downloadupstream-0a9147be6a5e920ea190c9a2bc35fe8e5d772693.tar.gz
upstream-0a9147be6a5e920ea190c9a2bc35fe8e5d772693.tar.bz2
upstream-0a9147be6a5e920ea190c9a2bc35fe8e5d772693.zip
kernel: bump 4.14 to 4.14.154
Refreshed all patches. Altered patches: - 902-debloat_proc.patch - 040-dmaengine-qcom-bam-Process-multiple-pending-descript.patch Remove upstreamed: - 303-spi-nor-enable-4B-opcodes-for-mx66l51235l.patch New symbols: X86_INTEL_MPX X86_INTEL_MEMORY_PROTECTION_KEYS X86_INTEL_TSX_MODE_OFF X86_INTEL_TSX_MODE_ON X86_INTEL_TSX_MODE_AUTO SGL_ALLOC Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/config-4.145
1 files changed, 5 insertions, 0 deletions
diff --git a/target/linux/x86/config-4.14 b/target/linux/x86/config-4.14
index 4a81cbc6b8..fa31df8b52 100644
--- 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