diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-04 10:52:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-04 10:52:09 -0700 |
| commit | 954b7207059cc4004f2e18f49c335304b1c6d64a (patch) | |
| tree | 8dc4347cead2d2eb247e198c9c50823ba7c4ea01 /mm/vmstat.c | |
| parent | 51e6f07cb12e50bfc71181bd08bad5f0a9b5e9e2 (diff) | |
| parent | a7f3d3d3600c8ed119eb0d2483de0062ce2e3707 (diff) | |
Merge tag 'dma-mapping-5.13' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping updates from Christoph Hellwig:
- add a new dma_alloc_noncontiguous API (me, Ricardo Ribalda)
- fix a copyright notice (Hao Fang)
- add an unlikely annotation to dma_mapping_error (Heiner Kallweit)
- remove a pointless empty line (Wang Qing)
- add support for multi-pages map/unmap bencharking (Xiang Chen)
* tag 'dma-mapping-5.13' of git://git.infradead.org/users/hch/dma-mapping:
dma-mapping: add unlikely hint to error path in dma_mapping_error
dma-mapping: benchmark: Add support for multi-pages map/unmap
dma-mapping: benchmark: use the correct HiSilicon copyright
dma-mapping: remove a pointless empty line in dma_alloc_coherent
media: uvcvideo: Use dma_alloc_noncontiguous API
dma-iommu: implement ->alloc_noncontiguous
dma-iommu: refactor iommu_dma_alloc_remap
dma-mapping: add a dma_alloc_noncontiguous API
dma-mapping: refactor dma_{alloc,free}_pages
dma-mapping: add a dma_mmap_pages helper
Diffstat (limited to 'mm/vmstat.c')
0 files changed, 0 insertions, 0 deletions