| Message ID | CAC8NTUUXoW4mV7aFD90mbSpVaai=o6fxM+PLSUzu82qOjEJn2Q@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 28, 2016 at 11:57 AM, Radha Mohan <mohun106@gmail.com> wrote: > On Thu, Mar 24, 2016 at 11:29 AM, Chalamarla, Tirumalesh > <Tirumalesh.Chalamarla@caviumnetworks.com> wrote: >> Thanks. >> >> >> >> >> On 3/24/16, 10:51 AM, "Will Deacon" <will.deacon@arm.com> wrote: >> >>>On Thu, Mar 24, 2016 at 05:36:39PM +0000, Chalamarla, Tirumalesh wrote: >>>> Do you want me to resend it with path version number change? >>> >>>Shouldn't be any need. I've queued this locally, and will push out when >>>I update my repo after the merge window. >>> > > Minor change that affects the kernel compilation. > I think it makes sense to resubmit the patch. > > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c > index 6ed7c3e..4aca5c1 100644 > --- a/drivers/iommu/arm-smmu.c > +++ b/drivers/iommu/arm-smmu.c > @@ -1834,8 +1834,8 @@ static int arm_smmu_device_dt_probe(struct > platform_device *pdev) > * asid/vmid space. > */ > if (of_device_is_compatible(dev->of_node, "cavium,smmu-v2")) { > - smmu->cavium_id_base = atomic_read(cavium_smmu_context_count); > - atomic_add(smmu->num_context_banks, cavium_smmu_context_count); > + smmu->cavium_id_base = atomic_read(&cavium_smmu_context_count); > + atomic_add(smmu->num_context_banks, &cavium_smmu_context_count); > } > > list_add(&smmu->list, &arm_smmu_devices); > Ok, please ignore this, I missed the changes in between the thread :) >>>Will >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 6ed7c3e..4aca5c1 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1834,8 +1834,8 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) * asid/vmid space. */ if (of_device_is_compatible(dev->of_node, "cavium,smmu-v2")) { - smmu->cavium_id_base = atomic_read(cavium_smmu_context_count); - atomic_add(smmu->num_context_banks, cavium_smmu_context_count); + smmu->cavium_id_base = atomic_read(&cavium_smmu_context_count); + atomic_add(smmu->num_context_banks, &cavium_smmu_context_count); }