linux-kernel - linux-next: manual merge of the driver-core tree with the iommu tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130206162523.c338c51f0d5fc31b20245184@canb.auug.org.au>
Date:	Wed, 6 Feb 2013 16:25:23 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thierry Reding <thierry.reding@...onic-design.de>,
	Hiroshi Doyu <hdoyu@...dia.com>,
	Joerg Roedel <joro@...tes.org>,
	David Woodhouse <dwmw2@...radead.org>
Subject: linux-next: manual merge of the driver-core tree with the iommu
 tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/iommu/tegra-smmu.c between commit a6870e928d1b ("iommu/tegra:
smmu: Support variable MMIO ranges/blocks") from the iommu tree and
commit bc5e6dea81b0 ("iommu: Convert to devm_ioremap_resource()") from
the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/iommu/tegra-smmu.c
index 7747283,f08dbcd..0000000
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@@ -1185,13 -1177,10 +1186,13 @@@ static int tegra_smmu_probe(struct plat
  		res = platform_get_resource(pdev, IORESOURCE_MEM, i);
  		if (!res)
  			return -ENODEV;
- 		smmu->regs[i] = devm_request_and_ioremap(&pdev->dev, res);
- 		if (!smmu->regs[i])
- 			return -EBUSY;
+ 		smmu->regs[i] = devm_ioremap_resource(&pdev->dev, res);
+ 		if (IS_ERR(smmu->regs[i]))
+ 			return PTR_ERR(smmu->regs[i]);
 +		smmu->rege[i] = smmu->regs[i] + resource_size(res) - 1;
  	}
 +	/* Same as "mc" 1st regiter block start address */
 +	smmu->regbase = (void __iomem *)((u32)smmu->regs[0] & ~PAGE_MASK);
  
  	err = of_get_dma_window(dev->of_node, NULL, 0, NULL, &base, &size);
  	if (err)

Content of type "application/pgp-signature" skipped