[rtems-libbsd commit] Update to Linux 4.12

[Sebastian Huber]

Module:    rtems-libbsd
Branch:    master
Commit:    ef1655c144b72f28d74557f1fc07d09a9d251a2b
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=ef1655c144b72f28d74557f1fc07d09a9d251a2b

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Jul 10 09:19:10 2017 +0200

Update to Linux 4.12

Linux baseline 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c (v4.12).

---

 linux-org                                            | 2 +-
 linux/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
 linux/drivers/net/ethernet/freescale/fman/mac.c      | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/linux-org b/linux-org
index b23afd3..6f7da29 160000
--- a/linux-org
+++ b/linux-org
@@ -1 +1 @@
-Subproject commit b23afd384801711ab6dbccd259cc14cb09a1dcaf
+Subproject commit 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c
diff --git a/linux/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/linux/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index e010f5d..c2e9b37 100644
--- a/linux/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/linux/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -3036,7 +3036,7 @@ dpaa_eth_priv_probe(struct platform_device *pdev, struct mac_device *mac_dev)
 
 #ifndef __rtems__
 	/* device used for DMA mapping */
-	arch_setup_dma_ops(dev, 0, 0, NULL, false);
+	set_dma_ops(dev, get_dma_ops(&pdev->dev));
 	err = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(40));
 	if (err) {
 		dev_err(dev, "dma_coerce_mask_and_coherent() failed\n");
diff --git a/linux/drivers/net/ethernet/freescale/fman/mac.c b/linux/drivers/net/ethernet/freescale/fman/mac.c
index f04ae70..b058b4a 100644
--- a/linux/drivers/net/ethernet/freescale/fman/mac.c
+++ b/linux/drivers/net/ethernet/freescale/fman/mac.c
@@ -704,6 +704,8 @@ static struct platform_device *dpaa_eth_add_device(int fman_id,
 		goto no_mem;
 	}
 
+	set_dma_ops(&pdev->dev, get_dma_ops(priv->dev));
+
 	ret = platform_device_add_data(pdev, &data, sizeof(data));
 	if (ret)
 		goto err;