UBUNTU: [Config] CONFIG_ZONE_DEVICE=y for amd64

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

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

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'}>

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

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

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

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

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

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

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