Commit 3edaded8 authored Feb 16, 2019 by Wei Yongjun Committed by David S. Miller Feb 17, 2019

net: sgi: use GFP_ATOMIC under spin lock



The function meth_init_tx_ring() is called from meth_tx_timeout(),
in which spin_lock is held, so we should use GFP_ATOMIC instead.

Fixes: 8d4c28fb ("meth: pass struct device to DMA API functions")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent aaeb1dea

drivers/net/ethernet/sgi/meth.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -214,7 +214,7 @@ static int meth_init_tx_ring(struct meth_private *priv)
		{
		/* Init TX ring */
		priv->tx_ring = dma_alloc_coherent(&priv->pdev->dev,
		TX_RING_BUFFER_SIZE, &priv->tx_ring_dma, GFP_KERNEL);
		TX_RING_BUFFER_SIZE, &priv->tx_ring_dma, GFP_ATOMIC);
		if (!priv->tx_ring)
		return -ENOMEM;

Admin message