diff options
| author | Luciano Coelho <coelho@ti.com> | 2011-12-01 14:14:48 +0400 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-12-01 14:14:48 +0400 |
| commit | e4da3fbfbd1de56d2367653e3823e6445e49f8a9 (patch) | |
| tree | f69f424f731b89a75f881967903ff2f38f4b6a92 /include/linux/syscalls.h | |
| parent | b693289406f0b8ca70ab77e745be6196d5740eb0 (diff) | |
| parent | ba5736a5e9ac20c378ae4179e8a0ed3cc4b44351 (diff) | |
| download | linux-e4da3fbfbd1de56d2367653e3823e6445e49f8a9.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next
Diffstat (limited to 'include/linux/syscalls.h')
| -rw-r--r-- | include/linux/syscalls.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 8c03b98df5f9..86a24b1166d1 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -702,9 +702,6 @@ asmlinkage long sys_sysctl(struct __sysctl_args __user *args); asmlinkage long sys_sysinfo(struct sysinfo __user *info); asmlinkage long sys_sysfs(int option, unsigned long arg1, unsigned long arg2); -asmlinkage long sys_nfsservctl(int cmd, - struct nfsctl_arg __user *arg, - void __user *res); asmlinkage long sys_syslog(int type, char __user *buf, int len); asmlinkage long sys_uselib(const char __user *library); asmlinkage long sys_ni_syscall(void); @@ -847,4 +844,17 @@ asmlinkage long sys_open_by_handle_at(int mountdirfd, struct file_handle __user *handle, int flags); asmlinkage long sys_setns(int fd, int nstype); +asmlinkage long sys_process_vm_readv(pid_t pid, + const struct iovec __user *lvec, + unsigned long liovcnt, + const struct iovec __user *rvec, + unsigned long riovcnt, + unsigned long flags); +asmlinkage long sys_process_vm_writev(pid_t pid, + const struct iovec __user *lvec, + unsigned long liovcnt, + const struct iovec __user *rvec, + unsigned long riovcnt, + unsigned long flags); + #endif |