diff --git a/drivers/gpu/nvgpu/common/linux/kmem.c b/drivers/gpu/nvgpu/common/linux/kmem.c
index 8422d7611..d058eba5e 100644
--- a/drivers/gpu/nvgpu/common/linux/kmem.c
+++ b/drivers/gpu/nvgpu/common/linux/kmem.c
@@ -15,14 +15,13 @@
  */
 
 #include <linux/mm.h>
-#include <linux/mutex.h>
 #include <linux/slab.h>
 #include <linux/debugfs.h>
-#include <linux/spinlock.h>
 #include <linux/seq_file.h>
 #include <linux/vmalloc.h>
 #include <linux/stacktrace.h>
 
+#include <nvgpu/lock.h>
 #include <nvgpu/kmem.h>
 #include <nvgpu/atomic.h>
 #include <nvgpu/bug.h>
@@ -137,12 +136,12 @@ void __nvgpu_vfree(struct gk20a *g, void *addr)
 
 static void lock_tracker(struct nvgpu_mem_alloc_tracker *tracker)
 {
-	mutex_lock(&tracker->lock);
+	nvgpu_mutex_acquire(&tracker->lock);
 }
 
 static void unlock_tracker(struct nvgpu_mem_alloc_tracker *tracker)
 {
-	mutex_unlock(&tracker->lock);
+	nvgpu_mutex_release(&tracker->lock);
 }
 
 static void kmem_print_mem_alloc(struct gk20a *g,
@@ -843,8 +842,8 @@ int nvgpu_kmem_init(struct gk20a *g)
 	g->vmallocs->allocs = NULL;
 	g->kmallocs->allocs = NULL;
 
-	mutex_init(&g->vmallocs->lock);
-	mutex_init(&g->kmallocs->lock);
+	nvgpu_mutex_init(&g->vmallocs->lock);
+	nvgpu_mutex_init(&g->kmallocs->lock);
 
 	g->vmallocs->min_alloc = PAGE_SIZE;
 	g->kmallocs->min_alloc = KMALLOC_MIN_SIZE;
diff --git a/drivers/gpu/nvgpu/common/linux/kmem_priv.h b/drivers/gpu/nvgpu/common/linux/kmem_priv.h
index cd58ac281..d3abb3784 100644
--- a/drivers/gpu/nvgpu/common/linux/kmem_priv.h
+++ b/drivers/gpu/nvgpu/common/linux/kmem_priv.h
@@ -18,6 +18,7 @@
 #define __KMEM_PRIV_H__
 
 #include <nvgpu/rbtree.h>
+#include <nvgpu/lock.h>
 
 #define __pstat(s, fmt, msg...)				\
 	do {						\
@@ -78,7 +79,7 @@ struct nvgpu_mem_alloc_tracker {
 	const char *name;
 	struct nvgpu_kmem_cache *allocs_cache;
 	struct nvgpu_rbtree_node *allocs;
-	struct mutex lock;
+	struct nvgpu_mutex lock;
 
 	u64 bytes_alloced;
 	u64 bytes_freed;