kernel: Update to 3.19.1

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

diff --git a/kernel/config-x86_64-default b/kernel/config-x86_64-default
index db5fd40505856c81160ca58e9e361b59ddb9cd65..1a936bbf85c3cdc7009e262fa587720bb6b2a7c0 100644 (file)
--- a/kernel/config-x86_64-default
+++ b/kernel/config-x86_64-default
@@ -53,15 +53,15 @@ CONFIG_X86_X2APIC=y
 CONFIG_X86_NUMACHIP=y
 # CONFIG_X86_VSMP is not set
 # CONFIG_X86_UV is not set
-CONFIG_XEN_MAX_DOMAIN_MEMORY=500
-# CONFIG_XEN_PVH is not set
 # CONFIG_MPSC is not set
 CONFIG_GENERIC_CPU=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_GART_IOMMU=y
 # CONFIG_CALGARY_IOMMU is not set
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
 # CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=64
+CONFIG_X86_VSYSCALL_EMULATION=y
 CONFIG_DIRECT_GBPAGES=y
 CONFIG_NUMA=y
 CONFIG_AMD_NUMA=y
@@ -152,8 +152,7 @@ CONFIG_INTEL_MIC_BUS=m
 # Intel MIC Card Driver
 #
 # CONFIG_INTEL_MIC_CARD is not set
-CONFIG_GENWQE=m
-CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
+# CONFIG_GENWQE is not set
 
 #
 # SCSI Transports
@@ -174,11 +173,14 @@ CONFIG_SCSI_FLASHPOINT=y
 #
 # CONFIG_VIDEO_CAFE_CCIC is not set
 
+#
+# I2C encoder or helper chips
+#
+CONFIG_HSA_AMD=m
+
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_EDAC_AMD64=m
-# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_SBRIDGE=m
 
 #
@@ -186,17 +188,10 @@ CONFIG_EDAC_SBRIDGE=m
 #
 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
 
 #
@@ -220,7 +215,14 @@ CONFIG_QUOTACTL_COMPAT=y
 #
 # Grsecurity
 #
-CONFIG_TASK_SIZE_MAX_SHIFT=47
+CONFIG_PAX_KERNEXEC_PLUGIN=y
+CONFIG_TASK_SIZE_MAX_SHIFT=42
+
+#
+# Non-executable pages
+#
+CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS=y
+CONFIG_PAX_KERNEXEC_PLUGIN_METHOD="bts"
 
 #
 # Memory Protections
@@ -244,6 +246,7 @@ CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 CONFIG_CRYPTO_SHA1_SSSE3=m
 CONFIG_CRYPTO_SHA256_SSSE3=m
 CONFIG_CRYPTO_SHA512_SSSE3=m
+# CONFIG_CRYPTO_SHA1_MB is not set
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 
 #