Merge commit 'v2.6.30-rc6' into perfcounters/core
Merge reason: this branch was on an -rc4 base, merge it up to -rc6 to get the latest upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@@ -434,6 +434,7 @@ asmlinkage long sys_fcntl(unsigned int fd, unsigned int cmd, unsigned long arg);
|
||||
asmlinkage long sys_fcntl64(unsigned int fd,
|
||||
unsigned int cmd, unsigned long arg);
|
||||
#endif
|
||||
asmlinkage long sys_pipe2(int __user *fildes, int flags);
|
||||
asmlinkage long sys_dup(unsigned int fildes);
|
||||
asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd);
|
||||
asmlinkage long sys_dup3(unsigned int oldfd, unsigned int newfd, int flags);
|
||||
|
Reference in New Issue
Block a user