From: Dimitris Michailidis Date: Tue, 8 Mar 2022 04:53:21 +0000 (-0800) Subject: net/fungible: Fix local_memory_node error X-Git-Tag: v5.18-rc1~136^2~149 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=cdba24904e1dd4d5152c80f6f96a0ed187e7f8a4;p=linux-block.git 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 Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller --- 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);