diff options
author | Nicolas Pitre <nico@cam.org> | 2005-09-01 07:37:13 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-09-01 07:37:13 -0400 |
commit | 68d9102f76de7a923fb81c8b6de4764f8f50ed17 (patch) | |
tree | 635711b71ef8aca704638b01bb2f58902b93d04a /arch/arm/kernel/entry-common.S | |
parent | 147056fb84150966d736fe21fa01d5e0f08e0980 (diff) |
[ARM] 2865/2: fix fadvise64_64 syscall argument passing
Patch from Nicolas Pitre
The prototype for sys_fadvise64_64() is:
long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice)
The argument list is therefore as follows on legacy ABI:
fd: type int (r0)
offset: type long long (r1-r2)
len: type long long (r3-sp[0])
advice: type int (sp[4])
With EABI this becomes:
fd: type int (r0)
offset: type long long (r2-r3)
len: type long long (sp[0]-sp[4])
advice: type int (sp[8])
Not only do we have ABI differences here, but the EABI version requires
one additional word on the syscall stack.
To avoid the ABI mismatch and the extra stack space required with EABI
this syscall is now defined with a different argument ordering
on ARM as follows:
long sys_arm_fadvise64_64(int fd, int advice, loff_t offset, loff_t len)
This gives us the following ABI independent argument distribution:
fd: type int (r0)
advice: type int (r1)
offset: type long long (r2-r3)
len: type long long (sp[0]-sp[4])
Now, since the syscall entry code takes care of 5 registers only by
default including the store of r4 to the stack, we need a wrapper to
store r5 to the stack as well. Because that wrapper was missing and was
always required this means that sys_fadvise64_64 never worked on ARM and
therefore we can safely reuse its syscall number for our new
sys_arm_fadvise64_64 interface.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/entry-common.S')
-rw-r--r-- | arch/arm/kernel/entry-common.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 3f8d0e3aefab..6281d488ac97 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
@@ -265,6 +265,10 @@ sys_futex_wrapper: | |||
265 | str r5, [sp, #4] @ push sixth arg | 265 | str r5, [sp, #4] @ push sixth arg |
266 | b sys_futex | 266 | b sys_futex |
267 | 267 | ||
268 | sys_arm_fadvise64_64_wrapper: | ||
269 | str r5, [sp, #4] @ push r5 to stack | ||
270 | b sys_arm_fadvise64_64 | ||
271 | |||
268 | /* | 272 | /* |
269 | * Note: off_4k (r5) is always units of 4K. If we can't do the requested | 273 | * Note: off_4k (r5) is always units of 4K. If we can't do the requested |
270 | * offset, we return EINVAL. | 274 | * offset, we return EINVAL. |