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

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 */