diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-02-27 11:51:52 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-02-27 11:51:52 -0500 |
| commit | 1ed82ae3df3882bfcb5bfe5e9f97e4e8e23af299 (patch) | |
| tree | 7f30dbdccd6c28aa4e8f2c9edb7813a7ae78097b /include/linux/syscalls.h | |
| parent | 11fff8287fdaeb700df79aa8253650b60c7b21e2 (diff) | |
| parent | cccc65a3b60edaf721cdee5a14f68ba009341822 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/syscalls.h')
| -rw-r--r-- | include/linux/syscalls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index d73501ba7e44..b9ea44ac0ddb 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
| @@ -543,7 +543,7 @@ asmlinkage long sys_unlinkat(int dfd, const char __user * pathname, int flag); | |||
| 543 | asmlinkage long sys_symlinkat(const char __user * oldname, | 543 | asmlinkage long sys_symlinkat(const char __user * oldname, |
| 544 | int newdfd, const char __user * newname); | 544 | int newdfd, const char __user * newname); |
| 545 | asmlinkage long sys_linkat(int olddfd, const char __user *oldname, | 545 | asmlinkage long sys_linkat(int olddfd, const char __user *oldname, |
| 546 | int newdfd, const char __user *newname); | 546 | int newdfd, const char __user *newname, int flags); |
| 547 | asmlinkage long sys_renameat(int olddfd, const char __user * oldname, | 547 | asmlinkage long sys_renameat(int olddfd, const char __user * oldname, |
| 548 | int newdfd, const char __user * newname); | 548 | int newdfd, const char __user * newname); |
| 549 | asmlinkage long sys_futimesat(int dfd, char __user *filename, | 549 | asmlinkage long sys_futimesat(int dfd, char __user *filename, |