diff --git a/scripts/ko/src/igb_uio.c b/scripts/ko/src/igb_uio.c
index 49c035b704..04bcfd44a2 100755
--- a/scripts/ko/src/igb_uio.c
+++ b/scripts/ko/src/igb_uio.c
@@ -498,15 +498,9 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 		goto fail_release_iomem;
 
 	/* set 64-bit DMA mask */
-	err = pci_set_dma_mask(dev,  DMA_BIT_MASK(64));
+	err = dma_set_mask_and_coherent(&dev->dev,  DMA_BIT_MASK(64));
 	if (err != 0) {
-		dev_err(&dev->dev, "Cannot set DMA mask\n");
-		goto fail_release_iomem;
-	}
-
-	err = pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(64));
-	if (err != 0) {
-		dev_err(&dev->dev, "Cannot set consistent DMA mask\n");
+		dev_err(&dev->dev, "Cannot set DMA mask and coherent\n");
 		goto fail_release_iomem;
 	}
 
diff --git a/scripts/so/x86_64/libstdc++.so.6 b/scripts/so/x86_64/libstdc++.so.6
deleted file mode 100644
index f2863bef57..0000000000
Binary files a/scripts/so/x86_64/libstdc++.so.6 and /dev/null differ