diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 17:29:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 17:29:03 -0700 |
commit | 29ca069cc6572cce62e42a27efdab01f50190616 (patch) | |
tree | b948f5eed1691fa0bca57aa116837c8eeef0b90a /include/asm-ia64 | |
parent | b4615e69b6c6353878b734a8202b65efbc554df4 (diff) | |
parent | 3e4d0cab61c88a9ae3e61151a857960397e26403 (diff) | |
download | op-kernel-dev-29ca069cc6572cce62e42a27efdab01f50190616.zip op-kernel-dev-29ca069cc6572cce62e42a27efdab01f50190616.tar.gz |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Wire up new system calls
Diffstat (limited to 'include/asm-ia64')
-rw-r--r-- | include/asm-ia64/unistd.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index e603147..d535833 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h @@ -302,11 +302,17 @@ #define __NR_timerfd_create 1310 #define __NR_timerfd_settime 1311 #define __NR_timerfd_gettime 1312 +#define __NR_signalfd4 1313 +#define __NR_eventfd2 1314 +#define __NR_epoll_create1 1315 +#define __NR_dup3 1316 +#define __NR_pipe2 1317 +#define __NR_inotify_init1 1318 #ifdef __KERNEL__ -#define NR_syscalls 289 /* length of syscall table */ +#define NR_syscalls 295 /* length of syscall table */ /* * The following defines stop scripts/checksyscalls.sh from complaining about |