git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
asm-x86_64
/
unistd.h
diff --git
a/include/asm-x86_64/unistd.h
b/include/asm-x86_64/unistd.h
index
030c41a
..
71671fa
100644
(file)
--- a/
include/asm-x86_64/unistd.h
+++ b/
include/asm-x86_64/unistd.h
@@
-298,8
+298,9
@@
__SYSCALL(__NR_utime, sys_utime)
#define __NR_mknod 133
__SYSCALL(__NR_mknod, sys_mknod)
#define __NR_mknod 133
__SYSCALL(__NR_mknod, sys_mknod)
+/* Only needed for a.out */
#define __NR_uselib 134
#define __NR_uselib 134
-__SYSCALL(__NR_uselib, sys_
uselib
)
+__SYSCALL(__NR_uselib, sys_
ni_syscall
)
#define __NR_personality 135
__SYSCALL(__NR_personality, sys_personality)
#define __NR_personality 135
__SYSCALL(__NR_personality, sys_personality)
@@
-554,8
+555,14
@@
__SYSCALL(__NR_mq_getsetattr, sys_mq_getsetattr)
__SYSCALL(__NR_kexec_load, sys_ni_syscall)
#define __NR_waitid 247
__SYSCALL(__NR_waitid, sys_waitid)
__SYSCALL(__NR_kexec_load, sys_ni_syscall)
#define __NR_waitid 247
__SYSCALL(__NR_waitid, sys_waitid)
-
-#define __NR_syscall_max __NR_waitid
+#define __NR_add_key 248
+__SYSCALL(__NR_add_key, sys_add_key)
+#define __NR_request_key 249
+__SYSCALL(__NR_request_key, sys_request_key)
+#define __NR_keyctl 250
+__SYSCALL(__NR_keyctl, sys_keyctl)
+
+#define __NR_syscall_max __NR_keyctl
#ifndef __NO_STUBS
/* user-visible error numbers are in the range -1 - -4095 */
#ifndef __NO_STUBS
/* user-visible error numbers are in the range -1 - -4095 */
@@
-579,7
+586,6
@@
do { \
#define __ARCH_WANT_SYS_PAUSE
#define __ARCH_WANT_SYS_SGETMASK
#define __ARCH_WANT_SYS_SIGNAL
#define __ARCH_WANT_SYS_PAUSE
#define __ARCH_WANT_SYS_SGETMASK
#define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_TIME
#define __ARCH_WANT_SYS_UTIME
#define __ARCH_WANT_SYS_WAITPID
#define __ARCH_WANT_SYS_SOCKETCALL
#define __ARCH_WANT_SYS_UTIME
#define __ARCH_WANT_SYS_WAITPID
#define __ARCH_WANT_SYS_SOCKETCALL
@@
-592,6
+598,7
@@
do { \
#define __ARCH_WANT_SYS_SIGPENDING
#define __ARCH_WANT_SYS_SIGPROCMASK
#define __ARCH_WANT_SYS_RT_SIGACTION
#define __ARCH_WANT_SYS_SIGPENDING
#define __ARCH_WANT_SYS_SIGPROCMASK
#define __ARCH_WANT_SYS_RT_SIGACTION
+#define __ARCH_WANT_COMPAT_SYS_TIME
#endif
#ifndef __KERNEL_SYSCALLS__
#endif
#ifndef __KERNEL_SYSCALLS__
@@
-722,7
+729,7
@@
static inline long dup(unsigned int fd)
}
/* implemented in asm in arch/x86_64/kernel/entry.S */
}
/* implemented in asm in arch/x86_64/kernel/entry.S */
-extern
long execve(char *, char **, char *
*);
+extern
int execve(const char *, char * const *, char * const
*);
static inline long open(const char * filename, int flags, int mode)
{
static inline long open(const char * filename, int flags, int mode)
{