diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-08-14 09:59:28 +0200 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-08-20 09:35:03 -0300 |
| commit | 9b2ed9cb975c63f5534daaebeb225ab52b589372 (patch) | |
| tree | caa82e286680cb3c071aed55bd168dcfb28dcaaa | |
| parent | 06d462beb470d361ffa8bd7b3d865509a8606987 (diff) | |
| download | linux-9b2ed9cb975c63f5534daaebeb225ab52b589372.tar.gz linux-9b2ed9cb975c63f5534daaebeb225ab52b589372.tar.bz2 linux-9b2ed9cb975c63f5534daaebeb225ab52b589372.zip | |
mm: remove CONFIG_MIGRATE_VMA_HELPER
CONFIG_MIGRATE_VMA_HELPER guards helpers that are required for proper
devic private memory support. Remove the option and just check for
CONFIG_DEVICE_PRIVATE instead.
Link: https://lore.kernel.org/r/20190814075928.23766-11-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Tested-by: Ralph Campbell <rcampbell@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/Kconfig | 1 | ||||
| -rw-r--r-- | mm/Kconfig | 3 | ||||
| -rw-r--r-- | mm/migrate.c | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index df4352c279ba..3558df043592 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig @@ -89,7 +89,6 @@ config DRM_NOUVEAU_SVM depends on MMU depends on STAGING select HMM_MIRROR - select MIGRATE_VMA_HELPER select MMU_NOTIFIER default n help diff --git a/mm/Kconfig b/mm/Kconfig index 563436dc1f24..2fe4902ad755 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -669,9 +669,6 @@ config ZONE_DEVICE If FS_DAX is enabled, then say Y. -config MIGRATE_VMA_HELPER - bool - config DEV_PAGEMAP_OPS bool diff --git a/mm/migrate.c b/mm/migrate.c index f4f5ae5ae44f..2cff57e7116e 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -2117,7 +2117,7 @@ out_unlock: #endif /* CONFIG_NUMA */ -#if defined(CONFIG_MIGRATE_VMA_HELPER) +#ifdef CONFIG_DEVICE_PRIVATE static int migrate_vma_collect_hole(unsigned long start, unsigned long end, struct mm_walk *walk) @@ -2942,4 +2942,4 @@ void migrate_vma_finalize(struct migrate_vma *migrate) } } EXPORT_SYMBOL(migrate_vma_finalize); -#endif /* defined(MIGRATE_VMA_HELPER) */ +#endif /* CONFIG_DEVICE_PRIVATE */ |