Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 658748
Collapse All | Expand All

(-)work.orig/kernel/common/inc/nv-linux.h (-1 / +5 lines)
Lines 1189-1195 extern void *nvidia_stack_t_cache; Link Here
1189 
#if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
 1189 
#if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
1190 
#define NV_KMEM_CACHE_CREATE_FULL(name, size, align, flags, ctor) \
 1190 
#define NV_KMEM_CACHE_CREATE_FULL(name, size, align, flags, ctor) \
1191 
    kmem_cache_create(name, size, align, flags, ctor)
 1191 
    kmem_cache_create(name, size, align, flags, ctor)
1192 


              1192
              
#define NV_KMEM_CACHE_CREATE_FULL_USERCOPY(name, size, align, flags, useroffset, usersize, ctor) \

            

            

              
              

              1193
              
    kmem_cache_create_usercopy(name, size, align, flags, useroffset, usersize, ctor)

            

        

          1193
          
#else

          1194
          
#else

        

        

          1194
          
#define NV_KMEM_CACHE_CREATE_FULL(name, size, align, flags, ctor) \

          1195
          
#define NV_KMEM_CACHE_CREATE_FULL(name, size, align, flags, ctor) \

        

        

          1195
          
    kmem_cache_create(name, size, align, flags, ctor, NULL)

          1196
          
    kmem_cache_create(name, size, align, flags, ctor, NULL)

        

  

    
      
            Lines 1198-1203
          extern void *nvidia_stack_t_cache;
      
      
        Link Here
      
    
  

        

          1198
          
#define NV_KMEM_CACHE_CREATE(name, type)    \

          1199
          
#define NV_KMEM_CACHE_CREATE(name, type)    \

        

        

          1199
          
    NV_KMEM_CACHE_CREATE_FULL(name, sizeof(type), 0, 0, NULL)

          1200
          
    NV_KMEM_CACHE_CREATE_FULL(name, sizeof(type), 0, 0, NULL)

        

        

          1200
          

          1201
          

        

            

              
              
              1202
              
#define NV_KMEM_CACHE_CREATE_USERCOPY(name, type)    \

            

            

              1203
              
    NV_KMEM_CACHE_CREATE_FULL_USERCOPY(name, sizeof(type), 0, 0, 0, sizeof(type), NULL)

            

            

              1204
              

            

        

          1201
          
#define NV_KMEM_CACHE_DESTROY(kmem_cache)   \

          1205
          
#define NV_KMEM_CACHE_DESTROY(kmem_cache)   \

        

        

          1202
          
    kmem_cache_destroy(kmem_cache)

          1206
          
    kmem_cache_destroy(kmem_cache)

        

        

          1203
          

          1207
          

        



(-)work.orig/kernel/nvidia/nv.c
      (-1 / +1 lines)




  

    
      
            Lines 682-688
          int __init nvidia_init_module(void)
      
      
        Link Here
      
    
  

        

          682
          

          682
          

        

        

          683
          
    nv_memdbg_init();

          683
          
    nv_memdbg_init();

        

        

          684
          

          684
          

        

          
            

              685
              
    nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE(nvidia_stack_cache_name,


              685
              
    nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE_USERCOPY(nvidia_stack_cache_name,

            

        

          686
          
                                                nvidia_stack_t);

          686
          
                                                nvidia_stack_t);

        

        

          687
          
    if (nvidia_stack_t_cache == NULL)

          687
          
    if (nvidia_stack_t_cache == NULL)

        

        

          688
          
    {

          688
          
    {

        






  

  Return to bug 658748