Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 583574 | Differences between
and this patch

Collapse All | Expand All

(-)common/lib/modules/fglrx/build_mod/firegl_public.c.orig (-2 / +6 lines)
Lines 3245-3251 Link Here
3245 
    int ret;
 3245 
    int ret;
3246 

          3246
          

        

        

          3247
          
    down_read(&current->mm->mmap_sem);

          3247
          
    down_read(&current->mm->mmap_sem);

        

          
            

              3248
              
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)


              3248
              
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)

            

            

              
              

              3249
              
    ret = get_user_pages(vaddr, page_cnt, 1, (struct page **)page_list,NULL);

            

            


              3250
              
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)

            

        

          3249
          
    ret = get_user_pages(vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL);

          3251
          
    ret = get_user_pages(vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL);

        

        

          3250
          
#else

          3252
          
#else

        

        

          3251
          
    ret = get_user_pages(current, current->mm, vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL);

          3253
          
    ret = get_user_pages(current, current->mm, vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL);

        

  

    
      
            Lines 3267-3273
          
      
      
        Link Here
      
    
  

        

          3267
          
    int ret;

          3269
          
    int ret;

        

        

          3268
          

          3270
          

        

        

          3269
          
    down_read(&current->mm->mmap_sem);

          3271
          
    down_read(&current->mm->mmap_sem);

        

          
            

              3270
              
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)


              3272
              
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)

            

            

              
              

              3273
              
    ret = get_user_pages(vaddr, page_cnt, 0, (struct page **)page_list, NULL);

            

            


              3274
              
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)

            

        

          3271
          
    ret = get_user_pages(vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL);

          3275
          
    ret = get_user_pages(vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL);

        

        

          3272
          
#else

          3276
          
#else

        

        

          3273
          
    ret = get_user_pages(current, current->mm, vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL);

          3277
          
    ret = get_user_pages(current, current->mm, vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL);

        






  

  Return to bug 583574