diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 18:19:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 18:19:14 -0400 |
commit | b24fd48a0b9afe9a16bec94ab10d7e83c1b57ce6 (patch) | |
tree | 6f9fc78982ab160853b84d215cdb70aeb537f91f /arch/arm/kernel/entry-common.S | |
parent | 0a305d2e1bd872fed6a073b27e38d457af2a69b0 (diff) | |
parent | 34f521fd5552fff2a5f892f4c3dbc75e309ad63b (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
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 db302c6e5343..81d450ac3fab 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
@@ -273,6 +273,10 @@ sys_mbind_wrapper: | |||
273 | str r5, [sp, #4] | 273 | str r5, [sp, #4] |
274 | b sys_mbind | 274 | b sys_mbind |
275 | 275 | ||
276 | sys_ipc_wrapper: | ||
277 | str r5, [sp, #4] @ push sixth arg | ||
278 | b sys_ipc | ||
279 | |||
276 | /* | 280 | /* |
277 | * Note: off_4k (r5) is always units of 4K. If we can't do the requested | 281 | * Note: off_4k (r5) is always units of 4K. If we can't do the requested |
278 | * offset, we return EINVAL. | 282 | * offset, we return EINVAL. |