Skip to content

Commit d247667

Browse files
mark-blochjgunthorpe
authored andcommitted
RDMA/mlx5: Fix compilation warning when USER_ACCESS isn't set
The cited commit made fs.c always compile, even when INFINIBAND_USER_ACCESS isn't set. This results in a compilation warning about an unused object when compiling with W=1 and USER_ACCESS is unset. Fix this by defining uverbs_destroy_def_handler() even when USER_ACCESS isn't set. Fixes: 36e0d43 ("RDMA/mlx5: Compile fs.c regardless of INFINIBAND_USER_ACCESS config") Link: https://patch.msgid.link/r/20250402070944.1022093-1-mbloch@nvidia.com Signed-off-by: Mark Bloch <mbloch@nvidia.com> Tested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
1 parent 95ba385 commit d247667

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

drivers/infiniband/hw/mlx5/fs.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3461,7 +3461,6 @@ DECLARE_UVERBS_NAMED_OBJECT(
34613461
&UVERBS_METHOD(MLX5_IB_METHOD_STEERING_ANCHOR_DESTROY));
34623462

34633463
const struct uapi_definition mlx5_ib_flow_defs[] = {
3464-
#if IS_ENABLED(CONFIG_INFINIBAND_USER_ACCESS)
34653464
UAPI_DEF_CHAIN_OBJ_TREE_NAMED(
34663465
MLX5_IB_OBJECT_FLOW_MATCHER),
34673466
UAPI_DEF_CHAIN_OBJ_TREE(
@@ -3472,7 +3471,6 @@ const struct uapi_definition mlx5_ib_flow_defs[] = {
34723471
UAPI_DEF_CHAIN_OBJ_TREE_NAMED(
34733472
MLX5_IB_OBJECT_STEERING_ANCHOR,
34743473
UAPI_DEF_IS_OBJ_SUPPORTED(mlx5_ib_shared_ft_allowed)),
3475-
#endif
34763474
{},
34773475
};
34783476

include/rdma/ib_verbs.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4790,7 +4790,14 @@ void roce_del_all_netdev_gids(struct ib_device *ib_dev,
47904790

47914791
struct ib_ucontext *ib_uverbs_get_ucontext_file(struct ib_uverbs_file *ufile);
47924792

4793+
#if IS_ENABLED(CONFIG_INFINIBAND_USER_ACCESS)
47934794
int uverbs_destroy_def_handler(struct uverbs_attr_bundle *attrs);
4795+
#else
4796+
static inline int uverbs_destroy_def_handler(struct uverbs_attr_bundle *attrs)
4797+
{
4798+
return 0;
4799+
}
4800+
#endif
47944801

47954802
struct net_device *rdma_alloc_netdev(struct ib_device *device, u32 port_num,
47964803
enum rdma_netdev_t type, const char *name,

0 commit comments

Comments
 (0)