diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 06:36:20 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 06:36:20 -1000 |
| commit | 455ce9d8410d381f56a1676449a723ca1985b369 (patch) | |
| tree | 05ab694a3529958cf917214cfa3dd47b09dc1a2b /arch/parisc/include/asm/unistd.h | |
| parent | 447e1363bc2cc80fa9205a51a4f86d83c35b54a4 (diff) | |
| parent | 205e9a2106b934ea39049bab28f0896c17a2cb30 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
[PARISC] wire up sendmmsg syscall
[PARISC] fix return type of __atomic64_add_return
[PARISC] Fix futex support
Diffstat (limited to 'arch/parisc/include/asm/unistd.h')
| -rw-r--r-- | arch/parisc/include/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h index 3392de3e7be..d61de64f990 100644 --- a/arch/parisc/include/asm/unistd.h +++ b/arch/parisc/include/asm/unistd.h @@ -821,8 +821,9 @@ #define __NR_open_by_handle_at (__NR_Linux + 326) #define __NR_syncfs (__NR_Linux + 327) #define __NR_setns (__NR_Linux + 328) +#define __NR_sendmmsg (__NR_Linux + 329) -#define __NR_Linux_syscalls (__NR_setns + 1) +#define __NR_Linux_syscalls (__NR_sendmmsg + 1) #define __IGNORE_select /* newselect */ |