Skip to content

Commit b39aeb3

Browse files
arndbtorvalds
authored andcommitted
rdma: fix INFINIBAND_USER_ACCESS dependency
After a change to the bnxt_re driver, it fails to link when CONFIG_INFINIBAND_USER_ACCESS is disabled: aarch64-linux-ld: drivers/infiniband/hw/bnxt_re/ib_verbs.o: in function `bnxt_re_handler_BNXT_RE_METHOD_ALLOC_PAGE': ib_verbs.c:(.text+0xd64): undefined reference to `ib_uverbs_get_ucontext_file' aarch64-linux-ld: drivers/infiniband/hw/bnxt_re/ib_verbs.o:(.rodata+0x168): undefined reference to `uverbs_idr_class' aarch64-linux-ld: drivers/infiniband/hw/bnxt_re/ib_verbs.o:(.rodata+0x1a8): undefined reference to `uverbs_destroy_def_handler' The problem is that the 'bnxt_re_uapi_defs' structure is built unconditionally and references a couple of functions that are never really called in this configuration but instead require other functions that are left out. Adding an #ifdef around the new code, or a Kconfig dependency would address this problem, but adding the compile-time check inside of the UAPI_DEF_CHAIN_OBJ_TREE_NAMED() macro seems best because that also addresses the problem in other drivers that may run into the same dependency. Fixes: 360da60 ("RDMA/bnxt_re: Enable low latency push") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Leon Romanovsky <leon@kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent a8d7060 commit b39aeb3

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

include/rdma/uverbs_ioctl.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,10 @@ struct uapi_definition {
436436
}, \
437437
##__VA_ARGS__
438438
#define UAPI_DEF_CHAIN_OBJ_TREE_NAMED(_object_enum, ...) \
439-
UAPI_DEF_CHAIN_OBJ_TREE(_object_enum, &UVERBS_OBJECT(_object_enum), \
440-
##__VA_ARGS__)
439+
UAPI_DEF_CHAIN_OBJ_TREE(_object_enum, \
440+
PTR_IF(IS_ENABLED(CONFIG_INFINIBAND_USER_ACCESS), \
441+
&UVERBS_OBJECT(_object_enum)), \
442+
##__VA_ARGS__)
441443

442444
/*
443445
* =======================================

0 commit comments

Comments
 (0)