Page MenuHomeFreeBSD
Files F98651297

D45850.diff
No OneTemporary
Actions

D45850.diff
View Options

diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h
--- a/sys/compat/linuxkpi/common/include/linux/mm.h
+++ b/sys/compat/linuxkpi/common/include/linux/mm.h
@@ -276,12 +276,14 @@
}
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
--- a/sys/compat/linuxkpi/common/src/linux_page.c
+++ b/sys/compat/linuxkpi/common/src/linux_page.c
@@ -277,8 +277,8 @@
}
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;

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 5, 5:31 AM (22 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13586764
Default Alt Text
D45850.diff (1 KB)

Event Timeline