Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[linux.git] / include / linux / syscalls.h

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 6ca1e08210c67ce3183b09df1407d29963aa56dd..45e2db2702557c1ddb57700671205546868cdc45 100644 (file)
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -566,10 +566,10 @@ asmlinkage long sys_utime(char __user *filename,
 asmlinkage long sys_utimes(char __user *filename,
                                struct timeval __user *utimes);
 asmlinkage long sys_lseek(unsigned int fd, off_t offset,
-                         unsigned int origin);
+                         unsigned int whence);
 asmlinkage long sys_llseek(unsigned int fd, unsigned long offset_high,
                        unsigned long offset_low, loff_t __user *result,
-                       unsigned int origin);
+                       unsigned int whence);
 asmlinkage long sys_read(unsigned int fd, char __user *buf, size_t count);
 asmlinkage long sys_readahead(int fd, loff_t offset, size_t count);
 asmlinkage long sys_readv(unsigned long fd,
@@ -877,4 +877,5 @@ asmlinkage long sys_process_vm_writev(pid_t pid,
 
 asmlinkage long sys_kcmp(pid_t pid1, pid_t pid2, int type,
                         unsigned long idx1, unsigned long idx2);
+asmlinkage long sys_finit_module(int fd, const char __user *uargs, int flags);
 #endif