kernel: Update to version 3.18.7

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

diff --git a/kernel/config-x86_64-default b/kernel/config-x86_64-default
index 197b5a76d14088a04ffd1567f50bdd9c1f295647..a398a6a085550e4a5a51e5ea0a21875497f71617 100644 (file)
--- a/kernel/config-x86_64-default
+++ b/kernel/config-x86_64-default
@@ -53,13 +53,13 @@ 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_DIRECT_GBPAGES=y
 CONFIG_NUMA=y
@@ -184,12 +184,6 @@ 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
 #
@@ -218,7 +212,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