Merge remote-tracking branch 'stevee/krb5-update'

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

diff --git a/kernel/config-x86_64-default b/kernel/config-x86_64-default
index 5a6a0abc0d4f2066b715593be2a73f2d74ea26ab..2782f9ec99cbe1acba744ea68c4c9611cdf78dfd 100644 (file)
--- a/kernel/config-x86_64-default
+++ b/kernel/config-x86_64-default
@@ -1,5 +1,4 @@
 CONFIG_64BIT=y
-# CONFIG_X86_32 is not set
 CONFIG_X86_64=y
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
@@ -18,6 +17,7 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 #
 # RCU Subsystem
 #
+# CONFIG_RCU_USER_QS is not set
 CONFIG_RCU_FANOUT=64
 
 #
@@ -25,6 +25,7 @@ CONFIG_RCU_FANOUT=64
 #
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_MODULES_USE_ELF_RELA=y
 
 #
 # Partition Types
@@ -133,7 +134,7 @@ CONFIG_SGI_IOC4=m
 CONFIG_GPIO_LANGWELL=y
 
 #
-# Webcam and/or TV USB devices
+# Media digital TV PCI Adapters
 #
 # CONFIG_VIDEO_CAFE_CCIC is not set
 
@@ -164,7 +165,6 @@ CONFIG_QUOTACTL_COMPAT=y
 #
 # Kernel hacking
 #
-CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_IOMMU_DEBUG is not set
 
 #
@@ -172,6 +172,11 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 #
 CONFIG_TASK_SIZE_MAX_SHIFT=47
 
+#
+# Memory Protections
+#
+CONFIG_GRKERNSEC_JIT_HARDEN=y
+
 #
 # Logging Options
 #
@@ -189,6 +194,8 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_CRYPTO_AES_X86_64=y
 CONFIG_CRYPTO_BLOWFISH_X86_64=m
 CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m