summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-06-26 14:27:22 +0200
committerJason Gunthorpe <jgg@mellanox.com>2019-07-02 14:32:45 -0300
commit7328d9cc1b9fdc52105901072e9a4a1234e29b11 (patch)
tree6f59165486746f506f4c5d18954eddd3361289df /mm
parent8a164fef9c4ccf6ff7757170397222860e40d192 (diff)
downloadlinux-stable-7328d9cc1b9fdc52105901072e9a4a1234e29b11.tar.gz
linux-stable-7328d9cc1b9fdc52105901072e9a4a1234e29b11.tar.bz2
linux-stable-7328d9cc1b9fdc52105901072e9a4a1234e29b11.zip
mm: sort out the DEVICE_PRIVATE Kconfig mess
The ZONE_DEVICE support doesn't depend on anything HMM related, just on various bits of arch support as indicated by the architecture. Also don't select the option from nouveau as it isn't present in many setups, and depend on it instead. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'mm')
-rw-r--r--mm/Kconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/Kconfig b/mm/Kconfig
index 6f35b85b3052..eecf037a54b3 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -677,13 +677,13 @@ config ARCH_HAS_HMM_MIRROR
config ARCH_HAS_HMM
bool
- default y
depends on (X86_64 || PPC64)
depends on ZONE_DEVICE
depends on MMU && 64BIT
depends on MEMORY_HOTPLUG
depends on MEMORY_HOTREMOVE
depends on SPARSEMEM_VMEMMAP
+ default y
config MIGRATE_VMA_HELPER
bool
@@ -709,8 +709,7 @@ config HMM_MIRROR
config DEVICE_PRIVATE
bool "Unaddressable device memory (GPU memory, ...)"
- depends on ARCH_HAS_HMM
- select HMM
+ depends on ZONE_DEVICE
select DEV_PAGEMAP_OPS
help