kernel: Update to 3.17

[ipfire-3.x.git] / kernel / config-x86_64-default

diff --git a/kernel/config-x86_64-default b/kernel/config-x86_64-default
index 9e9d297e347bb692aee5d2a90f41b7cab34a8c1e..db5fd40505856c81160ca58e9e361b59ddb9cd65 100644 (file)
--- a/kernel/config-x86_64-default
+++ b/kernel/config-x86_64-default
@@ -137,7 +137,11 @@ CONFIG_BLK_DEV_SKD=m
 #
 # CONFIG_IBM_ASM is not set
 CONFIG_SGI_IOC4=m
-# CONFIG_CS5535_MFGPT is not set
+
+#
+# Intel MIC Bus Driver
+#
+CONFIG_INTEL_MIC_BUS=m
 
 #
 # Intel MIC Host Driver
@@ -149,6 +153,7 @@ CONFIG_SGI_IOC4=m
 #
 # CONFIG_INTEL_MIC_CARD is not set
 CONFIG_GENWQE=m
+CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
 
 #
 # SCSI Transports
@@ -176,22 +181,30 @@ CONFIG_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_SBRIDGE=m
 
+#
+# DMA Devices
+#
+CONFIG_INTEL_MIC_X100_DMA=m
+
 #
 # Xen driver support
 #
 # CONFIG_XEN_MCE_LOG is not set
+CONFIG_XEN_EFI=y
 
 #
 # Android
 #
 CONFIG_CRYPTO_SKEIN=y
 CONFIG_CRYPTO_THREEFISH=y
+# CONFIG_UNISYSSPAR is not set
 
 #
-# Hardware Spinlock drivers
+# Clock Source drivers
 #
 CONFIG_AMD_IOMMU=y
 CONFIG_AMD_IOMMU_STATS=y
+CONFIG_AMD_IOMMU_V2=m
 CONFIG_IRQ_REMAP=y
 
 #
@@ -212,7 +225,6 @@ CONFIG_TASK_SIZE_MAX_SHIFT=47
 #
 # Memory Protections
 #
-CONFIG_GRKERNSEC_JIT_HARDEN=y
 CONFIG_GRKERNSEC_KSTACKOVERFLOW=y
 
 #
@@ -244,6 +256,7 @@ CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
 CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
 CONFIG_CRYPTO_CAST5_AVX_X86_64=m
 CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_DES3_EDE_X86_64=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m