|
 |
168984b |
From 888ba9b2a02e8d144c3a9ae5e01a1a94280cd2bf Mon Sep 17 00:00:00 2001
|
|
|
168984b |
From: Fedora Kernel Team <kernel-team@fedoraproject.org>
|
|
|
168984b |
Date: Fri, 22 Jan 2016 13:03:36 -0600
|
|
|
168984b |
Subject: [PATCH] Make ZONE_DMA not depend on CONFIG_EXPERT
|
|
|
168984b |
|
|
|
168984b |
Disable the requirement on CONFIG_EXPERT for ZONE_DMA and ZONE_DEVICE so
|
|
|
168984b |
that we can enable NVDIMM_PFN and ND_PFN
|
|
|
168984b |
|
|
|
168984b |
Signed-off-by: Justin Forbes <jforbes@fedoraproject.org>
|
|
|
168984b |
---
|
|
|
168984b |
arch/x86/Kconfig | 2 +-
|
|
|
168984b |
mm/Kconfig | 2 +-
|
|
|
168984b |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
168984b |
|
|
|
168984b |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
|
|
|
168984b |
index a02c842..ea2eaeb 100644
|
|
|
168984b |
--- a/arch/x86/Kconfig
|
|
|
168984b |
+++ b/arch/x86/Kconfig
|
|
|
168984b |
@@ -315,7 +315,7 @@ source "kernel/Kconfig.freezer"
|
|
|
168984b |
menu "Processor type and features"
|
|
|
168984b |
|
|
|
168984b |
config ZONE_DMA
|
|
|
168984b |
- bool "DMA memory allocation support" if EXPERT
|
|
|
168984b |
+ bool "DMA memory allocation support"
|
|
|
168984b |
default y
|
|
|
168984b |
help
|
|
|
168984b |
DMA memory allocation support allows devices with less than 32-bit
|
|
|
168984b |
diff --git a/mm/Kconfig b/mm/Kconfig
|
|
|
168984b |
index 97a4e06..26bbbe0 100644
|
|
|
168984b |
--- a/mm/Kconfig
|
|
|
168984b |
+++ b/mm/Kconfig
|
|
|
168984b |
@@ -650,7 +650,7 @@ config IDLE_PAGE_TRACKING
|
|
|
168984b |
See Documentation/vm/idle_page_tracking.txt for more details.
|
|
|
168984b |
|
|
|
168984b |
config ZONE_DEVICE
|
|
|
168984b |
- bool "Device memory (pmem, etc...) hotplug support" if EXPERT
|
|
|
168984b |
+ bool "Device memory (pmem, etc...) hotplug support"
|
|
|
168984b |
default !ZONE_DMA
|
|
|
168984b |
depends on !ZONE_DMA
|
|
|
168984b |
depends on MEMORY_HOTPLUG
|
|
|
168984b |
--
|
|
|
168984b |
2.5.0
|
|
|
168984b |
|