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 | |
| parent | sys_paccept definition missing __user annotation (diff) | |
| parent | [IA64] Wire up new system calls (diff) | |
| download | linux-dev-29ca069cc6572cce62e42a27efdab01f50190616.tar.xz linux-dev-29ca069cc6572cce62e42a27efdab01f50190616.zip | |
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
| -rw-r--r-- | arch/ia64/kernel/entry.S | 6 | ||||
| -rw-r--r-- | include/asm-ia64/unistd.h | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 56ab156c48ae..0dd6c1419d8d 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1691,6 +1691,12 @@ sys_call_table: data8 sys_timerfd_create // 1310 data8 sys_timerfd_settime data8 sys_timerfd_gettime + data8 sys_signalfd4 + data8 sys_eventfd2 + data8 sys_epoll_create1 // 1315 + data8 sys_dup3 + data8 sys_pipe2 + data8 sys_inotify_init1 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index e60314716122..d535833aab5e 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 |