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 1fa32dfcef903a13068e13d95be20c2ae50f27fa..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"
@@ -12,20 +11,21 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -
 #
 # IRQ subsystem
 #
-CONFIG_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 
 #
 # RCU Subsystem
 #
+# CONFIG_RCU_USER_QS is not set
 CONFIG_RCU_FANOUT=64
 
 #
 # Kernel Performance Events And Counters
 #
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_MODULES_USE_ELF_RELA=y
 
 #
 # Partition Types
@@ -134,7 +134,7 @@ CONFIG_SGI_IOC4=m
 CONFIG_GPIO_LANGWELL=y
 
 #
-# Miscelaneous helper chips
+# Media digital TV PCI Adapters
 #
 # CONFIG_VIDEO_CAFE_CCIC is not set
 
@@ -145,6 +145,11 @@ CONFIG_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_SBRIDGE=m
 
+#
+# Xen driver support
+#
+# CONFIG_XEN_MCE_LOG is not set
+
 #
 # Hardware Spinlock drivers
 #
@@ -160,8 +165,6 @@ CONFIG_QUOTACTL_COMPAT=y
 #
 # Kernel hacking
 #
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
 # CONFIG_IOMMU_DEBUG is not set
 
 #
@@ -169,6 +172,11 @@ CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
 #
 CONFIG_TASK_SIZE_MAX_SHIFT=47
 
+#
+# Memory Protections
+#
+CONFIG_GRKERNSEC_JIT_HARDEN=y
+
 #
 # Logging Options
 #
@@ -186,7 +194,11 @@ 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
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m