diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-20 18:36:05 -0400 | 
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-20 18:36:05 -0400 | 
| commit | 857c68f733eea07f11a061caea43a38fed61adb7 (patch) | |
| tree | 4567a9e91f717b22143ac1ccb0fb5323ac15afd3 /arch/mips/kernel/linux32.c | |
| parent | 4741c336d27dec3ea68a35659abb8dc82b142388 (diff) | |
| parent | 402a26f0c040077ed6f941eefac5a6971f0d5f40 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/kernel/linux32.c')
| -rw-r--r-- | arch/mips/kernel/linux32.c | 10 | 
1 files changed, 10 insertions, 0 deletions
| diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 3f40c37a9ee6..7c953bcc5f6a 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
| @@ -1182,6 +1182,16 @@ asmlinkage ssize_t sys32_readahead(int fd, u32 pad0, u64 a2, u64 a3, | |||
| 1182 | return sys_readahead(fd, merge_64(a2, a3), count); | 1182 | return sys_readahead(fd, merge_64(a2, a3), count); | 
| 1183 | } | 1183 | } | 
| 1184 | 1184 | ||
| 1185 | asmlinkage long sys32_sync_file_range(int fd, int __pad, | ||
| 1186 | unsigned long a2, unsigned long a3, | ||
| 1187 | unsigned long a4, unsigned long a5, | ||
| 1188 | int flags) | ||
| 1189 | { | ||
| 1190 | return sys_sync_file_range(fd, | ||
| 1191 | merge_64(a2, a3), merge_64(a4, a5), | ||
| 1192 | flags); | ||
| 1193 | } | ||
| 1194 | |||
| 1185 | /* Argument list sizes for sys_socketcall */ | 1195 | /* Argument list sizes for sys_socketcall */ | 
| 1186 | #define AL(x) ((x) * sizeof(unsigned int)) | 1196 | #define AL(x) ((x) * sizeof(unsigned int)) | 
| 1187 | static unsigned char socketcall_nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3), | 1197 | static unsigned char socketcall_nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3), | 
