On Thu, Oct 10, 2013 at 07:05:58PM +0100, Kirill A. Shutemov wrote:
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
> Cc: Will Deacon <will.deacon@xxxxxxx>
> Cc: Grant Likely <grant.likely@xxxxxxxxxx>
> Cc: Rob Herring <rob.herring@xxxxxxxxxxx>
> ---
> drivers/iommu/arm-smmu.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
> index f417e89e1e..2b256a5075 100644
> --- a/drivers/iommu/arm-smmu.c
> +++ b/drivers/iommu/arm-smmu.c
> @@ -1211,7 +1211,10 @@ static int arm_smmu_alloc_init_pte(struct arm_smmu_device *smmu, pmd_t *pmd,
>
> arm_smmu_flush_pgtable(smmu, page_address(table),
> ARM_SMMU_PTE_HWTABLE_SIZE);
> - pgtable_page_ctor(table);
> + if (!pgtable_page_ctor(table)) {
> + __free_page(table);
> + return -ENOMEM;
> + }
> pmd_populate(NULL, pmd, table);
> arm_smmu_flush_pgtable(smmu, pmd, sizeof(*pmd));
> }
Acked-by: Will Deacon <will.deacon@xxxxxxx>
I have quite a few changes queued for this driver, but it doesn't look like
you'll get a conflict with the iommu tree.
Will
--
To unsubscribe from this list: send the line "unsubscribe linux-arch" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
