diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-29 02:42:26 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-29 02:42:26 +0200 |
| commit | d6754b401a15eaa16492ea5dbaa4826361d3f411 (patch) | |
| tree | 032f067d3af458527d903a7653885404ed82431e /include/asm-x86_64 | |
| parent | linux/blkpg.h needs <linux/compiler.h> for __user (diff) | |
| parent | [PATCH] slab: fix crash on __drain_alien_cahce() during CPU Hotplug (diff) | |
| download | linux-d6754b401a15eaa16492ea5dbaa4826361d3f411.tar.xz linux-d6754b401a15eaa16492ea5dbaa4826361d3f411.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-x86_64')
| -rw-r--r-- | include/asm-x86_64/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h index 98c36eae567c..feb77cb8c044 100644 --- a/include/asm-x86_64/unistd.h +++ b/include/asm-x86_64/unistd.h @@ -615,8 +615,10 @@ __SYSCALL(__NR_splice, sys_splice) __SYSCALL(__NR_tee, sys_tee) #define __NR_sync_file_range 277 __SYSCALL(__NR_sync_file_range, sys_sync_file_range) +#define __NR_vmsplice 278 +__SYSCALL(__NR_vmsplice, sys_vmsplice) -#define __NR_syscall_max __NR_sync_file_range +#define __NR_syscall_max __NR_vmsplice #ifndef __NO_STUBS |