]> git.pld-linux.org Git - packages/xorg-driver-video-nvidia-legacy-390xx.git/blob - kernel-4.20.patch
7b5022ca666769f8fae4a8da23da7bfeb90cc4d7
[packages/xorg-driver-video-nvidia-legacy-390xx.git] / kernel-4.20.patch
1 --- NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia/os-interface.c~        2018-08-22 09:55:22.000000000 +0900
2 +++ NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia/os-interface.c 2019-01-02 09:55:45.271845101 +0900
3 @@ -1697,7 +1697,11 @@
4  
5  struct nv_ipmi_softc
6  {
7 +#if defined(ipmi_user_t)
8      ipmi_user_t         p_user;     // ptr to ipmi_msghandler user structure
9 +#else
10 +    struct ipmi_user    *p_user;     // ptr to ipmi_msghandler user structure
11 +#endif
12      spinlock_t          msg_lock;
13      struct list_head    msgs;
14      NvU32               seqNum;     //request sequence number
15 @@ -1706,7 +1710,11 @@
16  static inline int
17  nv_ipmi_set_my_address
18  (
19 +#if defined(ipmi_user_t)
20      ipmi_user_t     user,
21 +#else
22 +    struct ipmi_user    *user,
23 +#endif
24      unsigned char   address
25  )
26  {
27 --- NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c~     2018-08-22 09:55:29.000000000 +0900
28 +++ NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c      2019-01-02 10:00:43.465451775 +0900
29 @@ -237,6 +237,9 @@
30  
31      page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node);
32  
33 +#if !defined(vm_insert_pfn)
34 +    return vmf_insert_pfn(vma, address, pfn + page_offset);
35 +#else
36      ret = vm_insert_pfn(vma, address, pfn + page_offset);
37  
38      switch (ret) {
39 @@ -258,6 +258,7 @@
40      }
41  
42      return VM_FAULT_SIGBUS;
43 +#endif
44  }
45  
46  /*
This page took 0.039532 seconds and 2 git commands to generate.