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 c6b9a498c35b259e49a3a1c1647d09cadfedfcaf..2782f9ec99cbe1acba744ea68c4c9611cdf78dfd 100644 (file)
--- a/kernel/config-x86_64-default
+++ b/kernel/config-x86_64-default
@@ -1,24 +1,34 @@
 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"
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_ZONE_DMA32=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_X86_64_SMP=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-# CONFIG_KTIME_SCALAR is not set
+
+#
+# IRQ subsystem
+#
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
 
 #
 # RCU Subsystem
 #
+# CONFIG_RCU_USER_QS is not set
 CONFIG_RCU_FANOUT=64
 
 #
-# GCOV-based kernel profiling
+# 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
 #
 CONFIG_BLOCK_COMPAT=y
 
@@ -26,11 +36,12 @@ CONFIG_BLOCK_COMPAT=y
 # Processor type and features
 #
 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_MPSC is not set
 CONFIG_GENERIC_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=7
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_GART_IOMMU=y
 # CONFIG_CALGARY_IOMMU is not set
@@ -71,6 +82,12 @@ CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_I7300_IDLE_IOAT_CHANNEL=y
 CONFIG_I7300_IDLE=m
 
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+
 #
 # PC-card bridges
 #
@@ -82,10 +99,12 @@ CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
+# CONFIG_X86_X32 is not set
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_SYSVIPC_COMPAT=y
 CONFIG_KEYS_COMPAT=y
+CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 
 #
@@ -94,7 +113,7 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_BPF_JIT=y
 
 #
-# Protocols
+# Misc devices
 #
 # CONFIG_IBM_ASM is not set
 CONFIG_SGI_IOC4=m
@@ -115,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
 
@@ -126,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
 #
@@ -141,17 +165,20 @@ CONFIG_QUOTACTL_COMPAT=y
 #
 # Kernel hacking
 #
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
 # CONFIG_IOMMU_DEBUG is not set
 
 #
-# PaX
+# Grsecurity
 #
 CONFIG_TASK_SIZE_MAX_SHIFT=47
 
 #
-# Miscellaneous hardening features
+# Memory Protections
+#
+CONFIG_GRKERNSEC_JIT_HARDEN=y
+
+#
+# Logging Options
 #
 CONFIG_INTEL_TXT=y
 
@@ -166,6 +193,12 @@ 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