From: Ferruh Yigit Date: Mon, 3 Apr 2017 16:49:01 +0000 (+0100) Subject: igb_uio: fix build with kernel < 3.2 X-Git-Url: http://git.droids-corp.org/?p=dpdk.git;a=commitdiff_plain;h=21be6fb6af7a26c6c92fe37128a99ffdfd8d69d3 igb_uio: fix build with kernel < 3.2 Recently added "dma_zalloc_coherent()" call is causing build error for Linux kernels < 3.2. compile error: lib/librte_eal/linuxapp/igb_uio/igb_uio.c: In function ‘igbuio_pci_probe’: lib/librte_eal/linuxapp/igb_uio/igb_uio.c:434:2: error: implicit declaration of function ‘dma_zalloc_coherent’ [-Werror=implicit-function-declaration] map_addr = dma_zalloc_coherent(&dev->dev, 1024, ^ dma_zalloc_coherent() introduced with Linux kernel 3.2, with commit Linux: 842fa69f3e0c ("include/linux/dma-mapping.h: add dma_zalloc_coherent()") Since it does not exist for older kernels, causing a build error. Switched to dma_alloc_coherent() API to prevent build error. Fixes: d287e4d41be0 ("igb_uio: map dummy DMA forcing IOMMU domain attachment") Signed-off-by: Ferruh Yigit --- diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c index 41bf6ea39a..192bd4a96b 100644 --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c @@ -431,8 +431,10 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) * the iommu identity mapping if kernel boots with iommu=pt. * Note this is not a problem if no IOMMU at all. */ - map_addr = dma_zalloc_coherent(&dev->dev, 1024, - &map_dma_addr, GFP_KERNEL); + map_addr = dma_alloc_coherent(&dev->dev, 1024, &map_dma_addr, + GFP_KERNEL); + if (map_addr) + memset(map_addr, 0, 1024); if (!map_addr) dev_info(&dev->dev, "dma mapping failed\n");