diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-04 08:03:16 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-04 08:03:16 +0900 |
| commit | cb37bbd90a11003993d47c395837e0f87abf1b31 (patch) | |
| tree | 404f13b334c2c2287e4bebac845c35db70ebfe81 /include | |
| parent | 3af91a1256b628d55913324d27fe747c69566749 (diff) | |
| parent | b36a968927b789b2dd8de0aaf7a72ef7c1f0d012 (diff) | |
| download | linux-stable-cb37bbd90a11003993d47c395837e0f87abf1b31.tar.gz linux-stable-cb37bbd90a11003993d47c395837e0f87abf1b31.tar.bz2 linux-stable-cb37bbd90a11003993d47c395837e0f87abf1b31.zip | |
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
asm-generic/unistd.h: support sendmmsg syscall
tile: enable CONFIG_BUGVERBOSE
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h index ae90e0f63995..4f76959397fa 100644 --- a/include/asm-generic/unistd.h +++ b/include/asm-generic/unistd.h @@ -683,9 +683,11 @@ __SC_COMP(__NR_clock_adjtime, sys_clock_adjtime, compat_sys_clock_adjtime) __SYSCALL(__NR_syncfs, sys_syncfs) #define __NR_setns 268 __SYSCALL(__NR_setns, sys_setns) +#define __NR_sendmmsg 269 +__SC_COMP(__NR_sendmmsg, sys_sendmmsg, compat_sys_sendmmsg) #undef __NR_syscalls -#define __NR_syscalls 269 +#define __NR_syscalls 270 /* * All syscalls below here should go away really, |