66 lines
2.6 KiB
Diff
66 lines
2.6 KiB
Diff
diff --git a/kernel/conftest.sh b/kernel/conftest.sh
|
|
index fcfa9d5..def089e 100755
|
|
--- a/kernel/conftest.sh
|
|
+++ b/kernel/conftest.sh
|
|
@@ -5181,20 +5181,22 @@ compile_test() {
|
|
compile_check_conftest "$CODE" "NV_PCI_CLASS_MULTIMEDIA_HD_AUDIO_PRESENT" "" "generic"
|
|
;;
|
|
|
|
- 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 --git a/kernel/nvidia/nvidia.Kbuild b/kernel/nvidia/nvidia.Kbuild
|
|
index 5248673..789e0e4 100644
|
|
--- a/kernel/nvidia/nvidia.Kbuild
|
|
+++ b/kernel/nvidia/nvidia.Kbuild
|
|
@@ -161,7 +161,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += pci_enable_atomic_ops_to_root
|
|
NV_CONFTEST_FUNCTION_COMPILE_TESTS += vga_tryget
|
|
NV_CONFTEST_FUNCTION_COMPILE_TESTS += cc_platform_has
|
|
NV_CONFTEST_FUNCTION_COMPILE_TESTS += seq_read_iter
|
|
-NV_CONFTEST_FUNCTION_COMPILE_TESTS += unsafe_follow_pfn
|
|
+NV_CONFTEST_FUNCTION_COMPILE_TESTS += follow_pfn
|
|
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_get
|
|
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_put_unlocked
|
|
NV_CONFTEST_FUNCTION_COMPILE_TESTS += add_memory_driver_managed
|
|
diff --git a/kernel/nvidia/os-mlock.c b/kernel/nvidia/os-mlock.c
|
|
index b4eabb8..300c3af 100644
|
|
--- a/kernel/nvidia/os-mlock.c
|
|
+++ b/kernel/nvidia/os-mlock.c
|
|
@@ -36,10 +36,10 @@ static inline int nv_follow_pfn(struct vm_area_struct *vma,
|
|
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
|
|
}
|
|
|