diff options
-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) | |||
695 | return out; | 695 | return out; |
696 | } | 696 | } |
697 | 697 | ||
698 | int ipc_buildid(struct ipc_ids* ids, int id, int seq) | ||
699 | { | ||
700 | return SEQ_MULTIPLIER*seq + id; | ||
701 | } | ||
702 | |||
703 | #ifdef __ARCH_WANT_IPC_PARSE_VERSION | 698 | #ifdef __ARCH_WANT_IPC_PARSE_VERSION |
704 | 699 | ||
705 | 700 | ||
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); | |||
107 | void ipc_rcu_putref(void *ptr); | 107 | void ipc_rcu_putref(void *ptr); |
108 | 108 | ||
109 | struct kern_ipc_perm *ipc_lock(struct ipc_ids *, int); | 109 | struct kern_ipc_perm *ipc_lock(struct ipc_ids *, int); |
110 | int ipc_buildid(struct ipc_ids* ids, int id, int seq); | ||
111 | 110 | ||
112 | void kernel_to_ipc64_perm(struct kern_ipc_perm *in, struct ipc64_perm *out); | 111 | void kernel_to_ipc64_perm(struct kern_ipc_perm *in, struct ipc64_perm *out); |
113 | void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out); | 112 | 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 *, | |||
127 | extern int ipcget_public(struct ipc_namespace *, struct ipc_ids *, | 126 | extern int ipcget_public(struct ipc_namespace *, struct ipc_ids *, |
128 | struct ipc_ops *, struct ipc_params *); | 127 | struct ipc_ops *, struct ipc_params *); |
129 | 128 | ||
129 | static inline int ipc_buildid(struct ipc_ids *ids, int id, int seq) | ||
130 | { | ||
131 | return SEQ_MULTIPLIER * seq + id; | ||
132 | } | ||
133 | |||
130 | static inline int ipc_checkid(struct ipc_ids *ids, struct kern_ipc_perm *ipcp, | 134 | static inline int ipc_checkid(struct ipc_ids *ids, struct kern_ipc_perm *ipcp, |
131 | int uid) | 135 | int uid) |
132 | { | 136 | { |