Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / asm-alpha / unistd.h

diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h
index aae3ab6..ef25b65 100644 (file)
--- a/include/asm-alpha/unistd.h
+++ b/include/asm-alpha/unistd.h
@@ -233,7 +233,6 @@
 #define __NR_osf_memcntl       260     /* not implemented */
 #define __NR_osf_fdatasync     261     /* not implemented */
 
-#define __NR_vserver           273
 
 /*
  * Linux-specific system calls begin at 300
@@ -374,8 +373,17 @@
 #define __NR_mq_timedreceive           435
 #define __NR_mq_notify                 436
 #define __NR_mq_getsetattr             437
-
-#define NR_SYSCALLS                    438
+#define __NR_waitid                    438
+#define __NR_add_key                   439
+#define __NR_request_key               440
+#define __NR_keyctl                    441
+#define __NR_ioprio_set                        442
+#define __NR_ioprio_get                        443
+#define __NR_inotify_init              444
+#define __NR_inotify_add_watch         445
+#define __NR_inotify_rm_watch          446
+
+#define NR_SYSCALLS                    447
 
 #if defined(__GNUC__)
 
@@ -618,7 +626,7 @@ static inline long read(int fd, char * buf, size_t nr)
        return sys_read(fd, buf, nr);
 }
 
-extern long execve(char *, char **, char **);
+extern int execve(char *, char **, char **);
 
 static inline long setsid(void)
 {
@@ -651,6 +659,6 @@ asmlinkage long sys_rt_sigaction(int sig,
    have declarations.  If we use no prototype, then we get warnings from
    -Wstrict-prototypes.  Ho hum.  */
 
-#define cond_syscall(x)  asm(".weak\t" #x "\n" #x " = sys_ni_syscall");
+#define cond_syscall(x)  asm(".weak\t" #x "\n" #x " = sys_ni_syscall")
 
 #endif /* _ALPHA_UNISTD_H */