--- usr/src/nv/nv.c
+++ usr/src/nv/nv.c
@@ -389,7 +389,11 @@
 
 /* character driver entry points */
 
+#ifndef __no_const
 static struct file_operations nv_fops = {
+#else
+static file_operations_no_const nv_fops = {
+#endif
     .owner     = THIS_MODULE,
     .poll      = nv_kern_poll,
 #if defined(NV_FILE_OPERATIONS_HAS_IOCTL)
@@ -1103,7 +1103,7 @@ static int __init nvidia_init_module(voi
     NV_SPIN_LOCK_INIT(&km_lock);
 #endif
 
-    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, "nv_stack_t", nv_stack_t);
+    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, "nv_stack_t", nv_stack_t, SLAB_USERCOPY);
     if (nv_stack_t_cache == NULL)
     {
         nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
@@ -1218,7 +1218,7 @@ static int __init nvidia_init_module(voi
     }
 #endif
 
-    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, "nv_pte_t", nv_pte_t);
+    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, "nv_pte_t", nv_pte_t, 0);
     if (nv_pte_t_cache == NULL)
     {
         rc = -ENOMEM;
--- usr/src/nv/nv-linux.h
+++ usr/src/nv/nv-linux.h
@@ -700,10 +700,10 @@ extern nv_spinlock_t km_lock;
                         0, 0, NULL, NULL);                      \
     }
 #elif (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
-#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
     {                                                           \
         kmem_cache = kmem_cache_create(name, sizeof(type),      \
-                        0, 0, NULL);                            \
+                        0, flags, NULL);                        \
     }
 #else
 #error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!"