diff options
author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-08-01 14:46:57 -0400 |
---|---|---|
committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-08-01 14:46:57 -0400 |
commit | 9f7cda5ad176c666b27b6b0f36f2daa8860eb18c (patch) | |
tree | c14c1e5946f18128e088ee5969269f97fb8b9e51 /lib | |
parent | f9b8c53d3a2eac222ae3885319ede420792d3cfe (diff) | |
parent | 9f86f302ec0e37e84617481c587e11c47a397e3f (diff) |
Merge tag 'v4.9.36' into v4.9-rt
This is the 4.9.36 stable release
Diffstat (limited to 'lib')
-rw-r--r-- | lib/swiotlb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index ad1d2962d129..b7812df04437 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -456,11 +456,11 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, : 1UL << (BITS_PER_LONG - IO_TLB_SHIFT); /* - * For mappings greater than a page, we limit the stride (and - * hence alignment) to a page size. + * For mappings greater than or equal to a page, we limit the stride + * (and hence alignment) to a page size. */ nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT; - if (size > PAGE_SIZE) + if (size >= PAGE_SIZE) stride = (1 << (PAGE_SHIFT - IO_TLB_SHIFT)); else stride = 1; |