]>
Commit | Line | Data |
---|---|---|
313cb220 JR |
1 | --- NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/conftest.sh~ 2021-12-13 07:06:52.000000000 +0100 |
2 | +++ NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/conftest.sh 2022-04-02 21:42:45.218675048 +0200 | |
3 | @@ -1806,6 +1806,19 @@ | |
4 | compile_check_conftest "$CODE" "NV_PDE_DATA_PRESENT" "" "functions" | |
5 | ;; | |
6 | ||
7 | + pde_data_func) | |
8 | + # | |
9 | + # Determine if the PDE_DATA() function is present. | |
10 | + # | |
11 | + CODE=" | |
12 | + #include <linux/proc_fs.h> | |
13 | + void conftest_pde_data(void) { | |
14 | + pde_data(); | |
15 | + }" | |
16 | + | |
17 | + compile_check_conftest "$CODE" "NV_PDE_DATA_FUNC_PRESENT" "" "functions" | |
18 | + ;; | |
19 | + | |
20 | get_num_physpages) | |
21 | # | |
22 | # Determine if the get_num_physpages() function is | |
23 | --- NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/common/inc/nv-procfs.h~ 2021-12-13 15:04:59.000000000 +0100 | |
24 | +++ NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/common/inc/nv-procfs.h 2022-04-02 21:44:19.777574273 +0200 | |
25 | @@ -115,8 +115,12 @@ | |
26 | #if defined(NV_PDE_DATA_PRESENT) | |
27 | # define NV_PDE_DATA(inode) PDE_DATA(inode) | |
28 | #else | |
29 | +#if defined(NV_PDE_DATA_FUNC_PRESENT) | |
30 | +# define NV_PDE_DATA(inode) pde_data(inode) | |
31 | +#else | |
32 | # define NV_PDE_DATA(inode) PDE(inode)->data | |
33 | #endif | |
34 | +#endif | |
35 | ||
36 | #if defined(NV_PROC_REMOVE_PRESENT) | |
37 | # define NV_REMOVE_PROC_ENTRY(entry) \ | |
38 | --- NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/nvidia/nvidia.Kbuild~ 2021-12-13 15:04:30.000000000 +0100 | |
39 | +++ NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/nvidia/nvidia.Kbuild 2022-04-02 21:48:22.121422416 +0200 | |
40 | @@ -133,6 +133,7 @@ | |
41 | NV_CONFTEST_FUNCTION_COMPILE_TESTS += efi_enabled | |
42 | NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_create_data | |
43 | NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data | |
44 | +NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data_func | |
45 | NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_remove | |
46 | NV_CONFTEST_FUNCTION_COMPILE_TESTS += pm_vt_switch_required | |
47 | NV_CONFTEST_FUNCTION_COMPILE_TESTS += xen_ioemu_inject_msi | |
48 | --- NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/nvidia-modeset/nvidia-modeset.Kbuild~ 2021-11-02 14:29:40.000000000 +0100 | |
49 | +++ NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/nvidia-modeset/nvidia-modeset.Kbuild 2022-04-02 21:49:08.364218278 +0200 | |
50 | @@ -90,6 +90,7 @@ | |
51 | NV_CONFTEST_TYPE_COMPILE_TESTS += proc_dir_entry | |
52 | NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_create_data | |
53 | NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data | |
54 | +NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data_func | |
55 | NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_remove | |
56 | NV_CONFTEST_FUNCTION_COMPILE_TESTS += timer_setup | |
57 | NV_CONFTEST_FUNCTION_COMPILE_TESTS += do_gettimeofday |