kernel: Update to version 4.0.4

[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 a398a6a085550e4a5a51e5ea0a21875497f71617..da287bb41ae1bfaaa66f831ee43dcdb564297c6e 100644 (file)
--- a/kernel/config-x86_64-default
+++ b/kernel/config-x86_64-default
@@ -53,6 +53,7 @@ CONFIG_X86_X2APIC=y
 CONFIG_X86_NUMACHIP=y
 # CONFIG_X86_VSMP is not set
 # CONFIG_X86_UV is not set
+CONFIG_IOSF_MBI=m
 # CONFIG_MPSC is not set
 CONFIG_GENERIC_CPU=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
@@ -61,6 +62,7 @@ CONFIG_GART_IOMMU=y
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
 # CONFIG_MAXSMP is not set
+CONFIG_X86_VSYSCALL_EMULATION=y
 CONFIG_DIRECT_GBPAGES=y
 CONFIG_NUMA=y
 CONFIG_AMD_NUMA=y
@@ -83,6 +85,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
 CONFIG_PHYSICAL_ALIGN=0x1000000
+# CONFIG_LIVEPATCH is not set
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 
 #
@@ -172,11 +175,14 @@ CONFIG_SCSI_FLASHPOINT=y
 #
 # CONFIG_VIDEO_CAFE_CCIC is not set
 
+#
+# Display Panels
+#
+CONFIG_HSA_AMD=m
+
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_EDAC_AMD64=m
-# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_SBRIDGE=m
 
 #
@@ -188,11 +194,10 @@ CONFIG_INTEL_MIC_X100_DMA=m
 # Android
 #
 CONFIG_CRYPTO_SKEIN=y
-CONFIG_CRYPTO_THREEFISH=y
 # CONFIG_UNISYSSPAR is not set
 
 #
-# Clock Source drivers
+# Generic IOMMU Pagetable Support
 #
 CONFIG_AMD_IOMMU=y
 CONFIG_AMD_IOMMU_STATS=y
@@ -204,6 +209,12 @@ CONFIG_IRQ_REMAP=y
 #
 CONFIG_QUOTACTL_COMPAT=y
 
+#
+# Memory Debugging
+#
+# CONFIG_KASAN is not set
+CONFIG_KASAN_SHADOW_OFFSET=0xdffffc0000000000
+
 #
 # Runtime Testing
 #
@@ -265,6 +276,11 @@ CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
 CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 
+#
+# Random Number Generation
+#
+CONFIG_KVM_COMPAT=y
+
 #
 # Library routines
 #