From 7d595f6b79fc7056cb592549da356c9c3eaaa71e Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Wed, 13 Mar 2019 19:53:20 +0000 Subject: [PATCH] Resolve duplicate symbol name conflict after r345095, when building LINT. MFC after: 1 week Sponsored by: Mellanox Technologies --- sys/compat/linuxkpi/common/include/linux/idr.h | 8 +++++++- sys/compat/linuxkpi/common/src/linux_idr.c | 7 ------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/idr.h b/sys/compat/linuxkpi/common/include/linux/idr.h index 1985ec66ec2..7387032fd98 100644 --- a/sys/compat/linuxkpi/common/include/linux/idr.h +++ b/sys/compat/linuxkpi/common/include/linux/idr.h @@ -112,7 +112,6 @@ struct ida { int ida_pre_get(struct ida *ida, gfp_t gfp_mask); int ida_get_new_above(struct ida *ida, int starting_id, int *p_id); void ida_remove(struct ida *ida, int id); -void ida_free(struct ida *ida, int id); void ida_destroy(struct ida *ida); void ida_init(struct ida *ida); @@ -120,6 +119,13 @@ int ida_simple_get(struct ida *ida, unsigned int start, unsigned int end, gfp_t gfp_mask); void ida_simple_remove(struct ida *ida, unsigned int id); +static inline void +ida_free(struct ida *ida, int id) +{ + + ida_remove(ida, id); +} + static inline int ida_get_new(struct ida *ida, int *p_id) { diff --git a/sys/compat/linuxkpi/common/src/linux_idr.c b/sys/compat/linuxkpi/common/src/linux_idr.c index 4508cbdeb7f..773ebd3b841 100644 --- a/sys/compat/linuxkpi/common/src/linux_idr.c +++ b/sys/compat/linuxkpi/common/src/linux_idr.c @@ -796,13 +796,6 @@ ida_remove(struct ida *ida, int id) idr_remove(&ida->idr, id); } -void -ida_free(struct ida *ida, int id) -{ - - ida_remove(ida, id); -} - void ida_init(struct ida *ida) {