diff options
author | Linus Torvalds | 2018-04-25 11:48:09 -0700 |
---|---|---|
committer | Linus Torvalds | 2018-04-25 11:48:09 -0700 |
commit | 26ed24e429d89e045e5eb2d2b75215244347b7f2 (patch) | |
tree | ebceef87144204fb10a6d7fc4ebb7be4718655de /drivers/perf/arm_pmu.c | |
parent | 3be4aaf4e2d3eb95cce7835e8df797ae65ae5ac1 (diff) | |
parent | 60695be2bb6b0623f8e53bd9949d582a83c6d44a (diff) |
Merge tag 'dma-mapping-4.17-3' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fixes from Christoph Hellwig:
"A few small dma-mapping fixes for Linux 4.17-rc3:
- don't loop to try GFP_DMA allocations if ZONE_DMA is not actually
enabled (regression in 4.16)
- don't try to do virt_to_page before we know we actuall have a valid
page in dma_common_mmap
- a comment fixup related to the above fix"
* tag 'dma-mapping-4.17-3' of git://git.infradead.org/users/hch/dma-mapping:
dma-mapping: postpone cpu addr translation on mmap
dma-coherent: clarify dma_mmap_from_dev_coherent documentation
dma-direct: don't retry allocation for no-op GFP_DMA
Diffstat (limited to 'drivers/perf/arm_pmu.c')
0 files changed, 0 insertions, 0 deletions