upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve duplicate symbol name conflict after r345095, when building LINT.

Browse source 
MFC after:		1 week
Sponsored by:		Mellanox Technologies
This commit is contained in:
Hans Petter Selasky 2019-03-13 19:53:20 +00:00
parent 998f22eb4b
commit 7d595f6b79
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/compat/linuxkpi/common/include/linux/idr.h
View file

@ -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)
{

7
sys/compat/linuxkpi/common/src/linux_idr.c
View file

@ -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)
{