git: d42136e36162 - main - LinuxKPI: Remove vmas argument from get_user_pages on KBI layer

The branch main has been updated by wulf:

URL: https://cgit.FreeBSD.org/src/commit/?id=d42136e36162d60ea543ae346f32edd321de3f6e

commit d42136e36162d60ea543ae346f32edd321de3f6e
Author:     Vladimir Kondratyev <wulf@FreeBSD.org>
AuthorDate: 2024-07-21 13:10:14 +0000
Commit:     Vladimir Kondratyev <wulf@FreeBSD.org>
CommitDate: 2024-07-21 13:10:14 +0000

    LinuxKPI: Remove vmas argument from get_user_pages on KBI layer
    
    To chase Linux kernel 6.5
    
    Sponsored by:   Serenity Cyber Security, LLC
    Reviewed by:    manu
    Differential Revision:  https://reviews.freebsd.org/D45850
---
 sys/compat/linuxkpi/common/include/linux/mm.h | 10 ++++++----
 sys/compat/linuxkpi/common/src/linux_page.c   |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h
index 56c849b02c32..b4c8bf3c1c30 100644
--- a/sys/compat/linuxkpi/common/include/linux/mm.h
+++ b/sys/compat/linuxkpi/common/include/linux/mm.h
@@ -276,12 +276,14 @@ get_page(struct page *page)
 }
 
 extern long
-get_user_pages(unsigned long start, unsigned long nr_pages,
-    unsigned int gup_flags, struct page **,
-    struct vm_area_struct **);
+lkpi_get_user_pages(unsigned long start, unsigned long nr_pages,
+    unsigned int gup_flags, struct page **);
 #if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 60500
 #define	get_user_pages(start, nr_pages, gup_flags, pages)	\
-	get_user_pages(start, nr_pages, gup_flags, pages, NULL)
+	lkpi_get_user_pages(start, nr_pages, gup_flags, pages)
+#else
+#define	get_user_pages(start, nr_pages, gup_flags, pages, vmas)	\
+	lkpi_get_user_pages(start, nr_pages, gup_flags, pages)
 #endif
 
 #if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 60500
diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c
index 8b78a3739f25..d4f8e75a3251 100644
--- a/sys/compat/linuxkpi/common/src/linux_page.c
+++ b/sys/compat/linuxkpi/common/src/linux_page.c
@@ -277,8 +277,8 @@ get_user_pages_remote(struct task_struct *task, struct mm_struct *mm,
 }
 
 long
-get_user_pages(unsigned long start, unsigned long nr_pages,
-    unsigned int gup_flags, struct page **pages, struct vm_area_struct **vmas)
+lkpi_get_user_pages(unsigned long start, unsigned long nr_pages,
+    unsigned int gup_flags, struct page **pages)
 {
 	vm_map_t map;