[PATCH Xenial 4.4] UBUNTU: [Config] CONFIG_ZONE_DEVICE=y for amd64
tim.gardner at canonical.com
tim.gardner at canonical.com
Tue Jan 5 15:00:58 UTC 2016
From: Tim Gardner <tim.gardner at canonical.com>
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
In order for ZONE_DEVICE to be enabled for amd64 you have to set ZONE_DMA=n (which is a change
from our current annotation policy). In effect, this precludes devices that can only DMA from
memory addresses below 16MB. Does anyone think this is a bad idea ? ZONE_DEVICE is a prequisite
for supporting NVDIMM devices which I believe we'll start seeing more of in the near future.
debian.master/config/amd64/config.common.amd64 | 6 +++---
debian.master/config/annotations | 2 +-
debian.master/config/arm64/config.common.arm64 | 1 +
debian.master/config/armhf/config.common.armhf | 1 +
debian.master/config/config.common.ubuntu | 4 +++-
debian.master/config/i386/config.common.i386 | 1 +
debian.master/config/powerpc/config.common.powerpc | 1 +
debian.master/config/ppc64el/config.common.ppc64el | 1 +
debian.master/config/s390x/config.common.s390x | 1 +
9 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index a49c017..1f07182 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -52,7 +52,6 @@ CONFIG_BLK_DEV_SKD=m
# CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_BLK_DEV_SX8=m
CONFIG_BLK_DEV_UMEM=m
-CONFIG_BOUNCE=y
CONFIG_BSD_DISKLABEL=y
CONFIG_C2PORT=m
CONFIG_CADENCE_WATCHDOG=m
@@ -393,7 +392,7 @@ CONFIG_SGI_PARTITION=y
CONFIG_SLIP=m
CONFIG_SND=m
CONFIG_SND_DMAENGINE_PCM=m
-CONFIG_SND_EMU10K1_SEQ=m
+# CONFIG_SND_EMU10K1_SEQ is not set
# CONFIG_SND_OPL4_LIB_SEQ is not set
CONFIG_SND_PCM=m
# CONFIG_SND_SBAWE_SEQ is not set
@@ -467,4 +466,5 @@ CONFIG_XZ_DEC_SPARC=y
CONFIG_XZ_DEC_TEST=m
CONFIG_XZ_DEC_X86=y
CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZONE_DMA_FLAG=1
+# CONFIG_ZONE_DMA is not set
+CONFIG_ZONE_DMA_FLAG=0
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index e34d8c0..1804369 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -9515,7 +9515,7 @@ CONFIG_STACK_GUARD policy<{'s390x': '256'}>
CONFIG_WARN_DYNAMIC_STACK policy<{'s390x': 'n'}>
# Menu: Processor type and features >> Architecture: x86
-CONFIG_ZONE_DMA policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_ZONE_DMA policy<{'amd64': 'n', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
CONFIG_X86_FEATURE_NAMES policy<{'amd64': 'y', 'i386': 'y'}>
CONFIG_X86_X2APIC policy<{'amd64': 'y'}>
CONFIG_X86_MPPARSE policy<{'amd64': 'y', 'i386': 'y'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index df371f2..41fc051 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -462,4 +462,5 @@ CONFIG_XZ_DEC_SPARC=y
CONFIG_XZ_DEC_TEST=m
CONFIG_XZ_DEC_X86=y
CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZONE_DMA=y
CONFIG_ZONE_DMA_FLAG=1
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 9694e9e..ebe3a60 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -451,3 +451,4 @@ CONFIG_XZ_DEC_SPARC=y
CONFIG_XZ_DEC_TEST=m
CONFIG_XZ_DEC_X86=y
CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZONE_DMA=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index c2a4aaf..17d38c6 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4896,6 +4896,7 @@ CONFIG_NCPFS_STRONG=y
CONFIG_ND_BLK=m
CONFIG_ND_BTT=m
CONFIG_ND_CLAIM=y
+CONFIG_ND_PFN=m
CONFIG_NE2000=m
CONFIG_NE2K_PCI=m
CONFIG_NEED_MULTIPLE_NODES=y
@@ -5369,6 +5370,7 @@ CONFIG_NTFS_FS=m
CONFIG_NUMA_BALANCING=y
CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
# CONFIG_NUMA_EMU is not set
+CONFIG_NVDIMM_PFN=y
CONFIG_NVEC_PAZ00=m
CONFIG_NVEC_POWER=m
CONFIG_NVM=y
@@ -9028,7 +9030,7 @@ CONFIG_ZEROPLUS_FF=y
CONFIG_ZFCP=m
CONFIG_ZISOFS=y
CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DEVICE=y
CONFIG_ZONE_DMA32=y
CONFIG_ZPOOL=y
CONFIG_ZRAM=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index d1f903e..6dad46c 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -463,4 +463,5 @@ CONFIG_XZ_DEC_SPARC=y
CONFIG_XZ_DEC_TEST=m
CONFIG_XZ_DEC_X86=y
CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZONE_DMA=y
CONFIG_ZONE_DMA_FLAG=1
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index e7480fd..9ef2b68 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -459,4 +459,5 @@ CONFIG_XZ_DEC_SPARC=y
CONFIG_XZ_DEC_TEST=m
CONFIG_XZ_DEC_X86=y
CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZONE_DMA=y
CONFIG_ZONE_DMA_FLAG=1
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index a046b1f..e3c7139 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -510,4 +510,5 @@ CONFIG_XZ_DEC_SPARC=y
CONFIG_XZ_DEC_TEST=m
CONFIG_XZ_DEC_X86=y
CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZONE_DMA=y
CONFIG_ZONE_DMA_FLAG=1
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 702d17e..bfdef2f 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -381,4 +381,5 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
# CONFIG_XZ_DEC_TEST is not set
# CONFIG_XZ_DEC_X86 is not set
CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZONE_DMA=y
CONFIG_ZONE_DMA_FLAG=1
--
1.9.1
More information about the kernel-team
mailing list