summaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/unistd.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-01-21 23:55:25 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-01-21 23:55:25 -0800
commit7755726fe90a8b253659756e6de68c1a55aa427f (patch)
treea3523fa77e07854db3b8089e3066a55ea997060c /arch/s390/include/asm/unistd.h
parent3bf127637e22ddf95e67e10a23c339cee3d52429 (diff)
parent92dcffb916d309aa01778bf8963a6932e4014d07 (diff)
downloadop-kernel-dev-7755726fe90a8b253659756e6de68c1a55aa427f.zip
op-kernel-dev-7755726fe90a8b253659756e6de68c1a55aa427f.tar.gz
Merge commit 'v2.6.33-rc5' into next
Diffstat (limited to 'arch/s390/include/asm/unistd.h')
-rw-r--r--arch/s390/include/asm/unistd.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
index cb5232d..6e9f049 100644
--- a/arch/s390/include/asm/unistd.h
+++ b/arch/s390/include/asm/unistd.h
@@ -376,6 +376,9 @@
#define __IGNORE_migrate_pages
#define __IGNORE_move_pages
+/* Ignore system calls that are also reachable via sys_socket */
+#define __IGNORE_recvmmsg
+
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_SYS_ALARM
OpenPOWER on IntegriCloud