diff options
| author | vnctdj | 2023-09-14 23:48:35 +0200 |
|---|---|---|
| committer | vnctdj | 2023-09-14 23:48:35 +0200 |
| commit | e0776a42c9ad5c43416d21abf89abc53058d0ef1 (patch) | |
| tree | 552c05710104da0646cab2a7d62b5abb7ba9503b /kernel-6.5.patch | |
| parent | 5f7afa888aa048c9a7ccbcc50dc038c20a782172 (diff) | |
| download | aur-e0776a42c9ad5c43416d21abf89abc53058d0ef1.tar.gz | |
Add edited kernel-6.5.patch from Joan Bruguera via Witscher
Diffstat (limited to 'kernel-6.5.patch')
| -rw-r--r-- | kernel-6.5.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/kernel-6.5.patch b/kernel-6.5.patch new file mode 100644 index 000000000000..f0e4561ee8ca --- /dev/null +++ b/kernel-6.5.patch @@ -0,0 +1,70 @@ +diff --git a/kernel/common/inc/nv-mm.h b/kernel/common/inc/nv-mm.h +index aec55b0..acd396d 100644 +--- a/kernel/common/inc/nv-mm.h ++++ b/kernel/common/inc/nv-mm.h +@@ -23,6 +23,7 @@ + #ifndef __NV_MM_H__ + #define __NV_MM_H__ + ++#include <linux/version.h> + #include "conftest.h" + + #if !defined(NV_VM_FAULT_T_IS_PRESENT) +@@ -47,7 +48,27 @@ typedef int vm_fault_t; + * + */ + +-#if defined(NV_GET_USER_PAGES_HAS_TASK_STRUCT) ++// Rel. commit. "mm/gup: remove unused vmas parameter from get_user_pages()" (Lorenzo Stoakes, 14 May 2023) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0) ++#include <linux/mm.h> ++ ++static inline long NV_GET_USER_PAGES(unsigned long start, ++ unsigned long nr_pages, ++ int write, ++ int force, ++ struct page **pages, ++ struct vm_area_struct **vmas) ++{ ++ unsigned int flags = 0; ++ ++ if (write) ++ flags |= FOLL_WRITE; ++ if (force) ++ flags |= FOLL_FORCE; ++ ++ return get_user_pages(start, nr_pages, flags, pages); ++} ++#elif defined(NV_GET_USER_PAGES_HAS_TASK_STRUCT) + #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS) + #define NV_GET_USER_PAGES(start, nr_pages, write, force, pages, vmas) \ + get_user_pages(current, current->mm, start, nr_pages, write, force, pages, vmas) +@@ -130,7 +151,27 @@ typedef int vm_fault_t; + * + */ + +-#if defined(NV_GET_USER_PAGES_REMOTE_PRESENT) ++// Rel. commit. "mm/gup: remove unused vmas parameter from get_user_pages_remote()" (Lorenzo Stoakes, 14 May 2023) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0) ++static inline long NV_GET_USER_PAGES_REMOTE(struct task_struct *tsk, ++ struct mm_struct *mm, ++ unsigned long start, ++ unsigned long nr_pages, ++ int write, ++ int force, ++ struct page **pages, ++ struct vm_area_struct **vmas) ++{ ++ unsigned int flags = 0; ++ ++ if (write) ++ flags |= FOLL_WRITE; ++ if (force) ++ flags |= FOLL_FORCE; ++ ++ return get_user_pages_remote(mm, start, nr_pages, flags, pages, NULL); ++} ++#elif defined(NV_GET_USER_PAGES_REMOTE_PRESENT) + #if defined(NV_GET_USER_PAGES_REMOTE_HAS_WRITE_AND_FORCE_ARGS) + #define NV_GET_USER_PAGES_REMOTE get_user_pages_remote + #else |