| Message ID | 20240913032824.2117095-1-almasrymina@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 52fa3b6532ec6f3a1e39bf869b304d3560dd983b |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] memory-provider: fix compilation issue without SYSFS | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Fri, 13 Sep 2024 03:28:24 +0000 you wrote: > When CONFIG_SYSFS is not set, the kernel fails to compile: > > net/core/page_pool_user.c:368:45: error: implicit declaration of function 'get_netdev_rx_queue_index' [-Werror=implicit-function-declaration] > 368 | if (pool->slow.queue_idx == get_netdev_rx_queue_index(rxq)) { > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > > When CONFIG_SYSFS is not set, get_netdev_rx_queue_index() is not defined > as well. > > [...] Here is the summary with links: - [net-next,v2] memory-provider: fix compilation issue without SYSFS https://git.kernel.org/netdev/net-next/c/52fa3b6532ec You are awesome, thank you!
diff --git a/include/net/netdev_rx_queue.h b/include/net/netdev_rx_queue.h index ac34f5fb4f71..596836abf7bf 100644 --- a/include/net/netdev_rx_queue.h +++ b/include/net/netdev_rx_queue.h @@ -45,7 +45,6 @@ __netif_get_rx_queue(struct net_device *dev, unsigned int rxq) return dev->_rx + rxq; } -#ifdef CONFIG_SYSFS static inline unsigned int get_netdev_rx_queue_index(struct netdev_rx_queue *queue) { @@ -55,7 +54,6 @@ get_netdev_rx_queue_index(struct netdev_rx_queue *queue) BUG_ON(index >= dev->num_rx_queues); return index; } -#endif int netdev_rx_queue_restart(struct net_device *dev, unsigned int rxq);
When CONFIG_SYSFS is not set, the kernel fails to compile: net/core/page_pool_user.c:368:45: error: implicit declaration of function 'get_netdev_rx_queue_index' [-Werror=implicit-function-declaration] 368 | if (pool->slow.queue_idx == get_netdev_rx_queue_index(rxq)) { | ^~~~~~~~~~~~~~~~~~~~~~~~~ When CONFIG_SYSFS is not set, get_netdev_rx_queue_index() is not defined as well. Fix by removing the ifdef around get_netdev_rx_queue_index(). It is not needed anymore after commit e817f85652c1 ("xdp: generic XDP handling of xdp_rxq_info") removed most of the CONFIG_SYSFS ifdefs. Fixes: 0f9214046893 ("memory-provider: dmabuf devmem memory provider") Cc: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: Mina Almasry <almasrymina@google.com> --- v2: - I (mina) sent v2 of Matthieu's fix. - Remove the ifdef around the function definition. It's not needed anymore (Jakub) --- include/net/netdev_rx_queue.h | 2 -- 1 file changed, 2 deletions(-)