Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid compile warnings on non-default arm64 configs

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQI/BAABCgApFiEEgdbnc3r/njty3Iq9D55TZVIEUYMFAlvdXrcLHGhjaEBsc3Qu
 ZGUACgkQD55TZVIEUYOggg/+KVxLGpWwJ0q8AGYQLirwj0KnWnUUkL++i8AK7NZO
 qwryJMQk+uzVAbMwa7boSM9nJCTNHjsneIyOcw+21nOupxLkuvuPiW581aOYTsho
 5WR9JW/ajZdEOWekMeuhLtkmLlX8trp46tDROrNLvUS+e/zwhFMjj/JTi+HQKl4r
 0QXaVSJGXvKiwNzv/mTuJ3WjMH8k19wV7LNHNUETNhnhUfeq2KvkZcnRM9tSJoMh
 ITkumaHVrJTkenxXXbdZZuls2QFrglOMbfVJQj7OKh/y3/X9VCAfvnTZpeynfztF
 Pnsn9AiqUdMmwm+DPWGaRakOWMe25qT+uvXfgLTf2z11nt6ZAPW9++T0ehwkCRja
 22xNRbJQswCm5IQRA/Tte5WF5U10NgDYfdhYcoIc0jAYu0QV9ifhNi+/eNcmatEa
 lA7EjJX4GazzeUv8fgXjU2O2k6aY/57ONzpholMksXPCYm77XJr/QkW5NCxSPCiz
 wLUoy7zhr/SoJytBcFcbAJTx2JeqHrCJ7Kjlrg9WtPh1YdzbTPuOVXzZDb7gP4CJ
 Dkul/7g3au8AY+MgFHrxNpJF/2utIlGTZuyATfDcPxrE0PWVcR3/+wW4WTCm96mj
 p6M2crKqp4A+QhBXml9ewoIfVzgTv+UKFY9wuHntZxc/HcsLpSNPgCaBpTRmKHGV
 07g=
 =2uk6
 -----END PGP SIGNATURE-----

Merge tag 'dma-mapping-4.20-2' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fix from Christoph Hellwig:
 "Avoid compile warnings on non-default arm64 configs"

* tag 'dma-mapping-4.20-2' of git://git.infradead.org/users/hch/dma-mapping:
  arm64: fix warnings without CONFIG_IOMMU_DMA
This commit is contained in:
Linus Torvalds 2018-11-03 10:53:33 -07:00
commit 3308a383ce
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/mm/dma-mapping.c
View File

@ -160,6 +160,7 @@ void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,
__dma_unmap_area(phys_to_virt(paddr), size, dir);
}
#ifdef CONFIG_IOMMU_DMA
static int __swiotlb_get_sgtable_page(struct sg_table *sgt,
struct page *page, size_t size)
{
@ -188,6 +189,7 @@ static int __swiotlb_mmap_pfn(struct vm_area_struct *vma,
return ret;
}
#endif /* CONFIG_IOMMU_DMA */
static int __init atomic_pool_init(void)
{