Merge branch 'for-joerg/arm-smmu/fixes' into for-joerg/arm-smmu/updates

Browse source

Merge in ARM SMMU fixes to avoid conflicts in the ARM io-pgtable code.

* for-joerg/arm-smmu/fixes:
  iommu/io-pgtable-arm: Support all Mali configurations
  iommu/io-pgtable-arm: Correct Mali attributes
  iommu/arm-smmu: Free context bitmap in the err path of arm_smmu_init_domain_context

...

This commit is contained in:

Will Deacon 2019-11-04 19:33:59 +00:00

parent 759aaa10c7 1be08f458d

commit db22a9de7a

2 changed files with 46 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/iommu/arm-smmu.c

View file

58

drivers/iommu/io-pgtable-arm.c

View file