[PATCH 06/06] This is a trivial patch that changes the ipc_buildid() routine into a static inline. Signed-off-by: Nadia Derbey --- ipc/util.c | 5 ----- ipc/util.h | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-) Index: linux-2.6.23-rc2/ipc/util.h =================================================================== --- linux-2.6.23-rc2.orig/ipc/util.h 2007-08-31 12:53:30.000000000 +0200 +++ linux-2.6.23-rc2/ipc/util.h 2007-08-31 12:58:14.000000000 +0200 @@ -106,7 +106,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); @@ -126,6 +125,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) { Index: linux-2.6.23-rc2/ipc/util.c =================================================================== --- linux-2.6.23-rc2.orig/ipc/util.c 2007-08-31 12:54:39.000000000 +0200 +++ linux-2.6.23-rc2/ipc/util.c 2007-08-31 12:58:40.000000000 +0200 @@ -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 -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/