summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-04-21 09:41:38 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-04-21 09:41:37 -0700
commit2fcd6d4d017c306c30c86c2eec97faa5010362e1 (patch)
tree0d55cd16ba33037ca509b6602f88cc6413e41389
parent3cbe2d2e4ef5e95e314ea54ebdd3b2c515b26390 (diff)
parent182caa19ec45a447e16a3d5e99d76f41b06a63d4 (diff)
Merge "arm: dma-mapping: set the proper bitmap size"
-rw-r--r--arch/arm/mm/dma-mapping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 8bda55f00b7b..0efa67b299b6 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -2191,7 +2191,7 @@ arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, u64 size)
mapping->nr_bitmaps = 1;
mapping->extensions = extensions;
mapping->base = base;
- mapping->bits = bits;
+ mapping->bits = BITS_PER_BYTE * bitmap_size;
spin_lock_init(&mapping->lock);