summaryrefslogtreecommitdiffstats
path: root/config-x86_64-generic
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-07-25 15:01:09 -0700
committerLaura Abbott <labbott@fedoraproject.org>2016-07-26 16:36:43 -0700
commitf339ce1dadf093ec63e24a19c01e75b821bb3974 (patch)
tree03552e16d4f7efe60041baeba6835989e8a99dd5 /config-x86_64-generic
parentbf1d35cfe8b31cbac09a036ab36cd742b63031f1 (diff)
downloadkernel-f339ce1dadf093ec63e24a19c01e75b821bb3974.tar.gz
kernel-f339ce1dadf093ec63e24a19c01e75b821bb3974.tar.xz
kernel-f339ce1dadf093ec63e24a19c01e75b821bb3974.zip
Linux v4.7
Diffstat (limited to 'config-x86_64-generic')
-rw-r--r--config-x86_64-generic5
1 files changed, 5 insertions, 0 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index b6037709c..0614913aa 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -117,6 +117,7 @@ CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_VMEMMAP=y
# CONFIG_MOVABLE_NODE is not set
CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
# CONFIG_ARCH_MEMORY_PROBE is not set
CONFIG_MEMORY_HOTREMOVE=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
@@ -222,8 +223,12 @@ CONFIG_CMA_AREAS=7
CONFIG_ZONE_DMA=y
CONFIG_ZONE_DEVICE=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVDIMM_DAX=y
CONFIG_ND_PFN=m
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
+
# Staging
CONFIG_STAGING_RDMA=y
CONFIG_INFINIBAND_HFI1=m