aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/syscalls.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-18 04:54:00 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-18 04:54:00 -0400
commit4741c336d27dec3ea68a35659abb8dc82b142388 (patch)
treea8576df82129354b77b0144c480c446ec7aba7b2 /include/linux/syscalls.h
parent26ec634c31a11a003040e10b4d650495158632fd (diff)
parenta9a5cd5d2a57fb76dbae2115450f777b69beccf7 (diff)
Merge branch 'master'
Diffstat (limited to 'include/linux/syscalls.h')
-rw-r--r--include/linux/syscalls.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index f001bad28d9a..d3ebc0e68b2b 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -574,6 +574,8 @@ 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
577asmlinkage long sys_tee(int fdin, int fdout, size_t len, unsigned int flags);
578
577asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes, 579asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes,
578 unsigned int flags); 580 unsigned int flags);
579 581