diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-16 21:22:33 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-16 21:22:33 +0100 |
| commit | 1e3510b2b053b8253a99511efb668fcc7ae8fcd7 (patch) | |
| tree | 196d1d212e16fa2f7ddc9fee6a7ddfb3ed163c7e /drivers | |
| parent | mm: hide a #warning for COMPILE_TEST (diff) | |
| parent | powerpc/macio: set a proper dma_coherent_mask (diff) | |
| download | linux-1e3510b2b053b8253a99511efb668fcc7ae8fcd7.tar.xz linux-1e3510b2b053b8253a99511efb668fcc7ae8fcd7.zip | |
Merge tag 'dma-mapping-4.16-2' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fixes from Christoph Hellwig:
"A few dma-mapping fixes for the fallout from the changes in rc1"
* tag 'dma-mapping-4.16-2' of git://git.infradead.org/users/hch/dma-mapping:
powerpc/macio: set a proper dma_coherent_mask
dma-mapping: fix a comment typo
dma-direct: comment the dma_direct_free calling convention
dma-direct: mark as is_phys
ia64: fix build failure with CONFIG_SWIOTLB
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/macintosh/macio_asic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index 62f541f968f6..07074820a167 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c @@ -375,6 +375,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip, dev->ofdev.dev.of_node = np; dev->ofdev.archdata.dma_mask = 0xffffffffUL; dev->ofdev.dev.dma_mask = &dev->ofdev.archdata.dma_mask; + dev->ofdev.dev.coherent_dma_mask = dev->ofdev.archdata.dma_mask; dev->ofdev.dev.parent = parent; dev->ofdev.dev.bus = &macio_bus_type; dev->ofdev.dev.release = macio_release_dev; |