diff options
author | Justin M. Forbes <jforbes@redhat.com> | 2016-01-22 13:23:22 -0600 |
---|---|---|
committer | Justin M. Forbes <jforbes@redhat.com> | 2016-01-22 13:23:22 -0600 |
commit | f94470562da0d5f158e490a7670e88456a94cf2f (patch) | |
tree | d28d235d2f6bd844106e43a217f305abf2ea65ea /disable-CONFIG_EXPERT-for-ZONE_DMA.patch | |
parent | 8a0bfe0000e40d4f0bf15daa0aa1f81bd93fc901 (diff) | |
download | kernel-f94470562da0d5f158e490a7670e88456a94cf2f.tar.gz kernel-f94470562da0d5f158e490a7670e88456a94cf2f.tar.xz kernel-f94470562da0d5f158e490a7670e88456a94cf2f.zip |
Linux v4.4-10454-g3e1e21c
Diffstat (limited to 'disable-CONFIG_EXPERT-for-ZONE_DMA.patch')
-rw-r--r-- | disable-CONFIG_EXPERT-for-ZONE_DMA.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/disable-CONFIG_EXPERT-for-ZONE_DMA.patch b/disable-CONFIG_EXPERT-for-ZONE_DMA.patch new file mode 100644 index 000000000..9cc0525f4 --- /dev/null +++ b/disable-CONFIG_EXPERT-for-ZONE_DMA.patch @@ -0,0 +1,43 @@ +From 888ba9b2a02e8d144c3a9ae5e01a1a94280cd2bf Mon Sep 17 00:00:00 2001 +From: Fedora Kernel Team <kernel-team@fedoraproject.org> +Date: Fri, 22 Jan 2016 13:03:36 -0600 +Subject: [PATCH] Make ZONE_DMA not depend on CONFIG_EXPERT + +Disable the requirement on CONFIG_EXPERT for ZONE_DMA and ZONE_DEVICE so +that we can enable NVDIMM_PFN and ND_PFN + +Signed-off-by: Justin Forbes <jforbes@fedoraproject.org> +--- + arch/x86/Kconfig | 2 +- + mm/Kconfig | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig +index a02c842..ea2eaeb 100644 +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -315,7 +315,7 @@ source "kernel/Kconfig.freezer" + menu "Processor type and features" + + config ZONE_DMA +- bool "DMA memory allocation support" if EXPERT ++ bool "DMA memory allocation support" + default y + help + DMA memory allocation support allows devices with less than 32-bit +diff --git a/mm/Kconfig b/mm/Kconfig +index 97a4e06..26bbbe0 100644 +--- a/mm/Kconfig ++++ b/mm/Kconfig +@@ -650,7 +650,7 @@ config IDLE_PAGE_TRACKING + See Documentation/vm/idle_page_tracking.txt for more details. + + config ZONE_DEVICE +- bool "Device memory (pmem, etc...) hotplug support" if EXPERT ++ bool "Device memory (pmem, etc...) hotplug support" + default !ZONE_DMA + depends on !ZONE_DMA + depends on MEMORY_HOTPLUG +-- +2.5.0 + |