From: Christoph Hellwig <hch@lst.de>
To: "Jérôme Glisse" <jglisse@redhat.com>,
"Jason Gunthorpe" <jgg@mellanox.com>,
"Ben Skeggs" <bskeggs@redhat.com>
Cc: Ralph Campbell <rcampbell@nvidia.com>,
Bharata B Rao <bharata@linux.ibm.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-mm@kvack.org, nouveau@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 10/10] mm: remove CONFIG_MIGRATE_VMA_HELPER
Date: Wed, 14 Aug 2019 09:59:28 +0200 [thread overview]
Message-ID: <20190814075928.23766-11-hch@lst.de> (raw)
In-Reply-To: <20190814075928.23766-1-hch@lst.de>
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.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/gpu/drm/nouveau/Kconfig | 1 -
mm/Kconfig | 3 ---
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 33e063c28c1b..993386cb5335 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -2117,7 +2117,7 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
#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 */
--
2.20.1
next prev parent reply other threads:[~2019-08-14 8:00 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-14 7:59 turn hmm migrate_vma upside down v3 Christoph Hellwig
2019-08-14 7:59 ` [PATCH 01/10] mm: turn migrate_vma upside down Christoph Hellwig
2019-08-16 17:11 ` Jason Gunthorpe
2019-08-17 11:31 ` Christoph Hellwig
2019-08-17 12:50 ` Jason Gunthorpe
2019-08-14 7:59 ` [PATCH 02/10] nouveau: reset dma_nr in nouveau_dmem_migrate_alloc_and_copy Christoph Hellwig
2019-08-14 7:59 ` [PATCH 03/10] nouveau: factor out device memory address calculation Christoph Hellwig
2019-08-14 7:59 ` [PATCH 04/10] nouveau: factor out dmem fence completion Christoph Hellwig
2019-08-14 7:59 ` [PATCH 05/10] nouveau: remove a few function stubs Christoph Hellwig
2019-08-14 7:59 ` [PATCH 06/10] nouveau: simplify nouveau_dmem_migrate_to_ram Christoph Hellwig
2019-08-14 7:59 ` [PATCH 07/10] nouveau: simplify nouveau_dmem_migrate_vma Christoph Hellwig
2019-08-14 7:59 ` [PATCH 08/10] mm: remove the unused MIGRATE_PFN_ERROR flag Christoph Hellwig
2019-08-14 7:59 ` [PATCH 09/10] mm: remove the unused MIGRATE_PFN_DEVICE flag Christoph Hellwig
2019-08-16 15:23 ` Jason Gunthorpe
2019-08-14 7:59 ` Christoph Hellwig [this message]
2019-08-16 15:21 ` [PATCH 10/10] mm: remove CONFIG_MIGRATE_VMA_HELPER Jason Gunthorpe
2019-08-15 0:09 ` turn hmm migrate_vma upside down v3 Ralph Campbell
2019-08-15 13:28 ` Christoph Hellwig
2019-08-16 6:51 ` Christoph Hellwig
2019-08-16 11:45 ` Jason Gunthorpe
2019-08-16 17:23 ` Jason Gunthorpe
2019-08-16 17:12 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190814075928.23766-11-hch@lst.de \
--to=hch@lst.de \
--cc=akpm@linux-foundation.org \
--cc=bharata@linux.ibm.com \
--cc=bskeggs@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jgg@mellanox.com \
--cc=jglisse@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=nouveau@lists.freedesktop.org \
--cc=rcampbell@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).