- fix building with kernel 5.14, rel 2
[packages/xorg-driver-video-nvidia-legacy-390xx.git] / kernel-5.14.patch
1 --- NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/os-interface.c~       2021-06-03 01:09:57.000000000 +0200
2 +++ NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/os-interface.c        2021-09-07 21:53:39.925501620 +0200
3 @@ -580,7 +580,11 @@
4          // the requested timeout has expired, loop until less
5          // than a jiffie of the desired delay remains.
6          //
7 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 14, 0))
8 +        set_current_state(TASK_INTERRUPTIBLE);
9 +#else
10          current->state = TASK_INTERRUPTIBLE;
11 +#endif
12          do
13          {
14              schedule_timeout(jiffies);
15 --- NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/nvlink_linux.c~       2021-06-03 01:10:01.000000000 +0200
16 +++ NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/nvlink_linux.c        2021-09-07 21:56:33.935565412 +0200
17 @@ -597,7 +597,11 @@
18          // the requested timeout has expired, loop until less
19          // than a jiffie of the desired delay remains.
20          //
21 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 14, 0))
22 +        set_current_state(TASK_INTERRUPTIBLE);
23 +#else
24          current->state = TASK_INTERRUPTIBLE;
25 +#endif
26          do
27          {
28              schedule_timeout(jiffies);
29 --- NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia-drm/nvidia-drm-drv.c~ 2021-06-03 01:10:01.000000000 +0200
30 +++ NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia-drm/nvidia-drm-drv.c  2021-09-07 22:06:07.148309829 +0200
31 @@ -20,6 +20,7 @@
32   * DEALINGS IN THE SOFTWARE.
33   */
34  
35 +#include "linux/version.h"
36  #include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */
37  
38  #include "nvidia-drm-priv.h"
39 @@ -811,7 +811,9 @@
40  
41      dev->dev_private = nv_dev;
42      nv_dev->dev = dev;
43 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0))
44      dev->pdev = pdev;
45 +#endif
46  
47      /* Register DRM device to DRM sub-system */
48  
This page took 0.17 seconds and 3 git commands to generate.