kernel: Update to 3.3.6.

[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 c6b9a498c35b259e49a3a1c1647d09cadfedfcaf..14b8ad815b69f33e163169b94ced3d05e74347f6 100644 (file)
--- a/kernel/config-x86_64-default
+++ b/kernel/config-x86_64-default
@@ -18,7 +18,7 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -
 CONFIG_RCU_FANOUT=64
 
 #
-# GCOV-based kernel profiling
+# Partition Types
 #
 CONFIG_BLOCK_COMPAT=y
 
@@ -26,8 +26,10 @@ 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
@@ -71,6 +73,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
 #
@@ -94,7 +102,7 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_BPF_JIT=y
 
 #
-# Protocols
+# Misc devices
 #
 # CONFIG_IBM_ASM is not set
 CONFIG_SGI_IOC4=m
@@ -167,5 +175,6 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_CRYPTO_AES_X86_64=y
 CONFIG_CRYPTO_BLOWFISH_X86_64=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m