diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-09 08:08:57 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-09 08:08:57 -0800 |
commit | 53523d5263dce1a3e3662c612f7050a4569071ad (patch) | |
tree | bc2ec3f77fcead18065c9642f456d9f6f50eb725 /include/asm-generic/unistd.h | |
parent | 592d44a5f8458892c007c61b9cfa677efede5e1e (diff) | |
parent | 0c90547b4a3fcee184db4d54ffc1a4fb17fd54d6 (diff) | |
download | blackbird-op-linux-53523d5263dce1a3e3662c612f7050a4569071ad.tar.gz blackbird-op-linux-53523d5263dce1a3e3662c612f7050a4569071ad.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: use new generic {enable,disable}_percpu_irq() routines
drivers/net/ethernet/tile: use skb_frag_page() API
asm-generic/unistd.h: support new process_vm_{readv,write} syscalls
arch/tile: fix double-free bug in homecache_free_pages()
arch/tile: add a few #includes and an EXPORT to catch up with kernel changes.
Diffstat (limited to 'include/asm-generic/unistd.h')
-rw-r--r-- | include/asm-generic/unistd.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h index f4c38d8c6674..2292d1af9d70 100644 --- a/include/asm-generic/unistd.h +++ b/include/asm-generic/unistd.h @@ -685,9 +685,15 @@ __SYSCALL(__NR_syncfs, sys_syncfs) __SYSCALL(__NR_setns, sys_setns) #define __NR_sendmmsg 269 __SC_COMP(__NR_sendmmsg, sys_sendmmsg, compat_sys_sendmmsg) +#define __NR_process_vm_readv 270 +__SC_COMP(__NR_process_vm_readv, sys_process_vm_readv, \ + compat_sys_process_vm_readv) +#define __NR_process_vm_writev 271 +__SC_COMP(__NR_process_vm_writev, sys_process_vm_writev, \ + compat_sys_process_vm_writev) #undef __NR_syscalls -#define __NR_syscalls 270 +#define __NR_syscalls 272 /* * All syscalls below here should go away really, |