diff options
| author | Nadia Derbey <Nadia.Derbey@bull.net> | 2007-10-18 23:40:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 11:53:47 -0700 |
| commit | 28028313134e9f11e49f74a4beaa47c91e5ebf06 (patch) | |
| tree | adf36a3b40c5cb48ff5bd8803fc10530bac65450 | |
| parent | ce621f5ba52f30dd59aef4fb50276faee04ef9cf (diff) | |
| download | linux-28028313134e9f11e49f74a4beaa47c91e5ebf06.tar.gz linux-28028313134e9f11e49f74a4beaa47c91e5ebf06.tar.bz2 linux-28028313134e9f11e49f74a4beaa47c91e5ebf06.zip | |
ipc: inline ipc_buildid()
This is a trivial patch that changes the ipc_buildid() routine into a static
inline.
Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | ipc/util.c | 5 | ||||
| -rw-r--r-- | ipc/util.h | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ipc/util.c b/ipc/util.c index c51c96f2e0cf..49e75efe305b 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -695,11 +695,6 @@ struct kern_ipc_perm *ipc_lock(struct ipc_ids *ids, int id) 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 --git a/ipc/util.h b/ipc/util.h index fa7e7a07486e..76f8a79902de 100644 --- a/ipc/util.h +++ b/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_namespace *, struct ipc_ids *, 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) { |