diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-06 08:11:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-06 08:11:33 +0100 |
| commit | 7119a341f35b0a3ddcf426818267980057c770a1 (patch) | |
| tree | 37e3b68d02bfc6f7759bf711e00d612ba86865b5 /arch/arm/include/asm/unistd.h | |
| parent | 87cdee71166fa107c5dc8e43060eeefa533c6a3b (diff) | |
| parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
Merge commit 'v3.2-rc4' into core/locking
Merge reason: Pick up post-rc1 fixes.
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 c60a2944f95..4a112378380 100644 --- a/arch/arm/include/asm/unistd.h +++ b/arch/arm/include/asm/unistd.h @@ -402,6 +402,8 @@ #define __NR_syncfs (__NR_SYSCALL_BASE+373) #define __NR_sendmmsg (__NR_SYSCALL_BASE+374) #define __NR_setns (__NR_SYSCALL_BASE+375) +#define __NR_process_vm_readv (__NR_SYSCALL_BASE+376) +#define __NR_process_vm_writev (__NR_SYSCALL_BASE+377) /* * The following SWIs are ARM private. |