projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[cascardo/linux.git]
/
ipc
/
msg.c
diff --git
a/ipc/msg.c
b/ipc/msg.c
index
b4eee1c
..
2ceab7f
100644
(file)
--- a/
ipc/msg.c
+++ b/
ipc/msg.c
@@
-309,7
+309,7
@@
static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
return security_msg_queue_associate(msq, msgflg);
}
return security_msg_queue_associate(msq, msgflg);
}
-
asmlinkage long sys_msgget(key_t key, int
msgflg)
+
SYSCALL_DEFINE2(msgget, key_t, key, int,
msgflg)
{
struct ipc_namespace *ns;
struct ipc_ops msg_ops;
{
struct ipc_namespace *ns;
struct ipc_ops msg_ops;
@@
-466,7
+466,7
@@
out_up:
return err;
}
return err;
}
-
asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *
buf)
+
SYSCALL_DEFINE3(msgctl, int, msqid, int, cmd, struct msqid_ds __user *,
buf)
{
struct msg_queue *msq;
int err, version;
{
struct msg_queue *msq;
int err, version;
@@
-723,8
+723,8
@@
out_free:
return err;
}
return err;
}
-asmlinkage long
-
sys_msgsnd(int msqid, struct msgbuf __user *msgp, size_t msgsz, int
msgflg)
+SYSCALL_DEFINE4(msgsnd, int, msqid, struct msgbuf __user *, msgp, size_t, msgsz,
+
int,
msgflg)
{
long mtype;
{
long mtype;
@@
-904,8
+904,8
@@
out_unlock:
return msgsz;
}
return msgsz;
}
-
asmlinkage long sys_msgrcv(int msqid, struct msgbuf __user *msgp, size_t
msgsz,
-
long msgtyp, int
msgflg)
+
SYSCALL_DEFINE5(msgrcv, int, msqid, struct msgbuf __user *, msgp, size_t,
msgsz,
+
long, msgtyp, int,
msgflg)
{
long err, mtype;
{
long err, mtype;