aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-06-27 17:10:09 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-28 14:38:30 -0400
commitedd5cd4a9424f22b0fa08bef5e299d41befd5622 (patch)
treedba461b19b066c862a2c4e443b2deb9443bc78c5 /arch/powerpc
parent2f4d4da8f82c2598b8713f4a01f360f3751d90be (diff)
Introduce fixed sys_sync_file_range2() syscall, implement on PowerPC and ARM
Not all the world is an i386. Many architectures need 64-bit arguments to be aligned in suitable pairs of registers, and the original sys_sync_file_range(int, loff_t, loff_t, int) was therefore wasting an argument register for padding after the first integer. Since we don't normally have more than 6 arguments for system calls, that left no room for the final argument on some architectures. Fix this by introducing sys_sync_file_range2(int, int, loff_t, loff_t) which all fits nicely. In fact, ARM already had that, but called it sys_arm_sync_file_range. Move it to fs/sync.c and rename it, then implement the needed compatibility routine. And stop the missing syscall check from bitching about the absence of sys_sync_file_range() if we've implemented sys_sync_file_range2() instead. Tested on PPC32 and with 32-bit and 64-bit userspace on PPC64. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kernel/sys_ppc32.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index 047246ad4f65..b42cbf1e2d7d 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
813asmlinkage 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}