diff --git a/drivers/gpu/nvgpu/common/mm/allocators/page_allocator.c b/drivers/gpu/nvgpu/common/mm/allocators/page_allocator.c
index 336514c67..9a3df0f29 100644
--- a/drivers/gpu/nvgpu/common/mm/allocators/page_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/allocators/page_allocator.c
@@ -61,6 +61,7 @@ static inline void add_slab_page_to_empty(struct page_alloc_slab *slab,
 {
 	BUG_ON(page_ptr->state != SP_NONE);
 	nvgpu_list_add(&page_ptr->list_entry, &slab->empty);
+	nvgpu_assert(slab->nr_empty < U32_MAX);
 	slab->nr_empty++;
 	page_ptr->state = SP_EMPTY;
 }
@@ -69,6 +70,7 @@ static inline void add_slab_page_to_partial(struct page_alloc_slab *slab,
 {
 	BUG_ON(page_ptr->state != SP_NONE);
 	nvgpu_list_add(&page_ptr->list_entry, &slab->partial);
+	nvgpu_assert(slab->nr_partial < U32_MAX);
 	slab->nr_partial++;
 	page_ptr->state = SP_PARTIAL;
 }
@@ -77,6 +79,7 @@ static inline void add_slab_page_to_full(struct page_alloc_slab *slab,
 {
 	BUG_ON(page_ptr->state != SP_NONE);
 	nvgpu_list_add(&page_ptr->list_entry, &slab->full);
+	nvgpu_assert(slab->nr_full < U32_MAX);
 	slab->nr_full++;
 	page_ptr->state = SP_FULL;
 }
@@ -85,6 +88,7 @@ static inline void del_slab_page_from_empty(struct page_alloc_slab *slab,
 					struct page_alloc_slab_page *page_ptr)
 {
 	nvgpu_list_del(&page_ptr->list_entry);
+	nvgpu_assert(slab->nr_empty > 0U);
 	slab->nr_empty--;
 	page_ptr->state = SP_NONE;
 }
@@ -92,6 +96,7 @@ static inline void del_slab_page_from_partial(struct page_alloc_slab *slab,
 					struct page_alloc_slab_page *page_ptr)
 {
 	nvgpu_list_del(&page_ptr->list_entry);
+	nvgpu_assert(slab->nr_partial > 0U);
 	slab->nr_partial--;
 	page_ptr->state = SP_NONE;
 }
@@ -99,6 +104,7 @@ static inline void del_slab_page_from_full(struct page_alloc_slab *slab,
 					struct page_alloc_slab_page *page_ptr)
 {
 	nvgpu_list_del(&page_ptr->list_entry);
+	nvgpu_assert(slab->nr_full > 0U);
 	slab->nr_full--;
 	page_ptr->state = SP_NONE;
 }
@@ -656,7 +662,7 @@ static struct nvgpu_page_alloc *nvgpu_alloc_pages(
 	struct nvgpu_page_alloc *alloc = NULL;
 	struct nvgpu_sgl *sgl;
 	u64 pages;
-	int i = 0;
+	u32 i = 0;
 
 	pages = ALIGN(len, a->page_size) >> a->page_shift;
 
@@ -671,6 +677,7 @@ static struct nvgpu_page_alloc *nvgpu_alloc_pages(
 		   pages << a->page_shift, pages, alloc->base);
 	sgl = alloc->sgt.sgl;
 	while (sgl != NULL) {
+		nvgpu_assert(i < U32_MAX);
 		palloc_dbg(a, "  Chunk %2d: 0x%010llx + 0x%llx",
 			   i++,
 			   nvgpu_sgt_get_phys(g, &alloc->sgt, sgl),
@@ -830,7 +837,7 @@ static u64 nvgpu_page_palloc_fixed(struct nvgpu_allocator *na,
 	struct nvgpu_sgl *sgl;
 	struct gk20a *g = a->owner->g;
 	u64 aligned_len, pages;
-	int i = 0;
+	u32 i = 0;
 
 	aligned_len = ALIGN(len, a->page_size);
 	pages = aligned_len >> a->page_shift;
@@ -850,6 +857,7 @@ static u64 nvgpu_page_palloc_fixed(struct nvgpu_allocator *na,
 		   alloc->base, aligned_len, pages);
 	sgl = alloc->sgt.sgl;
 	while (sgl != NULL) {
+		nvgpu_assert(i < U32_MAX);
 		palloc_dbg(a, "  Chunk %2d: 0x%010llx + 0x%llx",
 			   i++,
 			   nvgpu_sgt_get_phys(g, &alloc->sgt, sgl),
diff --git a/drivers/gpu/nvgpu/include/nvgpu/page_allocator.h b/drivers/gpu/nvgpu/include/nvgpu/page_allocator.h
index fabff0be4..7d2b3c9ed 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/page_allocator.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/page_allocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -56,9 +56,9 @@ struct page_alloc_slab {
 	struct nvgpu_list_node partial;
 	struct nvgpu_list_node full;
 
-	int nr_empty;
-	int nr_partial;
-	int nr_full;
+	u32 nr_empty;
+	u32 nr_partial;
+	u32 nr_full;
 
 	u32 slab_size;
 };