50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
diff -Naur kernel.org/conftest.sh kernel/conftest.sh
|
|
--- kernel.org/conftest.sh 2024-05-02 22:25:33.000000000 +0800
|
|
+++ kernel/conftest.sh 2024-07-26 21:24:43.434506976 +0800
|
|
@@ -4683,20 +4689,22 @@
|
|
compile_check_conftest "$CODE" "NV_SG_PAGE_ITER_PAGE_PRESENT" "" "functions"
|
|
;;
|
|
|
|
- unsafe_follow_pfn)
|
|
+ follow_pfn)
|
|
#
|
|
- # Determine if unsafe_follow_pfn() is present.
|
|
+ # Determine if follow_pfn() is present.
|
|
#
|
|
- # unsafe_follow_pfn() was added by commit 69bacee7f9ad
|
|
- # ("mm: Add unsafe_follow_pfn") in v5.13-rc1.
|
|
+ # follow_pfn() was added by commit 3b6748e2dd69
|
|
+ # ("mm: introduce follow_pfn()") in v2.6.31-rc1, and removed
|
|
+ # by commit 233eb0bf3b94 ("mm: remove follow_pfn")
|
|
+ # from linux-next 233eb0bf3b94.
|
|
#
|
|
CODE="
|
|
#include <linux/mm.h>
|
|
- void conftest_unsafe_follow_pfn(void) {
|
|
- unsafe_follow_pfn();
|
|
+ void conftest_follow_pfn(void) {
|
|
+ follow_pfn();
|
|
}"
|
|
|
|
- compile_check_conftest "$CODE" "NV_UNSAFE_FOLLOW_PFN_PRESENT" "" "functions"
|
|
+ compile_check_conftest "$CODE" "NV_FOLLOW_PFN_PRESENT" "" "functions"
|
|
;;
|
|
|
|
drm_plane_atomic_check_has_atomic_state_arg)
|
|
diff -Naur kernel.org/nvidia/os-mlock.c kernel/nvidia/os-mlock.c
|
|
--- kernel.org/nvidia/os-mlock.c 2024-05-02 23:16:35.000000000 +0800
|
|
+++ kernel/nvidia/os-mlock.c 2024-07-26 21:24:43.511506979 +0800
|
|
@@ -17,10 +17,10 @@
|
|
unsigned long address,
|
|
unsigned long *pfn)
|
|
{
|
|
-#if defined(NV_UNSAFE_FOLLOW_PFN_PRESENT)
|
|
- return unsafe_follow_pfn(vma, address, pfn);
|
|
-#else
|
|
+#if defined(NV_FOLLOW_PFN_PRESENT)
|
|
return follow_pfn(vma, address, pfn);
|
|
+#else
|
|
+ return -1;
|
|
#endif
|
|
}
|