summaryrefslogtreecommitdiffstats
path: root/config-x86_64-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2016-01-22 13:23:22 -0600
committerJustin M. Forbes <jforbes@redhat.com>2016-01-22 13:23:22 -0600
commitf94470562da0d5f158e490a7670e88456a94cf2f (patch)
treed28d235d2f6bd844106e43a217f305abf2ea65ea /config-x86_64-generic
parent8a0bfe0000e40d4f0bf15daa0aa1f81bd93fc901 (diff)
downloadkernel-f94470562da0d5f158e490a7670e88456a94cf2f.tar.gz
kernel-f94470562da0d5f158e490a7670e88456a94cf2f.tar.xz
kernel-f94470562da0d5f158e490a7670e88456a94cf2f.zip
Linux v4.4-10454-g3e1e21c
Diffstat (limited to 'config-x86_64-generic')
-rw-r--r--config-x86_64-generic8
1 files changed, 7 insertions, 1 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 9d13391fc..4a811a2d2 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -113,7 +113,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y
# CONFIG_MOVABLE_NODE is not set
CONFIG_MEMORY_HOTPLUG=y
# CONFIG_ARCH_MEMORY_PROBE is not set
-# CONFIG_MEMORY_HOTREMOVE is not set
+CONFIG_MEMORY_HOTREMOVE=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
# CONFIG_BLK_DEV_CMD640 is not set
@@ -212,3 +212,9 @@ CONFIG_CMA=y
# CONFIG_CMA_DEBUG is not set
# CONFIG_CMA_DEBUGFS is not set
CONFIG_CMA_AREAS=7
+
+# Changes for persistent memory devices
+# CONFIG_ZONE_DMA is not set
+CONFIG_ZONE_DEVICE=y
+CONFIG_NVDIMM_PFN=y
+CONFIG_ND_PFN=m