Commit 38435bc4 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Russell King

[ARM PATCH] 2456/1: fix futex syscall argument passing

Patch from Nicolas Pitre

sys_futex wrapper to store its sixth argument on the stack.
Also fix a typo with sys_clone_wapper.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King
parent 64fe2214
...@@ -134,7 +134,7 @@ __syscall_start: ...@@ -134,7 +134,7 @@ __syscall_start:
.long sys_ipc .long sys_ipc
.long sys_fsync .long sys_fsync
.long sys_sigreturn_wrapper .long sys_sigreturn_wrapper
/* 120 */ .long sys_clone_wapper /* 120 */ .long sys_clone_wrapper
.long sys_setdomainname .long sys_setdomainname
.long sys_newuname .long sys_newuname
.long sys_ni_syscall .long sys_ni_syscall
...@@ -254,7 +254,7 @@ __syscall_start: ...@@ -254,7 +254,7 @@ __syscall_start:
.long sys_fremovexattr .long sys_fremovexattr
.long sys_tkill .long sys_tkill
.long sys_sendfile64 .long sys_sendfile64
/* 240 */ .long sys_futex /* 240 */ .long sys_futex_wrapper
.long sys_sched_setaffinity .long sys_sched_setaffinity
.long sys_sched_getaffinity .long sys_sched_getaffinity
.long sys_io_setup .long sys_io_setup
......
...@@ -213,7 +213,7 @@ sys_execve_wrapper: ...@@ -213,7 +213,7 @@ sys_execve_wrapper:
add r3, sp, #S_OFF add r3, sp, #S_OFF
b sys_execve b sys_execve
sys_clone_wapper: sys_clone_wrapper:
add ip, sp, #S_OFF add ip, sp, #S_OFF
str ip, [sp, #4] str ip, [sp, #4]
b sys_clone b sys_clone
...@@ -238,6 +238,10 @@ sys_sigaltstack_wrapper: ...@@ -238,6 +238,10 @@ sys_sigaltstack_wrapper:
ldr r2, [sp, #S_OFF + S_SP] ldr r2, [sp, #S_OFF + S_SP]
b do_sigaltstack b do_sigaltstack
sys_futex_wrapper:
str r5, [sp, #4] @ push sixth arg
b sys_futex
/* /*
* Note: off_4k (r5) is always units of 4K. If we can't do the requested * Note: off_4k (r5) is always units of 4K. If we can't do the requested
* offset, we return EINVAL. * offset, we return EINVAL.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment