| Message ID | 20190701062020.19239-23-hch@lst.de |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [01/22] mm/hmm.c: suppress compilation warnings when CONFIG_HUGETLB_PAGE is not set | expand |
On Mon, Jul 01, 2019 at 08:20:20AM +0200, Christoph Hellwig wrote: > Switch the one remaining user in nouveau over to its replacement, > and remove all the wrappers. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- > include/linux/hmm.h | 36 -------------------------- > 2 files changed, 1 insertion(+), 37 deletions(-) Christoph, I guess you didn't mean to send this branch to the mailing list? In any event some of these, like this one, look obvious and I could still grab a few for hmm.git. Let me know what you'd like please Reviewed-by: Jason Gunthorpe <jgg@mellanox.com> Thanks, Jason
On Wed, Jul 03, 2019 at 03:01:25PM -0300, Jason Gunthorpe wrote: > Christoph, I guess you didn't mean to send this branch to the mailing > list? > > In any event some of these, like this one, look obvious and I could > still grab a few for hmm.git. > > Let me know what you'd like please > > Reviewed-by: Jason Gunthorpe <jgg@mellanox.com> Thanks. I was going to send this series out as soon as you had applied the previous one. Now that it leaked I'm happy to collect reviews. But while I've got your attention: the rdma.git hmm branch is still at the -rc7 merge and doen't have my series, is that intentional?
On Wed, Jul 03, 2019 at 08:03:08PM +0200, Christoph Hellwig wrote: > On Wed, Jul 03, 2019 at 03:01:25PM -0300, Jason Gunthorpe wrote: > > Christoph, I guess you didn't mean to send this branch to the mailing > > list? > > > > In any event some of these, like this one, look obvious and I could > > still grab a few for hmm.git. > > > > Let me know what you'd like please > > > > Reviewed-by: Jason Gunthorpe <jgg@mellanox.com> > > Thanks. I was going to send this series out as soon as you had > applied the previous one. Now that it leaked I'm happy to collect > reviews. But while I've got your attention: the rdma.git hmm > branch is still at the -rc7 merge and doen't have my series, is that > intentional? Sorry, I rushed it too late at night to do it right apparently. Fixed. Jason
diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c index 40c47d6a7d78..534069ffe20a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -853,7 +853,7 @@ nouveau_dmem_convert_pfn(struct nouveau_drm *drm, struct page *page; uint64_t addr; - page = hmm_pfn_to_page(range, range->pfns[i]); + page = hmm_device_entry_to_page(range, range->pfns[i]); if (page == NULL) continue; diff --git a/include/linux/hmm.h b/include/linux/hmm.h index 3457cf9182e5..9799fde71f2e 100644 --- a/include/linux/hmm.h +++ b/include/linux/hmm.h @@ -290,42 +290,6 @@ static inline uint64_t hmm_device_entry_from_pfn(const struct hmm_range *range, range->flags[HMM_PFN_VALID]; } -/* - * Old API: - * hmm_pfn_to_page() - * hmm_pfn_to_pfn() - * hmm_pfn_from_page() - * hmm_pfn_from_pfn() - * - * This are the OLD API please use new API, it is here to avoid cross-tree - * merge painfullness ie we convert things to new API in stages. - */ -static inline struct page *hmm_pfn_to_page(const struct hmm_range *range, - uint64_t pfn) -{ - return hmm_device_entry_to_page(range, pfn); -} - -static inline unsigned long hmm_pfn_to_pfn(const struct hmm_range *range, - uint64_t pfn) -{ - return hmm_device_entry_to_pfn(range, pfn); -} - -static inline uint64_t hmm_pfn_from_page(const struct hmm_range *range, - struct page *page) -{ - return hmm_device_entry_from_page(range, page); -} - -static inline uint64_t hmm_pfn_from_pfn(const struct hmm_range *range, - unsigned long pfn) -{ - return hmm_device_entry_from_pfn(range, pfn); -} - - - #if IS_ENABLED(CONFIG_HMM_MIRROR) /* * Mirroring: how to synchronize device page table with CPU page table.
Switch the one remaining user in nouveau over to its replacement, and remove all the wrappers. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- include/linux/hmm.h | 36 -------------------------- 2 files changed, 1 insertion(+), 37 deletions(-)