diff --git a/[refs] b/[refs]
index 52a7ce712e98..492aaebe65fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0547c2f56e6e4795d5366ba3b8483b668920a947
+refs/heads/master: ff7636292aac6cae2ee3a553d5424ea49c8a8263
diff --git a/trunk/drivers/iommu/tegra-smmu.c b/trunk/drivers/iommu/tegra-smmu.c
index cc6aba45e49a..becfc614cf94 100644
--- a/trunk/drivers/iommu/tegra-smmu.c
+++ b/trunk/drivers/iommu/tegra-smmu.c
@@ -902,8 +902,8 @@ static int tegra_smmu_probe(struct platform_device *pdev)
 	struct smmu_device *smmu;
 	struct device *dev = &pdev->dev;
 	int i, asids, err = 0;
-	dma_addr_t base;
-	size_t bytes, size;
+	dma_addr_t uninitialized_var(base);
+	size_t bytes, uninitialized_var(size);
 
 	if (smmu_handle)
 		return -EIO;