diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-14 00:19:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-14 00:19:14 +0200 |
| commit | b24fd48a0b9afe9a16bec94ab10d7e83c1b57ce6 (patch) | |
| tree | 6f9fc78982ab160853b84d215cdb70aeb537f91f /arch | |
| parent | [PATCH] Even more fallout from ATI Xpress timer workaround (diff) | |
| parent | [ARM] 2896/1: Add sys_ipc_wrapper to pass 'fifth' argument on stack (diff) | |
| download | linux-b24fd48a0b9afe9a16bec94ab10d7e83c1b57ce6.tar.xz linux-b24fd48a0b9afe9a16bec94ab10d7e83c1b57ce6.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/calls.S | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 949ec4427f21..2ad4aa2a1536 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S @@ -131,7 +131,7 @@ __syscall_start: .long sys_wait4 /* 115 */ .long sys_swapoff .long sys_sysinfo - .long sys_ipc + .long sys_ipc_wrapper .long sys_fsync .long sys_sigreturn_wrapper /* 120 */ .long sys_clone_wrapper diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index db302c6e5343..81d450ac3fab 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -273,6 +273,10 @@ sys_mbind_wrapper: str r5, [sp, #4] b sys_mbind +sys_ipc_wrapper: + str r5, [sp, #4] @ push sixth arg + b sys_ipc + /* * Note: off_4k (r5) is always units of 4K. If we can't do the requested * offset, we return EINVAL. |