diff options
author | Joerg Roedel <jroedel@suse.de> | 2015-12-22 11:26:37 +0100 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2015-12-22 11:26:37 +0100 |
commit | 6d6c7e56a20f879f8d7b5ff34ea067bfc7ea1572 (patch) | |
tree | 7aacd0192a3fa7dd592961604f6cd5794d8fa651 /drivers/iommu/io-pgtable.h | |
parent | 4ef7675344d687a0ef5b0d7c0cee12da005870c0 (diff) | |
parent | 12c2ab09571e8aae3a87da2a4a452632a5fac1e5 (diff) | |
download | linux-6d6c7e56a20f879f8d7b5ff34ea067bfc7ea1572.tar.bz2 |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'drivers/iommu/io-pgtable.h')
-rw-r--r-- | drivers/iommu/io-pgtable.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h index ac9e2341a633..36673c83de58 100644 --- a/drivers/iommu/io-pgtable.h +++ b/drivers/iommu/io-pgtable.h @@ -26,8 +26,8 @@ enum io_pgtable_fmt { */ struct iommu_gather_ops { void (*tlb_flush_all)(void *cookie); - void (*tlb_add_flush)(unsigned long iova, size_t size, bool leaf, - void *cookie); + void (*tlb_add_flush)(unsigned long iova, size_t size, size_t granule, + bool leaf, void *cookie); void (*tlb_sync)(void *cookie); }; @@ -131,6 +131,8 @@ struct io_pgtable { struct io_pgtable_ops ops; }; +#define io_pgtable_ops_to_pgtable(x) container_of((x), struct io_pgtable, ops) + /** * struct io_pgtable_init_fns - Alloc/free a set of page tables for a * particular format. |