diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:31 -0400 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /arch/arm/include/asm/unistd.h | |
| parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/include/asm/unistd.h')
| -rw-r--r-- | arch/arm/include/asm/unistd.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h index 010618487cf1..94cc58ef61ae 100644 --- a/arch/arm/include/asm/unistd.h +++ b/arch/arm/include/asm/unistd.h | |||
| @@ -387,6 +387,8 @@ | |||
| 387 | #define __NR_dup3 (__NR_SYSCALL_BASE+358) | 387 | #define __NR_dup3 (__NR_SYSCALL_BASE+358) |
| 388 | #define __NR_pipe2 (__NR_SYSCALL_BASE+359) | 388 | #define __NR_pipe2 (__NR_SYSCALL_BASE+359) |
| 389 | #define __NR_inotify_init1 (__NR_SYSCALL_BASE+360) | 389 | #define __NR_inotify_init1 (__NR_SYSCALL_BASE+360) |
| 390 | #define __NR_preadv (__NR_SYSCALL_BASE+361) | ||
| 391 | #define __NR_pwritev (__NR_SYSCALL_BASE+362) | ||
| 390 | 392 | ||
| 391 | /* | 393 | /* |
| 392 | * The following SWIs are ARM private. | 394 | * The following SWIs are ARM private. |