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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-alpha
/
unistd.h
diff --git
a/include/asm-alpha/unistd.h
b/include/asm-alpha/unistd.h
index
9aca27e
..
bc6e6a9
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_osf_memcntl 260 /* not implemented */
#define __NR_osf_fdatasync 261 /* not implemented */
-#define __NR_vserver 273
/*
* Linux-specific system calls begin at 300
/*
* Linux-specific system calls begin at 300
@@
-375,8
+374,18
@@
#define __NR_mq_notify 436
#define __NR_mq_getsetattr 437
#define __NR_waitid 438
#define __NR_mq_notify 436
#define __NR_mq_getsetattr 437
#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 439
+#ifdef __KERNEL__
+
+#define NR_SYSCALLS 447
#if defined(__GNUC__)
#if defined(__GNUC__)
@@
-558,9
+567,8
@@
type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, type6 arg6)\
_syscall_return(type); \
}
_syscall_return(type); \
}
-#endif /* __
LIBRARY__ && __
GNUC__ */
+#endif /* __GNUC__ */
-#ifdef __KERNEL__
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_STAT64
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_STAT64
@@
-571,7
+579,6
@@
type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, type6 arg6)\
#define __ARCH_WANT_SYS_OLD_GETRLIMIT
#define __ARCH_WANT_SYS_OLDUMOUNT
#define __ARCH_WANT_SYS_SIGPENDING
#define __ARCH_WANT_SYS_OLD_GETRLIMIT
#define __ARCH_WANT_SYS_OLDUMOUNT
#define __ARCH_WANT_SYS_SIGPENDING
-#endif
#ifdef __KERNEL_SYSCALLS__
#ifdef __KERNEL_SYSCALLS__
@@
-652,6
+659,7
@@
asmlinkage long sys_rt_sigaction(int sig,
have declarations. If we use no prototype, then we get warnings from
-Wstrict-prototypes. Ho hum. */
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 /* __KERNEL__ */
#endif /* _ALPHA_UNISTD_H */
#endif /* _ALPHA_UNISTD_H */