diff --git a/drivers/video/tegra/nvmap/nvmap_init.c b/drivers/video/tegra/nvmap/nvmap_init.c
index 4e4bc73c..92097fe1 100644
--- a/drivers/video/tegra/nvmap/nvmap_init.c
+++ b/drivers/video/tegra/nvmap/nvmap_init.c
@@ -498,7 +498,7 @@ void nvmap_dma_free_attrs(struct device *dev, size_t size, void *cpu_addr,
 	struct dma_coherent_mem_replica *mem;
 	bool is_gpu = false;
 	const char *device_name;
-	u32 granule_size = 0;
+	size_t granule_size = 0;
 
 	if (!dev || !dev->dma_mem)
 		return;
diff --git a/drivers/video/tegra/nvmap/nvmap_ioctl.c b/drivers/video/tegra/nvmap/nvmap_ioctl.c
index 46dc9354..d765a518 100644
--- a/drivers/video/tegra/nvmap/nvmap_ioctl.c
+++ b/drivers/video/tegra/nvmap/nvmap_ioctl.c
@@ -223,7 +223,7 @@ int nvmap_ioctl_alloc(struct file *filp, void __user *arg)
 	 * In case of Gpu carveout, the handle size needs to be aligned to granule.
 	 */
 	if (op.heap_mask & NVMAP_HEAP_CARVEOUT_GPU) {
-		u32 granule_size = 0;
+		size_t granule_size = 0;
 
 		for (i = 0; i < nvmap_dev->nr_carveouts; i++)
 			if (nvmap_dev->heaps[i].heap_bit & NVMAP_HEAP_CARVEOUT_GPU)