diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 09:35:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 09:35:24 -0700 |
| commit | dee119b1fa672d65f34f86fe5cefa81d71ed040e (patch) | |
| tree | 3f9801db7e0c58e3596132642eba05204951206e | |
| parent | 1046a2c428bedd64c960dcfd0c57cc69a82fea2f (diff) | |
| parent | 5569459cd3a828a998dc305ae4141c1e41f25ecb (diff) | |
| download | talos-op-linux-dee119b1fa672d65f34f86fe5cefa81d71ed040e.tar.gz talos-op-linux-dee119b1fa672d65f34f86fe5cefa81d71ed040e.zip | |
Merge branch 'process_vm' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
* 'process_vm' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
[IA64] Wire up cross memory attach syscalls
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 4 | ||||
| -rw-r--r-- | arch/ia64/kernel/entry.S | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 7c928da35b17..7617248f0d11 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h @@ -321,11 +321,13 @@ #define __NR_syncfs 1329 #define __NR_setns 1330 #define __NR_sendmmsg 1331 +#define __NR_process_vm_readv 1332 +#define __NR_process_vm_writev 1333 #ifdef __KERNEL__ -#define NR_syscalls 308 /* length of syscall table */ +#define NR_syscalls 310 /* length of syscall table */ /* * The following defines stop scripts/checksyscalls.sh from complaining about diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 198c753d1006..5b31d46aff67 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1777,6 +1777,8 @@ sys_call_table: data8 sys_syncfs data8 sys_setns // 1330 data8 sys_sendmmsg + data8 sys_process_vm_readv + data8 sys_process_vm_writev .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |
