UBUNTU: [Config] CONFIG_ZONE_DMA=y

BugLink: http://bugs.launchpad.net/bugs/1534647Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

debian.master/config/amd64/config.common.amd64

@@ -260,6 +260,7 @@ CONFIG_NODES_SHIFT=6
 CONFIG_NODES_SPAN_OTHER_NODES=y
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=256
+CONFIG_NR_ZONES_EXTENDED=y
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA=y
@@ -392,6 +393,7 @@ CONFIG_SGI_PARTITION=y
 CONFIG_SLIP=m
 CONFIG_SND=m
 CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_EMU10K1_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 CONFIG_SND_PCM=m
 # CONFIG_SND_SBAWE_SEQ is not set
@@ -463,3 +465,4 @@ CONFIG_XZ_DEC_SPARC=y
 CONFIG_XZ_DEC_TEST=m
 CONFIG_XZ_DEC_X86=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZONE_DMA_FLAG=1

debian.master/config/amd64/config.flavour.generic

@@ -7,6 +7,3 @@ CONFIG_HZ_250=y
 # CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_SND_EMU10K1_SEQ is not set
-# CONFIG_ZONE_DMA is not set
-CONFIG_ZONE_DMA_FLAG=0

debian.master/config/amd64/config.flavour.lowlatency

@@ -7,6 +7,3 @@ CONFIG_HZ_1000=y
 CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
 CONFIG_PREEMPT=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_ZONE_DMA=y
-CONFIG_ZONE_DMA_FLAG=1

debian.master/config/arm64/config.common.arm64

@@ -459,5 +459,4 @@ 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

debian.master/config/armhf/config.common.armhf

@@ -251,6 +251,7 @@ CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=4
+# CONFIG_NR_ZONES_EXTENDED is not set
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NVRAM=m
@@ -448,4 +449,3 @@ CONFIG_XZ_DEC_SPARC=y
 CONFIG_XZ_DEC_TEST=m
 CONFIG_XZ_DEC_X86=y
 CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZONE_DMA=y

debian.master/config/config.common.ubuntu

@@ -9035,6 +9035,7 @@ CONFIG_ZFCP=m
 CONFIG_ZISOFS=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DEVICE=y
+CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA32=y
 CONFIG_ZPOOL=y
 CONFIG_ZRAM=m

debian.master/config/i386/config.common.i386

@@ -256,6 +256,7 @@ CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=8
+# CONFIG_NR_ZONES_EXTENDED is not set
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NVRAM=m
@@ -460,5 +461,4 @@ 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

debian.master/config/powerpc/config.common.powerpc

@@ -250,6 +250,7 @@ CONFIG_NFC=m
 CONFIG_NODES_SHIFT=8
 CONFIG_NODES_SPAN_OTHER_NODES=y
 CONFIG_NOZOMI=m
+# CONFIG_NR_ZONES_EXTENDED is not set
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NVRAM=y
@@ -456,5 +457,4 @@ 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

debian.master/config/ppc64el/config.common.ppc64el

@@ -507,5 +507,4 @@ 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

debian.master/config/s390x/config.common.s390x

@@ -378,5 +378,4 @@ 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