diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-26 07:47:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-26 07:47:55 -0700 |
| commit | 7b97ebfb931887be63bfa29b6c143e9e9da3f5e8 (patch) | |
| tree | faaf77f68ef4192ac1a3c23f43fed122a080d341 /include/asm-i386/unistd.h | |
| parent | 07db8696f5d484485dde77138ff87d19c8628a75 (diff) | |
| parent | 1ebd32fc54bd04de6b3944587f25513c0681f98e (diff) | |
Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] splice: add ->splice_write support for /dev/null
[PATCH] splice: rearrange moving to/from pipe helpers
[PATCH] Add support for the sys_vmsplice syscall
[PATCH] splice: fix offset problems
[PATCH] splice: fix min() warning
Diffstat (limited to 'include/asm-i386/unistd.h')
| -rw-r--r-- | include/asm-i386/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h index d81d6cfc1bb..eb4b152c82f 100644 --- a/include/asm-i386/unistd.h +++ b/include/asm-i386/unistd.h @@ -321,8 +321,9 @@ #define __NR_splice 313 #define __NR_sync_file_range 314 #define __NR_tee 315 +#define __NR_vmsplice 316 -#define NR_syscalls 316 +#define NR_syscalls 317 /* * user-visible error numbers are in the range -1 - -128: see |