Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28028313 authored by Nadia Derbey's avatar Nadia Derbey Committed by Linus Torvalds
Browse files

ipc: inline ipc_buildid() 



This is a trivial patch that changes the ipc_buildid() routine into a static
inline.

Signed-off-by: default avatarNadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ce621f5b

ipc/util.c

+0 −5
Original line number Diff line number Diff line
@@ -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

ipc/util.h

+5 −1
Original line number Diff line number Diff line
@@ -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)

{