summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Gunthorpe <jgg@nvidia.com>2023-01-24 16:34:25 -0400
committerAndrew Morton <akpm@linux-foundation.org>2023-02-09 16:51:44 -0800
commit7ce154fe6917e7db94d63bc4d6c73b678ad1c581 (patch)
treed3ff29d566f48645cf2b654dfce96e9297464e6a
parentafa3c33e2684c2eec4f47d83d2859b76f3568be6 (diff)
mm/gup: move try_grab_page() to mm/internal.h
This is part of the internal function of gup.c and is only non-static so that the parts of gup.c in the huge_memory.c and hugetlb.c can call it. Put it in internal.h beside the similarly purposed try_grab_folio() Link: https://lkml.kernel.org/r/4-v2-987e91b59705+36b-gup_tidy_jgg@nvidia.com Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> Reviewed-by: John Hubbard <jhubbard@nvidia.com> Cc: Alistair Popple <apopple@nvidia.com> Cc: Christoph Hellwig <hch@infradead.org> Cc: Claudio Imbrenda <imbrenda@linux.ibm.com> Cc: David Hildenbrand <david@redhat.com> Cc: David Howells <dhowells@redhat.com> Cc: Mike Rapoport (IBM) <rppt@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--include/linux/mm.h2
-rw-r--r--mm/internal.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 0ed0cb2401f5..afefc166b349 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1268,8 +1268,6 @@ static inline void get_page(struct page *page)
folio_get(page_folio(page));
}
-int __must_check try_grab_page(struct page *page, unsigned int flags);
-
static inline __must_check bool try_get_page(struct page *page)
{
page = compound_head(page);
diff --git a/mm/internal.h b/mm/internal.h
index 90bb2078444c..3f75763b0fc2 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -856,6 +856,7 @@ int migrate_device_coherent_page(struct page *page);
* mm/gup.c
*/
struct folio *try_grab_folio(struct page *page, int refs, unsigned int flags);
+int __must_check try_grab_page(struct page *page, unsigned int flags);
extern bool mirrored_kernelcore;