projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
drivers
/
vfio
/
vfio_iommu_type1.c
diff --git
a/drivers/vfio/vfio_iommu_type1.c
b/drivers/vfio/vfio_iommu_type1.c
index
a0747c3
..
a3e925a
100644
(file)
--- a/
drivers/vfio/vfio_iommu_type1.c
+++ b/
drivers/vfio/vfio_iommu_type1.c
@@
-2795,7
+2795,7
@@
static int vfio_iommu_iova_build_caps(struct vfio_iommu *iommu,
return 0;
}
- size = s
izeof(*cap_iovas) + (iovas * sizeof(*cap_iovas->iova_ranges)
);
+ size = s
truct_size(cap_iovas, iova_ranges, iovas
);
cap_iovas = kzalloc(size, GFP_KERNEL);
if (!cap_iovas)