From: Nadia Derbey This is a trivial patch that changes the ipc_buildid() routine into a static inline. Signed-off-by: Nadia Derbey Signed-off-by: Andrew Morton --- ipc/util.c | 5 ----- ipc/util.h | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff -puN ipc/util.c~ipc-inline-ipc_buildid ipc/util.c --- a/ipc/util.c~ipc-inline-ipc_buildid +++ a/ipc/util.c @@ -695,11 +695,6 @@ struct kern_ipc_perm *ipc_lock(struct ip return out; } -int ipc_buildid(struct ipc_ids* ids, int id, int seq) -{ - return SEQ_MULTIPLIER*seq + id; -} - #ifdef __ARCH_WANT_IPC_PARSE_VERSION diff -puN ipc/util.h~ipc-inline-ipc_buildid ipc/util.h --- a/ipc/util.h~ipc-inline-ipc_buildid +++ a/ipc/util.h @@ -107,7 +107,6 @@ void ipc_rcu_getref(void *ptr); void ipc_rcu_putref(void *ptr); struct kern_ipc_perm *ipc_lock(struct ipc_ids *, int); -int ipc_buildid(struct ipc_ids* ids, int id, int seq); void kernel_to_ipc64_perm(struct kern_ipc_perm *in, struct ipc64_perm *out); void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out); @@ -127,6 +126,11 @@ extern int ipcget_new(struct ipc_namespa extern int ipcget_public(struct ipc_namespace *, struct ipc_ids *, struct ipc_ops *, struct ipc_params *); +static inline int ipc_buildid(struct ipc_ids *ids, int id, int seq) +{ + return SEQ_MULTIPLIER * seq + id; +} + static inline int ipc_checkid(struct ipc_ids *ids, struct kern_ipc_perm *ipcp, int uid) { _