diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 20:29:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 20:29:03 -0400 |
| commit | 29ca069cc6572cce62e42a27efdab01f50190616 (patch) | |
| tree | b948f5eed1691fa0bca57aa116837c8eeef0b90a /include | |
| parent | b4615e69b6c6353878b734a8202b65efbc554df4 (diff) | |
| parent | 3e4d0cab61c88a9ae3e61151a857960397e26403 (diff) | |
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')
| -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 e60314716122..d535833aab5e 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h | |||
| @@ -302,11 +302,17 @@ | |||
| 302 | #define __NR_timerfd_create 1310 | 302 | #define __NR_timerfd_create 1310 |
| 303 | #define __NR_timerfd_settime 1311 | 303 | #define __NR_timerfd_settime 1311 |
| 304 | #define __NR_timerfd_gettime 1312 | 304 | #define __NR_timerfd_gettime 1312 |
| 305 | #define __NR_signalfd4 1313 | ||
| 306 | #define __NR_eventfd2 1314 | ||
| 307 | #define __NR_epoll_create1 1315 | ||
| 308 | #define __NR_dup3 1316 | ||
| 309 | #define __NR_pipe2 1317 | ||
| 310 | #define __NR_inotify_init1 1318 | ||
| 305 | 311 | ||
| 306 | #ifdef __KERNEL__ | 312 | #ifdef __KERNEL__ |
| 307 | 313 | ||
| 308 | 314 | ||
| 309 | #define NR_syscalls 289 /* length of syscall table */ | 315 | #define NR_syscalls 295 /* length of syscall table */ |
| 310 | 316 | ||
| 311 | /* | 317 | /* |
| 312 | * The following defines stop scripts/checksyscalls.sh from complaining about | 318 | * The following defines stop scripts/checksyscalls.sh from complaining about |
