Commit 9b2ed9cb authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jason Gunthorpe

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.deSigned-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Tested-by: default avatarRalph Campbell <rcampbell@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 06d462be
...@@ -89,7 +89,6 @@ config DRM_NOUVEAU_SVM ...@@ -89,7 +89,6 @@ config DRM_NOUVEAU_SVM
depends on MMU depends on MMU
depends on STAGING depends on STAGING
select HMM_MIRROR select HMM_MIRROR
select MIGRATE_VMA_HELPER
select MMU_NOTIFIER select MMU_NOTIFIER
default n default n
help help
......
...@@ -669,9 +669,6 @@ config ZONE_DEVICE ...@@ -669,9 +669,6 @@ config ZONE_DEVICE
If FS_DAX is enabled, then say Y. If FS_DAX is enabled, then say Y.
config MIGRATE_VMA_HELPER
bool
config DEV_PAGEMAP_OPS config DEV_PAGEMAP_OPS
bool bool
......
...@@ -2117,7 +2117,7 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm, ...@@ -2117,7 +2117,7 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
#endif /* CONFIG_NUMA */ #endif /* CONFIG_NUMA */
#if defined(CONFIG_MIGRATE_VMA_HELPER) #ifdef CONFIG_DEVICE_PRIVATE
static int migrate_vma_collect_hole(unsigned long start, static int migrate_vma_collect_hole(unsigned long start,
unsigned long end, unsigned long end,
struct mm_walk *walk) struct mm_walk *walk)
...@@ -2942,4 +2942,4 @@ void migrate_vma_finalize(struct migrate_vma *migrate) ...@@ -2942,4 +2942,4 @@ void migrate_vma_finalize(struct migrate_vma *migrate)
} }
} }
EXPORT_SYMBOL(migrate_vma_finalize); EXPORT_SYMBOL(migrate_vma_finalize);
#endif /* defined(MIGRATE_VMA_HELPER) */ #endif /* CONFIG_DEVICE_PRIVATE */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment