tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[ARM] 2896/1: Add sys_ipc_wrapper to pass 'fifth' argument on stack

Patch from George G. Davis

As pointed out be Matthew Klahn <MKLAHN@motorola.com>, some sys_ipc()
call options require six args, e.g. SEMTIMEDOP. This patch adds an ARM sys_ipc_wrapper to save the sys_ipc() 'fifth' arg on the stack.

Signed-off-by: George G. Davis <gdavis@mvista.com>
arch/arm/kernel/calls.S | 2 +-
arch/arm/kernel/entry-common.S | 5 +++++
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by George G. Davis and committed by Russell King 34f521fd 2f4ba45a

+5 -1
unified split
+1 -1
arch/arm/kernel/calls.S
··· 131 .long sys_wait4 132 /* 115 */ .long sys_swapoff 133 .long sys_sysinfo 134 - .long sys_ipc 135 .long sys_fsync 136 .long sys_sigreturn_wrapper 137 /* 120 */ .long sys_clone_wrapper
··· 131 .long sys_wait4 132 /* 115 */ .long sys_swapoff 133 .long sys_sysinfo 134 + .long sys_ipc_wrapper 135 .long sys_fsync 136 .long sys_sigreturn_wrapper 137 /* 120 */ .long sys_clone_wrapper
+4
arch/arm/kernel/entry-common.S
··· 273 str r5, [sp, #4] 274 b sys_mbind 275 276 /* 277 * Note: off_4k (r5) is always units of 4K. If we can't do the requested 278 * offset, we return EINVAL.
··· 273 str r5, [sp, #4] 274 b sys_mbind 275 276 + sys_ipc_wrapper: 277 + str r5, [sp, #4] @ push sixth arg 278 + b sys_ipc 279 + 280 /* 281 * Note: off_4k (r5) is always units of 4K. If we can't do the requested 282 * offset, we return EINVAL.