Commit cdba2490 authored by Dimitris Michailidis's avatar Dimitris Michailidis Committed by David S. Miller
Browse files

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: ee6373dd ("net/funeth: probing and netdev ops")
Fixes: db37bc17 ("net/funeth: add the data path")
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDimitris Michailidis <dmichail@fungible.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1330b6ef

drivers/net/ethernet/fungible/funeth/funeth_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/fungible/funeth/funeth_txrx.h

+1 −1
Original line number Diff line number Diff line
@@ -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);