kernel: Remove grsecurity patchset

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

diff --git a/kernel/config-i686-default b/kernel/config-i686-default
index e35bd6d313d5d1bcfd5e3caf6423edcec6a02f5f..dceb7e13cacb068693a8d384198bf525c998b5d8 100644 (file)
--- a/kernel/config-i686-default
+++ b/kernel/config-i686-default
@@ -70,7 +70,6 @@ CONFIG_M686=y
 # CONFIG_MVIAC7 is not set
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=5
@@ -79,6 +78,7 @@ CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y
 # CONFIG_X86_ANCIENT_MCE is not set
 CONFIG_VM86=y
+CONFIG_X86_ESPFIX32=y
 CONFIG_TOSHIBA=m
 # CONFIG_X86_REBOOTFIXUPS is not set
 # CONFIG_NOHIGHMEM is not set
@@ -161,6 +161,11 @@ CONFIG_PCI_BIOS=y
 # CONFIG_HOTPLUG_PCI_IBM is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 
+#
+# Executable file formats / Emulations
+#
+# CONFIG_BINFMT_AOUT is not set
+
 #
 # Misc devices
 #
@@ -329,24 +334,7 @@ CONFIG_CLKSRC_I8253=y
 # CONFIG_DEBUG_IMR_SELFTEST is not set
 
 #
-# Grsecurity
-#
-CONFIG_ARCH_TRACK_EXEC_LIMIT=y
-
-#
-# Non-executable pages
-#
-CONFIG_PAX_SEGMEXEC=y
-CONFIG_PAX_KERNEXEC_PLUGIN_METHOD=""
-CONFIG_PAX_KERNEXEC_MODULE_TEXT=8
-
-#
-# Memory Protections
-#
-CONFIG_GRKERNSEC_VM86=y
-
-#
-# Logging Options
+# Security options
 #
 # CONFIG_INTEL_TXT is not set