rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-07-27 20:55:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to Linux 4.12

Browse Source 
Linux baseline 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c (v4.12).
This commit is contained in:
Sebastian Huber 2017-07-10 09:19:10 +02:00
parent e3dc39ee0c
commit ef1655c144
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-org

@ -1 +1 @@
Subproject commit b23afd384801711ab6dbccd259cc14cb09a1dcaf Subproject commit 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c

2
linux/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
View File

@ -3036,7 +3036,7 @@ dpaa_eth_priv_probe(struct platform_device *pdev, struct mac_device *mac_dev)
#ifndef __rtems__ #ifndef __rtems__
/* device used for DMA mapping */ /* 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)); err = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(40));
if (err) { if (err) {
dev_err(dev, "dma_coerce_mask_and_coherent() failed\n"); dev_err(dev, "dma_coerce_mask_and_coherent() failed\n");

2
linux/drivers/net/ethernet/freescale/fman/mac.c
View File

@ -704,6 +704,8 @@ static struct platform_device *dpaa_eth_add_device(int fman_id,
goto no_mem; goto no_mem;
} }
set_dma_ops(&pdev->dev, get_dma_ops(priv->dev));
ret = platform_device_add_data(pdev, &data, sizeof(data)); ret = platform_device_add_data(pdev, &data, sizeof(data));
if (ret) if (ret)
goto err; goto err;