NoPaste

fglrx-8.6-2.6.26.patch

von Anonymous

SNIPPET_TEXT:
  1. diff -aur build_mod.old/firegl_public.c build_mod/firegl_public.c
  2. --- build_mod.old/firegl_public.c       2008-07-16 13:45:19.000000000 +0200
  3. +++ build_mod/firegl_public.c   2008-07-16 13:51:40.000000000 +0200
  4. @@ -3274,10 +3274,6 @@
  5.  
  6.  /*****************************************************************************/
  7.  
  8. -#ifndef NOPAGE_SIGBUS
  9. -#define NOPAGE_SIGBUS 0
  10. -#endif /* !NOPAGE_SIGBUS */
  11. -
  12.  typedef struct page mem_map_t;
  13.  typedef mem_map_t *vm_nopage_ret_t;
  14.  
  15. @@ -3310,7 +3306,7 @@
  16.                         return page;
  17.                 }
  18.         }
  19. -       return NOPAGE_SIGBUS;           /* Disallow mremap */
  20. +       return VM_FAULT_SIGBUS;         /* Disallow mremap */
  21.  }
  22.  
  23.  #endif /* __ia64__ */
  24. @@ -3351,7 +3347,7 @@
  25.              (unsigned long)__ke_vm_offset(vma));
  26.  
  27.      if (address > vma->vm_end)
  28. -        return NOPAGE_SIGBUS; /* address is out of range */
  29. +        return VM_FAULT_SIGBUS; /* address is out of range */
  30.  
  31.      /*  Calculate offset into VMA */
  32.      vma_offset = address - vma->vm_start;
  33. @@ -3363,7 +3359,7 @@
  34.      pte_linear = firegl_get_addr_from_vm(vma);
  35.      if (!pte_linear)
  36.      {
  37. -        return NOPAGE_SIGBUS; /* bad address */
  38. +        return VM_FAULT_SIGBUS; /* bad address */
  39.      }
  40.      pte_linear += vma_offset;
  41.  
  42. @@ -3417,7 +3413,7 @@
  43.      kaddr = firegl_get_addr_from_vm(vma);
  44.      if (!kaddr)
  45.      {
  46. -        return NOPAGE_SIGBUS; /* bad address */
  47. +        return VM_FAULT_SIGBUS; /* bad address */
  48.      }
  49.      kaddr += (address - vma->vm_start);
  50.  
  51. @@ -3457,7 +3453,7 @@
  52.      kaddr = firegl_get_addr_from_vm(vma);
  53.      if (!kaddr)
  54.      {
  55. -        return NOPAGE_SIGBUS; /* bad address */
  56. +        return VM_FAULT_SIGBUS; /* bad address */
  57.      }
  58.      kaddr += (address - vma->vm_start);
  59.  
  60. @@ -3492,26 +3488,26 @@
  61.      if (dev == NULL)
  62.      {
  63.          __KE_ERROR("dev is NULL\n");
  64. -        return NOPAGE_SIGBUS;
  65. +        return VM_FAULT_SIGBUS;
  66.      }
  67.  
  68.      if (address > vma->vm_end)
  69.      {
  70.          __KE_ERROR("address out of range\n");
  71. -        return NOPAGE_SIGBUS; /* address is out of range */
  72. +        return VM_FAULT_SIGBUS; /* address is out of range */
  73.      }
  74.      pciemem = firegl_get_pciemem_from_addr ( vma, address);
  75.      if (pciemem == NULL)
  76.      {
  77.          __KE_ERROR("No pciemem found! \n");
  78. -        return NOPAGE_SIGBUS;
  79. +        return VM_FAULT_SIGBUS;
  80.      }    
  81.      pagelist = firegl_get_pagelist_from_vm(vma);
  82.  
  83.      if (pagelist == NULL)
  84.      {
  85.          __KE_ERROR("No pagelist! \n");
  86. -        return NOPAGE_SIGBUS;
  87. +        return VM_FAULT_SIGBUS;
  88.      }
  89.      
  90.      /** Find offset in  vma */
  91. @@ -3525,7 +3521,7 @@
  92.      if (page_address(pMmPage) == 0x0)
  93.      {
  94.          __KE_ERROR("Invalid page address\n");
  95. -        return NOPAGE_SIGBUS;
  96. +        return VM_FAULT_SIGBUS;
  97.      }
  98.      return pMmPage;
  99.  }
  100. @@ -3541,7 +3537,7 @@
  101.      if (address > vma->vm_end)
  102.      {
  103.          __KE_ERROR("Invalid virtual address\n");
  104. -        return NOPAGE_SIGBUS;   /* Disallow mremap */
  105. +        return VM_FAULT_SIGBUS;   /* Disallow mremap */
  106.      }          
  107.  
  108.      offset      = address - vma->vm_start;
  109. @@ -3553,7 +3549,7 @@
  110.      if( !page_addr)
  111.      {
  112.          __KE_ERROR("Invalid page address\n");
  113. -        return NOPAGE_SIGBUS;   /* Disallow mremap */
  114. +        return VM_FAULT_SIGBUS;   /* Disallow mremap */
  115.      }
  116.      page        = virt_to_page(page_addr);
  117.      get_page(page);
  118. @@ -3830,7 +3826,7 @@
  119.  
  120.  static struct vm_operations_struct vm_ops =
  121.  {
  122. -    nopage:  vm_nopage,
  123. +    fault:  vm_nopage,
  124.      open:    ip_drm_vm_open,
  125.      close:   ip_drm_vm_close,
  126.  };
  127. @@ -3839,7 +3835,7 @@
  128.  #ifdef __ia64__
  129.  static struct vm_operations_struct vm_cant_ops =
  130.  {
  131. -    nopage:  vm_cant_nopage,
  132. +    fault:  vm_cant_nopage,
  133.      open:    ip_drm_vm_open,
  134.      close:   ip_drm_vm_close,
  135.  };
  136. @@ -3848,42 +3844,42 @@
  137.  
  138.  static struct vm_operations_struct vm_shm_ops =
  139.  {
  140. -    nopage:  vm_shm_nopage,
  141. +    fault:  vm_shm_nopage,
  142.      open:    ip_drm_vm_open,
  143.      close:   ip_drm_vm_close,
  144.  };
  145.  
  146.  static struct vm_operations_struct vm_pci_bq_ops =
  147.  {
  148. -    nopage:  vm_dma_nopage,
  149. +    fault:  vm_dma_nopage,
  150.      open:    ip_drm_vm_open,
  151.      close:   ip_drm_vm_close,
  152.  };
  153.  
  154.  static struct vm_operations_struct vm_ctx_ops =
  155.  {
  156. -    nopage:  vm_dma_nopage,
  157. +    fault:  vm_dma_nopage,
  158.      open:    ip_drm_vm_open,
  159.      close:   ip_drm_vm_close,
  160.  };
  161.  
  162.  static struct vm_operations_struct vm_pcie_ops =
  163.  {
  164. -    nopage:  vm_pcie_nopage,
  165. +    fault:  vm_pcie_nopage,
  166.      open:    ip_drm_vm_open,
  167.      close:   ip_drm_vm_close,
  168.  };
  169.  
  170.  static struct vm_operations_struct vm_kmap_ops =
  171.  {
  172. -    nopage:  vm_kmap_nopage,
  173. +    fault:  vm_kmap_nopage,
  174.      open:    ip_drm_vm_open,
  175.      close:   ip_drm_vm_close,
  176.  };
  177.  
  178.  static struct vm_operations_struct vm_gart_ops =
  179.  {
  180. -    nopage:  vm_gart_nopage,
  181. +    fault:  vm_gart_nopage,
  182.      open:    ip_drm_vm_open,
  183.      close:   ip_drm_vm_close,
  184.  };
  185. @@ -3892,14 +3888,14 @@
  186.  #ifndef __ia64__
  187.  static struct vm_operations_struct vm_agp_bq_ops =
  188.  {
  189. -    nopage:  vm_nopage,
  190. +    fault:  vm_nopage,
  191.      open:    ip_drm_vm_open,
  192.      close:   ip_drm_vm_close,
  193.  };
  194.  #else         
  195.  static struct vm_operations_struct vm_cant_agp_bq_ops =
  196.  {
  197. -    nopage:  vm_cant_nopage,
  198. +    fault:  vm_cant_nopage,
  199.      open:    ip_drm_vm_open,
  200.      close:   ip_drm_vm_close,
  201.  };
  202. diff -aur build_mod.old/firegl_public.h build_mod/firegl_public.h
  203. --- build_mod.old/firegl_public.h       2008-07-16 13:45:19.000000000 +0200
  204. +++ build_mod/firegl_public.h   2008-07-16 13:48:03.000000000 +0200
  205. @@ -78,7 +78,7 @@
  206.      if (!pgd_present(*(pgd_p)))        \
  207.      { \
  208.          __KE_ERROR("FATAL ERROR: User queue buffer not present! (pgd)\n"); \
  209. -        return (unsigned long)NOPAGE_SIGBUS;   /* Something bad happened; generate SIGBUS */ \
  210. +        return VM_FAULT_SIGBUS;   /* Something bad happened; generate SIGBUS */ \
  211.          /* alternatively we could generate a NOPAGE_OOM "out of memory" */ \
  212.      } \
  213.  } while(0)
  214. @@ -91,7 +91,7 @@
  215.      if (!pud_present(*(pud_p)))        \
  216.      { \
  217.          __KE_ERROR("FATAL ERROR: User queue buffer not present! (pud)\n"); \
  218. -        return (unsigned long)NOPAGE_SIGBUS;   /* Something bad happened; generate SIGBUS */ \
  219. +        return VM_FAULT_SIGBUS;   /* Something bad happened; generate SIGBUS */ \
  220.          /* alternatively we could generate a NOPAGE_OOM "out of memory" */ \
  221.      } \
  222.      pmd_p = pmd_offset(pud_p, pte_linear); \
  223. @@ -111,7 +111,7 @@
  224.      if (!pmd_present(*(pmd_p)))        \
  225.      { \
  226.          __KE_ERROR("FATAL ERROR: User queue buffer not present! (pmd)\n"); \
  227. -        return (unsigned long)NOPAGE_SIGBUS;   /* Something bad happened; generate SIGBUS */ \
  228. +        return VM_FAULT_SIGBUS;   /* Something bad happened; generate SIGBUS */ \
  229.          /* alternatively we could generate a NOPAGE_OOM "out of memory" */ \
  230.      } \
  231.  } while(0)
  232. @@ -157,7 +157,7 @@
  233.      if (!pte_present(pte)) \
  234.      { \
  235.          __KE_ERROR("FATAL ERROR: User queue buffer not present! (pte)\n"); \
  236. -        return (unsigned long)NOPAGE_SIGBUS;   /* Something bad happened; generate SIGBUS */ \
  237. +        return VM_FAULT_SIGBUS;   /* Something bad happened; generate SIGBUS */ \
  238.          /* alternatively we could generate a NOPAGE_OOM "out of memory" */ \
  239.      } \
  240.  } while(0)

Quellcode

Hier kannst du den Code kopieren und ihn in deinen bevorzugten Editor einfügen. PASTEBIN_DOWNLOAD_SNIPPET_EXPLAIN

Verlinken

URL: alles markieren
https://nopaste.debianforum.de/9635

BBCode: alles markieren
[NP]9635[/NP]

LATEST_SNIPPETS