diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-02-02 21:51:52 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-02-02 21:51:52 -0500 |
commit | 33052057e3e2db7f37fc78aa3f25c98f7e989fae (patch) | |
tree | e80a3aa1371f513c833dc94a16674f78faeeeb1d /include/linux/syscalls.h | |
parent | 00b464debf0038b1628996065f0be564ccfbfd86 (diff) | |
parent | 1113a7e92e483074c6235da59460759e33b9b144 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/syscalls.h')
-rw-r--r-- | include/linux/syscalls.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index fdbd436b24cc..3877209d23c3 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
@@ -559,12 +559,12 @@ asmlinkage long sys_newfstatat(int dfd, char __user *filename, | |||
559 | struct stat __user *statbuf, int flag); | 559 | struct stat __user *statbuf, int flag); |
560 | asmlinkage long sys_readlinkat(int dfd, const char __user *path, char __user *buf, | 560 | asmlinkage long sys_readlinkat(int dfd, const char __user *path, char __user *buf, |
561 | int bufsiz); | 561 | int bufsiz); |
562 | asmlinkage long compat_sys_futimesat(int dfd, char __user *filename, | 562 | asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename, |
563 | struct compat_timeval __user *t); | 563 | struct compat_timeval __user *t); |
564 | asmlinkage long compat_sys_newfstatat(int dfd, char __user * filename, | 564 | asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * filename, |
565 | struct compat_stat __user *statbuf, | 565 | struct compat_stat __user *statbuf, |
566 | int flag); | 566 | int flag); |
567 | asmlinkage long compat_sys_openat(int dfd, const char __user *filename, | 567 | asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename, |
568 | int flags, int mode); | 568 | int flags, int mode); |
569 | 569 | ||
570 | #endif | 570 | #endif |