|
Line
Link Here
|
| 0 |
-- usr/src/nv/nv.c |
0 |
++ usr/src/nv/nv.c |
|
Lines 389-395
Link Here
|
| 389 |
|
389 |
|
| 390 |
/* character driver entry points */ |
390 |
/* character driver entry points */ |
| 391 |
|
391 |
|
|
|
392 |
#ifndef __no_const |
| 392 |
static struct file_operations nv_fops = { |
393 |
static struct file_operations nv_fops = { |
|
|
394 |
#else |
| 395 |
static file_operations_no_const nv_fops = { |
| 396 |
#endif |
| 393 |
.owner = THIS_MODULE, |
397 |
.owner = THIS_MODULE, |
| 394 |
.poll = nv_kern_poll, |
398 |
.poll = nv_kern_poll, |
| 395 |
#if defined(NV_FILE_OPERATIONS_HAS_IOCTL) |
399 |
#if defined(NV_FILE_OPERATIONS_HAS_IOCTL) |
|
Lines 1103-1109
static int __init nvidia_init_module(voi
Link Here
|
| 1103 |
NV_SPIN_LOCK_INIT(&km_lock); |
1103 |
NV_SPIN_LOCK_INIT(&km_lock); |
| 1104 |
#endif |
1104 |
#endif |
| 1105 |
|
1105 |
|
| 1106 |
NV_KMEM_CACHE_CREATE(nv_stack_t_cache, "nv_stack_t", nv_stack_t); |
1106 |
NV_KMEM_CACHE_CREATE(nv_stack_t_cache, "nv_stack_t", nv_stack_t, SLAB_USERCOPY); |
| 1107 |
if (nv_stack_t_cache == NULL) |
1107 |
if (nv_stack_t_cache == NULL) |
| 1108 |
{ |
1108 |
{ |
| 1109 |
nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n"); |
1109 |
nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n"); |
|
Lines 1218-1224
static int __init nvidia_init_module(voi
Link Here
|
| 1218 |
} |
1218 |
} |
| 1219 |
#endif |
1219 |
#endif |
| 1220 |
|
1220 |
|
| 1221 |
NV_KMEM_CACHE_CREATE(nv_pte_t_cache, "nv_pte_t", nv_pte_t); |
1221 |
NV_KMEM_CACHE_CREATE(nv_pte_t_cache, "nv_pte_t", nv_pte_t, 0); |
| 1222 |
if (nv_pte_t_cache == NULL) |
1222 |
if (nv_pte_t_cache == NULL) |
| 1223 |
{ |
1223 |
{ |
| 1224 |
rc = -ENOMEM; |
1224 |
rc = -ENOMEM; |
| 1225 |
-- usr/src/nv/nv-linux.h |
1225 |
++ usr/src/nv/nv-linux.h |
|
Lines 700-709
extern nv_spinlock_t km_lock;
Link Here
|
| 700 |
0, 0, NULL, NULL); \ |
700 |
0, 0, NULL, NULL); \ |
| 701 |
} |
701 |
} |
| 702 |
#elif (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5) |
702 |
#elif (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5) |
| 703 |
#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type) \ |
703 |
#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags) \ |
| 704 |
{ \ |
704 |
{ \ |
| 705 |
kmem_cache = kmem_cache_create(name, sizeof(type), \ |
705 |
kmem_cache = kmem_cache_create(name, sizeof(type), \ |
| 706 |
0, 0, NULL); \ |
706 |
0, flags, NULL); \ |
| 707 |
} |
707 |
} |
| 708 |
#else |
708 |
#else |
| 709 |
#error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!" |
709 |
#error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!" |
