[linux] 06/07: [amd64] mm,nvdimm: Disable ZONE_DMA; enable ZONE_DEVICE, NVDIMM_PFN

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 580997dd4a36e0fd52954c4a5d29a52283ab92e5
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Feb 10 01:37:32 2016 +0000

    [amd64] mm,nvdimm: Disable ZONE_DMA; enable ZONE_DEVICE, NVDIMM_PFN
---
 debian/changelog                            | 2 ++
 debian/config/kernelarch-x86/config-arch-64 | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2f33e2a..4c7ca9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,6 +79,8 @@ linux (4.4.1-1~exp1) UNRELEASED; urgency=medium
     disable THERMAL_OF
   * [x86] Enable INTEL_PMC_IPC as module
   * vfs,nvdimm: Really enable FS_DAX
+  * [amd64] mm,nvdimm: Disable ZONE_DMA; enable ZONE_DEVICE, NVDIMM_PFN
+    - This disables drivers for some AC'97 sound cards
 
  -- Ian Campbell <ijc at debian.org>  Sat, 23 Jan 2016 08:23:05 +0000
 
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index ec28905..18c0a9f 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/debian/config/kernelarch-x86/config-arch-64
@@ -2,6 +2,7 @@
 ## file: arch/x86/Kconfig
 ##
 CONFIG_64BIT=y
+# CONFIG_ZONE_DMA is not set
 CONFIG_SMP=y
 CONFIG_X86_X2APIC=y
 CONFIG_CALGARY_IOMMU=y
@@ -141,6 +142,11 @@ CONFIG_FUJITSU_ES=m
 # CONFIG_IPW2100 is not set
 
 ##
+## file: drivers/nvdimm/Kconfig
+##
+CONFIG_NVDIMM_PFN=y
+
+##
 ## file: drivers/scsi/Kconfig
 ##
 CONFIG_SCSI_INIA100=m
@@ -183,6 +189,7 @@ CONFIG_SPARSEMEM_MANUAL=y
 ## end choice
 CONFIG_SPARSEMEM_VMEMMAP=y
 # CONFIG_MOVABLE_NODE is not set
+CONFIG_ZONE_DEVICE=y
 
 ##
 ## file: security/Kconfig

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git