diff options
| author |   Mark Brown <broonie@linaro.org> | 2014-05-05 12:27:30 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-05 12:27:30 -0700 |
| commit | af46929e6ee7197dfe315af3c5bb5cc75a0aec9c (patch) | |
| tree | 18359b934daf8c7e271930c938bd867a379cace7 /net/socket.c | |
| parent | ASoC: fsl_spdif: Use clk_set_rate() for spdif root clock only (diff) | |
| parent | Linux 3.15-rc4 (diff) | |
| download | wireguard-linux-af46929e6ee7197dfe315af3c5bb5cc75a0aec9c.tar.xz wireguard-linux-af46929e6ee7197dfe315af3c5bb5cc75a0aec9c.zip | |
Merge tag 'v3.15-rc4' into asoc-fsl-spdif
Linux 3.15-rc4
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c index 1b1e7e6a960f..abf56b2a14f9 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1880,8 +1880,8 @@ out: * Receive a datagram from a socket. */ -asmlinkage long sys_recv(int fd, void __user *ubuf, size_t size, - unsigned int flags) +SYSCALL_DEFINE4(recv, int, fd, void __user *, ubuf, size_t, size, + unsigned int, flags) { return sys_recvfrom(fd, ubuf, size, flags, NULL, NULL); } |