diff options
| author |   Dimitris Michailidis <d.michailidis@fungible.com> | 2022-03-07 20:53:21 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2022-03-09 11:26:07 +0000 |
| commit | cdba24904e1dd4d5152c80f6f96a0ed187e7f8a4 (patch) | |
| tree | a265c63e54a2bb3e7c4d53bd4d0580525506f6ec /drivers/net/ethernet/fungible | |
| parent | skb: make drop reason booleanable (diff) | |
| download | linux-dev-cdba24904e1dd4d5152c80f6f96a0ed187e7f8a4.tar.xz linux-dev-cdba24904e1dd4d5152c80f6f96a0ed187e7f8a4.zip | |
net/fungible: Fix local_memory_node error
Stephen Rothwell reported the following failure on powerpc:
ERROR: modpost: ".local_memory_node"
[drivers/net/ethernet/fungible/funeth/funeth.ko] undefined!
AFAICS this is because local_memory_node() is a non-inline non-exported
function when CONFIG_HAVE_MEMORYLESS_NODES=y. It is also the wrong API
to get a CPU's memory node. Use cpu_to_mem() in the two spots it's used.
Fixes: ee6373ddf3a9 ("net/funeth: probing and netdev ops")
Fixes: db37bc177dae ("net/funeth: add the data path")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Dimitris Michailidis <dmichail@fungible.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/fungible')
| -rw-r--r-- | drivers/net/ethernet/fungible/funeth/funeth_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/fungible/funeth/funeth_txrx.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/fungible/funeth/funeth_main.c b/drivers/net/ethernet/fungible/funeth/funeth_main.c index c58b10c216ef..67dd02ed1fa3 100644 --- a/drivers/net/ethernet/fungible/funeth/funeth_main.c +++ b/drivers/net/ethernet/fungible/funeth/funeth_main.c @@ -253,7 +253,7 @@ static struct fun_irq *fun_alloc_qirq(struct funeth_priv *fp, unsigned int idx, int cpu, res; cpu = cpumask_local_spread(idx, node); - node = local_memory_node(cpu_to_node(cpu)); + node = cpu_to_mem(cpu); irq = kzalloc_node(sizeof(*irq), GFP_KERNEL, node); if (!irq) diff --git a/drivers/net/ethernet/fungible/funeth/funeth_txrx.h b/drivers/net/ethernet/fungible/funeth/funeth_txrx.h index 7aed0561aeac..04c9f91b7489 100644 --- a/drivers/net/ethernet/fungible/funeth/funeth_txrx.h +++ b/drivers/net/ethernet/fungible/funeth/funeth_txrx.h @@ -239,7 +239,7 @@ static inline void fun_txq_wr_db(const struct funeth_txq *q) static inline int fun_irq_node(const struct fun_irq *p) { - return local_memory_node(cpu_to_node(cpumask_first(&p->affinity_mask))); + return cpu_to_mem(cpumask_first(&p->affinity_mask)); } int fun_rxq_napi_poll(struct napi_struct *napi, int budget); |