Date: Wed, 13 Mar 2019 19:53:20 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345110 - in head/sys/compat/linuxkpi/common: include/linux src Message-ID: <201903131953.x2DJrK21023537@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Wed Mar 13 19:53:20 2019 New Revision: 345110 URL: https://svnweb.freebsd.org/changeset/base/345110 Log: Resolve duplicate symbol name conflict after r345095, when building LINT. MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/idr.h head/sys/compat/linuxkpi/common/src/linux_idr.c Modified: head/sys/compat/linuxkpi/common/include/linux/idr.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/idr.h Wed Mar 13 19:31:33 2019 (r345109) +++ head/sys/compat/linuxkpi/common/include/linux/idr.h Wed Mar 13 19:53:20 2019 (r345110) @@ -112,13 +112,19 @@ 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); 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) Modified: head/sys/compat/linuxkpi/common/src/linux_idr.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_idr.c Wed Mar 13 19:31:33 2019 (r345109) +++ head/sys/compat/linuxkpi/common/src/linux_idr.c Wed Mar 13 19:53:20 2019 (r345110) @@ -797,13 +797,6 @@ ida_remove(struct ida *ida, int id) } void -ida_free(struct ida *ida, int id) -{ - - ida_remove(ida, id); -} - -void ida_init(struct ida *ida) { idr_init(&ida->idr);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903131953.x2DJrK21023537>