diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-05-26 06:51:55 +0200 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-05-26 06:51:55 +0200 |
| commit | ece928df16494becd43f999aff9bd530182e7e81 (patch) | |
| tree | 905042764ea5d8ab6eda63666406e19f607bcf4c /arch/s390/include/asm/unistd.h | |
| parent | Ocfs2: Teach local-mounted ocfs2 to handle unwritten_extents correctly. (diff) | |
| parent | Ocfs2/move_extents: Set several trivial constraints for threshold. (diff) | |
| download | linux-ece928df16494becd43f999aff9bd530182e7e81.tar.xz linux-ece928df16494becd43f999aff9bd530182e7e81.zip | |
Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window
Conflicts:
fs/ocfs2/ioctl.c
Diffstat (limited to 'arch/s390/include/asm/unistd.h')
| -rw-r--r-- | arch/s390/include/asm/unistd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h index e82152572377..9208e69245a0 100644 --- a/arch/s390/include/asm/unistd.h +++ b/arch/s390/include/asm/unistd.h @@ -385,6 +385,7 @@ /* Ignore system calls that are also reachable via sys_socket */ #define __IGNORE_recvmmsg +#define __IGNORE_sendmmsg #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR |