Pull dma-mapping fixes from Christoph Hellwig: - add a warning when the atomic pool is depleted (David Rientjes) - protect the parameters of the new scatterlist helper macros (Marek Szyprowski ) * tag 'dma-mapping-5.8-5' of git://git.infradead.org/users/hch/dma-mapping: scatterlist: protect parameters of the sg_table related macros dma-mapping: warn when coherent pool is depleted
Showing the changes to include/linux (1 of 2 files). Show all
Unified · Split
| @@ -155,7 +155,7 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf, · 154 unmodified lines | |||
| 155 | * Loop over each sg element in the given sg_table object. | 155 | * Loop over each sg element in the given sg_table object. |
| 156 | */ | 156 | */ |
| 157 | #define for_each_sgtable_sg(sgt, sg, i) \ | 157 | #define for_each_sgtable_sg(sgt, sg, i) \ |
| 158 | for_each_sg(sgt->sgl, sg, sgt->orig_nents, i) | 158 | for_each_sg((sgt)->sgl, sg, (sgt)->orig_nents, i) |
| 159 | 159 | ||
| 160 | /* | 160 | /* |
| 161 | * Loop over each sg element in the given *DMA mapped* sg_table object. | 161 | * Loop over each sg element in the given *DMA mapped* sg_table object. |
| @@ -163,7 +163,7 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf, · 1 unmodified line | |||
| 163 | * of the each element. | 163 | * of the each element. |
| 164 | */ | 164 | */ |
| 165 | #define for_each_sgtable_dma_sg(sgt, sg, i) \ | 165 | #define for_each_sgtable_dma_sg(sgt, sg, i) \ |
| 166 | for_each_sg(sgt->sgl, sg, sgt->nents, i) | 166 | for_each_sg((sgt)->sgl, sg, (sgt)->nents, i) |
| 167 | 167 | ||
| 168 | /** | 168 | /** |
| 169 | * sg_chain - Chain two sglists together | 169 | * sg_chain - Chain two sglists together |
| @@ -451,7 +451,7 @@ sg_page_iter_dma_address(struct sg_dma_page_iter *dma_iter) · 281 unmodified lines | |||
| 451 | * See also for_each_sg_page(). In each loop it operates on PAGE_SIZE unit. | 451 | * See also for_each_sg_page(). In each loop it operates on PAGE_SIZE unit. |
| 452 | */ | 452 | */ |
| 453 | #define for_each_sgtable_page(sgt, piter, pgoffset) \ | 453 | #define for_each_sgtable_page(sgt, piter, pgoffset) \ |
| 454 | for_each_sg_page(sgt->sgl, piter, sgt->orig_nents, pgoffset) | 454 | for_each_sg_page((sgt)->sgl, piter, (sgt)->orig_nents, pgoffset) |
| 455 | 455 | ||
| 456 | /** | 456 | /** |
| 457 | * for_each_sgtable_dma_page - iterate over the DMA mapped sg_table object | 457 | * for_each_sgtable_dma_page - iterate over the DMA mapped sg_table object |
| @@ -465,7 +465,7 @@ sg_page_iter_dma_address(struct sg_dma_page_iter *dma_iter) · 7 unmodified lines | |||
| 465 | * unit. | 465 | * unit. |
| 466 | */ | 466 | */ |
| 467 | #define for_each_sgtable_dma_page(sgt, dma_iter, pgoffset) \ | 467 | #define for_each_sgtable_dma_page(sgt, dma_iter, pgoffset) \ |
| 468 | for_each_sg_dma_page(sgt->sgl, dma_iter, sgt->nents, pgoffset) | 468 | for_each_sg_dma_page((sgt)->sgl, dma_iter, (sgt)->nents, pgoffset) |
| 469 | 469 | ||
| 470 | 470 | ||
| 471 | /* | 471 | /* |