diff options
-rw-r--r-- | arch/arm/kernel/calls.S | 2 | ||||
-rw-r--r-- | arch/arm/kernel/sys_arm.c | 13 | ||||
-rw-r--r-- | arch/powerpc/kernel/sys_ppc32.c | 9 | ||||
-rw-r--r-- | fs/sync.c | 8 | ||||
-rw-r--r-- | include/asm-arm/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-powerpc/systbl.h | 1 | ||||
-rw-r--r-- | include/asm-powerpc/unistd.h | 3 | ||||
-rw-r--r-- | include/linux/syscalls.h | 2 | ||||
-rwxr-xr-x | scripts/checksyscalls.sh | 5 |
9 files changed, 29 insertions, 15 deletions
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 19326d7cdeb..a98d0c933db 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S | |||
@@ -350,7 +350,7 @@ | |||
350 | CALL(sys_set_robust_list) | 350 | CALL(sys_set_robust_list) |
351 | CALL(sys_get_robust_list) | 351 | CALL(sys_get_robust_list) |
352 | /* 340 */ CALL(sys_splice) | 352 | /* 340 */ CALL(sys_splice) |
353 | CALL(sys_arm_sync_file_range) | 353 | CALL(sys_sync_file_range2) |
354 | CALL(sys_tee) | 354 | CALL(sys_tee) |
355 | CALL(sys_vmsplice) | 355 | CALL(sys_vmsplice) |
356 | CALL(sys_move_pages) | 356 | CALL(sys_move_pages) |
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c index 1ca2d5174fc..4d25e49a14f 100644 --- a/arch/arm/kernel/sys_arm.c +++ b/arch/arm/kernel/sys_arm.c | |||
@@ -328,16 +328,3 @@ asmlinkage long sys_arm_fadvise64_64(int fd, int advice, | |||
328 | { | 328 | { |
329 | return sys_fadvise64_64(fd, offset, len, advice); | 329 | return sys_fadvise64_64(fd, offset, len, advice); |
330 | } | 330 | } |
331 | |||
332 | /* | ||
333 | * Yet more syscall fsckage - we can't fit sys_sync_file_range's | ||
334 | * arguments into the available registers with EABI. So, let's | ||
335 | * create an ARM specific syscall for this which has _sane_ | ||
336 | * arguments. (This incidentally also has an ABI-independent | ||
337 | * argument layout.) | ||
338 | */ | ||
339 | asmlinkage long sys_arm_sync_file_range(int fd, unsigned int flags, | ||
340 | loff_t offset, loff_t nbytes) | ||
341 | { | ||
342 | return sys_sync_file_range(fd, offset, nbytes, flags); | ||
343 | } | ||
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c index 047246ad4f6..b42cbf1e2d7 100644 --- a/arch/powerpc/kernel/sys_ppc32.c +++ b/arch/powerpc/kernel/sys_ppc32.c | |||
@@ -810,3 +810,12 @@ asmlinkage long compat_sys_request_key(const char __user *_type, | |||
810 | return sys_request_key(_type, _description, _callout_info, destringid); | 810 | return sys_request_key(_type, _description, _callout_info, destringid); |
811 | } | 811 | } |
812 | 812 | ||
813 | asmlinkage long compat_sys_sync_file_range2(int fd, unsigned int flags, | ||
814 | unsigned offset_hi, unsigned offset_lo, | ||
815 | unsigned nbytes_hi, unsigned nbytes_lo) | ||
816 | { | ||
817 | loff_t offset = ((loff_t)offset_hi << 32) | offset_lo; | ||
818 | loff_t nbytes = ((loff_t)nbytes_hi << 32) | nbytes_lo; | ||
819 | |||
820 | return sys_sync_file_range(fd, offset, nbytes, flags); | ||
821 | } | ||
@@ -236,6 +236,14 @@ out: | |||
236 | return ret; | 236 | return ret; |
237 | } | 237 | } |
238 | 238 | ||
239 | /* It would be nice if people remember that not all the world's an i386 | ||
240 | when they introduce new system calls */ | ||
241 | asmlinkage long sys_sync_file_range2(int fd, unsigned int flags, | ||
242 | loff_t offset, loff_t nbytes) | ||
243 | { | ||
244 | return sys_sync_file_range(fd, offset, nbytes, flags); | ||
245 | } | ||
246 | |||
239 | /* | 247 | /* |
240 | * `endbyte' is inclusive | 248 | * `endbyte' is inclusive |
241 | */ | 249 | */ |
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h index 250d7f145ac..bfdbebebdc1 100644 --- a/include/asm-arm/unistd.h +++ b/include/asm-arm/unistd.h | |||
@@ -367,6 +367,7 @@ | |||
367 | #define __NR_get_robust_list (__NR_SYSCALL_BASE+339) | 367 | #define __NR_get_robust_list (__NR_SYSCALL_BASE+339) |
368 | #define __NR_splice (__NR_SYSCALL_BASE+340) | 368 | #define __NR_splice (__NR_SYSCALL_BASE+340) |
369 | #define __NR_arm_sync_file_range (__NR_SYSCALL_BASE+341) | 369 | #define __NR_arm_sync_file_range (__NR_SYSCALL_BASE+341) |
370 | #define __NR_sync_file_range2 __NR_arm_sync_file_range | ||
370 | #define __NR_tee (__NR_SYSCALL_BASE+342) | 371 | #define __NR_tee (__NR_SYSCALL_BASE+342) |
371 | #define __NR_vmsplice (__NR_SYSCALL_BASE+343) | 372 | #define __NR_vmsplice (__NR_SYSCALL_BASE+343) |
372 | #define __NR_move_pages (__NR_SYSCALL_BASE+344) | 373 | #define __NR_move_pages (__NR_SYSCALL_BASE+344) |
diff --git a/include/asm-powerpc/systbl.h b/include/asm-powerpc/systbl.h index 700ca592874..1cc3f9cb6f4 100644 --- a/include/asm-powerpc/systbl.h +++ b/include/asm-powerpc/systbl.h | |||
@@ -311,3 +311,4 @@ COMPAT_SYS_SPU(utimensat) | |||
311 | COMPAT_SYS_SPU(signalfd) | 311 | COMPAT_SYS_SPU(signalfd) |
312 | COMPAT_SYS_SPU(timerfd) | 312 | COMPAT_SYS_SPU(timerfd) |
313 | SYSCALL_SPU(eventfd) | 313 | SYSCALL_SPU(eventfd) |
314 | COMPAT_SYS_SPU(sync_file_range2) | ||
diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h index e3c28dc31ab..f71c6061f1e 100644 --- a/include/asm-powerpc/unistd.h +++ b/include/asm-powerpc/unistd.h | |||
@@ -330,10 +330,11 @@ | |||
330 | #define __NR_signalfd 305 | 330 | #define __NR_signalfd 305 |
331 | #define __NR_timerfd 306 | 331 | #define __NR_timerfd 306 |
332 | #define __NR_eventfd 307 | 332 | #define __NR_eventfd 307 |
333 | #define __NR_sync_file_range2 308 | ||
333 | 334 | ||
334 | #ifdef __KERNEL__ | 335 | #ifdef __KERNEL__ |
335 | 336 | ||
336 | #define __NR_syscalls 308 | 337 | #define __NR_syscalls 309 |
337 | 338 | ||
338 | #define __NR__exit __NR_exit | 339 | #define __NR__exit __NR_exit |
339 | #define NR_syscalls __NR_syscalls | 340 | #define NR_syscalls __NR_syscalls |
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index b02070eac42..83d0ec11235 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
@@ -598,6 +598,8 @@ asmlinkage long sys_tee(int fdin, int fdout, size_t len, unsigned int flags); | |||
598 | 598 | ||
599 | asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes, | 599 | asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes, |
600 | unsigned int flags); | 600 | unsigned int flags); |
601 | asmlinkage long sys_sync_file_range2(int fd, unsigned int flags, | ||
602 | loff_t offset, loff_t nbytes); | ||
601 | asmlinkage long sys_get_robust_list(int pid, | 603 | asmlinkage long sys_get_robust_list(int pid, |
602 | struct robust_list_head __user * __user *head_ptr, | 604 | struct robust_list_head __user * __user *head_ptr, |
603 | size_t __user *len_ptr); | 605 | size_t __user *len_ptr); |
diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh index f98171f5a3d..0dcc01ce45a 100755 --- a/scripts/checksyscalls.sh +++ b/scripts/checksyscalls.sh | |||
@@ -99,6 +99,11 @@ cat << EOF | |||
99 | #define __IGNORE_setfsuid32 | 99 | #define __IGNORE_setfsuid32 |
100 | #define __IGNORE_setfsgid32 | 100 | #define __IGNORE_setfsgid32 |
101 | 101 | ||
102 | /* sync_file_range had a stupid ABI. Allow sync_file_range2 instead */ | ||
103 | #ifdef __NR_sync_file_range2 | ||
104 | #define __IGNORE_sync_file_range | ||
105 | #endif | ||
106 | |||
102 | /* Unmerged syscalls for AFS, STREAMS, etc. */ | 107 | /* Unmerged syscalls for AFS, STREAMS, etc. */ |
103 | #define __IGNORE_afs_syscall | 108 | #define __IGNORE_afs_syscall |
104 | #define __IGNORE_getpmsg | 109 | #define __IGNORE_getpmsg |