diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:53 -0400 |
| commit | 7894eaf291238a62a565e9e9777483beeb00eeae (patch) | |
| tree | 43c08830d2030d39d719f3f3d54a0e9b36554770 /include/linux/syscalls.h | |
| parent | 9e73972cef1c0961c78b0e0b61c4ecc275b29f04 (diff) | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
Merge branch 'upstream' into irq-pio
Diffstat (limited to 'include/linux/syscalls.h')
| -rw-r--r-- | include/linux/syscalls.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index d3ebc0e68b2b..3996960fc565 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
| @@ -574,6 +574,9 @@ asmlinkage long sys_splice(int fd_in, loff_t __user *off_in, | |||
| 574 | int fd_out, loff_t __user *off_out, | 574 | int fd_out, loff_t __user *off_out, |
| 575 | size_t len, unsigned int flags); | 575 | size_t len, unsigned int flags); |
| 576 | 576 | ||
| 577 | asmlinkage long sys_vmsplice(int fd, const struct iovec __user *iov, | ||
| 578 | unsigned long nr_segs, unsigned int flags); | ||
| 579 | |||
| 577 | asmlinkage long sys_tee(int fdin, int fdout, size_t len, unsigned int flags); | 580 | asmlinkage long sys_tee(int fdin, int fdout, size_t len, unsigned int flags); |
| 578 | 581 | ||
| 579 | asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes, | 582 | asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes, |