diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
| commit | e635a01ea0a16cf7cd31ecd2305870385dca9be6 (patch) | |
| tree | c7153e7dee5caf6ac90d85694ff27e4d0b606290 /include/linux/syscalls.h | |
| parent | 143070e74630b9557e1bb64d899ff2cc5a1dcb48 (diff) | |
| parent | 947391cfbaa3b08558844c0b187bcd0223c3f660 (diff) | |
Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'include/linux/syscalls.h')
| -rw-r--r-- | include/linux/syscalls.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 40617c1d8976..30520844b8da 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
| @@ -433,6 +433,7 @@ asmlinkage long sys_fcntl(unsigned int fd, unsigned int cmd, unsigned long arg); | |||
| 433 | asmlinkage long sys_fcntl64(unsigned int fd, | 433 | asmlinkage long sys_fcntl64(unsigned int fd, |
| 434 | unsigned int cmd, unsigned long arg); | 434 | unsigned int cmd, unsigned long arg); |
| 435 | #endif | 435 | #endif |
| 436 | asmlinkage long sys_pipe2(int __user *fildes, int flags); | ||
| 436 | asmlinkage long sys_dup(unsigned int fildes); | 437 | asmlinkage long sys_dup(unsigned int fildes); |
| 437 | asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd); | 438 | asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd); |
| 438 | asmlinkage long sys_dup3(unsigned int oldfd, unsigned int newfd, int flags); | 439 | asmlinkage long sys_dup3(unsigned int oldfd, unsigned int newfd, int flags); |