kernel: Update to 3.5.1.

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

diff --git a/kernel/config-x86_64-default b/kernel/config-x86_64-default
index 2da29dbd975564513558edb48e8c3feec42e049a..1fa32dfcef903a13068e13d95be20c2ae50f27fa 100644 (file)
--- a/kernel/config-x86_64-default
+++ b/kernel/config-x86_64-default
@@ -3,14 +3,19 @@ CONFIG_64BIT=y
 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_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
 
 #
 # RCU Subsystem
@@ -99,6 +104,7 @@ 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
 
 #
@@ -159,7 +165,7 @@ CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
 # CONFIG_IOMMU_DEBUG is not set
 
 #
-# PaX
+# Grsecurity
 #
 CONFIG_TASK_SIZE_MAX_SHIFT=47