SHARE
TWEET

aur-catalyst-test-linux-5.1.patch

a guest May 19th, 2019 94 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. --- archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c
  2. +++ archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c
  3. @@ -212,6 +212,10 @@
  4.  #include <asm/set_memory.h>
  5.  #endif
  6.  
  7. +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0)
  8. +#include <uapi/linux/mman.h>// MAP_SHARED
  9. +#endif
  10. +
  11.  #include "firegl_public.h"
  12.  #include "kcl_osconfig.h"
  13.  #include "kcl_io.h"
  14. @@ -4262,22 +4266,28 @@ static vm_nopage_ret_t ip_vm_gart_nopage(struct vm_area_struct* vma,
  15.  
  16.  #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
  17.  
  18. -static int ip_vm_fault(struct vm_fault *vmf) {
  19. +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0)
  20. +typedef unsigned int ip_vm_ret;
  21. +#else
  22. +typedef int ip_vm_ret;
  23. +#endif
  24. +
  25. +static ip_vm_ret ip_vm_fault(struct vm_fault *vmf) {
  26.      TRACE_FAULT(do_vm_fault, vmf->vma, vmf);
  27.  }
  28. -static int ip_vm_shm_fault(struct vm_fault *vmf) {
  29. +static ip_vm_ret ip_vm_shm_fault(struct vm_fault *vmf) {
  30.      TRACE_FAULT(do_vm_shm_fault, vmf->vma, vmf);
  31.  }
  32. -static int ip_vm_dma_fault(struct vm_fault *vmf) {
  33. +static ip_vm_ret ip_vm_dma_fault(struct vm_fault *vmf) {
  34.      TRACE_FAULT(do_vm_dma_fault, vmf->vma, vmf);
  35.  }
  36. -static int ip_vm_kmap_fault(struct vm_fault *vmf) {
  37. +static ip_vm_ret ip_vm_kmap_fault(struct vm_fault *vmf) {
  38.      TRACE_FAULT(do_vm_kmap_fault, vmf->vma, vmf);
  39.  }
  40. -static int ip_vm_pcie_fault(struct vm_fault *vmf) {
  41. +static ip_vm_ret ip_vm_pcie_fault(struct vm_fault *vmf) {
  42.      TRACE_FAULT(do_vm_pcie_fault, vmf->vma, vmf);
  43.  }
  44. -static int ip_vm_gart_fault(struct vm_fault *vmf) {
  45. +static ip_vm_ret ip_vm_gart_fault(struct vm_fault *vmf) {
  46.      TRACE_FAULT(do_vm_gart_fault, vmf->vma, vmf);
  47.  }
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top