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/linux | |
| parent | 592d44a5f8458892c007c61b9cfa677efede5e1e (diff) | |
| parent | 0c90547b4a3fcee184db4d54ffc1a4fb17fd54d6 (diff) | |
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/linux')
| -rw-r--r-- | include/linux/compat.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index 154bf568301..66ed067fb72 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -552,5 +552,14 @@ extern ssize_t compat_rw_copy_check_uvector(int type, extern void __user *compat_alloc_user_space(unsigned long len); +asmlinkage ssize_t compat_sys_process_vm_readv(compat_pid_t pid, + const struct compat_iovec __user *lvec, + unsigned long liovcnt, const struct compat_iovec __user *rvec, + unsigned long riovcnt, unsigned long flags); +asmlinkage ssize_t compat_sys_process_vm_writev(compat_pid_t pid, + const struct compat_iovec __user *lvec, + unsigned long liovcnt, const struct compat_iovec __user *rvec, + unsigned long riovcnt, unsigned long flags); + #endif /* CONFIG_COMPAT */ #endif /* _LINUX_COMPAT_H */ |