diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-28 20:42:26 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-28 20:42:26 -0400 |
| commit | d6754b401a15eaa16492ea5dbaa4826361d3f411 (patch) | |
| tree | 032f067d3af458527d903a7653885404ed82431e /include/asm-x86_64 | |
| parent | acc429a517bd11fdcac9bea97d082d26231beb92 (diff) | |
| parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) | |
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) | |||
| 615 | __SYSCALL(__NR_tee, sys_tee) | 615 | __SYSCALL(__NR_tee, sys_tee) |
| 616 | #define __NR_sync_file_range 277 | 616 | #define __NR_sync_file_range 277 |
| 617 | __SYSCALL(__NR_sync_file_range, sys_sync_file_range) | 617 | __SYSCALL(__NR_sync_file_range, sys_sync_file_range) |
| 618 | #define __NR_vmsplice 278 | ||
| 619 | __SYSCALL(__NR_vmsplice, sys_vmsplice) | ||
| 618 | 620 | ||
| 619 | #define __NR_syscall_max __NR_sync_file_range | 621 | #define __NR_syscall_max __NR_vmsplice |
| 620 | 622 | ||
| 621 | #ifndef __NO_STUBS | 623 | #ifndef __NO_STUBS |
| 622 | 624 | ||