summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-09-14 10:43:11 +0200
committerPaul Mundt <lethal@linux-sh.org>2010-09-14 10:43:11 +0200
commit51d149be0a535634b86493a4d910e3320cc984ea (patch)
tree54da47b8e983f4062ca69742c3bd5fd90752852a /arch
parentsh: Add syscall entries for non multiplexed socket calls (diff)
downloadlinux-51d149be0a535634b86493a4d910e3320cc984ea.tar.xz
linux-51d149be0a535634b86493a4d910e3320cc984ea.zip
sh: Provide a non-multiplexed sys_recvmmsg path.
Now that the rest of the socket calls are provided through their own paths, do the same for sys_recvmmsg. It's unlikely we'll ever be able to kill off the socketcall path, but this at least permits userspace to gradually begin migrating. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/include/asm/unistd_32.h39
-rw-r--r--arch/sh/kernel/syscalls_32.S1
2 files changed, 20 insertions, 20 deletions
diff --git a/arch/sh/include/asm/unistd_32.h b/arch/sh/include/asm/unistd_32.h
index 2000709e681f..903cd618eb74 100644
--- a/arch/sh/include/asm/unistd_32.h
+++ b/arch/sh/include/asm/unistd_32.h
@@ -350,30 +350,29 @@
#define __NR_prlimit64 339
/* Non-multiplexed socket family */
-#define __NR_socket 340
-#define __NR_bind 341
-#define __NR_connect 342
-#define __NR_listen 343
-#define __NR_accept 344
-#define __NR_getsockname 345
-#define __NR_getpeername 346
-#define __NR_socketpair 347
-#define __NR_send 348
-#define __NR_sendto 349
-#define __NR_recv 350
-#define __NR_recvfrom 351
-#define __NR_shutdown 352
-#define __NR_setsockopt 353
-#define __NR_getsockopt 354
-#define __NR_sendmsg 355
-#define __NR_recvmsg 356
+#define __NR_socket 340
+#define __NR_bind 341
+#define __NR_connect 342
+#define __NR_listen 343
+#define __NR_accept 344
+#define __NR_getsockname 345
+#define __NR_getpeername 346
+#define __NR_socketpair 347
+#define __NR_send 348
+#define __NR_sendto 349
+#define __NR_recv 350
+#define __NR_recvfrom 351
+#define __NR_shutdown 352
+#define __NR_setsockopt 353
+#define __NR_getsockopt 354
+#define __NR_sendmsg 355
+#define __NR_recvmsg 356
+#define __NR_recvmmsg 357
-#define NR_syscalls 357
+#define NR_syscalls 358
#ifdef __KERNEL__
-#define __IGNORE_recvmmsg
-
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_OLD_STAT
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S
index 0847433e2dbe..e872e81add8a 100644
--- a/arch/sh/kernel/syscalls_32.S
+++ b/arch/sh/kernel/syscalls_32.S
@@ -374,3 +374,4 @@ ENTRY(sys_call_table)
.long sys_getsockopt
.long sys_sendmsg /* 355 */
.long sys_recvmsg
+ .long sys_recvmmsg